On Mon, Jul 10, 2017 at 10:35:27PM +0100, Rowland Penny wrote:
> On Mon, 10 Jul 2017 16:17:40 -0500 golinux@??? wrote:
>
> > ascii,samba-libs
>
> Don't understand why this is on the list, surely this will be built
> with the other Samba packages (they get built from the same source
> code), so why does this still have a systemd dependancy ?
I guess no one got around to adjusting the packaging.
Here's a debdiff (attached) from my repository -- I've got no upload rights
in Devuan (other than to ceres in a roundabout way :p), but someone can
apply this; should be good enough.
--
⢀⣴⠾⠻⢶⣦⠀
⣾⠁⢠⠒⠀⣿⡁ A dumb species has no way to open a tuna can.
⢿⡄⠘⠷⠚⠋⠀ A smart species invents a can opener.
⠈⠳⣄⠀⠀⠀⠀ A master species delegates.
diff -Nru samba-4.5.6+dfsg/debian/changelog samba-4.5.6+dfsg/debian/changelog
--- samba-4.5.6+dfsg/debian/changelog 2017-03-09 15:42:37.000000000 +0100
+++ samba-4.5.6+dfsg/debian/changelog 2017-03-10 06:56:14.000000000 +0100
@@ -1,3 +1,10 @@
+samba (2:4.5.6+dfsg-1.0nosystemd1) nosystemd-stretch; urgency=medium
+
+ * Non-maintainer upload.
+ * Cure systemd infestation.
+
+ -- Adam Borowski <kilobyte@???> Fri, 10 Mar 2017 06:56:14 +0100
+
samba (2:4.5.6+dfsg-1) unstable; urgency=medium
* New upstream version
diff -Nru samba-4.5.6+dfsg/debian/control samba-4.5.6+dfsg/debian/control
--- samba-4.5.6+dfsg/debian/control 2017-03-06 13:02:55.000000000 +0100
+++ samba-4.5.6+dfsg/debian/control 2017-03-10 06:55:15.000000000 +0100
@@ -12,7 +12,6 @@
Build-Depends: bison,
debhelper (>> 9),
dh-python,
- dh-systemd (>= 1.5),
docbook-xml,
docbook-xsl,
faketime,
@@ -35,7 +34,6 @@
libpcap-dev [hurd-i386 kfreebsd-any],
libpopt-dev,
libreadline-dev,
- libsystemd-dev [linux-any],
libtalloc-dev (>= 2.1.8~),
libtdb-dev (>= 1.3.10~),
libtevent-dev (>= 0.9.29~),
diff -Nru samba-4.5.6+dfsg/debian/ctdb.install samba-4.5.6+dfsg/debian/ctdb.install
--- samba-4.5.6+dfsg/debian/ctdb.install 2017-03-06 13:02:55.000000000 +0100
+++ samba-4.5.6+dfsg/debian/ctdb.install 2017-03-10 06:54:57.000000000 +0100
@@ -1,6 +1,5 @@
etc/ctdb
etc/sudoers.d
-lib/systemd/system/ctdb.service
usr/bin/ctdb
usr/bin/ctdb_diagnostics
usr/lib/*/ctdb/ctdb_event_helper
diff -Nru samba-4.5.6+dfsg/debian/rules samba-4.5.6+dfsg/debian/rules
--- samba-4.5.6+dfsg/debian/rules 2017-03-08 22:53:03.000000000 +0100
+++ samba-4.5.6+dfsg/debian/rules 2017-03-10 06:56:01.000000000 +0100
@@ -75,14 +75,14 @@
ifeq ($(DEB_HOST_ARCH_OS), linux)
conf_args += \
- --with-systemd
+ --without-systemd
else
conf_args += \
--without-systemd
endif
%:
- dh $* --with python2 --with systemd
+ dh $* --with python2
override_dh_auto_configure:
$(WAF) configure $(conf_args)
@@ -106,9 +106,6 @@
# Running make test requires configuration with --enable-selftest, which
# we don't want to do for production systems.
-override_dh_systemd_start:
- dh_systemd_start -pctdb --no-start --no-restart-on-upgrade
-
override_dh_installdocs-arch:
cp ctdb/config/events.d/README ctdb/README.eventscripts
cp ctdb/config/notify.d.README ctdb/README.notify.d
@@ -171,23 +168,6 @@
rm $(DESTDIR)/usr/bin/ctdb_run_cluster_tests
rm -r $(DESTDIR)/usr/lib/*/ctdb/tests
rm -r $(DESTDIR)/usr/share/ctdb/tests
- # Install systemd configs
- mkdir -p $(DESTDIR)/lib/systemd/system/
- install -m 0644 ctdb/config/ctdb.service $(DESTDIR)/lib/systemd/system/
- install -m 0644 packaging/systemd/*.service $(DESTDIR)/lib/systemd/system/
- mv $(DESTDIR)/lib/systemd/system/nmb.service $(DESTDIR)/lib/systemd/system/nmbd.service
- mv $(DESTDIR)/lib/systemd/system/smb.service $(DESTDIR)/lib/systemd/system/smbd.service
- mv $(DESTDIR)/lib/systemd/system/samba.service $(DESTDIR)/lib/systemd/system/samba-ad-dc.service
- sed -i \
- -e 's|/etc/sysconfig/|/etc/default/|' \
- -e 's|nmb\.service|nmbd.service|' \
- -e 's|smb\.service|smbd.service|' \
- -e 's|samba\.service|samba-ad-dc.service|' \
- -e 's|^PIDFile=/run/|PIDFile=/var/run/samba/|' \
- $(DESTDIR)/lib/systemd/system/nmbd.service \
- $(DESTDIR)/lib/systemd/system/samba-ad-dc.service \
- $(DESTDIR)/lib/systemd/system/smbd.service \
- $(DESTDIR)/lib/systemd/system/winbind.service
mkdir -p $(DESTDIR)/usr/lib/tmpfiles.d
echo "d /run/samba 0755 root root -" > $(DESTDIR)/usr/lib/tmpfiles.d/samba.conf
#install -m 0644 packaging/systemd/samba.sysconfig $(DESTDIR)/etc/default/samba
diff -Nru samba-4.5.6+dfsg/debian/samba.install samba-4.5.6+dfsg/debian/samba.install
--- samba-4.5.6+dfsg/debian/samba.install 2017-03-06 13:02:56.000000000 +0100
+++ samba-4.5.6+dfsg/debian/samba.install 2017-03-10 06:54:57.000000000 +0100
@@ -14,9 +14,6 @@
usr/lib/*/samba/libkdc-samba4.so.2.0.0
usr/lib/*/samba/libpac.so.*
usr/lib/*/samba/service/*.so
-lib/systemd/system/nmbd.service
-lib/systemd/system/samba-ad-dc.service
-lib/systemd/system/smbd.service
usr/sbin/mksmbpasswd
usr/sbin/nmbd
usr/sbin/samba
diff -Nru samba-4.5.6+dfsg/debian/samba.links samba-4.5.6+dfsg/debian/samba.links
--- samba-4.5.6+dfsg/debian/samba.links 2017-03-06 13:02:56.000000000 +0100
+++ samba-4.5.6+dfsg/debian/samba.links 2017-03-10 06:54:57.000000000 +0100
@@ -1,2 +0,0 @@
-# mask /etc/init.d/samba init script for systemd
-/dev/null /lib/systemd/system/samba.service
diff -Nru samba-4.5.6+dfsg/debian/samba.postinst samba-4.5.6+dfsg/debian/samba.postinst
--- samba-4.5.6+dfsg/debian/samba.postinst 2017-03-06 13:02:56.000000000 +0100
+++ samba-4.5.6+dfsg/debian/samba.postinst 2017-03-10 06:54:57.000000000 +0100
@@ -80,23 +80,6 @@
SERVER_ROLE=`samba-tool testparm --parameter-name="server role" 2>/dev/null | tail -1`
SERVER_SERVICES=`samba-tool testparm --parameter-name="server services" 2>/dev/null | tail -1`
DCERPC_ENDPOINT_SERVERS=`samba-tool testparm --parameter-name="dcerpc endpoint servers" 2>/dev/null | tail -1`
-if [ "$SERVER_ROLE" != "active directory domain controller" ] \
- && ( echo "$SERVER_SERVICES" | grep -qv '\(^\|, \)smb\(,\|$\)' ) \
- && ( echo "$DCERPC_ENDPOINT_SERVERS" | grep -qv '\(^\|, \)remote\(,\|$\)' ) \
- && ( echo "$DCERPC_ENDPOINT_SERVERS" | grep -qv '\(^\|, \)mapiproxy\(,\|$\)' ) \
-; then
- if [ ! -e /etc/systemd/system/samba-ad-dc.service ]; then
- mkdir -p /etc/systemd/system
- echo "Samba is not being run as an AD Domain Controller, masking samba-ad-dc-service."
- echo "Please ignore the following error about deb-systemd-helper not finding samba-ad-dc-service."
- ln -s /dev/null /etc/systemd/system/samba-ad-dc.service
- # In case this system is running systemd, we make systemd reload the unit files
- # to pick up changes.
- if [ -d /run/systemd/system ] ; then
- systemctl --system daemon-reload >/dev/null || true
- fi
- fi
-fi
#DEBHELPER#
diff -Nru samba-4.5.6+dfsg/debian/winbind.install samba-4.5.6+dfsg/debian/winbind.install
--- samba-4.5.6+dfsg/debian/winbind.install 2017-03-06 13:02:56.000000000 +0100
+++ samba-4.5.6+dfsg/debian/winbind.install 2017-03-10 06:54:57.000000000 +0100
@@ -7,7 +7,6 @@
usr/lib/*/samba/nss_info/rfc2307.so
usr/lib/*/samba/nss_info/sfu.so
usr/lib/*/samba/nss_info/sfu20.so
-lib/systemd/system/winbind.service
usr/sbin/winbindd
usr/share/man/man1/ntlm_auth.1
usr/share/man/man1/wbinfo.1