debian/changelog

-samba (2:4.9.0+dfsg-1) UNRELEASED; urgency=medium
+samba (2:4.9.0+dfsg-1) experimental; urgency=medium
 
+  * Upload to experimental
   * New upstream release
-    - Upload to experimental
     - Update d/gbp.conf, d/watch and d/README.source for 4.9
     - Remove Fix-pidl-manpage-sections.patch, Fix-spelling.patch and
       Improve-vfs_linux_xfs_sgid-manpage.patch, merged upstream
     - Bump build-depends talloc >= 2.1.14, tdb >= 1.3.16, tevent >= 0.9.37 and
       ldb >= 2:1.4.2'
+    - Update paths
+    - Update libsmbclient.symbols
+    - ctdb.lintian-override: Remove script-not-executable override
+    - Add ctdb.NEWS: "Configuration has been completely overhauled"
+    - ctdb: Enable/disable legacy script in postinst/presinst
 
- -- Mathieu Parent <sathieu@debian.org>  Mon, 17 Sep 2018 15:30:44 +0200
+ -- Mathieu Parent <sathieu@debian.org>  Sat, 22 Sep 2018 23:04:11 +0200
 
 samba (2:4.8.5+dfsg-1) unstable; urgency=medium
 

debian/ctdb.NEWS

+samba (2:4.9.0+dfsg-1) experimental; urgency=medium
+
+  From WHATSNEW.txt:
+  
+  CTDB changes
+  ------------
+  
+  There are many changes to CTDB in this release.
+  
+  * Configuration has been completely overhauled
+  
+    - Daemon and tool options are now specified in a new ctdb.conf
+      Samba-style configuration file.  See ctdb.conf(5) for details.
+  
+    - Event script configuration is no longer specified in the top-level
+      configuration file.  It can now be specified per event script.
+      For example, configuration options for the 50.samba event script
+      can be placed alongside the event script in a file called
+      50.samba.options.  Script options can also be specified in a new
+      script.options file.  See ctdb-script.options(5) for details.
+  
+    - Options that affect CTDB startup should be configured in the
+      distribution-specific configuration file.  See ctdb.sysconfig(5)
+      for details.
+  
+    - Tunable settings are now loaded from ctdb.tunables.  Using
+      CTDB_SET_TunableVariable=<value> in the main configuration file is
+      no longer supported.  See ctdb-tunables(7) for details.
+  
+    A example script to migrate an old-style configuration to the new
+    style is available in ctdb/doc/examples/config_migrate.sh.
+  
+  * The following configuration variables and corresponding ctdbd
+    command-line options have been removed and not replaced with
+    counterparts in the new configuration scheme:
+  
+      CTDB_PIDFILE                     --pidfile
+      CTDB_SOCKET			     --socket
+      CTDB_NODES			     --nlist
+      CTDB_PUBLIC_ADDRESSES	     --public-addresses
+      CTDB_EVENT_SCRIPT_DIR	     --event-script-dir
+      CTDB_NOTIFY_SCRIPT		     --notification-script
+      CTDB_PUBLIC_INTERFACE	     --public-interface
+      CTDB_MAX_PERSISTENT_CHECK_ERRORS --max-persistent-check-errors
+  
+    - The compile-time defaults should be used for the first 6 of these.
+    - Use a symbolic link from the configuration directory to specify a
+      different location for nodes or public_addresses (e.g. in the
+      cluster filesystem).
+    - Executable notification scripts in the notify.d/ subdirectory of
+      the configuration directory are now run by unconditionally.
+    - Interfaces for public IP addresses must always be specified in the
+      public_addresses file using the currently supported format.
+  
+ -- Mathieu Parent <sathieu@debian.org>  Sat, 22 Sep 2018 07:47:32 +0200

debian/ctdb.docs

 ctdb/README
 ctdb/README.eventscripts
-ctdb/README.notify.d
+ctdb/README.notification
 ctdb/doc/*.txt

debian/ctdb.install

+ctdb/config/ctdb.conf etc/ctdb
+ctdb/config/ctdb.tunables etc/ctdb
+ctdb/config/script.options etc/ctdb
 etc/ctdb
 etc/sudoers.d
 lib/systemd/system/ctdb.service
@@ -6,8 +9,10 @@ usr/bin/ctdb_diagnostics
 usr/bin/ltdbtool
 usr/bin/onnode
 usr/bin/ping_pong
-usr/lib/*/ctdb/ctdb_event
-usr/lib/*/ctdb/ctdb_eventd
+usr/lib/*/ctdb/ctdb-config
+usr/lib/*/ctdb/ctdb-event
+usr/lib/*/ctdb/ctdb-eventd
+usr/lib/*/ctdb/ctdb-path
 usr/lib/*/ctdb/ctdb_killtcp
 usr/lib/*/ctdb/ctdb_lock_helper
 usr/lib/*/ctdb/ctdb_lvs
