convert build script to debian directory for fehqlibs

12 files changed, 382 insertions, 87 deletions

diff --git a/.gitignore b/.gitignore
index ac3e9d7..acfc986 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,3 @@
-fehqlibs-*/
-sqmail-*/
-ucspi-ssl-*/
-ucspi-tcp6-*/
 *.tgz
 *.tgz.*
 *.debian.tar.xz
diff --git a/build-fehQlibs b/build-fehQlibs
deleted file mode 100755
index 20aeb51..0000000
--- a/build-fehQlibs
+++ /dev/null
@@ -1,83 +0,0 @@
-#!/bin/sh
-
-set -eu
-
-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%a} $srcname
-cd $srcname
-debmake -b libqlibs --email jannis@fehcom.de --fullname 'Jannis M. Hoffmann'
-
-patch debian/control <<'END'
-2c2
-< Section: unknown
----
-> Section: libs
-5c5
-< Build-Depends: debhelper-compat (= 13)
----
-> Build-Depends: debhelper-compat (= 13), dh-exec
-7c7
-< Homepage: <insert the upstream URL, if relevant>
----
-> Homepage: https://www.fehcom.de/ipnet/qlibs.html
-17c17
-< Depends: ${misc:Depends}, ${shlibs:Depends}
----
-> Depends: ${misc:Depends}, ${shlibs:Depends}, pkgconf
-END
-
-cat <<'END' >debian/rules
-#!/usr/bin/make -f
-export DH_VERBOSE = 1
-
-%:
-	dh $@ --buildsystem=none
-
-override_dh_auto_clean:
-	$(MAKE) -C src clean
-	sed -i '31,$$d' conf-build
-
-override_dh_auto_configure:
-	echo CFLAGS=\"-Iinclude $(CFLAGS)\" >>conf-build
-	$(MAKE) -C src check
-
-override_dh_auto_build:
-	LDFLAGS= $(MAKE) -C src default
-END
-
-cat <<'END' >debian/install
-#!/usr/bin/dh-exec
-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
-ls --zero include/*.h | xargs --null -I{} echo '{} usr/include/qlibs/' >>debian/install
-
-cat <<'END' >debian/manpages
-#!/usr/bin/dh-exec
-man/error.3 => man/error-qlibs.3
-END
-chmod +x debian/manpages
-ls man/*.3 | grep -F 'man/error.3' -v >>debian/manpages
-
-mkdir debian/contrib
-cat <<'END' >debian/contrib/qlibs.pc
-prefix=/usr
-includedir=${prefix}/include
-
-Name: qlibs
-Description: qlibs is the foundation of `feh' software
-URL: https://www.fehcom.de/ipnet/qlibs.html
-Version: 25a
-Cflags: -I${includedir}/qlibs
-Libs: -lqlibs -ldnsresolv
-END
-
-rm debian/source/control debian/tests/control
diff --git a/fehqlibs-deb/debian/README.Debian b/fehqlibs-deb/debian/README.Debian
new file mode 100644
index 0000000..f7f4f26
--- /dev/null
+++ b/fehqlibs-deb/debian/README.Debian
@@ -0,0 +1,8 @@
+fehqlibs for Debian
+
+Please edit this to provide information specific to
+this fehqlibs Debian package.
+
+    (Automatically generated by debmake Version 4.4.0)
+
+ -- Jannis M. Hoffmann <jannis@fehcom.de>  Mon, 30 Sep 2024 18:58:44 +0200
diff --git a/fehqlibs-deb/debian/changelog b/fehqlibs-deb/debian/changelog
new file mode 100644
index 0000000..78d7dd3
--- /dev/null
+++ b/fehqlibs-deb/debian/changelog
@@ -0,0 +1,6 @@
+fehqlibs (25a-1) UNRELEASED; urgency=low
+
+  * Initial release. Closes: #nnnn
+    <nnnn is the bug number of your ITP>
+
+ -- Jannis M. Hoffmann <jannis@fehcom.de>  Mon, 30 Sep 2024 18:58:44 +0200
diff --git a/fehqlibs-deb/debian/contrib/qlibs.pc b/fehqlibs-deb/debian/contrib/qlibs.pc
new file mode 100644
index 0000000..9fd063a
--- /dev/null
+++ b/fehqlibs-deb/debian/contrib/qlibs.pc
@@ -0,0 +1,9 @@
+prefix=/usr
+includedir=${prefix}/include
+
+Name: qlibs
+Description: qlibs is the foundation of `feh' software
+URL: https://www.fehcom.de/ipnet/qlibs.html
+Version: 25a
+Cflags: -I${includedir}/qlibs
+Libs: -lqlibs -ldnsresolv
diff --git a/fehqlibs-deb/debian/control b/fehqlibs-deb/debian/control
new file mode 100644
index 0000000..5096f7a
--- /dev/null
+++ b/fehqlibs-deb/debian/control
@@ -0,0 +1,20 @@
+Source: fehqlibs
+Section: libs
+Priority: optional
+Maintainer: Jannis M. Hoffmann <jannis@fehcom.de>
+Build-Depends: debhelper-compat (= 13), dh-exec
+Standards-Version: 4.5.1
+Homepage: https://www.fehcom.de/ipnet/qlibs.html
+Rules-Requires-Root: no
+#Vcs-Git: https://salsa.debian.org/debian/fehqlibs.git
+#Vcs-Browser: https://salsa.debian.org/debian/fehqlibs
+
+Package: libqlibs
+Section: libs
+Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}, pkgconf
+Description: auto-generated package by debmake
+ This Debian binary package was auto-generated by the
+ debmake(1) command provided by the debmake package.
diff --git a/fehqlibs-deb/debian/copyright b/fehqlibs-deb/debian/copyright
new file mode 100644
index 0000000..c3b6534
--- /dev/null
+++ b/fehqlibs-deb/debian/copyright
@@ -0,0 +1,228 @@
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: fehqlibs
+Upstream-Contact: <preferred name and address to reach the upstream project>
+Source: <url://example.com>
+#
+# Please double check copyright with the licensecheck(1) command.
+
+Files:     BUILD
+           CHANGELOG
+           CONTENT.md
+           FILES
+           INSTALL.md
+           README.md
+           TARGETS
+           VERSION
+           compile
+           conf-build
+           configure
+           include/alloc.h
+           include/base64.h
+           include/buffer.h
+           include/byte.h
+           include/case.h
+           include/cdbmake.h
+           include/cdbread.h
+           include/close.h
+           include/constmap.h
+           include/direntry.h
+           include/dnsresolv.h
+           include/env.h
+           include/error.h
+           include/exit.h
+           include/fd.h
+           include/fifo.h
+           include/fmt.h
+           include/genalloc.h
+           include/getln.h
+           include/getoptb.h
+           include/iopause.h
+           include/ip.h
+           include/lock.h
+           include/logmsg.h
+           include/ndelay.h
+           include/open.h
+           include/pathexec.h
+           include/prot.h
+           include/readclose.h
+           include/readwrite.h
+           include/rename.h
+           include/scan.h
+           include/seek.h
+           include/select.h
+           include/sig.h
+           include/socket_if.h
+           include/str.h
+           include/stralloc.h
+           include/tai.h
+           include/taia.h
+           include/timeout.h
+           include/timeoutconn.h
+           include/uint_t.h
+           include/wait.h
+           install
+           makelib
+           man/INSTALL
+           man/alloc.3
+           man/buffer.3
+           man/byte.3
+           man/case.3
+           man/cdbmake.3
+           man/cdbread.3
+           man/constmap.3
+           man/dns.3
+           man/dnsstub.3
+           man/env.3
+           man/error.3
+           man/fd.3
+           man/fmt.3
+           man/getln.3
+           man/getoptb.3
+           man/iopause.3
+           man/ip4.3
+           man/ip6.3
+           man/logmsg.3
+           man/pathexec.3
+           man/scan.3
+           man/socket_bind.3
+           man/socket_connect.3
+           man/socket_if.3
+           man/socket_info.3
+           man/socket_recv.3
+           man/socket_send.3
+           man/socket_setup.3
+           man/socket_tcp.3
+           man/socket_udp.3
+           man/str.3
+           man/stralloc.3
+           man/taia.3
+           man/timeout.3
+           man/timeoutconn.3
+           man/wait.3
+           sharedlib
+           src/Makefile
+           src/TARGETS
+           src/alloc.c
+           src/base64.c
+           src/buffer.c
+           src/byte.c
+           src/case.c
+           src/cdbmake.c
+           src/cdbread.c
+           src/constmap.c
+           src/dnsstub/Makefile
+           src/dnsstub/README.md
+           src/dnsstub/TARGETS
+           src/dnsstub/dns_cname.c
+           src/dnsstub/dns_dfd.c
+           src/dnsstub/dns_domain.c
+           src/dnsstub/dns_dtda.c
+           src/dnsstub/dns_ip.c
+           src/dnsstub/dns_ipq.c
+           src/dnsstub/dns_mx.c
+           src/dnsstub/dns_name.c
+           src/dnsstub/dns_nd.c
+           src/dnsstub/dns_packet.c
+           src/dnsstub/dns_random.c
+           src/dnsstub/dns_rcip.c
+           src/dnsstub/dns_rcrw.c
+           src/dnsstub/dns_resolve.c
+           src/dnsstub/dns_sortip.c
+           src/dnsstub/dns_transmit.c
+           src/dnsstub/dns_txt.c
+           src/env.c
+           src/errstr.c
+           src/fd.c
+           src/fmt.c
+           src/getln.c
+           src/getoptb.c
+           src/iopause.c
+           src/ip4.c
+           src/ip6.c
+           src/lock.c
+           src/logmsg.c
+           src/ndelay.c
+           src/open.c
+           src/pathexec.c
+           src/prot.c
+           src/readclose.c
+           src/scan.c
+           src/seek.c
+           src/sharedlib
+           src/sig.c
+           src/socket_bind.c
+           src/socket_connect.c
+           src/socket_if.c
+           src/socket_info.c
+           src/socket_recv.c
+           src/socket_send.c
+           src/socket_setup.c
+           src/socket_tcp.c
+           src/socket_udp.c
+           src/str.c
+           src/stralloc.c
+           src/tai.c
+           src/taia.c
+           src/timeout.c
+           src/timeoutconn.c
+           src/uint128p.c
+           src/uint16p.c
+           src/uint32p.c
+           src/uint64p.c
+           src/uint8p.c
+           src/wait.c
+Copyright: __NO_COPYRIGHT_NOR_LICENSE__
+License:   __NO_COPYRIGHT_NOR_LICENSE__
+
+#----------------------------------------------------------------------------
+# xml and html files (skipped):
+#         man/x.html
+
+#----------------------------------------------------------------------------
+# Files marked as NO_LICENSE_TEXT_FOUND may be covered by the following
+# license/copyright files.
+
+#----------------------------------------------------------------------------
+# License file: LICENSE
+ AUTHOR
+ ======
+ .
+ Author:
+ 	Dr. Erwin Hoffmann - FEHCom Germany
+ Web-Site:
+ 	https://www.fehcom.de
+ E-Mail:
+ 	feh@fehcom.de
+ .
+ .
+ LICENSE
+ =======
+ .
+ fehQlibs is free software placed into the Public Domain.
+ fehQlibs is based on D.J. Bernstein's 'qmail' and 'ucspi-tcp' also put in the Public Domain.
+ .
+ This includes:
+ 	You can download and use fehQlibs (and parts of it) as you like.
+ 	You can modify the source code without notification to or permission by the author.
+ Please check:
+ 	http://www.cr.yp.to/softwarelaw.html
+ Note:
+ 	fehQlibs may use/may depend on third party software with different
+ 	license and/or distribution conditions.
+ .
+ .
+ FITNESS
+ =======
+ .
+ The Author does not guarantee a specific fitness of fehQlibs.
+ If you use fehQlibs, it's on your own risk.
+ .
+ .
+ DISTRIBUTION
+ ============
+ .
+ fehQlibs may be included in ports and packages under the following conditions:
+ .
+ 	- The files VERSION and BUILD has to be part of the distribution.
+ 	- This LICENSE file has to be included in the distribution.
+ .
diff --git a/fehqlibs-deb/debian/install b/fehqlibs-deb/debian/install
new file mode 100755
index 0000000..e887a96
--- /dev/null
+++ b/fehqlibs-deb/debian/install
@@ -0,0 +1,48 @@
+#!/usr/bin/dh-exec
+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/
+include/alloc.h usr/include/qlibs/
+include/base64.h usr/include/qlibs/
+include/buffer.h usr/include/qlibs/
+include/byte.h usr/include/qlibs/
+include/case.h usr/include/qlibs/
+include/cdbmake.h usr/include/qlibs/
+include/cdbread.h usr/include/qlibs/
+include/close.h usr/include/qlibs/
+include/constmap.h usr/include/qlibs/
+include/direntry.h usr/include/qlibs/
+include/dnsresolv.h usr/include/qlibs/
+include/env.h usr/include/qlibs/
+include/error.h usr/include/qlibs/
+include/exit.h usr/include/qlibs/
+include/fd.h usr/include/qlibs/
+include/fifo.h usr/include/qlibs/
+include/fmt.h usr/include/qlibs/
+include/genalloc.h usr/include/qlibs/
+include/getln.h usr/include/qlibs/
+include/getoptb.h usr/include/qlibs/
+include/iopause.h usr/include/qlibs/
+include/ip.h usr/include/qlibs/
+include/lock.h usr/include/qlibs/
+include/logmsg.h usr/include/qlibs/
+include/ndelay.h usr/include/qlibs/
+include/open.h usr/include/qlibs/
+include/pathexec.h usr/include/qlibs/
+include/prot.h usr/include/qlibs/
+include/readclose.h usr/include/qlibs/
+include/readwrite.h usr/include/qlibs/
+include/rename.h usr/include/qlibs/
+include/scan.h usr/include/qlibs/
+include/seek.h usr/include/qlibs/
+include/select.h usr/include/qlibs/
+include/sig.h usr/include/qlibs/
+include/socket_if.h usr/include/qlibs/
+include/str.h usr/include/qlibs/
+include/stralloc.h usr/include/qlibs/
+include/tai.h usr/include/qlibs/
+include/taia.h usr/include/qlibs/
+include/timeout.h usr/include/qlibs/
+include/timeoutconn.h usr/include/qlibs/
+include/uint_t.h usr/include/qlibs/
+include/wait.h usr/include/qlibs/
diff --git a/fehqlibs-deb/debian/manpages b/fehqlibs-deb/debian/manpages
new file mode 100755
index 0000000..6a8c8b3
--- /dev/null
+++ b/fehqlibs-deb/debian/manpages
@@ -0,0 +1,37 @@
+#!/usr/bin/dh-exec
+man/error.3 => man/error-qlibs.3
+man/alloc.3
+man/buffer.3
+man/byte.3
+man/case.3
+man/cdbmake.3
+man/cdbread.3
+man/constmap.3
+man/dns.3
+man/dnsstub.3
+man/env.3
+man/fd.3
+man/fmt.3
+man/getln.3
+man/getoptb.3
+man/iopause.3
+man/ip4.3
+man/ip6.3
+man/logmsg.3
+man/pathexec.3
+man/scan.3
+man/socket_bind.3
+man/socket_connect.3
+man/socket_if.3
+man/socket_info.3
+man/socket_recv.3
+man/socket_send.3
+man/socket_setup.3
+man/socket_tcp.3
+man/socket_udp.3
+man/str.3
+man/stralloc.3
+man/taia.3
+man/timeout.3
+man/timeoutconn.3
+man/wait.3
diff --git a/fehqlibs-deb/debian/patches/series b/fehqlibs-deb/debian/patches/series
new file mode 100644
index 0000000..4a97dfa
--- /dev/null
+++ b/fehqlibs-deb/debian/patches/series
@@ -0,0 +1 @@
+# You must remove unused comment lines for the released package.
diff --git a/fehqlibs-deb/debian/rules b/fehqlibs-deb/debian/rules
new file mode 100755
index 0000000..de332cf
--- /dev/null
+++ b/fehqlibs-deb/debian/rules
@@ -0,0 +1,22 @@
+#!/usr/bin/make -f
+export DH_VERBOSE = 1
+
+UPSTREAM_VERSION := $(shell dpkg-parsechangelog --show-field Version | cut -d- -f1)
+
+get-orig-source:
+	uscan --download-current-version
+
+%:
+	dh $@ --buildsystem=none
+
+override_dh_auto_clean:
+	-tar -xf ../fehqlibs_$(UPSTREAM_VERSION).orig.tar.gz --strip-components=1
+	$(MAKE) -C src clean
+	sed -i '31,$$d' conf-build
+
+override_dh_auto_configure:
+	echo CFLAGS=\"-Iinclude $(CFLAGS)\" >>conf-build
+	$(MAKE) -C src check
+
+override_dh_auto_build:
+	LDFLAGS= $(MAKE) -C src default
diff --git a/fehqlibs-deb/debian/watch b/fehqlibs-deb/debian/watch
new file mode 100644
index 0000000..1f126ea
--- /dev/null
+++ b/fehqlibs-deb/debian/watch
@@ -0,0 +1,3 @@
+# You must remove unused comment lines for the released package.
+version=4
+https://www.fehcom.de/ipnet/fehQlibs/fehQlibs-(\d+[a-z]?).tgz