[Git][debian-proftpd-team/proftpd-mod-proxy][master] Enable full harderning, enable blhc test on Salsa CI.

[Hilmar Preuße (@hilmar)]

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


Commits:
61426496 by Hilmar Preuße at 2025-11-24T09:14:53+01:00
Enable full harderning, enable blhc test on Salsa CI.

- - - - -


3 changed files:

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


Changes:

=====================================
debian/changelog
=====================================
@@ -2,6 +2,7 @@ proftpd-mod-proxy (0.9.5-2) UNRELEASED; urgency=medium
 
   * Move Make.rules from patches/01_built_outside_tree to subdir
     "debian/".
+  * Enable full harderning, enable blhc test on Salsa CI.
 
  -- Hilmar Preuße <hille42 at debian.org>  Mon, 24 Nov 2025 08:22:57 +0100
 


=====================================
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
=====================================
@@ -2,7 +2,7 @@ Bring in Make.rule to build w/o proftp build tree installed.
 
 --- proftpd-mod-proxy.orig/Makefile.in
 +++ proftpd-mod-proxy/Makefile.in
-@@ -2,7 +2,7 @@
+@@ -2,12 +2,13 @@
  top_srcdir=../..
  srcdir=@srcdir@
  
@@ -11,7 +11,13 @@ Bring in Make.rule to build w/o proftp build tree installed.
  
  .SUFFIXES: .la .lo
  
-@@ -109,7 +109,7 @@
+ SHARED_CFLAGS=-DPR_SHARED_MODULE
+ SHARED_LDFLAGS=-avoid-version -export-dynamic -module
++SHARED_LDFLAGS += $(shell dpkg-buildflags --get LDFLAGS)
+ VPATH=@srcdir@
+ 
+ MODULE_LIBS=@MODULE_LIBS@
+@@ -109,7 +110,7 @@
    lib/proxy/ssh/utf8.lo
  
  # Necessary redefinitions
@@ -20,7 +26,7 @@ Bring in Make.rule to build w/o proftp build tree installed.
  CPPFLAGS= $(ADDL_CPPFLAGS) -DHAVE_CONFIG_H $(DEFAULT_PATHS) $(PLATFORM) $(INCLUDES)
  LDFLAGS=-L../../lib @LIBDIRS@
  
-@@ -120,7 +120,7 @@
+@@ -120,7 +121,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-proxy/-/commit/614264963201561b0209b8fe729454a862a55fb4

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