[arch-commits] Commit in shadow/trunk (3 files)
Date: Monday, December 31, 2018 @ 13:14:03
Author: dreisner
Revision: 342839
upgpkg: shadow 4.6-2
- backport fix for crash with `useradd -s ` (FS#60924)
- cherrypick two commits for fixing crashes in usermod
- drop our own local patches (the patches, they do nothing!)
Modified:
shadow/trunk/PKGBUILD
Deleted:
shadow/trunk/shadow-strncpy-usage.patch
shadow/trunk/xstrdup.patch
+
PKGBUILD | 25 +++--
shadow-strncpy-usage.patch | 25 -
xstrdup.patch |9 -
3 files changed, 15 insertions(+), 44 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2018-12-31 08:49:38 UTC (rev 342838)
+++ PKGBUILD2018-12-31 13:14:03 UTC (rev 342839)
@@ -3,7 +3,7 @@
pkgname=shadow
pkgver=4.6
-pkgrel=1
+pkgrel=2
pkgdesc="Password and account management tool suite with support for shadow
files and PAM"
arch=('x86_64')
url='https://github.com/shadow-maint/shadow'
@@ -28,9 +28,7 @@
newusers
passwd
shadow.{timer,service}
-useradd.defaults
-xstrdup.patch
-shadow-strncpy-usage.patch)
+useradd.defaults)
sha1sums=('SKIP'
'33a6cf1e44a1410e5c9726c89e5de68b78f5f922'
'4ad0e059406a305c8640ed30d93c2a1f62c2f4ad'
@@ -41,9 +39,7 @@
'611be25d91c3f8f307c7fe2485d5f781e5dee75f'
'a154a94b47a3d0c6c287253b98c0d10b861226d0'
'b5540736f5acbc23b568973eb5645604762db3dd'
- 'c173208c5cf34528602f9931468a67b7f68abad3'
- '6010fffeed1fc6673ad9875492e1193b1a847b53'
- '21e12966a6befb25ec123b403cd9b5c492fe5b16')
+ 'c173208c5cf34528602f9931468a67b7f68abad3')
pkgver() {
cd "$pkgname"
@@ -54,10 +50,19 @@
prepare() {
cd "$pkgname"
- # need to offer these upstream
- patch -Np1 <"$srcdir/xstrdup.patch"
- patch -Np1 <"$srcdir/shadow-strncpy-usage.patch"
+ local backports=(
+# Fix usermod crash
+73a876a05612c278da747faeaeea40c3b8d34a53
+# usermod: prevent a segv
+48dcf7852e51b9d8e7926737cc7f7823978b7d7d
+# https://github.com/shadow-maint/shadow/issues/125
+10e388efc2c786d1ec4ed007891bfefa8826b6fd
+ )
+ for commit in "${backports[@]}"; do
+git cherry-pick -n "$commit"
+ done
+
autoreconf -v -f --install
# supress etc/pam.d/*, we provide our own
Deleted: shadow-strncpy-usage.patch
===
--- shadow-strncpy-usage.patch 2018-12-31 08:49:38 UTC (rev 342838)
+++ shadow-strncpy-usage.patch 2018-12-31 13:14:03 UTC (rev 342839)
@@ -1,25 +0,0 @@
-diff -u shadow-4.1.5/src/usermod.c.orig shadow-4.1.5/src/usermod.c
shadow-4.1.5/src/usermod.c.orig2012-02-13 08:19:43.792146449 -0500
-+++ shadow-4.1.5/src/usermod.c 2012-02-13 08:21:19.375114500 -0500
-@@ -182,7 +182,7 @@
- struct tm *tp;
-
- if (date < 0) {
-- strncpy (buf, "never", maxsize);
-+ strncpy (buf, "never", maxsize - 1);
- } else {
- time_t t = (time_t) date;
- tp = gmtime (&t);
-diff -u shadow-4.1.5/src/login.c.orig shadow-4.1.5/src/login.c
shadow-4.1.5/src/login.c.orig 2012-02-13 08:19:50.951994454 -0500
-+++ shadow-4.1.5/src/login.c 2012-02-13 08:21:04.490430937 -0500
-@@ -752,7 +752,8 @@
- _("%s login: "), hostn);
- } else {
- strncpy (loginprompt, _("login: "),
-- sizeof (loginprompt));
-+ sizeof (loginprompt) - 1);
-+ loginprompt[sizeof (loginprompt) - 1] = '\0';
- }
-
- retcode = pam_set_item (pamh, PAM_USER_PROMPT, loginprompt);
Deleted: xstrdup.patch
===
--- xstrdup.patch 2018-12-31 08:49:38 UTC (rev 342838)
+++ xstrdup.patch 2018-12-31 13:14:03 UTC (rev 342839)
@@ -1,9 +0,0 @@
shadow-4.1.2.1/libmisc/xmalloc.c 2008-08-30 21:55:44.0 -0500
-+++ shadow-4.1.2.1/libmisc/xmalloc.c.new 2008-08-30 21:55:36.0
-0500
-@@ -61,5 +61,6 @@
-
- char *xstrdup (const char *str)
- {
-+ if(str == NULL) return NULL;
- return strcpy (xmalloc (strlen (str) + 1), str);
- }
[arch-commits] Commit in shadow/trunk (3 files)
Date: Saturday, February 25, 2012 @ 10:52:38
Author: dreisner
Revision: 151350
upgpkg: shadow 4.1.5-4
- revert change to login preventing utmp/wtmp writes (FS#28543)
- fix i686 userdel crash (FS#28594)
Added:
shadow/trunk/userdel-avoid-bad-mem-access.patch
shadow/trunk/write-utmp-wtmp-entries.patch
Modified:
shadow/trunk/PKGBUILD
+
PKGBUILD | 19 +--
userdel-avoid-bad-mem-access.patch | 57 +++
write-utmp-wtmp-entries.patch | 47
3 files changed, 120 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2012-02-25 15:28:56 UTC (rev 151349)
+++ PKGBUILD2012-02-25 15:52:38 UTC (rev 151350)
@@ -4,7 +4,7 @@
pkgname=shadow
pkgver=4.1.5
-pkgrel=3
+pkgrel=4
pkgdesc="Password and account management tool suite with support for shadow
files and PAM"
arch=('i686' 'x86_64')
url='http://pkg-shadow.alioth.debian.org/'
@@ -33,7 +33,9 @@
nscd-error-reporting.patch
xstrdup.patch
shadow-strncpy-usage.patch
-shadow-add-missing-include.patch)
+shadow-add-missing-include.patch
+userdel-avoid-bad-mem-access.patch
+write-utmp-wtmp-entries.patch)
sha1sums=('3ab1ae0e30af36d04445314fcb5a079bdf05de41'
'0a31aafceb948a91fe7370a6378cafd6fd883145'
'33a6cf1e44a1410e5c9726c89e5de68b78f5f922'
@@ -50,7 +52,9 @@
'ae6eebb842c433ac4022c493294a13ed68e06acc'
'6010fffeed1fc6673ad9875492e1193b1a847b53'
'21e12966a6befb25ec123b403cd9b5c492fe5b16'
- '0697a21f7519de30821da7772677035652df4ad2')
+ '0697a21f7519de30821da7772677035652df4ad2'
+ 'e1dd93d82c6eba76b5f17a9fefad4bbc513cff5b'
+ 'bcef8558c9123b396d2d4df26c815a951f97a91a')
build() {
cd "$pkgname-$pkgver"
@@ -61,11 +65,20 @@
# link to glibc's crypt(3)
LDFLAGS+=" -lcrypt"
+ # need to offer these upstream
patch -Np1 <"$srcdir/xstrdup.patch"
patch -Np1 <"$srcdir/shadow-strncpy-usage.patch"
+
+ # backports queued for 4.1.5.1
patch -Np1 <"$srcdir/shadow-add-missing-include.patch"
patch -Np1 <"$srcdir/nscd-error-reporting.patch"
+ # sent to ML
+ patch -Np0 <"$srcdir/userdel-avoid-bad-mem-access.patch"
+
+ # revert to fix FS#28543
+ patch -RNp1 <"$srcdir/write-utmp-wtmp-entries.patch"
+
# supress etc/pam.d/*, we provide our own
sed -i '/^SUBDIRS/s/pam.d//' etc/Makefile.in
Added: userdel-avoid-bad-mem-access.patch
===
--- userdel-avoid-bad-mem-access.patch (rev 0)
+++ userdel-avoid-bad-mem-access.patch 2012-02-25 15:52:38 UTC (rev 151350)
@@ -0,0 +1,57 @@
+Index: src/userdel.c
+===
+--- src/userdel.c (revision 3713)
src/userdel.c (working copy)
+@@ -329,26 +329,33 @@
+ }
+
+ if (NULL == pwd) {
++ char gr_name[GROUP_NAME_MAX_LENGTH + 1];
++
++ /* make a copy of the group name before we delete it.
++ * we can't use ->gr_name after the group is deleted
++ * for logging purposes */
++ snprintf(gr_name, GROUP_NAME_MAX_LENGTH, "%s", grp->gr_name);
++
+ /*
+* We can remove this group, it is not the primary
+* group of any remaining user.
+*/
+- if (gr_remove (grp->gr_name) == 0) {
++ if (gr_remove (gr_name) == 0) {
+ fprintf (stderr,
+_("%s: cannot remove entry '%s' from %s\n"),
+- Prog, grp->gr_name, gr_dbname ());
++ Prog, gr_name, gr_dbname ());
+ fail_exit (E_GRP_UPDATE);
+ }
+
+ #ifdef WITH_AUDIT
+ audit_logger (AUDIT_DEL_GROUP, Prog,
+ "deleting group",
+-grp->gr_name, AUDIT_NO_ID,
++gr_name, AUDIT_NO_ID,
+ SHADOW_AUDIT_SUCCESS);
+ #endif/* WITH_AUDIT */
+ SYSLOG ((LOG_INFO,
+"removed group '%s' owned by '%s'\n",
+- grp->gr_name, user_name));
++ gr_name, user_name));
+
+ #ifdefSHADOWGRP
+ if (sgr_locate (user_name) != NULL) {
+@@ -361,12 +368,12 @@
+ #ifdef WITH_AUDIT
+ audit_logger (AUDIT_DEL_GROUP, Prog,
+ "deleting shadow group",
+-grp->gr_name, AUDIT_NO_ID,
++gr_name, AUDIT_NO_ID,
+ SHADOW_AUDIT_SUCCESS);
+ #endif/* WITH_AUDIT */
+
[arch-commits] Commit in shadow/trunk (3 files)
Date: Monday, February 13, 2012 @ 16:55:51
Author: dreisner
Revision: 150163
upgpkg: shadow 4.1.5-1
- remove CVE patch
- refactor remaining patches
- add source gpg .sig
- build static libmisc (avoids build breakage)
- assorted PKGBUILD cleanup
Modified:
shadow/trunk/PKGBUILD
shadow/trunk/shadow-strncpy-usage.patch
Deleted:
shadow/trunk/shadow_CVE-2011-0721.patch
+
PKGBUILD | 74 +++
shadow-strncpy-usage.patch | 36 +---
shadow_CVE-2011-0721.patch | 57 -
3 files changed, 57 insertions(+), 110 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2012-02-13 21:03:16 UTC (rev 150162)
+++ PKGBUILD2012-02-13 21:55:51 UTC (rev 150163)
@@ -3,8 +3,8 @@
# Maintainer: Aaron Griffin
pkgname=shadow
-pkgver=4.1.4.3
-pkgrel=5
+pkgver=4.1.5
+pkgrel=1
pkgdesc="Password and account management tool suite with support for shadow
files and PAM"
arch=('i686' 'x86_64')
url='http://pkg-shadow.alioth.debian.org/'
@@ -17,15 +17,25 @@
etc/pam.d/{chfn,chgpasswd,groupmems,chsh}
etc/default/useradd)
options=('!libtool')
-install=shadow.install
-#http://pkg-shadow.alioth.debian.org/releases/shadow-$pkgver.tar.bz2
-# shadow 4.1.4.3 is just shadow 4.1.4.2 with shadow_CVE-2011-0721.patch applied
-source=(ftp://ftp.archlinux.org/other/shadow/shadow_4.1.4.2+svn3283.orig.tar.gz
-adduser chgpasswd chpasswd defaults.pam login login.defs newusers
-passwd shadow.cron.daily useradd.defaults LICENSE
-xstrdup.patch shadow_CVE-2011-0721.patch shadow-strncpy-usage.patch
+install='shadow.install'
+source=("http://pkg-shadow.alioth.debian.org/releases/$pkgname-$pkgver.tar.bz2"{,.sig}
+LICENSE
+adduser
+chgpasswd
+chpasswd
+defaults.pam
+login
+login.defs
+newusers
+passwd
+shadow.cron.daily
+useradd.defaults
+xstrdup.patch
+shadow-strncpy-usage.patch
shadow-add-missing-include.patch)
-sha1sums=('8b704b8f07718e329205f23d457c3121c0f3679e'
+sha1sums=('3ab1ae0e30af36d04445314fcb5a079bdf05de41'
+ '0a31aafceb948a91fe7370a6378cafd6fd883145'
+ '33a6cf1e44a1410e5c9726c89e5de68b78f5f922'
'78ec184a499f9708adcfcf0b7a3b22a60bf39f91'
'4ad0e059406a305c8640ed30d93c2a1f62c2f4ad'
'12427b1ca92a9b85ca8202239f0d9f50198b818f'
@@ -36,42 +46,40 @@
'611be25d91c3f8f307c7fe2485d5f781e5dee75f'
'5d83ba7e11c765c951867cbe00b0ae7ff57148fa'
'9ae93de5987dd0ae428f0cc1a5a5a5cd53583f19'
- '33a6cf1e44a1410e5c9726c89e5de68b78f5f922'
'6010fffeed1fc6673ad9875492e1193b1a847b53'
- '6bfe6528391eb38d338beacedd620407877b637d'
- '9db9e62ad173f31e1039121c0124cf60826ffd7e'
+ '21e12966a6befb25ec123b403cd9b5c492fe5b16'
'0697a21f7519de30821da7772677035652df4ad2')
build() {
- cd "$srcdir/$pkgname-4.1.4.2+svn3283"
+ cd "$pkgname-$pkgver"
- # fix linking issues with binutils 2.22
+ # avoid transitive linking issues with binutils 2.22
sed -i '/^user\(mod\|add\)_LDADD/s|$| -lattr|' src/Makefile.am
- # Ugh, force this to build shared libraries, for god's sake
- sed -i "s/noinst_LTLIBRARIES/lib_LTLIBRARIES/g" lib/Makefile.am
- libtoolize
- autoreconf
- export LDFLAGS="$LDFLAGS -lcrypt"
+ # link to glibc's crypt(3)
+ LDFLAGS+=" -lcrypt"
- patch -p1 -i "$srcdir/xstrdup.patch"
- patch -p1 -i "$srcdir/shadow_CVE-2011-0721.patch"
- patch -p1 -i "$srcdir/shadow-strncpy-usage.patch"
- patch -p1 -i "$srcdir/shadow-add-missing-include.patch"
+ patch -Np1 <"$srcdir/xstrdup.patch"
+ patch -Np1 <"$srcdir/shadow-strncpy-usage.patch"
+ patch -Np1 <"$srcdir/shadow-add-missing-include.patch"
# supress etc/pam.d/*, we provide our own
sed -i '/^SUBDIRS/s/pam.d//' etc/Makefile.in
./configure \
---prefix=/usr --libdir=/lib \
---mandir=/usr/share/man --sysconfdir=/etc \
---enable-shared --disable-static \
---with-libpam --without-selinux
+--prefix=/usr \
+--libdir=/lib \
+--mandir=/usr/share/man \
+--sysconfdir=/etc \
+--with-libpam \
+--without-selinux
+
make
}
package() {
- cd "$srcdir/$pkgname-4.1.4.2+svn3283"
+ cd "$pkgname-$pkgver"
+
make DESTDIR="$pkgdir" install
# license
@@ -90,11 +98,9 @@
install -Dm644 "$srcdir/login.defs" "$pkgdir/etc/login.defs"
# PAM config - custom
- install -Dm644 "$srcdir/login" "$pkgdir/etc/pam.d/login"
- install -Dm644 "$srcdir/passwd" "$pkgdir/etc/pam.d/passwd"
- install -Dm644 "$srcdir/chgpasswd" "$pkgdir/etc/pam.d/chgpasswd"
- install -Dm644 "$srcdir/chpasswd" "$pkgdir/etc/pam.d/chpasswd"
- install -Dm644 "$srcdir/newusers" "$pkgdir/etc/pam.d/newusers"
+ install -dm644 "$pkgdir/etc/pam.d"
+ install -t "$pkgdir/etc/pam.d" -m644
"$srcdir"/{login,passwd,chgpas