@@ -16,8 +21,10 @@ usr/lib/*/ctdb/ctdb_natgw
 usr/lib/*/ctdb/ctdb_recovery_helper
 usr/lib/*/ctdb/ctdb_takeover_helper
 usr/lib/*/ctdb/smnotify
+usr/lib/*/samba/libctdb-event-client.so.0
 usr/sbin/ctdbd
 usr/sbin/ctdbd_wrapper
+usr/share/ctdb/events/legacy/*.script
 usr/share/man/man1/ctdb.1
 usr/share/man/man1/ctdb_diagnostics.1
 usr/share/man/man1/ctdbd.1
@@ -25,7 +32,9 @@ usr/share/man/man1/ctdbd_wrapper.1
 usr/share/man/man1/ltdbtool.1
 usr/share/man/man1/onnode.1
 usr/share/man/man1/ping_pong.1
-usr/share/man/man5/ctdbd.conf.5
+usr/share/man/man5/ctdb-script.options.5
+usr/share/man/man5/ctdb.conf.5
+usr/share/man/man5/ctdb.sysconfig.5
 usr/share/man/man7/ctdb-statistics.7
 usr/share/man/man7/ctdb-tunables.7
 usr/share/man/man7/ctdb.7

debian/ctdb.lintian-overrides

-# Some scripts are not executable by default: They are disabled.
-# They can be enabled with "ctdb enablescript <script>" command which sets the
-# executable bit
-ctdb: script-not-executable etc/ctdb/events.d/10.external

debian/ctdb.postinst

+#!/bin/sh
+# postinst script for ctdb
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+#        * <postinst> `configure' <most-recently-configured-version>
+#        * <old-postinst> `abort-upgrade' <new version>
+#        * <conflictor's-postinst> `abort-remove' `in-favour' <package>
+#          <new-version>
+#        * <postinst> `abort-remove'
+#        * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
+#          <failed-install-package> <version> `removing'
+#          <conflicting-package> <version>
+# for details, see https://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+
+enable_legacy() { # From ctdb/packaging/RPM/ctdb.spec.in
+    # If mandatory 00.ctdb event script is not enabled then enable it and
+    # some other scripts.  The assumption here is that this is a
+    # first-time install or an upgrade to a version that requires event
+    # scripts to be enabled via symlinks.
+    required_script="00.ctdb"
+    required_path="/etc/ctdb/events/legacy/${required_script}.script"
+    if [ ! -L "$required_path" ] && [ ! -e "$required_path" ] ; then
+        default_scripts="${required_script}
+                 01.reclock
+                 05.system
+                 10.interface
+                 "
+        for t in $default_scripts ; do
+            tgt="/usr/share/ctdb/events/legacy/${t}.script"
+            name="/etc/ctdb/events/legacy/${t}.script"
+            # Directory is created via install and files
+            ln -s "$tgt" "$name"
+        done
+    fi
+}
+
+case "$1" in
+    configure)
+        enable_legacy
+    ;;
+
+    abort-upgrade|abort-remove|abort-deconfigure)
+    ;;
+
+    *)
+        echo "postinst called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0

debian/ctdb.postrm

+#!/bin/sh
+# postrm script for ctdb
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+#        * <postrm> `remove'
+#        * <postrm> `purge'
+#        * <old-postrm> `upgrade' <new-version>
+#        * <new-postrm> `failed-upgrade' <old-version>
+#        * <new-postrm> `abort-install'
+#        * <new-postrm> `abort-install' <old-version>
+#        * <new-postrm> `abort-upgrade' <old-version>
+#        * <disappearer's-postrm> `disappear' <overwriter>
+#          <overwriter-version>
+# for details, see https://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+disable_legacy() { # From ctdb/packaging/RPM/ctdb.spec.in
+    # Uninstall, not upgrade.  Clean up by removing any remaining links.
+    if [ "$1" = "0" ] ; then
+        for i in "/etc/ctdb/events/legacy/"*.script ; do
+            if [ -L "$i" ] ; then
+                rm -f "$i"
+            fi
+        done
+    fi
+}
+
+case "$1" in
+    purge)
+        disable_legacy
+    ;;
+
+    remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
+    ;;
+
+    *)
+        echo "postrm called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0

debian/libsmbclient.symbols

@@ -6,6 +6,9 @@ libsmbclient.so.0 libsmbclient #MINVER#
  SMBCLIENT_0.2.3@SMBCLIENT_0.2.3 2:4.3.0+dfsg
  SMBCLIENT_0.3.0@SMBCLIENT_0.3.0 2:4.8.0+dfsg
  SMBCLIENT_0.3.1@SMBCLIENT_0.3.1 2:4.8.0+dfsg
+ SMBCLIENT_0.3.2@SMBCLIENT_0.3.2 2:4.9.0+dfsg
+ SMBCLIENT_0.3.3@SMBCLIENT_0.3.3 2:4.9.0+dfsg
+ SMBCLIENT_0.4.0@SMBCLIENT_0.4.0 2:4.9.0+dfsg
  smbc_chmod@SMBCLIENT_0.1.0 2:4.0.3+dfsg1
  smbc_close@SMBCLIENT_0.1.0 2:4.0.3+dfsg1
  smbc_closedir@SMBCLIENT_0.1.0 2:4.0.3+dfsg1
@@ -47,6 +50,7 @@ libsmbclient.so.0 libsmbclient #MINVER#
  smbc_getFunctionPurgeCachedServers@SMBCLIENT_0.1.0 2:4.0.3+dfsg1
  smbc_getFunctionRead@SMBCLIENT_0.1.0 2:4.0.3+dfsg1
  smbc_getFunctionReaddir@SMBCLIENT_0.1.0 2:4.0.3+dfsg1
+ smbc_getFunctionReaddirPlus@SMBCLIENT_0.3.3 2:4.9.0+dfsg
  smbc_getFunctionRemoveCachedServer@SMBCLIENT_0.1.0 2:4.0.3+dfsg1
  smbc_getFunctionRemoveUnusedServer@SMBCLIENT_0.1.0 2:4.0.3+dfsg1
  smbc_getFunctionRemovexattr@SMBCLIENT_0.1.0 2:4.0.3+dfsg1
@@ -104,9 +108,11 @@ libsmbclient.so.0 libsmbclient #MINVER#
  smbc_print_file@SMBCLIENT_0.1.0 2:4.0.3+dfsg1
  smbc_read@SMBCLIENT_0.1.0 2:4.0.3+dfsg1
  smbc_readdir@SMBCLIENT_0.1.0 2:4.0.3+dfsg1
+ smbc_readdirplus@SMBCLIENT_0.3.3 2:4.9.0+dfsg
  smbc_removexattr@SMBCLIENT_0.1.0 2:4.0.3+dfsg1
  smbc_rename@SMBCLIENT_0.1.0 2:4.0.3+dfsg1
  smbc_rmdir@SMBCLIENT_0.1.0 2:4.0.3+dfsg1
+ smbc_setConfiguration@SMBCLIENT_0.3.2 2:4.9.0+dfsg
  smbc_setDebug@SMBCLIENT_0.1.0 2:4.0.3+dfsg1
  smbc_setFunctionAddCachedServer@SMBCLIENT_0.1.0 2:4.0.3+dfsg1
  smbc_setFunctionAuthData@SMBCLIENT_0.1.0 2:4.0.3+dfsg1
@@ -136,6 +142,7 @@ libsmbclient.so.0 libsmbclient #MINVER#
  smbc_setFunctionPurgeCachedServers@SMBCLIENT_0.1.0 2:4.0.3+dfsg1
  smbc_setFunctionRead@SMBCLIENT_0.1.0 2:4.0.3+dfsg1
  smbc_setFunctionReaddir@SMBCLIENT_0.1.0 2:4.0.3+dfsg1
+ smbc_setFunctionReaddirPlus@SMBCLIENT_0.3.3 2:4.9.0+dfsg
  smbc_setFunctionRemoveCachedServer@SMBCLIENT_0.1.0 2:4.0.3+dfsg1
  smbc_setFunctionRemoveUnusedServer@SMBCLIENT_0.1.0 2:4.0.3+dfsg1
  smbc_setFunctionRemovexattr@SMBCLIENT_0.1.0 2:4.0.3+dfsg1

debian/rules

@@ -164,8 +164,8 @@ override_dh_auto_install:
 	echo "d /run/samba 0755 root root -" > $(DESTDIR)/usr/lib/tmpfiles.d/samba.conf
 
 override_dh_installdocs-arch:
-	cp ctdb/config/events.d/README ctdb/README.eventscripts
-	cp ctdb/config/notify.d.README ctdb/README.notify.d
+	cp ctdb/config/events/README ctdb/README.eventscripts
+	cp ctdb/config/notification.README ctdb/README.notification
 	dh_installdocs
 ifeq ($(DEB_HOST_ARCH_OS), hurd)
 	dh_installdocs -pctdb debian/ctdb.README.hurd
@@ -190,7 +190,6 @@ ifneq (,$(filter winbind, $(shell dh_listpackages)))
 	dh_installinit -pwinbind
 endif
 ifneq (,$(filter ctdb, $(shell dh_listpackages)))
-	install -m644 ctdb/config/ctdbd.conf $(CURDIR)/debian/ctdb/etc/ctdb/ctdbd.conf
 	# Install /etc/init.d/ctdb
 	mkdir -p $(CURDIR)/debian/ctdb/etc/init.d
 	install -m755 ctdb/config/ctdb.init $(CURDIR)/debian/ctdb/etc/init.d/ctdb
@@ -257,4 +256,4 @@ override_dh_auto_clean:
 	rm -rf bin
 	rm -f .lock-wscript
 	rm -f ctdb/README.eventscripts
-	rm -f ctdb/README.notify.d
+	rm -f ctdb/README.notification

debian/samba-libs.install

@@ -13,7 +13,7 @@ usr/lib/*/libsamba-credentials.so.0*
 usr/lib/*/libsamba-errors.so.*
 usr/lib/*/libsamba-hostconfig.so.*
 usr/lib/*/libsamba-passdb.so.0
-usr/lib/*/libsamba-passdb.so.0.27.0
+usr/lib/*/libsamba-passdb.so.0.27.1
 usr/lib/*/libsamba-policy.so.*
 usr/lib/*/libsamba-util.so.*
 usr/lib/*/libsamdb.so.*
