[Git][debian-proftpd-team/proftpd][master] Fixed #977853 and fully supporting systemd socket mode

[Francesco Paolo Lovergine]

Francesco Paolo Lovergine pushed to branch master at Debian ProFTPD Team / proftpd


Commits:
8de25877 by Francesco Paolo Lovergine at 2020-12-22T12:50:21+01:00
Fixed #977853 and fully supporting systemd socket mode

- - - - -


6 changed files:

- debian/changelog
- debian/control
- debian/control.in
- debian/proftpd-core.postinst
- debian/proftpd-dev.install
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -2,6 +2,12 @@ proftpd-dfsg (1.3.7a+dfsg-5) UNRELEASED; urgency=medium
 
   * Sigh, removed a spurious line introduced in postinst in the last upload.
     (closes: #977853)
+  * Now truly installing socket-related systemd files. Migrated to debhelper
+    level 11 to finalize a working combination of dh_installsystemd/dh_installinit.
+    That triggered also a few changes to debian/rules, including the dropping 
+    dh_auto_configure use.
+  * Fixed postinst to add new conf files, if missing. That also caused
+    breakage at postinst time :-/
 
  -- Francesco Paolo Lovergine <frankie at debian.org>  Tue, 22 Dec 2020 09:29:25 +0100
 


=====================================
debian/control
=====================================
@@ -5,7 +5,7 @@ Maintainer: ProFTPD Maintainance Team <pkg-proftpd-maintainers at alioth-lists.debi
 Uploaders: Francesco Paolo Lovergine <frankie at debian.org>,
            Hilmar Preusse <hille42 at web.de>
 Standards-Version: 4.5.1
-Build-Depends: debhelper-compat (=10),
+Build-Depends: debhelper-compat (=11),
                dh-exec,
                libacl1-dev,
                libcap-dev [linux-any],


=====================================
debian/control.in
=====================================
@@ -5,7 +5,7 @@ Maintainer: ProFTPD Maintainance Team <pkg-proftpd-maintainers at alioth-lists.debi
 Uploaders: Francesco Paolo Lovergine <frankie at debian.org>,
            Hilmar Preusse <hille42 at web.de>
 Standards-Version: 4.5.1
-Build-Depends: debhelper-compat (=10),
+Build-Depends: debhelper-compat (=11),
                dh-exec,
                libacl1-dev,
                libcap-dev [linux-any],


=====================================
debian/proftpd-core.postinst
=====================================
@@ -157,7 +157,7 @@ if [ "$1" = "configure" ]; then
     fi
 
     # use current configuration files or generate new ones from scratch
-    for name in proftpd modules sql ldap tls virtuals
+    for name in proftpd modules sql ldap tls virtuals sftp geoip mod_snmp
     do
       if [ ! -f $ETC_DIR/$name.conf ]; then
           cp  /usr/share/proftpd/templates/$name.conf $ETC_DIR/$name.conf.proftpd-new


=====================================
debian/proftpd-dev.install
=====================================
@@ -1,5 +1,5 @@
 usr/bin/prxs
 usr/lib/proftpd/*.a
 usr/include/proftpd/*
-usr/lib/*/pkgconfig/proftpd.pc usr/share/pkgconfig
+usr/lib/pkgconfig/proftpd.pc usr/share/pkgconfig
 debian/proftpd-substvars usr/share/proftpd/


=====================================
debian/rules
=====================================
@@ -39,7 +39,7 @@ DSOMODS3 = mod_wrap2_sql:mod_quotatab_file:mod_quotatab_radius:mod_facl:mod_ctrl
 DSOMODS4 = mod_geoip:mod_exec:mod_sftp:mod_sftp_pam:mod_sftp_sql:mod_shaper:mod_sql_passwd:mod_ifsession:mod_auth_otp:mod_tls_redis
 DSOMODS5 = mod_wrap2_redis:mod_redis:mod_memcache:mod_tls_memcache:mod_readme:mod_snmp:mod_digest:mod_ident
 DSOMODS6 = mod_log_forensic:mod_qos:mod_statcache:mod_tls_fscache:mod_tls_shmcache:mod_dnsbl
-CONF_ARGS := --prefix=/usr \
+CONF_ARGS := --prefix=/usr --with-pkgconfig=lib/pkgconfig \
 	     --with-includes=$(shell pg_config --includedir)$(shell mysql_config --include|sed -e 's/-I/:/g'|sed -e 's/ //') \
 	     --mandir=/usr/share/man --sysconfdir=/etc/$(NAME) --localstatedir=/run --libexecdir=/usr/lib/$(NAME) \
 	     --enable-sendfile --enable-facl --enable-dso --enable-autoshadow --enable-ctrls --enable-openssl \
@@ -63,7 +63,11 @@ debian/proftpd-substvars: debian/proftpd-substvars.in
 
 override_dh_auto_configure:
 	dh_update_autotools_config
-	dh_auto_configure -- $(CONF_ARGS) --with-shared=$(DSOMODS1):$(DSOMODS2):$(DSOMODS3):$(DSOMODS4):$(DSOMODS5):$(DSOMODS6)
+
+	# upstream autotools stuff is old enough to miss --runstatedir option and break debhelper(>10)
+	# dh_auto_configure -- $(CONF_ARGS) --with-shared=$(DSOMODS1):$(DSOMODS2):$(DSOMODS3):$(DSOMODS4):$(DSOMODS5):$(DSOMODS6)
+	./configure --infodir=\${prefix}/share/info --disable-option-checking --disable-silent-rules --libdir=\${prefix}/lib/$(DEB_BUILD_GNU_TYPE) --disable-dependency-tracking \
+				$(CONF_ARGS) --with-shared=$(DSOMODS1):$(DSOMODS2):$(DSOMODS3):$(DSOMODS4):$(DSOMODS5):$(DSOMODS6)
 
 override_dh_auto_build: debian/proftpd-substvars
 	dh_auto_build
@@ -87,6 +91,11 @@ override_dh_installpam:
 override_dh_installinit:
 	dh_installinit --name=$(NAME)
 
+override_dh_installsystemd:
+	dh_installsystemd -p$(PACKAGE) --name=$(NAME) --no-enable --no-start $(NAME).socket
+	dh_installsystemd -p$(PACKAGE) --name=$(NAME)@ --no-enable --no-start $(NAME)@.service
+	dh_installsystemd -p$(PACKAGE) --name=$(NAME) $(NAME).service
+
 checkroot:
 	dh_testdir
 	dh_testroot



View it on GitLab: https://salsa.debian.org/debian-proftpd-team/proftpd/-/commit/8de25877b2e2f47917eb00b24272349ff112e4fb

-- 
View it on GitLab: https://salsa.debian.org/debian-proftpd-team/proftpd/-/commit/8de25877b2e2f47917eb00b24272349ff112e4fb
You're receiving this email because of your account on salsa.debian.org.