shadow: update to 4.5.
This commit is contained in:
Juan RP
parent
0f05140de4
commit
0b92184eb6
|
|
@ -1,35 +0,0 @@
|
|||
From 507f96cdeb54079fb636c7ce21e371f7a16a520e Mon Sep 17 00:00:00 2001
|
||||
From: Tomas Mraz <tmraz@fedoraproject.org>
|
||||
Date: Thu, 25 Aug 2016 11:20:34 +0200
|
||||
Subject: [PATCH] Fix regression in useradd not loading defaults properly.
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
The get_defaults() has to be called before processing the flags.
|
||||
|
||||
Signed-off-by: Tomáš Mráz <tmraz@fedoraproject.org>
|
||||
---
|
||||
src/useradd.c | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
--- src/useradd.c.orig
|
||||
+++ src/useradd.c
|
||||
@@ -2027,6 +2027,8 @@ int main (int argc, char **argv)
|
||||
is_shadow_grp = sgr_file_present ();
|
||||
#endif
|
||||
|
||||
+ get_defaults ();
|
||||
+
|
||||
process_flags (argc, argv);
|
||||
|
||||
#ifdef ENABLE_SUBIDS
|
||||
@@ -2036,8 +2038,6 @@ int main (int argc, char **argv)
|
||||
(!user_id || (user_id <= uid_max && user_id >= uid_min));
|
||||
#endif /* ENABLE_SUBIDS */
|
||||
|
||||
- get_defaults ();
|
||||
-
|
||||
#ifdef ACCT_TOOLS_SETUID
|
||||
#ifdef USE_PAM
|
||||
{
|
||||
|
|
@ -1,33 +0,0 @@
|
|||
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(+)
|
||||
|
||||
--- lib/sgroupio.c.orig
|
||||
+++ 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)
|
||||
--- lib/shadowio.c.orig
|
||||
+++ 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>
|
||||
|
|
@ -1,17 +0,0 @@
|
|||
https://github.com/shadow-maint/shadow/issues/32
|
||||
|
||||
Anyway, we use su from util-linux.
|
||||
|
||||
--- src/su.c.orig 2016-12-01 20:41:50.000000000 +0100
|
||||
+++ src/su.c 2017-02-26 17:36:32.291904996 +0100
|
||||
@@ -373,8 +373,8 @@
|
||||
stderr);
|
||||
(void) kill (-pid_child, caught);
|
||||
|
||||
- snprintf (kill_msg, _(" ...killed.\n"));
|
||||
- snprintf (wait_msg, _(" ...waiting for child to terminate.\n"));
|
||||
+ snprintf (kill_msg, sizeof kill_msg, _(" ...killed.\n"));
|
||||
+ snprintf (wait_msg, sizeof wait_msg, _(" ...waiting for child to terminate.\n"));
|
||||
|
||||
(void) signal (SIGALRM, kill_child);
|
||||
(void) alarm (2);
|
||||
|
|
@ -1,31 +0,0 @@
|
|||
From 61abb4645cb0c4911eea0a7ce63a9c7d37cabe8f Mon Sep 17 00:00:00 2001
|
||||
From: Wolfgang Bumiller <wry.git@bumiller.com>
|
||||
Date: Sat, 5 Nov 2016 15:51:13 +0100
|
||||
Subject: [PATCH] buildsys: fix suidubins assignments
|
||||
|
||||
These assignments were pasted as is into the Makefile and
|
||||
ended up as part of a rule. (Usually the .PRECIOUS rule
|
||||
which is why the build system never attempted to execute it
|
||||
as commands, hiding the problem.)
|
||||
|
||||
Signed-off-by: Wolfgang Bumiller <wry.git@bumiller.com>
|
||||
Reported-by: Rahel A <ra00177@surrey.ac.uk>
|
||||
---
|
||||
src/Makefile.am | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
--- src/Makefile.am.orig
|
||||
+++ src/Makefile.am
|
||||
@@ -54,10 +54,10 @@ noinst_PROGRAMS = id sulogin
|
||||
suidbins = su
|
||||
suidubins = chage chfn chsh expiry gpasswd newgrp passwd
|
||||
if ACCT_TOOLS_SETUID
|
||||
- suidubins += chage chgpasswd chpasswd groupadd groupdel groupmod newusers useradd userdel usermod
|
||||
+suidubins += chage chgpasswd chpasswd groupadd groupdel groupmod newusers useradd userdel usermod
|
||||
endif
|
||||
if ENABLE_SUBIDS
|
||||
- suidubins += newgidmap newuidmap
|
||||
+suidubins += newgidmap newuidmap
|
||||
endif
|
||||
|
||||
if WITH_TCB
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
# Template file for 'shadow'
|
||||
pkgname=shadow
|
||||
version=4.4
|
||||
revision=2
|
||||
version=4.5
|
||||
revision=1
|
||||
build_style=gnu-configure
|
||||
configure_args="--bindir=/usr/bin --sbindir=/usr/bin
|
||||
--libdir=/usr/lib --enable-shared --disable-static
|
||||
|
|
@ -10,27 +10,13 @@ configure_args="--bindir=/usr/bin --sbindir=/usr/bin
|
|||
hostmakedepends="automake libtool gettext-devel"
|
||||
makedepends="acl-devel pam-devel"
|
||||
depends="pam"
|
||||
conf_files="
|
||||
/etc/pam.d/usermod
|
||||
/etc/pam.d/userdel
|
||||
/etc/pam.d/useradd
|
||||
/etc/pam.d/passwd
|
||||
/etc/pam.d/newusers
|
||||
/etc/pam.d/groupmod
|
||||
/etc/pam.d/groupmems
|
||||
/etc/pam.d/groupdel
|
||||
/etc/pam.d/groupadd
|
||||
/etc/pam.d/chpasswd
|
||||
/etc/pam.d/chgpasswd
|
||||
/etc/pam.d/chage
|
||||
/etc/default/useradd
|
||||
/etc/login.defs"
|
||||
conf_files="/etc/pam.d/* /etc/default/* /etc/login.defs"
|
||||
short_desc="Shadow password file utilities"
|
||||
maintainer="Juan RP <xtraeme@voidlinux.eu>"
|
||||
license="BSD"
|
||||
homepage="https://github.com/shadow-maint/shadow"
|
||||
distfiles="${homepage}/releases/download/${version}/shadow-${version}.tar.xz"
|
||||
checksum=61a9a4041b552eab9a253788d589e3664cf9b903bdd1f1ca73ea8aac4a71f03c
|
||||
checksum=fc8c858381ad577a5c25ff5beb6ee60a34f8719c73e4e7c61e74188b4e54b741
|
||||
|
||||
pre_configure() {
|
||||
autoreconf -fi
|
||||
|
|
|
|||
Loading…
Reference in New Issue