VesperOS/shadow
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refreshed patches.

Browse Source
This commit is contained in:
nekral-guest
2011-11-19 15:13:17 +00:00
parent 89c37173e1
commit 21b505094a
10 changed files with 30 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
debian/changelog
Vendored
+12 -9
View File
@@ -33,17 +33,20 @@ shadow (1:4.1.5-1) unstable; urgency=low
- groupmod: document that /etc/passwd can be modified by groupmod -g.
Closes: #647308
- Updated patches
+ debian/patches/523_su_arguments_are_no_more_concatenated_by_default
+ debian/patches/505_useradd_recommend_adduser
+ debian/patches/463_login_delay_obeys_to_PAM
+ debian/patches/008_login_log_failure_in_FTMP
+ debian/patches/501_commonio_group_shadow
+ debian/patches/429_login_FAILLOG_ENAB
+ debian/patches/508_nologin_in_usr_sbin
+ debian/patches/506_relaxed_usernames
+ debian/patches/523_su_arguments_are_concatenated
+ debian/patches/542_useradd-O_option
+ debian/patches/401_cppw_src.dpatch
+ debian/patches/402_cppw_selinux
+ debian/patches/428_grpck_add_prune_option
+ debian/patches/429_login_FAILLOG_ENAB
+ debian/patches/463_login_delay_obeys_to_PAM
+ debian/patches/501_commonio_group_shadow
+ debian/patches/505_useradd_recommend_adduser
+ debian/patches/506_relaxed_usernames
+ debian/patches/508_nologin_in_usr_sbin
+ debian/patches/523_su_arguments_are_concatenated
+ debian/patches/523_su_arguments_are_no_more_concatenated_by_default
+ debian/patches/542_useradd-O_option
+ debian/patches/900_testsuite_groupmems
- debian/patches/008_su_get_PAM_username: Removed, feature supported
upstream.
- debian/patches/300_CVE-2011-0721: Removed, applied upstream.
debian/patches/401_cppw_src.dpatch
Vendored
+1 -1
View File
@@ -266,7 +266,7 @@
groupdel_LDADD = $(LDADD) $(LIBPAM_SUID) $(LIBAUDIT) $(LIBSELINUX)
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -82,6 +82,7 @@
@@ -83,6 +83,7 @@
src/chgpasswd.c
src/chpasswd.c
src/chsh.c
debian/patches/402_cppw_selinux
Vendored
+4 -4
View File
@@ -21,7 +21,7 @@ Depends on 401_cppw_src.dpatch
#include "exitcodes.h"
#include "prototypes.h"
#include "pwio.h"
@@ -134,6 +137,22 @@
@@ -139,6 +142,22 @@
if (access (file, F_OK) != 0) {
cppwexit (file, 1, 1);
}
@@ -42,10 +42,10 @@ Depends on 401_cppw_src.dpatch
+ }
+#endif /* WITH_SELINUX */
if (file_lock () == 0) {
cppwexit ("Couldn't lock file", 0, 5);
cppwexit (_("Couldn't lock file"), 0, 5);
}
@@ -162,6 +181,15 @@
cppwexit (0,0,1);
@@ -167,6 +186,15 @@
cppwexit (NULL,0,1);
}
+#ifdef WITH_SELINUX
debian/patches/428_grpck_add_prune_option
Vendored
+3 -28
View File
@@ -7,7 +7,7 @@ Status wrt upstream: It could certainly be submitted to upstream.
--- a/src/grpck.c
+++ b/src/grpck.c
@@ -79,6 +79,7 @@
@@ -81,6 +81,7 @@
/* Options */
static bool read_only = false;
static bool sort_mode = false;
@@ -15,37 +15,12 @@ Status wrt upstream: It could certainly be submitted to upstream.
/* local function prototypes */
static void fail_exit (int status);
@@ -178,7 +179,7 @@
@@ -203,7 +204,7 @@
/*
* Parse the command line arguments
*/
- while ((c = getopt_long (argc, argv, "hqrR:s",
+ while ((c = getopt_long (argc, argv, "hqprR:s",
long_options, NULL)) != -1) {
long_options, NULL)) != -1) {
switch (c) {
case 'h':
usage (E_SUCCESS);
@@ -189,6 +190,9 @@
case 's':
sort_mode = true;
break;
+ case 'p':
+ prune = true;
+ break;
default:
usage ();
}
@@ -474,7 +478,12 @@
/*
* prompt the user to delete the entry or not
*/
- if (!yes_or_no (read_only)) {
+ if (!prune) {
+ if (!yes_or_no (read_only)) {
+ continue;
+ }
+ } else {
+ puts (_("Yes"));
continue;
}
debian/patches/429_login_FAILLOG_ENAB
Vendored
+2 -2
View File
@@ -56,7 +56,7 @@ Note: It could be removed if pam_tally could report the number of failures
if (getdef_str("FTMP_FILE") != NULL) {
#ifdef USE_UTMPX
struct utmpx *failent =
@@ -1288,6 +1303,7 @@
@@ -1291,6 +1306,7 @@
*/
#ifndef USE_PAM
motd (); /* print the message of the day */
@@ -64,7 +64,7 @@ Note: It could be removed if pam_tally could report the number of failures
if ( getdef_bool ("FAILLOG_ENAB")
&& (0 != faillog.fail_cnt)) {
failprint (&faillog);
@@ -1300,6 +1316,7 @@
@@ -1303,6 +1319,7 @@
username, (int) faillog.fail_cnt));
}
}
debian/patches/463_login_delay_obeys_to_PAM
Vendored
+1 -1
View File
@@ -67,7 +67,7 @@ Note: If removed, FAIL_DELAY must be re-added to /etc/login.defs
retcode = pam_authenticate (pamh, 0);
@@ -1104,14 +1092,17 @@
@@ -1107,14 +1095,17 @@
free (username);
username = NULL;
debian/patches/523_su_arguments_are_concatenated
Vendored
+1 -1
View File
@@ -10,7 +10,7 @@ Note: the fix of the man page is still missing.
--- a/src/su.c
+++ b/src/su.c
@@ -1151,6 +1151,35 @@
@@ -1150,6 +1150,35 @@
argv[0] = "-c";
argv[1] = command;
}
debian/patches/523_su_arguments_are_no_more_concatenated_by_default
Vendored
+2 -2
View File
@@ -30,7 +30,7 @@ Status wrt upstream: This patch is Debian specific.
#ifdef USE_PAM
static pam_handle_t *pamh = NULL;
static int caught = 0;
@@ -951,6 +964,8 @@
@@ -950,6 +963,8 @@
int ret;
#endif /* USE_PAM */
@@ -39,7 +39,7 @@ Status wrt upstream: This patch is Debian specific.
(void) setlocale (LC_ALL, "");
(void) bindtextdomain (PACKAGE, LOCALEDIR);
(void) textdomain (PACKAGE);
@@ -1155,7 +1170,7 @@
@@ -1154,7 +1169,7 @@
* resulting string is always given to the shell with its
* -c option.
*/
debian/patches/542_useradd-O_option
Vendored
+2 -2
View File
@@ -21,7 +21,7 @@ Status wrt upstream: not included as this is just specific
<varlistentry>
--- a/src/useradd.c
+++ b/src/useradd.c
@@ -1007,9 +1007,9 @@
@@ -1009,9 +1009,9 @@
};
while ((c = getopt_long (argc, argv,
#ifdef WITH_SELINUX
@@ -33,7 +33,7 @@ Status wrt upstream: not included as this is just specific
#endif
long_options, NULL)) != -1) {
switch (c) {
@@ -1132,6 +1132,7 @@
@@ -1134,6 +1134,7 @@
kflg = true;
break;
case 'K':
debian/patches/900_testsuite_groupmems
Vendored
+2 -2
View File
@@ -53,7 +53,7 @@
--- a/debian/rules
+++ b/debian/rules
@@ -61,6 +61,7 @@
@@ -60,6 +60,7 @@
dh_installpam -p passwd --name=chsh
dh_installpam -p passwd --name=chpasswd
dh_installpam -p passwd --name=newusers
@@ -61,7 +61,7 @@
ifeq ($(DEB_HOST_ARCH_OS),hurd)
# login is not built on The Hurd, but some utilities of passwd depends on
# /etc/login.defs.
@@ -91,3 +92,6 @@
@@ -87,3 +88,6 @@
chgrp shadow debian/passwd/usr/bin/expiry
chmod g+s debian/passwd/usr/bin/chage
chmod g+s debian/passwd/usr/bin/expiry