[Git][debian-proftpd-team/proftpd-mod-kafka][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-kafka


Commits:
4a0113db by Hilmar Preusse at 2025-11-23T12:15:18+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_built_outside_tree


Changes:

=====================================
debian/changelog
=====================================
@@ -4,6 +4,8 @@ proftpd-mod-kafka (0.1-2) UNRELEASED; urgency=medium
     + Build-Depends: Drop versioned constraint on proftpd-dev.
     + proftpd-mod-kafka: Drop versioned constraint on proftpd-basic in Breaks.
   * Enable Reprotest on Salsa CI.
+  * Build using the default build flags (Closes: #1119532);
+    enable blhc test on Salsa CI.
 
  -- Debian Janitor <janitor at jelmer.uk>  Sun, 24 Jul 2022 00:59:10 -0000
 


=====================================
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_built_outside_tree
=====================================
@@ -51,16 +51,16 @@ Bring in Make.rule to build w/o proftp build tree installed.
 +
 +# 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
 +
 +# 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.
 +#
-+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
@@ -121,7 +121,7 @@ Bring in Make.rule to build w/o proftp build tree installed.
 +BUILD_FTPWHO_OBJS=utils/ftpwho.o utils/scoreboard.o utils/misc.o
 --- proftpd-mod-kafka.orig/Makefile.in
 +++ proftpd-mod-kafka/Makefile.in
-@@ -2,7 +2,7 @@
+@@ -2,12 +2,13 @@
  top_srcdir=../..
  srcdir=@srcdir@
  
@@ -130,16 +130,22 @@ Bring in Make.rule to build w/o proftp build tree installed.
  
  .SUFFIXES: .la .lo
  
-@@ -16,7 +16,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_kafka
+@@ -16,7 +17,7 @@
  SHARED_MODULE_OBJS=mod_kafka.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@
  
-@@ -27,7 +27,7 @@
+@@ -27,7 +28,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-kafka/-/commit/4a0113dba0a630a85dbb6c40c837e0bdfdc9124f

-- 
View it on GitLab: https://salsa.debian.org/debian-proftpd-team/proftpd-mod-kafka/-/commit/4a0113dba0a630a85dbb6c40c837e0bdfdc9124f
You're receiving this email because of your account on salsa.debian.org.