use repackaging for ucspi-ssl

7 files changed, 183 insertions, 181 deletions

diff --git a/ucspi-ssl-deb/debian/clean b/ucspi-ssl-deb/debian/clean
index 4971849..8efb517 100644
--- a/ucspi-ssl-deb/debian/clean
+++ b/ucspi-ssl-deb/debian/clean
@@ -1,6 +1,6 @@
 # You must remove unused comment lines for the released package.
-superscript.com/net/ucspi-ssl-0.13.01/src/ip4_bit.o
-superscript.com/net/ucspi-ssl-0.13.01/src/ip6_bit.o
-superscript.com/net/ucspi-ssl-0.13.01/src/hassgact.h
-superscript.com/net/ucspi-ssl-0.13.01/src/hassgprm.h
-superscript.com/net/ucspi-ssl-0.13.01/sslhandle
+src/ip4_bit.o
+src/ip6_bit.o
+src/hassgact.h
+src/hassgprm.h
+sslhandle
diff --git a/ucspi-ssl-deb/debian/control b/ucspi-ssl-deb/debian/control
index ec65868..e979d84 100644
--- a/ucspi-ssl-deb/debian/control
+++ b/ucspi-ssl-deb/debian/control
@@ -2,7 +2,7 @@ Source: ucspi-ssl
 Section: net
 Priority: optional
 Maintainer: Jannis M. Hoffmann <jannis@fehcom.de>
-Build-Depends: debhelper-compat (= 13), dh-exec, libqlibs, ucspi-tcp6, libssl-dev, libperl-dev
+Build-Depends: debhelper-compat (= 13), dh-exec, pkg-config, libqlibs, ucspi-tcp6, libssl-dev, libperl-dev
 Standards-Version: 4.5.1
 Homepage: https://www.fehcom.de/ipnet/ucspi-ssl.html
 Rules-Requires-Root: no
diff --git a/ucspi-ssl-deb/debian/copyright b/ucspi-ssl-deb/debian/copyright
index 0c32ecd..20bbd82 100644
--- a/ucspi-ssl-deb/debian/copyright
+++ b/ucspi-ssl-deb/debian/copyright
@@ -5,167 +5,166 @@ Source: <url://example.com>
 #
 # Please double check copyright with the licensecheck(1) command.
 
