diff options
author | tnn <tnn> | 2008-03-08 01:06:52 +0000 |
---|---|---|
committer | tnn <tnn> | 2008-03-08 01:06:52 +0000 |
commit | 467a1346daaa746a6d37e5798ff472f13675fcae (patch) | |
tree | f2d4fb550e292e14e04c2d324ab124c7f7a43077 /sysutils | |
parent | 15d42f8b53385511d9e7bc034f77a0ffc4daadfa (diff) | |
download | pkgsrc-467a1346daaa746a6d37e5798ff472f13675fcae.tar.gz |
Update to coreutils-6.10.
New tools:
* gmktemp - GNU implementation of mktemp(1)
* gchcon - change the SELinux security context of a file
* gruncon - run a program in a different SELinux security context
Programs now default disabled by upstream (thus not installed):
* ghostname
* gsu (XXX: could make this a PKG_OPTION if requested)
Also assorted bugfixes.
Diffstat (limited to 'sysutils')
-rw-r--r-- | sysutils/coreutils/MESSAGE.gsu | 7 | ||||
-rw-r--r-- | sysutils/coreutils/Makefile | 23 | ||||
-rw-r--r-- | sysutils/coreutils/PLIST | 18 | ||||
-rw-r--r-- | sysutils/coreutils/distinfo | 12 | ||||
-rw-r--r-- | sysutils/coreutils/patches/patch-ad | 16 | ||||
-rw-r--r-- | sysutils/coreutils/patches/patch-ah | 8 |
6 files changed, 41 insertions, 43 deletions
diff --git a/sysutils/coreutils/MESSAGE.gsu b/sysutils/coreutils/MESSAGE.gsu deleted file mode 100644 index 5540153ccec..00000000000 --- a/sysutils/coreutils/MESSAGE.gsu +++ /dev/null @@ -1,7 +0,0 @@ -=========================================================================== -$NetBSD: MESSAGE.gsu,v 1.2 2005/12/05 20:50:59 rillig Exp $ - -The GNU ${PKGNAME} version of su doesn't support the wheel group. -Because of that it is installed without the setuid bit on ${OPSYS}. - -=========================================================================== diff --git a/sysutils/coreutils/Makefile b/sysutils/coreutils/Makefile index 7fead4e0354..787688493b4 100644 --- a/sysutils/coreutils/Makefile +++ b/sysutils/coreutils/Makefile @@ -1,18 +1,18 @@ -# $NetBSD: Makefile,v 1.42 2007/11/26 15:40:45 tron Exp $ +# $NetBSD: Makefile,v 1.43 2008/03/08 01:06:52 tnn Exp $ -DISTNAME= coreutils-6.9 -PKGREVISION= 1 +DISTNAME= coreutils-6.10 CATEGORIES= sysutils MASTER_SITES= ${MASTER_SITE_GNU:=coreutils/} -EXTRACT_SUFX= .tar.bz2 +#EXTRACT_SUFX= .tar.bz2 MAINTAINER= tech-pkg@NetBSD.org HOMEPAGE= http://www.gnu.org/software/coreutils/ COMMENT= GNU basic file, shell and text manipulation utilities +PKG_DESTDIR_SUPPORT= user-destdir NOT_FOR_PLATFORM= NetBSD-2.0[D-H]-* -CONFLICTS= fileutils-[0-9]* linuxls-[0-9]* sh-utils-[0-9]* textutils-[0-9]* +CONFLICTS= fileutils-[0-9]* linuxls-[0-9]* sh-utils-[0-9]* textutils-[0-9]* mktemp-[0-9]* CFLAGS+= -g LDFLAGS+= -g @@ -67,12 +67,13 @@ CONFLICTS+= teTeX-bin<3 PLIST_SUBST+= GNU_PROGRAM_PREFIX=${GNU_PROGRAM_PREFIX:Q} BUILD_DEFS+= GNU_PROGRAM_PREFIX -.if ${OPSYS} == "NetBSD" || ${OPSYS} == "FreeBSD" || \ - ${OPSYS} == "OpenBSD" -MAKE_FLAGS+= setuid_root_mode=a=rx -MESSAGE_SRC= ${.CURDIR}/MESSAGE.gsu -MESSAGE_SUBST+= OPSYS=${OPSYS:Q} -.endif +#CONFIGURE_ARGS+= --enable-install-program=su +#.if ${OPSYS} == "NetBSD" || ${OPSYS} == "FreeBSD" || \ +# ${OPSYS} == "OpenBSD" +#MAKE_FLAGS+= setuid_root_mode=a=rx +#MESSAGE_SRC= ${.CURDIR}/MESSAGE.gsu +#MESSAGE_SUBST+= OPSYS=${OPSYS:Q} +#.endif .include "../../converters/libiconv/buildlink3.mk" .include "../../devel/gettext-lib/buildlink3.mk" diff --git a/sysutils/coreutils/PLIST b/sysutils/coreutils/PLIST index 9847b2a1d94..f03a96f2656 100644 --- a/sysutils/coreutils/PLIST +++ b/sysutils/coreutils/PLIST @@ -1,8 +1,9 @@ -@comment $NetBSD: PLIST,v 1.8 2007/07/18 11:25:19 tnn Exp $ +@comment $NetBSD: PLIST,v 1.9 2008/03/08 01:06:52 tnn Exp $ bin/${GNU_PROGRAM_PREFIX}[ bin/${GNU_PROGRAM_PREFIX}base64 bin/${GNU_PROGRAM_PREFIX}basename bin/${GNU_PROGRAM_PREFIX}cat +bin/${GNU_PROGRAM_PREFIX}chcon bin/${GNU_PROGRAM_PREFIX}chgrp bin/${GNU_PROGRAM_PREFIX}chmod bin/${GNU_PROGRAM_PREFIX}chown @@ -30,7 +31,6 @@ bin/${GNU_PROGRAM_PREFIX}fold bin/${GNU_PROGRAM_PREFIX}groups bin/${GNU_PROGRAM_PREFIX}head ${COREUTILS_HAVE_HOSTID}bin/${GNU_PROGRAM_PREFIX}hostid -bin/${GNU_PROGRAM_PREFIX}hostname bin/${GNU_PROGRAM_PREFIX}id bin/${GNU_PROGRAM_PREFIX}install bin/${GNU_PROGRAM_PREFIX}join @@ -43,6 +43,7 @@ bin/${GNU_PROGRAM_PREFIX}md5sum bin/${GNU_PROGRAM_PREFIX}mkdir bin/${GNU_PROGRAM_PREFIX}mkfifo bin/${GNU_PROGRAM_PREFIX}mknod +bin/${GNU_PROGRAM_PREFIX}mktemp bin/${GNU_PROGRAM_PREFIX}mv bin/${GNU_PROGRAM_PREFIX}nice bin/${GNU_PROGRAM_PREFIX}nl @@ -59,6 +60,7 @@ bin/${GNU_PROGRAM_PREFIX}pwd bin/${GNU_PROGRAM_PREFIX}readlink bin/${GNU_PROGRAM_PREFIX}rm bin/${GNU_PROGRAM_PREFIX}rmdir +bin/${GNU_PROGRAM_PREFIX}runcon bin/${GNU_PROGRAM_PREFIX}seq bin/${GNU_PROGRAM_PREFIX}sha1sum bin/${GNU_PROGRAM_PREFIX}sha224sum @@ -72,7 +74,6 @@ bin/${GNU_PROGRAM_PREFIX}sort bin/${GNU_PROGRAM_PREFIX}split bin/${GNU_PROGRAM_PREFIX}stat bin/${GNU_PROGRAM_PREFIX}stty -bin/${GNU_PROGRAM_PREFIX}su bin/${GNU_PROGRAM_PREFIX}sum bin/${GNU_PROGRAM_PREFIX}sync bin/${GNU_PROGRAM_PREFIX}tac @@ -99,6 +100,7 @@ info/coreutils.info man/man1/${GNU_PROGRAM_PREFIX}base64.1 man/man1/${GNU_PROGRAM_PREFIX}basename.1 man/man1/${GNU_PROGRAM_PREFIX}cat.1 +man/man1/${GNU_PROGRAM_PREFIX}chcon.1 man/man1/${GNU_PROGRAM_PREFIX}chgrp.1 man/man1/${GNU_PROGRAM_PREFIX}chmod.1 man/man1/${GNU_PROGRAM_PREFIX}chown.1 @@ -126,7 +128,6 @@ man/man1/${GNU_PROGRAM_PREFIX}fold.1 man/man1/${GNU_PROGRAM_PREFIX}groups.1 man/man1/${GNU_PROGRAM_PREFIX}head.1 man/man1/${GNU_PROGRAM_PREFIX}hostid.1 -man/man1/${GNU_PROGRAM_PREFIX}hostname.1 man/man1/${GNU_PROGRAM_PREFIX}id.1 man/man1/${GNU_PROGRAM_PREFIX}install.1 man/man1/${GNU_PROGRAM_PREFIX}join.1 @@ -139,6 +140,7 @@ man/man1/${GNU_PROGRAM_PREFIX}md5sum.1 man/man1/${GNU_PROGRAM_PREFIX}mkdir.1 man/man1/${GNU_PROGRAM_PREFIX}mkfifo.1 man/man1/${GNU_PROGRAM_PREFIX}mknod.1 +man/man1/${GNU_PROGRAM_PREFIX}mktemp.1 man/man1/${GNU_PROGRAM_PREFIX}mv.1 man/man1/${GNU_PROGRAM_PREFIX}nice.1 man/man1/${GNU_PROGRAM_PREFIX}nl.1 @@ -155,6 +157,7 @@ man/man1/${GNU_PROGRAM_PREFIX}pwd.1 man/man1/${GNU_PROGRAM_PREFIX}readlink.1 man/man1/${GNU_PROGRAM_PREFIX}rm.1 man/man1/${GNU_PROGRAM_PREFIX}rmdir.1 +man/man1/${GNU_PROGRAM_PREFIX}runcon.1 man/man1/${GNU_PROGRAM_PREFIX}seq.1 man/man1/${GNU_PROGRAM_PREFIX}sha1sum.1 man/man1/${GNU_PROGRAM_PREFIX}sha224sum.1 @@ -168,7 +171,6 @@ man/man1/${GNU_PROGRAM_PREFIX}sort.1 man/man1/${GNU_PROGRAM_PREFIX}split.1 man/man1/${GNU_PROGRAM_PREFIX}stat.1 man/man1/${GNU_PROGRAM_PREFIX}stty.1 -man/man1/${GNU_PROGRAM_PREFIX}su.1 man/man1/${GNU_PROGRAM_PREFIX}sum.1 man/man1/${GNU_PROGRAM_PREFIX}sync.1 man/man1/${GNU_PROGRAM_PREFIX}tac.1 @@ -213,7 +215,6 @@ share/locale/ko/LC_MESSAGES/coreutils.mo share/locale/ms/LC_MESSAGES/coreutils.mo share/locale/nb/LC_MESSAGES/coreutils.mo share/locale/nl/LC_MESSAGES/coreutils.mo -share/locale/no/LC_MESSAGES/coreutils.mo share/locale/pl/LC_MESSAGES/coreutils.mo share/locale/pt/LC_MESSAGES/coreutils.mo share/locale/pt_BR/LC_MESSAGES/coreutils.mo @@ -223,6 +224,8 @@ share/locale/sk/LC_MESSAGES/coreutils.mo share/locale/sl/LC_MESSAGES/coreutils.mo share/locale/sv/LC_MESSAGES/coreutils.mo share/locale/tr/LC_MESSAGES/coreutils.mo +share/locale/uk/LC_MESSAGES/coreutils.mo +share/locale/vi/LC_MESSAGES/coreutils.mo share/locale/zh_CN/LC_MESSAGES/coreutils.mo share/locale/zh_TW/LC_MESSAGES/coreutils.mo share/locale/af/LC_TIME/coreutils.mo @@ -247,7 +250,6 @@ share/locale/ko/LC_TIME/coreutils.mo share/locale/ms/LC_TIME/coreutils.mo share/locale/nb/LC_TIME/coreutils.mo share/locale/nl/LC_TIME/coreutils.mo -share/locale/no/LC_TIME/coreutils.mo share/locale/pl/LC_TIME/coreutils.mo share/locale/pt/LC_TIME/coreutils.mo share/locale/pt_BR/LC_TIME/coreutils.mo @@ -257,5 +259,7 @@ share/locale/sk/LC_TIME/coreutils.mo share/locale/sl/LC_TIME/coreutils.mo share/locale/sv/LC_TIME/coreutils.mo share/locale/tr/LC_TIME/coreutils.mo +share/locale/uk/LC_TIME/coreutils.mo +share/locale/vi/LC_TIME/coreutils.mo share/locale/zh_CN/LC_TIME/coreutils.mo share/locale/zh_TW/LC_TIME/coreutils.mo diff --git a/sysutils/coreutils/distinfo b/sysutils/coreutils/distinfo index 16668d26e4e..6196ac55e41 100644 --- a/sysutils/coreutils/distinfo +++ b/sysutils/coreutils/distinfo @@ -1,11 +1,11 @@ -$NetBSD: distinfo,v 1.13 2007/12/02 12:55:10 wiz Exp $ +$NetBSD: distinfo,v 1.14 2008/03/08 01:06:52 tnn Exp $ -SHA1 (coreutils-6.9.tar.bz2) = 10310a78c4e1d9f742f3815ac28e9bf1086a5885 -RMD160 (coreutils-6.9.tar.bz2) = c6ae65204b2e9c234a1140f39a8be1ee5cdcaab7 -Size (coreutils-6.9.tar.bz2) = 5384378 bytes +SHA1 (coreutils-6.10.tar.gz) = f91f16e999dea6097bf555b467066ac931d584e4 +RMD160 (coreutils-6.10.tar.gz) = bddc507cd9bef5dc7f07c4c51518870b7ac6b3a9 +Size (coreutils-6.10.tar.gz) = 9193125 bytes SHA1 (patch-ab) = bc1e79814a6ebc177862eae1816a24e3a4a5c577 SHA1 (patch-ac) = 83e271d8da9d8d70e1f9eb34129d2cbf1cd352fc -SHA1 (patch-ad) = eb10a960047957b4142e06aff363cf35249df70c +SHA1 (patch-ad) = 145a88a6731fbec315037a140677f2fc763e5026 SHA1 (patch-ag) = 3e24b8e025a151eb7bed4c778a326da5eed09ded -SHA1 (patch-ah) = 3a101d45bb5fc502dd5402e0df587494d1844597 +SHA1 (patch-ah) = 33fe73aac79731f980fcbe1afda4c64537aff742 SHA1 (patch-ai) = 6b05293d6d151ca28ed897c47a1dad729306b770 diff --git a/sysutils/coreutils/patches/patch-ad b/sysutils/coreutils/patches/patch-ad index 7af0f00ac44..205f9c55a5d 100644 --- a/sysutils/coreutils/patches/patch-ad +++ b/sysutils/coreutils/patches/patch-ad @@ -1,8 +1,8 @@ -$NetBSD: patch-ad,v 1.2 2007/07/18 11:25:20 tnn Exp $ +$NetBSD: patch-ad,v 1.3 2008/03/08 01:06:52 tnn Exp $ ---- src/su.c.orig 2007-03-18 22:36:43.000000000 +0100 +--- src/su.c.orig 2007-11-25 14:23:31.000000000 +0100 +++ src/su.c -@@ -119,6 +119,12 @@ +@@ -118,6 +118,12 @@ /* The user to become if none is specified. */ #define DEFAULT_USER "root" @@ -15,7 +15,7 @@ $NetBSD: patch-ad,v 1.2 2007/07/18 11:25:20 tnn Exp $ char *crypt (); char *getusershell (); void endusershell (); -@@ -245,9 +251,13 @@ correct_password (const struct passwd *p +@@ -244,9 +250,13 @@ correct_password (const struct passwd *p error (0, 0, _("getpass: cannot open /dev/tty")); return false; } @@ -29,7 +29,7 @@ $NetBSD: patch-ad,v 1.2 2007/07/18 11:25:20 tnn Exp $ } /* Update `environ' for the new shell based on PW, with SHELL being -@@ -297,6 +307,9 @@ modify_environment (const struct passwd +@@ -296,6 +306,9 @@ modify_environment (const struct passwd static void change_identity (const struct passwd *pw) { @@ -39,10 +39,10 @@ $NetBSD: patch-ad,v 1.2 2007/07/18 11:25:20 tnn Exp $ #ifdef HAVE_INITGROUPS errno = 0; if (initgroups (pw->pw_name, pw->pw_gid) == -1) -@@ -307,6 +320,7 @@ change_identity (const struct passwd *pw - error (EXIT_FAIL, errno, _("cannot set group id")); +@@ -306,6 +319,7 @@ change_identity (const struct passwd *pw + error (EXIT_FAILURE, errno, _("cannot set group id")); if (setuid (pw->pw_uid)) - error (EXIT_FAIL, errno, _("cannot set user id")); + error (EXIT_FAILURE, errno, _("cannot set user id")); +#endif } diff --git a/sysutils/coreutils/patches/patch-ah b/sysutils/coreutils/patches/patch-ah index f255543bd0d..506d15db3a5 100644 --- a/sysutils/coreutils/patches/patch-ah +++ b/sysutils/coreutils/patches/patch-ah @@ -1,9 +1,9 @@ -$NetBSD: patch-ah,v 1.2 2007/07/18 11:25:21 tnn Exp $ +$NetBSD: patch-ah,v 1.3 2008/03/08 01:06:52 tnn Exp $ ---- src/df.c.orig 2007-03-18 22:36:43.000000000 +0100 +--- src/df.c.orig 2008-01-11 14:47:21.000000000 +0100 +++ src/df.c -@@ -943,8 +943,10 @@ main (int argc, char **argv) - _("%scannot read table of mounted file systems"), warning); +@@ -944,8 +944,10 @@ main (int argc, char **argv) + _("cannot read table of mounted file systems")); } +#if HAVE_SYNC |