Date: Sun, 28 May 2017 00:13:44 +0000 (UTC) From: "Rodney W. Grimes" <rgrimes@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r319016 - in stable/11: bin/pkill libexec/rtld-elf usr.bin/chpass usr.bin/passwd usr.sbin/bsdinstall/partedit usr.sbin/mailwrapper usr.sbin/nologin Message-ID: <201705280013.v4S0DipZ086301@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: rgrimes Date: Sun May 28 00:13:44 2017 New Revision: 319016 URL: https://svnweb.freebsd.org/changeset/base/319016 Log: MFC r314833 Convert absolute links to relative links. Style.Makefile(9) has been ignored to produce minimal diffs. MFC r314837 The relative symlink fix causes downstream issues for EMC DELL Isilon so revert the relative symlink fix pending a better solution. Reported by: ngie MFC r315091 Revert r314833 until the problem with INSTALL_RSYMLINKS can be found as it appears to break arm release builds. PR: 217705 Reported by: cyclaero@gmail.com Approved by: grehan (mentor) Modified: stable/11/bin/pkill/Makefile stable/11/libexec/rtld-elf/Makefile stable/11/usr.bin/chpass/Makefile stable/11/usr.bin/passwd/Makefile stable/11/usr.sbin/bsdinstall/partedit/Makefile stable/11/usr.sbin/mailwrapper/Makefile stable/11/usr.sbin/nologin/Makefile Directory Properties: stable/11/ (props changed) Modified: stable/11/bin/pkill/Makefile ============================================================================== --- stable/11/bin/pkill/Makefile Sat May 27 23:57:09 2017 (r319015) +++ stable/11/bin/pkill/Makefile Sun May 28 00:13:44 2017 (r319016) @@ -16,8 +16,8 @@ MLINKS= pkill.1 pgrep.1 # keep in mind that pkill is installed to /usr/bin in other # OS types, e.g., NetBSD, OpenBSD, Solaris, and Linux. # -SYMLINKS= ${BINDIR}/pkill /usr/bin/pkill -SYMLINKS+= ${BINDIR}/pgrep /usr/bin/pgrep +SYMLINKS= ../..${BINDIR}/pkill /usr/bin/pkill +SYMLINKS+= ../..${BINDIR}/pgrep /usr/bin/pgrep .if ${MK_TESTS} != "no" SUBDIR+= tests Modified: stable/11/libexec/rtld-elf/Makefile ============================================================================== --- stable/11/libexec/rtld-elf/Makefile Sat May 27 23:57:09 2017 (r319015) +++ stable/11/libexec/rtld-elf/Makefile Sun May 28 00:13:44 2017 (r319016) @@ -34,7 +34,7 @@ WARNS?= 2 INSTALLFLAGS= -C -b PRECIOUSPROG= BINDIR= /libexec -SYMLINKS= ${BINDIR}/${PROG} ${LIBEXECDIR}/${PROG} +SYMLINKS= ../..${BINDIR}/${PROG} ${LIBEXECDIR}/${PROG} MLINKS= rtld.1 ld-elf.so.1.1 \ rtld.1 ld.so.1 Modified: stable/11/usr.bin/chpass/Makefile ============================================================================== --- stable/11/usr.bin/chpass/Makefile Sat May 27 23:57:09 2017 (r319015) +++ stable/11/usr.bin/chpass/Makefile Sun May 28 00:13:44 2017 (r319016) @@ -22,12 +22,12 @@ LIBADD= crypt util LIBADD+= ypclnt .endif -SYMLINKS= ${BINDIR}/chpass ${BINDIR}/chfn -SYMLINKS+= ${BINDIR}/chpass ${BINDIR}/chsh +SYMLINKS= chpass ${BINDIR}/chfn +SYMLINKS+= chpass ${BINDIR}/chsh .if ${MK_NIS} != "no" -SYMLINKS+= ${BINDIR}/chpass ${BINDIR}/ypchpass -SYMLINKS+= ${BINDIR}/chpass ${BINDIR}/ypchfn -SYMLINKS+= ${BINDIR}/chpass ${BINDIR}/ypchsh +SYMLINKS+= chpass ${BINDIR}/ypchfn +SYMLINKS+= chpass ${BINDIR}/ypchpass +SYMLINKS+= chpass ${BINDIR}/ypchsh .endif MLINKS= chpass.1 chfn.1 chpass.1 chsh.1 Modified: stable/11/usr.bin/passwd/Makefile ============================================================================== --- stable/11/usr.bin/passwd/Makefile Sat May 27 23:57:09 2017 (r319015) +++ stable/11/usr.bin/passwd/Makefile Sun May 28 00:13:44 2017 (r319016) @@ -9,7 +9,7 @@ BINMODE = 4555 PRECIOUSPROG= LIBADD = pam .if ${MK_NIS} != "no" -SYMLINKS = ${BINDIR}/passwd ${BINDIR}/yppasswd +SYMLINKS = passwd ${BINDIR}/yppasswd MLINKS = passwd.1 yppasswd.1 .endif Modified: stable/11/usr.sbin/bsdinstall/partedit/Makefile ============================================================================== --- stable/11/usr.sbin/bsdinstall/partedit/Makefile Sat May 27 23:57:09 2017 (r319015) +++ stable/11/usr.sbin/bsdinstall/partedit/Makefile Sun May 28 00:13:44 2017 (r319016) @@ -4,7 +4,7 @@ BINDIR= ${LIBEXECDIR}/bsdinstall PROG= partedit LINKS= ${BINDIR}/partedit ${BINDIR}/autopart \ ${BINDIR}/partedit ${BINDIR}/scriptedpart -SYMLINKS= ${BINDIR}/partedit /usr/sbin/sade +SYMLINKS= ../libexec/bsdinstall/partedit /usr/sbin/sade LIBADD+= geom ncursesw util dialog m PARTEDIT_ARCH= ${MACHINE} Modified: stable/11/usr.sbin/mailwrapper/Makefile ============================================================================== --- stable/11/usr.sbin/mailwrapper/Makefile Sat May 27 23:57:09 2017 (r319015) +++ stable/11/usr.sbin/mailwrapper/Makefile Sun May 28 00:13:44 2017 (r319016) @@ -10,19 +10,19 @@ LIBADD= util .endif .if ${MK_MAILWRAPPER} != "no" || ${MK_SENDMAIL} != "no" -SYMLINKS= ${BINDIR}/mailwrapper /usr/sbin/sendmail \ - ${BINDIR}/mailwrapper /usr/sbin/hoststat \ - ${BINDIR}/mailwrapper /usr/sbin/purgestat \ - ${BINDIR}/mailwrapper /usr/bin/newaliases \ - ${BINDIR}/mailwrapper /usr/bin/mailq +SYMLINKS= ../sbin/mailwrapper /usr/bin/mailq \ + ../sbin/mailwrapper /usr/bin/newaliases \ + mailwrapper /usr/sbin/hoststat \ + mailwrapper /usr/sbin/purgestat \ + mailwrapper /usr/sbin/sendmail .if ${MK_MAILWRAPPER} == "no" && ${MK_SENDMAIL} != "no" -SYMLINKS+= /usr/libexec/sendmail/sendmail ${BINDIR}/mailwrapper +SYMLINKS+= ../libexec/sendmail/sendmail ${BINDIR}/mailwrapper .endif .endif .if ${MK_MAILWRAPPER} != "no" && ${MK_SENDMAIL} == "no" -SYMLINKS+= ${BINDIR}/mailwrapper /bin/rmail +SYMLINKS+= ..${BINDIR}/mailwrapper /bin/rmail .endif .if ${MK_MAILWRAPPER} != "no" Modified: stable/11/usr.sbin/nologin/Makefile ============================================================================== --- stable/11/usr.sbin/nologin/Makefile Sat May 27 23:57:09 2017 (r319015) +++ stable/11/usr.sbin/nologin/Makefile Sun May 28 00:13:44 2017 (r319016) @@ -4,7 +4,7 @@ PROG= nologin MAN= nologin.5 nologin.8 -SYMLINKS= ${BINDIR}/nologin /sbin/nologin +SYMLINKS= ..${BINDIR}/nologin /sbin/nologin # It is important that nologin be statically linked for security # reasons. A dynamic non-setuid binary can be linked against a trojan
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201705280013.v4S0DipZ086301>