diff options
| -rw-r--r-- | sys-apps/psmisc/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-apps/psmisc/Manifest | 20 | ||||
| -rw-r--r-- | sys-apps/psmisc/files/psmisc-21.2-no-nls.patch | 56 | ||||
| -rw-r--r-- | sys-apps/psmisc/files/psmisc-21.4-no-nls.patch | 71 | ||||
| -rw-r--r-- | sys-apps/psmisc/psmisc-21.2-r4.ebuild | 6 | ||||
| -rw-r--r-- | sys-apps/psmisc/psmisc-21.4.ebuild | 6 | ||||
| -rw-r--r-- | sys-apps/shadow/Manifest | 37 |
7 files changed, 170 insertions, 32 deletions
diff --git a/sys-apps/psmisc/ChangeLog b/sys-apps/psmisc/ChangeLog index 5b0c867bb4c3..ecf08951f3fb 100644 --- a/sys-apps/psmisc/ChangeLog +++ b/sys-apps/psmisc/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-apps/psmisc # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/psmisc/ChangeLog,v 1.35 2004/06/11 13:54:12 kloeri Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/psmisc/ChangeLog,v 1.36 2004/06/15 07:16:28 solar Exp $ + + 15 Jun 2004; <solar@gentoo.org> psmisc-21.2-r4.ebuild, psmisc-21.4.ebuild, + files/psmisc-21.2-no-nls.patch, files/psmisc-21.4-no-nls.patch: + added patch to allow the disabling of nls for psmisc 11 Jun 2004; Bryan Østergaard <kloeri@gentoo.org> psmisc-21.4.ebuild: Stable on alpha. diff --git a/sys-apps/psmisc/Manifest b/sys-apps/psmisc/Manifest index 3a07d91ee9a8..e9350916b5d5 100644 --- a/sys-apps/psmisc/Manifest +++ b/sys-apps/psmisc/Manifest @@ -1,12 +1,14 @@ +MD5 5c36f8fc5d72a5f77611f639c5b91c77 ChangeLog 4912 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164 -MD5 ffb45e09433aa9365af241edd95f9578 psmisc-21.2-r3.ebuild 1168 -MD5 d639137c32732ce9d6096dc8f6defaab ChangeLog 4714 -MD5 0467ad4c26a190dacdc36833c1f50178 psmisc-21.4.ebuild 1356 -MD5 6efde017510cd30ae697d11f8b66885c psmisc-21.2-r4.ebuild 1940 -MD5 5d788fbdf401f203822bee5d8dc8c504 files/psmisc-21.4-selinux.diff.bz2 7841 -MD5 c3fc900b7ebf1f4231b1ea416d908ce2 files/psmisc-21.2-fix-realloc.patch 368 +MD5 109d404ac943e3e91bfac7ede0fc5de5 psmisc-21.2-r3.ebuild 1167 +MD5 e13e1963af83ddd6634fd3a5bcfba7f9 psmisc-21.2-r4.ebuild 2019 +MD5 30064534a7df4442637b8fc4d5d6684b psmisc-21.4.ebuild 1432 +MD5 75e16053b4cd5c14c747413ee46dbaa1 files/psmisc-21.2-selinux.diff.bz2 10102 MD5 b3c372e1b1ef54a8798b8526a2aa92d1 files/psmisc-21.2-gcc33.patch 547 -MD5 b27975d795b1253e70ef1133dde797d0 files/digest-psmisc-21.4 63 -MD5 056073bdd75042db6a6484fab28f6210 files/digest-psmisc-21.2-r4 63 MD5 056073bdd75042db6a6484fab28f6210 files/digest-psmisc-21.2-r3 63 -MD5 75e16053b4cd5c14c747413ee46dbaa1 files/psmisc-21.2-selinux.diff.bz2 10102 +MD5 056073bdd75042db6a6484fab28f6210 files/digest-psmisc-21.2-r4 63 +MD5 c3fc900b7ebf1f4231b1ea416d908ce2 files/psmisc-21.2-fix-realloc.patch 368 +MD5 b27975d795b1253e70ef1133dde797d0 files/digest-psmisc-21.4 63 +MD5 5d788fbdf401f203822bee5d8dc8c504 files/psmisc-21.4-selinux.diff.bz2 7841 +MD5 06fa2daf8fe69cf2890ccd85ed77369a files/psmisc-21.2-no-nls.patch 1268 +MD5 329287c0414da4ba155403a97d65dbff files/psmisc-21.4-no-nls.patch 1594 diff --git a/sys-apps/psmisc/files/psmisc-21.2-no-nls.patch b/sys-apps/psmisc/files/psmisc-21.2-no-nls.patch new file mode 100644 index 000000000000..79292b40a5c6 --- /dev/null +++ b/sys-apps/psmisc/files/psmisc-21.2-no-nls.patch @@ -0,0 +1,56 @@ +--- src/fuser.c.nonls~ Fri Sep 27 12:58:54 2002 ++++ src/fuser.c Tue Jun 8 20:55:24 2004 +@@ -31,9 +31,13 @@ + #include <linux/kdev_t.h> /* for MKDEV */ + #include <linux/major.h> /* for LOOP_MAJOR */ + #endif ++#ifdef USE_NLS + #include <libintl.h> + #include <locale.h> + #define _(String) gettext (String) ++#else ++#define _(String) (String) ++#endif + + #include "comm.h" + #include "loop.h" /* for loop_info */ +@@ -981,9 +985,11 @@ + no_files = 1; + + /* Setup the i18n */ ++#ifdef USE_NLS + setlocale(LC_ALL, ""); + bindtextdomain(PACKAGE, LOCALEDIR); + textdomain(PACKAGE); ++#endif + + if (argc < 2) + usage (); +--- src/killall.c.nonls~ Tue Jun 8 20:52:00 2004 ++++ src/killall.c Tue Jun 8 20:55:24 2004 +@@ -24,9 +24,13 @@ + #include <fs_secure.h> + #include <ss.h> + #endif /*FLASK_LINUX*/ ++#ifdef USE_NLS + #include <libintl.h> + #include <locale.h> + #define _(String) gettext (String) ++#else ++#define _(String) (String) ++#endif + + #include "comm.h" + #include "signals.h" +@@ -461,9 +465,11 @@ + sig_num = SIGTERM; + + /* Setup the i18n */ ++#ifdef USE_NLS + setlocale(LC_ALL, ""); + bindtextdomain(PACKAGE, LOCALEDIR); + textdomain(PACKAGE); ++#endif + + opterr = 0; + while ( (optc = getopt_long_only(argc,argv,"egilqs:vwS:c:V",options,NULL)) != EOF) { diff --git a/sys-apps/psmisc/files/psmisc-21.4-no-nls.patch b/sys-apps/psmisc/files/psmisc-21.4-no-nls.patch new file mode 100644 index 000000000000..89546b3a072d --- /dev/null +++ b/sys-apps/psmisc/files/psmisc-21.4-no-nls.patch @@ -0,0 +1,71 @@ +--- src/fuser.c.mps 2004-06-08 18:21:33 +0200 ++++ src/fuser.c 2004-06-08 18:27:13 +0200 +@@ -31,9 +31,13 @@ + #include <linux/kdev_t.h> /* for MKDEV */ + #include <linux/major.h> /* for LOOP_MAJOR */ + #endif ++#ifdef USE_NLS + #include <libintl.h> + #include <locale.h> + #define _(String) gettext (String) ++#else ++#define _(String) (String) ++#endif + + #include "comm.h" + #include "loop.h" /* for loop_info */ +@@ -1007,9 +1011,11 @@ main (int argc, char **argv) + no_files = 1; + + /* Setup the i18n */ ++#ifdef USE_NLS + setlocale(LC_ALL, ""); + bindtextdomain(PACKAGE, LOCALEDIR); + textdomain(PACKAGE); ++#endif + + if (argc < 2) + usage (); +--- src/killall.c.mps 2004-06-08 18:21:38 +0200 ++++ src/killall.c 2004-06-08 18:26:51 +0200 +@@ -25,9 +25,13 @@ + #include <selinux/fs_secure.h> + #include <selinux/ss.h> + #endif /*FLASK_LINUX*/ ++#ifdef USE_NLS + #include <libintl.h> + #include <locale.h> + #define _(String) gettext (String) ++#else ++#define _(String) (String) ++#endif + + #include "comm.h" + #include "signals.h" +@@ -467,9 +471,11 @@ main (int argc, char **argv) + sig_num = SIGTERM; + + /* Setup the i18n */ ++#ifdef USE_NLS + setlocale(LC_ALL, ""); + bindtextdomain(PACKAGE, LOCALEDIR); + textdomain(PACKAGE); ++#endif + + opterr = 0; + #ifdef FLASK_LINUX +--- src/pstree.c.mps 2004-06-08 18:27:39 +0200 ++++ src/pstree.c 2004-06-08 18:28:03 +0200 +@@ -22,8 +22,12 @@ + #include <sys/types.h> + #include <sys/stat.h> + #include <sys/ioctl.h> ++#ifdef USE_NLS + #include <libintl.h> + #define _(String) gettext (String) ++#else ++#define _(String) (String) ++#endif + + #include "comm.h" + diff --git a/sys-apps/psmisc/psmisc-21.2-r4.ebuild b/sys-apps/psmisc/psmisc-21.2-r4.ebuild index c0e607de4899..a8915f28cb8f 100644 --- a/sys-apps/psmisc/psmisc-21.2-r4.ebuild +++ b/sys-apps/psmisc/psmisc-21.2-r4.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/psmisc/psmisc-21.2-r4.ebuild,v 1.15 2004/04/09 05:00:27 lv Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/psmisc/psmisc-21.2-r4.ebuild,v 1.16 2004/06/15 07:16:28 solar Exp $ inherit eutils gnuconfig @@ -16,7 +16,8 @@ KEYWORDS="x86 amd64 ppc sparc ~alpha hppa mips ia64 ppc64 s390" IUSE="nls selinux" DEPEND=">=sys-libs/ncurses-5.2-r2 - selinux? ( sys-libs/libselinux )" + selinux? ( sys-libs/libselinux ) + nls? ( sys-devel/gettext )" src_unpack() { unpack ${A} @@ -42,6 +43,7 @@ src_unpack() { # pointer that is used, thanks to bug submitted (bug #28234) by # Grant McDorman <grant.mcdorman@sympatico.ca>. epatch ${FILESDIR}/${P}-fix-realloc.patch + use nls || epatch ${FILESDIR}/${P}-no-nls.patch } src_compile() { diff --git a/sys-apps/psmisc/psmisc-21.4.ebuild b/sys-apps/psmisc/psmisc-21.4.ebuild index 47d213693b91..65a2768af50e 100644 --- a/sys-apps/psmisc/psmisc-21.4.ebuild +++ b/sys-apps/psmisc/psmisc-21.4.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/psmisc/psmisc-21.4.ebuild,v 1.7 2004/06/11 13:54:12 kloeri Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/psmisc/psmisc-21.4.ebuild,v 1.8 2004/06/15 07:16:28 solar Exp $ inherit eutils gnuconfig @@ -16,7 +16,8 @@ KEYWORDS="~x86 ~ppc ~sparc ~mips alpha arm hppa ~amd64 ~ia64 ~ppc64 s390" IUSE="nls selinux" DEPEND=">=sys-libs/ncurses-5.2-r2 - selinux? ( sys-libs/libselinux )" + selinux? ( sys-libs/libselinux ) + nls? ( sys-devel/gettext )" src_unpack() { unpack ${A} @@ -26,6 +27,7 @@ src_unpack() { # Necessary selinux patch epatch ${FILESDIR}/${SELINUX_PATCH} fi + use nls || epatch ${FILESDIR}/${P}-no-nls.patch } src_compile() { diff --git a/sys-apps/shadow/Manifest b/sys-apps/shadow/Manifest index c7feb0f38421..5fc22770cf08 100644 --- a/sys-apps/shadow/Manifest +++ b/sys-apps/shadow/Manifest @@ -1,31 +1,32 @@ +MD5 8e60aa145d0587f4a85ebcdc2150ff7a ChangeLog 11790 MD5 acd62ca53b03390252a3df9f13749c67 shadow-4.0.3-r9.ebuild 5813 -MD5 39a042e1783a4292797d3e13c5f163ac shadow-4.0.4.1-r1.ebuild 6108 -MD5 5bccf899001c00cafff96685e2617cd6 shadow-4.0.4.1.ebuild 5807 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164 MD5 079b89bf1aeffbd95a1241fa7d919335 shadow-4.0.3-r10.ebuild 5912 -MD5 1c08640c0261f382987352b640dfe972 ChangeLog 11608 -MD5 245b48df2df7337677cf1fbdf4425dbe shadow-4.0.4.1-r2.ebuild 5875 -MD5 cef6788bc7c8c5468c1b1f68df77ed9e files/digest-shadow-4.0.4.1-r1 67 -MD5 e70a5f61d37c3c67a4b860d8a6191dbc files/securetty 230 -MD5 13c8bec4c2cffb2d73c2f5aa01229d03 files/shadow-4.0.3-su-pam_open_session.patch-v2 4882 -MD5 5be850b601aabd73a43b1a3bbb893386 files/shadow-4.0.3-nologin-run-sh.patch 972 +MD5 5bccf899001c00cafff96685e2617cd6 shadow-4.0.4.1.ebuild 5807 +MD5 39a042e1783a4292797d3e13c5f163ac shadow-4.0.4.1-r1.ebuild 6108 +MD5 80d9080656514adced5db61792413519 shadow-4.0.4.1-r2.ebuild 5984 MD5 94728414b91e556a211379f6acc9b52d files/shadow-4.0.3-selinux.diff 3940 MD5 52fc2a150fc27350a5f9990e0007d064 files/digest-shadow-4.0.3-r9 65 -MD5 b8efca60a25e256eebe54c3d0db0760f files/shadow-4.0.4.1-gcc34-xmalloc.patch 361 -MD5 cef6788bc7c8c5468c1b1f68df77ed9e files/digest-shadow-4.0.4.1-r2 67 -MD5 201f1321262da41ccd1a0283216ae9a7 files/shadow-4.0.4.1-su-pam_open_session.patch 4886 -MD5 ab9789d22ebb1e74be504dcd71e23132 files/shadow-4.0.4.1-selinux.diff 3926 MD5 52fc2a150fc27350a5f9990e0007d064 files/digest-shadow-4.0.3-r10 65 +MD5 e70a5f61d37c3c67a4b860d8a6191dbc files/securetty 230 +MD5 5be850b601aabd73a43b1a3bbb893386 files/shadow-4.0.3-nologin-run-sh.patch 972 +MD5 13c8bec4c2cffb2d73c2f5aa01229d03 files/shadow-4.0.3-su-pam_open_session.patch-v2 4882 MD5 de1e23b4a7d38545475dffc3c9dc73a0 files/shadow-4.0.3-useradd-manpage-update.patch 804 -MD5 cef6788bc7c8c5468c1b1f68df77ed9e files/digest-shadow-4.0.4.1 67 MD5 6dfd34cef0901f49a1899aa59219bc8f files/shadow-4.0.3-shared-needs-pam.patch 646 -MD5 d0d7abec0c499ad20d2fbc865215c3e6 files/shadow-4.0.3-gcc34-xmalloc.patch 260 +MD5 cef6788bc7c8c5468c1b1f68df77ed9e files/digest-shadow-4.0.4.1 67 +MD5 ab9789d22ebb1e74be504dcd71e23132 files/shadow-4.0.4.1-selinux.diff 3926 +MD5 201f1321262da41ccd1a0283216ae9a7 files/shadow-4.0.4.1-su-pam_open_session.patch 4886 MD5 bb55107c3a9354ef2d1977547fdb5a83 files/shadow-4.0.4.1-useradd-manpage-update.patch 958 +MD5 d0d7abec0c499ad20d2fbc865215c3e6 files/shadow-4.0.3-gcc34-xmalloc.patch 260 +MD5 b8efca60a25e256eebe54c3d0db0760f files/shadow-4.0.4.1-gcc34-xmalloc.patch 361 +MD5 cef6788bc7c8c5468c1b1f68df77ed9e files/digest-shadow-4.0.4.1-r1 67 +MD5 cef6788bc7c8c5468c1b1f68df77ed9e files/digest-shadow-4.0.4.1-r2 67 +MD5 020e030c2d09b206e88cf9051ced6244 files/shadow-4.0.4.1-nonis.patch 1504 MD5 6e0bc0211949c624da0ea08d994a7038 files/default/useradd 96 -MD5 60d44a6f43aafcb9ca35858ab2534a49 files/pam.d/shadow 227 -MD5 0a8b62ed0426b607b92e275d63fa7cbf files/pam.d/su 1247 -MD5 1baa646400c4a596290e9d4b9e1c09b2 files/pam.d/system-auth-1.1 491 +MD5 51b0337bd261f6ed5e53af5dc196431a files/pam.d/system-auth 499 MD5 a5311bbc9c1fc378a6b0bfb3ca1b2394 files/pam.d/login 431 MD5 344d17a865edc40adebe07797853c839 files/pam.d/other 198 -MD5 51b0337bd261f6ed5e53af5dc196431a files/pam.d/system-auth 499 MD5 a1c7fb84c2dc309db86ba7b8d3dfae76 files/pam.d/passwd 214 +MD5 60d44a6f43aafcb9ca35858ab2534a49 files/pam.d/shadow 227 +MD5 0a8b62ed0426b607b92e275d63fa7cbf files/pam.d/su 1247 +MD5 1baa646400c4a596290e9d4b9e1c09b2 files/pam.d/system-auth-1.1 491 |