[Pkg-samba-maint] r3606 - in branches/samba/backports.org/lenny/debian: . source

bubulle at alioth.debian.org bubulle at alioth.debian.org
Sun Sep 26 10:38:43 UTC 2010 

Author: bubulle
Date: 2010-09-26 10:38:36 +0000 (Sun, 26 Sep 2010)
New Revision: 3606

Modified:
   branches/samba/backports.org/lenny/debian/changelog
   branches/samba/backports.org/lenny/debian/control
   branches/samba/backports.org/lenny/debian/libpam-smbpass.files
   branches/samba/backports.org/lenny/debian/libpam-smbpass.pam-config
   branches/samba/backports.org/lenny/debian/libpam-smbpass.postinst
   branches/samba/backports.org/lenny/debian/libpam-smbpass.prerm
   branches/samba/backports.org/lenny/debian/rules
   branches/samba/backports.org/lenny/debian/samba-common.samba.pam
   branches/samba/backports.org/lenny/debian/source/format
   branches/samba/backports.org/lenny/debian/winbind.files
   branches/samba/backports.org/lenny/debian/winbind.pam-config
   branches/samba/backports.org/lenny/debian/winbind.postinst
   branches/samba/backports.org/lenny/debian/winbind.prerm
Log:
Merge backport changes

Modified: branches/samba/backports.org/lenny/debian/changelog
===================================================================
--- branches/samba/backports.org/lenny/debian/changelog	2010-09-25 18:36:15 UTC (rev 3605)
+++ branches/samba/backports.org/lenny/debian/changelog	2010-09-26 10:38:36 UTC (rev 3606)
@@ -1,3 +1,13 @@
+samba (2:3.5.5~dfsg-2) UNRELEASED; urgency=low
+
+  * Backport to lenny.
+  * Use 1.0 source format
+  * Drop PAM profile for winbind (not supported in lenny)
+  * Drop pam-auth-update calls in winbind.postinst and entirely drop
+    winbind.postrm. Also drop useless debian/winbind.pam-config.
+
+ -- Christian Perrier <bubulle at debian.org>  Sun, 26 Sep 2010 12:35:43 +0200
+
 samba (2:3.5.5~dfsg-1) unstable; urgency=high
 
   [ Christian Perrier ]
@@ -102,6 +112,16 @@
 
  -- Christian Perrier <bubulle at debian.org>  Fri, 15 Jan 2010 23:31:01 +0100
 
+samba (2:3.4.8~dfsg-2~bpo50+1) lenny-backports; urgency=low
+
+  * Backport to lenny.
+  * Use 1.0 source format
+  * Drop PAM profile for winbind (not supported in lenny)
+  * Drop pam-auth-update calls in winbind.postinst and entirely drop
+    winbind.postrm. Also drop useless debian/winbind.pam-config.
+
+ -- Christian Perrier <bubulle at debian.org>  Sun, 25 Jul 2010 19:22:27 +0200
+
 samba (2:3.4.8~dfsg-2) unstable; urgency=low
 
   [ Steve Langasek ]

Modified: branches/samba/backports.org/lenny/debian/control
===================================================================
--- branches/samba/backports.org/lenny/debian/control	2010-09-25 18:36:15 UTC (rev 3605)
+++ branches/samba/backports.org/lenny/debian/control	2010-09-26 10:38:36 UTC (rev 3606)
@@ -11,7 +11,7 @@
 	libcap2-dev  [alpha amd64 arm armeb armel avr32 hppa i386 ia64 lpia m32r m68k mips mipsel powerpc ppc64 s390 s390x sh3 sh3eb sh4 sh4eb sparc],
 	libkeyutils-dev  [alpha amd64 arm armeb armel avr32 hppa i386 ia64 lpia m32r m68k mips mipsel powerpc ppc64 s390 s390x sh3 sh3eb sh4 sh4eb sparc],
 	ctdb (>= 1.0.103) [alpha amd64 arm armeb armel avr32 hppa i386 ia64 lpia m32r m68k mips mipsel powerpc ppc64 s390 s390x sh3 sh3eb sh4 sh4eb sparc],
-	pkg-config
+	pkg-config, quilt (>=0.46-7~)
 Build-Conflicts: libfam-dev
 Standards-Version: 3.9.0
 Homepage: http://www.samba.org
@@ -20,7 +20,7 @@
 
 Package: samba
 Architecture: any
