Fix compiling with gcc-2.95.x

(Portage version: 2.0.51.22-r2)

4 files changed, 94 insertions, 66 deletions

diff --git a/sys-apps/shadow/ChangeLog b/sys-apps/shadow/ChangeLog
index 27ca49726d7a..fe45ba40b403 100644
--- a/sys-apps/shadow/ChangeLog
+++ b/sys-apps/shadow/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-apps/shadow
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/shadow/ChangeLog,v 1.120 2005/08/23 01:44:11 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/shadow/ChangeLog,v 1.121 2005/08/24 11:33:18 azarah Exp $
+
+  24 Aug 2005; Martin Schlemmer <azarah@gentoo.org>
+  +files/shadow-4.0.12-gcc2.patch, shadow-4.0.12.ebuild:
+  Fix compiling with gcc-2.95.x
 
 *shadow-4.0.12 (23 Aug 2005)
 
diff --git a/sys-apps/shadow/Manifest b/sys-apps/shadow/Manifest
index 7ba52326597d..9a64a9c9d1e8 100644
--- a/sys-apps/shadow/Manifest
+++ b/sys-apps/shadow/Manifest
@@ -1,87 +1,78 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 41c23ed0904ed9071c85d13aa76d0a42 shadow-4.0.7-r1.ebuild 6582
 MD5 69b75fc8b3df89e5da434f35f6db5e31 shadow-4.0.5-r3.ebuild 5616
-MD5 5946e4282004a450086ec4f043530cfb shadow-4.0.7-r4.ebuild 7187
-MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
-MD5 4689e675338a28ed3c6fdda0de327970 shadow-4.0.12.ebuild 7030
-MD5 711f9b8bb5dde9d72417d26fa8f1f8b6 shadow-4.0.7-r3.ebuild 7054
+MD5 dd33182f75e512eacdf6652e505359eb shadow-4.0.4.1-r4.ebuild 5963
 MD5 314bf4f7ce691287c74208fe9719f146 shadow-4.0.7.ebuild 5582
-MD5 a0d8e3f6fb0895bc2cc023898a48e81c shadow-4.0.6-r1.ebuild 5621
-MD5 75f60cacddf580b22250ec244749116c shadow-4.0.11.1-r2.ebuild 7215
-MD5 bbedc15fb467b91796456cd032199535 shadow-4.0.5-r2.ebuild 5443
+MD5 711f9b8bb5dde9d72417d26fa8f1f8b6 shadow-4.0.7-r3.ebuild 7054
+MD5 5946e4282004a450086ec4f043530cfb shadow-4.0.7-r4.ebuild 7187
 MD5 14251ed7e3cf0063e3d5cb3dd6c4a83e ChangeLog 22490
-MD5 dd33182f75e512eacdf6652e505359eb shadow-4.0.4.1-r4.ebuild 5963
+MD5 2fd1c6e370dce9fdb6b99f428e5406b1 shadow-4.0.12.ebuild 7110
 MD5 30c0eb4f3ffb1e531659cf9b69cffa14 shadow-4.0.11.1-r1.ebuild 7084
-MD5 e32464f2df5a85f4f6c67bc78e9a23d1 files/shadow-4.0.7-nscd-socket-path.patch 1081
+MD5 41c23ed0904ed9071c85d13aa76d0a42 shadow-4.0.7-r1.ebuild 6582
+MD5 bbedc15fb467b91796456cd032199535 shadow-4.0.5-r2.ebuild 5443
+MD5 a0d8e3f6fb0895bc2cc023898a48e81c shadow-4.0.6-r1.ebuild 5621
+MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
+MD5 75f60cacddf580b22250ec244749116c shadow-4.0.11.1-r2.ebuild 7215
 MD5 20fd2dc35b8671b91e120b90281b4cf3 files/shadow-4.0.5-hack-X-envvars.patch 521
