[Git][debian-proftpd-team/proftpd][master] 4 commits: Added comment to changelog

[Francesco Paolo Lovergine]

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


Commits:
697d8987 by Francesco Paolo Lovergine at 2020-12-10T12:56:17+01:00
Added comment to changelog

- - - - -
f53437e1 by Francesco Paolo Lovergine at 2020-12-10T14:07:32+01:00
Some minor changes to modules.conf template and debian/rules

- - - - -
58a1c67c by Francesco Paolo Lovergine at 2020-12-10T14:13:56+01:00
Removed spaces in service file

- - - - -
da9724c5 by Francesco Paolo Lovergine at 2020-12-10T14:43:11+01:00
Readded hardening and annotated bugs

- - - - -


4 changed files:

- debian/changelog
- + debian/proftpd-basic.proftpd.service
- debian/rules
- debian/templates/modules.conf


Changes:

=====================================
debian/changelog
=====================================
@@ -35,11 +35,15 @@ proftpd-dfsg (1.3.7a-2) UNRELEASED; urgency=medium
 
   [ Francesco Paolo Lovergine ]
   * Now using dh methods to modernize debian/rules style. 
+    (closes: #842293, #848045)
   * Policy bumped to 4.5.1.
   * Updated debian/control.in to reflect use of a debhelper >= 10.
   * Fixed a bit the long description to make lintian happy.
+  * Added a service file for systemd.
+  * Added a commented mod_ident loading in default modules.conf
+  * Reinstated hardening in debian/rules.
 
- -- Francesco Paolo Lovergine <frankie at debian.org>  Wed, 09 Dec 2020 14:17:33 +0000
+ -- Francesco Paolo Lovergine <frankie at debian.org>  Thu, 10 Dec 2020 14:04:26 +0100
 
 proftpd-dfsg (1.3.7a-1) unstable; urgency=medium
 


=====================================
debian/proftpd-basic.proftpd.service
=====================================
@@ -0,0 +1,16 @@
+[Unit]
+Description=ProFTPD FTP Server
+Wants=network-online.target
+After=network-online.target nss-lookup.target local-fs.target remote-fs.target
+
+[Service]
+Type=forking
+Environment=OPTIONS= CONFIG_FILE=/etc/proftpd/proftpd.conf
+EnvironmentFile=-/etc/default/proftpd
+ExecStartPre=/usr/sbin/proftpd --configtest -c $CONFIG_FILE
+ExecStart=/usr/sbin/proftpd -c $CONFIG_FILE $OPTIONS
+ExecReload=/bin/kill -HUP $MAINPID
+PIDFile=/run/proftpd.pid
+
+[Install]
+WantedBy=multi-user.target


=====================================
debian/rules
=====================================
@@ -5,6 +5,8 @@ PACKAGE_DEV=proftpd-dev
 NAME=proftpd
 VERSION=$(shell grep PROFTPD_VERSION_TEXT $(CURDIR)/include/version.h|cut -d\" -f2)
 
+export DEB_BUILD_MAINT_OPTIONS=hardening=+all
+
 #
 # HAVE_OPENSSL is required by mod_sql.c.
 # See #233031 for details.
@@ -93,7 +95,7 @@ override_dh_installpam:
 	dh_installpam --name=$(NAME)
 
 override_dh_installinit:
-	dh_installinit --name=proftpd
+	dh_installinit --name=$(NAME)
 
 checkroot:
 	dh_testdir


=====================================
debian/templates/modules.conf
=====================================
@@ -12,6 +12,9 @@ ModulePath /usr/lib/proftpd
 ModuleControlsACLs insmod,rmmod allow user root
 ModuleControlsACLs lsmod allow user *
 
+#This is required only if you need to set IdentLookups on
+#LoadModule mod_ident.c
+
 LoadModule mod_ctrls_admin.c
 LoadModule mod_tls.c
 



View it on GitLab: https://salsa.debian.org/debian-proftpd-team/proftpd/-/compare/e5f1fd103412da36b497794d37d771e29146acc8...da9724c5316641d4f7cc22953108497fd6080748

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