[Git][debian-proftpd-team/proftpd-mod-vroot][master] Build using the default build flags; enable blhc test on Salsa CI.
Hilmar Preuße (@hilmar)
gitlab at salsa.debian.org
Tue Nov 18 23:01:03 GMT 2025
Hilmar Preuße pushed to branch master at Debian ProFTPD Team / proftpd-mod-vroot
Commits:
4c2e9538 by Hilmar Preuße at 2025-11-19T00:00:52+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
=====================================
@@ -1,6 +1,8 @@
proftpd-mod-vroot (0.9.12-2) UNRELEASED; urgency=medium
* Enable Reprotest on Salsa CI.
+ * Build using the default build flags (Closes: #1119535);
+ enable blhc test on Salsa CI.
-- Hilmar Preuße <hille42 at debian.org> Tue, 16 Sep 2025 22:00:08 +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_built_outside_tree
=====================================
@@ -1,9 +1,7 @@
Required changes to build module outside of proftp source tree.
-Index: proftpd-mod-vroot/Make.rules
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ proftpd-mod-vroot/Make.rules 2020-08-13 09:53:23.928659313 +0200
+--- /dev/null
++++ proftpd-mod-vroot/Make.rules
@@ -0,0 +1,116 @@
+prefix=/usr
+exec_prefix=/usr
@@ -22,10 +20,10 @@ Index: proftpd-mod-vroot/Make.rules
+
+AR=ar
+CC=gcc
-+PLATFORM=-DLINUX
++PLATFORM=-DLINUX
+LDFLAGS=-L$(top_srcdir)/lib -L$(top_builddir)/lib -Wl,-z,relro -rdynamic -L/usr/lib/x86_64-linux-gnu/ -L/usr/lib/x86_64-linux-gnu
+LIBEXECDIR=/usr/lib/proftpd
-+LIBS=-lsupp -lattr -lnsl -lresolv -lresolv -lcrypt -ldl -lhiredis -lmemcachedutil -lmemcached -pthread -lacl -lpcreposix -lpcre -lssl -lcrypto -lsodium -lcap -lpam -ldl
++LIBS=-lsupp -lattr -lnsl -lresolv -lresolv -lcrypt -ldl -lhiredis -lmemcachedutil -lmemcached -pthread -lacl -lpcreposix -lpcre -lssl -lcrypto -lsodium -lcap -lpam -ldl
+LIBTOOL=libtool
+MAKEDEPEND=makedepend -Y
+RANLIB=ranlib
@@ -57,12 +55,12 @@ Index: proftpd-mod-vroot/Make.rules
+
+# 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
@@ -95,7 +93,7 @@ Index: proftpd-mod-vroot/Make.rules
+SHARED_MODULE_LIBS= -lsodium
+SHARED_MODULE_OBJS=mod_unique_id.la mod_site_misc.la mod_ban.la mod_quotatab.la mod_sql.la mod_sql_mysql.la mod_sql_postgres.la mod_sql_sqlite.la mod_sql_odbc.la mod_dynmasq.la mod_quotatab_sql.la mod_ldap.la mod_quotatab_ldap.la mod_ratio.la mod_tls.la mod_rewrite.la mod_radius.la mod_wrap.la mod_wrap2_file.la mod_wrap2_sql.la mod_quotatab_file.la mod_quotatab_radius.la mod_facl.la mod_ctrls_admin.la mod_copy.la mod_deflate.la mod_ifversion.la mod_geoip.la mod_exec.la mod_sftp_pam.la mod_sftp_sql.la mod_shaper.la mod_sql_passwd.la mod_ifsession.la mod_tls_redis.la mod_wrap2_redis.la mod_redis.la mod_memcache.la mod_tls_memcache.la mod_readme.la mod_digest.la mod_ident.la mod_log_forensic.la mod_qos.la mod_statcache.la mod_tls_fscache.la mod_tls_shmcache.la
+
-+BUILD_SHARED_MODULE_OBJS=modules/mod_tls_shmcache.la modules/mod_tls_fscache.la modules/mod_statcache.la modules/mod_qos.la modules/mod_log_forensic.la modules/mod_ident.la modules/mod_digest.la modules/mod_snmp.la modules/mod_readme.la modules/mod_tls_memcache.la modules/mod_memcache.la modules/mod_redis.la modules/mod_wrap2_redis.la modules/mod_tls_redis.la modules/mod_auth_otp.la modules/mod_ifsession.la modules/mod_sql_passwd.la modules/mod_shaper.la modules/mod_sftp_sql.la modules/mod_sftp_pam.la modules/mod_sftp.la modules/mod_exec.la modules/mod_geoip.la modules/mod_ifversion.la modules/mod_deflate.la modules/mod_copy.la modules/mod_ctrls_admin.la modules/mod_facl.la modules/mod_quotatab_radius.la modules/mod_quotatab_file.la modules/mod_wrap2_sql.la modules/mod_wrap2_file.la modules/mod_wrap2.la modules/mod_wrap.la modules/mod_radius.la modules/mod_rewrite.la modules/mod_tls.la modules/mod_ratio.la modules/mod_quotatab_ldap.la modules/mod_ldap.la modules/mod_quotatab_sql.la modules/mod_dynmasq.la modules/mod_sql_odbc.la modules/mod_sql_sqlite.la modules/mod_sql_postgres.la modules/mod_sql_mysql.la modules/mod_sql.la modules/mod_quotatab.la modules/mod_ban.la modules/mod_load.la modules/mod_site_misc.la modules/mod_unique_id.la
++BUILD_SHARED_MODULE_OBJS=modules/mod_tls_shmcache.la modules/mod_tls_fscache.la modules/mod_statcache.la modules/mod_qos.la modules/mod_log_forensic.la modules/mod_ident.la modules/mod_digest.la modules/mod_snmp.la modules/mod_readme.la modules/mod_tls_memcache.la modules/mod_memcache.la modules/mod_redis.la modules/mod_wrap2_redis.la modules/mod_tls_redis.la modules/mod_auth_otp.la modules/mod_ifsession.la modules/mod_sql_passwd.la modules/mod_shaper.la modules/mod_sftp_sql.la modules/mod_sftp_pam.la modules/mod_sftp.la modules/mod_exec.la modules/mod_geoip.la modules/mod_ifversion.la modules/mod_deflate.la modules/mod_copy.la modules/mod_ctrls_admin.la modules/mod_facl.la modules/mod_quotatab_radius.la modules/mod_quotatab_file.la modules/mod_wrap2_sql.la modules/mod_wrap2_file.la modules/mod_wrap2.la modules/mod_wrap.la modules/mod_radius.la modules/mod_rewrite.la modules/mod_tls.la modules/mod_ratio.la modules/mod_quotatab_ldap.la modules/mod_ldap.la modules/mod_quotatab_sql.la modules/mod_dynmasq.la modules/mod_sql_odbc.la modules/mod_sql_sqlite.la modules/mod_sql_postgres.la modules/mod_sql_mysql.la modules/mod_sql.la modules/mod_quotatab.la modules/mod_ban.la modules/mod_load.la modules/mod_site_misc.la modules/mod_unique_id.la
+
+STATIC_MODULE_DIRS=""
+STATIC_MODULE_OBJS=mod_core.o mod_xfer.o mod_rlimit.o mod_auth_unix.o mod_auth_file.o mod_auth.o mod_ls.o mod_log.o mod_site.o mod_delay.o mod_facts.o mod_dso.o mod_auth_pam.o mod_cap.o mod_ctrls.o mod_lang.o
@@ -121,11 +119,9 @@ Index: proftpd-mod-vroot/Make.rules
+
+FTPWHO_OBJS=ftpwho.o scoreboard.o misc.o
+BUILD_FTPWHO_OBJS=utils/ftpwho.o utils/scoreboard.o utils/misc.o
-Index: proftpd-mod-vroot/Makefile.in
-===================================================================
---- proftpd-mod-vroot.orig/Makefile.in 2020-08-13 09:53:23.936663313 +0200
-+++ proftpd-mod-vroot/Makefile.in 2020-08-13 09:54:02.980177110 +0200
-@@ -2,7 +2,7 @@
+--- proftpd-mod-vroot.orig/Makefile.in
++++ proftpd-mod-vroot/Makefile.in
+@@ -2,12 +2,13 @@
top_srcdir=../..
srcdir=@srcdir@
@@ -134,7 +130,13 @@ Index: proftpd-mod-vroot/Makefile.in
.SUFFIXES: .la .lo
-@@ -22,7 +22,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_vroot
+@@ -22,7 +23,7 @@
fsio.lo
# Necessary redefinitions
@@ -143,7 +145,7 @@ Index: proftpd-mod-vroot/Makefile.in
CPPFLAGS= $(ADDL_CPPFLAGS) -DHAVE_CONFIG_H $(DEFAULT_PATHS) $(PLATFORM) $(INCLUDES)
LDFLAGS=-L../../lib @LIBDIRS@
-@@ -33,7 +33,7 @@
+@@ -33,7 +34,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-vroot/-/commit/4c2e9538fa9a05f3004d1921479c777329788b40
--
View it on GitLab: https://salsa.debian.org/debian-proftpd-team/proftpd-mod-vroot/-/commit/4c2e9538fa9a05f3004d1921479c777329788b40
You're receiving this email because of your account on salsa.debian.org.
More information about the Pkg-proftpd-maintainers
mailing list