+MD5 d06833980d79d4f001b6064a3f52f938 files/shadow-4.0.7-iswheel.patch 416
+MD5 70b7c7f1725841e335e5f2361fc9ebab files/shadow-4.0.7-nscd-EPIPE-failure.patch 947
+MD5 d14e133da535d64d1b397784e17c213a files/shadow-4.0.5-login.defs.patch 766
+MD5 b4d0fc0f54800978591791493d6b2ec3 files/shadow-4.0.6-dots-in-usernames.patch 1993
+MD5 46c2be2ed8b26ec007e3ed1f476491d8 files/digest-shadow-4.0.7-r4 66
+MD5 46c2be2ed8b26ec007e3ed1f476491d8 files/digest-shadow-4.0.7-r3 66
+MD5 44f064b586ea49c8e2dc1fca8b9e4599 files/shadow-4.0.11.1-SUPATH.patch 1614
+MD5 6355d65b618395c4adf46f733269546c files/shadow-4.0.10-dots-in-usernames.patch 1894
+MD5 e1c86a7766f97cff8d5196821b6b1913 files/shadow-4.0.12-gcc2.patch 962
+MD5 cec3e64e953a7f3f96a1e89d73b62899 files/digest-shadow-4.0.12 67
+MD5 d8b8542a7bc013011a293732ca504a50 files/digest-shadow-4.0.5-r2 66
+MD5 450a2289f2a383296ad9af005e46da74 files/shadow-4.0.11.1-ngettext.patch 1038
+MD5 c5e9081ed43837797e2f1617b7ce1c24 files/shadow-4.0.5-fix-adding-of-pam_env-set-env-vars.patch 285
+MD5 c87c0968ace90b32753b91f93ad7bab1 files/shadow-4.0.11.1-uclibc-missing-l64a.patch 1269
+MD5 391991f50203bd8b7738474051befdee files/shadow-4.0.5-remove-else.patch 531
+MD5 ae5d078bc6b651b5f081dcfc64b5df69 files/shadow-4.0.11.1-perms.patch 1659
+MD5 e32464f2df5a85f4f6c67bc78e9a23d1 files/shadow-4.0.7-nscd-socket-path.patch 1081
+MD5 aaf16ddabef285df169e37254b13561c files/shadow-4.0.4.1-selinux.diff 4296
+MD5 fda41657b856ffaeec5a2734b312409b files/shadow-4.0.5-fix-mail-configure.patch 5452
+MD5 e9ac6a566b65499773437ce98911a046 files/digest-shadow-4.0.6-r1 66
+MD5 201f1321262da41ccd1a0283216ae9a7 files/shadow-4.0.4.1-su-pam_open_session.patch 4886
+MD5 46c2be2ed8b26ec007e3ed1f476491d8 files/digest-shadow-4.0.7 66
+MD5 c31db5c71b0cdfca75346abc2887aa02 files/shadow-4.0.5-nls-manpages.patch 362
+MD5 aaedecd7edcccff66f962fd82928eec9 files/shadow-4.0.10-long-groupnames.patch 1205
+MD5 a99f871c88548d503bad935d2aa6f412 files/shadow-4.0.4.1-nls-manpages.patch 355
+MD5 d8b8542a7bc013011a293732ca504a50 files/digest-shadow-4.0.5-r3 66
 MD5 8bf11ce0e8ee683fe290462473871dab files/shadow-4.0.6-long-groupnames.patch 1625
-MD5 b52179dd78e6b6d207600184022114db files/shadow-4.0.12-dots-in-usernames.patch 1466
+MD5 a744152ec905f4c06f3b92142b7fec8a files/securetty 253
 MD5 020e030c2d09b206e88cf9051ced6244 files/shadow-4.0.4.1-nonis.patch 1504
