[Pkg-shadow-commits] r873 - trunk/debian/patches

[Nicolas FRANCOIS]

Author: nekral-guest
Date: 2006-02-21 23:09:26 +0000 (Tue, 21 Feb 2006)
New Revision: 873

Added:
   trunk/debian/patches/390_link_selinux_only_when_needed
   trunk/debian/patches/592_manpages_typos
Removed:
   trunk/debian/patches/490_link_selinux_only_when_needed
   trunk/debian/patches/492_manpages_typos
Modified:
   trunk/debian/patches/series
Log:
490_link_selinux_only_when_needed was committed upstream
492_manpages_typos is debian specific (docbook-xsl bug)


Copied: trunk/debian/patches/390_link_selinux_only_when_needed (from rev 872, trunk/debian/patches/490_link_selinux_only_when_needed)

Deleted: trunk/debian/patches/490_link_selinux_only_when_needed
===================================================================
--- trunk/debian/patches/490_link_selinux_only_when_needed	2006-02-21 23:06:55 UTC (rev 872)
+++ trunk/debian/patches/490_link_selinux_only_when_needed	2006-02-21 23:09:26 UTC (rev 873)
@@ -1,72 +0,0 @@
-Goal: Do not link login and su (and others) with libselinux
-
-Status wrt upstream: will be in 4.0.15
-
-Index: shadow-4.0.14/lib/Makefile.am
-===================================================================
---- shadow-4.0.14.orig/lib/Makefile.am	2005-08-31 19:16:44.000000000 +0200
-+++ shadow-4.0.14/lib/Makefile.am	2006-02-09 14:29:37.000000000 +0100
-@@ -6,7 +6,7 @@
- lib_LTLIBRARIES = libshadow.la
- 
- libshadow_la_LDFLAGS = -version-info 0:0:0
--libshadow_la_LIBADD = $(INTLLIBS) $(LIBCRYPT) $(LIBSKEY) $(LIBMD) $(LIBSELINUX)
-+libshadow_la_LIBADD = $(INTLLIBS) $(LIBCRYPT) $(LIBSKEY) $(LIBMD)
- 
- libshadow_la_SOURCES = \
- 	commonio.c \
-Index: shadow-4.0.14/src/Makefile.am
-===================================================================
---- shadow-4.0.14.orig/src/Makefile.am	2006-02-09 14:21:44.000000000 +0100
-+++ shadow-4.0.14/src/Makefile.am	2006-02-09 14:45:25.000000000 +0100
-@@ -52,29 +52,37 @@
- 		 $(top_builddir)/lib/libshadow.la
- AM_CPPFLAGS    = -DLOCALEDIR=\"$(datadir)/locale\"
- 
--chage_LDADD    = $(LDADD) $(LIBAUDIT)
--chfn_LDADD     = $(LDADD) $(LIBPAM)
--chsh_LDADD     = $(LDADD) $(LIBPAM)
--chpasswd_LDADD = $(LDADD)
--gpasswd_LDADD  = $(LDADD) $(LIBAUDIT)
--groupadd_LDADD = $(LDADD) $(LIBAUDIT)
--groupdel_LDADD = $(LDADD) $(LIBAUDIT)
--groupmod_LDADD = $(LDADD) $(LIBAUDIT)
-+chage_LDADD    = $(LDADD) $(LIBAUDIT) $(LIBSELINUX)
-+chfn_LDADD     = $(LDADD) $(LIBPAM) $(LIBSELINUX)
-+chsh_LDADD     = $(LDADD) $(LIBPAM) $(LIBSELINUX)
-+chpasswd_LDADD = $(LDADD) $(LIBSELINUX)
-+gpasswd_LDADD  = $(LDADD) $(LIBAUDIT) $(LIBSELINUX)
-+groupadd_LDADD = $(LDADD) $(LIBAUDIT) $(LIBSELINUX)
-+groupdel_LDADD = $(LDADD) $(LIBAUDIT) $(LIBSELINUX)
-+groupmod_LDADD = $(LDADD) $(LIBAUDIT) $(LIBSELINUX)
- login_SOURCES  = \
- 	login.c \
- 	login_nopam.c
- login_LDADD    = $(LDADD) $(LIBPAM) $(LIBAUDIT)
- newgrp_LDADD   = $(LDADD) $(LIBPAM) $(LIBAUDIT)
--newusers_LDADD = $(LDADD)
-+newusers_LDADD = $(LDADD) $(LIBSELINUX)
- nologin_LDADD  =
--passwd_LDADD   = $(LDADD) $(LIBPAM) $(LIBCRACK) $(LIBAUDIT)
-+passwd_LDADD   = $(LDADD) $(LIBPAM) $(LIBCRACK) $(LIBAUDIT) $(LIBSELINUX)
- su_SOURCES     = \
- 	su.c \
- 	suauth.c
- su_LDADD       = $(LDADD) $(LIBPAM)
--useradd_LDADD  = $(LDADD) $(LIBAUDIT)
--userdel_LDADD  = $(LDADD) $(LIBAUDIT)
--usermod_LDADD  = $(LDADD) $(LIBAUDIT)
-+useradd_LDADD  = $(LDADD) $(LIBAUDIT) $(LIBSELINUX)
-+userdel_LDADD  = $(LDADD) $(LIBAUDIT) $(LIBSELINUX)
-+usermod_LDADD  = $(LDADD) $(LIBAUDIT) $(LIBSELINUX)
-+grpck_LDADD    = $(LDADD) $(LIBSELINUX)
-+grpconv_LDADD  = $(LDADD) $(LIBSELINUX)
-+grpunconv_LDADD = $(LDADD) $(LIBSELINUX)
-+pwck_LDADD     = $(LDADD) $(LIBSELINUX)
-+pwconv_LDADD   = $(LDADD) $(LIBSELINUX)
-+pwunconv_LDADD = $(LDADD) $(LIBSELINUX)
-+vipw_LDADD     = $(LDADD) $(LIBSELINUX)
-+cppw_LDADD     = $(LDADD) $(LIBSELINUX)
- 
- install-am: all-am
- 	$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am

