[Pkg-samba-maint] r3458 - in branches/samba/backports-unofficial/lenny-latest/debian: . source

bubulle at alioth.debian.org bubulle at alioth.debian.org
Wed May 5 07:50:46 UTC 2010 

Author: bubulle
Date: 2010-05-05 07:50:43 +0000 (Wed, 05 May 2010)
New Revision: 3458

Removed:
   branches/samba/backports-unofficial/lenny-latest/debian/libpam-smbpass.pam-config
   branches/samba/backports-unofficial/lenny-latest/debian/libpam-smbpass.postinst
   branches/samba/backports-unofficial/lenny-latest/debian/libpam-smbpass.prerm
Modified:
   branches/samba/backports-unofficial/lenny-latest/debian/changelog
   branches/samba/backports-unofficial/lenny-latest/debian/control
   branches/samba/backports-unofficial/lenny-latest/debian/libpam-smbpass.files
   branches/samba/backports-unofficial/lenny-latest/debian/rules
   branches/samba/backports-unofficial/lenny-latest/debian/samba-common.samba.pam
   branches/samba/backports-unofficial/lenny-latest/debian/source/format
   branches/samba/backports-unofficial/lenny-latest/debian/winbind.files
Log:
Merge "lenny backport" changes, namely changes between 2:3.4.7~dfsg-2
and 2:3.4.7~dfsg-2~bpo50+1


Modified: branches/samba/backports-unofficial/lenny-latest/debian/changelog
===================================================================
--- branches/samba/backports-unofficial/lenny-latest/debian/changelog	2010-05-05 05:57:22 UTC (rev 3457)
+++ branches/samba/backports-unofficial/lenny-latest/debian/changelog	2010-05-05 07:50:43 UTC (rev 3458)
@@ -1,3 +1,11 @@
+samba (2:3.5.2~dfsg-2~unoff50+1) lenny-backports-latest-UNRELEASED; urgency=low
+
+  * Backport to lenny.
+  * Use 1.0 source format
+  * Drop PAM profile for winbind (not supported in lenny)
+
+ -- Christian Perrier <bubulle at debian.org>  Tue, 04 May 2010 10:28:46 +0200
+
 samba (2:3.5.2~dfsg-2) experimental; urgency=low
 
   * Resync changes with changes in trunk between 3:3.4.4~dfsg-1 and
@@ -65,6 +73,21 @@
 
  -- Christian Perrier <bubulle at debian.org>  Sat, 13 Feb 2010 14:36:33 +0100
 
+samba (2:3.4.5~dfsg-1~bpo50+2) lenny-backports; urgency=low
+
+  * Add the correct versioned build dependency on libtalloc-dev as
+    we need 2.0.1 to build samba
+  * re-add the patch and unatch targets in debian/rules
+
+ -- Christian Perrier <bubulle at debian.org>  Wed, 03 Mar 2010 19:53:06 +0100
+
+samba (2:3.4.5~dfsg-1~bpo50+1) lenny-backports; urgency=low
+
+  * Lenny backport
+  * Down to 1.0 source format: reintroduce build dependency on quilt
+
+ -- Christian Perrier <bubulle at debian.org>  Wed, 24 Feb 2010 21:40:37 +0100
+
 samba (2:3.4.5~dfsg-1) unstable; urgency=low
 
   * New upstream release. Bugs fixed by this release:
@@ -176,6 +199,29 @@
 
  -- Christian Perrier <bubulle at debian.org>  Sat, 31 Oct 2009 14:32:07 +0100
 
+samba (2:3.4.2-1~bpo50+3) lenny-backports; urgency=low
+
+  * Drop dependency on libpam-runtime for libpam-smbpass
+
+ -- Christian Perrier <bubulle at debian.org>  Sun, 25 Oct 2009 22:15:04 +0100
+
+samba (2:3.4.2-1~bpo50+2) lenny-backports; urgency=high
+
+  * Revert PAM changes from unstable:
+   - debian/samba.pamd: no longer include common-session-noninteractive
+     instead of common-session
+   * debian/control: samba no longer depends on libpam-runtime
+     (>= 1.0.1-11)  
+
+ -- Christian Perrier <bubulle at debian.org>  Sat, 17 Oct 2009 07:45:07 +0200
+
+samba (2:3.4.2-1~bpo50+1) lenny-backports; urgency=high
+
+  * Backport to lenny
+  * Security update for lenny backports
+
+ -- Christian Perrier <bubulle at debian.org>  Sat, 10 Oct 2009 19:05:24 +0200
+
 samba (2:3.4.2-1) unstable; urgency=high
 
   * New upstream release. Security update.
@@ -344,6 +390,13 @@
 
  -- Christian Perrier <bubulle at debian.org>  Wed, 20 May 2009 18:50:35 +0200
 
+samba (2:3.3.6-1~bpo50+1) lenny-backports; urgency=high
+
+  * Backport to lenny
+  * Security update for lenny backports
+
+ -- Christian Perrier <bubulle at debian.org>  Tue, 30 Jun 2009 08:07:54 +0200
+
 samba (2:3.3.6-1) unstable; urgency=high
 
   * New upstream release. Security release.
@@ -386,6 +439,20 @@
 
  -- Christian Perrier <bubulle at debian.org>  Sat, 16 May 2009 17:31:09 +0200
 
