[Git][debian-proftpd-team/proftpd][master] Simplify d/patches/autotools a little bit.

Mon Jun 8 21:57:50 BST 2026


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


Commits:
d37fead3 by Hilmar Preuße at 2026-06-08T22:57:39+02:00
Simplify d/patches/autotools a little bit.

- - - - -


3 changed files:

- debian/changelog
- debian/patches/autotools
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,9 @@
+proftpd-dfsg (1.3.9b~dfsg-2) UNRELEASED; urgency=medium
+
+  * Simplify d/patches/autotools a little bit.
+
+ -- Hilmar Preuße <hille42 at debian.org>  Mon, 08 Jun 2026 22:56:46 +0200
+
 proftpd-dfsg (1.3.9b~dfsg-1) unstable; urgency=medium
 
   * New upstream release; disable / refresh patches.


=====================================
debian/patches/autotools
=====================================
@@ -2,8 +2,8 @@ Description: Do not touch config.h.in and stamp-h.in. Also export dpkg build fla
 Author: Francesco Paolo Lovergine <frankie at debian.org>
 Forwarded: not needed
 
---- proftpd-dfsg-1.3.9b~dfsg.orig/Makefile.in
-+++ proftpd-dfsg-1.3.9b~dfsg/Makefile.in
+--- proftpd.orig/Makefile.in
++++ proftpd/Makefile.in
 @@ -272,10 +272,10 @@
  	chmod a+x configure config.sub install-sh modules/glue.sh
  
@@ -19,8 +19,8 @@ Forwarded: not needed
  
  config.h: stamp-h
  stamp-h: config.h.in config.status
---- proftpd-dfsg-1.3.9b~dfsg.orig/Make.rules.in
-+++ proftpd-dfsg-1.3.9b~dfsg/Make.rules.in
+--- proftpd.orig/Make.rules.in
++++ proftpd/Make.rules.in
 @@ -16,7 +16,7 @@
  AR=@AR@
  CC=@CC@
@@ -45,67 +45,57 @@ Forwarded: not needed
  DEFINES=$(PLATFORM)
  
  # Module-specific libraries to link against.  These libraries may be
---- proftpd-dfsg-1.3.9b~dfsg.orig/contrib/mod_dnsbl/Makefile.in
-+++ proftpd-dfsg-1.3.9b~dfsg/contrib/mod_dnsbl/Makefile.in
-@@ -20,8 +20,8 @@
- 
+--- proftpd.orig/contrib/mod_dnsbl/Makefile.in
++++ proftpd/contrib/mod_dnsbl/Makefile.in
+@@ -21,7 +21,7 @@
  # Necessary redefinitions
  INCLUDES=-I. -I../.. -I../../include -I$(top_srcdir)/../../include @INCLUDES@
--CPPFLAGS=$(ADDL_CPPFLAGS) -DHAVE_CONFIG_H $(DEFAULT_PATHS) $(PLATFORM) $(INCLUDES)
+ CPPFLAGS=$(ADDL_CPPFLAGS) -DHAVE_CONFIG_H $(DEFAULT_PATHS) $(PLATFORM) $(INCLUDES)
 -LDFLAGS=-L../../lib @LDFLAGS@
-+CPPFLAGS=$(ADDL_CPPFLAGS) -DHAVE_CONFIG_H $(DEFAULT_PATHS) $(PLATFORM) $(INCLUDES) $(shell dpkg-buildflags --get CPPFLAGS)
 +LDFLAGS=-L../../lib @LDFLAGS@ $(shell dpkg-buildflags --get LDFLAGS)
  
  .c.o:
  	$(CC) $(CPPFLAGS) $(CFLAGS) -c $<
---- proftpd-dfsg-1.3.9b~dfsg.orig/contrib/mod_load/Makefile.in
-+++ proftpd-dfsg-1.3.9b~dfsg/contrib/mod_load/Makefile.in
-@@ -21,8 +21,8 @@
- 
+--- proftpd.orig/contrib/mod_load/Makefile.in
++++ proftpd/contrib/mod_load/Makefile.in
+@@ -22,7 +22,7 @@
  # Necessary redefinitions
  INCLUDES=-I. -I../.. -I../../include -I$(top_srcdir)/../../include @INCLUDES@
--CPPFLAGS=$(ADDL_CPPFLAGS) -DHAVE_CONFIG_H $(DEFAULT_PATHS) $(PLATFORM) $(INCLUDES)
+ CPPFLAGS=$(ADDL_CPPFLAGS) -DHAVE_CONFIG_H $(DEFAULT_PATHS) $(PLATFORM) $(INCLUDES)
 -LDFLAGS=-L../../lib @LDFLAGS@
-+CPPFLAGS=$(ADDL_CPPFLAGS) -DHAVE_CONFIG_H $(DEFAULT_PATHS) $(PLATFORM) $(INCLUDES) $(shell dpkg-buildflags --get CPPFLAGS)
 +LDFLAGS=-L../../lib @LDFLAGS@ $(shell dpkg-buildflags --get LDFLAGS)
  
  .c.o:
  	$(CC) $(CPPFLAGS) $(CFLAGS) -c $<
