update versions

4 files changed, 14 insertions, 56 deletions

diff --git a/build-fehQlibs b/build-fehQlibs
index 970d77d..20aeb51 100755
--- a/build-fehQlibs
+++ b/build-fehQlibs
@@ -2,14 +2,14 @@
 
 set -eu
 
-version=22a
+version=25a
 upname=fehqlibs_$version.orig.tar.gz
 srcname=fehqlibs-$version
 
 wget https://www.fehcom.de/ipnet/fehQlibs/fehQlibs-$version.tgz
 ln -sf fehQlibs-$version.tgz $upname
 tar -xf $upname
-mv fehQlibs-$version $srcname
+mv fehQlibs-${version%a} $srcname
 cd $srcname
 debmake -b libqlibs --email jannis@fehcom.de --fullname 'Jannis M. Hoffmann'
 
@@ -40,21 +40,21 @@ export DH_VERBOSE = 1
 	dh $@ --buildsystem=none
 
 override_dh_auto_clean:
-	$(MAKE) clean
+	$(MAKE) -C src clean
 	sed -i '31,$$d' conf-build
 
 override_dh_auto_configure:
 	echo CFLAGS=\"-Iinclude $(CFLAGS)\" >>conf-build
-	$(MAKE) check
+	$(MAKE) -C src check
 
 override_dh_auto_build:
-	LDFLAGS= $(MAKE) default
+	LDFLAGS= $(MAKE) -C src default
 END
 
 cat <<'END' >debian/install
 #!/usr/bin/dh-exec
-qlibs.a => usr/lib/${DEB_HOST_MULTIARCH}/libqlibs.a
-dnsstub/dnsresolv.a => usr/lib/${DEB_HOST_MULTIARCH}/libdnsresolv.a
+src/qlibs.a => usr/lib/${DEB_HOST_MULTIARCH}/libqlibs.a
+src/dnsstub/dnsresolv.a => usr/lib/${DEB_HOST_MULTIARCH}/libdnsresolv.a
 debian/contrib/qlibs.pc usr/share/pkgconfig/
 END
 chmod +x debian/install
@@ -75,23 +75,9 @@ includedir=${prefix}/include
 Name: qlibs
 Description: qlibs is the foundation of `feh' software
 URL: https://www.fehcom.de/ipnet/qlibs.html
-Version: 22a
+Version: 25a
 Cflags: -I${includedir}/qlibs
 Libs: -lqlibs -ldnsresolv
 END
 
-cat <<END >debian/patches/000-ip-unsigned.patch
-Author: Jannis M. Hoffmann <jannis@fehcom.de>
-
---- fehqlibs_$version.orig/include/ip.h
-+++ fehqlibs-$version/include/ip.h
-@@ -60,3 +60,3 @@
- const static char V4localnet[4] = {0,0,0,0};
--const static char V4broadcast[4] = {255,255,255,255};
-+const static unsigned char V4broadcast[4] = {255,255,255,255};
- 
-END
-
-echo 000-ip-unsigned.patch >>debian/patches/series
-
 rm debian/source/control debian/tests/control
diff --git a/build-sqmail b/build-sqmail
index 8b0f108..41a43b7 100755
--- a/build-sqmail
+++ b/build-sqmail
@@ -3,7 +3,7 @@
 set -eu
 
 name=sqmail
-version=4.2.24
+version=4.2.29
 upname=${name}_$version.orig.tar.gz
 srcname=$name-$version
 rel_project_root=$name/$name-$version
@@ -503,36 +503,6 @@ Description: replace direct ucspissl.a with libucspissl
  qmail-remote.o: \\
 END
 
-cat <<END >debian/patches/000-error-narrowing.patch
-Author: Jannis M. Hoffmann <jannis@fehcom.de>
-
---- $orig_project_root/src/dkimverify.cpp
-+++ $abs_project_root/src/dkimverify.cpp
-@@ -377,14 +377,14 @@
- unsigned DecodeBase64(char *ptr)
- {
-   static const unsigned char base64_table[256] = {
--    -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,
--    -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,62,-1,-1,-1,63,52,53,54,55,56,57,58,59,60,61,-1,-1,-1,-1,-1,-1,
--    -1, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,-1,-1,-1,-1,-1,
--    -1,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,-1,-1,-1,-1,-1,
--    -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,
--    -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,
--    -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,
--    -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1};
-+    255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-+    255,255,255,255,255,255,255,255,255,255,255, 62,255,255,255, 63, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61,255,255,255,255,255,255,
-+    255,  0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25,255,255,255,255,255,
-+    255, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51,255,255,255,255,255,
-+    255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-+    255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-+    255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-+    255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255};
- 
-   unsigned char* s = (unsigned char* )ptr;
-   unsigned char* d = (unsigned char* )ptr;
-END
-
-printf "000-config.patch\n000-make-ucspissl.patch\n000-error-narrowing.patch\n" >>debian/patches/series
+printf "000-config.patch\n000-make-ucspissl.patch\n" >>debian/patches/series
 
 rm debian/source/control debian/tests/control
diff --git a/build-ucspi-ssl b/build-ucspi-ssl
index 1f6e53b..caab438 100755
--- a/build-ucspi-ssl
+++ b/build-ucspi-ssl
@@ -3,7 +3,7 @@
 set -euC
 
 name=ucspi-ssl
-version=0.12.7
+version=0.12.10
 upname=${name}_$version.orig.tar.gz
 srcname=$name-$version
 rel_project_root=superscript.com/net/$name-$version
diff --git a/build-ucspi-tcp6 b/build-ucspi-tcp6
index 117a6b3..f2e44d1 100755
--- a/build-ucspi-tcp6
+++ b/build-ucspi-tcp6
@@ -3,7 +3,7 @@
 set -eu
 
 name=ucspi-tcp6
-version=1.12.4
+version=1.13.00
 upname=${name}_$version.orig.tar.gz
 srcname=$name-$version
 rel_project_root=$name/$name-$version
@@ -46,10 +46,12 @@ override_dh_auto_clean:
 	rm -f $rel_project_root/conf-cc
 	rm -f $rel_project_root/conf-ld
 	\$(MAKE) -C $rel_project_root/src clean
+	rm -f $rel_project_root/src/home
 
 override_dh_auto_configure:
 	echo "\$(CC) -Iinclude \`pkg-config -cflags qlibs\` \$(CFLAGS)" >$rel_project_root/conf-cc
 	echo \$(CC) >$rel_project_root/conf-ld
+	touch $rel_project_root/src/home
 
 override_dh_auto_build:
 	\$(MAKE) -C $rel_project_root/src default