[Git][debian-proftpd-team/proftpd][master] 4 commits: Minor change to a description in debian/control.in

[Francesco Paolo Lovergine]

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


Commits:
2ce45dff by Francesco Paolo Lovergine at 2020-12-10T14:59:28+01:00
Minor change to a description in debian/control.in

- - - - -
749d0187 by Francesco Paolo Lovergine at 2020-12-10T15:22:28+01:00
Removed obsolete makefile variables

- - - - -
a3c0c4ac by Francesco Paolo Lovergine at 2020-12-10T15:27:15+01:00
Fixed typo

- - - - -
f0afd241 by Francesco Paolo Lovergine at 2020-12-10T15:48:07+01:00
Prepare for upload into unstable

- - - - -


4 changed files:

- debian/changelog
- debian/control
- debian/control.in
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,4 +1,4 @@
-proftpd-dfsg (1.3.7a-2) UNRELEASED; urgency=medium
+proftpd-dfsg (1.3.7a-2) unstable; urgency=medium
 
   [ Hilmar Preusse ]
   * Applied some patches pulled from upstream.
@@ -35,6 +35,9 @@ proftpd-dfsg (1.3.7a-2) UNRELEASED; urgency=medium
 
   [ Francesco Paolo Lovergine ]
   * Now using dh methods to modernize debian/rules style. 
+    Cleaned up old makefile variables and now using --enable-openssl to 
+    enable SSL in mod_sql and mod_tls instead of using the 
+    HAVING_OPENSSL variable.
     (closes: #842293, #848045)
   * Policy bumped to 4.5.1.
   * Updated debian/control.in to reflect use of a debhelper >= 10.
@@ -43,7 +46,7 @@ proftpd-dfsg (1.3.7a-2) UNRELEASED; urgency=medium
   * Added a commented mod_ident loading in default modules.conf
   * Reinstated hardening in debian/rules.
 
- -- Francesco Paolo Lovergine <frankie at debian.org>  Thu, 10 Dec 2020 14:04:26 +0100
+ -- Francesco Paolo Lovergine <frankie at debian.org>  Thu, 10 Dec 2020 15:45:13 +0100
 
 proftpd-dfsg (1.3.7a-1) unstable; urgency=medium
 


=====================================
debian/control
=====================================
@@ -275,6 +275,6 @@ Description: Versatile, virtual-hosting FTP daemon - SNMP module
  not needed). Advanced features such as multiple password files and
  upload/download ratios are also supported.
  .
- This module is contained in the contrib/mod_wrap.c file for ProFTPD 1.2.x. It
+ This module is contained in the contrib/mod_wrap.c file for ProFTPD 1.2+. It
  enables the daemon to use the common tcpwrappers access control library while
  in standalone mode, and in a very configurable manner.


=====================================
debian/control.in
=====================================
@@ -275,6 +275,6 @@ Description: Versatile, virtual-hosting FTP daemon - SNMP module
  not needed). Advanced features such as multiple password files and
  upload/download ratios are also supported.
  .
- This module is contained in the contrib/mod_wrap.c file for ProFTPD 1.2.x. It
+ This module is contained in the contrib/mod_wrap.c file for ProFTPD 1.2+. It
  enables the daemon to use the common tcpwrappers access control library while
  in standalone mode, and in a very configurable manner.


=====================================
debian/rules
=====================================
@@ -7,14 +7,6 @@ VERSION=$(shell grep PROFTPD_VERSION_TEXT $(CURDIR)/include/version.h|cut -d\" -
 
 export DEB_BUILD_MAINT_OPTIONS=hardening=+all
 
-#
-# HAVE_OPENSSL is required by mod_sql.c.
-# See #233031 for details.
-#
-PROFTPD_FLAGS := -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -DHAVE_OPENSSL -DUSE_LDAP_TLS
-CFLAGS := $(PROFTPD_FLAGS)
-CC := gcc
-
 # Some special build options
 ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
   DEVELOPT=--enable-devel=yes
@@ -29,6 +21,7 @@ ifeq (,$(filter test,$(LOCAL_BUILD_OPTIONS)))
 # Disable automated build tests
 override_dh_auto_test:
 endif
+
 # dpkg-arch rules
 ifeq (,$(DEB_BUILD_GNU_TYPE))
   include debian/scripts/dpkg-arch.mk
@@ -52,7 +45,7 @@ DSOMODS6 = mod_log_forensic:mod_qos:mod_statcache:mod_tls_fscache:mod_tls_shmcac
 CONF_ARGS := --prefix=/usr \
 	     --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-sendfile --enable-facl --enable-dso --enable-autoshadow --enable-ctrls --enable-openssl \
 	     --enable-ipv6 --enable-nls --enable-memcache --with-lastlog=/var/log/lastlog --enable-pcre $(DEVELOPT) \
 	     --disable-strip --enable-redis $(BUILDNOTXATTR)
 



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

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