[pkg-bacula-commits] [bacula] 01/01: Revert "enable native systemd support" Stay with only init files instead

Thu Jul 7 14:42:23 UTC 2016

This is an automated email from the git hooks/post-receive script.

leo pushed a commit to branch master
in repository bacula.

commit 9e337ac13f0a061e7379c92dbec5370d3ece6061
Author: Carsten Leonhardt <leo at debian.org>
Date:   Thu Jul 7 16:37:17 2016 +0200

    Revert "enable native systemd support"
    Stay with only init files instead
---
 debian/TODO                                  | 13 ++++++++
 debian/changelog                             |  9 ------
 debian/control                               |  1 -
 debian/patches/deb-fix-systemd-service-files | 44 ----------------------------
 debian/patches/series                        |  1 -
 debian/rules                                 | 24 +++++++--------
 6 files changed, 23 insertions(+), 69 deletions(-)

diff --git a/debian/TODO b/debian/TODO
index 53466bd..6bca07d 100644
--- a/debian/TODO
+++ b/debian/TODO
@@ -10,6 +10,19 @@ Wishlist:
 
  * autopkgtests
  * reproducible builds
+ * add native systemd support
+   - whishlist because it works with init files too, cost-benefit ratio
+     seems to be too low
+   - should be implemented in a way that switching init systems
+     doesn't require any reconfiguration
+   - execute config test in ExecStartPre=
+   - see https://www.freedesktop.org/software/systemd/man/systemd.service.html
+   - see also commits
+     1e99f35e0b2c07b1bfe2d15d70dba4b0ced161ce
+     a6a323a4a0ab1631858e8d7e3a40dc0c455856b6
+     0b48e6dcce098ab07fe135697ee4a1efa6df2aed
+   - daemons need to be started with "-f" for "don't fork" (thanks to
+     Sven Hartge for the hint)
 
 Old:
 
diff --git a/debian/changelog b/debian/changelog
index 8afcddd..efa2bfb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,12 +1,3 @@
-bacula (7.4.1~dfsg-2) unstable; urgency=low
-
-  * Add functioning native systemd support. Thanks to Sven Hartge.
-  * Test config before attempting to start daemons via systemd, avoids
-    regression of #825064
-  * Honour /etc/defaults/bacula-* in systemd service files
-
- --
-
 bacula (7.4.1~dfsg-1) unstable; urgency=high
 
   * New upstream release
diff --git a/debian/control b/debian/control
index 3094eb6..98c0203 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,6 @@ Build-Depends:
  autotools-dev,
  bc,
  debhelper (>= 9),
- dh-systemd (>= 1.5) [linux-any],
  libacl1-dev,
  libcap-dev [linux-any],
  libgnome2-dev,
diff --git a/debian/patches/deb-fix-systemd-service-files b/debian/patches/deb-fix-systemd-service-files
deleted file mode 100644
index df94cda..0000000
--- a/debian/patches/deb-fix-systemd-service-files
+++ /dev/null
@@ -1,44 +0,0 @@
-Description: fix systemd service files for debian
- - execute config test before starting a daemon
- - honour default-files contents
- this patch is packaging-specific
-Author: Carsten Leonhardt <leo at debian.org>
---- a/platforms/systemd/bacula-dir.service.in
-+++ b/platforms/systemd/bacula-dir.service.in
-@@ -25,7 +25,9 @@
- Type=forking
- User=@dir_user@
- Group=@dir_group@
--ExecStart=@sbindir@/bacula-dir -c @sysconfdir@/bacula-dir.conf
-+EnvironmentFile=-/etc/default/bacula-dir
-+ExecStartPre=@sbindir@/bacula-dir -t -c $CONFIG $ARGS
-+ExecStart=@sbindir@/bacula-dir -c $CONFIG $ARGS
- PIDFile=@piddir@/bacula-dir. at dir_port@.pid
- ExecReload=@sbindir@/bacula-dir -t -c @sysconfdir@/bacula-dir.conf
- ExecReload=/bin/kill -HUP $MAINPID
---- a/platforms/systemd/bacula-fd.service.in
-+++ b/platforms/systemd/bacula-fd.service.in
-@@ -25,7 +25,9 @@
- Type=forking
- User=@fd_user@
- Group=@fd_group@
--ExecStart=@sbindir@/bacula-fd -c @sysconfdir@/bacula-fd.conf
-+EnvironmentFile=-/etc/default/bacula-fd
-+ExecStartPre=@sbindir@/bacula-fd -t -c $CONFIG $ARGS
-+ExecStart=@sbindir@/bacula-fd -c $CONFIG $ARGS
- PIDFile=@piddir@/bacula-fd. at fd_port@.pid
- StandardError=syslog
- 
---- a/platforms/systemd/bacula-sd.service.in
-+++ b/platforms/systemd/bacula-sd.service.in
-@@ -24,7 +24,9 @@
- Type=forking
- User=@sd_user@
- Group=@sd_group@
--ExecStart=@sbindir@/bacula-sd -c @sysconfdir@/bacula-sd.conf
-+EnvironmentFile=-/etc/default/bacula-sd
-+ExecStartPre=@sbindir@/bacula-sd -t -c $CONFIG $ARGS
-+ExecStart=@sbindir@/bacula-sd -c $CONFIG $ARGS
- PIDFile=@piddir@/bacula-sd. at sd_port@.pid
- StandardError=syslog
- 
diff --git a/debian/patches/series b/debian/patches/series
index e864d90..77011cc 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -8,4 +8,3 @@ fix-libbaccats-rpath.patch
 fix-mysql-libdir.patch
 fix-scriptdir-examples-devices.patch
 enable-hardening-for-bat.patch