-Files:     superscript.com/net/ucspi-ssl-0.13.01/INSTALL.md
-           superscript.com/net/ucspi-ssl-0.13.01/README.md
-           superscript.com/net/ucspi-ssl-0.13.01/conf-cadir
-           superscript.com/net/ucspi-ssl-0.13.01/conf-cafile
-           superscript.com/net/ucspi-ssl-0.13.01/conf-cc
-           superscript.com/net/ucspi-ssl-0.13.01/conf-ccafile
-           superscript.com/net/ucspi-ssl-0.13.01/conf-ccperl
-           superscript.com/net/ucspi-ssl-0.13.01/conf-certchainfile
-           superscript.com/net/ucspi-ssl-0.13.01/conf-certfile
-           superscript.com/net/ucspi-ssl-0.13.01/conf-ciphers
-           superscript.com/net/ucspi-ssl-0.13.01/conf-dhfile
-           superscript.com/net/ucspi-ssl-0.13.01/conf-home
-           superscript.com/net/ucspi-ssl-0.13.01/conf-keyfile
-           superscript.com/net/ucspi-ssl-0.13.01/conf-ld
-           superscript.com/net/ucspi-ssl-0.13.01/conf-ldperl
-           superscript.com/net/ucspi-ssl-0.13.01/conf-man
-           superscript.com/net/ucspi-ssl-0.13.01/conf-perl
-           superscript.com/net/ucspi-ssl-0.13.01/conf-qlibs
-           superscript.com/net/ucspi-ssl-0.13.01/conf-rsa
-           superscript.com/net/ucspi-ssl-0.13.01/conf-ssl
-           superscript.com/net/ucspi-ssl-0.13.01/conf-ssllib
-           superscript.com/net/ucspi-ssl-0.13.01/doc/CHAIN-SSL
-           superscript.com/net/ucspi-ssl-0.13.01/doc/CHANGELOG
-           superscript.com/net/ucspi-ssl-0.13.01/doc/README_RTS.md
-           superscript.com/net/ucspi-ssl-0.13.01/doc/TLSVERSION_CIPHERSUITES
-           superscript.com/net/ucspi-ssl-0.13.01/doc/TLS_1_3
-           superscript.com/net/ucspi-ssl-0.13.01/doc/TODO
-           superscript.com/net/ucspi-ssl-0.13.01/etc/127.0.0.1.pw
-           superscript.com/net/ucspi-ssl-0.13.01/etc/127.0.0.1_cert.pem
-           superscript.com/net/ucspi-ssl-0.13.01/etc/127.0.0.1_key.pem
-           superscript.com/net/ucspi-ssl-0.13.01/etc/127.0.0.1_key.pem.plain
-           superscript.com/net/ucspi-ssl-0.13.01/etc/::1.pw
-           superscript.com/net/ucspi-ssl-0.13.01/etc/::1_cert.pem
-           superscript.com/net/ucspi-ssl-0.13.01/etc/::1_key.pem
-           superscript.com/net/ucspi-ssl-0.13.01/etc/::1_key.pem.plain
-           superscript.com/net/ucspi-ssl-0.13.01/etc/README_CERTS.md
-           superscript.com/net/ucspi-ssl-0.13.01/etc/chain4.pem
-           superscript.com/net/ucspi-ssl-0.13.01/etc/chain6.pem
-           superscript.com/net/ucspi-ssl-0.13.01/etc/dh2048.pem
-           superscript.com/net/ucspi-ssl-0.13.01/etc/localhost.pw
-           superscript.com/net/ucspi-ssl-0.13.01/etc/localhost_cert.pem
-           superscript.com/net/ucspi-ssl-0.13.01/etc/localhost_key.pem
-           superscript.com/net/ucspi-ssl-0.13.01/etc/localhost_key.pem.plain
-           superscript.com/net/ucspi-ssl-0.13.01/etc/rootCA_cert.pem
-           superscript.com/net/ucspi-ssl-0.13.01/man/Makefile
-           superscript.com/net/ucspi-ssl-0.13.01/man/Makefile.mandoc
-           superscript.com/net/ucspi-ssl-0.13.01/man/TARGETS
-           superscript.com/net/ucspi-ssl-0.13.01/man/https@.1
-           superscript.com/net/ucspi-ssl-0.13.01/man/sslcat.1
-           superscript.com/net/ucspi-ssl-0.13.01/man/sslclient.1
-           superscript.com/net/ucspi-ssl-0.13.01/man/sslconnect.1
-           superscript.com/net/ucspi-ssl-0.13.01/man/sslhandle.1
-           superscript.com/net/ucspi-ssl-0.13.01/man/sslserver.1
-           superscript.com/net/ucspi-ssl-0.13.01/man/ucspi-tls.2
-           superscript.com/net/ucspi-ssl-0.13.01/package/build
-           superscript.com/net/ucspi-ssl-0.13.01/package/command-cp
-           superscript.com/net/ucspi-ssl-0.13.01/package/command-ln
-           superscript.com/net/ucspi-ssl-0.13.01/package/commands-base
-           superscript.com/net/ucspi-ssl-0.13.01/package/commands-sslperl
-           superscript.com/net/ucspi-ssl-0.13.01/package/commands-sys
-           superscript.com/net/ucspi-ssl-0.13.01/package/compile
-           superscript.com/net/ucspi-ssl-0.13.01/package/files
-           superscript.com/net/ucspi-ssl-0.13.01/package/install
-           superscript.com/net/ucspi-ssl-0.13.01/package/man
-           superscript.com/net/ucspi-ssl-0.13.01/package/path
-           superscript.com/net/ucspi-ssl-0.13.01/package/report
-           superscript.com/net/ucspi-ssl-0.13.01/package/rts
-           superscript.com/net/ucspi-ssl-0.13.01/package/run
-           superscript.com/net/ucspi-ssl-0.13.01/package/upgrade
-           superscript.com/net/ucspi-ssl-0.13.01/package/version
-           superscript.com/net/ucspi-ssl-0.13.01/src/Makefile
-           superscript.com/net/ucspi-ssl-0.13.01/src/TARGETS
-           superscript.com/net/ucspi-ssl-0.13.01/src/auto-str.c
-           superscript.com/net/ucspi-ssl-0.13.01/src/auto_cadir.h
-           superscript.com/net/ucspi-ssl-0.13.01/src/auto_cafile.h
-           superscript.com/net/ucspi-ssl-0.13.01/src/auto_ccafile.h
-           superscript.com/net/ucspi-ssl-0.13.01/src/auto_certchainfile.h
-           superscript.com/net/ucspi-ssl-0.13.01/src/auto_certfile.h
-           superscript.com/net/ucspi-ssl-0.13.01/src/auto_ciphers.h
-           superscript.com/net/ucspi-ssl-0.13.01/src/auto_dhfile.h
-           superscript.com/net/ucspi-ssl-0.13.01/src/auto_keyfile.h
-           superscript.com/net/ucspi-ssl-0.13.01/src/chkshsgr.c
-           superscript.com/net/ucspi-ssl-0.13.01/src/choose.sh
-           superscript.com/net/ucspi-ssl-0.13.01/src/coe.c
-           superscript.com/net/ucspi-ssl-0.13.01/src/coe.h
-           superscript.com/net/ucspi-ssl-0.13.01/src/exit.h
-           superscript.com/net/ucspi-ssl-0.13.01/src/exp.base
-           superscript.com/net/ucspi-ssl-0.13.01/src/exp.it
-           superscript.com/net/ucspi-ssl-0.13.01/src/exp.sslperl
-           superscript.com/net/ucspi-ssl-0.13.01/src/find-systype.sh
-           superscript.com/net/ucspi-ssl-0.13.01/src/fork.h1
-           superscript.com/net/ucspi-ssl-0.13.01/src/fork.h2
-           superscript.com/net/ucspi-ssl-0.13.01/src/hassgact.h1
-           superscript.com/net/ucspi-ssl-0.13.01/src/hassgact.h2
-           superscript.com/net/ucspi-ssl-0.13.01/src/hassgprm.h1
-           superscript.com/net/ucspi-ssl-0.13.01/src/hassgprm.h2
-           superscript.com/net/ucspi-ssl-0.13.01/src/hasshsgr.h1
-           superscript.com/net/ucspi-ssl-0.13.01/src/hasshsgr.h2
-           superscript.com/net/ucspi-ssl-0.13.01/src/haswaitp.h1
-           superscript.com/net/ucspi-ssl-0.13.01/src/haswaitp.h2
-           superscript.com/net/ucspi-ssl-0.13.01/src/https@.sh
-           superscript.com/net/ucspi-ssl-0.13.01/src/ip4_bit.c
-           superscript.com/net/ucspi-ssl-0.13.01/src/ip6_bit.c
-           superscript.com/net/ucspi-ssl-0.13.01/src/ip_bit.h
-           superscript.com/net/ucspi-ssl-0.13.01/src/it-base=d
-           superscript.com/net/ucspi-ssl-0.13.01/src/it-sslperl=d
-           superscript.com/net/ucspi-ssl-0.13.01/src/it-sys=d
-           superscript.com/net/ucspi-ssl-0.13.01/src/it=d
-           superscript.com/net/ucspi-ssl-0.13.01/src/print-ar.sh
-           superscript.com/net/ucspi-ssl-0.13.01/src/print-cc.sh
-           superscript.com/net/ucspi-ssl-0.13.01/src/print-ccperl.sh
-           superscript.com/net/ucspi-ssl-0.13.01/src/print-dl.sh
-           superscript.com/net/ucspi-ssl-0.13.01/src/print-ld.sh
-           superscript.com/net/ucspi-ssl-0.13.01/src/print-ldperl.sh
-           superscript.com/net/ucspi-ssl-0.13.01/src/print-perlembed.sh
-           superscript.com/net/ucspi-ssl-0.13.01/src/remoteinfo.c
-           superscript.com/net/ucspi-ssl-0.13.01/src/remoteinfo.h
-           superscript.com/net/ucspi-ssl-0.13.01/src/rts.base
-           superscript.com/net/ucspi-ssl-0.13.01/src/rts.it
-           superscript.com/net/ucspi-ssl-0.13.01/src/rts.sslperl
-           superscript.com/net/ucspi-ssl-0.13.01/src/rules.c
-           superscript.com/net/ucspi-ssl-0.13.01/src/rules.h
-           superscript.com/net/ucspi-ssl-0.13.01/src/select.h1
-           superscript.com/net/ucspi-ssl-0.13.01/src/select.h2
-           superscript.com/net/ucspi-ssl-0.13.01/src/ssl_ca.c
-           superscript.com/net/ucspi-ssl-0.13.01/src/ssl_cca.c
-           superscript.com/net/ucspi-ssl-0.13.01/src/ssl_certkey.c
-           superscript.com/net/ucspi-ssl-0.13.01/src/ssl_chainfile.c
-           superscript.com/net/ucspi-ssl-0.13.01/src/ssl_ciphers.c
-           superscript.com/net/ucspi-ssl-0.13.01/src/ssl_context.c
-           superscript.com/net/ucspi-ssl-0.13.01/src/ssl_env.c
-           superscript.com/net/ucspi-ssl-0.13.01/src/ssl_error.c
-           superscript.com/net/ucspi-ssl-0.13.01/src/ssl_io.c
-           superscript.com/net/ucspi-ssl-0.13.01/src/ssl_new.c
-           superscript.com/net/ucspi-ssl-0.13.01/src/ssl_params.c
-           superscript.com/net/ucspi-ssl-0.13.01/src/ssl_timeout.c
-           superscript.com/net/ucspi-ssl-0.13.01/src/ssl_verify.c
-           superscript.com/net/ucspi-ssl-0.13.01/src/sslcat.sh
-           superscript.com/net/ucspi-ssl-0.13.01/src/sslclient.c
-           superscript.com/net/ucspi-ssl-0.13.01/src/sslconnect.sh
-           superscript.com/net/ucspi-ssl-0.13.01/src/sslhandle.c
-           superscript.com/net/ucspi-ssl-0.13.01/src/sslperl.c
-           superscript.com/net/ucspi-ssl-0.13.01/src/sslprint.c
-           superscript.com/net/ucspi-ssl-0.13.01/src/sslserver.c
-           superscript.com/net/ucspi-ssl-0.13.01/src/trycpp.c
-           superscript.com/net/ucspi-ssl-0.13.01/src/trylsock.c
-           superscript.com/net/ucspi-ssl-0.13.01/src/trysgact.c
-           superscript.com/net/ucspi-ssl-0.13.01/src/trysgprm.c
-           superscript.com/net/ucspi-ssl-0.13.01/src/tryshsgr.c
-           superscript.com/net/ucspi-ssl-0.13.01/src/tryssl.c
-           superscript.com/net/ucspi-ssl-0.13.01/src/trysysel.c
-           superscript.com/net/ucspi-ssl-0.13.01/src/tryvfork.c
-           superscript.com/net/ucspi-ssl-0.13.01/src/ucspissl.c
-           superscript.com/net/ucspi-ssl-0.13.01/src/ucspissl.h
-           superscript.com/net/ucspi-ssl-0.13.01/src/warn-auto.sh
-           superscript.com/net/ucspi-ssl-0.13.01/src/warn-shsgr
-           superscript.com/net/ucspi-ssl-0.13.01/src/x86cpuid.c
+Files:     INSTALL.md
+           README.md
+           conf-cadir
+           conf-cafile
+           conf-ccafile
+           conf-ccperl
+           conf-certchainfile
+           conf-certfile
+           conf-ciphers
+           conf-dhfile
+           conf-home
+           conf-keyfile
+           conf-ld
+           conf-ldperl
+           conf-man
+           conf-perl
+           conf-qlibs
+           conf-rsa
+           conf-ssl
+           conf-ssllib
+           doc/CHAIN-SSL
+           doc/CHANGELOG
+           doc/README_RTS.md
+           doc/TLSVERSION_CIPHERSUITES
+           doc/TLS_1_3
+           doc/TODO
+           etc/127.0.0.1.pw
+           etc/127.0.0.1_cert.pem
+           etc/127.0.0.1_key.pem
+           etc/127.0.0.1_key.pem.plain
+           etc/::1.pw
+           etc/::1_cert.pem
+           etc/::1_key.pem
+           etc/::1_key.pem.plain
+           etc/README_CERTS.md
+           etc/chain4.pem
+           etc/chain6.pem
+           etc/dh2048.pem
+           etc/localhost.pw
+           etc/localhost_cert.pem
+           etc/localhost_key.pem
+           etc/localhost_key.pem.plain
+           etc/rootCA_cert.pem
+           man/Makefile
+           man/Makefile.mandoc
+           man/TARGETS
+           man/https@.1
+           man/sslcat.1
+           man/sslclient.1
+           man/sslconnect.1
+           man/sslhandle.1
+           man/sslserver.1
+           man/ucspi-tls.2
+           package/build
+           package/command-cp
+           package/command-ln
+           package/commands-base
+           package/commands-sslperl
+           package/commands-sys
+           package/compile
+           package/files
+           package/install
+           package/man
+           package/path
+           package/report
+           package/rts
+           package/run
+           package/upgrade
+           package/version
+           src/Makefile
+           src/TARGETS
+           src/auto-str.c
+           src/auto_cadir.h
+           src/auto_cafile.h
+           src/auto_ccafile.h
+           src/auto_certchainfile.h
+           src/auto_certfile.h
+           src/auto_ciphers.h
+           src/auto_dhfile.h
+           src/auto_keyfile.h
+           src/chkshsgr.c
+           src/choose.sh
+           src/coe.c
+           src/coe.h
+           src/exit.h
+           src/exp.base
+           src/exp.it
+           src/exp.sslperl
+           src/find-systype.sh
+           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/haswaitp.h1
+           src/haswaitp.h2
+           src/https@.sh
+           src/ip4_bit.c
+           src/ip6_bit.c
+           src/ip_bit.h
+           src/it-base=d
+           src/it-sslperl=d
+           src/it-sys=d
+           src/it=d
+           src/print-ar.sh
+           src/print-cc.sh
+           src/print-ccperl.sh
+           src/print-dl.sh
+           src/print-ld.sh
+           src/print-ldperl.sh
+           src/print-perlembed.sh
+           src/remoteinfo.c
+           src/remoteinfo.h
+           src/rts.base
+           src/rts.it
+           src/rts.sslperl
+           src/rules.c
+           src/rules.h
+           src/select.h1
+           src/select.h2
+           src/ssl_ca.c
+           src/ssl_cca.c
+           src/ssl_certkey.c
+           src/ssl_chainfile.c
+           src/ssl_ciphers.c
+           src/ssl_context.c
+           src/ssl_env.c
+           src/ssl_error.c
+           src/ssl_io.c
+           src/ssl_new.c
+           src/ssl_params.c
+           src/ssl_timeout.c
+           src/ssl_verify.c
+           src/sslcat.sh
+           src/sslclient.c
+           src/sslconnect.sh
+           src/sslhandle.c
+           src/sslperl.c
+           src/sslprint.c
+           src/sslserver.c
+           src/trycpp.c
+           src/trylsock.c
+           src/trysgact.c
+           src/trysgprm.c
+           src/tryshsgr.c
+           src/tryssl.c
+           src/trysysel.c
+           src/tryvfork.c
+           src/ucspissl.c
+           src/ucspissl.h
+           src/warn-auto.sh
+           src/warn-shsgr
+           src/x86cpuid.c
 Copyright: __NO_COPYRIGHT_NOR_LICENSE__
 License:   __NO_COPYRIGHT_NOR_LICENSE__
 
