[Pkg-samba-maint] r3954 - branches/samba/experimental/debian
bubulle at alioth.debian.org
bubulle at alioth.debian.org
Sat Oct 29 05:31:55 UTC 2011
Author: bubulle
Date: 2011-10-29 05:31:54 +0000 (Sat, 29 Oct 2011)
New Revision: 3954
Added:
branches/samba/experimental/debian/libpam-winbind.install
branches/samba/experimental/debian/libpam-winbind.lintian-overrides
branches/samba/experimental/debian/libpam-winbind.postinst
branches/samba/experimental/debian/libpam-winbind.prerm
Removed:
branches/samba/experimental/debian/winbind.lintian-overrides
branches/samba/experimental/debian/winbind.prerm
Modified:
branches/samba/experimental/debian/changelog
branches/samba/experimental/debian/control
branches/samba/experimental/debian/rules
branches/samba/experimental/debian/winbind.install
branches/samba/experimental/debian/winbind.postinst
Log:
Merge changes between 3.5.11-2 and -4
Modified: branches/samba/experimental/debian/changelog
===================================================================
--- branches/samba/experimental/debian/changelog 2011-10-28 08:15:22 UTC (rev 3953)
+++ branches/samba/experimental/debian/changelog 2011-10-29 05:31:54 UTC (rev 3954)
@@ -1,43 +1,7 @@
samba (2:3.6.1-2) UNRELEASED; urgency=low
- * Merge changes from 3.5.11~dfsg-2 in unstable branch
+ * Merge changes from 3.5.11~dfsg-4 in unstable branch
- [ Steve Langasek ]
- * Don't export DEB_HOST_ARCH_OS in debian/rules, this is only used locally.
- * Use dh_links instead of manually creating directories and symlinks from
- debian/rules.
- * Switch from dh_movefiles to dh_install and adjust for debhelper compat
- level 7, in preparation for moving to dh(1).
- * Where possible, use dh_installman and dh_install's support for target
- directories instead of moving files around in debian/rules.
- * We don't need to mess with perms on usr/include/libsmbclient.h anymore
- in debian/rules, the upstream install target gets it right
- * Use debian/clean instead of removing left-behind files by hand in the
- clean target
- * Convert debian/rules to dh(1).
- * Don't run debconf-updatepo on clean; not worth the divergence in
- debian/rules anymore :)
- * Don't install debian/README.build in the package; this is really only
- relevant in the source.
- * Bump to debhelper compat level 9 and build libraries for multiarch.
- * Drop Makefile.internal from libsmbclient-dev examples so that we can mark
- libsmbclient-dev Multi-Arch: same.
- * Bump build-depends on debhelper to 8.9.4, so we ensure we have
- dpkg-buildflags by default and get full build hardening enabled out of
- the box - critical for a server like samba.
- * Use DH_ALWAYS_EXCLUDE instead of passing override options to
- dh_installexamples.
- * Pass --sourcedirectory=source3 to dh instead of having to pass it to each
- dh_auto_* command.
- * Ironically, this means that we have to manually disable dh_auto_test,
- which now finds the makefile targets but doesn't work unless we build an
- extra wrapper library into our binaries that we don't want.
- * Drop a few configure options from debian/rules that shadow the built-in
- defaults.
- * debian/libsmbclient.lintian-overrides: yes, we know the package name
- doesn't match the soname - and it never should until there's an ABI
- change.
-
-- Christian Perrier <bubulle at debian.org> Tue, 25 Oct 2011 04:52:36 +0200
samba (2:3.6.1-1) experimental; urgency=low
@@ -99,6 +63,63 @@
-- Christian Perrier <bubulle at debian.org> Mon, 09 May 2011 11:29:52 +0200
+samba (2:3.5.11~dfsg-4) unstable; urgency=low
+
+ * Lintian override for libpam-winbind; it's not a shared library so doesn't
+ really need the pre-depends on multiarch-support.
+ * export DEB_BUILD_MAINT_OPTIONS := hardening=+bindnow, taken from Ubuntu.
+
+ -- Steve Langasek <vorlon at debian.org> Fri, 21 Oct 2011 16:01:29 -0700
+
+samba (2:3.5.11~dfsg-3) unstable; urgency=low
+
+ * Split winbind into separate packages, winbind and libpam-winbind,
+ with the latter marked Multi-Arch: same and the former marked
+ Multi-Arch: foreign, so that we can install multiple copies of the
+ pam module and nss modules on the same system.
+
+ -- Steve Langasek <vorlon at debian.org> Fri, 21 Oct 2011 20:00:13 +0000
+
+>>>>>>> .fusion-droit.r3945
+samba (2:3.5.11~dfsg-2) unstable; urgency=low
+
+ * Don't export DEB_HOST_ARCH_OS in debian/rules, this is only used locally.
+ * Use dh_links instead of manually creating directories and symlinks from
+ debian/rules.
+ * Switch from dh_movefiles to dh_install and adjust for debhelper compat
+ level 7, in preparation for moving to dh(1).
+ * Where possible, use dh_installman and dh_install's support for target
+ directories instead of moving files around in debian/rules.
+ * We don't need to mess with perms on usr/include/libsmbclient.h anymore
+ in debian/rules, the upstream install target gets it right
+ * Use debian/clean instead of removing left-behind files by hand in the
+ clean target
+ * Convert debian/rules to dh(1).
+ * Don't run debconf-updatepo on clean; not worth the divergence in
+ debian/rules anymore :)
+ * Don't install debian/README.build in the package; this is really only
+ relevant in the source.
+ * Bump to debhelper compat level 9 and build libraries for multiarch.
+ * Drop Makefile.internal from libsmbclient-dev examples so that we can mark
+ libsmbclient-dev Multi-Arch: same.
+ * Bump build-depends on debhelper to 8.9.4, so we ensure we have
+ dpkg-buildflags by default and get full build hardening enabled out of
+ the box - critical for a server like samba.
+ * Use DH_ALWAYS_EXCLUDE instead of passing override options to
+ dh_installexamples.
+ * Pass --sourcedirectory=source3 to dh instead of having to pass it to each
+ dh_auto_* command.
+ * Ironically, this means that we have to manually disable dh_auto_test,
+ which now finds the makefile targets but doesn't work unless we build an
+ extra wrapper library into our binaries that we don't want.
+ * Drop a few configure options from debian/rules that shadow the built-in
+ defaults.
+ * debian/libsmbclient.lintian-overrides: yes, we know the package name
+ doesn't match the soname - and it never should until there's an ABI
+ change.
+
+ -- Steve Langasek <vorlon at debian.org> Fri, 07 Oct 2011 21:36:43 -0700
+
samba (2:3.5.11~dfsg-1) unstable; urgency=low
* New upstream release
Modified: branches/samba/experimental/debian/control
===================================================================
--- branches/samba/experimental/debian/control 2011-10-28 08:15:22 UTC (rev 3953)
+++ branches/samba/experimental/debian/control 2011-10-29 05:31:54 UTC (rev 3954)
@@ -180,8 +180,9 @@
Section: net
Priority: optional
Architecture: any
-Pre-Depends: multiarch-support
-Depends: ${shlibs:Depends}, ${misc:Depends}, libwbclient0 (= ${binary:Version}), samba-common (= ${source:Version}), lsb-base (>= 3.0-6), adduser, libpam-runtime (>= 1.0.1-6), libpam0g (>= 1.1.3-2~)
+Multi-Arch: foreign
+Depends: ${shlibs:Depends}, ${misc:Depends}, libwbclient0 (= ${binary:Version}), samba-common (= ${source:Version}), lsb-base (>= 3.0-6), adduser
+Recommends: libpam-winbind
Replaces: samba (<= 2.2.3-2)
Description: Samba nameservice integration server
Samba is an implementation of the SMB/CIFS protocol for Unix systems,
@@ -196,6 +197,27 @@
/etc/nsswitch.conf, and authentication is integrated using the winbind
module for PAM.
+Package: libpam-winbind
+Section: net
+Priority: optional
+Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}, winbind (= ${binary:Version}), libwbclient0 (= ${binary:Version}), samba-common (= ${source:Version}), libpam-runtime (>= 1.0.1-6), libpam0g (>= 1.1.3-2~)
+Breaks: winbind (<< 2:3.5.11~dfsg-3)
+Replaces: samba (<= 2.2.3-2), winbind (<< 2:3.5.11~dfsg-3)
+Description: Samba nameservice and authentication integration plugins
+ Samba is an implementation of the SMB/CIFS protocol for Unix systems,
+ providing support for cross-platform file and printer sharing with
+ Microsoft Windows, OS X, and other Unix systems. Samba can also function
+ as an NT4-style domain controller, and can integrate with both NT4 domains
+ and Active Directory realms as a member server.
+ .
+ This package provides pam_winbind and nss_winbind, plugins that integrate
+ with a local winbindd server to provide Windows domain authentication and
+ user/group name lookups to the system; and nss_wins, which provides
+ hostname lookups via the WINS and NBNS protocols.
+
Package: samba-dbg
Section: debug
Priority: extra
Copied: branches/samba/experimental/debian/libpam-winbind.install (from rev 3953, tags/samba/2:3.5.11~dfsg-4/debian/libpam-winbind.install)
===================================================================
--- branches/samba/experimental/debian/libpam-winbind.install (rev 0)
+++ branches/samba/experimental/debian/libpam-winbind.install 2011-10-29 05:31:54 UTC (rev 3954)
@@ -0,0 +1,5 @@
+usr/share/man/man8/pam_winbind.8
+lib/*/security/pam_winbind.so
+usr/share/pam-configs/winbind
+lib/*/libnss_winbind.so.2
+lib/*/libnss_wins.so.2
Copied: branches/samba/experimental/debian/libpam-winbind.lintian-overrides (from rev 3953, tags/samba/2:3.5.11~dfsg-4/debian/libpam-winbind.lintian-overrides)
===================================================================
--- branches/samba/experimental/debian/libpam-winbind.lintian-overrides (rev 0)
+++ branches/samba/experimental/debian/libpam-winbind.lintian-overrides 2011-10-29 05:31:54 UTC (rev 3954)
@@ -0,0 +1,6 @@
+libpam-winbind: no-shlibs-control-file lib/*/libnss_winbind.so.2
+libpam-winbind: no-shlibs-control-file lib/*/libnss_wins.so.2
+libpam-winbind: postinst-must-call-ldconfig lib/*/libnss_wins.so.2
+libpam-winbind: postrm-should-call-ldconfig lib/*/libnss_wins.so.2
+libpam-winbind: package-name-doesnt-match-sonames libnss-winbind2 libnss-wins2
+libpam-winbind: missing-pre-dependency-on-multiarch-support
Copied: branches/samba/experimental/debian/libpam-winbind.postinst (from rev 3953, tags/samba/2:3.5.11~dfsg-4/debian/libpam-winbind.postinst)
===================================================================
--- branches/samba/experimental/debian/libpam-winbind.postinst (rev 0)
+++ branches/samba/experimental/debian/libpam-winbind.postinst 2011-10-29 05:31:54 UTC (rev 3954)
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+set -e
+
+pam-auth-update --package
+
+#DEBHELPER#
Copied: branches/samba/experimental/debian/libpam-winbind.prerm (from rev 3953, tags/samba/2:3.5.11~dfsg-4/debian/libpam-winbind.prerm)
===================================================================
--- branches/samba/experimental/debian/libpam-winbind.prerm (rev 0)
+++ branches/samba/experimental/debian/libpam-winbind.prerm 2011-10-29 05:31:54 UTC (rev 3954)
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+set -e
+
+if [ "$1" = remove ]; then
+ pam-auth-update --package --remove winbind
+fi
+
+#DEBHELPER#
Modified: branches/samba/experimental/debian/rules
===================================================================
--- branches/samba/experimental/debian/rules 2011-10-28 08:15:22 UTC (rev 3953)
+++ branches/samba/experimental/debian/rules 2011-10-29 05:31:54 UTC (rev 3954)
@@ -6,6 +6,7 @@
DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
export DEB_CFLAGS_MAINT_APPEND := -Wall
+export DEB_BUILD_MAINT_OPTIONS := hardening=+bindnow
# Ignore these files which would otherwise be pulled into our examples
export DH_ALWAYS_EXCLUDE := COPYING:Makefile.internal:history
Modified: branches/samba/experimental/debian/winbind.install
===================================================================
--- branches/samba/experimental/debian/winbind.install 2011-10-28 08:15:22 UTC (rev 3953)
+++ branches/samba/experimental/debian/winbind.install 2011-10-29 05:31:54 UTC (rev 3954)
@@ -9,7 +9,6 @@
usr/lib/samba/idmap/tdb2.so
usr/share/man/man1/wbinfo.1
usr/share/man/man1/ntlm_auth.1
-usr/share/man/man8/pam_winbind.8
usr/share/man/man8/winbindd.8
usr/share/man/man8/idmap_ad.8
usr/share/man/man8/idmap_ldap.8
@@ -19,7 +18,3 @@
usr/share/man/man8/idmap_tdb2.8
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
Deleted: branches/samba/experimental/debian/winbind.lintian-overrides
===================================================================
--- branches/samba/experimental/debian/winbind.lintian-overrides 2011-10-28 08:15:22 UTC (rev 3953)
+++ branches/samba/experimental/debian/winbind.lintian-overrides 2011-10-29 05:31:54 UTC (rev 3954)
@@ -1,5 +0,0 @@
-winbind: no-shlibs-control-file lib/*/libnss_winbind.so.2
-winbind: no-shlibs-control-file lib/*/libnss_wins.so.2
-winbind: postinst-must-call-ldconfig lib/*/libnss_wins.so.2
-winbind: postrm-should-call-ldconfig lib/*/libnss_wins.so.2
-winbind: package-name-doesnt-match-sonames libnss-winbind2 libnss-wins2
Modified: branches/samba/experimental/debian/winbind.postinst
===================================================================
--- branches/samba/experimental/debian/winbind.postinst 2011-10-28 08:15:22 UTC (rev 3953)
+++ branches/samba/experimental/debian/winbind.postinst 2011-10-29 05:31:54 UTC (rev 3954)
@@ -20,6 +20,4 @@
mv /etc/samba/idmap2.tdb /var/lib/samba/idmap2.tdb
fi
-pam-auth-update --package
-
#DEBHELPER#
Deleted: branches/samba/experimental/debian/winbind.prerm
===================================================================
--- branches/samba/experimental/debian/winbind.prerm 2011-10-28 08:15:22 UTC (rev 3953)
+++ branches/samba/experimental/debian/winbind.prerm 2011-10-29 05:31:54 UTC (rev 3954)
@@ -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