use repackaging for ucspi-tcp6

8 files changed, 141 insertions, 170 deletions

diff --git a/ucspi-tcp6-deb/debian/clean b/ucspi-tcp6-deb/debian/clean
index 81a4356..d589249 100755..100644
--- a/ucspi-tcp6-deb/debian/clean
+++ b/ucspi-tcp6-deb/debian/clean
@@ -1,13 +1,16 @@
-#!/usr/bin/dh-exec
-ucspi-tcp6/ucspi-tcp6-${UPSTREAM_VERSION}/src/ip4_bit.o
-ucspi-tcp6/ucspi-tcp6-${UPSTREAM_VERSION}/src/ip6_bit.o
-ucspi-tcp6/ucspi-tcp6-${UPSTREAM_VERSION}/src/remoteinfo.o
-ucspi-tcp6/ucspi-tcp6-${UPSTREAM_VERSION}/src/rules.o
-ucspi-tcp6/ucspi-tcp6-${UPSTREAM_VERSION}/src/argv0
-ucspi-tcp6/ucspi-tcp6-${UPSTREAM_VERSION}/src/argv0.o
-ucspi-tcp6/ucspi-tcp6-${UPSTREAM_VERSION}/src/commands.o
-ucspi-tcp6/ucspi-tcp6-${UPSTREAM_VERSION}/src/rblsmtpd
-ucspi-tcp6/ucspi-tcp6-${UPSTREAM_VERSION}/src/rblsmtpd.o
-ucspi-tcp6/ucspi-tcp6-${UPSTREAM_VERSION}/src/date@
-ucspi-tcp6/ucspi-tcp6-${UPSTREAM_VERSION}/src/finger@
-ucspi-tcp6/ucspi-tcp6-${UPSTREAM_VERSION}/src/http@
+src/ip4_bit.o
+src/ip6_bit.o
+src/remoteinfo.o
+src/rules.o
+src/argv0
+src/argv0.o
+src/commands.o
+src/rblsmtpd
+src/rblsmtpd.o
+src/date@
+src/finger@
+src/http@
+src/hassgact.h
+src/hasshsgr.h
+src/sysdeps
+src/systype
diff --git a/ucspi-tcp6-deb/debian/copyright b/ucspi-tcp6-deb/debian/copyright
index 2c385fc..889a153 100644
--- a/ucspi-tcp6-deb/debian/copyright
+++ b/ucspi-tcp6-deb/debian/copyright
@@ -5,110 +5,90 @@ Source: <url://example.com>
 #
 # Please double check copyright with the licensecheck(1) command.
 