-MD5 aaf16ddabef285df169e37254b13561c files/shadow-4.0.4.1-selinux.diff 4296
-MD5 c5e9081ed43837797e2f1617b7ce1c24 files/shadow-4.0.5-fix-adding-of-pam_env-set-env-vars.patch 285
-MD5 450a2289f2a383296ad9af005e46da74 files/shadow-4.0.11.1-ngettext.patch 1038
-MD5 7becc41b4f7264483ee3ff0ca8277084 files/shadow-4.0.4.1-passwd-typo.patch 438
+MD5 bb55107c3a9354ef2d1977547fdb5a83 files/shadow-4.0.4.1-useradd-manpage-update.patch 958
 MD5 f9846ea2aeefba54443ef5d6796f0bbc files/shadow-4.0.10-nls-manpages.patch 367
+MD5 46c2be2ed8b26ec007e3ed1f476491d8 files/digest-shadow-4.0.7-r1 66
+MD5 058f760e522ab65e270293003805fe61 files/shadow-4.0.4.1-userdel-missing-brackets.patch 380
 MD5 b8efca60a25e256eebe54c3d0db0760f files/shadow-4.0.4.1-gcc34-xmalloc.patch 361
-MD5 cec3e64e953a7f3f96a1e89d73b62899 files/digest-shadow-4.0.12 67
+MD5 9375147f78a25196b654616c969af9a5 files/digest-shadow-4.0.11.1-r2 69
+MD5 804242385ef14139f4b46167396f26f8 files/shadow-4.0.12-long-groupnames.patch 923
 MD5 90e2ab53494f677dc23b5137d6e39110 files/shadow-4.0.6-fix-configure.patch 3047
-MD5 13cddd2e24cbcaf5164e13f9105c222c files/shadow-4.0.7-perms.patch 1768
-MD5 46c2be2ed8b26ec007e3ed1f476491d8 files/digest-shadow-4.0.7-r1 66
-MD5 44f064b586ea49c8e2dc1fca8b9e4599 files/shadow-4.0.11.1-SUPATH.patch 1614
+MD5 636f233fa173a998195016c3808173d4 files/shadow-4.0.5-skey.patch 395
+MD5 b52179dd78e6b6d207600184022114db files/shadow-4.0.12-dots-in-usernames.patch 1466
 MD5 fdb23bff28b70bd53f200379c33dd27c files/shadow-4.0.10-nonis.patch 1434
-MD5 cef6788bc7c8c5468c1b1f68df77ed9e files/digest-shadow-4.0.4.1-r4 67
-MD5 a99f871c88548d503bad935d2aa6f412 files/shadow-4.0.4.1-nls-manpages.patch 355
 MD5 f4ae7cde924d5d91ce4010760439b836 files/shadow-4.0.11.1-su-fix-environment.patch 966
-MD5 46c2be2ed8b26ec007e3ed1f476491d8 files/digest-shadow-4.0.7-r4 66
-MD5 d14e133da535d64d1b397784e17c213a files/shadow-4.0.5-login.defs.patch 766
-MD5 058f760e522ab65e270293003805fe61 files/shadow-4.0.4.1-userdel-missing-brackets.patch 380
-MD5 aaedecd7edcccff66f962fd82928eec9 files/shadow-4.0.10-long-groupnames.patch 1205
-MD5 a744152ec905f4c06f3b92142b7fec8a files/securetty 253
-MD5 b4d0fc0f54800978591791493d6b2ec3 files/shadow-4.0.6-dots-in-usernames.patch 1993
-MD5 bb55107c3a9354ef2d1977547fdb5a83 files/shadow-4.0.4.1-useradd-manpage-update.patch 958
-MD5 e9ac6a566b65499773437ce98911a046 files/digest-shadow-4.0.6-r1 66
-MD5 c87c0968ace90b32753b91f93ad7bab1 files/shadow-4.0.11.1-uclibc-missing-l64a.patch 1269
-MD5 d8b8542a7bc013011a293732ca504a50 files/digest-shadow-4.0.5-r2 66
-MD5 201f1321262da41ccd1a0283216ae9a7 files/shadow-4.0.4.1-su-pam_open_session.patch 4886
+MD5 13cddd2e24cbcaf5164e13f9105c222c files/shadow-4.0.7-perms.patch 1768
+MD5 cef6788bc7c8c5468c1b1f68df77ed9e files/digest-shadow-4.0.4.1-r4 67
+MD5 95f7b8980169e81352229bd548909ea7 files/shadow-4.0.10-fix-configure.patch 579
 MD5 d15398f7d8c06b906abdf73ae3a55f54 files/shadow-4.0.6-manpages.patch 564
