diff options
author | Mike Frysinger <vapier@gentoo.org> | 2016-12-05 17:18:52 -0500 |
---|---|---|
committer | Mike Frysinger <vapier@gentoo.org> | 2016-12-05 17:20:19 -0500 |
commit | 46e0b1d2b5a8babfa822438be2bc77daafc22057 (patch) | |
tree | 18410ae6aac0bd536568432facd299184d245e74 /sys-apps/shadow/files | |
parent | sys-apps/shadow: update to EAPI=5 (diff) | |
download | gentoo-46e0b1d2b5a8babfa822438be2bc77daafc22057.tar.gz gentoo-46e0b1d2b5a8babfa822438be2bc77daafc22057.tar.bz2 gentoo-46e0b1d2b5a8babfa822438be2bc77daafc22057.zip |
sys-apps/shadow: version bump to 4.4 #580432
Diffstat (limited to 'sys-apps/shadow/files')
-rw-r--r-- | sys-apps/shadow/files/shadow-4.4-prototypes.patch | 42 | ||||
-rw-r--r-- | sys-apps/shadow/files/shadow-4.4-su-snprintf.patch | 29 |
2 files changed, 71 insertions, 0 deletions
diff --git a/sys-apps/shadow/files/shadow-4.4-prototypes.patch b/sys-apps/shadow/files/shadow-4.4-prototypes.patch new file mode 100644 index 000000000000..5209a2988f7b --- /dev/null +++ b/sys-apps/shadow/files/shadow-4.4-prototypes.patch @@ -0,0 +1,42 @@ +https://github.com/shadow-maint/shadow/pull/53 + +From 32c0b283ef5d68b63e4ec05fb22ed0db938fea67 Mon Sep 17 00:00:00 2001 +From: Mike Frysinger <vapier@gentoo.org> +Date: Mon, 5 Dec 2016 17:15:29 -0500 +Subject: [PATCH] include getdef.h for getdef_bool prototype + +Otherwise we get build warnings like: +sgroupio.c:255:6: warning: implicit declaration of function 'getdef_bool' [-Wimplicit-function-declaration] +shadowio.c:131:6: warning: implicit declaration of function 'getdef_bool' [-Wimplicit-function-declaration] +--- + lib/sgroupio.c | 1 + + lib/shadowio.c | 1 + + 2 files changed, 2 insertions(+) + +diff --git a/lib/sgroupio.c b/lib/sgroupio.c +index f2685779a12b..5423626a01da 100644 +--- a/lib/sgroupio.c ++++ b/lib/sgroupio.c +@@ -40,6 +40,7 @@ + #include "prototypes.h" + #include "defines.h" + #include "commonio.h" ++#include "getdef.h" + #include "sgroupio.h" + + /*@null@*/ /*@only@*/struct sgrp *__sgr_dup (const struct sgrp *sgent) +diff --git a/lib/shadowio.c b/lib/shadowio.c +index 6e44ab24d69c..5fa3d312bbf9 100644 +--- a/lib/shadowio.c ++++ b/lib/shadowio.c +@@ -40,6 +40,7 @@ + #include <shadow.h> + #include <stdio.h> + #include "commonio.h" ++#include "getdef.h" + #include "shadowio.h" + #ifdef WITH_TCB + #include <tcb.h> +-- +2.11.0.rc2 + diff --git a/sys-apps/shadow/files/shadow-4.4-su-snprintf.patch b/sys-apps/shadow/files/shadow-4.4-su-snprintf.patch new file mode 100644 index 000000000000..45667c8e4bf9 --- /dev/null +++ b/sys-apps/shadow/files/shadow-4.4-su-snprintf.patch @@ -0,0 +1,29 @@ +fix from upstream + +From 67d2bb6e0a5ac124ce1f026dd5723217b1493194 Mon Sep 17 00:00:00 2001 +From: Serge Hallyn <serge@hallyn.com> +Date: Sun, 18 Sep 2016 21:31:18 -0500 +Subject: [PATCH] su.c: fix missing length argument to snprintf + +--- + src/su.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/su.c b/src/su.c +index 0c50a9456afd..93ffd2fbe2b4 100644 +--- a/src/su.c ++++ b/src/su.c +@@ -373,8 +373,8 @@ static void prepare_pam_close_session (void) + stderr); + (void) kill (-pid_child, caught); + +- snprintf (kill_msg, _(" ...killed.\n")); +- snprintf (wait_msg, _(" ...waiting for child to terminate.\n")); ++ snprintf (kill_msg, 256, _(" ...killed.\n")); ++ snprintf (wait_msg, 256, _(" ...waiting for child to terminate.\n")); + + (void) signal (SIGALRM, kill_child); + (void) alarm (2); +-- +2.11.0.rc2 + |