diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/debianutils/ChangeLog b/sdk_container/src/third_party/coreos-overlay/sys-apps/debianutils/ChangeLog deleted file mode 100644 index 0df29b8a07..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/debianutils/ChangeLog +++ /dev/null @@ -1,595 +0,0 @@ -# ChangeLog for sys-apps/debianutils -# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/debianutils/ChangeLog,v 1.138 2009/08/14 13:59:29 jer Exp $ - - 14 Aug 2009; Jeroen Roovers - -files/debianutils-2.16.2-palo.patch, - -files/debianutils-2.28.2-mkboot-quiet.patch, - -files/debianutils-2.28.2-no-bs-namespace.patch, - -debianutils-2.28.5.ebuild, -debianutils-2.29.ebuild, - -debianutils-2.30.ebuild, -debianutils-2.31.ebuild, - -debianutils-3.0.1.ebuild, -debianutils-3.0.2.ebuild, - -debianutils-3.1.ebuild, -debianutils-3.1.1.ebuild: - Remove old. - -*debianutils-3.2.1-r1 (11 Aug 2009) - - 11 Aug 2009; Jeroen Roovers -debianutils-3.2.1.ebuild, - +debianutils-3.2.1-r1.ebuild, - +files/debianutils-3.2.1-no-bs-namespace.patch: - Redo the namespace patch. - -*debianutils-3.2.1 (11 Aug 2009) - - 11 Aug 2009; Jeroen Roovers +debianutils-3.2.1.ebuild: - Version bump. - - 13 Jul 2009; Joseph Jezak debianutils-3.1.3.ebuild: - Marked ppc stable for bug #273060. - -*debianutils-3.2 (05 Jul 2009) - - 05 Jul 2009; Jeroen Roovers +debianutils-3.2.ebuild: - Version bump. - - 24 Jun 2009; Raúl Porcel debianutils-3.1.3.ebuild: - alpha/arm/ia64/m68k/s390/sh/sparc stable wrt #273060 - - 19 Jun 2009; Brent Baude debianutils-3.1.3.ebuild: - stable ppc64, bug 273060 - - 16 Jun 2009; Tobias Klausmann - debianutils-3.1.3.ebuild: - Stable on alpha, bug #273060 - - 10 Jun 2009; Markus Meier debianutils-3.1.3.ebuild: - amd64/x86 stable, bug #273060 - - 09 Jun 2009; Jeroen Roovers -debianutils-2.28.2.ebuild, - -debianutils-2.28.4.ebuild: - Remove old. - - 09 Jun 2009; Jeroen Roovers debianutils-3.1.3.ebuild: - Stable for HPPA (bug #273060). - -*debianutils-3.1.3 (06 May 2009) - - 06 May 2009; Jeroen Roovers +debianutils-3.1.3.ebuild: - Version bump. - -*debianutils-3.1.1 (03 May 2009) - - 03 May 2009; Jeroen Roovers +debianutils-3.1.1.ebuild: - Version bump. - -*debianutils-3.1 (02 May 2009) - - 02 May 2009; Jeroen Roovers +debianutils-3.1.ebuild: - Version bump. - -*debianutils-3.0.2 (02 May 2009) - - 02 May 2009; Jeroen Roovers debianutils-3.0.1.ebuild, - +debianutils-3.0.2.ebuild: - Version bump. Remove commented epatches. - -*debianutils-3.0.1 (01 May 2009) - - 01 May 2009; Jeroen Roovers +debianutils-3.0.1.ebuild: - Version bump. - - 18 Mar 2009; Brent Baude debianutils-2.28.5.ebuild: - stable ppc, bug 260463 - -*debianutils-2.31 (14 Mar 2009) - - 14 Mar 2009; Mike Frysinger - +files/debianutils-2.31-no-bs-namespace.patch, +debianutils-2.31.ebuild: - Version bump #259496 by Raúl Porcel. - - 07 Mar 2009; Jeremy Olexa debianutils-2.28.5.ebuild: - amd64 stable, bug 260463 - - 27 Feb 2009; Brent Baude debianutils-2.28.5.ebuild: - stable ppc64, bug 260463 - - 08 Aug 2008; Jeroen Roovers debianutils-2.28.2.ebuild, - debianutils-2.28.4.ebuild, debianutils-2.28.5.ebuild, - debianutils-2.29.ebuild, debianutils-2.30.ebuild: - Add SMAIL license (bug #176006). - -*debianutils-2.30 (08 Aug 2008) - - 08 Aug 2008; Jeroen Roovers +debianutils-2.30.ebuild: - Version bump. - - 10 Jul 2008; Jeroen Roovers debianutils-2.28.5.ebuild: - Stable for HPPA too. - -*debianutils-2.29 (19 Jun 2008) - - 19 Jun 2008; Mike Frysinger +debianutils-2.29.ebuild: - Version bumps #228015. - - 17 Jun 2008; Raúl Porcel debianutils-2.28.5.ebuild: - alpha/ia64/sparc/x86 stable - - 17 Jun 2008; Alexis Ballier - debianutils-2.28.5.ebuild: - keyword ~sparc-fbsd - - 16 Jun 2008; Alexis Ballier - debianutils-2.28.5.ebuild: - keyword ~x86-fbsd - - 16 Jun 2008; Alexis Ballier - debianutils-2.28.5.ebuild: - fix deps on fbsd wrt mktemp - - 16 Jun 2008; Alexis Ballier - debianutils-2.28.5.ebuild: - bind installkernel and mkboot to kernel_linux useflag as discussed on bug - #225759 - -*debianutils-2.28.5 (05 May 2008) - - 05 May 2008; Mike Frysinger - +debianutils-2.28.5.ebuild: - Version bump #219496 by Conrad Kostecki. - -*debianutils-2.28.4 (13 Apr 2008) - - 13 Apr 2008; Mike Frysinger - +debianutils-2.28.4.ebuild: - Version bump #217431 by Arfrever Frehtes Taifersar Arahesis. - - 16 Mar 2008; nixnut debianutils-2.28.2.ebuild: - Stable on ppc wrt bug 213591 - - 07 Feb 2008; Samuli Suominen debianutils-2.28.2.ebuild: - amd64 stable - - 05 Feb 2008; Markus Rothe debianutils-2.28.2.ebuild: - Stable on ppc64 - - 04 Feb 2008; Jeroen Roovers debianutils-2.28.2.ebuild: - Stable for HPPA too. - - 04 Feb 2008; Mike Frysinger - +files/debianutils-2.28.2-mkboot-quiet.patch, debianutils-2.28.2.ebuild: - Send which error output to /dev/null. - - 23 Jan 2008; Mike Frysinger debianutils-2.25.ebuild, - debianutils-2.28.2.ebuild: - Pull in either mktemp or latest coreutils for the mktemp binary. - - 21 Jan 2008; Raúl Porcel debianutils-2.28.2.ebuild: - alpha/ia64/sparc/x86 stable - - 21 Dec 2007; Tobias Scherbaum - debianutils-2.25.ebuild: - ppc stable - -*debianutils-2.28.2 (21 Dec 2007) - - 21 Dec 2007; Doug Klima - -files/debianutils-2.15-palo.patch, - +files/debianutils-2.28.2-no-bs-namespace.patch, - -debianutils-2.18.1.ebuild, -debianutils-2.21.ebuild, - -debianutils-2.22.1.ebuild, -debianutils-2.23.1.ebuild, - +debianutils-2.28.2.ebuild: - remove old versions. version bump for bug #194523 - - 21 Dec 2007; Doug Klima debianutils-2.25.ebuild: - amd64 stable - - 01 Dec 2007; Markus Rothe debianutils-2.25.ebuild: - Stable on ppc64 - - 19 Nov 2007; Joshua Kinard debianutils-2.25.ebuild: - Stable on mips. - - 08 Nov 2007; Jeroen Roovers debianutils-2.25.ebuild: - Stable for HPPA too. - - 07 Nov 2007; Raúl Porcel debianutils-2.25.ebuild: - alpha/ia64/sparc/x86 stable - - 15 Oct 2007; Markus Rothe debianutils-2.23.1.ebuild: - Stable on ppc64 - - 01 Oct 2007; Christian Birchinger - debianutils-2.23.1.ebuild: - Added sparc stable keyword - -*debianutils-2.25 (29 Sep 2007) - - 29 Sep 2007; Mike Frysinger +debianutils-2.25.ebuild: - Version bump #194005. - - 28 Sep 2007; Joshua Kinard debianutils-2.23.1.ebuild: - Stable on mips. - - 18 Sep 2007; Raúl Porcel debianutils-2.23.1.ebuild: - alpha/ia64/x86 stable - -*debianutils-2.23.1 (17 Aug 2007) - - 17 Aug 2007; Mike Frysinger - +debianutils-2.23.1.ebuild: - Version bump. - - 13 Aug 2007; Gustavo Zacarias - debianutils-2.22.1.ebuild: - Stable on sparc - - 12 Aug 2007; Tom Gall debianutils-2.22.1.ebuild: - stable on ppc64 - - 10 Aug 2007; Raúl Porcel debianutils-2.22.1.ebuild: - alpha/ia64/x86 stable - -*debianutils-2.22.1 (09 Jul 2007) - - 09 Jul 2007; Mike Frysinger - +debianutils-2.22.1.ebuild: - Version bump #184629. - - 17 Jun 2007; Christoph Mende - debianutils-2.17.5.ebuild: - Stable on amd64 wrt bug 181258 - - 17 Jun 2007; Raúl Porcel debianutils-2.17.5.ebuild: - alpha stable wrt #182280 - - 17 Jun 2007; Markus Rothe debianutils-2.17.5.ebuild: - Stable on ppc64; bug #182280 - - 17 Jun 2007; Tobias Scherbaum - debianutils-2.17.5.ebuild: - ppc stable, bug #182280 - -*debianutils-2.21 (16 Jun 2007) - - 16 Jun 2007; Mike Frysinger +debianutils-2.21.ebuild: - Version bump #181905 by Raul Porcel. - - 23 May 2007; Gustavo Zacarias - debianutils-2.17.5.ebuild: - Stable on sparc - -*debianutils-2.18.1 (16 May 2007) - - 16 May 2007; Roy Marples +debianutils-2.18.1.ebuild: - New version, fixes #177576. - - 05 May 2007; Raúl Porcel debianutils-2.18.ebuild: - Back to ~arch - -*debianutils-2.18 (05 May 2007) - - 05 May 2007; Mike Frysinger +debianutils-2.18.ebuild: - Version bump #175706 by Raul Porcel. - - 24 Apr 2007; Alexander Færøy - debianutils-2.17.5.ebuild: - Stable on MIPS. - - 23 Apr 2007; Raúl Porcel debianutils-2.17.5.ebuild: - ia64 + x86 stable - - 25 Mar 2007; Jose Luis Rivero - debianutils-2.17.4.ebuild: - Stable on alpha wrt bug #169082 - - 18 Mar 2007; nixnut debianutils-2.17.4.ebuild: - Stable on ppc wrt bug 169082 - - 17 Mar 2007; Steve Dibb debianutils-2.17.4.ebuild: - amd64 stable, bug 169082 - - 07 Mar 2007; Alexander H. Færøy - debianutils-2.17.4.ebuild: - Stable on MIPS; bug #169082 - - 06 Mar 2007; Gustavo Zacarias - debianutils-2.17.4.ebuild: - Stable on sparc wrt #169082 - - 06 Mar 2007; Markus Rothe debianutils-2.17.4.ebuild: - Stable on ppc64; bug #169082 - - 04 Mar 2007; Jeroen Roovers debianutils-2.17.4.ebuild: - Stable for HPPA (bug #169082). - - 03 Mar 2007; Raúl Porcel debianutils-2.17.4.ebuild: - x86 stable wrt bug 169082 - -*debianutils-2.17.5 (03 Mar 2007) - - 03 Mar 2007; Mike Frysinger - +debianutils-2.17.5.ebuild: - Version bump #168818 by teidakankan. - -*debianutils-2.17.4 (07 Dec 2006) - - 07 Dec 2006; Mike Frysinger - +debianutils-2.17.4.ebuild: - Version bump. - -*debianutils-2.17.1 (15 Sep 2006) - - 15 Sep 2006; Mike Frysinger - +debianutils-2.17.1.ebuild: - Version bump #147540 by Raul Porcel. - -*debianutils-2.16.2 (06 Jul 2006) - - 06 Jul 2006; Mike Frysinger - +files/debianutils-2.16.2-palo.patch, +debianutils-2.16.2.ebuild: - Version bump. - - 29 Apr 2006; Joshua Kinard debianutils-2.15.ebuild: - Marked stable on mips. - - 22 Apr 2006; Fabian Groffen debianutils-2.15.ebuild: - Marked ppc-macos stable (bug #127975) - -*debianutils-2.15-r1 (15 Apr 2006) - - 15 Apr 2006; Jeroen Roovers - +files/debianutils-2.15-palo.patch, +debianutils-2.15-r1.ebuild: - mkboot: fix the shebang, the notice about the -i option and the palo test/run - - 02 Apr 2006; Bryan Østergaard - debianutils-2.15.ebuild: - Drop ~x86-fbsd, was taken out of an overlay. - - 30 Mar 2006; Gustavo Zacarias - debianutils-2.15.ebuild: - Stable on sparc wrt #127975 - - 30 Mar 2006; Diego Pettenò - debianutils-2.15.ebuild: - Add ~x86-fbsd keyword. - - 30 Mar 2006; Chris White debianutils-2.15.ebuild: - debianutils-2.15 x86 stable bug #127975. - - 30 Mar 2006; Marcus D. Hanwell debianutils-2.15.ebuild: - Stable on amd64, bug 127975. - - 29 Mar 2006; Markus Rothe debianutils-2.15.ebuild: - Stable on ppc64; bug #127975 - - 29 Mar 2006; Luca Barbato debianutils-2.15.ebuild: - Marked ppc, see bug #127975 - -*debianutils-2.15 (03 Nov 2005) - - 03 Nov 2005; Mike Frysinger +debianutils-2.15.ebuild: - Version bump #111275 by Richard Hartmann. - - 16 Sep 2005; Aron Griffis - debianutils-2.14.1-r1.ebuild: - Mark 2.14.1-r1 stable on alpha - - 03 Sep 2005; Markus Rothe - debianutils-2.14.1-r1.ebuild: - Stable on ppc64 - - 19 Aug 2005; Michael Hanselmann - debianutils-2.14.1-r1.ebuild: - Stable on ppc. - - 16 Aug 2005; Gustavo Zacarias - debianutils-2.14.1-r1.ebuild: - Stable on sparc - -*debianutils-2.14.1-r1 (13 Jul 2005) - - 13 Jul 2005; Martin Schlemmer - +files/debianutils-2.14.1-no-bs-namespace.patch, - +debianutils-2.14.1-r1.ebuild: - Allow dots in the names, bug #95173. Patch by Kerin Millar. - -*debianutils-2.14.1 (02 Jul 2005) - - 02 Jul 2005; Mike Frysinger - +debianutils-2.14.1.ebuild: - Version bump #92748 by Kerin Millar. - -*debianutils-2.13.2 (16 Jun 2005) - - 16 Jun 2005; Mike Frysinger - +debianutils-2.13.2.ebuild: - Version bump. - -*debianutils-2.13.1-r1 (24 Mar 2005) - - 24 Mar 2005; Mike Frysinger - +debianutils-2.13.1-r1.ebuild: - Version bump to fix install locations #86349 by Peter Gantner. - -*debianutils-2.13.1 (22 Mar 2005) - - 22 Mar 2005; Mike Frysinger - +debianutils-2.13.1.ebuild: - Version bump. - - 28 Nov 2004; Joseph Jezak - debianutils-1.16.7-r4.ebuild: - Had to remove coreutils from the ppc-macos dependancy list because we - still don't have a coreutils virtual and it got added back in. - - 12 Sep 2004; Pieter Van den Abeele - debianutils-1.16.7-r4.ebuild: - keeping in stable, but made coreutils a !macos? dependency - Debianutils is needed for portage, but we haven't been able to create a - coreutils virtual yet. - - 22 Aug 2004; Michael Hanselmann - debianutils-1.16.7-r4.ebuild: - Added to macos. Stable because it's a dependency for bleeding-edge - Portage-versions. - - 25 Apr 2004; Michael Sterrett - debianutils-1.16.7-r4.ebuild: - inherit eutils for epatch - -*debianutils-1.16.7-r4 (10 Dec 2003) - - 10 Dec 2003; Seemant Kulleen - debianutils-1.16.7-r3.ebuild, debianutils-1.16.7-r4.ebuild, - files/debianutils-1.16.7-gentoo.patch: - mkboot queries portage for sys-boot/grub instead of sys-apps/grub, thanks to - max@gentoo.org in #gentoo-dev - - 09 Dec 2003; Seemant Kulleen - debianutils-1.16.7-r2.ebuild, debianutils-1.16.7-r3.ebuild: - don't install the readlink manpage -- partially closes bug #32096 by Radek - Podgorny - - 26 Sep 2003; Bartosch Pixa - debianutils-1.16.7-r3.ebuild: - set ppc in keywords - - 25 Sep 2003; Martin Schlemmer - debianutils-1.16.7-r3.ebuild, files/debianutils-1.16.7-gentoo.patch: - Fix bug #25216 (use portageq and not qpkg to check if grub is installed), mark - stable as otherwise its been working fine for a long time. - - 19 Sep 2003; Christian Birchinger - debianutils-1.16.7-r3.ebuild: - Added sparc stable keyword - - 17 Sep 2003; Jon Portnoy - debianutils-1.16.7-r3.ebuild : - ia64 keywords. - - 12 Sep 2003; Seemant Kulleen - debianutils-1.16.7-r3.ebuild: - moved to stable x86 - - 27 Aug 2003; Seemant Kulleen - debianutils-1.16.7-r3.ebuild: - hits stable, because coreutils-5.0 has hit stable. marked for all arches -- - the change between -r2 and -r3 is just the removal of readlink - - 27 Aug 2003; Seemant Kulleen - debianutils-1.16.7-r2.ebuild, debianutils-1.16.7-r3.ebuild: - changed SRC_URI to point to our own mirrors. thanks to Alastair Tse - for pointing that out in bug #26274 - - 03 Aug 2003; Seemant Kulleen - debianutils-1.16.7-r3.ebuild: - added coreutils to dependency - -*debianutils-1.16.7-r3 (02 Aug 2003) - - 02 Aug 2003; Seemant Kulleen - debianutils-1.16.7-r1.ebuild, debianutils-1.16.7-r2.ebuild, - debianutils-1.16.7-r3.ebuild: - removed old version, this version will hit stable, when coreutils-5.0 hits - stable -- removal of /bin/readlink from here, thanks to SpanKYzor in bug - #25600 - -*debianutils-1.16.7-r2 (19 May 2003) - - 06 Jul 2003; Guy Martin debianutils-1.16.7-r2.ebuild : - Marked stable on hppa. - - 06 Jul 2003; Joshua Kinard debianutils-1.16.7-r2.ebuild: - Changed ~mips to mips in KEYWORDS - - 24 Jun 2003; Aron Griffis - debianutils-1.16.7-r2.ebuild: - Mark stable on alpha - - 22 Jun 2003; Joshua Kinard debianutils-1.16.7-r2.ebuild: - Changed ~sparc to sparc in KEYWORDS - - 19 May 2003; Martin Schlemmer - debianutils-1.16.7-r2.ebuild, files/debianutils-1.16.7-gcc33.patch: - Fix gcc-3.3 issue, bug #21211. - -*debianutils-1.16.7-r1 (03 Apr 2003) - - 12 Apr 2003; Seemant Kulleen Manifest, - debianutils-1.16.7-r1.ebuild: - SMAIL license removed, thanks to: Luke-Jr in bug #18948 - - 03 Apr 2003; Seemant Kulleen - debianutils-1.16.7-r1.ebuild, debianutils-1.16.7.ebuild, - debianutils-1.16.7.ebuild, files/debianutils-1.16.7-gentoo.patch: - Added patch for run-parts to ignore .keep files. Patch was submitted by: Jukka - Salmi in bug #18423. - -*debianutils-1.16.7 (26 Mar 2003) - - 26 Mar 2003; Seemant Kulleen debianutils-1.16.7.ebuild, - files/debianutils-1.16.7-gentoo.patch: - version bump - - 21 Feb 2003; Zach Welch debianutils-1.16.3.ebuild : - Added arm to keywords. - - 07 Feb 2003; Guy Martin debianutils-1.16.3.ebuild : - Added hppa to keywords. - -*debianutils-1.16.3 (20 Dec 2002) - - 07 Mar 2003; Seemant Kulleen - files/debianutils-compress.patch: - added patch to use bzip2 instead of gzip for savelog - - 07 Mar 2003; Seemant Kulleen debianutils-1.16.3.ebuild: - use epatch - - 20 Dec 2002; Jan Seidel : debianutils-1.13.3-r3.ebuild - Added mips to keywords - - 06 Dec 2002; Rodney Rees : changed sparc ~sparc keywords - -*debianutils-1.16.3 (25 Sep 2002) - - 23 Oct 2002; Mike Frysinger : - Removed bootcd USE flag and added IUSE - - 25 Sep 2002; Martin Schlemmer : - Version update. Add some of missing util. Add patch to make - installkernel and mkboot more Gentoo friendly. - -*debianutils-1.13.3-r3 (14 July 2002) - - 14 Jul 2002; phoen][x debianutils-1.13.3-r3.ebuild : - Added KEYWORDS, SLOT. - -*debianutils-1.16 (23 Mar 2002) - - 23 Oct 2002; Mike Frysinger : - Removed bootcd USE flag and added IUSE - - 14 Jul 2002; phoen][x debianutils-1.16.ebuild : - Added KEYWORDS, SLOT. - - 23 Mar 2002; Seemant Kulleen debianutils-1.16.ebuild : - - Version update. With it came a change in the SRC_URI as well. Submitted by - Jim Nutt. - -*debianutils-1.13.3-r4 (1 Feb 2002) - - 14 Jul 2002; phoen][x debianutils-1.13.3-r4.ebuild : - Added KEYWORDS, SLOT. - - 1 Feb 2002; G.Bevin ChangeLog : - - Added initial ChangeLog which should be updated whenever the package is - updated in any way. This changelog is targetted to users. This means that the - comments should well explained and written in clean English. The details about - writing correct changelogs are explained in the skel.ChangeLog file which you - can find in the root directory of the portage repository. diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/debianutils/Manifest b/sdk_container/src/third_party/coreos-overlay/sys-apps/debianutils/Manifest deleted file mode 100644 index 92422696f5..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/debianutils/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST debianutils_3.1.3.tar.gz 132108 RMD160 b38fdc56519ce22627d0dd320455b89460eafea9 SHA1 6de01d71eec751db913b8ad66e90fb4e63b7b27b SHA256 83861a6c28166b0c84ab248d44fcd19d8c3940fa43f9450a7a8c9870af59ae8f diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/debianutils/debianutils-3.1.3-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/debianutils/debianutils-3.1.3-r1.ebuild deleted file mode 120000 index 2a68695e3b..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/debianutils/debianutils-3.1.3-r1.ebuild +++ /dev/null @@ -1 +0,0 @@ -debianutils-3.1.3.ebuild \ No newline at end of file diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/debianutils/debianutils-3.1.3.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/debianutils/debianutils-3.1.3.ebuild deleted file mode 100644 index ff2b037708..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/debianutils/debianutils-3.1.3.ebuild +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/debianutils/debianutils-3.1.3.ebuild,v 1.7 2009/07/13 18:22:10 josejx Exp $ - -inherit eutils flag-o-matic - -DESCRIPTION="A selection of tools from Debian" -HOMEPAGE="http://packages.qa.debian.org/d/debianutils.html" -SRC_URI="mirror://debian/pool/main/d/${PN}/${PN}_${PV}.tar.gz" - -LICENSE="BSD GPL-2 SMAIL" -SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd" -IUSE="kernel_linux static" - -PDEPEND="|| ( >=sys-apps/coreutils-6.10-r1 sys-apps/mktemp sys-freebsd/freebsd-ubin )" - -src_unpack() { - unpack ${A} - cd "${S}" - epatch "${FILESDIR}"/${PN}-2.31-no-bs-namespace.patch - epatch "${FILESDIR}"/${P}-installkernel-symlinks.patch -} - -src_compile() { - use static && append-ldflags -static - econf || die - emake || die -} - -src_install() { - into / - dobin tempfile run-parts || die - if use kernel_linux ; then - dosbin installkernel || die "installkernel failed" - fi - - into /usr - dosbin savelog || die "savelog failed" - - doman tempfile.1 run-parts.8 savelog.8 - use kernel_linux && doman installkernel.8 - cd debian - dodoc changelog control -} diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/debianutils/files/debianutils-2.31-no-bs-namespace.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/debianutils/files/debianutils-2.31-no-bs-namespace.patch deleted file mode 100644 index 0e58219228..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/debianutils/files/debianutils-2.31-no-bs-namespace.patch +++ /dev/null @@ -1,26 +0,0 @@ -Allow dots in the names, bug #95173. Patch by Kerin Millar. -Re-sourced for 2.28.2 - ---- debianutils-2.28.2/run-parts.8 -+++ debianutils-2.28.2/run-parts.8 -@@ -27,7 +27,8 @@ - - If neither the \-\-lsbsysinit option nor the \-\-regex option is given - then the names must consist entirely of upper and lower case letters, --digits, underscores, and hyphens. -+digits, underscores, hyphens, and periods. However, the name must not begin -+with a period. - - If the \-\-lsbsysinit option is given, then the names must not end - in .dpkg\-old or .dpkg\-dist or .dpkg\-new or .dpkg\-tmp, and must ---- debianutils-2.28.2/run-parts.c -+++ debianutils-2.28.2/run-parts.c -@@ -494,7 +494,7 @@ regex_compile_pattern (void) - != 0) - pt_regex = &tradre; - -- } else if ( (err = regcomp(&classicalre, "^[a-zA-Z0-9_-]+$", -+ } else if ( (err = regcomp(&classicalre, "^[a-zA-Z0-9_-][a-zA-Z0-9._-]+$", - REG_EXTENDED | REG_NOSUB)) != 0) - pt_regex = &classicalre; - diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/debianutils/files/debianutils-3.1.3-installkernel-symlinks.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/debianutils/files/debianutils-3.1.3-installkernel-symlinks.patch deleted file mode 100644 index 4f1c31e57f..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/debianutils/files/debianutils-3.1.3-installkernel-symlinks.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- a/installkernel 2010-02-12 04:39:49.000000000 +0000 -+++ b/installkernel 2010-02-12 05:38:40.000000000 +0000 -@@ -41,11 +41,7 @@ - - cat "$2" > "$dir/$1-$ver" - -- # This section is for backwards compatibility only - if test -f "$dir/$1" ; then -- # The presence of "$dir/$1" is unusual in modern intallations, and -- # the results are mostly unused. So only recreate them if they -- # already existed. - if test -L "$dir/$1" ; then - # If we were using links, continue to use links, updating if - # we need to. -@@ -55,12 +51,12 @@ - else - mv "$dir/$1" "$dir/$1.old" - fi -- ln -sf "$1-$ver" "$dir/$1" - else # No links - mv "$dir/$1" "$dir/$1.old" -- cat "$2" > "$dir/$1" - fi - fi -+ -+ ln -sf "$1-$ver" "$dir/$1" - } - - if [ "$(basename $img)" = "vmlinux" ] ; then diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/debianutils/metadata.xml b/sdk_container/src/third_party/coreos-overlay/sys-apps/debianutils/metadata.xml deleted file mode 100644 index 96a2d58636..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/debianutils/metadata.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - -base-system - diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/module-init-tools/Manifest b/sdk_container/src/third_party/coreos-overlay/sys-apps/module-init-tools/Manifest deleted file mode 100644 index eaac3f7367..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/module-init-tools/Manifest +++ /dev/null @@ -1,51 +0,0 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - -AUX module-init-tools-3.1_generate-modprobe-assume-kernel.patch 3674 RMD160 28491f1c5a654b21b4d82c2a23b8d0f30ea32960 SHA1 73a8deeb2765a31c0f51042a8ae69e7b3752e8de SHA256 8735f921aadd901b98983ce9678d3e7babb9fd3553ce7881460c050dc5611f66 -AUX module-init-tools-3.2.2-handle-dupliate-aliases.patch 2345 RMD160 12e3132824dadbf853228dec146347cf2b87f31c SHA1 b2b16636ae61de179d4674dbe5c48868aa1e2ca0 SHA256 6cd1ae6736bec9c72474acb6b7dce68db1ec0703f0b55f312dcfefce7cf56166 -AUX module-init-tools-3.2_pre7-abort-on-modprobe-failure.patch 1425 RMD160 ce073d744e0eb191ef10f3a1186f393b42620813 SHA1 5138c1a5b7ead76d683d5d3f31d7c161b0a4dfb2 SHA256 5a058a5dfae5bd6eaf6fa338b800f477b542dd9da0c09283d274504beb19c3b6 -AUX module-init-tools-3.6-hidden-dirs.patch 372 RMD160 17e339f529d17a3396331f7d0e23f726dc3d75cf SHA1 1844b256795d81bf687a2722b6aae3b12807a317 SHA256 cf89453c57dce3b839c062f6fd89ced1f72683e1635e761fae2f6b651f69d36a -AUX module-init-tools-3.6-skip-sys-check.patch 1775 RMD160 bbc71209ce22fbb8da4d1717221bb2c8e30e45c9 SHA1 39b0ba97b9905d39528755a7ea2c3829987aafb5 SHA256 1888621529238d1d449e1cf1ba0842070fff6b79de8a58602b877f369a98f2f3 -AUX modutils-2.4.27-alias.patch 2246 RMD160 bcf4fffbecae76e5b14b05c9003ba4f0cf2675ff SHA1 7d69355210aaccbd2dc6dd8a9b1b736f74dfdd36 SHA256 453e3ab982088e2e85164e63b4944af58cd01c2b2d45d75fdcda6649a339878f -AUX modutils-2.4.27-build.patch 948 RMD160 f1b08653720bbba56505cef5df378d6365c54ed5 SHA1 481d7f31c6e58e4356537b728779d014edece374 SHA256 7b015de3c739e996247edcda9a1df59fa871f4e93a408a8033f0e64c36325703 -AUX modutils-2.4.27-flex.patch 805 RMD160 aa0806e61e5287a5ce821bce66cbfa028e50576b SHA1 87d2dee1db44ff854e3d4c371efd78cc3f613578 SHA256 dbe0c3207751157e7b104d66bdfeea280343ceabe856dc5d51849c206fdccad9 -AUX modutils-2.4.27-gcc.patch 7438 RMD160 a3d1fa1e6dd865e531684882daab881b90d0e142 SHA1 657796971d5b0e6ec6ebcbfa1f66a1f09e5ec6aa SHA256 8ecda7ac4010c54e7fbdd8b2109b5c19ea2266f67d430ab6413188c63cdca2a6 -AUX modutils-2.4.27-hppa.patch 302 RMD160 15c0b2aadee725ef21370c9f016da6c74b882b6f SHA1 6af5f392dd173eacacc258211c67ef103ccaff49 SHA256 9b4e629a310732129b96766e0c6f185008e98f8429551da85372a01fa59c7d05 -AUX modutils-2.4.27-no-nested-function.patch 1422 RMD160 6c34f6ff25019884495c21af525e88a63e449b3c SHA1 17eeaddba0fc3e476138a05d570eb79ab77b67ed SHA256 3e9961a7c9411e8c01eb48d9053d7901ec7a90ee0e070e85bd766385f36d563d -AUX update-modules-3.5.sh 10519 RMD160 16c6c32397aa0e063e12cdd79efc81d02bcd2133 SHA1 3d5e2ae0f23b35147b38ec26c3377d2b697969c0 SHA256 b8866f643d369569de040b89c997b6a864ec3f0767a5e86b78d4b0badaa267c9 -AUX update-modules.8 3210 RMD160 6d82ea356c1751ad46cf1c30e0fe237e7a4f50f2 SHA1 ed64791ca8e3215ee8a98784326f5d1c8a60bfd4 SHA256 4e352ee28ecaf79fac2a0216b8b4b52ced864cd258752f33213d1ac8f4a5849c -DIST module-init-tools-3.10.tar.bz2 885014 RMD160 225827526953c6d7ced53f7f326d48943ae5294b SHA1 761c03b9a3171e08215c0e793e1f299681bb1455 SHA256 fef01424081e728ff6fadc96a8e9b6e4efe3d21f315f1e27b1a16abf7047c12b -DIST module-init-tools-3.11-man.tar.bz2 8067 RMD160 18b3e17ac534899b2e2afecf50e86a187447a57a SHA1 1e7385433554bdac0451cd9bc56dc7ce6e51624a SHA256 48944831741696e39d7ce439131b4239e4352726f4b99d042c140db7d0404466 -DIST module-init-tools-3.11.1.tar.bz2 200815 RMD160 deebbe725d7ad6b886cb8b77c42ff8b5f00fffbe SHA1 1be5f6be71fb9ea7790c9736114bbbf14e43c32e SHA256 c5bc5fba03769fec786a305abdf97f37c5d7a33e61b92f4ee4f1b80cbc1d1dc0 -DIST module-init-tools-3.11.tar.bz2 220460 RMD160 6734d6b9d4ca49c1cb5a2c5e2f741746bbce67d0 SHA1 3944445cffdc9c6d6143e94fbfdf6f7a8e3fd3b9 SHA256 69c1fd3f55b8da7a105e9e1be0f1684ea780d2f8724b11985a2161c6b73cd0d9 -DIST module-init-tools-3.12.tar.bz2 938086 RMD160 3ea858854d4fba25301b2a68cfb5614ad1281658 SHA1 caf70188c85370936626027ae5b5a9258cc851f9 SHA256 d012ab07ea26721467a85a775f34747c1c8897e37f16bec5317d8a72ef8b4f17 -DIST module-init-tools-3.13.tar.bz2 975594 RMD160 18842745faad77a42c1636980d2ae7dd208dae40 SHA1 587c6df08986a4db9feb286ca0d4dba07f05c50e SHA256 6a29185d09fab7c30817d57994336bb2e1a9da5b80b82c8b282d2c08a221925b -DIST module-init-tools-3.16-man.tar.bz2 9300 RMD160 9a2f8801f353c0a6ecfe53955dd59dc21227a89d SHA1 6138725eff35e2d465ca133a32902b22fe43c383 SHA256 a80cfeb48279964b2c515ab5ca06925dd22d2187ae1043992650bf7950fc36c8 -DIST module-init-tools-3.16.tar.bz2 228821 RMD160 55b0f26bcf15ab39d9852c94a3d65beec3e079e0 SHA1 919c9fb3e8c73a5790411da1c4d79efda19db195 SHA256 e1f2cdcae64a8effc25e545a5e0bdaf312f816ebbcd0916e4e87450755fab64b -DIST module-init-tools-3.5.tar.bz2 212177 RMD160 a49dda7ea6545dc91f6156930572150841743744 SHA1 86289ccafc47c0f1dde0955fda1922cdcc79ae9f SHA256 842496eae31ccd1334cd548f93d90180ca4f6c2cdde411e13c606bebe9f8cbea -DIST module-init-tools-3.6-man.tar.bz2 8872 RMD160 c7bcce7696f6fab2b356d5ccd0bc14c849d763e2 SHA1 41d1cbd20314519b4b8e23c2d9daf514600223b1 SHA256 a8b5dcc3572619d604645292abd7adf508511141a3bdb94cf58f79eb86836b22 -DIST module-init-tools-3.6.tar.bz2 230327 RMD160 40cc2e8e1f31f94ba8dfdc014e547e6184b02b69 SHA1 ce1ab358502865e336bbcf5cb728af1cc8d9ed1f SHA256 64a0b3b058f2236be1a8138356306c91e5f23f149a131428e4c7d97b1c050728 -DIST module-init-tools-3.8.tar.bz2 802725 RMD160 147017323c3222844ff91f12398a2545b8815b36 SHA1 28cb40b5a94d6d10df144b821350dd87a749707e SHA256 dc880716a6b16a28dd5e18178bd266b9f598bd29b2580688390915bcc1aef65e -DIST module-init-tools-3.9.tar.bz2 193216 RMD160 a0bb8bbc385c183e29af64d6de50c940cf631872 SHA1 3f61aea95910a4218db5c0f2436c2906848c2454 SHA256 b21e3094000571ffa567d6bb829cc2e17615a2547f07e91393332e7a210d63dc -DIST modutils-2.4.27.tar.bz2 234963 RMD160 3179d364106859cf6dbd1fad82d8356337634735 SHA1 fa268b48d98e0efab349d45fa7fb2372d58320c1 SHA256 ab4c9191645f9ffb455ae7c014d8c45339c13a1d0f6914817cfbf30a0bc56bf0 -EBUILD module-init-tools-3.10.ebuild 1373 RMD160 a5e8bd7dcbb1ecaa903cc3d3235647cde78c269d SHA1 95a8262d2983583d13e151678d71d3b77f6a5cd5 SHA256 4cf6d1d551dd388abf2d33ae4424756537c7fc5f73e46c5dbf64dc13ce1cea6b -EBUILD module-init-tools-3.11.1.ebuild 2606 RMD160 cec2c9854f970dfea95852459041968d31bc5011 SHA1 bcc6f8d6576eeed58388268170658b8fc3ffbd81 SHA256 a0e05b7c7ec0f9170e0ac7205637c88f27e18a45d353e666711d3f6131cb9eba -EBUILD module-init-tools-3.11.ebuild 1468 RMD160 d3db4058d907aa3d28c3ce0d141d1ed03d223320 SHA1 220d0a0b114575a49efd833bff1b5663095cd91f SHA256 6dd893e5a33ed75cdc56336b5dda50ca3ceb5d3b4a7d3fec47db2fb41b4febc0 -EBUILD module-init-tools-3.12-r1.ebuild 2955 RMD160 6018854ddb14a7063943f2802a9d6951c434d7ab SHA1 f93389fcb936aa4ee96b1d0e2f386979da8b2186 SHA256 74847e053f6e64c3bfef86ab16ceb9ed295dd1110c74910f8c037a6aebcb016a -EBUILD module-init-tools-3.12.ebuild 2506 RMD160 ff7df345fb4b20e23f5c86d201b0fbe8a50cfe13 SHA1 a724fa9670912f01485106456099e51469df5263 SHA256 3aa46926741fb93d8670e235711f6593846c2032cd64e5127a5a3447ac53c13c -EBUILD module-init-tools-3.13.ebuild 2963 RMD160 cbb7470e14f6158989284a4813423039a106820a SHA1 7690114b35b0f83e2dbd2d92fa0d16015da74d38 SHA256 fc50a4f058e81d4bed91afd332195156498ebe8aa860f454aa1641e19fe2e0e0 -EBUILD module-init-tools-3.16-r1.ebuild 2979 RMD160 780a8e370fde55d0cb5fd9805416539f201f5ddb SHA1 02ed466cfe26308413adf329ce49224a8ae8980d SHA256 b2eeaca9e22797390d181e58dba4d371adde122114d14188a57704d1141fe8c7 -EBUILD module-init-tools-3.16.ebuild 3012 RMD160 b666e8aef01b136ac357b878287f0942b77bf55c SHA1 0781c989da0a73e06be38ce651fa2e7357b25a00 SHA256 c4e5ef1e7b5217cba96a9926b72b09a3229331ee616ef5e426df3fdc5067a040 -EBUILD module-init-tools-3.5.ebuild 5193 RMD160 9ffc849326ab7bc700ebc518ba61068c06fb1d03 SHA1 6e01eccd8190e27785c5af3c93a2d95c35f33c7f SHA256 5bc29dcbd501bf85be32ecf6ba4a8c5118635bc93d6d730d74d5e61f7a41728e -EBUILD module-init-tools-3.6-r1.ebuild 5357 RMD160 f94239b661403ba5eeadd19a23ec35dbe16239dd SHA1 d966f4a540293f5b6fdd710ae2c2796c8ec5fa8b SHA256 6912a0aac2fd3c9a0bd2638a78a09aa555305be98478d94dec53ce3d3d224dbb -EBUILD module-init-tools-3.8.ebuild 1537 RMD160 79042e4f47f1200bda66a5114f3e74c9f93ccfb0 SHA1 855903af0babe41a6cd7d6ad2ee6f41cf0865b01 SHA256 737da2d4e1d2d63736e828e31a24868e00e2fc40f2c1de3fa232a8c313daed06 -EBUILD module-init-tools-3.9.ebuild 1372 RMD160 bff47da007a4010fad3b3036f5dbfb1ada52821c SHA1 fa1f0ca025151df886c1848dcdca6c36b2e6db52 SHA256 69a0a34769d9d6ee7a3f36579bb2268f0c61444abc8f6dc3a453ac682a2dede3 -MISC ChangeLog 31348 RMD160 0cb5530cf5a532011bac9912e9dcdd041ddee53b SHA1 c8ca45f1f5857b53dd2f2b50eb8bc214687ed35f SHA256 b65dfea47d5b2e8b9b2bdef9319a292bad2b073bbe254693b20c0d8e219dfc7b -MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.17 (GNU/Linux) - -iEYEARECAAYFAk8sfC4ACgkQblQW9DDEZTjqBACfdAEyJLL13Gq6VRkevAQT80dx -54UAoLXU/TzFR5uKl9aJcjsh6evIjT1j -=Dkr7 ------END PGP SIGNATURE----- diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/module-init-tools/files/module-init-tools-3.16-use-fd-syscall.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/module-init-tools/files/module-init-tools-3.16-use-fd-syscall.patch deleted file mode 100644 index 849da55ba1..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/module-init-tools/files/module-init-tools-3.16-use-fd-syscall.patch +++ /dev/null @@ -1,179 +0,0 @@ -Description: In support of the new finit_module syscall, keep the file - descriptor for the desired module around when loading. In the case where - a module is uncompressed and unstripped, attempt to load via the fd and - finit_module. If finit_module does not exist (ENOSYS), fall back to using - init_module with the blob read from the fd. -Author: Kees Cook - -diff -uNrp module-init-tools-3.16~/insmod.c module-init-tools-3.16/insmod.c ---- module-init-tools-3.16~/insmod.c 2011-06-02 10:55:01.000000000 -0700 -+++ module-init-tools-3.16/insmod.c 2012-09-11 15:42:26.976369988 -0700 -@@ -56,18 +56,18 @@ static const char *moderror(int err) - } - } - --static void *grab_file(const char *filename, unsigned long *size) -+static void *grab_file(const char *filename, unsigned long *size, int *fd) - { - unsigned int max = 16384; -- int ret, fd, err_save; -+ int ret, err_save; - void *buffer; - - if (streq(filename, "-")) -- fd = dup(STDIN_FILENO); -+ *fd = dup(STDIN_FILENO); - else -- fd = open(filename, O_RDONLY, 0); -+ *fd = open(filename, O_RDONLY, 0); - -- if (fd < 0) -+ if (*fd < 0) - return NULL; - - buffer = malloc(max); -@@ -75,7 +75,7 @@ static void *grab_file(const char *filen - goto out_error; - - *size = 0; -- while ((ret = read(fd, buffer + *size, max - *size)) > 0) { -+ while ((ret = read(*fd, buffer + *size, max - *size)) > 0) { - *size += ret; - if (*size == max) { - void *p; -@@ -89,13 +89,12 @@ static void *grab_file(const char *filen - if (ret < 0) - goto out_error; - -- close(fd); - return buffer; - - out_error: - err_save = errno; - free(buffer); -- close(fd); -+ close(*fd); - errno = err_save; - return NULL; - } -@@ -104,6 +103,7 @@ int main(int argc, char *argv[]) - { - unsigned int i; - long int ret; -+ int fd; - unsigned long len; - void *file; - char *filename, *options = strdup(""); -@@ -149,18 +149,21 @@ int main(int argc, char *argv[]) - strcat(options, " "); - } - -- file = grab_file(filename, &len); -+ file = grab_file(filename, &len, &fd); - if (!file) { - fprintf(stderr, "insmod: can't read '%s': %s\n", - filename, strerror(errno)); - exit(1); - } - -- ret = init_module(file, len, options); -+ ret = finit_module(fd, options, 0); -+ if (ret != 0 && errno == ENOSYS) -+ ret = init_module(file, len, options); - if (ret != 0) { - fprintf(stderr, "insmod: error inserting '%s': %li %s\n", - filename, ret, moderror(errno)); - } -+ close(fd); - free(file); - - if (ret != 0) -diff -uNrp module-init-tools-3.16~/modprobe.c module-init-tools-3.16/modprobe.c ---- module-init-tools-3.16~/modprobe.c 2011-06-02 10:55:01.000000000 -0700 -+++ module-init-tools-3.16/modprobe.c 2012-09-11 15:42:58.746370022 -0700 -@@ -1713,6 +1713,7 @@ static int insmod(struct list_head *list - modprobe_flags_t flags) - { - int ret; -+ int fd; - struct elf_file *module; - const struct module_softdep *softdep; - const char *command; -@@ -1778,10 +1779,17 @@ static int insmod(struct list_head *list - strerror(errno)); - goto out; - } -- if (flags & mit_strip_modversion) -+ fd = open(mod->filename, O_RDONLY); -+ if (flags & mit_strip_modversion) { - module->ops->strip_section(module, "__versions"); -- if (flags & mit_strip_vermagic) -+ close(fd); -+ fd = -1; -+ } -+ if (flags & mit_strip_vermagic) { - clear_magic(module); -+ close(fd); -+ fd = -1; -+ } - - /* Config file might have given more options */ - opts = add_extra_options(mod->modname, optstring, conf->options); -@@ -1792,7 +1800,13 @@ static int insmod(struct list_head *list - goto out_elf_file; - - /* request kernel linkage */ -- ret = init_module(module->data, module->len, opts); -+ if (fd < 0) -+ ret = init_module(module->data, module->len, opts); -+ else { -+ ret = finit_module(fd, opts, 0); -+ if (ret != 0 && errno == ENOSYS) -+ ret = init_module(module->data, module->len, opts); -+ } - if (ret != 0) { - if (errno == EEXIST) { - if (flags & mit_first_time) -@@ -1810,6 +1820,7 @@ static int insmod(struct list_head *list - } - out_elf_file: - release_elf_file(module); -+ close(fd); - free(opts); - out: - free_module(mod); -diff -uNrp module-init-tools-3.16~/util.h module-init-tools-3.16/util.h ---- module-init-tools-3.16~/util.h 2011-06-02 10:55:01.000000000 -0700 -+++ module-init-tools-3.16/util.h 2012-09-11 15:41:49.126370186 -0700 -@@ -3,6 +3,31 @@ - - #include - -+#include -+#include -+#ifndef __NR_finit_module -+# if defined(__x86_64__) -+# define __NR_finit_module 313 -+# elif defined(__i386__) -+# define __NR_finit_module 350 -+# elif defined(__arm__) -+# define __NR_finit_module 379 -+# endif -+#endif -+ -+#ifdef __NR_finit_module -+static inline int finit_module(int fd, const char *uargs, int flags) -+{ -+ return syscall(__NR_finit_module, fd, uargs, flags); -+} -+#else -+static inline int finit_module(int fd, const char *uargs, int flags) -+{ -+ errno = ENOSYS; -+ return -1; -+} -+#endif -+ - struct string_table - { - unsigned int cnt; diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/module-init-tools/files/update-modules-3.5.sh b/sdk_container/src/third_party/coreos-overlay/sys-apps/module-init-tools/files/update-modules-3.5.sh deleted file mode 100755 index 206521ce8a..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/module-init-tools/files/update-modules-3.5.sh +++ /dev/null @@ -1,395 +0,0 @@ -#!/bin/bash -# vim:ts=4 -# Distributed under the terms of the GNU General Public License v2 -# -# This script will do: -# - create /etc/modules.conf from /etc/modules.d/* -# - create /etc/modprobe.conf from /etc/modprobe.d/* -# - update modules.dep if modules.conf has been updated so depmod doesnt whine -# -# This is all for backwards compatibility. In the perfect world, we would be -# running a linux-2.6 kernel and not have any modules.d directory. Then there -# would be no work for us as module-init-tools automatically scans modprobe.d. -# Until that happens, we'll keep scanning and warning and being a pita. -# - - -ROOT="${ROOT%/}/" -[ "${ROOT}" = "${ROOT#/}" ] && ROOT="${PWD}/${ROOT}" -cd "${ROOT}" - -argv0=${0##*/} -. /etc/init.d/functions.sh || { - echo "${argv0}: Could not source /etc/init.d/functions.sh!" 1>&2 - exit 1 -} -umask 022 -esyslog() { :; } -export PATH=/sbin:${PATH} - -[ "${argv0}" = "modules-update" ] && ewarn "Please run 'update-modules' from now on; 'modules-update' is going away" - - -# -# Setup some variables -# - -HEADER="### This file is automatically generated by update-modules" - -# -# Parse command-line -# - -VERBOSE=0 -DEBUG=0 -FORCE="false" -BACKUP="false" -KV= -while [ -n "$1" ] ; do - case $1 in - --assume-kernel=*) KV=${1#*=};; - -b|--backup) BACKUP="true";; - -f|--force|force) FORCE="true";; - -v|--verbose) ((VERBOSE+=1));; - -d|--debug) ((DEBUG+=1));; - -V|--version) exec echo "${argv0}$Revision: 1.1 $ $Date: 2008/10/25 23:55:43 $";; - -h|--help) - cat <<-EOF - Usage: update-modules [options] - - Options: - --assume-kernel=KV Assume the kernel is at least version KV - -b, --backup Backup existing config files (add .old ext) - -f, --force Force execution in face of bad things - -v, --verbose Be a bit more verbose in what we do - -d, --debug Helpful debug output - -V, --version Dump version info - -h, --help This help screen, duh - EOF - exit 0 - ;; - *) - eerror "Error: I don't understand $1" - exit 1 - ;; - esac - shift -done - -if [ ! -w ./etc ] ; then - eerror "You must be root to do this" - exit 2 -fi - -[ ${DEBUG} -gt 0 ] && set -x - -veinfo() { [ ${VERBOSE} -gt 0 ] && einfo "$*" ; return 0 ; } -vewarn() { [ ${VERBOSE} -gt 0 ] && ewarn "$*" ; return 0 ; } - -[ "${ROOT}" != "/" ] && veinfo "Operating on ROOT = '${ROOT}'" - -# -# Let's check the optimal case first: nothing to do -# -if ! ${FORCE} ; then - if [ ! -d "./etc/modules.d" ] ; then - if [ ! -d "./etc/modprobe.d" ] ; then - veinfo "No /etc/modules.d or /etc/modprobe.d dir; Nothing to do!" - exit 0 - - elif [ -e "./etc/modprobe.conf" ] ; then - vewarn "You should put settings in /etc/modprobe.d/ rather than modprobe.conf" - - elif [ -e "./etc/modules.conf" ] ; then - vewarn "If you only run linux-2.4, you should delete /etc/modules.conf" - - else - veinfo "We have just /etc/modprobe.d; Nothing to do!" - exit 0 - fi - else - vewarn "You have /etc/modules.d, so things need to get coalesced" - fi -fi - -# -# Build list of config files to generate and verify none -# have been modified in any way -# -for x in modprobe.conf modules.conf ; do - x="./etc/${x}" - [ -r ${x} ] || continue - - if [ "$(sed -ne 1p ${x})" != "${HEADER}" ] ; then - ewarn "Warning: ${x#.} has not been automatically generated" - - if ${FORCE} ; then - ewarn "--force specified, (re)generating file anyway" - else - eerror "Use \"update-modules force\" to force (re)generation" - exit 1 - fi - fi -done - - -# -# If the system doesnt have old modutils, then this is prob linux-2.6 only -# -if type -P modprobe.old > /dev/null || \ - LC_ALL=C modprobe -V 2>/dev/null | grep -qs "modprobe version" -then - GENERATE_OLD="true" -else - GENERATE_OLD="false" -fi - - -# Reset the sorting order since we depend on it -export LC_COLLATE="C" - -KV=${KV:-$(uname -r)} - - -# -# Desc: backup a config file if need be and replace with new one -# Usage: backup -# Ex: backup /etc/modules.conf /etc/modules.conf.tempfile -# -backup() { - if ${BACKUP} && [ -e "$1" ] ; then - mv -f "$1" "$1".old - fi - mv -f "$2" "$1" -} - - -# -# Desc: Create module header -# Usage: create_header -# Ex: create_header /etc/modules.d -create_header() { - local moddir=$1 - - cat <<-EOF - ${HEADER} - # - # Please do not edit this file directly. If you want to change or add - # anything please take a look at the files in ${moddir} and read - # the manpage for update-modules(8). - # - EOF -} - - -# -# Desc: Combine all config files in a dir and place output in a file -# Usage: generate_config -# Ex: generate_config /etc/modules.conf /etc/modules.d -# -generate_config() { - local config=$1 - local moddir=$2 - local refdir=$3 - local silent=$4 - local tmpfile="${config}.$$" - - [ -z "${silent}" ] && ebegin "Updating ${config#./etc/}" - - create_header ${refdir:-${moddir}} > "${tmpfile}" - - for cfg in "${moddir}"/* ; do - [ -d "${cfg}" ] && continue - [ ! -r "${cfg}" ] && continue - - # Skip backup and RCS files #20597 - case ${cfg} in *~|*.bak|*,v) continue;; esac - - # If config file is found in the reference dir, then skip it - [ -n "${refdir}" ] && [ -e "${refdir}/${cfg##*/}" ] && continue - - ( - echo "### update-modules: start processing ${cfg#.}" - if [ -x "${cfg}" ] ; then - # $cfg can be executable; nice touch, Wichert! :) - "${cfg}" - else - cat "${cfg}" - fi - echo - echo "### update-modules: end processing ${cfg#.}" - echo - ) >> "${tmpfile}" - done - - backup "${config}" "${tmpfile}" - - [ -z "${silent}" ] && eend 0 - - return 0 -} - - -# -# Generate the old modules.conf file based upon all the snippets in -# modules.d. Since modprobe doesnt handle modules.d, we need to gather -# the files together in modules.conf for it. -# - -if [ ! -d "./etc/modules.d" ] ; then - veinfo "No need to generate modules.conf :)" - -elif ${FORCE} || is_older_than ./etc/modules.conf ./etc/modules.d ; then - generate_config ./etc/modules.conf ./etc/modules.d - -else - veinfo "modules.conf: already up-to-date wheatness" -fi - -# -# Call depmod to keep insmod from complaining that modules.conf is more -# recent then the modules.dep file. -# -if [ -e "./etc/modules.conf" ] ; then - depfile=$( - # the modules.conf file has optional syntax: - # depfile=/path/to/modules.dep - ret=$(sed -n -e '/^[[:space:]]*depfile=/s:.*=::p' ./etc/modules.conf) - eval echo "${ret:-/lib/modules/${KV}/modules.dep}" - ) - - if [ -d "${depfile%/*}" ] ; then - if [ ./etc/modules.conf -nt "${depfile}" ] ; then - arch=$(uname -m) - ebegin "Updating modules.dep" - for cfg in /lib/modules/${KV}/build /usr/src/linux-${KV} \ - /lib/modules/${KV} /boot /usr/src/linux "" - do - cfg=".${cfg}/System.map" - for suffix in -genkernel-${arch}-${KV} -genkernel-'*'-${KV} -${KV} "" ; do - scfg=$(echo ${cfg}${suffix}) - scfg=${scfg%% *} - [ -f "${scfg}" ] && cfg=${scfg} && break 2 - done - cfg="" - done - [ -n "${cfg}" ] && cfg="-F ${cfg}" - depmod -b "${ROOT}" -a ${cfg} ${KV} - eend $? - veinfo "Ran: depmod -b '${ROOT}' -a ${cfg} ${KV}" - else - veinfo "modules.dep: already up-to-date goodness" - fi - else - vewarn "The dir '${depfile}' does not exist, skipping call to depmod" - fi -fi - - -# -# Generate the new modprobe.conf file if possible. What this entails is -# grabbing details from the old modprobe via the -c option and sticking -# it in the newer config file. This is useful for backwards compat support -# and for packages that provide older style /etc/modules.d/ files but not -# newer style /etc/modprobe.d/ files. -# -# First we try to use the script `generate-modprobe.conf` from the -# module-init-tools and if that fails us, we try and generate modprobe.conf -# ourselves from the /etc/modules.d/ files. -# -if ! type -P generate-modprobe.conf > /dev/null ; then - vewarn "Skipping /etc/modprobe.conf generation (generate-modprobe.conf doesn't exist)" - -elif ! ${FORCE} && ! is_older_than ./etc/modprobe.conf ./etc/modules.d ./etc/modprobe.d ; then - veinfo "modprobe.conf: already up-to-date nutness" - -elif [ ! -e ./etc/modules.conf -a ! -e ./etc/modules.d ] ; then - veinfo "No need to generate modprobe.conf :)" - rm -f ./etc/modprobe.conf - -else - # - # First, bitch like crazy - # - for f in ./etc/modules.d/* ; do - # hack: ignore baselayout ;x - case ${f##*/} in - aliases|i386) continue;; - esac - [ -e "${f}" ] || continue - if [ ! -e "./etc/modprobe.d/${f##*/}" ] ; then - ewarn "Please file a bug about ${f#.}: it needs an /etc/modprobe.d/${f##*/}" - fi - done - - generated_ok=0 - tmpfile="./etc/modprobe.conf.$$" - - # - # First we try to use regular generate-modprobe.conf - # - if ${GENERATE_OLD} ; then - ebegin "Updating modprobe.conf" - create_header /etc/modprobe.d > "${tmpfile}" - if generate-modprobe.conf ${ASSUME_KV:+--assume-kernel=${KV}} \ - >> "${tmpfile}" 2> "${tmpfile}.err" - then - backup "./etc/modprobe.conf" "${tmpfile}" - eend 0 - generated_ok=1 - else - [[ ${VERBOSE} -gt 0 ]] && cat "${tmpfile}.err" - eend 1 "Warning: could not generate /etc/modprobe.conf!" - fi - fi - - # - # If the helper script failed, we fall back to doing it by hand - # - if [[ ${generated_ok} -eq 0 ]] ; then - ebegin "Updating modprobe.conf by hand" - - generate_config ./etc/modprobe.conf ./etc/modules.d ./etc/modprobe.d 0 - create_header /etc/modprobe.d > "${tmpfile}" - - # Just use generate-modprobe.conf to filter compatible syntax - if TESTING_MODPROBE_CONF=./etc/modprobe.conf \ - generate-modprobe.conf ${ASSUME_KV:+--assume-kernel=${KV}} \ - >> "${tmpfile}" 2> "${tmpfile}.err" - then - # we use mv here instead of backup_config() as the call to - # generate_config() above already took care of the backup - mv -f "${tmpfile}" "./etc/modprobe.conf" - eend $? - else - [[ ${VERBOSE} -gt 0 ]] && cat "${tmpfile}.err" - eend 1 "Warning: could not generate /etc/modprobe.conf!" - fi - fi - - # - # Now append all the new files ... modprobe will not scan /etc/modprobe.d/ - # if /etc/modprobe.conf exists, so we need to append /etc/modprobe.conf with - # /etc/modprobe.d/* ... http://bugs.gentoo.org/145962 - # - if [[ -e ./etc/modprobe.conf ]] ; then - for cfg in ./etc/modprobe.d/* ; do - [ -d "${cfg}" ] && continue - [ ! -r "${cfg}" ] && continue - - # Skip backup and RCS files #20597 - case ${cfg} in *~|*.bak|*,v) continue;; esac - - ( - echo - echo "### update-modules: start processing ${cfg#.}" - cat "${cfg}" - echo "### update-modules: end processing ${cfg#.}" - ) >> "./etc/modprobe.conf" - done - fi - - rm -f "${tmpfile}" "${tmpfile}.err" -fi - -: # make sure we fall through with 0 exit status diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/module-init-tools/files/update-modules.8 b/sdk_container/src/third_party/coreos-overlay/sys-apps/module-init-tools/files/update-modules.8 deleted file mode 100644 index 16e99e28c8..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/module-init-tools/files/update-modules.8 +++ /dev/null @@ -1,74 +0,0 @@ -.TH UPDATE-MODULES 8 "Gentoo Linux" "2007" -.SH NAME -update\-modules \- (re)generate module config files in /etc/ -.SH SYNOPSIS -\fBupdate\-modules\fR \fI[options]\fR -.SH DESCRIPTION -\fBupdate\-modules\fR is a simple tool to manage the module config files found -in the /etc/ directory. - -The old Linux module utilities use a single file for all their configuration. -This makes it difficult for packages to dynamically add information about their -own modules. - -\fBupdate-modules\fR makes the dynamic addition of information easier by -generating the single configuration file from the many files located in -\fI/etc/modules.d/\fR. All files in that directory are assembled together to -form \fI/etc/modules.conf\fR. - -Newer Linux module utilities include support automatically for a directory of -configuration files in \fI/etc/modprobe.d/\fR. However, to maintain backwards -compatibility with packages that do not yet support this, we still need to -assemble the contents of \fI/etc/modules.d/\fR and \fI/etc/modprobe.d/\fR and -produce the corresponding \fI/etc/modules.conf\fR and \fI/etc/modprobe.conf\fR. - -Also, when requested, it is also possible to generate \fI/etc/modules.devfs\fR. -.SH OPTIONS -.TP -\fI\-\-assume-kernel=\fR -When calculating which files need to be generated, assume the kernel version -is at least the specified \fIKV\fR. -.TP -\fI\-b\fR, \fI\-\-backup\fR -When updating configuration files, make backups by renaming files with a '.old' -suffix if they are going to be updated. -.TP -\fI\-d\fR, \fI\-\-debug\fR -Run with shell debugging enabled. Really only useful for tracking down -misbehavior. -.TP -\fI\-D\fR, \fI\-\-devfs\fR -Force generation of the deprecated \fI/etc/modules.devfs\fR file. -.TP -\fI\-f\fR, \fI\-\-force\fR -Force generation of files regardless of timestamps. By default, -\fBupdate-modules\fR will regenerate files only when timestamps indicate that -the configuration files are out of date. -.TP -\fI\-v\fR, \fI\-\-verbose\fR -Enable verbose output since by default, \fBupdate-modules\fR only displays -information when it does something and not when it skips steps. -.SH "FILES" -There are two types of file you can put in the module directories: normal files -and exectuable files. Normal files contain standard modules configuration -information, as described in \fBmodules.conf\fR(5) (for files in -\fI/etc/modules.d/\fR) or as described in \fBmodprobe.conf\fR(5) (for files in -\fI/etc/modprobe.d/\fR). Executable files are executed and their output is -used as extra configuration information. Error messages are sent to stderr and -thus do not become part of the configuration file. - -.nf -\fI/etc/modules.d/\fR - config snippets for old module utilities (<= linux-2.4) -\fI/etc/modules.conf\fR - sum of all files in \fI/etc/modules.d/\fR -\fI/etc/modprobe.d/\fR - config snippets for new module utilities (>= linux-2.6) -\fI/etc/modprobe.conf\fR - sum of all files in \fI/etc/modprobe.d/\fR -.fi -.SH "REPORTING BUGS" -Please report bugs via http://bugs.gentoo.org/ -.SH AUTHORS -This manual page was written by Wichert Akkerman -for the Debian GNU/Linux system. Modified for \fIGentoo Linux\fR. -.SH "SEE ALSO" -.BR depmod (1), -.BR modules.conf (5), -.BR modprobe.conf (5) diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/module-init-tools/module-init-tools-3.16-r4.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/module-init-tools/module-init-tools-3.16-r4.ebuild deleted file mode 100644 index 41d5c1f1d8..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/module-init-tools/module-init-tools-3.16-r4.ebuild +++ /dev/null @@ -1,102 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/module-init-tools/module-init-tools-3.16-r1.ebuild,v 1.8 2012/02/04 00:33:38 williamh Exp $ - -inherit eutils flag-o-matic - -DESCRIPTION="tools for managing linux kernel modules" -HOMEPAGE="http://modules.wiki.kernel.org/" -SRC_URI="mirror://kernel/linux/utils/kernel/module-init-tools/${P}.tar.bz2 - mirror://gentoo/${P}-man.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86" -IUSE="static" -RESTRICT="test" - -DEPEND="sys-libs/zlib" -RDEPEND="${DEPEND} - ! "${T}"/usb-load-ehci-first.conf - install ohci_hcd /sbin/modprobe ehci_hcd ; /sbin/modprobe --ignore-install ohci_hcd \$CMDLINE_OPTS - install uhci_hcd /sbin/modprobe ehci_hcd ; /sbin/modprobe --ignore-install uhci_hcd \$CMDLINE_OPTS - EOF - - insinto /etc/modprobe.d - doins "${T}"/usb-load-ehci-first.conf || die #260139 -} - -pkg_postinst() { - # cheat to keep users happy - if grep -qs modules-update "${ROOT}"/etc/init.d/modules ; then - sed -i 's:modules-update:update-modules:' "${ROOT}"/etc/init.d/modules - fi - - # For files that were upgraded but not renamed via their ebuild to - # have a proper .conf extension, rename them so etc-update tools can - # take care of things. #274942 - local i f cfg - eshopts_push -s nullglob - for f in "${ROOT}"etc/modprobe.d/* ; do - # The .conf files need no upgrading unless a non-.conf exists, - # so skip this until later ... - [[ ${f} == *.conf ]] && continue - # If a .conf doesn't exist, then a package needs updating, or - # the user created it, or it's orphaned. Either way, we don't - # really know, so leave it alone. - [[ ! -f ${f}.conf ]] && continue - - i=0 - while :; do - cfg=$(printf "%s/._cfg%04d_%s.conf" "${f%/*}" ${i} "${f##*/}") - [[ ! -e ${cfg} ]] && break - ((i++)) - done - elog "Updating ${f}; please run 'etc-update'" - mv "${f}.conf" "${cfg}" - mv "${f}" "${f}.conf" - done - # Whine about any non-.conf files that are left - for f in "${ROOT}"etc/modprobe.d/* ; do - [[ ${f} == *.conf ]] && continue - ewarn "The '${f}' file needs to be upgraded to end with a '.conf'." - ewarn "Either upgrade the package that owns it, or manually rename it." - done - eshopts_pop -} diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/Manifest b/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/Manifest deleted file mode 100644 index da193aa420..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST shadow-4.1.2.2.tar.bz2 1697615 RMD160 19b8d3bc37d26d708ecad6a86e6a1f2dcc3c51d3 SHA1 6cbd29104c219ff6776eececb8068f7326d57a45 SHA256 378fbfb0e8bb8c87be239fccd692818871f763206bb7d881744f4fa72dc6b491 diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/files/4.1.2.2/shadow-svn-2298.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/files/4.1.2.2/shadow-svn-2298.patch deleted file mode 100644 index 5489001cc1..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/files/4.1.2.2/shadow-svn-2298.patch +++ /dev/null @@ -1,52 +0,0 @@ -http://bugs.gentoo.org/256784 - -From 6f74a20a3002280f23033dea64d7186896d0dfc0 Mon Sep 17 00:00:00 2001 -From: nekral-guest -Date: Sat, 30 Aug 2008 18:31:21 +0000 -Subject: [PATCH] * configure.in: Check if the stat structure has a st_atim or - st_atimensec field. - * libmisc/copydir.c: Conditionally use the stat's st_atim and - st_atimensec fields. - -git-svn-id: svn://svn.debian.org/pkg-shadow/upstream/trunk@2298 5a98b0ae-9ef6-0310-add3-de5d479b70d7 ---- - ChangeLog | 4 ++++ - libmisc/copydir.c | 9 +++++++-- - 2 files changed, 11 insertions(+), 2 deletions(-) - -+ * configure.in: Check if the stat structure has a st_atim or -+ st_atimensec field. -+ * libmisc/copydir.c: Conditionally use the stat's st_atim and -+ st_atimensec fields. - -diff --git a/libmisc/copydir.c b/libmisc/copydir.c -index b887303..cdd2037 100644 ---- a/libmisc/copydir.c -+++ b/libmisc/copydir.c -@@ -288,16 +288,21 @@ static int copy_entry (const char *src, const char *dst, - if (LSTAT (src, &sb) == -1) { - /* If we cannot stat the file, do not care. */ - } else { --#if defined(_BSD_SOURCE) || defined(_SVID_SOURCE) -+#ifdef HAVE_STRUCT_STAT_ST_ATIM - mt[0].tv_sec = sb.st_atim.tv_sec; - mt[0].tv_usec = sb.st_atim.tv_nsec / 1000; - mt[1].tv_sec = sb.st_mtim.tv_sec; - mt[1].tv_usec = sb.st_mtim.tv_nsec / 1000; - #else - mt[0].tv_sec = sb.st_atime; -- mt[0].tv_usec = sb.st_atimensec / 1000; - mt[1].tv_sec = sb.st_mtime; -+#ifdef HAVE_STRUCT_STAT_ST_ATIMENSEC -+ mt[0].tv_usec = sb.st_atimensec / 1000; - mt[1].tv_usec = sb.st_mtimensec / 1000; -+#else -+ mt[0].tv_usec = 0; -+ mt[1].tv_usec = 0; -+#endif - #endif - - if (S_ISDIR (sb.st_mode)) { --- -1.6.1.2 - diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/files/4.1.2.2/shadow-svn-2364.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/files/4.1.2.2/shadow-svn-2364.patch deleted file mode 100644 index 59333feb0b..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/files/4.1.2.2/shadow-svn-2364.patch +++ /dev/null @@ -1,61 +0,0 @@ -http://bugs.gentoo.org/256784 - -From 060292366348d55eb90b5c3f4f15768ffc7639d2 Mon Sep 17 00:00:00 2001 -From: nekral-guest -Date: Sun, 7 Sep 2008 00:05:38 +0000 -Subject: [PATCH] * libmisc/copydir.c, configure.in: Check for the presence of - st_mtim and st_mtimensec, as for st_atim and st_atimensec. - -git-svn-id: svn://svn.debian.org/pkg-shadow/upstream/trunk@2364 5a98b0ae-9ef6-0310-add3-de5d479b70d7 ---- - ChangeLog | 5 +++++ - configure.in | 2 ++ - libmisc/copydir.c | 17 ++++++++++++----- - 3 files changed, 19 insertions(+), 5 deletions(-) - -+2008-09-07 Nicolas François -+ -+ * libmisc/copydir.c, configure.in: Check for the presence of -+ st_mtim and st_mtimensec, as for st_atim and st_atimensec. - -/* configure.in changes are in the 4.1.2.2 configure.in ... */ - -diff --git a/libmisc/copydir.c b/libmisc/copydir.c -index cdd2037..a9aec98 100644 ---- a/libmisc/copydir.c -+++ b/libmisc/copydir.c -@@ -288,19 +288,26 @@ static int copy_entry (const char *src, const char *dst, - if (LSTAT (src, &sb) == -1) { - /* If we cannot stat the file, do not care. */ - } else { --#ifdef HAVE_STRUCT_STAT_ST_ATIM -+#ifdef HAVE_STRUCT_STAT_ST_ATIM - mt[0].tv_sec = sb.st_atim.tv_sec; - mt[0].tv_usec = sb.st_atim.tv_nsec / 1000; -- mt[1].tv_sec = sb.st_mtim.tv_sec; -- mt[1].tv_usec = sb.st_mtim.tv_nsec / 1000; - #else - mt[0].tv_sec = sb.st_atime; -- mt[1].tv_sec = sb.st_mtime; - #ifdef HAVE_STRUCT_STAT_ST_ATIMENSEC - mt[0].tv_usec = sb.st_atimensec / 1000; -- mt[1].tv_usec = sb.st_mtimensec / 1000; - #else - mt[0].tv_usec = 0; -+#endif -+#endif -+ -+#ifdef HAVE_STRUCT_STAT_ST_MTIM -+ mt[1].tv_sec = sb.st_mtim.tv_sec; -+ mt[1].tv_usec = sb.st_mtim.tv_nsec / 1000; -+#else -+ mt[1].tv_sec = sb.st_mtime; -+#ifdef HAVE_STRUCT_STAT_ST_MTIMENSEC -+ mt[1].tv_usec = sb.st_mtimensec / 1000; -+#else - mt[1].tv_usec = 0; - #endif - #endif --- -1.6.1.2 - diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/files/default/useradd b/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/files/default/useradd deleted file mode 100644 index ae81dbb3a0..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/files/default/useradd +++ /dev/null @@ -1,7 +0,0 @@ -# useradd defaults file -GROUP=100 -HOME=/home -INACTIVE=-1 -EXPIRE= -SHELL=/bin/bash -SKEL=/etc/skel diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/files/login.defs b/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/files/login.defs deleted file mode 100644 index 4aa7044bec..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/files/login.defs +++ /dev/null @@ -1,212 +0,0 @@ -# -# /etc/login.defs - Configuration control definitions for the login package. -# -# $Id: login.defs,v 1.6 2006/03/12 23:47:08 flameeyes Exp $ -# -# Three items must be defined: MAIL_DIR, ENV_SUPATH, and ENV_PATH. -# If unspecified, some arbitrary (and possibly incorrect) value will -# be assumed. All other items are optional - if not specified then -# the described action or option will be inhibited. -# -# Comment lines (lines beginning with "#") and blank lines are ignored. -# -# Modified for Linux. --marekm - -# -# Delay in seconds before being allowed another attempt after a login failure -# -FAIL_DELAY 3 - -# -# Enable display of unknown usernames when login failures are recorded. -# -LOG_UNKFAIL_ENAB no - -# -# Enable logging of successful logins -# -LOG_OK_LOGINS no - -# -# Enable "syslog" logging of su activity - in addition to sulog file logging. -# SYSLOG_SG_ENAB does the same for newgrp and sg. -# -SYSLOG_SU_ENAB yes -SYSLOG_SG_ENAB yes - -# -# If defined, either full pathname of a file containing device names or -# a ":" delimited list of device names. Root logins will be allowed only -# upon these devices. -# -CONSOLE /etc/securetty -#CONSOLE console:tty01:tty02:tty03:tty04 - -# -# If defined, all su activity is logged to this file. -# -#SULOG_FILE /var/log/sulog - -# -# If defined, file which maps tty line to TERM environment parameter. -# Each line of the file is in a format something like "vt100 tty01". -# -#TTYTYPE_FILE /etc/ttytype - -# -# If defined, the command name to display when running "su -". For -# example, if this is defined as "su" then a "ps" will display the -# command is "-su". If not defined, then "ps" would display the -# name of the shell actually being run, e.g. something like "-sh". -# -SU_NAME su - -# -# *REQUIRED* -# Directory where mailboxes reside, _or_ name of file, relative to the -# home directory. If you _do_ define both, MAIL_DIR takes precedence. -# -MAIL_DIR /var/spool/mail - -# -# If defined, file which inhibits all the usual chatter during the login -# sequence. If a full pathname, then hushed mode will be enabled if the -# user's name or shell are found in the file. If not a full pathname, then -# hushed mode will be enabled if the file exists in the user's home directory. -# -HUSHLOGIN_FILE .hushlogin -#HUSHLOGIN_FILE /etc/hushlogins - -# -# *REQUIRED* The default PATH settings, for superuser and normal users. -# -# (they are minimal, add the rest in the shell startup files) -ENV_SUPATH PATH=/sbin:/bin:/usr/sbin:/usr/bin -ENV_PATH PATH=/bin:/usr/bin - -# -# Terminal permissions -# -# TTYGROUP Login tty will be assigned this group ownership. -# TTYPERM Login tty will be set to this permission. -# -# If you have a "write" program which is "setgid" to a special group -# which owns the terminals, define TTYGROUP to the group number and -# TTYPERM to 0620. Otherwise leave TTYGROUP commented out and assign -# TTYPERM to either 622 or 600. -# -TTYGROUP tty -TTYPERM 0600 - -# -# Login configuration initializations: -# -# ERASECHAR Terminal ERASE character ('\010' = backspace). -# KILLCHAR Terminal KILL character ('\025' = CTRL/U). -# UMASK Default "umask" value. -# -# The ERASECHAR and KILLCHAR are used only on System V machines. -# The ULIMIT is used only if the system supports it. -# (now it works with setrlimit too; ulimit is in 512-byte units) -# -# Prefix these values with "0" to get octal, "0x" to get hexadecimal. -# -ERASECHAR 0177 -KILLCHAR 025 -UMASK 022 - -# -# Password aging controls: -# -# PASS_MAX_DAYS Maximum number of days a password may be used. -# PASS_MIN_DAYS Minimum number of days allowed between password changes. -# PASS_WARN_AGE Number of days warning given before a password expires. -# -PASS_MAX_DAYS 99999 -PASS_MIN_DAYS 0 -PASS_WARN_AGE 7 - -# -# Min/max values for automatic uid selection in useradd -# -UID_MIN 1000 -UID_MAX 60000 - -# -# Min/max values for automatic gid selection in groupadd -# -GID_MIN 100 -GID_MAX 60000 - -# -# Max number of login retries if password is bad -# -LOGIN_RETRIES 3 - -# -# Max time in seconds for login -# -LOGIN_TIMEOUT 60 - -# -# Which fields may be changed by regular users using chfn - use -# any combination of letters "frwh" (full name, room number, work -# phone, home phone). If not defined, no changes are allowed. -# For backward compatibility, "yes" = "rwh" and "no" = "frwh". -# -CHFN_RESTRICT rwh - -# -# List of groups to add to the user's supplementary group set -# when logging in on the console (as determined by the CONSOLE -# setting). Default is none. -# -# Use with caution - it is possible for users to gain permanent -# access to these groups, even when not logged in on the console. -# How to do it is left as an exercise for the reader... -# -#CONSOLE_GROUPS floppy:audio:cdrom - -# -# Should login be allowed if we can't cd to the home directory? -# Default in no. -# -DEFAULT_HOME yes - -# -# If defined, this command is run when removing a user. -# It should remove any at/cron/print jobs etc. owned by -# the user to be removed (passed as the first argument). -# -#USERDEL_CMD /usr/sbin/userdel_local - -# -# When prompting for password without echo, getpass() can optionally -# display a random number (in the range 1 to GETPASS_ASTERISKS) of '*' -# characters for each character typed. This feature is designed to -# confuse people looking over your shoulder when you enter a password :-). -# Also, the new getpass() accepts both Backspace (8) and Delete (127) -# keys to delete previous character (to cope with different terminal -# types), Control-U to delete all characters, and beeps when there are -# no more characters to delete, or too many characters entered. -# -# Setting GETPASS_ASTERISKS to 1 results in more traditional behaviour - -# exactly one '*' displayed for each character typed. -# -# Setting GETPASS_ASTERISKS to 0 disables the '*' characters (Backspace, -# Delete, Control-U and beep continue to work as described above). -# -# Setting GETPASS_ASTERISKS to -1 reverts to the traditional getpass() -# without any new features. This is the default. -# -GETPASS_ASTERISKS 0 - -# -# Enable setting of the umask group bits to be the same as owner bits -# (examples: 022 -> 002, 077 -> 007) for non-root users, if the uid is -# the same as gid, and username is the same as the primary group name. -# -# This also enables userdel to remove user groups if no members exist. -# -USERGROUPS_ENAB yes - diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/files/login.pamd b/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/files/login.pamd deleted file mode 100644 index f8f1f86fbc..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/files/login.pamd +++ /dev/null @@ -1,30 +0,0 @@ -#%PAM-1.0 - -auth required pam_securetty.so -auth include system-auth -auth required pam_tally.so file=/var/log/faillog onerr=succeed no_magic_root -auth required pam_shells.so -auth required pam_nologin.so - -account required pam_access.so -account include system-auth -account required pam_tally.so deny=0 file=/var/log/faillog onerr=succeed no_magic_root - -password include system-auth - -@selinux@# pam_selinux.so close should be the first session rule -@selinux@session required pam_selinux.so close -@selinux@ -session include system-auth -session required pam_env.so -session optional pam_lastlog.so -session optional pam_motd.so motd=/etc/motd -session optional pam_mail.so - -# If you want to enable pam_console, uncomment the following line -# and read carefully README.pam_console in /usr/share/doc/pam* -#session optional pam_console.so - -@selinux@# pam_selinux.so open should be the last session rule -@selinux@session required pam_selinux.so multiple open -@selinux@ diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/files/login.pamd.1 b/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/files/login.pamd.1 deleted file mode 100644 index 2c784e240a..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/files/login.pamd.1 +++ /dev/null @@ -1,31 +0,0 @@ -#%PAM-1.0 - -auth required pam_securetty.so -auth required pam_tally.so file=/var/log/faillog onerr=succeed no_magic_root -auth required pam_shells.so -auth required pam_nologin.so -auth include system-auth - -account required pam_access.so -account include system-auth -account required pam_tally.so deny=0 file=/var/log/faillog onerr=succeed no_magic_root - -password include system-auth - -@selinux@# pam_selinux.so close should be the first session rule -@selinux@session required pam_selinux.so close -@selinux@ -session required pam_env.so -session optional pam_lastlog.so -session optional pam_motd.so motd=/etc/motd -session optional pam_mail.so - -# If you want to enable pam_console, uncomment the following line -# and read carefully README.pam_console in /usr/share/doc/pam* -#session optional pam_console.so - -session include system-auth - -@selinux@# pam_selinux.so open should be the last session rule -@selinux@session required pam_selinux.so multiple open -@selinux@ diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/files/login.pamd.2 b/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/files/login.pamd.2 deleted file mode 100644 index 49c3a648b1..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/files/login.pamd.2 +++ /dev/null @@ -1,28 +0,0 @@ -#%PAM-1.0 - -auth include chromeos-auth -auth required pam_securetty.so -auth required pam_tally.so file=/var/log/faillog onerr=succeed -auth required pam_shells.so -auth required pam_nologin.so -auth include system-auth - -account required pam_access.so -account include system-auth -account required pam_tally.so file=/var/log/faillog onerr=succeed - -password include system-auth - -#%EPAM-Use-Flag:selinux%## pam_selinux.so close should be the first session rule -#%EPAM-Use-Flag:selinux%#session required pam_selinux.so close -#%EPAM-Use-Flag:selinux%# -session required pam_env.so -session optional pam_lastlog.so -session optional pam_motd.so motd=/etc/motd -session optional pam_mail.so - -session include system-auth - -#%EPAM-Use-Flag:selinux%## pam_selinux.so open should be the last session rule -#%EPAM-Use-Flag:selinux%#session required pam_selinux.so multiple open -#%EPAM-Use-Flag:selinux%# diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/files/login.pamd.3 b/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/files/login.pamd.3 deleted file mode 100644 index 13abd2796b..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/files/login.pamd.3 +++ /dev/null @@ -1,6 +0,0 @@ -auth required pam_securetty.so -auth include system-local-login - -account include system-local-login -password include system-local-login -session include system-local-login diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/files/login_defs.awk b/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/files/login_defs.awk deleted file mode 100644 index 56087c647e..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/files/login_defs.awk +++ /dev/null @@ -1,32 +0,0 @@ -# Fixes up login defs for PAM by commenting all non-PAM options and adding a -# comment that it is not supported with PAM. -# -# Call with lib/getdef.c and etc/login.defs as args in the root source directory -# of shadow, ie: -# -# gawk -f login_defs.awk lib/getdef.c etc/login.defs > login.defs.new -# - -(FILENAME == "lib/getdef.c") { - if ($2 == "USE_PAM") - start_printing = 1 - else if ($1 == "#endif") - nextfile - else if (start_printing == 1) - VARS[count++] = substr($1, 3, length($1) - 4) -} - -(FILENAME != "lib/getdef.c") { - print_line = 1 - for (x in VARS) { - regex = "(^|#)" VARS[x] - if ($0 ~ regex) { - print_line = 0 - printf("%s%s\t(NOT SUPPORTED WITH PAM)\n", - ($0 ~ /^#/) ? "" : "#", $0) - } - } - if (print_line) - print $0 -} - diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/files/login_defs_pam.sed b/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/files/login_defs_pam.sed deleted file mode 100644 index ba308ba9ab..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/files/login_defs_pam.sed +++ /dev/null @@ -1,24 +0,0 @@ -/^FAILLOG_ENAB/b comment -/^LASTLOG_ENAB/b comment -/^MAIL_CHECK_ENAB/b comment -/^OBSCURE_CHECKS_ENAB/b comment -/^PORTTIME_CHECKS_ENAB/b comment -/^QUOTAS_ENAB/b comment -/^MOTD_FILE/b comment -/^FTMP_FILE/b comment -/^NOLOGINS_FILE/b comment -/^ENV_HZ/b comment -/^PASS_MIN_LEN/b comment -/^SU_WHEEL_ONLY/b comment -/^CRACKLIB_DICTPATH/b comment -/^PASS_CHANGE_TRIES/b comment -/^PASS_ALWAYS_WARN/b comment -/^CHFN_AUTH/b comment -/^ENVIRON_FILE/b comment - -b exit - -: comment - s:^:#: - -: exit diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/files/pam.d-include/login b/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/files/pam.d-include/login deleted file mode 100644 index 9d2167793c..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/files/pam.d-include/login +++ /dev/null @@ -1,12 +0,0 @@ -#%PAM-1.0 - -auth required pam_securetty.so -auth include system-auth -auth required pam_nologin.so - -account include system-auth - -password include system-auth - -session include system-auth -session optional pam_console.so diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/files/pam.d-include/other b/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/files/pam.d-include/other deleted file mode 100644 index bb0b9647c0..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/files/pam.d-include/other +++ /dev/null @@ -1,9 +0,0 @@ -#%PAM-1.0 - -auth required pam_deny.so - -account required pam_deny.so - -password required pam_deny.so - -session required pam_deny.so diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/files/pam.d-include/passwd b/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/files/pam.d-include/passwd deleted file mode 100644 index 3a98715220..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/files/pam.d-include/passwd +++ /dev/null @@ -1,5 +0,0 @@ -#%PAM-1.0 - -auth include system-auth -account include system-auth -password include system-auth diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/files/pam.d-include/shadow b/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/files/pam.d-include/shadow deleted file mode 100644 index 743b2f0260..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/files/pam.d-include/shadow +++ /dev/null @@ -1,8 +0,0 @@ -#%PAM-1.0 - -auth sufficient pam_rootok.so -auth required pam_permit.so - -account include system-auth - -password required pam_permit.so diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/files/pam.d-include/su b/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/files/pam.d-include/su deleted file mode 100644 index d15c7edfc5..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/files/pam.d-include/su +++ /dev/null @@ -1,32 +0,0 @@ -#%PAM-1.0 - -auth sufficient pam_rootok.so - -# If you want to restrict users begin allowed to su even more, -# create /etc/security/suauth.allow (or to that matter) that is only -# writable by root, and add users that are allowed to su to that -# file, one per line. -#auth required pam_listfile.so item=ruser sense=allow onerr=fail file=/etc/security/suauth.allow - -# Uncomment this to allow users in the wheel group to su without -# entering a passwd. -#auth sufficient pam_wheel.so use_uid trust - -# Alternatively to above, you can implement a list of users that do -# not need to supply a passwd with a list. -#auth sufficient pam_listfile.so item=ruser sense=allow onerr=fail file=/etc/security/suauth.nopass - -# Comment this to allow any user, even those not in the 'wheel' -# group to su -auth required pam_wheel.so use_uid - -auth include system-auth - -account include system-auth - -password include system-auth - -session include system-auth -session required pam_env.so -session optional pam_xauth.so - diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/files/pam.d-include/su-openpam b/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/files/pam.d-include/su-openpam deleted file mode 100644 index e9ec7d3dd2..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/files/pam.d-include/su-openpam +++ /dev/null @@ -1,14 +0,0 @@ -#%PAM-1.0 - -auth sufficient pam_rootok.so - -auth include system-auth - -account include system-auth - -password include system-auth - -session include system-auth -session required pam_env.so -session optional pam_xauth.so - diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/files/pam.d-include/system-auth b/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/files/pam.d-include/system-auth deleted file mode 100644 index b7c37afdad..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/files/pam.d-include/system-auth +++ /dev/null @@ -1,14 +0,0 @@ -#%PAM-1.0 - -auth required pam_env.so -auth sufficient pam_unix.so likeauth nullok nodelay -auth required pam_deny.so - -account required pam_unix.so - -password required pam_cracklib.so retry=3 -password sufficient pam_unix.so nullok md5 shadow use_authtok -password required pam_deny.so - -session required pam_limits.so -session required pam_unix.so diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/files/pam.d-include/system-auth-1.1 b/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/files/pam.d-include/system-auth-1.1 deleted file mode 100644 index fe80483120..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/files/pam.d-include/system-auth-1.1 +++ /dev/null @@ -1,14 +0,0 @@ -#%PAM-1.0 - -auth required pam_env.so -auth sufficient pam_unix.so likeauth nullok -auth required pam_deny.so - -account required pam_unix.so - -password required pam_cracklib.so retry=3 -password sufficient pam_unix.so nullok md5 shadow use_authtok -password required pam_deny.so - -session required pam_limits.so -session required pam_unix.so diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/files/securetty b/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/files/securetty deleted file mode 100644 index 218b9f4bfc..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/files/securetty +++ /dev/null @@ -1,35 +0,0 @@ -# /etc/securetty: list of terminals on which root is allowed to login. -# See securetty(5) and login(1). -console - -vc/0 -vc/1 -vc/2 -vc/3 -vc/4 -vc/5 -vc/6 -vc/7 -vc/8 -vc/9 -vc/10 -vc/11 -vc/12 -tty0 -tty1 -tty2 -tty3 -tty4 -tty5 -tty6 -tty7 -tty8 -tty9 -tty10 -tty11 -tty12 - -tts/0 -ttyS0 -ttySAC1 -ttySAC3 diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/files/shadow-4.0.11.1-perms.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/files/shadow-4.0.11.1-perms.patch deleted file mode 100644 index 3446fd7f66..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/files/shadow-4.0.11.1-perms.patch +++ /dev/null @@ -1,46 +0,0 @@ ---- src/Makefile.am 2005-08-01 12:29:59.000000000 +0200 -+++ src.az/Makefile.am 2005-08-01 12:30:44.000000000 +0200 -@@ -45,6 +45,8 @@ noinst_PROGRAMS = id sulogin - - suidbins = su - suidubins = chage chfn chsh expiry gpasswd newgrp passwd -+suidbinperms = 4711 -+suidubinperms = 4711 - - LDADD = $(top_builddir)/libmisc/libmisc.a \ - $(top_builddir)/lib/libshadow.la -@@ -79,8 +81,8 @@ install-am: all-am - ln -sf newgrp $(DESTDIR)$(ubindir)/sg - ln -sf vipw $(DESTDIR)$(usbindir)/vigr - for i in $(suidbins); do \ -- chmod -f 4755 $(DESTDIR)$(bindir)/$$i; \ -+ chmod -f $(suidbinperms) $(DESTDIR)$(bindir)/$$i; \ - done - for i in $(suidubins); do \ -- chmod -f 4755 $(DESTDIR)$(ubindir)/$$i; \ -+ chmod -f $(suidubinperms) $(DESTDIR)$(ubindir)/$$i; \ - done ---- src/Makefile.in 2005-08-01 12:31:07.000000000 +0200 -+++ src.az/Makefile.in 2005-08-01 12:33:54.000000000 +0200 -@@ -346,6 +346,8 @@ INCLUDES = \ - - suidbins = su - suidubins = chage chfn chsh expiry gpasswd newgrp passwd -+suidbinperms = 4711 -+suidubinperms = 4711 - LDADD = $(top_builddir)/libmisc/libmisc.a \ - $(top_builddir)/lib/libshadow.la - -@@ -839,10 +841,10 @@ install-am: all-am - ln -sf newgrp $(DESTDIR)$(ubindir)/sg - ln -sf vipw $(DESTDIR)$(usbindir)/vigr - for i in $(suidbins); do \ -- chmod -f 4755 $(DESTDIR)$(bindir)/$$i; \ -+ chmod -f $(suidbinperms) $(DESTDIR)$(bindir)/$$i; \ - done - for i in $(suidubins); do \ -- chmod -f 4755 $(DESTDIR)$(ubindir)/$$i; \ -+ chmod -f $(suidubinperms) $(DESTDIR)$(ubindir)/$$i; \ - done - # Tell versions [3.59,3.63) of GNU make to not export all variables. - # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/files/shadow-4.0.12-gcc2.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/files/shadow-4.0.12-gcc2.patch deleted file mode 100644 index b70dbceffc..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/files/shadow-4.0.12-gcc2.patch +++ /dev/null @@ -1,30 +0,0 @@ -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/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/files/shadow-4.0.13-dots-in-usernames.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/files/shadow-4.0.13-dots-in-usernames.patch deleted file mode 100644 index 54e1d72e61..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/files/shadow-4.0.13-dots-in-usernames.patch +++ /dev/null @@ -1,28 +0,0 @@ -Allow people to add users with dots in their names. - -http://bugs.gentoo.org/22920 - -Index: libmisc/chkname.c -=================================================================== -RCS file: /cvsroot/shadow/libmisc/chkname.c,v -retrieving revision 1.11 -diff -u -p -r1.11 chkname.c ---- libmisc/chkname.c 31 Aug 2005 17:24:57 -0000 1.11 -+++ libmisc/chkname.c 10 Oct 2005 22:20:16 -0000 -@@ -18,7 +18,7 @@ - static int good_name (const char *name) - { - /* -- * User/group names must match [a-z_][a-z0-9_-]*[$] -+ * User/group names must match [a-z_][a-z0-9_-.]*[$] - */ - if (!*name || !((*name >= 'a' && *name <= 'z') || *name == '_')) - return 0; -@@ -27,6 +27,7 @@ static int good_name (const char *name) - if (!((*name >= 'a' && *name <= 'z') || - (*name >= '0' && *name <= '9') || - *name == '_' || *name == '-' || -+ *name == '.' || - (*name == '$' && *(name + 1) == '\0'))) - return 0; - } diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/files/shadow-4.0.13-long-groupnames.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/files/shadow-4.0.13-long-groupnames.patch deleted file mode 100644 index df322cf28b..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/files/shadow-4.0.13-long-groupnames.patch +++ /dev/null @@ -1,18 +0,0 @@ -Remove arbitrary requirement on the length of groups. Perhaps we -should turn this into a configure option and send upstream ? - -http://bugs.gentoo.org/3485 - ---- libmisc/chkname.c -+++ libmisc/chkname.c -@@ -59,8 +60,10 @@ - * Arbitrary limit for group names - max 16 - * characters (same as on HP-UX 10). - */ -+#if 0 - if (strlen (name) > 16) - return 0; -+#endif - - return good_name (name); - } diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/files/shadow-4.0.13-nonis.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/files/shadow-4.0.13-nonis.patch deleted file mode 100644 index 0c89e90e21..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/files/shadow-4.0.13-nonis.patch +++ /dev/null @@ -1,53 +0,0 @@ ---- src/login_nopam.c -+++ src/login_nopam.c -@@ -50,7 +50,9 @@ - #include - #include /* for inet_ntoa() */ - extern struct group *getgrnam (); -+#ifdef USE_NIS - extern int innetgr (); -+#endif - - #if !defined(MAXHOSTNAMELEN) || (MAXHOSTNAMELEN < 64) - #undef MAXHOSTNAMELEN -@@ -178,6 +180,7 @@ static char *myhostname (void) - return (name); - } - -+#ifdef USE_NIS - /* netgroup_match - match group against machine or user */ - static int - netgroup_match (const char *group, const char *machine, const char *user) -@@ -193,6 +196,7 @@ netgroup_match (const char *group, const - - return innetgr (group, machine, user, mydomain); - } -+#endif - - /* user_match - match a username against one token */ - static int user_match (const char *tok, const char *string) -@@ -214,8 +218,10 @@ static int user_match (const char *tok, - *at = 0; - return (user_match (tok, string) - && from_match (at + 1, myhostname ())); -+#ifdef USE_NIS - } else if (tok[0] == '@') { /* netgroup */ - return (netgroup_match (tok + 1, (char *) 0, string)); -+#endif - } else if (string_match (tok, string)) { /* ALL or exact match */ - return (YES); - } else if ((group = getgrnam (tok))) { /* try group membership */ -@@ -271,9 +277,12 @@ static int from_match (const char *tok, - * contain a "." character. If the token is a network number, return YES - * if it matches the head of the string. - */ -+#ifdef USE_NIS - if (tok[0] == '@') { /* netgroup */ - return (netgroup_match (tok + 1, string, (char *) 0)); -- } else if (string_match (tok, string)) { /* ALL or exact match */ -+ } else -+#endif -+ if (string_match (tok, string)) { /* ALL or exact match */ - return (YES); - } else if (tok[0] == '.') { /* domain: match last fields */ - if ((str_len = strlen (string)) > (tok_len = strlen (tok)) diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/files/shadow-4.0.15-uclibc-missing-l64a.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/files/shadow-4.0.15-uclibc-missing-l64a.patch deleted file mode 100644 index ac9aa8c9df..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/files/shadow-4.0.15-uclibc-missing-l64a.patch +++ /dev/null @@ -1,57 +0,0 @@ -uClibc svn has l64a() support in it, but not uClibc 0.9.28 release - ---- shadow-4.0.15/libmisc/salt.c -+++ shadow-4.0.15/libmisc/salt.c -@@ -14,6 +14,52 @@ - #include "prototypes.h" - #include "defines.h" - #include "getdef.h" -+ -+#ifndef HAVE_A64L -+ -+/* -+ * l64a - convert a long to a string of radix 64 characters -+ */ -+ -+static const char conv_table[64] = -+{ -+ '.', '/', '0', '1', '2', '3', '4', '5', -+ '6', '7', '8', '9', 'A', 'B', 'C', 'D', -+ 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', -+ 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', -+ 'U', 'V', 'W', 'X', 'Y', 'Z', 'a', 'b', -+ 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', -+ 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', -+ 's', 't', 'u', 'v', 'w', 'x', 'y', 'z' -+}; -+ -+char * -+l64a (n) -+ long int n; -+{ -+ unsigned long int m = (unsigned long int) n; -+ static char result[7]; -+ int cnt; -+ -+ /* The standard says that only 32 bits are used. */ -+ m &= 0xffffffff; -+ -+ if (m == 0ul) -+ /* The value for N == 0 is defined to be the empty string. */ -+ return (char *) ""; -+ -+ for (cnt = 0; m > 0ul; ++cnt) -+ { -+ result[cnt] = conv_table[m & 0x3f]; -+ m >>= 6; -+ } -+ result[cnt] = '\0'; -+ -+ return result; -+} -+ -+#endif /* !HAVE_A64L */ -+ - /* - * Generate 8 base64 ASCII characters of random salt. If MD5_CRYPT_ENAB - * in /etc/login.defs is "yes", the salt string will be prefixed by "$1$" diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/files/shadow-4.0.16-fix-useradd-usergroups.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/files/shadow-4.0.16-fix-useradd-usergroups.patch deleted file mode 100644 index 3170869f02..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/files/shadow-4.0.16-fix-useradd-usergroups.patch +++ /dev/null @@ -1,105 +0,0 @@ -http://bugs.gentoo.org/128715 - -exact implementation details are still in discussion upstream, but this fixes -the behavior to not suck like current code - -Index: src/useradd.c -=================================================================== -RCS file: /cvsroot/shadow/src/useradd.c,v -retrieving revision 1.96 -diff -u -p -r1.96 useradd.c ---- src/useradd.c 30 May 2006 18:28:45 -0000 1.96 -+++ src/useradd.c 10 Jun 2006 22:13:32 -0000 -@@ -114,7 +114,7 @@ static int do_grp_update = 0; /* group f - static char *Prog; - - static int -- bflg = 0, /* new default root of home directory */ -+ bflg = 0, /* new default root of home directory */ - cflg = 0, /* comment (GECOS) field for new account */ - dflg = 0, /* home directory for new account */ - Dflg = 0, /* set/show new user default values */ -@@ -253,6 +253,12 @@ static void get_defaults (void) - const struct group *grp; - - /* -+ * Pull relevant settings from login.defs first. -+ */ -+ if (getdef_bool ("USERGROUPS_ENAB")) -+ nflg = -1; -+ -+ /* - * Open the defaults file for reading. - */ - -@@ -628,6 +634,8 @@ static void usage (void) - " -K, --key KEY=VALUE overrides /etc/login.defs defaults\n" - " -m, --create-home create home directory for the new user\n" - " account\n" -+ " -n, --user-group create a new group with the same name as the\n" -+ " new user\n" - " -o, --non-unique allow create user with duplicate\n" - " (non-unique) UID\n" - " -p, --password PASSWORD use encrypted password for the new user\n" -@@ -1009,6 +1017,7 @@ static void process_flags (int argc, cha - {"skel", required_argument, NULL, 'k'}, - {"key", required_argument, NULL, 'K'}, - {"create-home", no_argument, NULL, 'm'}, -+ {"user-group", no_argument, NULL, 'n'}, - {"non-unique", no_argument, NULL, 'o'}, - {"password", required_argument, NULL, 'p'}, - {"shell", required_argument, NULL, 's'}, -@@ -1016,7 +1025,7 @@ static void process_flags (int argc, cha - {NULL, 0, NULL, '\0'} - }; - while ((c = -- getopt_long (argc, argv, "b:c:d:De:f:g:G:k:K:mMop:s:u:", -+ getopt_long (argc, argv, "b:c:d:De:f:g:G:k:K:mMnop:s:u:", - long_options, NULL)) != -1) { - switch (c) { - case 'b': -@@ -1156,6 +1165,9 @@ static void process_flags (int argc, cha - case 'm': - mflg++; - break; -+ case 'n': -+ nflg = 1; -+ break; - case 'o': - oflg++; - break; -@@ -1203,6 +1215,16 @@ static void process_flags (int argc, cha - usage (); - - /* -+ * Using --gid and --user-group doesn't make sense. -+ */ -+ if (nflg == -1 && gflg) -+ nflg = 0; -+ if (nflg && gflg) { -+ fprintf (stderr, _("%s: options -g and -n conflict\n"), Prog); -+ exit (E_BAD_ARG); -+ } -+ -+ /* - * Either -D or username is required. Defaults can be set with -D - * for the -b, -e, -f, -g, -s options only. - */ -@@ -1725,7 +1747,7 @@ int main (int argc, char **argv) - * to that group, use useradd -g username username. - * --bero - */ -- if (!gflg) { -+ if (nflg) { - if (getgrnam (user_name)) { - fprintf (stderr, - _ -@@ -1759,7 +1781,7 @@ int main (int argc, char **argv) - - /* do we have to add a group for that user? This is why we need to - * open the group files in the open_files() function --gafton */ -- if (!(nflg || gflg)) { -+ if (nflg) { - find_new_gid (); - grp_add (); - } diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/files/shadow-4.0.17-login.defs.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/files/shadow-4.0.17-login.defs.patch deleted file mode 100644 index 03eb731fa9..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/files/shadow-4.0.17-login.defs.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- etc/login.defs -+++ etc/login.defs -@@ -38 +38 @@ --MAIL_CHECK_ENAB yes -+MAIL_CHECK_ENAB no -@@ -205 +205 @@ --SU_WHEEL_ONLY no -+SU_WHEEL_ONLY yes -@@ -210 +210 @@ --CRACKLIB_DICTPATH /var/cache/cracklib/cracklib_dict -+CRACKLIB_DICTPATH /usr/@LIBDIR@/cracklib_dict -@@ -227 +227 @@ --LOGIN_RETRIES 5 -+LOGIN_RETRIES 3 -@@ -279 +279 @@ --#MD5_CRYPT_ENAB no -+MD5_CRYPT_ENAB yes diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/files/shadow-4.0.18.1-useradd-usermod.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/files/shadow-4.0.18.1-useradd-usermod.patch deleted file mode 100644 index 8fe14329f1..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/files/shadow-4.0.18.1-useradd-usermod.patch +++ /dev/null @@ -1,42 +0,0 @@ ---- shadow-4.0.18.1.orig/src/useradd.c 2006-07-28 19:42:48.000000000 +0200 -+++ shadow-4.0.18.1/src/useradd.c 2006-08-04 09:24:34.000000000 +0200 -@@ -203,13 +203,17 @@ - long gid; - char *errptr; - -+ struct group* grp = getgrnam (grname); -+ if (grp) -+ return grp; -+ - gid = strtol (grname, &errptr, 10); - if (*errptr || errno == ERANGE || gid < 0) { - fprintf (stderr, - _("%s: invalid numeric argument '%s'\n"), Prog, grname); - exit (E_BAD_ARG); - } -- return getgrnam (grname); -+ return getgrgid (gid); - } - - static long get_number (const char *numstr) ---- shadow-4.0.18.1.orig/src/usermod.c 2006-07-28 19:42:48.000000000 +0200 -+++ shadow-4.0.18.1/src/usermod.c 2006-08-04 09:24:21.000000000 +0200 -@@ -165,13 +165,17 @@ - long val; - char *errptr; - -+ struct group* grp = getgrnam (grname); -+ if (grp) -+ return grp; -+ - val = strtol (grname, &errptr, 10); - if (*errptr || errno == ERANGE || val < 0) { - fprintf (stderr, _("%s: invalid numeric argument '%s'\n"), Prog, - grname); - exit (E_BAD_ARG); - } -- return getgrnam (grname); -+ return getgrgid (val); - } - - /* diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/files/shadow-4.0.18.2-useradd.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/files/shadow-4.0.18.2-useradd.patch deleted file mode 100644 index 1135500758..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/files/shadow-4.0.18.2-useradd.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- shadow-4.0.18.2/src/useradd.c -+++ shadow-4.0.18.2/src/useradd.c -@@ -203,14 +203,18 @@ - long gid; - char *errptr; - -+ struct group* grp = getgrnam (grname); -+ if (grp) -+ return grp; -+ - gid = strtol (grname, &errptr, 10); - if (*errptr || errno == ERANGE || gid < 0) { - fprintf (stderr, - _("%s: invalid numeric argument '%s'\n"), Prog, - grname); - exit (E_BAD_ARG); - } -- return getgrnam (grname); -+ return getgrgid (gid); - } - - static long get_number (const char *numstr) diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/files/shadow-4.1.0-fix-useradd-usergroups.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/files/shadow-4.1.0-fix-useradd-usergroups.patch deleted file mode 100644 index 8595ec39a9..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/files/shadow-4.1.0-fix-useradd-usergroups.patch +++ /dev/null @@ -1,91 +0,0 @@ -http://bugs.gentoo.org/128715 - -exact implementation details are still in discussion upstream, but this fixes -the behavior to not suck like current code - ---- src/useradd.c -+++ src/useradd.c -@@ -254,6 +254,12 @@ - char *cp, *ep; - - /* -+ * Pull relevant settings from login.defs first. -+ */ -+ if (getdef_bool ("USERGROUPS_ENAB")) -+ nflg = -1; -+ -+ /* - * Open the defaults file for reading. - */ - -@@ -632,6 +638,8 @@ - " -K, --key KEY=VALUE overrides /etc/login.defs defaults\n" - " -m, --create-home create home directory for the new user\n" - " account\n" -+ " -n, --user-group create a new group with the same name as the\n" -+ " new user\n" - " -o, --non-unique allow create user with duplicate\n" - " (non-unique) UID\n" - " -p, --password PASSWORD use encrypted password for the new user\n" -@@ -1001,6 +1009,7 @@ - {"skel", required_argument, NULL, 'k'}, - {"key", required_argument, NULL, 'K'}, - {"create-home", no_argument, NULL, 'm'}, -+ {"user-group", no_argument, NULL, 'n'}, - {"non-unique", no_argument, NULL, 'o'}, - {"password", required_argument, NULL, 'p'}, - {"shell", required_argument, NULL, 's'}, -@@ -1008,7 +1017,7 @@ - {NULL, 0, NULL, '\0'} - }; - while ((c = -- getopt_long (argc, argv, "b:c:d:De:f:g:G:k:K:mMop:s:u:", -+ getopt_long (argc, argv, "b:c:d:De:f:g:G:k:K:mMnop:s:u:", - long_options, NULL)) != -1) { - switch (c) { - case 'b': -@@ -1145,6 +1154,9 @@ - case 'm': - mflg++; - break; -+ case 'n': -+ nflg = 1; -+ break; - case 'o': - oflg++; - break; -@@ -1192,6 +1204,16 @@ - usage (); - - /* -+ * Using --gid and --user-group doesn't make sense. -+ */ -+ if (nflg == -1 && gflg) -+ nflg = 0; -+ if (nflg && gflg) { -+ fprintf (stderr, _("%s: options -g and -n conflict\n"), Prog); -+ exit (E_BAD_ARG); -+ } -+ -+ /* - * Either -D or username is required. Defaults can be set with -D - * for the -b, -e, -f, -g, -s options only. - */ -@@ -1728,7 +1750,7 @@ - * to that group, use useradd -g username username. - * --bero - */ -- if (!gflg) { -+ if (nflg) { - if (getgrnam (user_name)) { /* local, no need for xgetgrnam */ - fprintf (stderr, - _ -@@ -1762,7 +1784,7 @@ - - /* do we have to add a group for that user? This is why we need to - * open the group files in the open_files() function --gafton */ -- if (!(nflg || gflg)) { -+ if (nflg) { - find_new_gid (); - grp_add (); - } diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/files/shadow-4.1.1-audit.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/files/shadow-4.1.1-audit.patch deleted file mode 100644 index 5968279f87..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/files/shadow-4.1.1-audit.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- a/trunk/src/newgrp.c 2008/04/16 22:03:43 1975 -+++ b/trunk/src/newgrp.c 2008/04/16 22:04:46 1976 -@@ -53,6 +53,10 @@ - static char *Prog; - static int is_newgrp; - -+#ifdef WITH_AUDIT -+char audit_buf[80]; -+#endif -+ - /* local function prototypes */ - static void usage (void); - static void check_perms (const struct group *grp, -@@ -349,8 +353,6 @@ - #endif - - #ifdef WITH_AUDIT -- char audit_buf[80]; -- - audit_help_open (); - #endif - setlocale (LC_ALL, ""); diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/files/shadow-4.1.2.1+openpam.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/files/shadow-4.1.2.1+openpam.patch deleted file mode 100644 index f10e02d036..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/files/shadow-4.1.2.1+openpam.patch +++ /dev/null @@ -1,121 +0,0 @@ -Index: shadow-4.1.2.1/configure.in -=================================================================== ---- shadow-4.1.2.1.orig/configure.in -+++ shadow-4.1.2.1/configure.in -@@ -339,13 +339,29 @@ if test "$with_libpam" != "no"; then - AC_MSG_ERROR(libpam not found) - fi - -- AC_CHECK_LIB(pam_misc, main, -- [pam_misc_lib="yes"], [pam_misc_lib="no"]) -- if test "$pam_misc_lib$with_libpam" = "noyes" ; then -- AC_MSG_ERROR(libpam_misc not found) -+ LIBPAM="-lpam" -+ pam_conv_function="no" -+ -+ AC_CHECK_LIB(pam, openpam_ttyconv, -+ [pam_conv_function="openpam_ttyconv"], -+ AC_CHECK_LIB(pam_misc, misc_conv, -+ [pam_conv_function="misc_conv"; LIBPAM="$LIBPAM -lpam_misc"]) -+ ) -+ -+ if test "$pam_conv_function$with_libpam" = "noyes" ; then -+ AC_MSG_ERROR(PAM conversation function not found) - fi - -- if test "$pam_lib$pam_misc_lib" = "yesyes" ; then -+ pam_headers_found=no -+ AC_CHECK_HEADERS( [security/openpam.h security/pam_misc.h], -+ [ pam_headers_found=yes ; break ], [], -+ [ #include ] ) -+ if test "$pam_headers_found$with_libpam" = "noyes" ; then -+ AC_MSG_ERROR(PAM headers not found) -+ fi -+ -+ -+ if test "$pam_lib$pam_headers_found" = "yesyes" -a "$pam_conv_function" != "no" ; then - with_libpam="yes" - else - with_libpam="no" -@@ -353,9 +369,22 @@ if test "$with_libpam" != "no"; then - fi - dnl Now with_libpam is either yes or no - if test "$with_libpam" = "yes"; then -+ AC_CHECK_DECLS([PAM_ESTABLISH_CRED, -+ PAM_DELETE_CRED, -+ PAM_NEW_AUTHTOK_REQD, -+ PAM_DATA_SILENT], -+ [], [], [#include ]) -+ -+ -+ save_libs=$LIBS -+ LIBS="$LIBS $LIBPAM" -+ AC_CHECK_FUNCS([pam_fail_delay]) -+ LIBS=$save_libs -+ - AC_DEFINE(USE_PAM, 1, [Define to support Pluggable Authentication Modules]) -+ AC_DEFINE_UNQUOTED(SHADOW_PAM_CONVERSATION, [$pam_conv_function],[PAM converstation to use]) - AM_CONDITIONAL(USE_PAM, [true]) -- LIBPAM="-lpam -lpam_misc" -+ - AC_MSG_CHECKING(use login and su access checking if PAM not used) - AC_MSG_RESULT(no) - else -Index: shadow-4.1.2.1/lib/pam_defs.h -=================================================================== ---- shadow-4.1.2.1.orig/lib/pam_defs.h -+++ shadow-4.1.2.1/lib/pam_defs.h -@@ -28,24 +28,31 @@ - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -+#include - #include --#include -+#ifdef HAVE_SECURITY_PAM_MISC_H -+# include -+#endif -+#ifdef HAVE_SECURITY_OPENPAM_H -+# include -+#endif -+ - - static struct pam_conv conv = { -- misc_conv, -+ SHADOW_PAM_CONVERSATION, - NULL - }; - - /* compatibility with different versions of Linux-PAM */ --#ifndef PAM_ESTABLISH_CRED -+#if !HAVE_DECL_PAM_ESTABLISH_CRED - #define PAM_ESTABLISH_CRED PAM_CRED_ESTABLISH - #endif --#ifndef PAM_DELETE_CRED -+#if !HAVE_DECL_PAM_DELETE_CRED - #define PAM_DELETE_CRED PAM_CRED_DELETE - #endif --#ifndef PAM_NEW_AUTHTOK_REQD -+#if !HAVE_DECL_PAM_NEW_AUTHTOK_REQD - #define PAM_NEW_AUTHTOK_REQD PAM_AUTHTOKEN_REQD - #endif --#ifndef PAM_DATA_SILENT -+#if !HAVE_DECL_PAM_DATA_SILENT - #define PAM_DATA_SILENT 0 - #endif -Index: shadow-4.1.2.1/src/login.c -=================================================================== ---- shadow-4.1.2.1.orig/src/login.c -+++ shadow-4.1.2.1/src/login.c -@@ -644,9 +644,10 @@ int main (int argc, char **argv) - failed = 0; - - failcount++; -+#ifdef HAVE_PAM_FAIL_DELAY - if (delay > 0) - retcode = pam_fail_delay(pamh, 1000000*delay); -- -+#endif - retcode = pam_authenticate (pamh, 0); - - pam_get_item (pamh, PAM_USER, diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/files/shadow-4.1.2.2-id-types.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/files/shadow-4.1.2.2-id-types.patch deleted file mode 100644 index 689884fecb..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/files/shadow-4.1.2.2-id-types.patch +++ /dev/null @@ -1,87 +0,0 @@ -From 670cce502aadf86b5b5d78059e5474e6171919f3 Mon Sep 17 00:00:00 2001 -From: nekral-guest -Date: Sat, 30 Aug 2008 18:30:58 +0000 -Subject: [PATCH] * lib/groupio.h, lib/prototypes.h, lib/pwio.h, lib/sgetgrent.c: - Include before and . It is necessary - for the definition of uid_t and gid_t. - * lib/pwmem.c: do not include , "pwio.h" is sufficient - here. - -git-svn-id: svn://svn.debian.org/pkg-shadow/upstream/trunk@2297 5a98b0ae-9ef6-0310-add3-de5d479b70d7 ---- - lib/groupio.h | 1 + - lib/prototypes.h | 1 + - lib/pwio.h | 2 ++ - lib/pwmem.c | 3 +-- - lib/sgetgrent.c | 1 + - 6 files changed, 11 insertions(+), 2 deletions(-) - -diff --git a/lib/groupio.h b/lib/groupio.h -index 9f2984c..d229845 100644 ---- a/lib/groupio.h -+++ b/lib/groupio.h -@@ -35,6 +35,7 @@ - #ifndef _GROUPIO_H - #define _GROUPIO_H - -+#include - #include - - extern int gr_close (void); -diff --git a/lib/prototypes.h b/lib/prototypes.h -index f1ffc50..feeedc4 100644 ---- a/lib/prototypes.h -+++ b/lib/prototypes.h -@@ -48,6 +48,7 @@ - #else - #include - #endif -+#include - #include - #include - #include -diff --git a/lib/pwio.h b/lib/pwio.h -index 28f8bbd..52c7bf3 100644 ---- a/lib/pwio.h -+++ b/lib/pwio.h -@@ -35,7 +35,9 @@ - #ifndef _PWIO_H - #define _PWIO_H - -+#include - #include -+ - extern int pw_close (void); - extern const struct passwd *pw_locate (const char *name); - extern const struct passwd *pw_locate_uid (uid_t uid); -diff --git a/lib/pwmem.c b/lib/pwmem.c -index 95a6137..84dee3d 100644 ---- a/lib/pwmem.c -+++ b/lib/pwmem.c -@@ -35,10 +35,9 @@ - - #ident "$Id: shadow-4.1.2.2-id-types.patch,v 1.1 2009/03/15 04:56:23 vapier Exp $" - -+#include - #include "prototypes.h" - #include "defines.h" --#include --#include - #include "pwio.h" - - struct passwd *__pw_dup (const struct passwd *pwent) -diff --git a/lib/sgetgrent.c b/lib/sgetgrent.c -index 6f090aa..186ee40 100644 ---- a/lib/sgetgrent.c -+++ b/lib/sgetgrent.c -@@ -35,6 +35,7 @@ - #ident "$Id: shadow-4.1.2.2-id-types.patch,v 1.1 2009/03/15 04:56:23 vapier Exp $" - - #include -+#include - #include - #include "defines.h" - #include "prototypes.h" --- -1.6.2 - diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/files/shadow-4.1.2.2-l64a.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/files/shadow-4.1.2.2-l64a.patch deleted file mode 100644 index e06598cf3c..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/files/shadow-4.1.2.2-l64a.patch +++ /dev/null @@ -1,13 +0,0 @@ -http://bugs.gentoo.org/260001 ---- a/libmisc/salt.c -+++ b/libmisc/salt.c -@@ -20,9 +20,6 @@ - #include "getdef.h" - - /* local function prototypes */ --#ifndef HAVE_L64A --char *l64a(long value); --#endif /* !HAVE_L64A */ - static void seedRNG (void); - static char *gensalt (size_t salt_size); - #ifdef USE_SHA_CRYPT diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/files/shadow-4.1.2.2-optional-nscd.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/files/shadow-4.1.2.2-optional-nscd.patch deleted file mode 100644 index 419a604c3b..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/files/shadow-4.1.2.2-optional-nscd.patch +++ /dev/null @@ -1,93 +0,0 @@ -From 803bce24e3c902efcfba82dad08f25edf1dd3d6f Mon Sep 17 00:00:00 2001 -From: nekral-guest -Date: Sat, 30 Aug 2008 18:30:36 +0000 -Subject: [PATCH] * configure.in, lib/nscd.h, lib/nscd.c: Added --with-nscd flag to - support systems without nscd. - -git-svn-id: svn://svn.debian.org/pkg-shadow/upstream/trunk@2296 5a98b0ae-9ef6-0310-add3-de5d479b70d7 ---- - configure.in | 13 +++++++++++-- - lib/nscd.c | 4 ++++ - lib/nscd.h | 4 ++++ - 4 files changed, 21 insertions(+), 2 deletions(-) - -diff --git a/configure.in b/configure.in -index 044617c..8384a15 100644 ---- a/configure.in -+++ b/configure.in -@@ -38,9 +38,9 @@ AC_CHECK_HEADERS(errno.h fcntl.h limits.h unistd.h sys/time.h utmp.h \ - dnl shadow now uses the libc's shadow implementation - AC_CHECK_HEADER([shadow.h],,[AC_MSG_ERROR([You need a libc with shadow.h])]) - --AC_CHECK_FUNCS(l64a fchmod fchown fsync getgroups gethostname getspnam \ -+AC_CHECK_FUNCS(l64a fchmod fchown fsync futimes getgroups gethostname getspnam \ - gettimeofday getusershell getutent initgroups lchown lckpwdf lstat \ -- memcpy memset setgroups sigaction strchr updwtmp updwtmpx innetgr \ -+ lutimes memcpy memset setgroups sigaction strchr updwtmp updwtmpx innetgr \ - getpwnam_r getpwuid_r getgrnam_r getgrgid_r getspnam_r) - AC_SYS_LARGEFILE - -@@ -235,12 +235,20 @@ AC_ARG_WITH(libcrack, - AC_ARG_WITH(sha-crypt, - [AC_HELP_STRING([--with-sha-crypt], [allow the SHA256 and SHA512 password encryption algorithms @<:@default=yes@:>@])], - [with_sha_crypt=$withval], [with_sha_crypt=yes]) -+AC_ARG_WITH(nscd, -+ [AC_HELP_STRING([--with-nscd], [enable support for nscd @<:@default=yes@:>@])], -+ [with_nscd=$withval], [with_nscd=yes]) - - AM_CONDITIONAL(USE_SHA_CRYPT, test "x$with_sha_crypt" = "xyes") - if test "$with_sha_crypt" = "yes"; then - AC_DEFINE(USE_SHA_CRYPT, 1, [Define to allow the SHA256 and SHA512 password encryption algorithms]) - fi - -+AM_CONDITIONAL(USE_NSCD, test "x$with_nscd" = "xyes") -+if test "$with_nscd" = "yes"; then -+ AC_DEFINE(USE_NSCD, 1, [Define to support flushing of nscd caches]) -+fi -+ - dnl Check for some functions in libc first, only if not found check for - dnl other libraries. This should prevent linking libnsl if not really - dnl needed (Linux glibc, Irix), but still link it if needed (Solaris). -@@ -457,4 +465,5 @@ echo " SELinux support: $with_selinux" - echo " shadow group support: $enable_shadowgrp" - echo " S/Key support: $with_skey" - echo " SHA passwords encryption: $with_sha_crypt" -+echo " nscd support: $with_nscd" - echo -diff --git a/lib/nscd.c b/lib/nscd.c -index 59b7172..5f54b72 100644 ---- a/lib/nscd.c -+++ b/lib/nscd.c -@@ -1,5 +1,8 @@ - /* Author: Peter Vrabec */ - -+#include -+#ifdef USE_NSCD -+ - /* because of TEMP_FAILURE_RETRY */ - #define _GNU_SOURCE - -@@ -54,4 +57,5 @@ int nscd_flush_cache (const char *service) - - return 0; - } -+#endif - -diff --git a/lib/nscd.h b/lib/nscd.h -index 8bb10a8..a430b00 100644 ---- a/lib/nscd.h -+++ b/lib/nscd.h -@@ -4,6 +4,10 @@ - /* - * nscd_flush_cache - flush specified service buffer in nscd cache - */ -+#ifdef USE_NSCD - extern int nscd_flush_cache (const char *service); -+#else -+#define nscd_flush_cache(service) (0) -+#endif - - #endif --- -1.6.2 - diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/files/shadow-4.1.2.2-optional-utimes.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/files/shadow-4.1.2.2-optional-utimes.patch deleted file mode 100644 index eba90da113..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/files/shadow-4.1.2.2-optional-utimes.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 1ed3c6672957f2033f217f90a76f85973f1c85c6 Mon Sep 17 00:00:00 2001 -From: nekral-guest -Date: Sat, 30 Aug 2008 18:29:55 +0000 -Subject: [PATCH] * NEWS: Added support for uclibc. - * configure.in, libmisc/copydir.c: futimes() and lutimes() are not - standard. Check if they are implemented before using them. Do not - set the time of links if lutimes() does not exist, and use - utimes() as a replacement for futimes(). - -git-svn-id: svn://svn.debian.org/pkg-shadow/upstream/trunk@2294 5a98b0ae-9ef6-0310-add3-de5d479b70d7 ---- - libmisc/copydir.c | 8 ++++++++ - 3 files changed, 17 insertions(+), 0 deletions(-) - -diff --git a/libmisc/copydir.c b/libmisc/copydir.c -index abcea4c..b887303 100644 ---- a/libmisc/copydir.c -+++ b/libmisc/copydir.c -@@ -431,12 +431,14 @@ static int copy_symlink (const char *src, const char *dst, - return -1; - } - -+#ifdef HAVE_LUTIMES - /* 2007-10-18: We don't care about - * exit status of lutimes because - * it returns ENOSYS on many system - * - not implemented - */ - lutimes (dst, mt); -+#endif - - return err; - } -@@ -548,9 +550,15 @@ static int copy_file (const char *src, const char *dst, - - (void) close (ifd); - -+#ifdef HAVE_FUTIMES - if (futimes (ofd, mt) != 0) { - return -1; - } -+#else -+ if (utimes(dst, mt) != 0) { -+ return -1; -+ } -+#endif - - if (close (ofd) != 0) { - return -1; --- -1.6.2 - diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/files/shadow-4.1.3-dots-in-usernames.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/files/shadow-4.1.3-dots-in-usernames.patch deleted file mode 100644 index efcb33dbd9..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/files/shadow-4.1.3-dots-in-usernames.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- shadow-4.1.3/libmisc/chkname.c -+++ shadow-4.1.3/libmisc/chkname.c -@@ -66,6 +66,7 @@ - ( ('0' <= *name) && ('9' >= *name) ) || - ('_' == *name) || - ('-' == *name) || -+ ('.' == *name) || - ( ('$' == *name) && ('\0' == *(name + 1)) ) - )) { - return false; diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/files/shadow-4.1.4.2-env-reset-keep-locale.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/files/shadow-4.1.4.2-env-reset-keep-locale.patch deleted file mode 100644 index 7c83f7cd05..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/files/shadow-4.1.4.2-env-reset-keep-locale.patch +++ /dev/null @@ -1,14 +0,0 @@ -http://bugs.gentoo.org/283725 -https://alioth.debian.org/tracker/index.php?func=detail&aid=311740&group_id=30580&atid=411480 - ---- shadow-4.1.4.2/libmisc/env.c -+++ shadow-4.1.4.2/libmisc/env.c -@@ -251,7 +251,7 @@ - if (strncmp (*cur, *bad, strlen (*bad)) != 0) { - continue; - } -- if (strchr (*cur, '/') != NULL) { -+ if (strchr (*cur, '/') == NULL) { - continue; /* OK */ - } - for (move = cur; NULL != *move; move++) { diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/files/shadow-4.1.4.2-groupmod-pam-check.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/files/shadow-4.1.4.2-groupmod-pam-check.patch deleted file mode 100644 index f25c4e10ff..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/files/shadow-4.1.4.2-groupmod-pam-check.patch +++ /dev/null @@ -1,21 +0,0 @@ -http://bugs.gentoo.org/300790 -http://lists.alioth.debian.org/pipermail/pkg-shadow-devel/2009-November/007850.html - -2009-11-05 Nicolas François - - * NEWS, src/groupmod.c: Fixed groupmod when configured with - --enable-account-tools-setuid. - -diff --git a/src/groupmod.c b/src/groupmod.c -index 4205df2..da6d77f 100644 ---- a/src/groupmod.c -+++ b/src/groupmod.c -@@ -724,7 +724,7 @@ int main (int argc, char **argv) - { - struct passwd *pampw; - pampw = getpwuid (getuid ()); /* local, no need for xgetpwuid */ -- if (NULL == pamh) { -+ if (NULL == pampw) { - fprintf (stderr, - _("%s: Cannot determine your user name.\n"), - Prog); diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/files/shadow-4.1.4.2-su_no_sanitize_env.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/files/shadow-4.1.4.2-su_no_sanitize_env.patch deleted file mode 100644 index 0cf74f8975..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/files/shadow-4.1.4.2-su_no_sanitize_env.patch +++ /dev/null @@ -1,14 +0,0 @@ -http://bugs.gentoo.org/show_bug.cgi?id=301957 -https://alioth.debian.org/scm/browser.php?group_id=30580 - ---- a/src/su.c -+++ b/src/su.c -@@ -342,7 +342,7 @@ - #endif - #endif /* !USE_PAM */ - -- sanitize_env (); -+ /* sanitize_env (); */ - - (void) setlocale (LC_ALL, ""); - (void) bindtextdomain (PACKAGE, LOCALEDIR); diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/metadata.xml b/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/metadata.xml deleted file mode 100644 index 68f3ff5a55..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - -base-system - - Enable support for sys-process/audit - When nousuid is enabled only su from the shadow package - will be installed with the setuid bit (mainly for single user - systems) - - diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/shadow-4.1.2.2-r3.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/shadow-4.1.2.2-r3.ebuild deleted file mode 120000 index b8cf9aff3a..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/shadow-4.1.2.2-r3.ebuild +++ /dev/null @@ -1 +0,0 @@ -shadow-4.1.2.2.ebuild \ No newline at end of file diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/shadow-4.1.2.2.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/shadow-4.1.2.2.ebuild deleted file mode 100644 index f2997c5ed2..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/shadow/shadow-4.1.2.2.ebuild +++ /dev/null @@ -1,167 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/shadow/shadow-4.1.2.2.ebuild,v 1.16 2009/08/23 10:45:45 vapier Exp $ - -inherit eutils libtool toolchain-funcs autotools pam multilib - -DESCRIPTION="Utilities to deal with user accounts" -HOMEPAGE="http://shadow.pld.org.pl/ http://pkg-shadow.alioth.debian.org/" -SRC_URI="ftp://pkg-shadow.alioth.debian.org/pub/pkg-shadow/shadow-${PV}.tar.bz2" - -LICENSE="BSD GPL-2" -SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86" -IUSE="audit cracklib nls pam selinux skey" - -RDEPEND="audit? ( sys-process/audit ) - cracklib? ( >=sys-libs/cracklib-2.7-r3 ) - pam? ( virtual/pam ) - !sys-apps/pam-login - !app-admin/nologin - skey? ( sys-auth/skey ) - selinux? ( >=sys-libs/libselinux-1.28 ) - nls? ( virtual/libintl )" -DEPEND="${RDEPEND} - nls? ( sys-devel/gettext )" -RDEPEND="${RDEPEND} - pam? ( >=sys-auth/pambase-20080219.1 )" - -src_unpack() { - unpack ${A} - cd "${S}" - - epatch "${FILESDIR}"/${PV}/*.patch - - # tweak the default login.defs - epatch "${FILESDIR}"/${PN}-4.0.17-login.defs.patch - sed -i "s:@LIBDIR@:$(get_libdir):" etc/login.defs || die - - # Make user/group names more flexible #3485 / #22920 - epatch "${FILESDIR}"/${PN}-4.0.13-dots-in-usernames.patch - epatch "${FILESDIR}"/${PN}-4.0.13-long-groupnames.patch - - epatch "${FILESDIR}"/${PN}-4.1.2.1+openpam.patch #232586 - epatch "${FILESDIR}"/${P}-l64a.patch #260001 - epatch "${FILESDIR}"/${P}-id-types.patch - epatch "${FILESDIR}"/${P}-optional-nscd.patch - epatch "${FILESDIR}"/${P}-optional-utimes.patch - - eautoconf - eautoheader - - elibtoolize - epunt_cxx -} - -src_compile() { - tc-is-cross-compiler && export ac_cv_func_setpgrp_void=yes - econf \ - --enable-shared=no \ - --enable-static=yes \ - $(use_with audit) \ - $(use_with cracklib libcrack) \ - $(use_with pam libpam) \ - $(use_with skey) \ - $(use_with selinux) \ - $(use_enable nls) \ - $(use_with elibc_glibc nscd) \ - || die "bad configure" - emake || die "compile problem" -} - -src_install() { - emake DESTDIR="${D}" suidperms=4711 install || die "install problem" - dosym useradd /usr/sbin/adduser - - # Remove libshadow and libmisc; see bug 37725 and the following - # comment from shadow's README.linux: - # Currently, libshadow.a is for internal use only, so if you see - # -lshadow in a Makefile of some other package, it is safe to - # remove it. - rm -f "${D}"/{,usr/}$(get_libdir)/lib{misc,shadow}.{a,la} - - insinto /etc - # Using a securetty with devfs device names added - # (compat names kept for non-devfs compatibility) - insopts -m0600 ; doins "${FILESDIR}"/securetty - if ! use pam ; then - insopts -m0600 - doins etc/login.access etc/limits - fi - # Output arch-specific cruft - case $(tc-arch) in - ppc*) echo "hvc0" >> "${D}"/etc/securetty - echo "hvsi0" >> "${D}"/etc/securetty - echo "ttyPSC0" >> "${D}"/etc/securetty;; - hppa) echo "ttyB0" >> "${D}"/etc/securetty;; - arm) echo "ttyFB0" >> "${D}"/etc/securetty;; - sh) echo "ttySC0" >> "${D}"/etc/securetty - echo "ttySC1" >> "${D}"/etc/securetty;; - esac - - # needed for 'adduser -D' - insinto /etc/default - insopts -m0600 - doins "${FILESDIR}"/default/useradd - - # move passwd to / to help recover broke systems #64441 - mv "${D}"/usr/bin/passwd "${D}"/bin/ - dosym /bin/passwd /usr/bin/passwd - - cd "${S}" - insinto /etc - insopts -m0644 - newins etc/login.defs login.defs - - if use pam ; then - dopamd "${FILESDIR}/pam.d-include/"{su,passwd,shadow} - - newpamd "${FILESDIR}/login.pamd.2" login - - for x in chage chsh chfn chpasswd newusers \ - user{add,del,mod} group{add,del,mod} ; do - newpamd "${FILESDIR}"/pam.d-include/shadow ${x} - done - - # comment out login.defs options that pam hates - sed -i -f "${FILESDIR}"/login_defs_pam.sed \ - "${D}"/etc/login.defs - - # remove manpages that pam will install for us - # and/or don't apply when using pam - find "${D}"/usr/share/man \ - '(' -name 'limits.5*' -o -name 'suauth.5*' ')' \ - -exec rm {} \; - fi - - # Remove manpages that are handled by other packages - find "${D}"/usr/share/man \ - '(' -name id.1 -o -name passwd.5 -o -name getspnam.3 ')' \ - -exec rm {} \; - - cd "${S}" - dodoc ChangeLog NEWS TODO - newdoc README README.download - cd doc - dodoc HOWTO README* WISHLIST *.txt -} - -pkg_preinst() { - rm -f "${ROOT}"/etc/pam.d/system-auth.new \ - "${ROOT}/etc/login.defs.new" - - use pam && pam_epam_expand "${D}"/etc/pam.d/login -} - -pkg_postinst() { - # Enable shadow groups (we need ROOT=/ here, as grpconv only - # operate on / ...). - if [[ ${ROOT} == / && ! -f /etc/gshadow ]] ; then - if grpck -r &>/dev/null; then - grpconv - else - ewarn "Running 'grpck' returned errors. Please run it by hand, and then" - ewarn "run 'grpconv' afterwards!" - fi - fi -}