@@ -107,6 +107,7 @@ usr/lib/*/samba/libsamba-security.so.*
 usr/lib/*/samba/libsamba-sockets.so.*
 usr/lib/*/samba/libsamba3-util.so.*
 usr/lib/*/samba/libsamdb-common.so.*
+usr/lib/*/samba/libscavenge-dns-records.so.0
 usr/lib/*/samba/libsecrets3.so.*
 usr/lib/*/samba/libserver-id-db.so.0
 usr/lib/*/samba/libserver-role.so.*

debian/samba.install

@@ -2,7 +2,6 @@ etc/ufw/applications.d/samba
 lib/systemd/system/nmbd.service
 lib/systemd/system/samba-ad-dc.service
 lib/systemd/system/smbd.service
-usr/bin/eventlogadm
 usr/bin/mvxattr
 usr/bin/oLschema2ldif
 usr/bin/pdbedit
@@ -18,11 +17,12 @@ usr/lib/*/samba/libkdc-samba4.so.2
 usr/lib/*/samba/libkdc-samba4.so.2.0.0
 usr/lib/*/samba/libpac.so.*
 usr/lib/*/samba/service/*.so
+usr/sbin/eventlogadm
 usr/sbin/mksmbpasswd
 usr/sbin/nmbd
 usr/sbin/samba
+usr/sbin/samba-gpupdate
 usr/sbin/samba_dnsupdate
-usr/sbin/samba_gpoupdate
 usr/sbin/samba_spnupdate
 usr/sbin/samba_upgradedns
 usr/sbin/smbd
@@ -37,7 +37,7 @@ usr/share/man/man8/eventlogadm.8
 usr/share/man/man8/idmap_script.8
 usr/share/man/man8/nmbd.8
 usr/share/man/man8/pdbedit.8
+usr/share/man/man8/samba-gpupdate.8
 usr/share/man/man8/samba.8
-usr/share/man/man8/samba_gpoupdate.8
 usr/share/man/man8/smbd.8
 usr/share/samba/setup

debian/winbind.install

@@ -11,7 +11,6 @@ usr/lib/*/samba/nss_info/sfu20.so
 usr/sbin/winbindd
 usr/share/man/man1/ntlm_auth.1
 usr/share/man/man1/wbinfo.1
-usr/share/man/man8/winbind_krb5_locator.8
 usr/share/man/man8/idmap_ad.8
 usr/share/man/man8/idmap_autorid.8
 usr/share/man/man8/idmap_hash.8
@@ -20,4 +19,5 @@ usr/share/man/man8/idmap_nss.8
 usr/share/man/man8/idmap_rid.8
 usr/share/man/man8/idmap_tdb.8
 usr/share/man/man8/idmap_tdb2.8
+usr/share/man/man8/winbind_krb5_locator.8
 usr/share/man/man8/winbindd.8