[Pkg-shadow-commits] r534 - branches/experimental/debian/patches
Christine Spang
christine-guest at costa.debian.org
Tue Sep 13 02:02:56 UTC 2005
Author: christine-guest
Date: 2005-09-13 02:02:55 +0000 (Tue, 13 Sep 2005)
New Revision: 534
Modified:
branches/experimental/debian/patches/999-2_build_using_cdbs
Log:
More debian/rules cleanup:
-all files that do not require name changes on install now use
dh_install
-no more manual dir installations
-a few readability and comment improvements
Modified: branches/experimental/debian/patches/999-2_build_using_cdbs
===================================================================
--- branches/experimental/debian/patches/999-2_build_using_cdbs 2005-09-11 13:51:58 UTC (rev 533)
+++ branches/experimental/debian/patches/999-2_build_using_cdbs 2005-09-13 02:02:55 UTC (rev 534)
@@ -1,6 +1,6 @@
Index: shadow-4.0.12/debian/login.files
===================================================================
---- shadow-4.0.12.orig/debian/login.files 2005-09-07 23:46:23.000000000 -0400
+--- shadow-4.0.12.orig/debian/login.files 2005-09-12 21:24:44.000000000 -0400
+++ /dev/null 1970-01-01 00:00:00.000000000 +0000
@@ -1,22 +0,0 @@
-usr/share/locale/*/LC_MESSAGES/shadow.mo
@@ -28,33 +28,34 @@
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-09-10 11:28:29.000000000 -0400
-@@ -0,0 +1,22 @@
-+usr/share/locale/*/LC_MESSAGES/shadow.mo
-+usr/share/man/*/man1/login.1
-+usr/share/man/*/man1/newgrp.1
-+usr/share/man/*/man1/sg.1
-+usr/share/man/*/man1/su.1
-+usr/share/man/*/man5/faillog.5
-+usr/share/man/*/man5/login.defs.5
-+usr/share/man/*/man8/faillog.8
-+usr/share/man/*/man8/lastlog.8
-+usr/share/man/man1/login.1
-+usr/share/man/man1/newgrp.1
-+usr/share/man/man1/sg.1
-+usr/share/man/man1/su.1
-+usr/share/man/man5/faillog.5
-+usr/share/man/man5/login.defs.5
-+usr/share/man/man8/faillog.8
-+usr/share/man/man8/lastlog.8
-+usr/bin/faillog
-+usr/bin/lastlog
-+usr/bin/newgrp
-+bin/login
-+bin/su
++++ shadow-4.0.12/debian/login.install 2005-09-12 21:34:28.000000000 -0400
+@@ -0,0 +1,23 @@
++debian/tmp/usr/share/locale/*/LC_MESSAGES/shadow.mo
++debian/tmp/usr/share/man/*/man1/login.1
++debian/tmp/usr/share/man/*/man1/newgrp.1
++debian/tmp/usr/share/man/*/man1/sg.1
++debian/tmp/usr/share/man/*/man1/su.1
++debian/tmp/usr/share/man/*/man5/faillog.5
++debian/tmp/usr/share/man/*/man5/login.defs.5
++debian/tmp/usr/share/man/*/man8/faillog.8
++debian/tmp/usr/share/man/*/man8/lastlog.8
++debian/tmp/usr/share/man/man1/login.1
++debian/tmp/usr/share/man/man1/newgrp.1
++debian/tmp/usr/share/man/man1/sg.1
++debian/tmp/usr/share/man/man1/su.1
++debian/tmp/usr/share/man/man5/faillog.5
++debian/tmp/usr/share/man/man5/login.defs.5
++debian/tmp/usr/share/man/man8/faillog.8
++debian/tmp/usr/share/man/man8/lastlog.8
++debian/tmp/usr/bin/faillog
++debian/tmp/usr/bin/lastlog
++debian/tmp/usr/bin/newgrp
++debian/tmp/bin/login
++debian/tmp/bin/su
++debian/login.defs etc
Index: shadow-4.0.12/debian/passwd.files
===================================================================
---- shadow-4.0.12.orig/debian/passwd.files 2005-09-07 23:46:23.000000000 -0400
+--- shadow-4.0.12.orig/debian/passwd.files 2005-09-12 21:24:44.000000000 -0400
+++ /dev/null 1970-01-01 00:00:00.000000000 +0000
@@ -1,77 +0,0 @@
-usr/bin/chage
@@ -137,132 +138,132 @@
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-09-10 11:28:29.000000000 -0400
-@@ -0,0 +1,77 @@
-+usr/bin/chage
-+usr/bin/chfn
-+usr/bin/chsh
-+usr/bin/expiry
-+usr/bin/gpasswd
-+usr/bin/passwd
-+usr/sbin/chpasswd
-+usr/sbin/cppw
-+usr/sbin/groupadd
-+usr/sbin/groupdel
-+usr/sbin/groupmod
-+usr/sbin/grpck
-+usr/sbin/grpconv
-+usr/sbin/grpunconv
-+usr/sbin/newusers
-+usr/sbin/pwck
-+usr/sbin/pwconv
-+usr/sbin/pwunconv
-+usr/sbin/useradd
-+usr/sbin/userdel
-+usr/sbin/usermod
-+usr/sbin/vipw
-+usr/share/man/*/man1/chage.1
-+usr/share/man/*/man1/chfn.1
-+usr/share/man/*/man1/chsh.1
-+usr/share/man/*/man1/expiry.1
-+usr/share/man/*/man1/gpasswd.1
-+usr/share/man/*/man1/passwd.1
-+usr/share/man/*/man5/login.access.5
-+usr/share/man/*/man5/passwd.5
-+usr/share/man/*/man5/porttime.5
-+usr/share/man/*/man5/shadow.5
-+usr/share/man/*/man5/gshadow.5
-+usr/share/man/*/man8/chpasswd.8
-+usr/share/man/*/man8/groupadd.8
-+usr/share/man/*/man8/groupdel.8
-+usr/share/man/*/man8/groupmod.8
-+usr/share/man/*/man8/grpck.8
-+usr/share/man/*/man8/grpconv.8
-+usr/share/man/*/man8/grpunconv.8
-+usr/share/man/*/man8/newusers.8
-+usr/share/man/*/man8/pwck.8
-+usr/share/man/*/man8/pwconv.8
-+usr/share/man/*/man8/pwunconv.8
-+usr/share/man/*/man8/useradd.8
-+usr/share/man/*/man8/userdel.8
-+usr/share/man/*/man8/usermod.8
-+usr/share/man/*/man8/vigr.8
-+usr/share/man/*/man8/vipw.8
-+usr/share/man/man1/chage.1
-+usr/share/man/man1/chfn.1
-+usr/share/man/man1/chsh.1
-+usr/share/man/man1/expiry.1
-+usr/share/man/man1/gpasswd.1
-+usr/share/man/man1/passwd.1
-+usr/share/man/man5/limits.5
-+usr/share/man/man5/login.access.5
-+usr/share/man/man5/passwd.5
-+usr/share/man/man5/porttime.5
-+usr/share/man/man5/shadow.5
-+usr/share/man/man5/gshadow.5
-+usr/share/man/man8/chpasswd.8
-+usr/share/man/man8/groupadd.8
-+usr/share/man/man8/groupdel.8
-+usr/share/man/man8/groupmod.8
-+usr/share/man/man8/grpck.8
-+usr/share/man/man8/grpconv.8
-+usr/share/man/man8/grpunconv.8
-+usr/share/man/man8/newusers.8
-+usr/share/man/man8/pwck.8
-+usr/share/man/man8/pwconv.8
-+usr/share/man/man8/pwunconv.8
-+usr/share/man/man8/useradd.8
-+usr/share/man/man8/userdel.8
-+usr/share/man/man8/usermod.8
-+usr/share/man/man8/vigr.8
-+usr/share/man/man8/vipw.8
++++ shadow-4.0.12/debian/passwd.install 2005-09-12 21:34:28.000000000 -0400
+@@ -0,0 +1,86 @@
++debian/tmp/usr/bin/chage
++debian/tmp/usr/bin/chfn
++debian/tmp/usr/bin/chsh
++debian/tmp/usr/bin/expiry
++debian/tmp/usr/bin/gpasswd
++debian/tmp/usr/bin/passwd
++debian/tmp/usr/sbin/chpasswd
++debian/tmp/usr/sbin/cppw
++debian/tmp/usr/sbin/groupadd
++debian/tmp/usr/sbin/groupdel
++debian/tmp/usr/sbin/groupmod
++debian/tmp/usr/sbin/grpck
++debian/tmp/usr/sbin/grpconv
++debian/tmp/usr/sbin/grpunconv
++debian/tmp/usr/sbin/newusers
++debian/tmp/usr/sbin/pwck
++debian/tmp/usr/sbin/pwconv
++debian/tmp/usr/sbin/pwunconv
++debian/tmp/usr/sbin/useradd
++debian/tmp/usr/sbin/userdel
++debian/tmp/usr/sbin/usermod
++debian/tmp/usr/sbin/vipw
++debian/tmp/usr/share/man/*/man1/chage.1
++debian/tmp/usr/share/man/*/man1/chfn.1
++debian/tmp/usr/share/man/*/man1/chsh.1
++debian/tmp/usr/share/man/*/man1/expiry.1
++debian/tmp/usr/share/man/*/man1/gpasswd.1
++debian/tmp/usr/share/man/*/man1/passwd.1
++debian/tmp/usr/share/man/*/man5/login.access.5
++debian/tmp/usr/share/man/*/man5/passwd.5
++debian/tmp/usr/share/man/*/man5/porttime.5
++debian/tmp/usr/share/man/*/man5/shadow.5
++debian/tmp/usr/share/man/*/man5/gshadow.5
++debian/tmp/usr/share/man/*/man8/chpasswd.8
++debian/tmp/usr/share/man/*/man8/groupadd.8
++debian/tmp/usr/share/man/*/man8/groupdel.8
++debian/tmp/usr/share/man/*/man8/groupmod.8
++debian/tmp/usr/share/man/*/man8/grpck.8
++debian/tmp/usr/share/man/*/man8/grpconv.8
++debian/tmp/usr/share/man/*/man8/grpunconv.8
++debian/tmp/usr/share/man/*/man8/newusers.8
++debian/tmp/usr/share/man/*/man8/pwck.8
++debian/tmp/usr/share/man/*/man8/pwconv.8
++debian/tmp/usr/share/man/*/man8/pwunconv.8
++debian/tmp/usr/share/man/*/man8/useradd.8
++debian/tmp/usr/share/man/*/man8/userdel.8
++debian/tmp/usr/share/man/*/man8/usermod.8
++debian/tmp/usr/share/man/*/man8/vigr.8
++debian/tmp/usr/share/man/*/man8/vipw.8
++debian/tmp/usr/share/man/man1/chage.1
++debian/tmp/usr/share/man/man1/chfn.1
++debian/tmp/usr/share/man/man1/chsh.1
++debian/tmp/usr/share/man/man1/expiry.1
++debian/tmp/usr/share/man/man1/gpasswd.1
++debian/tmp/usr/share/man/man1/passwd.1
++debian/tmp/usr/share/man/man5/limits.5
++debian/tmp/usr/share/man/man5/login.access.5
++debian/tmp/usr/share/man/man5/passwd.5
++debian/tmp/usr/share/man/man5/porttime.5
++debian/tmp/usr/share/man/man5/shadow.5
++debian/tmp/usr/share/man/man5/gshadow.5
++debian/tmp/usr/share/man/man8/chpasswd.8
++debian/tmp/usr/share/man/man8/groupadd.8
++debian/tmp/usr/share/man/man8/groupdel.8
++debian/tmp/usr/share/man/man8/groupmod.8
++debian/tmp/usr/share/man/man8/grpck.8
++debian/tmp/usr/share/man/man8/grpconv.8
++debian/tmp/usr/share/man/man8/grpunconv.8
++debian/tmp/usr/share/man/man8/newusers.8
++debian/tmp/usr/share/man/man8/pwck.8
++debian/tmp/usr/share/man/man8/pwconv.8
++debian/tmp/usr/share/man/man8/pwunconv.8
++debian/tmp/usr/share/man/man8/useradd.8
++debian/tmp/usr/share/man/man8/userdel.8
++debian/tmp/usr/share/man/man8/usermod.8
++debian/tmp/usr/share/man/man8/vigr.8
++debian/tmp/usr/share/man/man8/vipw.8
++debian/shells usr/share/passwd
++debian/add-shell.8 usr/share/man/man8
++debian/remove-shell.8 usr/share/man/man8
++debian/cpgr.8 usr/share/man/man8
++debian/cppw.8 usr/share/man/man8
++man/shadowconfig.8 usr/share/man/man8
++man/ja/shadowconfig.8 usr/share/man/ja/man8
++man/pl/shadowconfig.8 usr/share/man/pl/man8
++man/fr/shadowconfig.8 usr/share/man/fr/man8
Index: shadow-4.0.12/debian/rules
===================================================================
---- shadow-4.0.12.orig/debian/rules 2005-09-07 23:46:23.000000000 -0400
-+++ shadow-4.0.12/debian/rules 2005-09-11 09:50:41.000000000 -0400
-@@ -1,8 +1,26 @@
+--- shadow-4.0.12.orig/debian/rules 2005-09-12 21:24:45.000000000 -0400
++++ shadow-4.0.12/debian/rules 2005-09-12 21:48:25.000000000 -0400
+@@ -1,199 +1,84 @@
#!/usr/bin/make -f
+# -*- mode: makefile; coding: utf-8 -*-
-+
+
+-# This is the debhelper compatibility version to use.
+-export DH_COMPAT=4
+-
+-CFLAGS = -g -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
+-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+- CFLAGS += -O0
+-else
+- CFLAGS += -O2
+-endif
+-export CFLAGS
+include /usr/share/cdbs/1/rules/debhelper.mk
-+# Specify where dh_install will find the files that it needs to move:
-+DEB_DH_INSTALL_SOURCEDIR=debian/tmp
+DH_COMPAT = 4
-+
+
+-config_options := --disable-shared --without-libcrack --mandir=/usr/share/man --with-libpam --enable-shadowgrp --enable-man
+include /usr/share/cdbs/1/class/autotools.mk
+# Automatically update autoconf, etc.
+DEB_AUTO_UPDATE_ACLOCAL = 1.7
+DEB_AUTO_UPDATE_AUTOCONF = 1.7
+DEB_AUTO_UPDATE_AUTOMAKE = 1.7
-+
+
+-DEB_HOST_ARCH_OS := $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
+-DEB_BUILD_GNU_TYPE = $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+-DEB_HOST_GNU_TYPE = $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+# Adds extra options when calling the configure script:
+DEB_CONFIGURE_EXTRA_FLAGS := --disable-shared --without-libcrack --mandir=/usr/share/man --with-libpam --enable-shadowgrp
-+ifneq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE))
+ ifneq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE))
+- config_options += --host=$(DEB_HOST_GNU_TYPE)
+ DEB_CONFIGURE_EXTRA_FLAGS += --host=$(DEB_HOST_GNU_TYPE)
-+endif
-+
-+# Automatically controls patching at build time:
-+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
-
--# This is the debhelper compatibility version to use.
--export DH_COMPAT=4
--
- CFLAGS = -g -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
- ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
- CFLAGS += -O0
-@@ -11,91 +29,16 @@
endif
- export CFLAGS
--config_options := --disable-shared --without-libcrack --mandir=/usr/share/man --with-libpam --enable-shadowgrp --enable-man
--
--DEB_HOST_ARCH_OS := $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
--DEB_BUILD_GNU_TYPE = $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
--DEB_HOST_GNU_TYPE = $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
--ifneq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE))
-- config_options += --host=$(DEB_HOST_GNU_TYPE)
--endif
--
-# see /usr/share/doc/autotools-dev/README.Debian.gz
-export DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-export DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
@@ -270,20 +271,20 @@
-# FOR AUTOCONF 2.52 AND NEWER ONLY
-ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
- confflags += --build $(DEB_HOST_GNU_TYPE)
--else
++# Automatically controls patching at build time:
++include /usr/share/cdbs/1/rules/patchsys-quilt.mk
++
++CFLAGS = -g -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
++ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
++ CFLAGS += -O0
+ else
- confflags += --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE)
--endif
++ CFLAGS += -O2
+ endif
++export CFLAGS
+
+-export DH_COMPAT=3
-
--export DH_COMPAT=3
-+# Add extras to the install process:
-+binary-install/login::
-+ 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
-+ install -c -m 444 debian/login.lintian-overrides debian/login/usr/share/lintian/overrides/login
-+ install -c -m 444 debian/login.linda-overrides debian/login/usr/share/linda/overrides/login
-
-# The autotools target adds forced build-time dependencies on
-# autotools-dev (for /usr/share/misc/config.*) and devscripts (for dch)
-# It's also a .PHONY make target.
@@ -347,31 +348,58 @@
- ln -sf vipw debian/passwd/usr/sbin/vigr
- ln -sf cppw debian/passwd/usr/sbin/cpgr
- ln -sf newgrp debian/login/usr/bin/sg
-+binary-install/passwd::
- # 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,6 +47,7 @@
- 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 -c -m 644 debian/useradd.default debian/passwd/etc/default/useradd
- dh_installpam -p passwd --name=chage
- dh_installpam -p passwd --name=chfn
- dh_installpam -p passwd --name=chsh
-@@ -114,9 +58,6 @@
- dh_installpam -p passwd --name=groupdel
- dh_installpam -p passwd --name=groupmod
- dh_installpam -p passwd --name=newusers
+- # 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
+- rm -f debian/passwd/usr/share/man/man5/limits.5 || true
+- install -c -m 444 man/shadowconfig.8 debian/passwd/usr/share/man/man8
+- 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
+- dh_installpam -p passwd --name=chage
+- dh_installpam -p passwd --name=chfn
+- dh_installpam -p passwd --name=chsh
+- dh_installpam -p passwd --name=useradd
+- dh_installpam -p passwd --name=userdel
+- dh_installpam -p passwd --name=usermod
+- dh_installpam -p passwd --name=groupadd
+- 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
-@@ -128,71 +69,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
++# Adds extras to the install process:
++binary-install/login::
++ dh_installpam -plogin
++ # dh_install can't handle file renaming, so we'll have to install
++ # these files manually:
+ 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/login.lintian-overrides debian/login/usr/share/lintian/overrides/login
++ install -c -m 444 debian/login.linda-overrides debian/login/usr/share/linda/overrides/login
++
++binary-install/passwd::
++ dh_installpam -ppasswd --name=chage
++ dh_installpam -ppasswd --name=chfn
++ dh_installpam -ppasswd --name=chsh
++ dh_installpam -ppasswd --name=useradd
++ dh_installpam -ppasswd --name=userdel
++ dh_installpam -ppasswd --name=usermod
++ dh_installpam -ppasswd --name=groupadd
++ dh_installpam -ppasswd --name=groupdel
++ dh_installpam -ppasswd --name=groupmod
++ dh_installpam -ppasswd --name=newusers
++ # Manual installations due to dh_install limitation:
+ install -c -m 644 debian/useradd.default debian/passwd/etc/default/useradd
+- install -c -m 444 debian/shells debian/passwd/usr/share/passwd/shells
+- install -d debian/passwd/sbin
+ install -c -m 555 debian/shadowconfig.sh debian/passwd/sbin/shadowconfig
+ install -c -m 555 debian/add-shell.sh debian/passwd/usr/sbin/add-shell
+ install -c -m 555 debian/remove-shell.sh debian/passwd/usr/sbin/remove-shell
+- install -c -m 444 debian/add-shell.8 debian/passwd/usr/share/man/man8
+- install -c -m 444 debian/remove-shell.8 debian/passwd/usr/share/man/man8
+- 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
- install -c -m 444 debian/login.lintian-overrides debian/login/usr/share/lintian/overrides/login
install -c -m 444 debian/passwd.lintian-overrides debian/passwd/usr/share/lintian/overrides/passwd
@@ -393,19 +421,35 @@
# chmod u+s debian/login/bin/login
chmod u+s debian/login/bin/su
chmod u+s debian/login/usr/bin/newgrp
-- 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
++ # From bug 235641?
++ 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
++
++binary-predeb/passwd::
++ # 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
++ rm -f debian/passwd/usr/share/man/man5/limits.5 || true
++ 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
- 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
@@ -441,26 +485,26 @@
-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
+-
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-09-10 11:32:40.000000000 -0400
++++ shadow-4.0.12/debian/passwd.links 2005-09-12 21:34:28.000000000 -0400
@@ -0,0 +1,2 @@
+usr/sbin/vipw usr/sbin/vigr
+usr/sbin/cppw usr/sbin/cpgr
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-09-10 11:28:29.000000000 -0400
++++ shadow-4.0.12/debian/login.links 2005-09-12 21:34:28.000000000 -0400
@@ -0,0 +1 @@
+usr/bin/newgrp usr/bin/sg
+Index: shadow-4.0.12/debian/passwd.dirs
+===================================================================
+--- shadow-4.0.12.orig/debian/passwd.dirs 2005-09-12 21:24:45.000000000 -0400
++++ shadow-4.0.12/debian/passwd.dirs 2005-09-12 21:34:28.000000000 -0400
+@@ -1,2 +1,4 @@
+ usr/share/lintian/overrides
+ usr/share/linda/overrides
++etc/default
++sbin
More information about the Pkg-shadow-commits
mailing list