---- proftpd-dfsg-1.3.9b~dfsg.orig/contrib/mod_sftp/Makefile.in
-+++ proftpd-dfsg-1.3.9b~dfsg/contrib/mod_sftp/Makefile.in
-@@ -30,8 +30,8 @@
- 
+--- proftpd.orig/contrib/mod_sftp/Makefile.in
++++ proftpd/contrib/mod_sftp/Makefile.in
+@@ -31,7 +31,7 @@
  # Necessary redefinitions
  INCLUDES=-I. -I../.. -I../../include -I$(top_srcdir)/../../include @INCLUDES@
--CPPFLAGS=$(ADDL_CPPFLAGS) -DHAVE_CONFIG_H $(DEFAULT_PATHS) $(PLATFORM) $(INCLUDES)
+ CPPFLAGS=$(ADDL_CPPFLAGS) -DHAVE_CONFIG_H $(DEFAULT_PATHS) $(PLATFORM) $(INCLUDES)
 -LDFLAGS=-L../../lib @LDFLAGS@
-+CPPFLAGS=$(ADDL_CPPFLAGS) -DHAVE_CONFIG_H $(DEFAULT_PATHS) $(PLATFORM) $(INCLUDES) $(shell dpkg-buildflags --get CPPFLAGS)
 +LDFLAGS=-L../../lib @LDFLAGS@ $(shell dpkg-buildflags --get LDFLAGS)
  
  # We special-case the building of umac128.o in order to use preprocessor
  # tricks to get the implementation, rather than making it be all in runtime.
---- proftpd-dfsg-1.3.9b~dfsg.orig/contrib/mod_snmp/Makefile.in
-+++ proftpd-dfsg-1.3.9b~dfsg/contrib/mod_snmp/Makefile.in
-@@ -20,8 +20,8 @@
- 
+--- proftpd.orig/contrib/mod_snmp/Makefile.in
++++ proftpd/contrib/mod_snmp/Makefile.in
+@@ -21,7 +21,7 @@
  # Necessary redefinitions
  INCLUDES=-I. -I../.. -I../../include -I$(top_srcdir)/../../include @INCLUDES@
--CPPFLAGS=$(ADDL_CPPFLAGS) -DHAVE_CONFIG_H $(DEFAULT_PATHS) $(PLATFORM) $(INCLUDES)
+ CPPFLAGS=$(ADDL_CPPFLAGS) -DHAVE_CONFIG_H $(DEFAULT_PATHS) $(PLATFORM) $(INCLUDES)
 -LDFLAGS=-L../../lib @LDFLAGS@
-+CPPFLAGS=$(ADDL_CPPFLAGS) -DHAVE_CONFIG_H $(DEFAULT_PATHS) $(PLATFORM) $(INCLUDES) $(shell dpkg-buildflags --get CPPFLAGS)
 +LDFLAGS=-L../../lib @LDFLAGS@ $(shell dpkg-buildflags --get LDFLAGS)
  
  .c.o:
  	$(CC) $(CPPFLAGS) $(CFLAGS) -c $<
---- proftpd-dfsg-1.3.9b~dfsg.orig/contrib/mod_wrap2/Makefile.in
-+++ proftpd-dfsg-1.3.9b~dfsg/contrib/mod_wrap2/Makefile.in
-@@ -20,8 +20,8 @@
- 
+--- proftpd.orig/contrib/mod_wrap2/Makefile.in
++++ proftpd/contrib/mod_wrap2/Makefile.in
+@@ -21,7 +21,7 @@
  # Necessary redefinitions
  INCLUDES=-I. -I../.. -I../../include -I$(top_srcdir)/../../include @INCLUDES@
--CPPFLAGS=$(ADDL_CPPFLAGS) -DHAVE_CONFIG_H $(DEFAULT_PATHS) $(PLATFORM) $(INCLUDES)
+ CPPFLAGS=$(ADDL_CPPFLAGS) -DHAVE_CONFIG_H $(DEFAULT_PATHS) $(PLATFORM) $(INCLUDES)
 -LDFLAGS=-L../../lib @LDFLAGS@
-+CPPFLAGS=$(ADDL_CPPFLAGS) -DHAVE_CONFIG_H $(DEFAULT_PATHS) $(PLATFORM) $(INCLUDES) $(shell dpkg-buildflags --get CPPFLAGS)
 +LDFLAGS=-L../../lib @LDFLAGS@ $(shell dpkg-buildflags --get LDFLAGS)
  
  .c.o:


=====================================
debian/rules
=====================================
@@ -35,6 +35,8 @@ ifneq (,$(filter $(DEB_HOST_ARCH), $(XATTR_NOT_EXISTS)))
   BUILDNOTXATTR=--disable-xattr
 endif
 
+# ADDL_CPPFLAGS = $(shell dpkg-buildflags --get CPPFLAGS)
+
 include /usr/share/dpkg/buildflags.mk
 
 DSOMODS1 = mod_unique_id:mod_site_misc:mod_load:mod_ban:mod_quotatab:mod_sql:mod_sql_mysql:mod_sql_postgres:mod_sql_sqlite:mod_sql_odbc:mod_dynmasq



View it on GitLab: https://salsa.debian.org/debian-proftpd-team/proftpd/-/commit/d37fead3cf2fe9e16bdb1f3d3081ca3f5d573ae3

-- 
View it on GitLab: https://salsa.debian.org/debian-proftpd-team/proftpd/-/commit/d37fead3cf2fe9e16bdb1f3d3081ca3f5d573ae3
You're receiving this email because of your account on salsa.debian.org. Manage all notifications: https://salsa.debian.org/-/profile/notifications | Help: https://salsa.debian.org/help


