[Git][debian-proftpd-team/proftpd][master] Patch for #1105645.

[Hilmar Preuße (@hilmar)]

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


Commits:
191cb9a1 by Hilmar Preuße at 2026-06-12T23:47:13+02:00
Patch for #1105645.

- - - - -


3 changed files:

- debian/changelog
- + debian/patches/2148.diff
- debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
@@ -1,6 +1,8 @@
 proftpd-dfsg (1.3.9b~dfsg-2) UNRELEASED; urgency=medium
 
   * Simplify d/patches/autotools a little bit.
+  * Patch from upstream to build using "make --shuffle=reverse"
+    (Closes: #1105645).
 
  -- Hilmar Preuße <hille42 at debian.org>  Mon, 08 Jun 2026 22:56:46 +0200
 


=====================================
debian/patches/2148.diff
=====================================
@@ -0,0 +1,43 @@
+From 7d11db17726fc468a7af0caff2a3b735604f8257 Mon Sep 17 00:00:00 2001
+From: TJ Saunders <tj at castaglia.org>
+Date: Fri, 12 Jun 2026 12:26:30 -0700
+Subject: [PATCH] Issue #2143: Fix an implicit dependency ordering issue with
+ the mod_auth_otp Makefile when building its `auth-otp` command-line
+ executable.
+
+---
+ contrib/mod_auth_otp/Makefile.in | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/contrib/mod_auth_otp/Makefile.in b/contrib/mod_auth_otp/Makefile.in
+index 4026969f0e..8d8776c0ae 100644
+--- a/contrib/mod_auth_otp/Makefile.in
++++ b/contrib/mod_auth_otp/Makefile.in
+@@ -17,7 +17,7 @@ MODULE_NAME=mod_auth_otp
+ MODULE_OBJS=mod_auth_otp.o base32.o otp.o crypto.o db.o
+ SHARED_MODULE_OBJS=mod_auth_otp.lo base32.lo otp.lo crypto.lo db.lo
+ UTILS_LIBS=@UTILS_LIBS@
+-UTILS_OBJS=base32.o otp.o crypto.o auth-otp.o
++UTILS_OBJS=utils/base32.o utils/otp.o utils/crypto.o auth-otp.o
+ UTILS_API_OBJS=../../src/pool.o \
+   ../../src/str.o \
+   ../../lib/prbase.a
+@@ -33,6 +33,10 @@ LDFLAGS=-L../../lib @LDFLAGS@
+ .c.lo:
+ 	$(LIBTOOL) --mode=compile --tag=CC $(CC) $(CPPFLAGS) $(CFLAGS) $(SHARED_CFLAGS) -c $<
+ 
++utils/%.o: %.c
++	-mkdir -p utils/
++	$(CC) $(CPPFLAGS) $(CFLAGS) -c $< -o $@
++
+ shared: $(SHARED_MODULE_OBJS) auth-otp$(EXEEXT)
+ 	$(LIBTOOL) --mode=link --tag=CC $(CC) -o $(MODULE_NAME).la $(SHARED_MODULE_OBJS) -rpath $(LIBEXECDIR) $(LDFLAGS) $(SHARED_LDFLAGS) $(SHARED_MODULE_LIBS) `cat $(top_srcdir)/$(MODULE_NAME).c | grep '$$Libraries:' | sed -e 's/^.*\$$Libraries: \(.*\)\\$$/\1/'`
+ 
+@@ -68,6 +72,7 @@ install-utils: $(DESTDIR)$(sbindir)
+ clean:
+ 	$(LIBTOOL) --mode=clean $(RM) $(MODULE_NAME).a $(MODULE_NAME).la *.o *.lo .libs/*.o
+ 	-$(RM) auth-otp$(EXEEXT)
++	-$(RM) -r utils/
+ 
+ distclean: clean
+ 	$(RM) Makefile t/Makefile $(MODULE_NAME).h config.status config.cache config.log *.gcda *.gcno


=====================================
debian/patches/series
=====================================
@@ -17,3 +17,4 @@ odbc
 #1a5ce6467756e92f42f89c53f0f370dc0f0206d7.diff
 #508eb4d1b8c550b5f3059ad5b33d60c6b6c76bc7.diff
 #d4ff72c0c32db68ef2cecfe08c53ac42a7bf85dd.diff
+2148.diff



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

-- 
View it on GitLab: https://salsa.debian.org/debian-proftpd-team/proftpd/-/commit/191cb9a10826ee637940362a0bd39997e9446cbe
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