Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=0aa96ab459895ff61bd159369100d8e93f3f7a91
commit 0aa96ab459895ff61bd159369100d8e93f3f7a91 Author: Miklos Vajna <[EMAIL PROTECTED]> Date: Fri Dec 21 14:44:35 2007 +0100 shadow-4.1.0-1-i686 version bump changed up2date/url/source to alioth removed -groups.diff, it's now in upstream closes #2631 diff --git a/source/base/shadow/FrugalBuild b/source/base/shadow/FrugalBuild index 0a775e2..39f6ea8 100644 --- a/source/base/shadow/FrugalBuild +++ b/source/base/shadow/FrugalBuild @@ -2,19 +2,21 @@ # Maintainer: VMiklos <[EMAIL PROTECTED]> pkgname=shadow -pkgver=4.0.18.1 -pkgrel=9 +pkgver=4.1.0 +pkgrel=1 pkgdesc="Shadow password file utilities" -url="http://shadow.pld.org.pl"; +url="http://pkg-shadow.alioth.debian.org/"; +pkgurl="ftp://pkg-shadow.alioth.debian.org/pub/pkg-shadow"; backup=(etc/{login.defs,group,passwd,shadow,adduser.conf} etc/limits) depends=('glibc') rodepends=('frugalware') # for /etc/issue groups=('base' 'chroot-core') archs=('i686' 'x86_64' 'ppc') -up2date="lynx -dump ftp://ftp.pld.org.pl/software/shadow|grep tar.bz2$|sed 's/.*-\(.*\)\.t.*/\1/;q'" -source=(ftp://ftp.pld.org.pl/software/$pkgname/$pkgname-$pkgver.tar.bz2 \ +up2date="lynx -dump $pkgurl |Flasttar" +source=($pkgurl/shadow-$pkgver.tar.gz \ adduser group passwd shadow $pkgname-4.0.13-login_defs.diff \ - shadow-4.0.16-useradd.diff shadow-4.0.18.1-groups.diff adduser.conf) + shadow-4.0.16-useradd.diff adduser.conf) +signatures=($source.sig '' '' '' '' '' '' '') build() { @@ -33,13 +35,4 @@ build() Ffile /etc/adduser.conf } -sha1sums=('1a30458e9db05560bfc82529048bd5d60b45cf9b' \ - 'd02dcaea4dc78d7feab23baae57f9a0a77db457f' \ - 'fcdfccf5e6741d2f310e18c2bfa26b205832240a' \ - 'e1554d118f582a978b4b14c348c155af957a1368' \ - 'a70e741ccea2d2f81b25b8b608a5fc3d3ab83ebe' \ - 'a3bcae5d8a4cf64c13599d047d963801962b6f4e' \ - '2edf92c64691c775f8b5962ae6092aa8352ae627' \ - 'c13cf8b5c566e129d4fc62ad3ac08b6c856c992e' \ - '8464ea4fbee01302f5fb2123c8cf9dee58f57eb4') # optimization OK diff --git a/source/base/shadow/shadow-4.0.18.1-groups.diff b/source/base/shadow/shadow-4.0.18.1-groups.diff deleted file mode 100644 index 8fe1432..0000000 --- a/source/base/shadow/shadow-4.0.18.1-groups.diff +++ /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/source/base/shadow/shadow.install b/source/base/shadow/shadow.install index 042fd67..4f07188 100644 --- a/source/base/shadow/shadow.install +++ b/source/base/shadow/shadow.install @@ -1,11 +1,3 @@ -post_upgrade() -{ - # Add the new netdev group - if ! grep -q 'netdev' /etc/group; then - /usr/sbin/groupadd -g 37 netdev 2>/dev/null - fi -} - post_remove() { # Remove the backup files _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
