[Git][debian-proftpd-team/proftpd][master] 3 commits: Parallel building is automagically assumed in dh>=10

[Francesco Paolo Lovergine]

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


Commits:
b840dc66 by Francesco Paolo Lovergine at 2020-12-13T11:37:57+01:00
Parallel building is automagically assumed in dh>=10

- - - - -
65eed0b9 by Francesco Paolo Lovergine at 2020-12-13T16:49:00+01:00
New update in postinst to manage better mod_inet and its directive

- - - - -
645e241d by Francesco Paolo Lovergine at 2020-12-13T17:27:20+01:00
Preparing for upload

- - - - -


3 changed files:

- debian/changelog
- debian/proftpd-basic.postinst
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,10 +1,11 @@
-proftpd-dfsg (1.3.7a+dfsg-2) UNRELEASED; urgency=medium
+proftpd-dfsg (1.3.7a+dfsg-2) unstable; urgency=medium
 
-  * Now enabled parallel building.
   * Fixed a bit debian/watch for current versioning by upstream.
   * Added debian/gbp.conf to force pristine-tar use.
+  * proftpd-basic.postint modified to try to manage better IdentLookups
+    directive and to move of mod_ident into DSO mode.
 
- -- Francesco Paolo Lovergine <frankie at debian.org>  Sat, 12 Dec 2020 19:02:51 +0100
+ -- Francesco Paolo Lovergine <frankie at debian.org>  Sun, 13 Dec 2020 16:26:07 +0000
 
 proftpd-dfsg (1.3.7a+dfsg-1) unstable; urgency=medium
 


=====================================
debian/proftpd-basic.postinst
=====================================
@@ -79,6 +79,24 @@ include_modules()
     fi
 }
 
+identlookups()
+{
+    if [ -f $CONF_NEW ] ; then
+	if ! egrep -qi "^[[:space:]]*<IfModule mod_ident.c>" $CONF_NEW ; then
+		perl -pi -e "s{^(.*IdentLookups.*)}{<IfModule mod_ident.c>\n\1\n</IfModule>\n}i;" $CONF_NEW
+	fi
+    fi
+}
+
+add_mod_ident()
+{
+    if [ -f $MODULES_NEW ] ; then
+	if ! egrep -qi "^[[:space:]]|#*LoadModule mod_ident.c" $MODULES_NEW ; then
+		perl -pi -e "s{^(ModulePath .*)}{\1\n\n#\n# Added at upgrade time\n#\nLoadModule mod_ident.c\n}i;" $MODULES_NEW
+	fi
+    fi
+}
+
 replace_file () {
     file=$1
     if [ ! -f ${file} ] ; then
@@ -121,9 +139,7 @@ EOF
 	fi
 }
 
-#. /usr/share/debconf/confmodule
-
-# update-ined is used if found, else you are on your own
+# update-inetd is used if found, else you are on your own
 if [ ! -z `which update-inetd` ]; then
     UPDATE_INETD=update-inetd
 else
@@ -163,6 +179,8 @@ if [ "$1" = "configure" ]; then
     tcpwin_options
     scoreboard
     include_modules
+    identlookups
+    add_mod_ident
 
 	# disable old cron jobs if needed
 	disable_script /etc/cron.monthly/proftpd


=====================================
debian/rules
=====================================
@@ -62,7 +62,7 @@ debian/proftpd-substvars: debian/proftpd-substvars.in
 	sed -e 's/@VERSION@/$(VERSION)/' $< >$@
 
 %:
-	dh $@ --parallel --without autoreconf
+	dh $@ --without autoreconf
 
 override_dh_auto_configure:
 	dh_update_autotools_config



View it on GitLab: https://salsa.debian.org/debian-proftpd-team/proftpd/-/compare/e9bfb75d30f1e4b12530989f971fb2b7d02a400b...645e241dbafdd754c980bca3d4e51718f87276e7

-- 
View it on GitLab: https://salsa.debian.org/debian-proftpd-team/proftpd/-/compare/e9bfb75d30f1e4b12530989f971fb2b7d02a400b...645e241dbafdd754c980bca3d4e51718f87276e7
You're receiving this email because of your account on salsa.debian.org.