diff options
| author | Eric Sandall | 2008-02-09 11:37:47 -0800 |
|---|---|---|
| committer | Eric Sandall | 2008-02-09 11:37:47 -0800 |
| commit | 2d3fc2bff252b4b33f5d4bca087c10b33026048e (patch) | |
| tree | 5d0f96e4219f64739b49af4f5b88ce674bbf313a | |
| parent | 5fea5855db8794477dc543ba3c6dbd36edc8b8cb (diff) | |
Revert "shadow 4.1.0"
This reverts commit f4236b7fb69f143baf41a668676543ef10f72ee9.
Remove coreutils update for this stable release cycle.
Conflicts:
security/shadow/DETAILS
security/shadow/HISTORY
| -rwxr-xr-x | security/shadow/BUILD | 2 | ||||
| -rwxr-xr-x | security/shadow/DETAILS | 8 | ||||
| -rw-r--r-- | security/shadow/HISTORY | 4 | ||||
| -rw-r--r-- | security/shadow/shadow-4.0.18.1-useradd-usermod.patch | 42 |
4 files changed, 48 insertions, 8 deletions
diff --git a/security/shadow/BUILD b/security/shadow/BUILD index 5be002571e..dd79a845bf 100755 --- a/security/shadow/BUILD +++ b/security/shadow/BUILD @@ -1,3 +1,5 @@ +patch -p1 < ${SCRIPT_DIRECTORY}/shadow-4.0.18.1-useradd-usermod.patch && + # Do not install default pam configuration files sedit 's|pam.d||' etc/Makefile.in && diff --git a/security/shadow/DETAILS b/security/shadow/DETAILS index 95aaab6ca1..70cd1d8469 100755 --- a/security/shadow/DETAILS +++ b/security/shadow/DETAILS @@ -1,10 +1,10 @@ SPELL=shadow - VERSION=4.1.0 - SOURCE_HASH=sha512:e039068389296258b341f5fc5a3590facdd9eac63c254ef5f382489c62e597d299a2ada9f65bbc733fe31ec35a663b5537b2542cc65a48472623e2381cb15481 + VERSION=4.0.18.1 + SOURCE_HASH=sha512:dc4be79f7e64540129f3c16be392e1d022f771020e5e69b2f03a6db4e73cab780068bd8485609cc65bb46a84316c5d87eefec9ff2c86d718488f3195b5e742c8 SOURCE=$SPELL-$VERSION.tar.bz2 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION - SOURCE_URL[0]=ftp://pkg-shadow.alioth.debian.org/pub/pkg-shadow/$SOURCE - WEB_SITE=http://pkg-shadow.alioth.debian.org/ + SOURCE_URL[0]=http://downloads.linuxfromscratch.org/$SOURCE + WEB_SITE=http://shadow.pld.org.pl/ ENTERED=20050303 PATCHLEVEL=2 SECURITY_PATCH=3 diff --git a/security/shadow/HISTORY b/security/shadow/HISTORY index d1c06fa62b..94c8e29cc0 100644 --- a/security/shadow/HISTORY +++ b/security/shadow/HISTORY @@ -1,7 +1,3 @@ -2008-01-29 Ladislav Hagara <hgr@vabo.cz> - * DETAILS: 4.1.0, new WEB_SITE and SOURCE_URL[0] - * BUILD, shadow-4.0.18.1-useradd-usermod.patch: removed patch - 2008-01-23 Ladislav Hagara <hgr@vabo.cz> * DETAILS: shadow now provides /bin/su, PATCHLEVEL=2 [Bug 14247] * pam.d/su: added (from coreutils) diff --git a/security/shadow/shadow-4.0.18.1-useradd-usermod.patch b/security/shadow/shadow-4.0.18.1-useradd-usermod.patch new file mode 100644 index 0000000000..8fe14329f1 --- /dev/null +++ b/security/shadow/shadow-4.0.18.1-useradd-usermod.patch @@ -0,0 +1,42 @@ +--- 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); + } + + /* |