-Files:     superscript.com/net/ucspi-ssl-0.13.01/doc/UCSPI-SSL.md
+Files:     doc/UCSPI-SSL.md
 Copyright: 2001 SuperScript Technology, Inc. sst@superscript.com
 License:   __UNKNOWN__
  This document defines the SSL protocol for UCSPI-1996 tools. An SSL
diff --git a/ucspi-ssl-deb/debian/libucspissl-dev.install b/ucspi-ssl-deb/debian/libucspissl-dev.install
index 3d1d3ec..eaa1bf1 100644
--- a/ucspi-ssl-deb/debian/libucspissl-dev.install
+++ b/ucspi-ssl-deb/debian/libucspissl-dev.install
@@ -1,3 +1,2 @@
-
 # You must remove unused comment lines for the released package.
-superscript.com/net/ucspi-ssl-0.13.01/src/ucspissl.h usr/include
+src/ucspissl.h usr/include
diff --git a/ucspi-ssl-deb/debian/libucspissl.install b/ucspi-ssl-deb/debian/libucspissl.install
index e0c9172..19013b9 100755
--- a/ucspi-ssl-deb/debian/libucspissl.install
+++ b/ucspi-ssl-deb/debian/libucspissl.install
@@ -1,2 +1,2 @@
 #!/usr/bin/dh-exec
