[Pkg-shadow-commits] r497 - branches/experimental/debian/patches

Christine Spang christine-guest at costa.debian.org
Tue Aug 30 21:04:10 UTC 2005 

Author: christine-guest
Date: 2005-08-30 21:04:09 +0000 (Tue, 30 Aug 2005)
New Revision: 497

Modified:
   branches/experimental/debian/patches/999-2_build_using_cdbs
Log:
Update cdbs rules file to use dh_installpam.


Modified: branches/experimental/debian/patches/999-2_build_using_cdbs
===================================================================
--- branches/experimental/debian/patches/999-2_build_using_cdbs	2005-08-30 18:10:06 UTC (rev 496)
+++ branches/experimental/debian/patches/999-2_build_using_cdbs	2005-08-30 21:04:09 UTC (rev 497)
@@ -1,6 +1,6 @@
 Index: shadow-4.0.12/debian/login.files
 ===================================================================
---- shadow-4.0.12.orig/debian/login.files	2005-08-26 02:41:05.000000000 -0400
+--- shadow-4.0.12.orig/debian/login.files	2005-08-26 01:18:49.000000000 -0400
 +++ /dev/null	1970-01-01 00:00:00.000000000 +0000
 @@ -1,22 +0,0 @@
 -usr/share/locale/*/LC_MESSAGES/shadow.mo
@@ -28,7 +28,7 @@
 Index: shadow-4.0.12/debian/login.install
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ shadow-4.0.12/debian/login.install	2005-08-26 02:43:45.000000000 -0400
++++ shadow-4.0.12/debian/login.install	2005-08-30 16:52:23.000000000 -0400
 @@ -0,0 +1,22 @@
 +usr/share/locale/*/LC_MESSAGES/shadow.mo
 +usr/share/man/*/man1/login.1
@@ -54,7 +54,7 @@
 +bin/su
 Index: shadow-4.0.12/debian/passwd.files
 ===================================================================
---- shadow-4.0.12.orig/debian/passwd.files	2005-08-26 02:41:05.000000000 -0400
+--- shadow-4.0.12.orig/debian/passwd.files	2005-08-26 01:18:49.000000000 -0400
 +++ /dev/null	1970-01-01 00:00:00.000000000 +0000
 @@ -1,77 +0,0 @@
 -usr/bin/chage
@@ -137,7 +137,7 @@
 Index: shadow-4.0.12/debian/passwd.install
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ shadow-4.0.12/debian/passwd.install	2005-08-26 02:43:45.000000000 -0400
++++ shadow-4.0.12/debian/passwd.install	2005-08-30 16:52:23.000000000 -0400
 @@ -0,0 +1,77 @@
 +usr/bin/chage
 +usr/bin/chfn
@@ -216,23 +216,10 @@
 +usr/share/man/man8/usermod.8
 +usr/share/man/man8/vigr.8
 +usr/share/man/man8/vipw.8
-Index: shadow-4.0.12/debian/login.links
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ shadow-4.0.12/debian/login.links	2005-08-26 02:43:45.000000000 -0400
-@@ -0,0 +1 @@
-+usr/bin/newgrp usr/bin/sg
-Index: shadow-4.0.12/debian/passwd.links
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ shadow-4.0.12/debian/passwd.links	2005-08-26 02:43:45.000000000 -0400
-@@ -0,0 +1,2 @@
-+usr/sbin/vipw usr/sbin/vigr
-+usr/sbin/cppw usr/sbin/cpgr
 Index: shadow-4.0.12/debian/rules
 ===================================================================
---- shadow-4.0.12.orig/debian/rules	2005-08-26 02:43:19.000000000 -0400
-+++ shadow-4.0.12/debian/rules	2005-08-26 02:39:28.000000000 -0400
+--- shadow-4.0.12.orig/debian/rules	2005-08-30 16:53:34.000000000 -0400
++++ shadow-4.0.12/debian/rules	2005-08-30 16:53:56.000000000 -0400
 @@ -1,8 +1,26 @@
  #!/usr/bin/make -f
 +# -*- mode: makefile; coding: utf-8 -*-
@@ -263,7 +250,7 @@
  CFLAGS = -g -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
  ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
    CFLAGS += -O0
-@@ -11,91 +29,18 @@
+@@ -11,91 +29,16 @@
  endif
  export CFLAGS
  
@@ -288,11 +275,9 @@
 -endif
 -
 -export DH_COMPAT=3
++# Add extras to the install process:
 +binary-install/login::
-+	# PAM
-+	install -d debian/login/etc/pam.d
-+	install -c -m 444 debian/pam.d/login debian/login/etc/pam.d/login
-+	install -c -m 444 debian/pam.d/su debian/login/etc/pam.d/su
++	dh_installpam -p login
 +	install -c -m 444 debian/login.defs debian/login/etc/login.defs
 +	install -c -m 444 debian/securetty.$(DEB_HOST_ARCH_OS) debian/login/etc/securetty
 +	# Lintian and Linda overrides
@@ -366,24 +351,17 @@
  	# Bug #288106. This used to be renamed to limits.conf.5
  	# but does not reflect what we do in Debian
  	# so we'd better forget about that man page
-@@ -104,15 +49,11 @@
- 	install -c -m 444 man/ja/shadowconfig.8 debian/passwd/usr/share/man/ja/man8
- 	install -c -m 444 man/pl/shadowconfig.8 debian/passwd/usr/share/man/pl/man8
- 	install -c -m 444 man/fr/shadowconfig.8 debian/passwd/usr/share/man/fr/man8
--	install -d debian/login/etc/pam.d
--	install -c -m 444 debian/pam.d/login debian/login/etc/pam.d/login
--	install -c -m 444 debian/pam.d/su debian/login/etc/pam.d/su
-+	# PAM
- 	install -d debian/passwd/etc/pam.d
- 	install -c -m 444 debian/pam.d/chfn debian/passwd/etc/pam.d/chfn
- 	install -c -m 444 debian/pam.d/chsh debian/passwd/etc/pam.d/chsh
- 	install -c -m 444 debian/pam.d/passwd debian/passwd/etc/pam.d/passwd
+@@ -114,9 +57,6 @@
+ 	dh_installpam -p passwd --name=groupdel
+ 	dh_installpam -p passwd --name=groupmod
+ 	dh_installpam -p passwd --name=newusers
+-	dh_installpam -p login
 -	install -c -m 444 debian/login.defs debian/login/etc/login.defs
 -	install -c -m 444 debian/securetty.$(DEB_HOST_ARCH_OS) debian/login/etc/securetty
  	install -d debian/passwd/usr/share/passwd
  	install -c -m 444 debian/shells debian/passwd/usr/share/passwd/shells
  	install -d debian/passwd/sbin
-@@ -124,71 +65,22 @@
+@@ -128,71 +68,27 @@
  	install -c -m 444 debian/cpgr.8 debian/passwd/usr/share/man/man8
  	install -c -m 444 debian/cppw.8 debian/passwd/usr/share/man/man8
  	# Lintian overrides files
@@ -407,25 +385,19 @@
  	# chmod u+s debian/login/bin/login
  	chmod u+s debian/login/bin/su
  	chmod u+s debian/login/usr/bin/newgrp
-+
-+binary-predeb/passwd::
-+	chmod u+s debian/passwd/usr/bin/chfn
-+	chmod u+s debian/passwd/usr/bin/chsh
-+	chmod u+s debian/passwd/usr/bin/gpasswd
-+	chmod u+s debian/passwd/usr/bin/passwd
- 	chgrp shadow debian/passwd/usr/bin/chage
- 	chgrp shadow debian/passwd/usr/bin/expiry
- 	chmod g+s debian/passwd/usr/bin/chage
- 	chmod g+s debian/passwd/usr/bin/expiry
+-	chgrp shadow debian/passwd/usr/bin/chage
+-	chgrp shadow debian/passwd/usr/bin/expiry
+-	chmod g+s debian/passwd/usr/bin/chage
+-	chmod g+s debian/passwd/usr/bin/expiry
 -	dh_strip
 -	dh_compress
 -	dh_shlibdeps
 -	dh_installdebconf
--ifneq ($(DEB_HOST_ARCH_OS),hurd)
--	echo "loginpam=login (>= 970502-1), libpam-modules (>= 0.72-5)" >> debian/passwd.substvars
--else
--	echo "loginpam=login, libpam-modules (>= 0.72-5)" >> debian/passwd.substvars
--endif
+ ifneq ($(DEB_HOST_ARCH_OS),hurd)
+ 	echo "loginpam=login (>= 970502-1), libpam-modules (>= 0.72-5)" >> debian/passwd.substvars
+ else
+ 	echo "loginpam=login, libpam-modules (>= 0.72-5)" >> debian/passwd.substvars
+ endif
 -	dh_installdeb
 -	dh_gencontrol
 -	dh_md5sums
@@ -461,4 +433,13 @@
 -unpatch:
 -	QUILT_PATCHES=$(QUILT_PATCH_DIR) quilt pop -a -R || test $$? = 2 
 -	rm -rf .pc debian/$(QUILT_STAMPFN)
--
+ 
++binary-predeb/passwd::
++	chmod u+s debian/passwd/usr/bin/chfn
++	chmod u+s debian/passwd/usr/bin/chsh
++	chmod u+s debian/passwd/usr/bin/gpasswd
++	chmod u+s debian/passwd/usr/bin/passwd
++	chgrp shadow debian/passwd/usr/bin/chage
++	chgrp shadow debian/passwd/usr/bin/expiry
++	chmod g+s debian/passwd/usr/bin/chage
++	chmod g+s debian/passwd/usr/bin/expiry

More information about the Pkg-shadow-commits mailing list