-Files:     ucspi-tcp6/ucspi-tcp6-1.13.00/INSTALL.md
-           ucspi-tcp6/ucspi-tcp6-1.13.00/README.md
-           ucspi-tcp6/ucspi-tcp6-1.13.00/conf-cc
-           ucspi-tcp6/ucspi-tcp6-1.13.00/conf-home
-           ucspi-tcp6/ucspi-tcp6-1.13.00/conf-ld
-           ucspi-tcp6/ucspi-tcp6-1.13.00/conf-man
-           ucspi-tcp6/ucspi-tcp6-1.13.00/conf-qlibs
-           ucspi-tcp6/ucspi-tcp6-1.13.00/doc/CHANGELOG
-           ucspi-tcp6/ucspi-tcp6-1.13.00/doc/README_RTS.md
-           ucspi-tcp6/ucspi-tcp6-1.13.00/doc/TODO
-           ucspi-tcp6/ucspi-tcp6-1.13.00/man/Makefile
-           ucspi-tcp6/ucspi-tcp6-1.13.00/man/Makefile.mandoc
-           ucspi-tcp6/ucspi-tcp6-1.13.00/man/TARGETS
-           ucspi-tcp6/ucspi-tcp6-1.13.00/man/addcr.1
-           ucspi-tcp6/ucspi-tcp6-1.13.00/man/argv0.1
-           ucspi-tcp6/ucspi-tcp6-1.13.00/man/date@.1
-           ucspi-tcp6/ucspi-tcp6-1.13.00/man/delcr.1
-           ucspi-tcp6/ucspi-tcp6-1.13.00/man/finger@.1
-           ucspi-tcp6/ucspi-tcp6-1.13.00/man/fixcrio.1
-           ucspi-tcp6/ucspi-tcp6-1.13.00/man/http@.1
-           ucspi-tcp6/ucspi-tcp6-1.13.00/man/mconnect.1
-           ucspi-tcp6/ucspi-tcp6-1.13.00/man/rblsmtpd.1
-           ucspi-tcp6/ucspi-tcp6-1.13.00/man/recordio.1
-           ucspi-tcp6/ucspi-tcp6-1.13.00/man/tcp-environ.5
-           ucspi-tcp6/ucspi-tcp6-1.13.00/man/tcpcat.1
-           ucspi-tcp6/ucspi-tcp6-1.13.00/man/tcpclient.1
-           ucspi-tcp6/ucspi-tcp6-1.13.00/man/tcprules.1
-           ucspi-tcp6/ucspi-tcp6-1.13.00/man/tcprulescheck.1
-           ucspi-tcp6/ucspi-tcp6-1.13.00/man/tcpserver.1
-           ucspi-tcp6/ucspi-tcp6-1.13.00/man/who@.1
-           ucspi-tcp6/ucspi-tcp6-1.13.00/package/build
-           ucspi-tcp6/ucspi-tcp6-1.13.00/package/command-cp
-           ucspi-tcp6/ucspi-tcp6-1.13.00/package/command-ln
-           ucspi-tcp6/ucspi-tcp6-1.13.00/package/commands-base
-           ucspi-tcp6/ucspi-tcp6-1.13.00/package/compile
-           ucspi-tcp6/ucspi-tcp6-1.13.00/package/files
-           ucspi-tcp6/ucspi-tcp6-1.13.00/package/install
-           ucspi-tcp6/ucspi-tcp6-1.13.00/package/man
-           ucspi-tcp6/ucspi-tcp6-1.13.00/package/path
-           ucspi-tcp6/ucspi-tcp6-1.13.00/package/report
-           ucspi-tcp6/ucspi-tcp6-1.13.00/package/rts
-           ucspi-tcp6/ucspi-tcp6-1.13.00/package/run
-           ucspi-tcp6/ucspi-tcp6-1.13.00/package/upgrade
-           ucspi-tcp6/ucspi-tcp6-1.13.00/package/version
-           ucspi-tcp6/ucspi-tcp6-1.13.00/src/Makefile
-           ucspi-tcp6/ucspi-tcp6-1.13.00/src/TARGETS
-           ucspi-tcp6/ucspi-tcp6-1.13.00/src/addcr.c
-           ucspi-tcp6/ucspi-tcp6-1.13.00/src/argv0.c
-           ucspi-tcp6/ucspi-tcp6-1.13.00/src/auto-str.c
-           ucspi-tcp6/ucspi-tcp6-1.13.00/src/auto_home.h
-           ucspi-tcp6/ucspi-tcp6-1.13.00/src/chkshsgr.c
-           ucspi-tcp6/ucspi-tcp6-1.13.00/src/choose.sh
-           ucspi-tcp6/ucspi-tcp6-1.13.00/src/commands.c
-           ucspi-tcp6/ucspi-tcp6-1.13.00/src/commands.h
-           ucspi-tcp6/ucspi-tcp6-1.13.00/src/date@.sh
-           ucspi-tcp6/ucspi-tcp6-1.13.00/src/delcr.c
-           ucspi-tcp6/ucspi-tcp6-1.13.00/src/exp.base
-           ucspi-tcp6/ucspi-tcp6-1.13.00/src/exp.it
-           ucspi-tcp6/ucspi-tcp6-1.13.00/src/find-systype.sh
-           ucspi-tcp6/ucspi-tcp6-1.13.00/src/finger@.sh
-           ucspi-tcp6/ucspi-tcp6-1.13.00/src/fixcrio.c
-           ucspi-tcp6/ucspi-tcp6-1.13.00/src/fork.h1
-           ucspi-tcp6/ucspi-tcp6-1.13.00/src/fork.h2
-           ucspi-tcp6/ucspi-tcp6-1.13.00/src/hassgact.h1
-           ucspi-tcp6/ucspi-tcp6-1.13.00/src/hassgact.h2
-           ucspi-tcp6/ucspi-tcp6-1.13.00/src/hassgprm.h1
-           ucspi-tcp6/ucspi-tcp6-1.13.00/src/hassgprm.h2
-           ucspi-tcp6/ucspi-tcp6-1.13.00/src/hasshsgr.h1
-           ucspi-tcp6/ucspi-tcp6-1.13.00/src/hasshsgr.h2
-           ucspi-tcp6/ucspi-tcp6-1.13.00/src/http@.sh
-           ucspi-tcp6/ucspi-tcp6-1.13.00/src/ip4_bit.c
-           ucspi-tcp6/ucspi-tcp6-1.13.00/src/ip6_bit.c
-           ucspi-tcp6/ucspi-tcp6-1.13.00/src/ip_bit.h
-           ucspi-tcp6/ucspi-tcp6-1.13.00/src/it-base=d
-           ucspi-tcp6/ucspi-tcp6-1.13.00/src/it=d
-           ucspi-tcp6/ucspi-tcp6-1.13.00/src/mconnect-io.c
-           ucspi-tcp6/ucspi-tcp6-1.13.00/src/mconnect.sh
-           ucspi-tcp6/ucspi-tcp6-1.13.00/src/rblsmtpd.c
-           ucspi-tcp6/ucspi-tcp6-1.13.00/src/recordio.c
-           ucspi-tcp6/ucspi-tcp6-1.13.00/src/remoteinfo.c
-           ucspi-tcp6/ucspi-tcp6-1.13.00/src/remoteinfo.h
-           ucspi-tcp6/ucspi-tcp6-1.13.00/src/rts.base
-           ucspi-tcp6/ucspi-tcp6-1.13.00/src/rts.it
-           ucspi-tcp6/ucspi-tcp6-1.13.00/src/rules.c
-           ucspi-tcp6/ucspi-tcp6-1.13.00/src/rules.h
-           ucspi-tcp6/ucspi-tcp6-1.13.00/src/tcpcat.sh
-           ucspi-tcp6/ucspi-tcp6-1.13.00/src/tcpclient.c
-           ucspi-tcp6/ucspi-tcp6-1.13.00/src/tcprules.c
-           ucspi-tcp6/ucspi-tcp6-1.13.00/src/tcprulescheck.c
-           ucspi-tcp6/ucspi-tcp6-1.13.00/src/tcpserver.c
-           ucspi-tcp6/ucspi-tcp6-1.13.00/src/trycpp.c
-           ucspi-tcp6/ucspi-tcp6-1.13.00/src/trylsock.c
-           ucspi-tcp6/ucspi-tcp6-1.13.00/src/trysgact.c
-           ucspi-tcp6/ucspi-tcp6-1.13.00/src/trysgprm.c
-           ucspi-tcp6/ucspi-tcp6-1.13.00/src/tryshsgr.c
-           ucspi-tcp6/ucspi-tcp6-1.13.00/src/tryvfork.c
-           ucspi-tcp6/ucspi-tcp6-1.13.00/src/warn-auto.sh
-           ucspi-tcp6/ucspi-tcp6-1.13.00/src/warn-shsgr
-           ucspi-tcp6/ucspi-tcp6-1.13.00/src/who@.sh
-           ucspi-tcp6/ucspi-tcp6-1.13.00/src/x86cpuid.c
+Files:     README.md
+           doc/CHANGELOG
+           doc/README_RTS.md
+           doc/TODO
+           man/Makefile
+           man/Makefile.mandoc
+           man/TARGETS
+           man/addcr.1
+           man/argv0.1
+           man/date@.1
+           man/delcr.1
+           man/finger@.1
+           man/fixcrio.1
+           man/http@.1
+           man/mconnect.1
+           man/rblsmtpd.1
+           man/recordio.1
+           man/tcp-environ.5
+           man/tcpcat.1
+           man/tcpclient.1
+           man/tcprules.1
+           man/tcprulescheck.1
+           man/tcpserver.1
+           man/who@.1
+           src/Makefile
+           src/TARGETS
+           src/addcr.c
+           src/argv0.c
+           src/auto-str.c
+           src/auto_home.h
+           src/chkshsgr.c
+           src/choose.sh
+           src/commands.c
+           src/commands.h
+           src/date@.sh
+           src/delcr.c
+           src/exp.base
+           src/exp.it
+           src/find-systype.sh
+           src/finger@.sh
+           src/fixcrio.c
+           src/fork.h1
+           src/fork.h2
+           src/hassgact.h1
+           src/hassgact.h2
+           src/hassgprm.h1
+           src/hassgprm.h2
+           src/hasshsgr.h1
+           src/hasshsgr.h2
+           src/http@.sh
+           src/ip4_bit.c
+           src/ip6_bit.c
+           src/ip_bit.h
+           src/it-base=d
+           src/it=d
+           src/mconnect-io.c
+           src/mconnect.sh
+           src/rblsmtpd.c
+           src/recordio.c
+           src/remoteinfo.c
+           src/remoteinfo.h
+           src/rts.base
+           src/rts.it
+           src/rules.c
+           src/rules.h
+           src/tcpcat.sh
+           src/tcpclient.c
+           src/tcprules.c
+           src/tcprulescheck.c
+           src/tcpserver.c
+           src/trycpp.c
+           src/trylsock.c
+           src/trysgact.c
+           src/trysgprm.c
+           src/tryshsgr.c
+           src/tryvfork.c
+           src/warn-auto.sh
+           src/warn-shsgr
+           src/who@.sh
+           src/x86cpuid.c
 Copyright: __NO_COPYRIGHT_NOR_LICENSE__
 License:   __NO_COPYRIGHT_NOR_LICENSE__
 
