[Pkg-shadow-commits] r1922 - in debian/trunk/debian: . patches
nekral-guest at alioth.debian.org
nekral-guest at alioth.debian.org
Wed Mar 19 20:23:43 UTC 2008
Author: nekral-guest
Date: 2008-03-19 20:23:42 +0000 (Wed, 19 Mar 2008)
New Revision: 1922
Modified:
debian/trunk/debian/changelog
debian/trunk/debian/patches/401_cppw_src.dpatch
debian/trunk/debian/patches/428_grpck_add_prune_option
debian/trunk/debian/patches/429_login_FAILLOG_ENAB
debian/trunk/debian/patches/501_commonio_group_shadow
debian/trunk/debian/patches/542_useradd-O_option
Log:
Updated patches to 1.1.1
Modified: debian/trunk/debian/changelog
===================================================================
--- debian/trunk/debian/changelog 2008-03-19 20:19:49 UTC (rev 1921)
+++ debian/trunk/debian/changelog 2008-03-19 20:23:42 UTC (rev 1922)
@@ -20,6 +20,11 @@
+ debian/patches/504_undef_USE_PAM.nolibpam
$(LIBCRYPT) $(LIBSKEY) $(LIBMD) are no more included in libshadow.la.
Avoid link to unneeded libraries (spotted by dpkg-shlibdeps).
+ + debian/patches/501_commonio_group_shadow
+ + debian/patches/429_login_FAILLOG_ENAB
+ + debian/patches/542_useradd-O_option
+ + debian/patches/401_cppw_src.dpatch
+ + debian/patches/428_grpck_add_prune_option
* debian/watch: Add a watch file for shadow.
-- Nicolas FRANCOIS (Nekral) <nicolas.francois at centraliens.net> Sun, 24 Feb 2008 18:33:31 +0100
Modified: debian/trunk/debian/patches/401_cppw_src.dpatch
===================================================================
--- debian/trunk/debian/patches/401_cppw_src.dpatch 2008-03-19 20:19:49 UTC (rev 1921)
+++ debian/trunk/debian/patches/401_cppw_src.dpatch 2008-03-19 20:23:42 UTC (rev 1922)
@@ -221,11 +221,11 @@
chpasswd \
groupadd \
@@ -59,6 +60,7 @@
- chgpasswd_LDADD = $(LDADD) $(LIBPAM) $(LIBSELINUX)
- chsh_LDADD = $(LDADD) $(LIBPAM) $(LIBSELINUX)
- chpasswd_LDADD = $(LDADD) $(LIBPAM) $(LIBSELINUX)
+ chgpasswd_LDADD = $(LDADD) $(LIBPAM) $(LIBSELINUX) $(LIBCRYPT)
+ chsh_LDADD = $(LDADD) $(LIBPAM) $(LIBSELINUX) $(LIBCRYPT) $(LIBSKEY) $(LIBMD)
+ chpasswd_LDADD = $(LDADD) $(LIBPAM) $(LIBSELINUX) $(LIBCRYPT)
+cppw_LDADD = $(LDADD) $(LIBSELINUX)
- gpasswd_LDADD = $(LDADD) $(LIBAUDIT) $(LIBSELINUX)
+ gpasswd_LDADD = $(LDADD) $(LIBAUDIT) $(LIBSELINUX) $(LIBCRYPT)
groupadd_LDADD = $(LDADD) $(LIBPAM) $(LIBAUDIT) $(LIBSELINUX)
groupdel_LDADD = $(LDADD) $(LIBPAM) $(LIBAUDIT) $(LIBSELINUX)
Index: shadow-4.1.0/po/POTFILES.in
Modified: debian/trunk/debian/patches/428_grpck_add_prune_option
===================================================================
--- debian/trunk/debian/patches/428_grpck_add_prune_option 2008-03-19 20:19:49 UTC (rev 1921)
+++ debian/trunk/debian/patches/428_grpck_add_prune_option 2008-03-19 20:23:42 UTC (rev 1922)
@@ -10,13 +10,13 @@
--- shadow-4.1.0.orig/src/grpck.c
+++ shadow-4.1.0/src/grpck.c
@@ -139,6 +139,7 @@
- int errors = 0;
- int changed = 0;
- int i;
-+ int prune = 0;
- struct commonio_entry *gre, *tgre;
- struct group *grp;
- int sort_mode = 0;
+ /* Options */
+ static int read_only = 0;
+ static int sort_mode = 0;
++static int prune = 0;
+
+ /* local function prototypes */
+ static void usage (void);
@@ -163,7 +164,7 @@
/*
* Parse the command line arguments
@@ -36,18 +36,19 @@
default:
usage ();
}
-@@ -296,8 +300,13 @@
+@@ -296,9 +300,14 @@
/*
* prompt the user to delete the entry or not
*/
-- if (!yes_or_no ())
+- if (!yes_or_no (read_only)) {
+ if (!prune) {
-+ if (!yes_or_no ())
++ if (!yes_or_no (read_only)) {
+ continue;
++ }
+ } else {
-+ puts (_("Yes"));
++ puts (_("Yes"));
continue;
-+ }
+ }
/*
* All group file deletions wind up here. This code
Modified: debian/trunk/debian/patches/429_login_FAILLOG_ENAB
===================================================================
--- debian/trunk/debian/patches/429_login_FAILLOG_ENAB 2008-03-19 20:19:49 UTC (rev 1921)
+++ debian/trunk/debian/patches/429_login_FAILLOG_ENAB 2008-03-19 20:23:42 UTC (rev 1922)
@@ -11,15 +11,13 @@
===================================================================
--- shadow-4.1.0.orig/src/login.c
+++ shadow-4.1.0/src/login.c
-@@ -130,11 +130,11 @@
+@@ -130,9 +130,9 @@
static void setup_tty (void);
static void check_flags (int, char *const *);
+static struct faillog faillog;
+
#ifndef USE_PAM
- extern int login_access (const char *, const char *);
-
-static struct faillog faillog;
-
static void bad_time_notify (void);
Modified: debian/trunk/debian/patches/501_commonio_group_shadow
===================================================================
--- debian/trunk/debian/patches/501_commonio_group_shadow 2008-03-19 20:19:49 UTC (rev 1921)
+++ debian/trunk/debian/patches/501_commonio_group_shadow 2008-03-19 20:23:42 UTC (rev 1922)
@@ -7,13 +7,13 @@
--- shadow-4.1.0.orig/lib/commonio.c
+++ shadow-4.1.0/lib/commonio.c
@@ -13,6 +13,7 @@
+ #include <errno.h>
#include <stdio.h>
#include <signal.h>
- #include <pwd.h>
+#include <grp.h>
- #include <nscd.h>
- #ifdef HAVE_SHADOW_H
- #include <shadow.h>
+ #include "nscd.h"
+ #ifdef WITH_SELINUX
+ #include <selinux/selinux.h>
@@ -712,13 +713,20 @@
goto fail;
}
Modified: debian/trunk/debian/patches/542_useradd-O_option
===================================================================
--- debian/trunk/debian/patches/542_useradd-O_option 2008-03-19 20:19:49 UTC (rev 1921)
+++ debian/trunk/debian/patches/542_useradd-O_option 2008-03-19 20:23:42 UTC (rev 1922)
@@ -29,8 +29,8 @@
{NULL, 0, NULL, '\0'}
};
while ((c =
-- getopt_long (argc, argv, "b:c:d:De:f:g:G:k:K:mMop:s:u:",
-+ getopt_long (argc, argv, "b:c:d:De:f:g:G:k:O:K:mMop:s:u:",
+- getopt_long (argc, argv, "b:c:d:De:f:g:G:k:K:lmMNop:rs:u:U",
++ getopt_long (argc, argv, "b:c:d:De:f:g:G:k:O:K:lmMNop:rs:u:U",
long_options, NULL)) != -1) {
switch (c) {
case 'b':
More information about the Pkg-shadow-commits
mailing list