Deleted: trunk/debian/patches/492_manpages_typos
===================================================================
--- trunk/debian/patches/492_manpages_typos	2006-02-21 23:06:55 UTC (rev 872)
+++ trunk/debian/patches/492_manpages_typos	2006-02-21 23:09:26 UTC (rev 873)
@@ -1,21 +0,0 @@
-Goal: fix some typos in the XML manpages.
-
-Fixes: #352135
-
-Status wrt upstream: not reported yet
-
-Index: shadow-4.0.14/man/passwd.1.xml
-===================================================================
---- shadow-4.0.14.orig/man/passwd.1.xml	2006-02-09 21:55:37.000000000 +0100
-+++ shadow-4.0.14/man/passwd.1.xml	2006-02-10 00:14:44.000000000 +0100
-@@ -101,8 +101,8 @@
-       <title>Hints for user passwords</title>
-       <para>
-         The security of a password depends upon the strength of the
--	encryption algorithm and the size of the key space. The
--	<emphasis>UNIX</emphasis> System encryption method is based on the
-+	encryption algorithm and the size of the key space.
-+	The <emphasis>UNIX</emphasis> System encryption method is based on the
- 	NBS DES algorithm and is very secure. The size of the key space
- 	depends upon the randomness of the password which is selected.
-       </para>

Copied: trunk/debian/patches/592_manpages_typos (from rev 867, trunk/debian/patches/492_manpages_typos)

Modified: trunk/debian/patches/series
===================================================================
--- trunk/debian/patches/series	2006-02-21 23:06:55 UTC (rev 872)
+++ trunk/debian/patches/series	2006-02-21 23:09:26 UTC (rev 873)
@@ -48,9 +48,9 @@
 386_nowarn
 489_useradd_allow_non_uniq_uid
 390_useradd_always_unlock_group_databases
-490_link_selinux_only_when_needed
+390_link_selinux_only_when_needed
 491_configure.in_friendly_selinux_detection
-492_manpages_typos
+592_manpages_typos
 493_selinux_no_proc
 # 999-2 is about using cdbs. It does not patch upstream files
 # so shouldn't be here, but we keep it for the future