-MD5 636f233fa173a998195016c3808173d4 files/shadow-4.0.5-skey.patch 395
-MD5 d8b8542a7bc013011a293732ca504a50 files/digest-shadow-4.0.5-r3 66
-MD5 391991f50203bd8b7738474051befdee files/shadow-4.0.5-remove-else.patch 531
-MD5 ae5d078bc6b651b5f081dcfc64b5df69 files/shadow-4.0.11.1-perms.patch 1659
-MD5 c31db5c71b0cdfca75346abc2887aa02 files/shadow-4.0.5-nls-manpages.patch 362
-MD5 6355d65b618395c4adf46f733269546c files/shadow-4.0.10-dots-in-usernames.patch 1894
-MD5 804242385ef14139f4b46167396f26f8 files/shadow-4.0.12-long-groupnames.patch 923
-MD5 fda41657b856ffaeec5a2734b312409b files/shadow-4.0.5-fix-mail-configure.patch 5452
-MD5 70b7c7f1725841e335e5f2361fc9ebab files/shadow-4.0.7-nscd-EPIPE-failure.patch 947
-MD5 d06833980d79d4f001b6064a3f52f938 files/shadow-4.0.7-iswheel.patch 416
 MD5 a63ee37286c486567191c7c6b24432e2 files/shadow-4.0.7-lastlog.patch 455
-MD5 95f7b8980169e81352229bd548909ea7 files/shadow-4.0.10-fix-configure.patch 579
-MD5 9375147f78a25196b654616c969af9a5 files/digest-shadow-4.0.11.1-r2 69
+MD5 7becc41b4f7264483ee3ff0ca8277084 files/shadow-4.0.4.1-passwd-typo.patch 438
 MD5 9375147f78a25196b654616c969af9a5 files/digest-shadow-4.0.11.1-r1 69
-MD5 46c2be2ed8b26ec007e3ed1f476491d8 files/digest-shadow-4.0.7-r3 66
-MD5 46c2be2ed8b26ec007e3ed1f476491d8 files/digest-shadow-4.0.7 66
-MD5 6e0bc0211949c624da0ea08d994a7038 files/default/useradd 96
-MD5 4b7d75b12f1bea9f349dff4c48c18b8b files/pam.d-include/login 245
-MD5 97b4f01b65fd3b8caa8983489e9b6848 files/pam.d-include/su 1059
 MD5 33d9efd092b6999143ea42c99a59bfb1 files/pam.d-include/system-auth-1.1 365
 MD5 e3a7d5b7abee1ba6e7f09ee607da87ba files/pam.d-include/su-openpam 249
-MD5 5df27e06de913de76e24790642eecfd2 files/pam.d-include/passwd 104
-MD5 5bff4f2134b72dabc4afa5bb296e874d files/pam.d-include/other 142
 MD5 caa5f36d54cb7a75ce5728f7f1badafb files/pam.d-include/system-auth 380
+MD5 4b7d75b12f1bea9f349dff4c48c18b8b files/pam.d-include/login 245
+MD5 97b4f01b65fd3b8caa8983489e9b6848 files/pam.d-include/su 1059
 MD5 50d7c96eab701fd6ddbf4b283e493b4c files/pam.d-include/shadow 152
+MD5 5df27e06de913de76e24790642eecfd2 files/pam.d-include/passwd 104
+MD5 5bff4f2134b72dabc4afa5bb296e874d files/pam.d-include/other 142
+MD5 6e0bc0211949c624da0ea08d994a7038 files/default/useradd 96
+MD5 33d9efd092b6999143ea42c99a59bfb1 files/pam.d/system-auth-1.1 365
+MD5 deed69f8fa52ca844f3669414bd5cf01 files/pam.d/system-auth 373
 MD5 987d0bd2e5dd1f96dc28ae2963054022 files/pam.d/login 333
 MD5 a1fc81dbd0d41face776fba4ca929d8f files/pam.d/su 1142
