[Git][debian-proftpd-team/proftpd-mod-sftp-ldap][master] Build using the default build flags; enable blhc test on Salsa CI.

[Hilmar Preuße (@hilmar)]

Hilmar Preuße pushed to branch master at Debian ProFTPD Team / proftpd-mod-sftp-ldap


Commits:
461379e2 by Hilmar Preuße at 2025-11-23T12:04:42+01:00
Build using the default build flags; enable blhc test on Salsa CI.

- - - - -


3 changed files:

- debian/changelog
- debian/gitlab-ci.yml
- debian/patches/01_build_outside_tree


Changes:

=====================================
debian/changelog
=====================================
@@ -1,6 +1,8 @@
 proftpd-mod-sftp-ldap (0.2-3) UNRELEASED; urgency=medium
 
   * Enable Reprotest on Salsa CI.
+  * Build using the default build flags (Closes: #1119533);
+    enable blhc test on Salsa CI.
 
  -- Hilmar Preuße <hille42 at debian.org>  Tue, 16 Sep 2025 21:55:53 +0200
 


=====================================
debian/gitlab-ci.yml
=====================================
@@ -6,7 +6,7 @@ include:
 # don't want
 variables:
   SALSA_CI_DISABLE_AUTOPKGTEST: 0
-  SALSA_CI_DISABLE_BLHC: 1
+  SALSA_CI_DISABLE_BLHC: 0
   SALSA_CI_DISABLE_LINTIAN: 0
   SALSA_CI_DISABLE_PIUPARTS: 0
   SALSA_CI_DISABLE_REPROTEST: 0


=====================================
debian/patches/01_build_outside_tree
=====================================
@@ -1,7 +1,7 @@
 Required changes to build module outside of proftp source tree.
 
 --- /dev/null
-+++ proftpd-mod_sftp_ldap/Make.rules
++++ proftpd-mod-sftp-ldap/Make.rules
 @@ -0,0 +1,116 @@
 +prefix=/usr
 +exec_prefix=/usr
@@ -51,16 +51,16 @@ Required changes to build module outside of proftp source tree.
 +
 +# Directory include paths.
 +#
-+INCLUDES=-I.. -I$(top_srcdir)/include -I$(top_builddir)/include -I/usr/include/mariadb/mysql -I/usr/include/mariadb -I/usr/include/postgresql -I/usr/include/mariadb -I/usr/include/mariadb/mysql -I/usr/include/postgresql
++INCLUDES=-I.. -I$(top_srcdir)/include -I$(top_builddir)/include -I/usr/include/proftpd
 +
 +# Preprocessor compilation flags.
 +#
-+CPPFLAGS=-Wdate-time -D_FORTIFY_SOURCE=2 -DHAVE_CONFIG_H $(DEFAULT_PATHS) $(PLATFORM) $(INCLUDES)
-+ADDL_CPPFLAGS=-Wdate-time -D_FORTIFY_SOURCE=2
++ADDL_CPPFLAGS=$(shell dpkg-buildflags --get CPPFLAGS)
 +
-+# Our compiler flags.
++# Our additional compiler flags.
 +#
-+CFLAGS=-g2 -g -O2 -fdebug-prefix-map=/home/hille/devel/proftp_debian/git/proftpd=. -fstack-protector-strong -Wformat -Werror=format-security -Wall -fno-omit-frame-pointer -Werror=implicit-function-declaration
++CFLAGS=-Wall -fno-omit-frame-pointer
++CFLAGS += $(shell dpkg-buildflags --get CFLAGS)
 +DEFINES=$(PLATFORM)
 +
 +# Module-specific libraries to link against.  These libraries may be
@@ -119,9 +119,9 @@ Required changes to build module outside of proftp source tree.
 +
 +FTPWHO_OBJS=ftpwho.o scoreboard.o misc.o
 +BUILD_FTPWHO_OBJS=utils/ftpwho.o utils/scoreboard.o utils/misc.o
---- proftpd-mod_sftp_ldap.orig/Makefile.in
-+++ proftpd-mod_sftp_ldap/Makefile.in
-@@ -2,7 +2,7 @@
+--- proftpd-mod-sftp-ldap.orig/Makefile.in
++++ proftpd-mod-sftp-ldap/Makefile.in
+@@ -2,12 +2,13 @@
  top_srcdir=../..
  srcdir=@srcdir@
  
@@ -130,16 +130,22 @@ Required changes to build module outside of proftp source tree.
  
  .SUFFIXES: .la .lo
  
-@@ -18,7 +18,7 @@
+ SHARED_CFLAGS=-DPR_SHARED_MODULE
+ SHARED_LDFLAGS=-avoid-version -export-dynamic -module
++SHARED_LDFLAGS += $(shell dpkg-buildflags --get LDFLAGS)
+ VPATH=@srcdir@
+ 
+ MODULE_NAME=mod_sftp_ldap
+@@ -18,7 +19,7 @@
    keys.lo
  
  # Necessary redefinitions
 -INCLUDES=-I. -I./include -I../.. -I../../include @INCLUDES@
-+INCLUDES=-I. -I./debian/proftp_code -I../.. -I../../include -I/usr/include/proftpd @INCLUDES@
++INCLUDES=-I. -I../.. -I../../include -I/usr/include/proftpd @INCLUDES@
  CPPFLAGS= $(ADDL_CPPFLAGS) -DHAVE_CONFIG_H $(DEFAULT_PATHS) $(PLATFORM) $(INCLUDES)
  LDFLAGS=-L../../lib @LIBDIRS@
  
-@@ -29,7 +29,7 @@
+@@ -29,7 +30,7 @@
  	$(LIBTOOL) --mode=compile --tag=CC $(CC) $(CPPFLAGS) $(CFLAGS) $(SHARED_CFLAGS) -c $< -o $@
  
  shared: $(SHARED_MODULE_OBJS)



View it on GitLab: https://salsa.debian.org/debian-proftpd-team/proftpd-mod-sftp-ldap/-/commit/461379e27ad350c270fe594c26b3e8b2e0ef22ed

-- 
View it on GitLab: https://salsa.debian.org/debian-proftpd-team/proftpd-mod-sftp-ldap/-/commit/461379e27ad350c270fe594c26b3e8b2e0ef22ed
You're receiving this email because of your account on salsa.debian.org.