[Git][debian-proftpd-team/proftpd][master] [skip-ci] Document upstream issue in d/rules.

[Hilmar Preuße (@hilmar)]

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


Commits:
9a9fc0b3 by Hilmar Preuße at 2026-11-06T00:08:17+01:00
[skip-ci] Document upstream issue in d/rules.

- - - - -


4 changed files:

- debian/patches/series
- debian/rules
- debian/tests/control
- debian/tests/test-suite


Changes:

=====================================
debian/patches/series
=====================================
@@ -5,12 +5,12 @@ mod_sql_mysql.c
 mod_wrap_noparanoid
 ftpstats
 odbc
-01_disable_inet_connect_ipv4_test.diff
-02_disable_redis_sentinel_conn_new_test.diff
+#01_disable_inet_connect_ipv4_test.diff
+#02_disable_redis_sentinel_conn_new_test.diff
 # The following two patches conflict.
 #04_disable_base_netaddr_get_addr_test.diff
-04_disable_base_netaddr_get_addr_test2.diff
-05_disable_inet_connect_ipv6_test.diff
+#04_disable_base_netaddr_get_addr_test2.diff
+#05_disable_inet_connect_ipv6_test.diff
 #ca9a7469ced3a7baf8ab9cc97f7c6b4c5ee3de75.diff
 933abc9ae115ffc59e4b2a98495ec267bf341d23.diff
 0f91a0f088312da4862d1f882cdf998e78fa3795.diff


=====================================
debian/rules
=====================================
@@ -72,6 +72,7 @@ override_dh_auto_configure:
 	dh_update_autotools_config
 
 	# upstream autotools stuff is old enough to miss --runstatedir option and break debhelper(>10)
+	# Reported: https://github.com/proftpd/proftpd/issues/1034
 	# dh_auto_configure -- $(CONF_ARGS) --with-shared=$(DSOMODS1):$(DSOMODS2):$(DSOMODS3):$(DSOMODS4):$(DSOMODS5):$(DSOMODS6)
 	install_user=$$(id -un) install_group=$$(id -gn) ./configure --infodir=\${prefix}/share/info --disable-option-checking --disable-silent-rules --libdir=\${prefix}/lib/$(DEB_BUILD_GNU_TYPE) --disable-dependency-tracking \
 				$(CONF_ARGS) --with-shared=$(DSOMODS1):$(DSOMODS2):$(DSOMODS3):$(DSOMODS4):$(DSOMODS5):$(DSOMODS6)


=====================================
debian/tests/control
=====================================
@@ -6,7 +6,8 @@ Depends: @builddeps@,
 	libnet-inet6glue-perl,
 	libnet-telnet-perl,
 	libhttp-message-perl,
-	redis-server
+	redis-server,
+	xz-utils
 Restrictions: allow-stderr
 
 Tests: sftp-connection


=====================================
debian/tests/test-suite
=====================================
@@ -13,4 +13,11 @@ eval "$(dpkg-buildflags --export=sh)"
 	    --enable-ipv6 --enable-nls --enable-memcache --enable-pcre2 \
 	    --disable-strip --enable-redis --enable-tests
 
-make check-api
+make check-api || \
+if [ -r "tests/api-tests.log" ]; then
+  if xz tests/api-tests.log; then
+    base64 tests/api-tests.log.xz
+  else
+    cat tests/api-tests.log
+  fi
+fi



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

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