+samba (2:3.3.4-1~bpo50+2) lenny-backports; urgency=low
+
+  * Rebuild (really for lenny this time)
+
+ -- Christian Perrier <bubulle at debian.org>  Wed, 27 May 2009 20:19:02 +0200
+
+samba (2:3.3.4-1~bpo50+1) lenny-backports; urgency=low
+
+  * Backport to lenny
+  * Disable use of pam-authupdate to avoid versioned build dependency
+    on libpam-runtime that's not possible in lenny
+
+ -- Christian Perrier <bubulle at debian.org>  Tue, 21 Apr 2009 10:33:46 +0200
+
 samba (2:3.3.4-1) unstable; urgency=low
 
   [ Christian Perrier ]

Modified: branches/samba/backports-unofficial/lenny-latest/debian/control
===================================================================
--- branches/samba/backports-unofficial/lenny-latest/debian/control	2010-05-05 05:57:22 UTC (rev 3457)
+++ branches/samba/backports-unofficial/lenny-latest/debian/control	2010-05-05 07:50:43 UTC (rev 3458)
@@ -12,7 +12,7 @@
 	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],
 	ctdb (>= 1.0.73) [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.8.4
 Homepage: http://www.samba.org
@@ -21,7 +21,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)
@@ -140,8 +140,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-unofficial/lenny-latest/debian/libpam-smbpass.files
===================================================================
--- branches/samba/backports-unofficial/lenny-latest/debian/libpam-smbpass.files	2010-05-05 05:57:22 UTC (rev 3457)
+++ branches/samba/backports-unofficial/lenny-latest/debian/libpam-smbpass.files	2010-05-05 07:50:43 UTC (rev 3458)
@@ -1,2 +1 @@
 lib/security/pam_smbpass.so
-usr/share/pam-configs/smbpasswd-migrate

Deleted: branches/samba/backports-unofficial/lenny-latest/debian/libpam-smbpass.pam-config
===================================================================
--- branches/samba/backports-unofficial/lenny-latest/debian/libpam-smbpass.pam-config	2010-05-05 05:57:22 UTC (rev 3457)
+++ branches/samba/backports-unofficial/lenny-latest/debian/libpam-smbpass.pam-config	2010-05-05 07:50:43 UTC (rev 3458)
@@ -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

Deleted: branches/samba/backports-unofficial/lenny-latest/debian/libpam-smbpass.postinst
===================================================================
--- branches/samba/backports-unofficial/lenny-latest/debian/libpam-smbpass.postinst	2010-05-05 05:57:22 UTC (rev 3457)
+++ branches/samba/backports-unofficial/lenny-latest/debian/libpam-smbpass.postinst	2010-05-05 07:50:43 UTC (rev 3458)
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-set -e
-
-pam-auth-update --package
-
-#DEBHELPER#

Deleted: branches/samba/backports-unofficial/lenny-latest/debian/libpam-smbpass.prerm
===================================================================
--- branches/samba/backports-unofficial/lenny-latest/debian/libpam-smbpass.prerm	2010-05-05 05:57:22 UTC (rev 3457)
+++ branches/samba/backports-unofficial/lenny-latest/debian/libpam-smbpass.prerm	2010-05-05 07:50:43 UTC (rev 3458)
@@ -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-unofficial/lenny-latest/debian/rules
===================================================================
--- branches/samba/backports-unofficial/lenny-latest/debian/rules	2010-05-05 05:57:22 UTC (rev 3457)
+++ branches/samba/backports-unofficial/lenny-latest/debian/rules	2010-05-05 07:50:43 UTC (rev 3458)
@@ -21,6 +21,8 @@
   CFLAGS += -O2
 endif
 
+include /usr/share/quilt/quilt.make
+
 DESTDIR=`pwd`/debian/tmp
 
 conf_args = \
@@ -80,7 +82,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 \
@@ -101,7 +104,9 @@
 
 	touch build-stamp
 
-clean:
+clean:	clean-patched unpatch
+
+clean-patched: 
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp configure-stamp
@@ -164,9 +169,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
@@ -254,4 +256,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-unofficial/lenny-latest/debian/samba-common.samba.pam
===================================================================
--- branches/samba/backports-unofficial/lenny-latest/debian/samba-common.samba.pam	2010-05-05 05:57:22 UTC (rev 3457)
+++ branches/samba/backports-unofficial/lenny-latest/debian/samba-common.samba.pam	2010-05-05 07:50:43 UTC (rev 3458)
@@ -1,3 +1,3 @@
 @include common-auth
 @include common-account
- at include common-session-noninteractive
+ at include common-session

Modified: branches/samba/backports-unofficial/lenny-latest/debian/source/format
===================================================================
--- branches/samba/backports-unofficial/lenny-latest/debian/source/format	2010-05-05 05:57:22 UTC (rev 3457)
+++ branches/samba/backports-unofficial/lenny-latest/debian/source/format	2010-05-05 07:50:43 UTC (rev 3458)
@@ -1 +1 @@
-3.0 (quilt)
+1.0

Modified: branches/samba/backports-unofficial/lenny-latest/debian/winbind.files
===================================================================
--- branches/samba/backports-unofficial/lenny-latest/debian/winbind.files	2010-05-05 05:57:22 UTC (rev 3457)
+++ branches/samba/backports-unofficial/lenny-latest/debian/winbind.files	2010-05-05 07:50:43 UTC (rev 3458)
@@ -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

More information about the Pkg-samba-maint mailing list