-MD5 33d9efd092b6999143ea42c99a59bfb1 files/pam.d/system-auth-1.1 365
+MD5 a5721c39446539b751dceae4b054542b files/pam.d/shadow 171
 MD5 8a59937d720a19824db6e4a8cd173a4b files/pam.d/passwd 172
 MD5 5bff4f2134b72dabc4afa5bb296e874d files/pam.d/other 142
-MD5 deed69f8fa52ca844f3669414bd5cf01 files/pam.d/system-auth 373
-MD5 a5721c39446539b751dceae4b054542b files/pam.d/shadow 171
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDC8CSgIKl8Uu19MoRAk66AJ9aCBeayOpkoRHG8IyGTMQ/V5xXsACeNi4j
-i9TX1we/Qk+QhATpr23QLmc=
-=Wjf4
------END PGP SIGNATURE-----
diff --git a/sys-apps/shadow/files/shadow-4.0.12-gcc2.patch b/sys-apps/shadow/files/shadow-4.0.12-gcc2.patch
new file mode 100644
index 000000000000..b70dbceffc56
--- /dev/null
+++ b/sys-apps/shadow/files/shadow-4.0.12-gcc2.patch
@@ -0,0 +1,30 @@
+Fix compiling with gcc-2.95.x:
+
+-----
+newgrp.c: In function `main':
+newgrp.c:459: parse error before `child'
+newgrp.c:467: `child' undeclared (first use in this function)
+newgrp.c:467: (Each undeclared identifier is reported only once
+newgrp.c:467: for each function it appears in.)
+newgrp.c:476: `pid' undeclared (first use in this function)
+make[2]: *** [newgrp.o] Error 1
+-----
+
+--- shadow-4.0.12/src/newgrp.c	2005-08-24 13:30:51.000000000 +0200
++++ shadow-4.0.12.az/src/newgrp.c	2005-08-24 13:31:01.000000000 +0200
+@@ -424,6 +424,7 @@
+ 	if (getdef_bool ("SYSLOG_SG_ENAB")) {
+ 		char *loginname = getlogin ();
+ 		char *tty = ttyname (0);
++		pid_t child, pid;
+ 
+ 		if (loginname != NULL)
+ 			loginname = xstrdup (loginname);
+@@ -456,7 +457,6 @@
+ 		 * avoid any possibility of the parent being stopped when it
+ 		 * receives SIGCHLD from the terminating subshell.  -- JWP
+ 		 */
+-		pid_t child, pid;
+ 
+ 		signal (SIGINT, SIG_IGN);
+ 		signal (SIGQUIT, SIG_IGN);
diff --git a/sys-apps/shadow/shadow-4.0.12.ebuild b/sys-apps/shadow/shadow-4.0.12.ebuild
index 258d353e24b0..2b3783e95642 100644
--- a/sys-apps/shadow/shadow-4.0.12.ebuild
+++ b/sys-apps/shadow/shadow-4.0.12.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/shadow/shadow-4.0.12.ebuild,v 1.2 2005/08/24 00:33:34 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/shadow/shadow-4.0.12.ebuild,v 1.3 2005/08/24 11:33:19 azarah Exp $
 
 inherit eutils libtool toolchain-funcs flag-o-matic
 
@@ -55,6 +55,9 @@ src_unpack() {
 	epatch "${FILESDIR}"/${PN}-4.0.12-dots-in-usernames.patch
 	epatch "${FILESDIR}"/${PN}-4.0.12-long-groupnames.patch
 
+	# Fix compiling with gcc-2.95.x
+	epatch "${FILESDIR}"/${PN}-4.0.12-gcc2.patch
+
 	# Patch from upstream enables the new environment too early for PAM
 	epatch "${FILESDIR}"/${PN}-4.0.11.1-su-fix-environment.patch