-Files:     ucspi-tcp6/ucspi-tcp6-1.13.00/doc/HISTORY
+Files:     doc/HISTORY
 Copyright: 2000 D. J. Bernstein ucspi-tcp home page: http://cr.yp.to/ucspi-tcp.html
 License:   __UNKNOWN__
  ucspi-tcp-0.88-man-20020317.tar.gz
diff --git a/ucspi-tcp6-deb/debian/install b/ucspi-tcp6-deb/debian/install
index 1b43657..63b79af 100755..100644
--- a/ucspi-tcp6-deb/debian/install
+++ b/ucspi-tcp6-deb/debian/install
@@ -1,20 +1,16 @@
-#!/usr/bin/dh-exec
-ucspi-tcp6/ucspi-tcp6-${UPSTREAM_VERSION}/src/addcr         usr/bin
-ucspi-tcp6/ucspi-tcp6-${UPSTREAM_VERSION}/src/argv0         usr/bin
-ucspi-tcp6/ucspi-tcp6-${UPSTREAM_VERSION}/src/date@         usr/bin
-ucspi-tcp6/ucspi-tcp6-${UPSTREAM_VERSION}/src/delcr         usr/bin
-ucspi-tcp6/ucspi-tcp6-${UPSTREAM_VERSION}/src/finger@       usr/bin
-ucspi-tcp6/ucspi-tcp6-${UPSTREAM_VERSION}/src/fixcrio       usr/bin
-ucspi-tcp6/ucspi-tcp6-${UPSTREAM_VERSION}/src/http@         usr/bin
-ucspi-tcp6/ucspi-tcp6-${UPSTREAM_VERSION}/src/mconnect      usr/bin
-ucspi-tcp6/ucspi-tcp6-${UPSTREAM_VERSION}/src/rblsmtpd      usr/bin
-ucspi-tcp6/ucspi-tcp6-${UPSTREAM_VERSION}/src/recordio      usr/bin
-ucspi-tcp6/ucspi-tcp6-${UPSTREAM_VERSION}/src/tcpcat        usr/bin
-ucspi-tcp6/ucspi-tcp6-${UPSTREAM_VERSION}/src/tcpclient     usr/bin
-ucspi-tcp6/ucspi-tcp6-${UPSTREAM_VERSION}/src/tcprules      usr/bin
-ucspi-tcp6/ucspi-tcp6-${UPSTREAM_VERSION}/src/tcprulescheck usr/bin
-ucspi-tcp6/ucspi-tcp6-${UPSTREAM_VERSION}/src/tcpserver     usr/bin
-ucspi-tcp6/ucspi-tcp6-${UPSTREAM_VERSION}/src/who@          usr/bin
-
-ucspi-tcp6/ucspi-tcp6-${UPSTREAM_VERSION}/man/*.1  usr/share/man/man1
-ucspi-tcp6/ucspi-tcp6-${UPSTREAM_VERSION}/man/*.5  usr/share/man/man5
+src/addcr         usr/bin
+src/argv0         usr/bin
+src/date@         usr/bin
+src/delcr         usr/bin
+src/finger@       usr/bin
+src/fixcrio       usr/bin
+src/http@         usr/bin
+src/mconnect      usr/bin
+src/rblsmtpd      usr/bin
+src/recordio      usr/bin
+src/tcpcat        usr/bin
+src/tcpclient     usr/bin
+src/tcprules      usr/bin
+src/tcprulescheck usr/bin
+src/tcpserver     usr/bin
+src/who@          usr/bin
diff --git a/ucspi-tcp6-deb/debian/manpages b/ucspi-tcp6-deb/debian/manpages
new file mode 100644
index 0000000..2e40bb0
--- /dev/null
+++ b/ucspi-tcp6-deb/debian/manpages
@@ -0,0 +1,2 @@
+man/*.1
+man/*.5
diff --git a/ucspi-tcp6-deb/debian/patches/000-conf.patch b/ucspi-tcp6-deb/debian/patches/000-conf.patch
deleted file mode 100644
index 17d86e7..0000000
--- a/ucspi-tcp6-deb/debian/patches/000-conf.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Author: Jannis M. Hoffmann
-Description: Adjust build configuration so that the `configure' step creates conf-XX files.
-
---- /dev/null
-+++ ucspi-tcp6-deb/ucspi-tcp6/ucspi-tcp6-1.13.00/src/home
-@@ -0,0 +0,1 @@
-+
-
---- ucspi-tcp6-deb/ucspi-tcp6/ucspi-tcp6-1.13.00/conf-cc
-+++ /dev/null
-@@ -0,3 +0,0 @@
--cc -O2 -g -Wall -I`head -1 ../conf-qlibs`/include 
--
--This will be used to compile .c files.
-
---- ucspi-tcp6-deb/ucspi-tcp6/ucspi-tcp6-1.13.00/conf-ld
-+++ /dev/null
-@@ -0,3 +0,0 @@
--cc -s -L`head -1 ../conf-qlibs`
--
--This will be used to link .o files into an executable.
diff --git a/ucspi-tcp6-deb/debian/rules b/ucspi-tcp6-deb/debian/rules
index 46f9a49..d5122ea 100755
--- a/ucspi-tcp6-deb/debian/rules
+++ b/ucspi-tcp6-deb/debian/rules
@@ -6,29 +6,30 @@ export DH_VERBOSE = 1
 #export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
 
 UPSTREAM_VERSION := $(shell dpkg-parsechangelog --show-field Version | cut -d- -f1)
-export UPSTREAM_VERSION
 
 get-orig-source:
-	uscan --download-current-version
+	uscan --download-current-version --no-symlink
+	tar -xf ../ucspi-tcp6-$(UPSTREAM_VERSION).tgz --strip-components=2
+	mv ucspi-tcp6-$(UPSTREAM_VERSION)/ ucspi-tcp6
+	rm ucspi-tcp6/conf-* ucspi-tcp6/INSTALL.md
+	rm -r ucspi-tcp6/package/
+	tar -czf ../ucspi-tcp6_$(UPSTREAM_VERSION).orig.tar.gz ucspi-tcp6
+	rm -r ucspi-tcp6/
 
 %:
 	dh $@ --buildsystem=none
 
 override_dh_auto_clean:
-	-tar -xf ../ucspi-tcp6_$(UPSTREAM_VERSION).orig.tar.gz --strip-components=1
-	rm -f ucspi-tcp6/ucspi-tcp6-$(UPSTREAM_VERSION)/conf-cc
-	rm -f ucspi-tcp6/ucspi-tcp6-$(UPSTREAM_VERSION)/conf-ld
-	rm -f ucspi-tcp6/ucspi-tcp6-$(UPSTREAM_VERSION)/src/hassgact.h
-	rm -f ucspi-tcp6/ucspi-tcp6-$(UPSTREAM_VERSION)/src/hasshsgr.h
-	rm -f ucspi-tcp6/ucspi-tcp6-$(UPSTREAM_VERSION)/src/sysdeps
-	rm -f ucspi-tcp6/ucspi-tcp6-$(UPSTREAM_VERSION)/src/systype
-	$(MAKE) -C ucspi-tcp6/ucspi-tcp6-$(UPSTREAM_VERSION)/src clean
-	rm -f ucspi-tcp6/ucspi-tcp6-$(UPSTREAM_VERSION)/src/home
+	-tar -xkf ../ucspi-tcp6_$(UPSTREAM_VERSION).orig.tar.gz --strip-components=1
+	rm -f conf-cc
+	rm -f conf-ld
+	rm -f src/home
+	$(MAKE) -C src clean
 
 override_dh_auto_configure:
-	echo "$(CC) -Iinclude `pkg-config -cflags qlibs` $(CFLAGS)" >ucspi-tcp6/ucspi-tcp6-$(UPSTREAM_VERSION)/conf-cc
-	echo $(CC) >ucspi-tcp6/ucspi-tcp6-$(UPSTREAM_VERSION)/conf-ld
-	touch ucspi-tcp6/ucspi-tcp6-$(UPSTREAM_VERSION)/src/home
+	echo "$(CC) -Iinclude `pkg-config -cflags qlibs` $(CFLAGS)" >conf-cc
+	echo $(CC) >conf-ld
+	touch src/home
 
 override_dh_auto_build:
-	$(MAKE) -C ucspi-tcp6/ucspi-tcp6-$(UPSTREAM_VERSION)/src default
+	$(MAKE) -C src default
diff --git a/ucspi-tcp6-deb/debian/source/format b/ucspi-tcp6-deb/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/ucspi-tcp6-deb/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/ucspi-tcp6-deb/debian/upstream/metadata b/ucspi-tcp6-deb/debian/upstream/metadata
new file mode 100644
index 0000000..eaa7bd5
--- /dev/null
+++ b/ucspi-tcp6-deb/debian/upstream/metadata
@@ -0,0 +1,9 @@
+#
+# DEP-12: Per-package machine-readable metadata about Upstream
+#        Please check * https://dep-team.pages.debian.net/deps/dep12/
+#                     * https://wiki.debian.org/UpstreamMetadata
+Reference:
+  Author: Erwin Hoffmann
+  Title: ucspi-tcp6
+  Year: 2024
+  URL: https://www.fehcom.de/ipnet/ucspi-tcp6.html