From aaba24ac3ab8069793728f337f7eeab594e199ed Mon Sep 17 00:00:00 2001 From: John Marino Date: Thu, 28 Jan 2016 20:17:37 +0100 Subject: [PATCH] move private edit library to /lib/priv While here, fix private ssh and ldns. The .so and .a versions were not installed and this probably will break future builds for anyone that's built world in the last few hours. Also, all of these private libraries also need -L flags in addition to -rpath flags. --- Makefile_upgrade.inc | 8 ++++++ bin/sh/Makefile | 6 ++++ etc/mtree/BSD.root.dist | 2 ++ gnu/sbin/lvm/Makefile | 1 + lib/libedit/libedit/Makefile | 49 +++----------------------------- lib/libldns/Makefile | 1 + lib/pam_module/pam_ssh/Makefile | 2 +- sbin/fsdb/Makefile | 2 ++ sbin/vinum/Makefile | 1 + secure/Makefile.ssh.common | 2 +- secure/lib/libssh/Makefile | 5 ++-- secure/usr.bin/sftp/Makefile | 1 + share/initrd/bin/Makefile | 4 +-- share/initrd/sbin.lvm/Makefile | 1 + share/initrd/sbin/Makefile | 1 + share/mk/bsd.libnames.mk | 2 +- usr.bin/bc/Makefile | 1 + usr.bin/drill/Makefile | 2 +- usr.bin/ftp/Makefile | 1 + usr.bin/tftp/Makefile | 1 + usr.bin/units/Makefile | 1 + usr.sbin/802_11/wpa_cli/Makefile | 1 + usr.sbin/cdcontrol/Makefile | 1 + usr.sbin/lpr/lpc/Makefile | 1 + usr.sbin/pppctl/Makefile | 1 + 25 files changed, 45 insertions(+), 53 deletions(-) diff --git a/Makefile_upgrade.inc b/Makefile_upgrade.inc index 0d06a5be03..438b630597 100644 --- a/Makefile_upgrade.inc +++ b/Makefile_upgrade.inc @@ -2283,6 +2283,14 @@ TO_REMOVE+=/usr/lib/profile/libprivate_ldns.a TO_REMOVE+=/usr/lib/libprivate_ssh.* TO_REMOVE+=/usr/lib/profile/libprivate_ssh.a TO_REMOVE+=/usr/share/man/man5/moduli.5.gz +TO_REMOVE+=/usr/lib/libprivate_edit.* +TO_REMOVE+=/usr/lib/profile/libprivate_edit.a +TO_REMOVE+=/lib/libprivate_edit.so.5 +TO_REMOVE+=/usr/share/man/man3/editline.3.gz +TO_REMOVE+=/usr/share/man/man3/el_*.3.gz +TO_REMOVE+=/usr/share/man/man3/history*.3.gz +TO_REMOVE+=/usr/share/man/man3/tok_*.3.gz +TO_REMOVE+=/usr/share/man/man5/editrc.5.gz .if !defined(WANT_INSTALLER) TO_REMOVE+=/usr/sbin/dfuibe_installer diff --git a/bin/sh/Makefile b/bin/sh/Makefile index 9a16db48bc..2626ec71c0 100644 --- a/bin/sh/Makefile +++ b/bin/sh/Makefile @@ -31,15 +31,21 @@ CFLAGS+= -DNO_HISTORY . if exists(/usr/lib/libedit.a) DPADD= /usr/lib/libedit.a ${LIBTERMCAP} LDADD= -ledit -ltermcap +. elif exists(/usr/lib/libprivate_edit.a) +DPADD= /usr/lib/libprivate_edit.a ${LIBTERMCAP} +LDADD= -lprivate_edit -ltermcap . else DPADD= ${LIBEDIT} ${LIBTERMCAP} LDADD= -lprivate_edit -ltermcap +LDFLAGS+= -rpath /lib/priv -L ${_SHLIBDIRPREFIX}/usr/lib/priv . endif .else DPADD= ${LIBEDIT} ${LIBTERMCAP} LDADD= -lprivate_edit -ltermcap +LDFLAGS+= -rpath /lib/priv -L ${_SHLIBDIRPREFIX}/usr/lib/priv .endif + .PATH: ${.CURDIR}/bltin \ ${.CURDIR}/../kill \ ${.CURDIR}/../test \ diff --git a/etc/mtree/BSD.root.dist b/etc/mtree/BSD.root.dist index c2df8b0c94..9b4d62fd55 100644 --- a/etc/mtree/BSD.root.dist +++ b/etc/mtree/BSD.root.dist @@ -64,6 +64,8 @@ .. .. lib + priv + .. .. libexec .. diff --git a/gnu/sbin/lvm/Makefile b/gnu/sbin/lvm/Makefile index acfa7cd31e..d9df1d0bb8 100644 --- a/gnu/sbin/lvm/Makefile +++ b/gnu/sbin/lvm/Makefile @@ -134,6 +134,7 @@ MKLINKS+= lvchange.8 lvchange.1 \ LDADD+= -llvm -ldevmapper -lprop -lprivate_edit -ltermcap -ldevattr DPADD+= ${LIBLVM} ${LIBDEVMAPPER} ${LIBPROP} ${LIBEDIT} ${LIBTERMCAP} DPADD+= ${LIBDEVATTR} +LDFLAGS+= -rpath /lib/priv -L ${_SHLIBDIRPREFIX}/usr/lib/priv .PATH: ${LVM2_DISTDIR}/tools diff --git a/lib/libedit/libedit/Makefile b/lib/libedit/libedit/Makefile index e6eeab11ab..d028bfd4c8 100644 --- a/lib/libedit/libedit/Makefile +++ b/lib/libedit/libedit/Makefile @@ -2,8 +2,10 @@ .include "../Makefile.inc" LIB= private_edit -SHLIB_MAJOR= 5 # NetBSD designates SHLIB_MAJOR as 3 -SHLIBDIR?= /lib +SHLIB_MAJOR= 5 +SHLIBDIR?= /lib/priv +LIBDIR?= /usr/lib/priv +PROFLIBDIR?= /usr/lib/priv/profile SRCDIR= ${BASEDIR}/src .PATH: ${SRCDIR} @@ -52,49 +54,6 @@ SRCS+= fcns.c help.c tokenizern.c historyn.c INCS= histedit.h -MAN= editline.3 editrc.5 - -MLINKS= editline.3 el_init.3 \ - editline.3 el_end.3 \ - editline.3 el_reset.3 \ - editline.3 el_gets.3 \ - editline.3 el_getc.3 \ - editline.3 el_push.3 \ - editline.3 el_parse.3 \ - editline.3 el_set.3 \ - editline.3 el_get.3 \ - editline.3 el_source.3 \ - editline.3 el_resize.3 \ - editline.3 el_line.3 \ - editline.3 el_insertstr.3 \ - editline.3 el_deletestr.3 \ - editline.3 history_init.3 \ - editline.3 history_end.3 \ - editline.3 history.3 \ - editline.3 tok_init.3 \ - editline.3 tok_end.3 \ - editline.3 tok_reset.3 \ - editline.3 tok_line.3 \ - editline.3 tok_str.3 - -MLINKS+= editline.3 el_wgets.3 \ - editline.3 el_wgetc.3 \ - editline.3 el_wpush.3 \ - editline.3 el_wparse.3 \ - editline.3 el_wset.3 \ - editline.3 el_wget.3 \ - editline.3 el_wline.3 \ - editline.3 el_winsertstr.3 \ - editline.3 el_wdeletestr.3 \ - editline.3 history_winit.3 \ - editline.3 history_wend.3 \ - editline.3 history_w.3 \ - editline.3 tok_winit.3 \ - editline.3 tok_wend.3 \ - editline.3 tok_wreset.3 \ - editline.3 tok_wline.3 \ - editline.3 tok_wstr.3 - CLEANFILES+= common.h emacs.h fcns.c fcns.h help.c help.h CLEANFILES+= historyn.c tokenizern.c vi.h AHDR= vi.h emacs.h common.h diff --git a/lib/libldns/Makefile b/lib/libldns/Makefile index a82eacf4b7..8e0edbad6c 100644 --- a/lib/libldns/Makefile +++ b/lib/libldns/Makefile @@ -5,6 +5,7 @@ LDNS= ${.CURDIR}/../../contrib/ldns LIB= private_ldns SHLIB_MAJOR= 1 SHLIBDIR?= /usr/lib/priv +LIBDIR?= ${SHLIBDIR} PROFLIBDIR?= ${SHLIBDIR}/profile SRCS = rdata.c util.c rr.c packet.c wire2host.c \ diff --git a/lib/pam_module/pam_ssh/Makefile b/lib/pam_module/pam_ssh/Makefile index 94cc9dba76..83b8f8b385 100644 --- a/lib/pam_module/pam_ssh/Makefile +++ b/lib/pam_module/pam_ssh/Makefile @@ -10,6 +10,6 @@ DPADD= ${LIBSSH} ${LIBCRYPTO} ${LIBCRYPT} WARNS?= 4 SSHDIR= ${.CURDIR}/../../../crypto/openssh CFLAGS+= -I${SSHDIR} -include ssh_namespace.h -LDFLAGS+= -rpath /usr/lib/priv +LDFLAGS+= -rpath /usr/lib/priv -L ${_SHLIBDIRPREFIX}/usr/lib/priv .include diff --git a/sbin/fsdb/Makefile b/sbin/fsdb/Makefile index ab2cd7de5c..634aaafe34 100644 --- a/sbin/fsdb/Makefile +++ b/sbin/fsdb/Makefile @@ -10,6 +10,8 @@ SRCS= fsdb.c fsdbutil.c \ CFLAGS+= -I${.CURDIR}/../fsck LDADD+= -lprivate_edit -ltermcap DPADD+= ${LIBEDIT} ${LIBTERMCAP} +LDFLAGS+= -rpath /lib/priv -L ${_SHLIBDIRPREFIX}/usr/lib/priv + .PATH: ${.CURDIR}/../fsck ${.CURDIR}/../../sys/vfs/ufs WARNS?= 1 diff --git a/sbin/vinum/Makefile b/sbin/vinum/Makefile index 010055f803..f9af9e77e7 100644 --- a/sbin/vinum/Makefile +++ b/sbin/vinum/Makefile @@ -8,5 +8,6 @@ WARNS?= 2 CFLAGS+= -I${.CURDIR}/../../lib/libedit -I${.CURDIR}/../../sys DPADD= ${LIBEDIT} ${LIBTERMCAP} ${LIBDEVSTAT} LDADD= -lprivate_edit -ltermcap -ldevstat +LDFLAGS+= -rpath /lib/priv -L ${_SHLIBDIRPREFIX}/usr/lib/priv .include diff --git a/secure/Makefile.ssh.common b/secure/Makefile.ssh.common index fcac077b68..0b6c8408d1 100644 --- a/secure/Makefile.ssh.common +++ b/secure/Makefile.ssh.common @@ -5,7 +5,7 @@ CFLAGS+= -I${.CURDIR}/../../lib/libssh -I${SSHDIR} -include ssh_namespace.h .if ${.CURDIR:T} != "libssh" DPADD+= ${LIBSSH} ${LIBCRYPTO} ${LIBUTIL} ${LIBZ} ${LIBPTHREAD} LDADD+= -lprivate_ssh -lcrypto -lutil -lz -lpthread -LDFLAGS+= -rpath /usr/lib/priv +LDFLAGS+= -rpath /usr/lib/priv -L ${_SHLIBDIRPREFIX}/usr/lib/priv .endif .PATH: ${SSHDIR} ${SSHDIR}/openbsd-compat diff --git a/secure/lib/libssh/Makefile b/secure/lib/libssh/Makefile index 0f6093db62..f27a7093b6 100644 --- a/secure/lib/libssh/Makefile +++ b/secure/lib/libssh/Makefile @@ -27,8 +27,9 @@ SRCS+= bcrypt_pbkdf.c blowfish.c bsd-misc.c explicit_bzero.c \ WARNS?= 2 -SHLIBDIR?= /usr/lib/priv -PROFLIBDIR?= ${SHLIBDIR}/profile +SHLIBDIR?= /usr/lib/priv +LIBDIR?= ${SHLIBDIR} +PROFLIBDIR?= ${SHLIBDIR}/profile .include "../../Makefile.ssh.common" .include diff --git a/secure/usr.bin/sftp/Makefile b/secure/usr.bin/sftp/Makefile index 59a17fa3f3..6bb4c4eafc 100644 --- a/secure/usr.bin/sftp/Makefile +++ b/secure/usr.bin/sftp/Makefile @@ -9,6 +9,7 @@ SRCS+= fmt_scaled.c DPADD+= ${LIBEDIT} ${LIBTERMCAP} LDADD+= -lprivate_edit -ltermcap +LDFLAGS+= -rpath /lib/priv -L ${_SHLIBDIRPREFIX}/usr/lib/priv .include "../../Makefile.ssh.common" .include diff --git a/share/initrd/bin/Makefile b/share/initrd/bin/Makefile index 22ec3450c1..39d7b81107 100644 --- a/share/initrd/bin/Makefile +++ b/share/initrd/bin/Makefile @@ -63,8 +63,8 @@ CRUNCH_ALIAS_ssh= scp CRUNCH_KEEP_ssh= roaming_write roaming_read add_recv_bytes -CRUNCH_LIBS+= -lprivate_ssh -lcrypto -lz -lpthread -CRUNCH_LDFLAGS+= -rpath /usr/lib/priv +CRUNCH_LIBS+= -lprivate_ssh -lcrypto -lz -lpthread \ + -rpath /lib/priv:/usr/lib/priv -L ${_SHLIBDIRPREFIX}/usr/lib/priv .include .include diff --git a/share/initrd/sbin.lvm/Makefile b/share/initrd/sbin.lvm/Makefile index 132adb14d1..477ec80e13 100644 --- a/share/initrd/sbin.lvm/Makefile +++ b/share/initrd/sbin.lvm/Makefile @@ -82,6 +82,7 @@ SYMLINKS+= lvm ${BINDIR}/lvchange \ LDADD+= -llvm -ldevmapper -lprop -lprivate_edit -ltermcap -ldevattr DPADD+= ${LIBLVM} ${LIBDEVMAPPER} ${LIBPROP} ${LIBEDIT} ${LIBTERMCAP} DPADD+= ${LIBDEVATTR} +LDFLAGS+= -rpath /lib/priv -L ${_SHLIBDIRPREFIX}/usr/lib/priv .PATH: ${LVM2_DISTDIR}/tools diff --git a/share/initrd/sbin/Makefile b/share/initrd/sbin/Makefile index 33735df0b7..d81a4b65e0 100644 --- a/share/initrd/sbin/Makefile +++ b/share/initrd/sbin/Makefile @@ -70,6 +70,7 @@ CRUNCH_ALIAS_swapon= swapoff swapctl CRUNCH_LIBS+= -lcam -lsbuf -lutil -lkvm -lm -lmd -lhammer -lkiconv CRUNCH_LIBS+= -lprivate_edit -ltermcap -ldevstat -lprop -lpthread CRUNCH_LIBS+= -lbsdxml -lipsec +CRUNCH_LIBS+= -rpath /lib/priv -L ${_SHLIBDIRPREFIX}/usr/lib/priv CRUNCH_SRCDIRS+= usr.sbin CRUNCH_PROGS_usr.sbin= boot0cfg chroot diff --git a/share/mk/bsd.libnames.mk b/share/mk/bsd.libnames.mk index c6a92a7727..9aee101166 100644 --- a/share/mk/bsd.libnames.mk +++ b/share/mk/bsd.libnames.mk @@ -30,7 +30,7 @@ LIBDEVSTAT?= ${DESTDIR}${LIBDIR}/libdevstat.a LIBDIALOG?= ${DESTDIR}${LIBDIR}/libdialog.a LIBDM?= ${DESTDIR}${LIBDIR}/libdm.a #LIBDMSG?= ${DESTDIR}${LIBDIR}/libdmsg.a -LIBEDIT?= ${DESTDIR}${LIBDIR}/libprivate_edit.a +LIBEDIT?= ${DESTDIR}${LIBDIR}/priv/libprivate_edit.a LIBEVTR?= ${DESTDIR}${LIBDIR}/libevtr.a LIBEXECINFO?= ${DESTDIR}${LIBDIR}/libexecinfo.a LIBFETCH?= ${DESTDIR}${LIBDIR}/libfetch.a diff --git a/usr.bin/bc/Makefile b/usr.bin/bc/Makefile index de59ec180e..7011d37b3e 100644 --- a/usr.bin/bc/Makefile +++ b/usr.bin/bc/Makefile @@ -7,6 +7,7 @@ WARNS?= 3 DPADD= ${LIBEDIT} ${LIBTERMCAP} LDADD= -lprivate_edit -ltermcap +LDFLAGS+= -rpath /lib/priv -L ${_SHLIBDIRPREFIX}/usr/lib/priv SCRIPTS= bc.library SCRIPTSMODE= 444 diff --git a/usr.bin/drill/Makefile b/usr.bin/drill/Makefile index 77835aefad..b2efb033ce 100644 --- a/usr.bin/drill/Makefile +++ b/usr.bin/drill/Makefile @@ -10,6 +10,6 @@ WARNS?= 2 LDADD+= -lprivate_ldns -lcrypto DPADD+= ${LIBLDNS} ${LIBCRYPTO} CFLAGS+=-I${.CURDIR} -I${LDNS} -I${LDNS}/drill -I${LDNSBASE} -LDFLAGS+= -rpath /usr/lib/priv +LDFLAGS+= -rpath /usr/lib/priv -L ${_SHLIBDIRPREFIX}/usr/lib/priv .include diff --git a/usr.bin/ftp/Makefile b/usr.bin/ftp/Makefile index ae36f0251b..2dd112c837 100644 --- a/usr.bin/ftp/Makefile +++ b/usr.bin/ftp/Makefile @@ -18,6 +18,7 @@ CFLAGS+=-I${.CURDIR} -I${.OBJDIR} -I${CONTRIBDIR} \ -D__dead=__dead2 -DUSE_GLOB_H LDADD= -lprivate_edit -ltermcap -lutil DPADD= ${LIBEDIT} ${LIBTERMCAP} ${LIBUTIL} +LDFLAGS+= -rpath /lib/priv -L ${_SHLIBDIRPREFIX}/usr/lib/priv .if !defined(NO_OPENSSL) SRCS+= ssl.c diff --git a/usr.bin/tftp/Makefile b/usr.bin/tftp/Makefile index e526e544bb..9d611efb2c 100644 --- a/usr.bin/tftp/Makefile +++ b/usr.bin/tftp/Makefile @@ -4,5 +4,6 @@ PROG= tftp SRCS= main.c tftp.c tftpsubs.c DPADD= ${LIBEDIT} ${LIBTERMCAP} LDADD= -lprivate_edit -ltermcap +LDFLAGS+= -rpath /lib/priv -L ${_SHLIBDIRPREFIX}/usr/lib/priv .include diff --git a/usr.bin/units/Makefile b/usr.bin/units/Makefile index f64fc955f8..5ce61f93f3 100644 --- a/usr.bin/units/Makefile +++ b/usr.bin/units/Makefile @@ -6,5 +6,6 @@ FILESDIR= ${SHAREDIR}/misc LDADD+= -lprivate_edit -ltermcap DPADD+= ${LIBEDIT} ${LIBTERMCAP} +LDFLAGS+= -rpath /lib/priv -L ${_SHLIBDIRPREFIX}/usr/lib/priv .include diff --git a/usr.sbin/802_11/wpa_cli/Makefile b/usr.sbin/802_11/wpa_cli/Makefile index ffb9a724b1..e45f17ae8e 100644 --- a/usr.sbin/802_11/wpa_cli/Makefile +++ b/usr.sbin/802_11/wpa_cli/Makefile @@ -15,5 +15,6 @@ CFLAGS+= -DCONFIG_READLINE LDADD+= -lprivate_edit -ltermcap DPADD+= ${LIBEDIT} ${LIBTERMCAP} +LDFLAGS+= -rpath /lib/priv -L ${_SHLIBDIRPREFIX}/usr/lib/priv .include diff --git a/usr.sbin/cdcontrol/Makefile b/usr.sbin/cdcontrol/Makefile index 182aca29d1..dfc85aa778 100644 --- a/usr.sbin/cdcontrol/Makefile +++ b/usr.sbin/cdcontrol/Makefile @@ -4,5 +4,6 @@ PROG= cdcontrol DPADD= ${LIBEDIT} ${LIBTERMCAP} LDADD= -lprivate_edit -ltermcap +LDFLAGS+= -rpath /lib/priv -L ${_SHLIBDIRPREFIX}/usr/lib/priv .include diff --git a/usr.sbin/lpr/lpc/Makefile b/usr.sbin/lpr/lpc/Makefile index 31e012f2dd..58af35faa3 100644 --- a/usr.sbin/lpr/lpc/Makefile +++ b/usr.sbin/lpr/lpc/Makefile @@ -13,5 +13,6 @@ CFLAGS+= -I${.CURDIR}/../common_source DPADD= ${LIBLPR} ${LIBEDIT} ${LIBTERMCAP} LDADD= ${LIBLPR} -lprivate_edit -ltermcap +LDFLAGS+= -rpath /lib/priv -L ${_SHLIBDIRPREFIX}/usr/lib/priv .include diff --git a/usr.sbin/pppctl/Makefile b/usr.sbin/pppctl/Makefile index eb3d4dc586..258ac6250e 100644 --- a/usr.sbin/pppctl/Makefile +++ b/usr.sbin/pppctl/Makefile @@ -5,5 +5,6 @@ MAN= pppctl.8 WARNS?= 2 LDADD+= -lprivate_edit -ltermcap DPADD+= ${LIBEDIT} ${LIBTERMCAP} +LDFLAGS+= -rpath /lib/priv -L ${_SHLIBDIRPREFIX}/usr/lib/priv .include -- 2.41.0