-Depends: samba-common (= ${source:Version}), libwbclient0 (= ${binary:Version}),${shlibs:Depends}, ${misc:Depends}, libpam-runtime (>= 1.0.1-11), libpam-modules, lsb-base (>= 3.2-13), procps, update-inetd, adduser
+Depends: samba-common (= ${source:Version}), libwbclient0 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}, libpam-runtime (>= 0.76-13.1), libpam-modules, lsb-base (>= 3.2-13), procps, update-inetd, adduser
 Recommends: logrotate
 Suggests: openbsd-inetd | inet-superserver, smbldap-tools, ldb-tools, ctdb
 Replaces: samba-common (<= 2.0.5a-2)
@@ -139,8 +139,7 @@
 Section: admin
 Priority: extra
 Architecture: any
-Depends: ${shlibs:Depends}, samba-common (= ${source:Version}), ${misc:Depends},
-	 libpam-runtime (>= 1.0.1-6)
+Depends: ${shlibs:Depends}, samba-common (= ${source:Version}), ${misc:Depends}
 Suggests: samba
 Description: pluggable authentication module for Samba
  This is a module for PAM that enables a system administrator to migrate

Modified: branches/samba/backports.org/lenny/debian/libpam-smbpass.files
===================================================================
--- branches/samba/backports.org/lenny/debian/libpam-smbpass.files	2010-09-25 18:36:15 UTC (rev 3605)
+++ branches/samba/backports.org/lenny/debian/libpam-smbpass.files	2010-09-26 10:38:36 UTC (rev 3606)
@@ -1,2 +1 @@
 lib/security/pam_smbpass.so
-usr/share/pam-configs/smbpasswd-migrate

Modified: branches/samba/backports.org/lenny/debian/libpam-smbpass.pam-config
===================================================================
--- branches/samba/backports.org/lenny/debian/libpam-smbpass.pam-config	2010-09-25 18:36:15 UTC (rev 3605)
+++ branches/samba/backports.org/lenny/debian/libpam-smbpass.pam-config	2010-09-26 10:38:36 UTC (rev 3606)
@@ -1,14 +0,0 @@
-Name: SMB password synchronization
-Default: yes
-Priority: 0
-Conflicts: smbpasswd-auth
-Auth-Type: Additional
-Auth-Initial:
-	optional			pam_smbpass.so migrate
-Auth-Final:
-	optional			pam_smbpass.so migrate
-Password-Type: Additional
-Password-Initial:
-	optional			pam_smbpass.so nullok use_authtok use_first_pass
-Password-Final:
-	optional			pam_smbpass.so nullok use_authtok use_first_pass

Modified: branches/samba/backports.org/lenny/debian/libpam-smbpass.postinst
===================================================================
--- branches/samba/backports.org/lenny/debian/libpam-smbpass.postinst	2010-09-25 18:36:15 UTC (rev 3605)
+++ branches/samba/backports.org/lenny/debian/libpam-smbpass.postinst	2010-09-26 10:38:36 UTC (rev 3606)
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-set -e
-
-pam-auth-update --package
-
-#DEBHELPER#

Modified: branches/samba/backports.org/lenny/debian/libpam-smbpass.prerm
===================================================================
--- branches/samba/backports.org/lenny/debian/libpam-smbpass.prerm	2010-09-25 18:36:15 UTC (rev 3605)
+++ branches/samba/backports.org/lenny/debian/libpam-smbpass.prerm	2010-09-26 10:38:36 UTC (rev 3606)
@@ -1,9 +0,0 @@
-#!/bin/sh
-
-set -e
-
-if [ "$1" = "remove" ]; then
-	pam-auth-update --package --remove smbpasswd-migrate
-fi
-
-#DEBHELPER#

Modified: branches/samba/backports.org/lenny/debian/rules
===================================================================
--- branches/samba/backports.org/lenny/debian/rules	2010-09-25 18:36:15 UTC (rev 3605)
+++ branches/samba/backports.org/lenny/debian/rules	2010-09-26 10:38:36 UTC (rev 3606)
@@ -21,6 +21,8 @@
   CFLAGS += -O2
 endif
 
+include /usr/share/quilt/quilt.make
+
 DESTDIR=`pwd`/debian/tmp
 
 conf_args = \
@@ -79,7 +81,8 @@
   conf_args += --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE)
 endif
 
-configure:
+configure: patch configure-stamp
+configure-stamp:
 	dh_testdir
 
 	if [ -f debian/config.cache ]; then \
@@ -100,7 +103,9 @@
 
 	touch build-stamp
 
-clean:
+clean:	clean-patched unpatch
+
+clean-patched: 
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp configure-stamp
@@ -163,9 +168,6 @@
 	install -m 0755 source3/bin/replacetort $(DESTDIR)/usr/bin/replacetort
 	install -m 0755 source3/bin/tdbtorture $(DESTDIR)/usr/bin/tdbtorture
 	install -m 0755 source3/bin/smbconftort $(DESTDIR)/usr/bin/smbconftort
