[proftpd-dfsg] 01/01: mod_readme is a module now. Kill lintian error init.d-script-should-always-start-service.

Sat Feb 24 15:18:46 GMT 2018

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

hilmar-guest pushed a commit to branch master
in repository proftpd-dfsg.

commit 99320ff8fa791e7b5311891be746c74f1d77c045
Author: Hilmar Preusse <hille42 at web.de>
Date:   Sat Feb 24 16:18:00 2018 +0100

    mod_readme is a module now. Kill lintian error init.d-script-should-always-start-service.
---
 debian/changelog                     | 9 +++++++--
 debian/proftpd-basic.NEWS            | 7 +++++++
 debian/proftpd-basic.install         | 1 +
 debian/proftpd-basic.proftpd.default | 4 ----
 debian/proftpd-basic.proftpd.init    | 2 +-
 debian/rules                         | 8 +++-----
 debian/templates/modules.conf        | 3 ++-
 7 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ee0079f..65b3e34 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,6 @@
-proftpd-dfsg (1.3.6-1) UNRELEASED; urgency=medium
+proftpd-dfsg (1.3.6-1) unstable; urgency=medium
 
-  [Hilmar Preuße]
+  [ Hilmar Preuße ]
   * New upstream release (Closes: #879113)
     - Has support for One time passwords (Closes: #94162)
     - Improved documentation of MaxInstances (Closes: #336001)
@@ -31,6 +31,11 @@ proftpd-dfsg (1.3.6-1) UNRELEASED; urgency=medium
 
   * Include geoip sample config into proftp-basic (Closes: #872452).
   * Add B-D on libhiredis-dev to build Redis support.
+  * Build mod_readme as module instead of built in (enabled by default).
+
+  * init.d-script-should-always-start-service:
+    Remove RUN="yes" statement from /etc/default/proftpd, set to RUN="yes" in
+    init-Skript.
 
  -- Francesco Paolo Lovergine <frankie at debian.org>  Mon, 15 Jan 2018 21:14:17 +0100
 
diff --git a/debian/proftpd-basic.NEWS b/debian/proftpd-basic.NEWS
index 0d488c6..2e227f2 100644
--- a/debian/proftpd-basic.NEWS
+++ b/debian/proftpd-basic.NEWS
@@ -1,3 +1,10 @@
+proftpd-dfsg (1.3.6-1) unstable; urgency=medium
+
+    mod_readme is now build a module instead of built in. Make sure it is
+    loaded if you need it (this is the default).
+
+ -- Francesco Paolo Lovergine <frankie at debian.org>  Fri, 27 Jan 2017 14:44:31 +0100
+
 proftpd-dfsg (1.3.5d-1) unstable; urgency=medium
 
     Starting from this version, proftpd works by default in standalone mode at
diff --git a/debian/proftpd-basic.install b/debian/proftpd-basic.install
index a04605f..69bb8bb 100644
--- a/debian/proftpd-basic.install
+++ b/debian/proftpd-basic.install
@@ -23,6 +23,7 @@ usr/lib/proftpd/mod_quotatab_sql.so
 usr/lib/proftpd/mod_radius.so
 usr/lib/proftpd/mod_ratio.so
 usr/lib/proftpd/mod_redis.so
+usr/lib/proftpd/mod_readme.so
 usr/lib/proftpd/mod_rewrite.so
 usr/lib/proftpd/mod_shaper.so
 usr/lib/proftpd/mod_site_misc.so
diff --git a/debian/proftpd-basic.proftpd.default b/debian/proftpd-basic.proftpd.default
index e6734cd..f1439cf 100644
--- a/debian/proftpd-basic.proftpd.default
+++ b/debian/proftpd-basic.proftpd.default
@@ -3,10 +3,6 @@
 # Main configuration file
 CONFIG_FILE=/etc/proftpd/proftpd.conf
 
-# Master system-wide proftpd switch. The initscript
-# will not run if it is not set to yes.
-RUN="yes"
-
 # Default options.
 # For more exhaustive logging, try "-d 3".
 OPTIONS=""
diff --git a/debian/proftpd-basic.proftpd.init b/debian/proftpd-basic.proftpd.init
index e79deea..f700f1d 100755
--- a/debian/proftpd-basic.proftpd.init
+++ b/debian/proftpd-basic.proftpd.init
@@ -20,7 +20,7 @@ DAEMON=/usr/sbin/proftpd
 NAME=proftpd
 
 # Defaults
-RUN="no"
+RUN="yes"
 OPTIONS=""
 CONFIG_FILE=/etc/proftpd/proftpd.conf
 
diff --git a/debian/rules b/debian/rules
index f92a7c2..dc6ec4c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -36,17 +36,15 @@ include /usr/share/dpkg/buildflags.mk
 
 DSOMODS1 = mod_unique_id:mod_site_misc:mod_load:mod_ban:mod_quotatab:mod_sql:mod_sql_mysql:mod_sql_postgres:mod_sql_sqlite:mod_sql_odbc:mod_dynmasq
 DSOMODS2 = mod_quotatab_sql:mod_ldap:mod_quotatab_ldap:mod_ratio:mod_tls:mod_rewrite:mod_radius:mod_wrap:mod_wrap2:mod_wrap2_file
-DSOMODS3 = mod_wrap2_sql:mod_quotatab_file:mod_quotatab_radius:mod_facl:mod_ctrls_admin:mod_copy:mod_deflate:mod_ifversion:mod_tls_memcache
+DSOMODS3 = mod_wrap2_sql:mod_quotatab_file:mod_quotatab_radius:mod_facl:mod_ctrls_admin:mod_copy:mod_deflate:mod_ifversion
 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
-#DSOMODS5 = mod_wrap2_redis:mod_redis:mod_memcache:mod_readme
+DSOMODS5 = mod_wrap2_redis:mod_redis:mod_memcache:mod_tls_memcache:mod_readme
 CONF_ARGS := --prefix=/usr \
 	     --with-includes=$(shell pg_config --includedir):$(shell mysql_config --include|sed -e 's/-I//') \
 	     --mandir=/usr/share/man --sysconfdir=/etc/$(NAME) --localstatedir=/run --libexecdir=/usr/lib/$(NAME) \
-	     --enable-sendfile --enable-facl --enable-dso --enable-autoshadow --enable-ctrls --with-modules=mod_readme \
+	     --enable-sendfile --enable-facl --enable-dso --enable-autoshadow --enable-ctrls \
 	     --enable-ipv6 --enable-nls --enable-memcache --with-lastlog=/var/log/lastlog --enable-pcre $(DEVELOPT) \
 	     --disable-strip --enable-redis
-	#     --enable-sendfile --enable-facl --enable-dso --enable-autoshadow --enable-ctrls \
 
 ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
   CONF_ARGS += --build $(DEB_HOST_GNU_TYPE)
diff --git a/debian/templates/modules.conf b/debian/templates/modules.conf
index 43f1e5a..9bdffbf 100644
--- a/debian/templates/modules.conf
+++ b/debian/templates/modules.conf
@@ -96,9 +96,10 @@ LoadModule mod_tls_memcache.c
 
 #LoadModule mod_auth_otp.c
 
+LoadModule mod_readme.c
+
 # Install proftpd-mod-geoip to use the GeoIP feature
 #LoadModule mod_geoip.c
 
 # keep this module the last one
 LoadModule mod_ifsession.c
-

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