-deb-fix-systemd-service-files
\ No newline at end of file
diff --git a/debian/rules b/debian/rules
index 5816fc4..1081be6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -49,16 +49,16 @@ CONF_ALL	= \
 	--with-mysql --with-postgresql --with-sqlite3 \
 	--enable-bat --with-x
 
-ifeq ($(DEB_HOST_ARCH_OS),linux)
-CONF_ALL	+= --with-systemd=/lib/systemd/system
-endif
+#ifeq ($(DEB_HOST_ARCH_OS),linux)
+#CONF_ALL	+= --with-systemd=/lib/systemd/system
+#endif
 
 ifeq ($(DEB_HOST_ARCH_OS),kfreebsd)
 CONF_ALL	+= --disable-acl --disable-xattr
 endif
 
 #set to 1 if configured with systemd
-HAVE_SYSTEMD = $(findstring 1,$(shell egrep "^\#define HAVE_SYSTEMD" config.log))
+#HAVE_SYSTEMD = $(findstring 1,$(shell egrep "^\#define HAVE_SYSTEMD" config.log))
 
 LONGNAME_mysql		= mysql
 LONGNAME_pgsql		= postgresql
@@ -93,11 +93,7 @@ $(foreach template,$(wildcard debian/*-db.*.in),$(call template-cleanup,$(templa
 endef
 
 %:
-ifeq ($(HAVE_SYSTEMD),1)
-	dh $@ --with autotools_dev,systemd --parallel
-else
 	dh $@ --with autotools_dev --parallel
-endif
 
 override_dh_shlibdeps:
 	# Handle shlibs for the database packages specially so they get
@@ -135,12 +131,12 @@ override_dh_install-arch:
 		-e "s/XX_DBLONGNAME_XX/$(LONGNAME_$(db))/" \
 		debian/bacula-director-$(db)/etc/bacula/scripts/make_catalog_backup \
 		debian/bacula-director-$(db)/etc/bacula/scripts/make_catalog_backup.pl;)
-ifeq ($(HAVE_SYSTEMD),1)
-	# only install systemd related files if systemd is enabled during build
-	install -m 644 platforms/systemd/bacula-fd.service -D debian/bacula-fd/lib/systemd/system/bacula-fd.service
-	install -m 644 platforms/systemd/bacula-sd.service -D debian/bacula-sd/lib/systemd/system/bacula-sd.service
-	install -m 644 platforms/systemd/bacula-dir.service -D debian/bacula-director-common/lib/systemd/system/bacula-director.service
-endif
+#ifeq ($(HAVE_SYSTEMD),1)
+#	# only install systemd related files if systemd is enabled during build
+#	install -m 644 platforms/systemd/bacula-fd.service -D debian/bacula-fd/lib/systemd/system/bacula-fd.service
+#	install -m 644 platforms/systemd/bacula-sd.service -D debian/bacula-sd/lib/systemd/system/bacula-sd.service
+#	install -m 644 platforms/systemd/bacula-dir.service -D debian/bacula-director-common/lib/systemd/system/bacula-director.service
+#endif
 
 override_dh_installdocs:
 	dh_installdocs -pbacula --link-doc=bacula-server

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-bacula/bacula.git

