Control: tags -1 patch
Dirk,
Many thanks
On Wed, Feb 19, 2025 at 08:20:44AM +0000, Mayer, Dirk wrote:
> Source: ucf
> Version: 3.0049
> Tags: ftbfs
>
> Dear Maintainer,
>
> The source package ucf FTBFS on a current Trixie system running on AMD64 as
> well as on ARM64.
I have reworked t/basic_with_re_special to remove absolute build paths (which is
always going to fail)
> Some of the tests are failing. Furthermore the tests run although the
> environment variables are set so skip any checks with
> DEB_BUILD_PROFILES="nocheck" and well as DEB_BUILD_OPTIONS="nocheck
> noautodbgsym noddebs"
Also removed Makefile check from all recipe.
Does these patches help?
Mark
commit 6376a97644b791b2e66fe7f2afdd87f4df54a3bb
Author: Mark Hindley <m...@hindley.org.uk>
Date: Wed Feb 19 09:12:58 2025 +0000
Makefile: don't run check in all recipe.
diff --git a/Makefile b/Makefile
index 321f179..fffe78a 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@ prefix = $(DESTDIR)
package = ucf
version = $(shell dpkg-parsechangelog -Sversion)
-all: build check
+all: build
build: man/ucfq.1
sed -i "s#^pversion='.*'\$$#pversion='$(version)'#" ucf ucfr
diff --git a/t/basic_with_re_special/expected/state/hashfile
b/t/basic_with_re_special/expected/state/hashfile
new file mode 100644
index 0000000..e69de29
diff --git a/t/basic_with_re_special/expected/target/bre[]+?{|input.conf
b/t/basic_with_re_special/expected/target/bre[]+?{|input.conf
new file mode 100644
index 0000000..c85543c
--- /dev/null
+++ b/t/basic_with_re_special/expected/target/bre[]+?{|input.conf
@@ -0,0 +1 @@
+# Basic test input
commit f959e598ba6997272cb5956f2777e887f3ad61d0
Author: Mark Hindley <m...@hindley.org.uk>
Date: Wed Feb 19 09:25:11 2025 +0000
t/basic_with_re_special/: fix -- don't embed absolute build paths, it will
always fail.
Closes: #1098327
diff --git a/t/basic_with_re_special/bre[]+?{|input.conf
b/t/basic_with_re_special/bre[]+?{input.conf
similarity index 100%
rename from t/basic_with_re_special/bre[]+?{|input.conf
rename to t/basic_with_re_special/bre[]+?{input.conf
diff --git a/t/basic_with_re_special/expected/output
b/t/basic_with_re_special/expected/output
index 5336f55..074305a 100644
--- a/t/basic_with_re_special/expected/output
+++ b/t/basic_with_re_special/expected/output
@@ -1,13 +1 @@
-The new start file is `/home/mark/src/debian/ucf/t/basic/input.conf\'
-The destination is `/tmp/bre[]+?{|input.conf\'
(`[[:space:]]/tmp/bre\[]+?{|input\.conf$\')
-The history is kept under \'/home/mark/src/debian/ucf/t/basic\'
-The file may be cached at \'/var/lib/ucf/cache/:tmp:bre[]+?{|input.conf\'
-The destination file does not exist.
-The old md5sum does not exist.
-The new file exists, and has md5sum:
-9adb3f4dd959f9427c489b1704aa609e /home/mark/src/debian/ucf/t/basic/input.conf
-Historical md5sums are not available
-The new start file is `/home/mark/src/debian/ucf/t/basic/input.conf\'
-The destination is `/tmp/bre[]+?{|input.conf\'
(`[[:space:]]/tmp/bre\[]+?{|input\.conf$\')
-The history is kept under \'/home/mark/src/debian/ucf/t/basic\'
-The file may be cached at \'/var/lib/ucf/cache/:tmp:bre[]+?{|input.conf\'
+Creating config file /tmp/bre[]+?{input.conf with new version
diff --git a/t/basic_with_re_special/expected/target/bre[]+?{|input.conf
b/t/basic_with_re_special/expected/state/cache/:tmp:bre[]+?{input.conf
similarity index 100%
rename from t/basic_with_re_special/expected/target/bre[]+?{|input.conf
rename to t/basic_with_re_special/expected/state/cache/:tmp:bre[]+?{input.conf
diff --git a/t/basic_with_re_special/expected/state/hashfile
b/t/basic_with_re_special/expected/state/hashfile
index e69de29..32fe5a0 100644
--- a/t/basic_with_re_special/expected/state/hashfile
+++ b/t/basic_with_re_special/expected/state/hashfile
@@ -0,0 +1 @@
+9adb3f4dd959f9427c489b1704aa609e /tmp/bre[]+?{input.conf
diff --git a/t/basic_with_re_special/expected/state/registry
b/t/basic_with_re_special/expected/state/registry
new file mode 100644
index 0000000..e69de29
diff --git a/t/basic_with_re_special/expected/state/registry.0
b/t/basic_with_re_special/expected/state/registry.0
new file mode 100644
index 0000000..1fa36e1
--- /dev/null
+++ b/t/basic_with_re_special/expected/state/registry.0
@@ -0,0 +1 @@
+breconf /tmp/bre[]+?{input.conf
diff --git a/t/basic_with_re_special/expected/state/registry.1
b/t/basic_with_re_special/expected/state/registry.1
new file mode 100644
index 0000000..e69de29
diff --git a/t/basic_with_re_special/expected/target/bre[]+?{input.conf
b/t/basic_with_re_special/expected/target/bre[]+?{input.conf
new file mode 100644
index 0000000..c85543c
--- /dev/null
+++ b/t/basic_with_re_special/expected/target/bre[]+?{input.conf
@@ -0,0 +1 @@
+# Basic test input
diff --git a/t/basic_with_re_special/test b/t/basic_with_re_special/test
index 98d8182..ad54451 100755
--- a/t/basic_with_re_special/test
+++ b/t/basic_with_re_special/test
@@ -3,8 +3,8 @@
set -e
# Test basic install of file with BRE special characters
-# Note: +?{| are only special in ERE and shouldn't be escaped.
+# Note: +?{ are only special in ERE and shouldn't be escaped.
-${UCF_TEST_BINDIR}ucf -d 'bre[]+?{|input.conf' '/tmp/bre[]+?{|input.conf' 2>&1
-${UCF_TEST_BINDIR}ucfr breconf '/tmp/bre[]+?{|input.conf' 2>&1
-${UCF_TEST_BINDIR}ucfr --purge breconf '/tmp/bre[]+?{|input.conf' 2>&1
+${UCF_TEST_BINDIR}ucf 'bre[]+?{input.conf' '/tmp/bre[]+?{input.conf' 2>&1
+${UCF_TEST_BINDIR}ucfr breconf '/tmp/bre[]+?{input.conf' 2>&1
+${UCF_TEST_BINDIR}ucfr --purge breconf '/tmp/bre[]+?{input.conf' 2>&1
