On Wed, Apr 04, 2018 at 10:51:36AM +0200, Julian Andres Klode wrote: > Package: socat > Version: 1.7.3.2-2 > Severity: wishlist > Tags: patch > User: [email protected] > Usertags: origin-ubuntu bionic ubuntu-patch > > > In Ubuntu, the attached patch was applied to achieve the following: > > * Enable tests during build. We cannot test all of them, but most > work fine. For that, patch test suite, add some files to debian/clean > and export LC_ALL=LANG=C.UTF-8 during the build. > > We want to move the package to main, and it's nice to have tests running > to prevent regressions. > > > Thanks for considering the patch.
Followup, seems I missed some build deps andd a test failed in containers. -- debian developer - deb.li/jak | jak-linux.org - free software dev ubuntu core developer i speak de, en
diff -Nru socat-1.7.3.2/debian/changelog socat-1.7.3.2/debian/changelog --- socat-1.7.3.2/debian/changelog 2018-04-03 14:50:03.000000000 +0200 +++ socat-1.7.3.2/debian/changelog 2018-04-04 12:06:49.000000000 +0200 @@ -1,3 +1,10 @@ +socat (1.7.3.2-2ubuntu2) bionic; urgency=medium + + * Add missing build-depends for tests, disable failing test 58 (does not like + containers). + + -- Julian Andres Klode <[email protected]> Wed, 04 Apr 2018 12:06:49 +0200 + socat (1.7.3.2-2ubuntu1) bionic; urgency=medium * Enable tests during build. We cannot test all of them, but most diff -Nru socat-1.7.3.2/debian/control socat-1.7.3.2/debian/control --- socat-1.7.3.2/debian/control 2018-04-03 14:50:03.000000000 +0200 +++ socat-1.7.3.2/debian/control 2018-04-04 12:06:49.000000000 +0200 @@ -4,7 +4,7 @@ Maintainer: Ubuntu Developers <[email protected]> XSBC-Original-Maintainer: Laszlo Boszormenyi (GCS) <[email protected]> Homepage: http://www.dest-unreach.org/socat/ -Build-Depends: debhelper (>= 10), libssl-dev, libwrap0-dev +Build-Depends: debhelper (>= 10), libssl-dev, libwrap0-dev, net-tools, iproute2, netbase Standards-Version: 4.1.1 Package: socat diff -Nru socat-1.7.3.2/debian/patches/test.sh-fixes.patch socat-1.7.3.2/debian/patches/test.sh-fixes.patch --- socat-1.7.3.2/debian/patches/test.sh-fixes.patch 2018-04-03 14:50:03.000000000 +0200 +++ socat-1.7.3.2/debian/patches/test.sh-fixes.patch 2018-04-04 12:06:49.000000000 +0200 @@ -8,16 +8,17 @@ --- a/test.sh +++ b/test.sh -@@ -12,7 +12,7 @@ +@@ -12,7 +12,8 @@ #set -vx val_t=0.1 -NUMCOND=true -+NUMCOND="test \$N -ne 314 -a \$N -ne 325 -a \$N -ne 366 -a \$N -ne 368 -a \$N -ne 369 -a \$N -ne 370 -a \$N -ne 371 -a \$N -ne 372 -a \$N -ne 373 -a \$N -ne 380" ++# 58 is broken in containers it seems, the rest looks like OpenSSL 1.1 screw up ++NUMCOND="test \$N -ne 58 -a \$N -ne 314 -a \$N -ne 325 -a \$N -ne 366 -a \$N -ne 368 -a \$N -ne 369 -a \$N -ne 370 -a \$N -ne 371 -a \$N -ne 372 -a \$N -ne 373 -a \$N -ne 380" #NUMCOND="test \$N -gt 70" VERBOSE= while [ "$1" ]; do -@@ -2251,7 +2251,7 @@ waitfile () { +@@ -2251,7 +2252,7 @@ waitfile () { gentestcert () { local name="$1" if [ -s $name.key -a -s $name.crt -a -s $name.pem ]; then return; fi @@ -26,7 +27,7 @@ openssl req -new -config $TESTCERT_CONF -key $name.key -x509 -out $name.crt -days 3653 >/dev/null 2>&1 cat $name.key $name.crt >$name.pem } -@@ -2260,8 +2260,8 @@ gentestcert () { +@@ -2260,8 +2261,8 @@ gentestcert () { gentestdsacert () { local name="$1" if [ -s $name.key -a -s $name.crt -a -s $name.pem ]; then return; fi @@ -37,7 +38,7 @@ openssl req -newkey dsa:$name-dsa.pem -keyout $name.key -nodes -x509 -config $TESTCERT_CONF -out $name.crt -days 3653 >/dev/null 2>&1 cat $name-dsa.pem $name-dh.pem $name.key $name.crt >$name.pem } -@@ -2282,7 +2282,7 @@ gentestcert6 () { +@@ -2282,7 +2283,7 @@ gentestcert6 () { cat $TESTCERT_CONF | { echo "# automatically generated by $0"; cat; } | sed 's/\(commonName\s*=\s*\).*/\1[::1]/' >$TESTCERT6_CONF @@ -46,7 +47,7 @@ openssl req -new -config $TESTCERT6_CONF -key $name.key -x509 -out $name.crt -days 3653 >/dev/null 2>&1 cat $name.key $name.crt >$name.pem } -@@ -10851,7 +10851,7 @@ te="$td/test$N.stderr" +@@ -10851,7 +10852,7 @@ te="$td/test$N.stderr" tdiff="$td/test$N.diff" da="test$N $(date) $RANDOM" CMD0="$TRACE $SOCAT $opts OPENSSL-LISTEN:$PORT,reuseaddr,cert=testsrv.crt,key=testsrv.key,verify=0 PIPE" @@ -55,7 +56,7 @@ printf "test $F_n $TEST... " $N $CMD0 >/dev/null 2>"${te}0" & pid0=$! -@@ -10906,7 +10906,7 @@ te="$td/test$N.stderr" +@@ -10906,7 +10907,7 @@ te="$td/test$N.stderr" tdiff="$td/test$N.diff" da="test$N $(date) $RANDOM" CMD0="$TRACE $SOCAT $opts OPENSSL-LISTEN:$PORT,reuseaddr,cert=testsrv.crt,key=testsrv.key,verify=0 SYSTEM:\"sleep 1; echo \\\\\\\"\\\"$da\\\"\\\\\\\"; sleep 1\"!!STDIO"
