[Pkg-shadow-commits] r992 - in trunk/debian: . patches
Nicolas FRANCOIS
nekral-guest at costa.debian.org
Thu May 18 06:51:29 UTC 2006
Author: nekral-guest
Date: 2006-05-18 06:51:26 +0000 (Thu, 18 May 2006)
New Revision: 992
Added:
trunk/debian/patches/332_login_cancel_timout_after_authentication
trunk/debian/patches/504_undef_USE_PAM.dpatch
trunk/debian/patches/504_undef_USE_PAM.nolibpam
trunk/debian/patches/507_32char_grnames.dpatch
Removed:
trunk/debian/patches/004_configure.in.dpatch
trunk/debian/patches/404_undef_USE_PAM.dpatch
trunk/debian/patches/404_undef_USE_PAM.nolibpam
trunk/debian/patches/407_32char_grnames.dpatch
trunk/debian/patches/432_login_cancel_timout_after_authentication
Modified:
trunk/debian/changelog
trunk/debian/patches/series
Log:
Do some cleanup in the patches.
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2006-05-18 04:08:28 UTC (rev 991)
+++ trunk/debian/changelog 2006-05-18 06:51:26 UTC (rev 992)
@@ -1,3 +1,17 @@
+shadow (1:4.0.15-10) unstable; urgency=low
+
+ * The "Morbier" release
+ * Debian specifix fixes
+ - Patches cleanup:
+ + remove 004_configure.in.dpatch (not used since a long time).
+ + rename 404_undef_USE_PAM.nolibpam and 404_undef_USE_PAM.dpatch to
+ 504_xxx as they are debian specific.
+ + rename 407_32char_grnames.dpatch to 507_xxx for the same reason.
+ + rename 432_login_cancel_timout_after_authentication to 332_xxx,
+ because it is already applied upstream.
+
+ -- Christian Perrier <bubulle at debian.org> Thu, 18 May 2006 01:44:56 -0500
+
shadow (1:4.0.15-9) unstable; urgency=low
* The "Coulommiers" release
Deleted: trunk/debian/patches/004_configure.in.dpatch
===================================================================
--- trunk/debian/patches/004_configure.in.dpatch 2006-05-18 04:08:28 UTC (rev 991)
+++ trunk/debian/patches/004_configure.in.dpatch 2006-05-18 06:51:26 UTC (rev 992)
@@ -1,23 +0,0 @@
-Goal: unknown. From Tomasz:
-"17:22 < kloczek> bubulle: 004 is neccessary only when libpam is incorrectly linked
-17:23 < kloczek> so it was Debian specyfic workaround. I don't know is it still neccessary on pam 0.79
-
-Status wrt upstream: useless with a correct PAM. Can probably be dropped
-
-Index: shadow-4.0.13/configure.in
-===================================================================
---- shadow-4.0.13.orig/configure.in 2005-10-04 08:06:34.680490047 +0200
-+++ shadow-4.0.13/configure.in 2005-10-04 08:07:11.639959261 +0200
-@@ -302,9 +302,10 @@
- AC_CHECK_LIB(pam, pam_start,
- [AC_DEFINE(USE_PAM, 1, [Define to support Pluggable Authentication Modules])
- LIBPAM="-lpam"
-- AC_CHECK_LIB(pam_misc, main,
-+ AC_CHECK_LIB(pam_misc, misc_conv,
- [LIBPAM="$LIBPAM -lpam_misc"],
-- AC_MSG_ERROR(libpam_misc is missing)
-+ AC_MSG_ERROR(libpam_misc is missing),
-+ -lpam
- )],
- [AC_MSG_CHECKING(use login access checking if PAM not used)
- AC_MSG_RESULT(yes)]
Copied: trunk/debian/patches/332_login_cancel_timout_after_authentication (from rev 990, trunk/debian/patches/432_login_cancel_timout_after_authentication)
Deleted: trunk/debian/patches/404_undef_USE_PAM.dpatch
===================================================================
--- trunk/debian/patches/404_undef_USE_PAM.dpatch 2006-05-18 04:08:28 UTC (rev 991)
+++ trunk/debian/patches/404_undef_USE_PAM.dpatch 2006-05-18 06:51:26 UTC (rev 992)
@@ -1,116 +0,0 @@
-Goal: Do not use PAM for chage, chpasswd, groupadd, groupdel, groupmod
- newusers, useradd, userdel, usermod (keep them low-level)
-Fixes: #283961, #162181, #162199, #162228.
-
-Note:
- * If it is kept for 4.0.13, libmisc/salt.c will also require an
- #undef USE_PAM
-
-Index: shadow-4.0.15/src/chage.c
-===================================================================
---- shadow-4.0.15.orig/src/chage.c 2006-03-08 19:32:11.925877012 +0100
-+++ shadow-4.0.15/src/chage.c 2006-03-08 19:33:24.670141095 +0100
-@@ -28,6 +28,7 @@
- */
-
- #include <config.h>
-+#undef USE_PAM
-
- #ident "$Id: chage.c,v 1.71 2006/02/21 22:44:35 kloczek Exp $"
-
-Index: shadow-4.0.15/src/chpasswd.c
-===================================================================
---- shadow-4.0.15.orig/src/chpasswd.c 2006-03-08 19:32:11.927876607 +0100
-+++ shadow-4.0.15/src/chpasswd.c 2006-03-08 19:33:24.672140689 +0100
-@@ -28,6 +28,7 @@
- */
-
- #include <config.h>
-+#undef USE_PAM
-
- #ident "$Id: chpasswd.c,v 1.34 2005/10/19 15:21:07 kloczek Exp $"
-
-Index: shadow-4.0.15/src/groupadd.c
-===================================================================
---- shadow-4.0.15.orig/src/groupadd.c 2006-03-08 19:32:11.928876405 +0100
-+++ shadow-4.0.15/src/groupadd.c 2006-03-08 19:33:24.675140082 +0100
-@@ -28,6 +28,7 @@
- */
-
- #include <config.h>
-+#undef USE_PAM
-
- #ident "$Id: groupadd.c,v 1.51 2006/01/18 19:55:15 kloczek Exp $"
-
-Index: shadow-4.0.15/src/groupdel.c
-===================================================================
---- shadow-4.0.15.orig/src/groupdel.c 2006-03-08 19:32:11.930876000 +0100
-+++ shadow-4.0.15/src/groupdel.c 2006-03-08 19:33:24.677139677 +0100
-@@ -28,6 +28,7 @@
- */
-
- #include <config.h>
-+#undef USE_PAM
-
- #ident "$Id: groupdel.c,v 1.31 2006/01/18 19:55:15 kloczek Exp $"
-
-Index: shadow-4.0.15/src/groupmod.c
-===================================================================
---- shadow-4.0.15.orig/src/groupmod.c 2006-03-08 19:32:11.931875797 +0100
-+++ shadow-4.0.15/src/groupmod.c 2006-03-08 19:33:24.680139069 +0100
-@@ -28,6 +28,7 @@
- */
-
- #include <config.h>
-+#undef USE_PAM
-
- #ident "$Id: groupmod.c,v 1.37 2005/10/19 15:21:07 kloczek Exp $"
-
-Index: shadow-4.0.15/src/newusers.c
-===================================================================
---- shadow-4.0.15.orig/src/newusers.c 2006-03-08 19:32:11.932875595 +0100
-+++ shadow-4.0.15/src/newusers.c 2006-03-08 19:33:24.683138462 +0100
-@@ -34,6 +34,7 @@
- */
-
- #include <config.h>
-+#undef USE_PAM
-
- #ident "$Id: newusers.c,v 1.32 2006/01/18 19:55:15 kloczek Exp $"
-
-Index: shadow-4.0.15/src/useradd.c
-===================================================================
---- shadow-4.0.15.orig/src/useradd.c 2006-03-08 19:32:11.934875190 +0100
-+++ shadow-4.0.15/src/useradd.c 2006-03-08 19:33:24.690137044 +0100
-@@ -28,6 +28,7 @@
- */
-
- #include <config.h>
-+#undef USE_PAM
-
- #ident "$Id: useradd.c,v 1.91 2006/02/07 19:49:32 kloczek Exp $"
-
-Index: shadow-4.0.15/src/userdel.c
-===================================================================
---- shadow-4.0.15.orig/src/userdel.c 2006-03-08 19:32:11.935874987 +0100
-+++ shadow-4.0.15/src/userdel.c 2006-03-08 19:33:24.695136031 +0100
-@@ -28,6 +28,7 @@
- */
-
- #include <config.h>
-+#undef USE_PAM
-
- #ident "$Id: userdel.c,v 1.61 2006/02/07 20:19:46 kloczek Exp $"
-
-Index: shadow-4.0.15/src/usermod.c
-===================================================================
---- shadow-4.0.15.orig/src/usermod.c 2006-03-08 19:32:11.937874582 +0100
-+++ shadow-4.0.15/src/usermod.c 2006-03-08 19:33:24.702134614 +0100
-@@ -28,6 +28,7 @@
- */
-
- #include <config.h>
-+#undef USE_PAM
-
- #ident "$Id: usermod.c,v 1.65 2006/01/18 19:55:15 kloczek Exp $"
-
Deleted: trunk/debian/patches/404_undef_USE_PAM.nolibpam
===================================================================
--- trunk/debian/patches/404_undef_USE_PAM.nolibpam 2006-05-18 04:08:28 UTC (rev 991)
+++ trunk/debian/patches/404_undef_USE_PAM.nolibpam 2006-05-18 06:51:26 UTC (rev 992)
@@ -1,48 +0,0 @@
-Index: shadow-4.0.15/src/Makefile.am
-===================================================================
---- shadow-4.0.15.orig/src/Makefile.am 2006-03-08 19:33:20.950894508 +0100
-+++ shadow-4.0.15/src/Makefile.am 2006-03-08 19:33:30.316997202 +0100
-@@ -53,16 +53,16 @@
- $(top_builddir)/lib/libshadow.la
- AM_CPPFLAGS = -DLOCALEDIR=\"$(datadir)/locale\"
-
--chage_LDADD = $(LDADD) $(LIBPAM) $(LIBAUDIT) $(LIBSELINUX)
-+chage_LDADD = $(LDADD) $(LIBAUDIT) $(LIBSELINUX)
- chfn_LDADD = $(LDADD) $(LIBPAM) $(LIBSELINUX)
- chgpasswd_LDADD = $(LDADD) $(LIBPAM) $(LIBSELINUX)
- chsh_LDADD = $(LDADD) $(LIBPAM) $(LIBSELINUX)
--chpasswd_LDADD = $(LDADD) $(LIBPAM) $(LIBSELINUX)
-+chpasswd_LDADD = $(LDADD) $(LIBSELINUX)
- cppw_LDADD = $(LDADD) $(LIBSELINUX)
- gpasswd_LDADD = $(LDADD) $(LIBAUDIT) $(LIBSELINUX)
--groupadd_LDADD = $(LDADD) $(LIBPAM) $(LIBAUDIT) $(LIBSELINUX)
--groupdel_LDADD = $(LDADD) $(LIBPAM) $(LIBAUDIT) $(LIBSELINUX)
--groupmod_LDADD = $(LDADD) $(LIBPAM) $(LIBAUDIT) $(LIBSELINUX)
-+groupadd_LDADD = $(LDADD) $(LIBAUDIT) $(LIBSELINUX)
-+groupdel_LDADD = $(LDADD) $(LIBAUDIT) $(LIBSELINUX)
-+groupmod_LDADD = $(LDADD) $(LIBAUDIT) $(LIBSELINUX)
- grpck_LDADD = $(LDADD) $(LIBSELINUX)
- grpconv_LDADD = $(LDADD) $(LIBSELINUX)
- grpunconv_LDADD = $(LDADD) $(LIBSELINUX)
-@@ -71,7 +71,7 @@
- login_nopam.c
- login_LDADD = $(LDADD) $(LIBPAM) $(LIBAUDIT)
- newgrp_LDADD = $(LDADD) $(LIBPAM) $(LIBAUDIT)
--newusers_LDADD = $(LDADD) $(LIBPAM) $(LIBSELINUX)
-+newusers_LDADD = $(LDADD) $(LIBSELINUX)
- nologin_LDADD =
- passwd_LDADD = $(LDADD) $(LIBPAM) $(LIBCRACK) $(LIBAUDIT) $(LIBSELINUX)
- pwck_LDADD = $(LDADD) $(LIBSELINUX)
-@@ -81,9 +81,9 @@
- su.c \
- suauth.c
- su_LDADD = $(LDADD) $(LIBPAM)
--useradd_LDADD = $(LDADD) $(LIBPAM) $(LIBAUDIT) $(LIBSELINUX)
--userdel_LDADD = $(LDADD) $(LIBPAM) $(LIBAUDIT) $(LIBSELINUX)
--usermod_LDADD = $(LDADD) $(LIBPAM) $(LIBAUDIT) $(LIBSELINUX)
-+useradd_LDADD = $(LDADD) $(LIBAUDIT) $(LIBSELINUX)
-+userdel_LDADD = $(LDADD) $(LIBAUDIT) $(LIBSELINUX)
-+usermod_LDADD = $(LDADD) $(LIBAUDIT) $(LIBSELINUX)
- vipw_LDADD = $(LDADD) $(LIBSELINUX)
-
- install-am: all-am
Deleted: trunk/debian/patches/407_32char_grnames.dpatch
===================================================================
--- trunk/debian/patches/407_32char_grnames.dpatch 2006-05-18 04:08:28 UTC (rev 991)
+++ trunk/debian/patches/407_32char_grnames.dpatch 2006-05-18 06:51:26 UTC (rev 992)
@@ -1,51 +0,0 @@
-#! /bin/sh -e
-## 407_32char_grnames_240456.dpatch by xrgtn
-##
-## All lines beginning with `## DP:' are a description of the patch.
-##
-## DP: The patch allows 32 character long group names instead of only 16
-## DP: characters.
-## DP:
-## DP: Comments from Karl Ramm (shadow 1:4.0.3-23, 28 Mar 2004 19:46:34 -0500):
-## DP:
-## DP: increase maximum group name size to 32 for no particularly good reason
-## DP: closes: #240456
-
-if [ $# -lt 1 ]; then
- echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
- exit 1
-fi
-
-[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
-patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}"
-
-case "$1" in
- -patch) patch -p1 ${patch_opts} < $0;;
- -unpatch) patch -R -p1 ${patch_opts} < $0;;
- *)
- echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
- exit 1;;
-esac
-
-exit 0
-
- at DPATCH@
-
-Index: shadow-4.0.15/libmisc/chkname.c
-===================================================================
---- shadow-4.0.15.orig/libmisc/chkname.c 2006-03-08 19:33:33.777296244 +0100
-+++ shadow-4.0.15/libmisc/chkname.c 2006-03-08 19:33:36.412762374 +0100
-@@ -66,10 +66,10 @@
- int check_group_name (const char *name)
- {
- /*
-- * Arbitrary limit for group names - max 16
-- * characters (same as on HP-UX 10).
-+ * Arbitrary limit for group names - max 32
-+ * same as linux UT_NAMESIZE
- */
-- if (strlen (name) > 16)
-+ if (strlen (name) > 32)
- return 0;
-
- return good_name (name);
Deleted: trunk/debian/patches/432_login_cancel_timout_after_authentication
===================================================================
--- trunk/debian/patches/432_login_cancel_timout_after_authentication 2006-05-18 04:08:28 UTC (rev 991)
+++ trunk/debian/patches/432_login_cancel_timout_after_authentication 2006-05-18 06:51:26 UTC (rev 992)
@@ -1,19 +0,0 @@
-Goal: Cancel login timeout after authentication so that patient people
- timing out on network directory services can log in with local
- accounts.
-Fixes: #107148
-
-Status wrt upstream: Will be in 4.0.16
-
-Index: shadow-4.0.15/src/login.c
-===================================================================
---- shadow-4.0.15.orig/src/login.c 2006-03-08 19:33:15.924912629 +0100
-+++ shadow-4.0.15/src/login.c 2006-03-08 19:33:17.240646099 +0100
-@@ -747,6 +747,7 @@
- }
-
- /* We don't get here unless they were authenticated above */
-+ alarm (0);
- retcode = pam_acct_mgmt (pamh, 0);
-
- if (retcode == PAM_NEW_AUTHTOK_REQD) {
Copied: trunk/debian/patches/504_undef_USE_PAM.dpatch (from rev 990, trunk/debian/patches/404_undef_USE_PAM.dpatch)
Copied: trunk/debian/patches/504_undef_USE_PAM.nolibpam (from rev 990, trunk/debian/patches/404_undef_USE_PAM.nolibpam)
Copied: trunk/debian/patches/507_32char_grnames.dpatch (from rev 990, trunk/debian/patches/407_32char_grnames.dpatch)
Modified: trunk/debian/patches/series
===================================================================
--- trunk/debian/patches/series 2006-05-18 04:08:28 UTC (rev 991)
+++ trunk/debian/patches/series 2006-05-18 06:51:26 UTC (rev 992)
@@ -1,6 +1,3 @@
-# Tomasz suggests it's probably useless as this is a workaround for
-# wrongly linked PAM
-# 004_configure.in.dpatch
503_shadowconfig.8
431_su_uid_0_not_root
008_su_no_sanitize_env
@@ -9,16 +6,16 @@
434_login_stop_checking_args_after--
008_login_log_failure_in_FTMP
429_login_FAILLOG_ENAB
-432_login_cancel_timout_after_authentication
+332_login_cancel_timout_after_authentication
438_su_GNU_origin
#
# 419_time_structures.dpatch # must be checked another time
433_shadow.5-typo_312430
401_cppw_src.dpatch
-404_undef_USE_PAM.dpatch
-404_undef_USE_PAM.nolibpam
+504_undef_USE_PAM.dpatch
+504_undef_USE_PAM.nolibpam
506_relaxed_usernames
-407_32char_grnames.dpatch
+507_32char_grnames.dpatch
326_grpck_group-gshadow_members_consistency
542_useradd-O_option
451_login_PATH
More information about the Pkg-shadow-commits
mailing list