-superscript.com/net/ucspi-ssl-0.13.01/src/ucspissl.a => usr/lib/${DEB_HOST_MULTIARCH}/libucspissl.a
+src/ucspissl.a => usr/lib/${DEB_HOST_MULTIARCH}/libucspissl.a
diff --git a/ucspi-ssl-deb/debian/rules b/ucspi-ssl-deb/debian/rules
index 02d420c..34cc53c 100755
--- a/ucspi-ssl-deb/debian/rules
+++ b/ucspi-ssl-deb/debian/rules
@@ -8,18 +8,23 @@ export DH_VERBOSE = 1
 UPSTREAM_VERSION := $(shell dpkg-parsechangelog --show-field Version | cut -d- -f1)
 
 get-orig-source:
-	uscan --download-current-version
+	uscan --download-current-version --no-symlink
+	tar -xf ../ucspi-ssl-$(UPSTREAM_VERSION).tgz --strip-components=3
+	mv ucspi-ssl-$(UPSTREAM_VERSION)/ ucspi-ssl
+	rm ucspi-ssl/conf-cc
+	tar -czf ../ucspi-ssl_$(UPSTREAM_VERSION).orig.tar.gz ucspi-ssl
+	rm -r ucspi-ssl/
 
 %:
 	dh $@ --buildsystem=none
 
 override_dh_auto_clean:
-	-tar -xf ../ucspi-ssl_$(UPSTREAM_VERSION).orig.tar.gz --strip-components=1
-	rm -f superscript.com/net/ucspi-ssl-$(UPSTREAM_VERSION)/conf-cc
-	$(MAKE) -C superscript.com/net/ucspi-ssl-$(UPSTREAM_VERSION)/src clean
+	-tar -xf ../ucspi-ssl_$(UPSTREAM_VERSION).orig.tar.gz --strip-components=1 --skip-old-files
+	rm -f conf-cc
+	$(MAKE) -C src clean
 
 override_dh_auto_configure:
-	echo "$(CC) `pkg-config -cflags qlibs` $(CFLAGS)" >superscript.com/net/ucspi-ssl-$(UPSTREAM_VERSION)/conf-cc
+	echo "$(CC) `pkg-config -cflags qlibs` $(CFLAGS)" >conf-cc
 
 override_dh_auto_build:
-	$(MAKE) -C superscript.com/net/ucspi-ssl-$(UPSTREAM_VERSION)/src default
+	$(MAKE) -C src default
diff --git a/ucspi-ssl-deb/debian/ucspissl.install b/ucspi-ssl-deb/debian/ucspissl.install
index 5d51fe8..75e830b 100644
--- a/ucspi-ssl-deb/debian/ucspissl.install
+++ b/ucspi-ssl-deb/debian/ucspissl.install
@@ -1,9 +1,8 @@
-
 # You must remove unused comment lines for the released package.
-superscript.com/net/ucspi-ssl-0.13.01/src/https@     usr/bin
-superscript.com/net/ucspi-ssl-0.13.01/src/sslcat     usr/bin
-superscript.com/net/ucspi-ssl-0.13.01/src/sslclient  usr/bin
-superscript.com/net/ucspi-ssl-0.13.01/src/sslconnect usr/bin
-superscript.com/net/ucspi-ssl-0.13.01/src/sslhandle  usr/bin
-superscript.com/net/ucspi-ssl-0.13.01/src/sslserver  usr/bin
-superscript.com/net/ucspi-ssl-0.13.01/etc/dh2048.pem usr/share/ucspi-ssl
+src/https@     usr/bin
+src/sslcat     usr/bin
+src/sslclient  usr/bin
+src/sslconnect usr/bin
+src/sslhandle  usr/bin
+src/sslserver  usr/bin
+etc/dh2048.pem usr/share/ucspi-ssl