diff options
author | Nicolas Iooss | 2019-01-11 18:43:01 +0100 |
---|---|---|
committer | Nicolas Iooss | 2019-01-11 18:43:01 +0100 |
commit | 56db1f3b21872fb022139b9d7441758560e5f78d (patch) | |
tree | a098e4a8bb77104e641c9861ab7cdc3f4e55c943 | |
parent | d6069a1440dfa3dbc147097859e47b475534a5df (diff) | |
download | aur-56db1f3b21872fb022139b9d7441758560e5f78d.tar.gz |
shadow-selinux 4.6-2 update
-rw-r--r-- | .SRCINFO | 11 | ||||
-rw-r--r-- | PKGBUILD | 28 | ||||
-rw-r--r-- | shadow-strncpy-usage.patch | 25 | ||||
-rw-r--r-- | xstrdup.patch | 9 |
4 files changed, 19 insertions, 54 deletions
@@ -1,7 +1,7 @@ pkgbase = shadow-selinux pkgdesc = Password and account management tool suite with support for shadow files and PAM - SELinux support pkgver = 4.6 - pkgrel = 1 + pkgrel = 2 url = https://github.com/shadow-maint/shadow install = shadow.install arch = x86_64 @@ -15,12 +15,11 @@ pkgbase = shadow-selinux depends = pam-selinux depends = acl depends = libsemanage - provides = shadow=4.6-1 - provides = selinux-shadow=4.6-1 + provides = shadow=4.6-2 + provides = selinux-shadow=4.6-2 conflicts = shadow conflicts = selinux-shadow options = strip - options = debug backup = etc/login.defs backup = etc/pam.d/chage backup = etc/pam.d/passwd @@ -47,8 +46,6 @@ pkgbase = shadow-selinux source = shadow.timer source = shadow.service source = useradd.defaults - source = xstrdup.patch - source = shadow-strncpy-usage.patch validpgpkeys = D5C2F9BFCA128BBA22A77218872F702C4D6E25A8 sha1sums = SKIP sha1sums = 33a6cf1e44a1410e5c9726c89e5de68b78f5f922 @@ -61,8 +58,6 @@ pkgbase = shadow-selinux sha1sums = a154a94b47a3d0c6c287253b98c0d10b861226d0 sha1sums = b5540736f5acbc23b568973eb5645604762db3dd sha1sums = c173208c5cf34528602f9931468a67b7f68abad3 - sha1sums = 6010fffeed1fc6673ad9875492e1193b1a847b53 - sha1sums = 21e12966a6befb25ec123b403cd9b5c492fe5b16 pkgname = shadow-selinux @@ -1,4 +1,3 @@ -# $Id$ # Maintainer: Dave Reisner <dreisner@archlinux.org> # Maintainer: Aaron Griffin <aaron@archlinux.org> # SELinux Maintainer: Nicolas Iooss (nicolas <dot> iooss <at> m4x <dot> org) @@ -11,7 +10,7 @@ pkgname=shadow-selinux pkgver=4.6 -pkgrel=1 +pkgrel=2 pkgdesc="Password and account management tool suite with support for shadow files and PAM - SELinux support" arch=('x86_64') url='https://github.com/shadow-maint/shadow' @@ -27,7 +26,7 @@ backup=(etc/login.defs etc/pam.d/{chpasswd,newusers,groupadd,groupdel,groupmod} etc/pam.d/{chgpasswd,groupmems} etc/default/useradd) -options=(strip debug) +options=(strip) install='shadow.install' validpgpkeys=('D5C2F9BFCA128BBA22A77218872F702C4D6E25A8') # Christian Perrier source=("git+https://github.com/shadow-maint/shadow.git#tag=$pkgver" @@ -39,9 +38,7 @@ source=("git+https://github.com/shadow-maint/shadow.git#tag=$pkgver" newusers passwd shadow.{timer,service} - useradd.defaults - xstrdup.patch - shadow-strncpy-usage.patch) + useradd.defaults) sha1sums=('SKIP' '33a6cf1e44a1410e5c9726c89e5de68b78f5f922' '4ad0e059406a305c8640ed30d93c2a1f62c2f4ad' @@ -52,9 +49,7 @@ sha1sums=('SKIP' '611be25d91c3f8f307c7fe2485d5f781e5dee75f' 'a154a94b47a3d0c6c287253b98c0d10b861226d0' 'b5540736f5acbc23b568973eb5645604762db3dd' - 'c173208c5cf34528602f9931468a67b7f68abad3' - '6010fffeed1fc6673ad9875492e1193b1a847b53' - '21e12966a6befb25ec123b403cd9b5c492fe5b16') + 'c173208c5cf34528602f9931468a67b7f68abad3') pkgver() { cd "${pkgname/-selinux}" @@ -65,9 +60,18 @@ pkgver() { prepare() { cd "${pkgname/-selinux}" - # 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 diff --git a/shadow-strncpy-usage.patch b/shadow-strncpy-usage.patch deleted file mode 100644 index 5aba8fa01f94..000000000000 --- a/shadow-strncpy-usage.patch +++ /dev/null @@ -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.orig 2012-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); diff --git a/xstrdup.patch b/xstrdup.patch deleted file mode 100644 index bce434264cd0..000000000000 --- a/xstrdup.patch +++ /dev/null @@ -1,9 +0,0 @@ ---- shadow-4.1.2.1/libmisc/xmalloc.c 2008-08-30 21:55:44.000000000 -0500 -+++ shadow-4.1.2.1/libmisc/xmalloc.c.new 2008-08-30 21:55:36.000000000 -0500 -@@ -61,5 +61,6 @@ - - char *xstrdup (const char *str) - { -+ if(str == NULL) return NULL; - return strcpy (xmalloc (strlen (str) + 1), str); - } |