shadow: update to 4.0.16
This commit is contained in:
Johannes Winkelmann
parent
6ab2762551
commit
4e6187ce79
|
|
@ -4,6 +4,10 @@ drwxr-xr-x root/root etc/
|
|||
drwxr-xr-x root/root etc/cron/
|
||||
drwxr-xr-x root/root etc/cron/daily/
|
||||
-rwxr-xr-x root/root etc/cron/daily/pwck
|
||||
drwxr-xr-x root/root etc/default/
|
||||
-rw-r--r-- root/root etc/default/useradd
|
||||
-rw-r--r-- root/root etc/limits
|
||||
-rw-r--r-- root/root etc/login.access
|
||||
-rw-r--r-- root/root etc/login.defs
|
||||
drwxr-xr-x root/root usr/
|
||||
drwxr-xr-x root/root usr/bin/
|
||||
|
|
@ -41,6 +45,7 @@ drwxr-xr-x root/root usr/man/man5/
|
|||
-rw-r--r-- root/root usr/man/man5/shadow.5.gz
|
||||
-rw-r--r-- root/root usr/man/man5/suauth.5.gz
|
||||
drwxr-xr-x root/root usr/man/man8/
|
||||
-rw-r--r-- root/root usr/man/man8/chgpasswd.8.gz
|
||||
-rw-r--r-- root/root usr/man/man8/faillog.8.gz
|
||||
-rw-r--r-- root/root usr/man/man8/groupadd.8.gz
|
||||
-rw-r--r-- root/root usr/man/man8/groupdel.8.gz
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
2b8c303d972cf6fb2a4545dd17262f27 login.defs
|
||||
be8f69c2701118093af3d7f3bc02af16 pwck
|
||||
9e2f566e29068dc98e42ea94ac788200 shadow-4.0.15-nflg-conflict.diff
|
||||
01bab2b152b8f2ae0056a467fa365797 shadow-4.0.15-noshadowgrp.diff
|
||||
a0452fa989f8ba45023cc5a08136568e shadow-4.0.15.tar.bz2
|
||||
1d91f7479143d1d705b94180c0d4874b shadow-4.0.16.tar.bz2
|
||||
a588e277ff49988f0e3787c5b327d10c shadow-fix-useradd-usergroups.patch
|
||||
75161be083592e2e4e7f9cdcb7369bab useradd-usergroup.diff
|
||||
|
|
|
|||
|
|
@ -4,24 +4,23 @@
|
|||
# Maintainer: Johannes Winkelmann, jw at crux dot nu
|
||||
|
||||
name=shadow
|
||||
version=4.0.15
|
||||
release=5
|
||||
version=4.0.16
|
||||
release=1
|
||||
source=(ftp://ftp.pld.org.pl/software/shadow/$name-$version.tar.bz2 \
|
||||
pwck login.defs \
|
||||
shadow-4.0.15-noshadowgrp.diff \
|
||||
shadow-fix-useradd-usergroups.patch\
|
||||
shadow-4.0.15-nflg-conflict.diff \
|
||||
useradd-usergroup.diff)
|
||||
|
||||
build() {
|
||||
cd $name-$version
|
||||
patch -p1 < $SRC/shadow-4.0.15-noshadowgrp.diff
|
||||
patch src/useradd.c $SRC/shadow-fix-useradd-usergroups.patch
|
||||
patch src/useradd.c $SRC/shadow-4.0.15-nflg-conflict.diff
|
||||
patch src/useradd.c $SRC/useradd-usergroup.diff
|
||||
|
||||
./configure --prefix=/usr \
|
||||
--mandir=/usr/man \
|
||||
--sysconfdir=/etc \
|
||||
--disable-shared \
|
||||
--disable-shadowgrp \
|
||||
--disable-nls \
|
||||
|
|
@ -41,5 +40,6 @@ build() {
|
|||
$PKG/usr/man/man8/{chpasswd.8,grpconv.8,grpunconv.8,logoutd.8} \
|
||||
$PKG/usr/man/man8/{mkpasswd.8,newusers.8,pwconv.8,pwunconv.8} \
|
||||
$PKG/usr/man/{man3,cs,de,es,fi,tr,fr,hu,id,it,ja,ko,pl,pt_BR,ru,zh_CN,zh_TW} \
|
||||
$PKG/lib
|
||||
$PKG/lib \
|
||||
$PKG/etc/{login.access,limits,default}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,127 +0,0 @@
|
|||
--- shadow-4.0.15.orig/src/chgpasswd.c 2006-03-23 11:10:24.000000000 +0100
|
||||
+++ shadow-4.0.15/src/chgpasswd.c 2006-03-23 11:55:18.000000000 +0100
|
||||
@@ -43,7 +43,9 @@
|
||||
#include "nscd.h"
|
||||
#include "prototypes.h"
|
||||
#include "groupio.h"
|
||||
+#ifdef SHADOWGRP
|
||||
#include "sgroupio.h"
|
||||
+#endif
|
||||
/*
|
||||
* Global variables
|
||||
*/
|
||||
@@ -51,7 +53,9 @@
|
||||
static int eflg = 0;
|
||||
static int md5flg = 0;
|
||||
|
||||
-static int is_shadow_pwd;
|
||||
+#ifdef SHADOWGRP
|
||||
+static int is_shadow_grp;
|
||||
+#endif
|
||||
|
||||
/* local function prototypes */
|
||||
static void usage (void);
|
||||
@@ -78,8 +82,10 @@
|
||||
char *newpwd;
|
||||
char *cp;
|
||||
|
||||
+#ifdef SHADOWGRP
|
||||
const struct sgrp *sg;
|
||||
struct sgrp newsg;
|
||||
+#endif
|
||||
|
||||
const struct group *gr;
|
||||
struct group newgr;
|
||||
@@ -179,8 +185,9 @@
|
||||
exit (1);
|
||||
}
|
||||
|
||||
- is_shadow_pwd = sgr_file_present ();
|
||||
- if (is_shadow_pwd) {
|
||||
+#ifdef SHADOWGRP
|
||||
+ is_shadow_grp = sgr_file_present ();
|
||||
+ if (is_shadow_grp) {
|
||||
if (!sgr_lock ()) {
|
||||
fprintf (stderr, _("%s: can't lock gshadow file\n"),
|
||||
Prog);
|
||||
@@ -195,6 +202,7 @@
|
||||
exit (1);
|
||||
}
|
||||
}
|
||||
+#endif
|
||||
|
||||
/*
|
||||
* Read each line, separating the group name from the password. The
|
||||
@@ -254,33 +262,33 @@
|
||||
errors++;
|
||||
continue;
|
||||
}
|
||||
- if (is_shadow_pwd)
|
||||
- sg = sgr_locate (name);
|
||||
- else
|
||||
- sg = NULL;
|
||||
+#ifdef SHADOWGRP
|
||||
+ sg = sgr_locate (name);
|
||||
+#endif
|
||||
|
||||
/*
|
||||
* The freshly encrypted new password is merged into the
|
||||
* user's password file entry and the last password change
|
||||
* date is set to the current date.
|
||||
*/
|
||||
- if (sg) {
|
||||
- newsg = *sg;
|
||||
- newsg.sg_passwd = cp;
|
||||
- } else {
|
||||
- newgr = *gr;
|
||||
- newgr.gr_passwd = cp;
|
||||
- }
|
||||
+#ifdef SHADOWGRP
|
||||
+ newsg = *sg;
|
||||
+ newsg.sg_passwd = cp;
|
||||
+#else
|
||||
+ newgr = *gr;
|
||||
+ newgr.gr_passwd = cp;
|
||||
+#endif
|
||||
|
||||
/*
|
||||
* The updated password file entry is then put back and will
|
||||
* be written to the password file later, after all the
|
||||
* other entries have been updated as well.
|
||||
*/
|
||||
- if (sg)
|
||||
+#ifdef SHADOWGRP
|
||||
ok = sgr_update (&newsg);
|
||||
- else
|
||||
+#else
|
||||
ok = gr_update (&newgr);
|
||||
+#endif
|
||||
|
||||
if (!ok) {
|
||||
fprintf (stderr,
|
||||
@@ -302,12 +310,15 @@
|
||||
if (errors) {
|
||||
fprintf (stderr,
|
||||
_("%s: error detected, changes ignored\n"), Prog);
|
||||
- if (is_shadow_pwd)
|
||||
+#ifdef SHADOWGRP
|
||||
+ if (is_shadow_grp)
|
||||
sgr_unlock ();
|
||||
+#endif
|
||||
gr_unlock ();
|
||||
exit (1);
|
||||
}
|
||||
- if (is_shadow_pwd) {
|
||||
+#ifdef SHADOWGRP
|
||||
+ if (is_shadow_grp) {
|
||||
if (!sgr_close ()) {
|
||||
fprintf (stderr,
|
||||
_("%s: error updating shadow file\n"), Prog);
|
||||
@@ -316,6 +327,7 @@
|
||||
}
|
||||
sgr_unlock ();
|
||||
}
|
||||
+#endif
|
||||
if (!gr_close ()) {
|
||||
fprintf (stderr, _("%s: error updating password file\n"), Prog);
|
||||
exit (1);
|
||||
Loading…
Reference in New Issue
Block a user