CVS commit: src/rescue
Module Name:src
Committed By: christos
Date: Sat Apr 4 17:57:16 UTC 2020
Modified Files:
src/rescue: Makefile
Log Message:
smb is no more.
To generate a diff of this commit:
cvs rdiff -u -r1.41 -r1.42 src/rescue/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/rescue/Makefile
diff -u src/rescue/Makefile:1.41 src/rescue/Makefile:1.42
--- src/rescue/Makefile:1.41 Sun Mar 1 15:59:54 2020
+++ src/rescue/Makefile Sat Apr 4 13:57:16 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2020/03/01 20:59:54 christos Exp $
+# $NetBSD: Makefile,v 1.42 2020/04/04 17:57:16 christos Exp $
NOLIBCSANITIZER= # defined
NOSANITIZER= # defined
@@ -50,9 +50,6 @@ LDD_ELF32DIR!= cd ${NETBSDSRCDIR}/usr.bi
LDD_ELF64DIR!= cd ${NETBSDSRCDIR}/usr.bin/ldd/elf64 && ${PRINTOBJDIR}
PARSELISTENV+= LDD_ELF32DIR=${LDD_ELF32DIR} LDD_ELF64DIR=${LDD_ELF64DIR}
-SMB_LIBDIR!= cd ${NETBSDSRCDIR}/external/bsd/smbfs/lib/libsmb && ${PRINTOBJDIR}
-PARSELISTENV+= SMB_LIBDIR=${SMB_LIBDIR}
-
# Specially built objects to override the behaviour of
# various library functions
#
CVS commit: src/rescue
Module Name:src
Committed By: christos
Date: Thu Feb 27 17:17:34 UTC 2020
Modified Files:
src/rescue: Makefile
Log Message:
Unfortunately libssh has an undefined symbol sshsk_sign(), which is provided
by different implementations depending if we are a server or a client. While
the clients we compile in, provide that symbol, it is getting hidden by
crunchhide, so we provide it again. It would have been a lot simpler to
use a function pointer instead in the library...
To generate a diff of this commit:
cvs rdiff -u -r1.39 -r1.40 src/rescue/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/rescue/Makefile
diff -u src/rescue/Makefile:1.39 src/rescue/Makefile:1.40
--- src/rescue/Makefile:1.39 Sun Dec 29 13:26:16 2019
+++ src/rescue/Makefile Thu Feb 27 12:17:34 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2019/12/29 18:26:16 christos Exp $
+# $NetBSD: Makefile,v 1.40 2020/02/27 17:17:34 christos Exp $
NOLIBCSANITIZER= # defined
NOSANITIZER= # defined
@@ -57,8 +57,9 @@ PARSELISTENV+= SMB_LIBDIR=${SMB_LIBDIR}
# various library functions
#
-OVERRIDEOBJS= rcmd.o
-.PATH: ${NETBSDSRCDIR}/lib/libc/net
+OVERRIDEOBJS= rcmd.o ssh-sk-client.o
+.PATH: ${NETBSDSRCDIR}/lib/libc/net \
+ ${NETBSDSRCDIR}/crypto/external/bsd/openssh/dist
CPPFLAGS.rcmd.c+=-I${NETBSDSRCDIR}/lib/libc/include -DRESCUEDIR=\"${RESCUEDIR}\"
LIBOVERRIDE= liboverride.o
CVS commit: src/rescue
Module Name:src Committed By: dholland Date: Sun Jan 27 04:42:47 UTC 2019 Modified Files: src/rescue: Makefile Log Message: fix duplicated chunk from merge To generate a diff of this commit: cvs rdiff -u -r1.36 -r1.37 src/rescue/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/rescue/Makefile diff -u src/rescue/Makefile:1.36 src/rescue/Makefile:1.37 --- src/rescue/Makefile:1.36 Sun Jan 27 02:08:36 2019 +++ src/rescue/Makefile Sun Jan 27 04:42:46 2019 @@ -1,7 +1,4 @@ -# $NetBSD: Makefile,v 1.36 2019/01/27 02:08:36 pgoyette Exp $ - -NOLIBCSANITIZER= # defined -NOSANITIZER= # defined +# $NetBSD: Makefile,v 1.37 2019/01/27 04:42:46 dholland Exp $ NOLIBCSANITIZER= # defined NOSANITIZER= # defined
CVS commit: src/rescue
Module Name:src Committed By: martin Date: Wed Dec 12 10:25:29 UTC 2018 Modified Files: src/rescue: list Log Message: Retire lmcconfig here too. To generate a diff of this commit: cvs rdiff -u -r1.51 -r1.52 src/rescue/list Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/rescue/list diff -u src/rescue/list:1.51 src/rescue/list:1.52 --- src/rescue/list:1.51 Sun Sep 23 07:24:19 2018 +++ src/rescue/list Wed Dec 12 10:25:29 2018 @@ -1,4 +1,4 @@ -# $NetBSD: list,v 1.51 2018/09/23 07:24:19 maxv Exp $ +# $NetBSD: list,v 1.52 2018/12/12 10:25:29 martin Exp $ SRCDIRS bin @@ -64,7 +64,6 @@ PROG fsirand PROG gpt PROG ifconfig PROG init init.bak -PROG lmcconfig PROG mbrlabel PROG mknod PROG modload
CVS commit: src/rescue
Module Name:src Committed By: kamil Date: Wed Jul 25 23:52:38 UTC 2018 Modified Files: src/rescue: Makefile Log Message: Specify NOLIBCSANITIZER for rescue The rescue image could be sanitized with a sanitizer in libc, but it's left for future as a possible research. To generate a diff of this commit: cvs rdiff -u -r1.34 -r1.35 src/rescue/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/rescue/Makefile diff -u src/rescue/Makefile:1.34 src/rescue/Makefile:1.35 --- src/rescue/Makefile:1.34 Thu Jun 21 10:44:01 2018 +++ src/rescue/Makefile Wed Jul 25 23:52:38 2018 @@ -1,5 +1,6 @@ -# $NetBSD: Makefile,v 1.34 2018/06/21 10:44:01 kamil Exp $ +# $NetBSD: Makefile,v 1.35 2018/07/25 23:52:38 kamil Exp $ +NOLIBCSANITIZER= # defined NOSANITIZER= # defined .include
CVS commit: src/rescue
Module Name:src
Committed By: kamil
Date: Thu Jun 21 10:44:01 UTC 2018
Modified Files:
src/rescue: Makefile
Log Message:
Set NOSANITIZER in rescue/Makefile
This is required to stop sanitizing rcmd.o and liboverride.o. These object
files will be linked into statically linked rescue.
To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.34 src/rescue/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/rescue/Makefile
diff -u src/rescue/Makefile:1.33 src/rescue/Makefile:1.34
--- src/rescue/Makefile:1.33 Sun Oct 8 15:02:33 2017
+++ src/rescue/Makefile Thu Jun 21 10:44:01 2018
@@ -1,4 +1,6 @@
-# $NetBSD: Makefile,v 1.33 2017/10/08 15:02:33 christos Exp $
+# $NetBSD: Makefile,v 1.34 2018/06/21 10:44:01 kamil Exp $
+
+NOSANITIZER= # defined
.include
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
CVS commit: src/rescue
Module Name:src
Committed By: christos
Date: Sun Oct 8 15:02:33 UTC 2017
Modified Files:
src/rescue: Makefile
Log Message:
Extra flags for static PIE
To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 src/rescue/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/rescue/Makefile
diff -u src/rescue/Makefile:1.32 src/rescue/Makefile:1.33
--- src/rescue/Makefile:1.32 Sun May 21 11:28:41 2017
+++ src/rescue/Makefile Sun Oct 8 11:02:33 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2017/05/21 15:28:41 riastradh Exp $
+# $NetBSD: Makefile,v 1.33 2017/10/08 15:02:33 christos Exp $
.include
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -11,6 +11,11 @@ DBG+= -Os
CRUNCHGEN_FLAGS=-d "${DBG}"
+.if ${MKSTATICPIE:Uno} == "yes"
+CRUNCHGEN_FLAGS+=-p
+CFLAGS+=-fPIE
+.endif
+
RESCUEDIR= /rescue
CRUNCHBIN= rescue
CRUNCHENV= RESCUEDIR=${RESCUEDIR}
CVS commit: src/rescue
Module Name:src Committed By: christos Date: Sat Jul 2 15:59:21 UTC 2016 Modified Files: src/rescue: list list.crypto Log Message: cgdconfig is not crypto To generate a diff of this commit: cvs rdiff -u -r1.46 -r1.47 src/rescue/list cvs rdiff -u -r1.9 -r1.10 src/rescue/list.crypto Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/rescue/list diff -u src/rescue/list:1.46 src/rescue/list:1.47 --- src/rescue/list:1.46 Sat Aug 9 14:32:34 2014 +++ src/rescue/list Sat Jul 2 11:59:21 2016 @@ -1,10 +1,11 @@ -# $NetBSD: list,v 1.46 2014/08/09 18:32:34 apb Exp $ +# $NetBSD: list,v 1.47 2016/07/02 15:59:21 christos Exp $ SRCDIRS bin PROG cat PROG chio PROG chmod +PROG cgdconfig PROG cp PROG csh PROG date Index: src/rescue/list.crypto diff -u src/rescue/list.crypto:1.9 src/rescue/list.crypto:1.10 --- src/rescue/list.crypto:1.9 Fri Dec 21 13:09:39 2012 +++ src/rescue/list.crypto Sat Jul 2 11:59:21 2016 @@ -1,6 +1,4 @@ -# $NetBSD: list.crypto,v 1.9 2012/12/21 18:09:39 christos Exp $ - -PROG cgdconfig +# $NetBSD: list.crypto,v 1.10 2016/07/02 15:59:21 christos Exp $ PROG scp PROG ssh slogin
CVS commit: src/rescue
Module Name:src
Committed By: matt
Date: Thu Jan 30 22:19:00 UTC 2014
Modified Files:
src/rescue: Makefile
Log Message:
Append -Os to DBG, not overwrite in case DBG has more than just -Ox from
sys.mk
To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 src/rescue/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/rescue/Makefile
diff -u src/rescue/Makefile:1.30 src/rescue/Makefile:1.31
--- src/rescue/Makefile:1.30 Thu Dec 26 02:25:57 2013
+++ src/rescue/Makefile Thu Jan 30 22:19:00 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2013/12/26 02:25:57 christos Exp $
+# $NetBSD: Makefile,v 1.31 2014/01/30 22:19:00 matt Exp $
.include bsd.own.mk
.include ${NETBSDSRCDIR}/distrib/common/Makefile.distrib
@@ -6,7 +6,7 @@
WARNS= 1
# XXX
.if ${MACHINE_ARCH} != m68000
-DBG= -Os
+DBG+= -Os
.endif
CRUNCHGEN_FLAGS=-d ${DBG}
CVS commit: src/rescue
Module Name:src
Committed By: christos
Date: Thu Dec 26 02:25:57 UTC 2013
Modified Files:
src/rescue: Makefile list
Log Message:
mount_smbfs has moved.
To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 src/rescue/Makefile
cvs rdiff -u -r1.44 -r1.45 src/rescue/list
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/rescue/Makefile
diff -u src/rescue/Makefile:1.29 src/rescue/Makefile:1.30
--- src/rescue/Makefile:1.29 Sun Mar 24 13:05:27 2013
+++ src/rescue/Makefile Wed Dec 25 21:25:57 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2013/03/24 17:05:27 christos Exp $
+# $NetBSD: Makefile,v 1.30 2013/12/26 02:25:57 christos Exp $
.include bsd.own.mk
.include ${NETBSDSRCDIR}/distrib/common/Makefile.distrib
@@ -47,6 +47,9 @@ LDD_ELF32DIR!= cd ${NETBSDSRCDIR}/usr.bi
LDD_ELF64DIR!= cd ${NETBSDSRCDIR}/usr.bin/ldd/elf64 ${PRINTOBJDIR}
PARSELISTENV+= LDD_ELF32DIR=${LDD_ELF32DIR} LDD_ELF64DIR=${LDD_ELF64DIR}
+SMB_LIBDIR!= cd ${NETBSDSRCDIR}/external/bsd/smbfs/lib/libsmb ${PRINTOBJDIR}
+PARSELISTENV+= SMB_LIBDIR=${SMB_LIBDIR}
+
# Specially built objects to override the behaviour of
# various library functions
#
Index: src/rescue/list
diff -u src/rescue/list:1.44 src/rescue/list:1.45
--- src/rescue/list:1.44 Thu Nov 28 20:12:47 2013
+++ src/rescue/list Wed Dec 25 21:25:57 2013
@@ -1,4 +1,4 @@
-# $NetBSD: list,v 1.44 2013/11/29 01:12:47 christos Exp $
+# $NetBSD: list,v 1.45 2013/12/26 02:25:57 christos Exp $
SRCDIRS bin
@@ -86,6 +86,8 @@ PROG mount_null
PROG mount_overlay
PROG mount_procfs
PROG mount_smbfs
+SPECIAL mount_smbfs srcdir external/bsd/smbfs/sbin/mount_smbfs
+LIBS ${SMB_LIBDIR}/libsmb.a
PROG mount_tmpfs
PROG mount_umap
PROG mount_union
CVS commit: src/rescue
Module Name:src Committed By: christos Date: Fri Nov 29 01:12:47 UTC 2013 Modified Files: src/rescue: list Log Message: nvi has moved To generate a diff of this commit: cvs rdiff -u -r1.43 -r1.44 src/rescue/list Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/rescue/list diff -u src/rescue/list:1.43 src/rescue/list:1.44 --- src/rescue/list:1.43 Fri May 25 17:46:13 2012 +++ src/rescue/list Thu Nov 28 20:12:47 2013 @@ -1,4 +1,4 @@ -# $NetBSD: list,v 1.43 2012/05/25 21:46:13 jnemeth Exp $ +# $NetBSD: list,v 1.44 2013/11/29 01:12:47 christos Exp $ SRCDIRS bin @@ -130,7 +130,7 @@ PROG less more SPECIAL less srcdir external/bsd/less/bin/less PROG vi ex -SPECIAL vi srcdir usr.bin/nvi/build +SPECIAL vi srcdir external/bsd/nvi/usr.bin/nvi SRCDIRS usr.sbin
CVS commit: src/rescue
Module Name:src
Committed By: martin
Date: Sun Mar 24 11:07:07 UTC 2013
Modified Files:
src/rescue: Makefile
Log Message:
pdisk has moved to external/bsd - try to deal.
To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 src/rescue/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/rescue/Makefile
diff -u src/rescue/Makefile:1.27 src/rescue/Makefile:1.28
--- src/rescue/Makefile:1.27 Wed Mar 10 23:13:10 2010
+++ src/rescue/Makefile Sun Mar 24 11:07:07 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2010/03/10 23:13:10 abs Exp $
+# $NetBSD: Makefile,v 1.28 2013/03/24 11:07:07 martin Exp $
.include bsd.own.mk
.include ${NETBSDSRCDIR}/distrib/common/Makefile.distrib
@@ -19,13 +19,20 @@ LISTS= ${.CURDIR}/list
TARGETDIR= ${DESTDIR}/rescue
PARSELISTENV+= TARGETDIR=${TARGETDIR:Q}
-.for f in ldconfig pdisk
+.for f in ldconfig
PROG_${f}!= cd ${NETBSDSRCDIR}/sbin/${f} ${MAKE} -V PROG
.if (${PROG_${f}} != )
LISTS+= ${.CURDIR}/list.${f}
.endif
.endfor
+.for f in pdisk
+PROG_${f}!= cd ${NETBSDSRCDIR}/external/bsd/${f} ${MAKE} -V PROG
+.if (${PROG_${f}} != )
+LISTS+= ${.CURDIR}/list.${f}
+.endif
+.endfor
+
.if ${USE_INET6} != no
LISTS+= ${.CURDIR}/list.inet6
.endif
CVS commit: src/rescue
Module Name:src
Committed By: christos
Date: Sun Mar 24 17:05:28 UTC 2013
Modified Files:
src/rescue: Makefile
Log Message:
descend to bin for pdisk
To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 src/rescue/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/rescue/Makefile
diff -u src/rescue/Makefile:1.28 src/rescue/Makefile:1.29
--- src/rescue/Makefile:1.28 Sun Mar 24 07:07:07 2013
+++ src/rescue/Makefile Sun Mar 24 13:05:27 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2013/03/24 11:07:07 martin Exp $
+# $NetBSD: Makefile,v 1.29 2013/03/24 17:05:27 christos Exp $
.include bsd.own.mk
.include ${NETBSDSRCDIR}/distrib/common/Makefile.distrib
@@ -27,7 +27,7 @@ LISTS+= ${.CURDIR}/list.${f}
.endfor
.for f in pdisk
-PROG_${f}!= cd ${NETBSDSRCDIR}/external/bsd/${f} ${MAKE} -V PROG
+PROG_${f}!= cd ${NETBSDSRCDIR}/external/bsd/${f}/bin ${MAKE} -V PROG
.if (${PROG_${f}} != )
LISTS+= ${.CURDIR}/list.${f}
.endif
CVS commit: src/rescue
Module Name:src Committed By: christos Date: Sun Mar 24 19:18:37 UTC 2013 Modified Files: src/rescue: list.pdisk Log Message: point pdisk to the right place To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/rescue/list.pdisk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/rescue/list.pdisk diff -u src/rescue/list.pdisk:1.1 src/rescue/list.pdisk:1.2 --- src/rescue/list.pdisk:1.1 Wed Aug 21 21:23:47 2002 +++ src/rescue/list.pdisk Sun Mar 24 15:18:37 2013 @@ -1,3 +1,4 @@ -# $NetBSD: list.pdisk,v 1.1 2002/08/22 01:23:47 lukem Exp $ +# $NetBSD: list.pdisk,v 1.2 2013/03/24 19:18:37 christos Exp $ PROG pdisk +SPECIAL pdisk srcdir external/bsd/pdisk/bin
CVS commit: src/rescue
Module Name:src Committed By: christos Date: Fri Dec 21 18:09:39 UTC 2012 Modified Files: src/rescue: list.crypto Log Message: PR/47276: ftp has ssl support now. To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/rescue/list.crypto Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/rescue/list.crypto diff -u src/rescue/list.crypto:1.8 src/rescue/list.crypto:1.9 --- src/rescue/list.crypto:1.8 Mon Jul 20 15:59:22 2009 +++ src/rescue/list.crypto Fri Dec 21 13:09:39 2012 @@ -1,4 +1,4 @@ -# $NetBSD: list.crypto,v 1.8 2009/07/20 19:59:22 christos Exp $ +# $NetBSD: list.crypto,v 1.9 2012/12/21 18:09:39 christos Exp $ PROG cgdconfig @@ -7,4 +7,4 @@ PROG ssh slogin SPECIAL scp srcdir crypto/external/bsd/openssh/bin/scp SPECIAL ssh srcdir crypto/external/bsd/openssh/bin/ssh -LIBS -lssh -lcrypto +LIBS -lssh -lssl -lcrypto
CVS commit: src/rescue
Module Name:src Committed By: tron Date: Sun Jul 3 22:05:01 UTC 2011 Modified Files: src/rescue: list Log Message: Update location of less directory. To generate a diff of this commit: cvs rdiff -u -r1.41 -r1.42 src/rescue/list Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/rescue/list diff -u src/rescue/list:1.41 src/rescue/list:1.42 --- src/rescue/list:1.41 Sun Jun 19 01:53:36 2011 +++ src/rescue/list Sun Jul 3 22:05:01 2011 @@ -1,4 +1,4 @@ -# $NetBSD: list,v 1.41 2011/06/19 01:53:36 christos Exp $ +# $NetBSD: list,v 1.42 2011/07/03 22:05:01 tron Exp $ SRCDIRS bin @@ -126,7 +126,7 @@ PROG ktruss PROG less more -SPECIAL less srcdir usr.bin/less/less +SPECIAL less srcdir external/bsd/less/bin/less PROG vi ex SPECIAL vi srcdir usr.bin/nvi/build
CVS commit: src/rescue
Module Name:src Committed By: christos Date: Sun Jun 19 01:53:36 UTC 2011 Modified Files: src/rescue: list Log Message: add the lzma library now that is used by gzip To generate a diff of this commit: cvs rdiff -u -r1.40 -r1.41 src/rescue/list Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/rescue/list diff -u src/rescue/list:1.40 src/rescue/list:1.41 --- src/rescue/list:1.40 Thu Jan 13 19:59:14 2011 +++ src/rescue/list Sat Jun 18 21:53:36 2011 @@ -1,4 +1,4 @@ -# $NetBSD: list,v 1.40 2011/01/14 00:59:14 njoly Exp $ +# $NetBSD: list,v 1.41 2011/06/19 01:53:36 christos Exp $ SRCDIRS bin @@ -148,4 +148,4 @@ PROG lfs_cleanerd LIBS liboverride.o -LIBS -lbz2 -lcrypt -ledit -lipsec -lkvm -ll -lm -lrmt -lcurses -lterminfo -lutil -lz -levent -lprop +LIBS -lbz2 -llzma -lcrypt -ledit -lipsec -lkvm -ll -lm -lrmt -lcurses -lterminfo -lutil -lz -levent -lprop
CVS commit: src/rescue
Module Name:src Committed By: njoly Date: Fri Jan 14 00:59:14 UTC 2011 Modified Files: src/rescue: list Log Message: Adjust for the new chown location. To generate a diff of this commit: cvs rdiff -u -r1.39 -r1.40 src/rescue/list Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/rescue/list diff -u src/rescue/list:1.39 src/rescue/list:1.40 --- src/rescue/list:1.39 Sat Feb 13 22:54:51 2010 +++ src/rescue/list Fri Jan 14 00:59:14 2011 @@ -1,4 +1,4 @@ -# $NetBSD: list,v 1.39 2010/02/13 22:54:51 roy Exp $ +# $NetBSD: list,v 1.40 2011/01/14 00:59:14 njoly Exp $ SRCDIRS bin @@ -45,6 +45,7 @@ PROG badsect PROG brconfig PROG ccdconfig +PROG chown chgrp PROG clri PROG disklabel PROG dkctl @@ -132,7 +133,6 @@ SRCDIRS usr.sbin -PROG chown chgrp PROG chroot PROG dumpfs PROG dumplfs
CVS commit: src/rescue
Module Name:src
Committed By: roy
Date: Sat Feb 13 11:21:56 UTC 2010
Modified Files:
src/rescue: Makefile
Removed Files:
src/rescue: mkterminfo terminfo
Log Message:
Don't install terminfo.db in rescue.
To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 src/rescue/Makefile
cvs rdiff -u -r1.1 -r0 src/rescue/mkterminfo src/rescue/terminfo
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/rescue/Makefile
diff -u src/rescue/Makefile:1.25 src/rescue/Makefile:1.26
--- src/rescue/Makefile:1.25 Fri Feb 5 09:44:23 2010
+++ src/rescue/Makefile Sat Feb 13 11:21:55 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2010/02/05 09:44:23 roy Exp $
+# $NetBSD: Makefile,v 1.26 2010/02/13 11:21:55 roy Exp $
.include bsd.own.mk
.include ${NETBSDSRCDIR}/distrib/common/Makefile.distrib
@@ -53,7 +53,7 @@
${_MKTARGET_LINK}
${LD} -r -o $@ ${OVERRIDEOBJS}
-CLEANFILES+= ${OVERRIDEOBJS} ${LIBOVERRIDE} terminfo.db
+CLEANFILES+= ${OVERRIDEOBJS} ${LIBOVERRIDE}
${CRUNCHBIN}: ${LIBOVERRIDE}
@@ -65,11 +65,7 @@
.include ${DISTRIBDIR}/common/Makefile.crunch
-realall: ${CRUNCHBIN} terminfo.db
-
-terminfo.db: terminfo
- ${_MKTARGET_CREATE}
- ${TOOL_TIC} -x -o ${.OBJDIR}/terminfo ${.CURDIR}/terminfo
+realall: ${CRUNCHBIN}
install: ${CRUNCHBIN}
# XXX this MKMSG doesn't line up
CVS commit: src/rescue
Module Name:src Committed By: roy Date: Sat Feb 13 22:54:51 UTC 2010 Modified Files: src/rescue: list Log Message: Don't install terminfo.db. To generate a diff of this commit: cvs rdiff -u -r1.38 -r1.39 src/rescue/list Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/rescue/list diff -u src/rescue/list:1.38 src/rescue/list:1.39 --- src/rescue/list:1.38 Fri Feb 5 09:44:23 2010 +++ src/rescue/list Sat Feb 13 22:54:51 2010 @@ -1,4 +1,4 @@ -# $NetBSD: list,v 1.38 2010/02/05 09:44:23 roy Exp $ +# $NetBSD: list,v 1.39 2010/02/13 22:54:51 roy Exp $ SRCDIRS bin @@ -147,7 +147,5 @@ PROG lfs_cleanerd -COPY terminfo.db terminfo.db - LIBS liboverride.o LIBS -lbz2 -lcrypt -ledit -lipsec -lkvm -ll -lm -lrmt -lcurses -lterminfo -lutil -lz -levent -lprop
CVS commit: src/rescue
Module Name:src
Committed By: he
Date: Fri Aug 21 15:16:46 UTC 2009
Modified Files:
src/rescue: Makefile
Added Files:
src/rescue: list.ldd.noaout
Log Message:
Add a new list.ldd.noaout, which is a copy of list.ldd but without
the a.out support.
Tweak Makefile so that the a.out support is not built for mips.
To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/rescue/Makefile
cvs rdiff -u -r0 -r1.1 src/rescue/list.ldd.noaout
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/rescue/Makefile
diff -u src/rescue/Makefile:1.22 src/rescue/Makefile:1.23
--- src/rescue/Makefile:1.22 Wed Jan 7 00:39:23 2009
+++ src/rescue/Makefile Fri Aug 21 15:16:45 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2009/01/07 00:39:23 mrg Exp $
+# $NetBSD: Makefile,v 1.23 2009/08/21 15:16:45 he Exp $
.include bsd.own.mk
.include ${NETBSDSRCDIR}/distrib/common/Makefile.distrib
@@ -35,11 +35,16 @@
CRUNCHENV+= MKKERBEROS=no # for ssh
.endif
+.if ${MACHINE_CPU} != mips
LISTS+= ${.CURDIR}/list.ldd
LDD_AOUTDIR!= cd ${NETBSDSRCDIR}/usr.bin/ldd/aout ${PRINTOBJDIR}
+PARSELISTENV+= LDD_AOUTDIR=${LDD_AOUTDIR}
+.else
+LISTS+= ${.CURDIR}/list.ldd.noaout
+.endif
LDD_ELF32DIR!= cd ${NETBSDSRCDIR}/usr.bin/ldd/elf32 ${PRINTOBJDIR}
LDD_ELF64DIR!= cd ${NETBSDSRCDIR}/usr.bin/ldd/elf64 ${PRINTOBJDIR}
-PARSELISTENV+= LDD_AOUTDIR=${LDD_AOUTDIR} LDD_ELF32DIR=${LDD_ELF32DIR} LDD_ELF64DIR=${LDD_ELF64DIR}
+PARSELISTENV+= LDD_ELF32DIR=${LDD_ELF32DIR} LDD_ELF64DIR=${LDD_ELF64DIR}
# Specially built objects to override the behaviour of
# various library functions
Added files:
Index: src/rescue/list.ldd.noaout
diff -u /dev/null src/rescue/list.ldd.noaout:1.1
--- /dev/null Fri Aug 21 15:16:46 2009
+++ src/rescue/list.ldd.noaout Fri Aug 21 15:16:46 2009
@@ -0,0 +1,12 @@
+# $NetBSD: list.ldd.noaout,v 1.1 2009/08/21 15:16:46 he Exp $
+
+PROG ldd
+
+LIBS ${LDD_ELF32DIR}/libldd_elf32.a
+LIBS ${LDD_ELF64DIR}/libldd_elf64.a
+
+SPECIAL ldd keepsymbols _rtld_pagesz _rtld_error _rtld_trust
+SPECIAL ldd keepsymbols _rtld_default_paths _rtld_paths
+SPECIAL ldd keepsymbols _rtld_xforms _rtld_objmain
+SPECIAL ldd keepsymbols _rtld_objtail _rtld_objlist
+SPECIAL ldd keepsymbols print_needed main_local main_progname
CVS commit: src/rescue
Module Name:src Committed By: christos Date: Mon Jul 20 19:59:23 UTC 2009 Modified Files: src/rescue: list.crypto Log Message: use the new ssh To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/rescue/list.crypto Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/rescue/list.crypto diff -u src/rescue/list.crypto:1.7 src/rescue/list.crypto:1.8 --- src/rescue/list.crypto:1.7 Mon Jun 23 10:53:06 2008 +++ src/rescue/list.crypto Mon Jul 20 15:59:22 2009 @@ -1,10 +1,10 @@ -# $NetBSD: list.crypto,v 1.7 2008/06/23 14:53:06 christos Exp $ +# $NetBSD: list.crypto,v 1.8 2009/07/20 19:59:22 christos Exp $ PROG cgdconfig PROG scp PROG ssh slogin -SPECIAL scp srcdir usr.bin/ssh/scp -SPECIAL ssh srcdir usr.bin/ssh/ssh +SPECIAL scp srcdir crypto/external/bsd/openssh/bin/scp +SPECIAL ssh srcdir crypto/external/bsd/openssh/bin/ssh LIBS -lssh -lcrypto