-	mkdir -p $(DESTDIR)/usr/share/pam-configs
-	install -m 0644 debian/libpam-smbpass.pam-config $(DESTDIR)/usr/share/pam-configs/smbpasswd-migrate
-	install -m 0644 debian/winbind.pam-config $(DESTDIR)/usr/share/pam-configs/winbind
 
 	# For CUPS to support printing to samba printers, it's necessary
 	#	to make the following symlink (according to
@@ -253,4 +255,4 @@
 	       -e "s/libcap2-dev\( ([^)]\+)\)* \[[^]]\+\]/libcap2-dev \1 [`type-handling any linux-gnu`]/g" \
 		debian/control
 
-.PHONY: build clean binary-indep binary-arch binary install configure update-archs
+.PHONY: build clean binary-indep binary-arch binary install configure patch unpatch update-archs

Modified: branches/samba/backports.org/lenny/debian/samba-common.samba.pam
===================================================================
--- branches/samba/backports.org/lenny/debian/samba-common.samba.pam	2010-09-25 18:36:15 UTC (rev 3605)
+++ branches/samba/backports.org/lenny/debian/samba-common.samba.pam	2010-09-26 10:38:36 UTC (rev 3606)
@@ -1,3 +1,3 @@
 @include common-auth
 @include common-account
- at include common-session-noninteractive
+ at include common-session

Modified: branches/samba/backports.org/lenny/debian/source/format
===================================================================
--- branches/samba/backports.org/lenny/debian/source/format	2010-09-25 18:36:15 UTC (rev 3605)
+++ branches/samba/backports.org/lenny/debian/source/format	2010-09-26 10:38:36 UTC (rev 3606)
@@ -1 +1 @@
-3.0 (quilt)
+1.0

Modified: branches/samba/backports.org/lenny/debian/winbind.files
===================================================================
--- branches/samba/backports.org/lenny/debian/winbind.files	2010-09-25 18:36:15 UTC (rev 3605)
+++ branches/samba/backports.org/lenny/debian/winbind.files	2010-09-26 10:38:36 UTC (rev 3606)
@@ -20,6 +20,5 @@
 usr/share/man/man8/idmap_adex.8
 usr/share/man/man8/idmap_hash.8
 lib/security/pam_winbind.so
-usr/share/pam-configs/winbind
 lib/libnss_winbind.so.2
 lib/libnss_wins.so.2

Modified: branches/samba/backports.org/lenny/debian/winbind.pam-config
===================================================================
--- branches/samba/backports.org/lenny/debian/winbind.pam-config	2010-09-25 18:36:15 UTC (rev 3605)
+++ branches/samba/backports.org/lenny/debian/winbind.pam-config	2010-09-26 10:38:36 UTC (rev 3606)
@@ -1,19 +0,0 @@
-Name: Winbind NT/Active Directory authentication
-Default: yes
-Priority: 192
-Auth-Type: Primary
-Auth:
-	[success=end default=ignore]	pam_winbind.so krb5_auth krb5_ccache_type=FILE cached_login try_first_pass
-Auth-Initial:
-	[success=end default=ignore]	pam_winbind.so krb5_auth krb5_ccache_type=FILE cached_login
-Account-Type: Primary
-Account:
-	[success=end new_authtok_reqd=done default=ignore]	pam_winbind.so
-Password-Type: Primary
-Password:
-	[success=end default=ignore]	pam_winbind.so use_authtok try_first_pass
-Password-Initial:
-	[success=end default=ignore]	pam_winbind.so
-Session-Type: Additional
-Session:
-	optional			pam_winbind.so

Modified: branches/samba/backports.org/lenny/debian/winbind.postinst
===================================================================
--- branches/samba/backports.org/lenny/debian/winbind.postinst	2010-09-25 18:36:15 UTC (rev 3605)
+++ branches/samba/backports.org/lenny/debian/winbind.postinst	2010-09-26 10:38:36 UTC (rev 3606)
@@ -20,6 +20,4 @@
 	mv /etc/samba/idmap2.tdb /var/lib/samba/idmap2.tdb
 fi
 
-pam-auth-update --package
-
 #DEBHELPER#

Modified: branches/samba/backports.org/lenny/debian/winbind.prerm
===================================================================
--- branches/samba/backports.org/lenny/debian/winbind.prerm	2010-09-25 18:36:15 UTC (rev 3605)
+++ branches/samba/backports.org/lenny/debian/winbind.prerm	2010-09-26 10:38:36 UTC (rev 3606)
@@ -1,9 +0,0 @@
-#!/bin/sh
-
-set -e
-
-if [ "$1" = remove ]; then
-	pam-auth-update --package --remove winbind
-fi
-
-#DEBHELPER#

More information about the Pkg-samba-maint mailing list