use repackaging for sqmail

12 files changed, 721 insertions, 696 deletions

diff --git a/.gitignore b/.gitignore
index e2f05d2..4281517 100644
--- a/.gitignore
+++ b/.gitignore
@@ -25,6 +25,27 @@
 /fehqlibs-deb/man/
 /fehqlibs-deb/sharedlib
 /fehqlibs-deb/src/
-/ucspi-tcp6-deb/ucspi-tcp6/
-/ucspi-ssl-deb/superscript.com/
-/sqmail-deb/sqmail/
+/ucspi-tcp6-deb/README.md
+/ucspi-tcp6-deb/doc/
+/ucspi-tcp6-deb/man/
+/ucspi-tcp6-deb/src/
+/ucspi-ssl-deb/INSTALL.md
+/ucspi-ssl-deb/README.md
+/ucspi-ssl-deb/conf-*
+/ucspi-ssl-deb/doc/
+/ucspi-ssl-deb/etc/
+/ucspi-ssl-deb/man/
+/ucspi-ssl-deb/package/
+/ucspi-ssl-deb/src/
+/sqmail-deb/INSTALL.md
+/sqmail-deb/README.md
+/sqmail-deb/addons/
+/sqmail-deb/conf-*
+/sqmail-deb/ctl/
+/sqmail-deb/doc/
+/sqmail-deb/etc/
+/sqmail-deb/man/
+/sqmail-deb/package/
+/sqmail-deb/scripts/
+/sqmail-deb/service/
+/sqmail-deb/src/
diff --git a/sqmail-deb/debian/clean b/sqmail-deb/debian/clean
index 3416eff..7fff9fe 100644
--- a/sqmail-deb/debian/clean
+++ b/sqmail-deb/debian/clean
@@ -1,16 +1,16 @@
-sqmail/sqmail-4.3.16/src/auto_break.c
-sqmail/sqmail-4.3.16/src/install
-sqmail/sqmail-4.3.16/src/instcheck
-sqmail/sqmail-4.3.16/src/libqdkim.a
-sqmail/sqmail-4.3.16/src/predate
-sqmail/sqmail-4.3.16/src/qmail-dksign
-sqmail/sqmail-4.3.16/src/qmail-dkverify
-sqmail/sqmail-4.3.16/src/srsforward
-sqmail/sqmail-4.3.16/src/srsreverse
-sqmail/sqmail-4.3.16/src/auto_usera.c
-sqmail/sqmail-4.3.16/src/config
-sqmail/sqmail-4.3.16/src/config-fast
-sqmail/sqmail-4.3.16/src/datemail
-sqmail/sqmail-4.3.16/src/hasspnam.h
-sqmail/sqmail-4.3.16/src/hasutmp.h
-sqmail/sqmail-4.3.16/src/hassalen.h
+src/auto_break.c
+src/install
+src/instcheck
+src/libqdkim.a
+src/predate
+src/qmail-dksign
+src/qmail-dkverify
+src/srsforward
+src/srsreverse
+src/auto_usera.c
+src/config
+src/config-fast
+src/datemail
+src/hasspnam.h
+src/hasutmp.h
+src/hassalen.h
diff --git a/sqmail-deb/debian/contrib/convert_ids.awk b/sqmail-deb/debian/contrib/convert_ids.awk
index e538371..e2e03bb 100644
--- a/sqmail-deb/debian/contrib/convert_ids.awk
+++ b/sqmail-deb/debian/contrib/convert_ids.awk
@@ -1,4 +1,4 @@
-# Format of sqmail/sqmail-4.3.16/conf-ids is 'uid:name:description:group:home'
+# Format of conf-ids is 'uid:name:description:group:home'
 BEGIN { FS = ":"; OFS = "\t"; print "# Generated by 'convert_ids.awk'; DO NOT EDIT!" }
 /^#/ { next }
 $3 ~ /group/ { print "g", $2, $1; next }
diff --git a/sqmail-deb/debian/control b/sqmail-deb/debian/control
index edd7f11..f1627d0 100644
--- a/sqmail-deb/debian/control
+++ b/sqmail-deb/debian/control
@@ -2,7 +2,7 @@ Source: sqmail
 Section: mail
 Priority: optional
 Maintainer: Jannis M. Hoffmann <jannis@fehcom.de>
-Build-Depends: debhelper-compat (= 13), dh-exec, libqlibs, libucspissl-dev
+Build-Depends: debhelper-compat (= 13), pkg-config, libqlibs, libucspissl-dev
 Standards-Version: 4.5.1
 Homepage: https://www.fehcom.de/sqmail/sqmail.html
 Rules-Requires-Root: no
@@ -23,8 +23,7 @@ Description: auto-generated package by debmake: bin #0
  debmake(1) command provided by the debmake package.
 
 Package: sqmail-users
-Architecture: any
-Multi-Arch: foreign
+Architecture: all
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Description: auto-generated package by debmake: bin #1
  This package contains the compiled binary executable.: #1
diff --git a/sqmail-deb/debian/copyright b/sqmail-deb/debian/copyright
index 50d6782..818dfd0 100644
--- a/sqmail-deb/debian/copyright
+++ b/sqmail-deb/debian/copyright
@@ -5,537 +5,537 @@ Source: <url://example.com>
 #
 # Please double check copyright with the licensecheck(1) command.
 
-Files:     sqmail/sqmail-4.3.16/INSTALL.md
-           sqmail/sqmail-4.3.16/README.md
-           sqmail/sqmail-4.3.16/addons/clamav-0.90.1_output.patch
-           sqmail/sqmail-4.3.16/conf-break
-           sqmail/sqmail-4.3.16/conf-cc
-           sqmail/sqmail-4.3.16/conf-delivery
-           sqmail/sqmail-4.3.16/conf-groups
-           sqmail/sqmail-4.3.16/conf-home
-           sqmail/sqmail-4.3.16/conf-idn2
-           sqmail/sqmail-4.3.16/conf-ids
-           sqmail/sqmail-4.3.16/conf-instances
-           sqmail/sqmail-4.3.16/conf-ld
-           sqmail/sqmail-4.3.16/conf-ldap
-           sqmail/sqmail-4.3.16/conf-log
-           sqmail/sqmail-4.3.16/conf-man
-           sqmail/sqmail-4.3.16/conf-patrn
-           sqmail/sqmail-4.3.16/conf-qlibs
-           sqmail/sqmail-4.3.16/conf-qmq
-           sqmail/sqmail-4.3.16/conf-queue
-           sqmail/sqmail-4.3.16/conf-spawn
-           sqmail/sqmail-4.3.16/conf-split
-           sqmail/sqmail-4.3.16/conf-svcdir
-           sqmail/sqmail-4.3.16/conf-ucspissl
-           sqmail/sqmail-4.3.16/conf-users
-           sqmail/sqmail-4.3.16/ctl/badloadertypes
-           sqmail/sqmail-4.3.16/ctl/badmailfrom
-           sqmail/sqmail-4.3.16/ctl/badmimetypes
-           sqmail/sqmail-4.3.16/ctl/badrcptto
-           sqmail/sqmail-4.3.16/ctl/locals
-           sqmail/sqmail-4.3.16/ctl/rules.qmtpd.cdb
-           sqmail/sqmail-4.3.16/ctl/rules.qmtpd.txt
-           sqmail/sqmail-4.3.16/ctl/rules.smtpd.cdb
-           sqmail/sqmail-4.3.16/ctl/rules.smtpd.txt
-           sqmail/sqmail-4.3.16/doc/BLURB
-           sqmail/sqmail-4.3.16/doc/CHANGELOG
-           sqmail/sqmail-4.3.16/doc/CHANGELOG_V3
-           sqmail/sqmail-4.3.16/doc/CONTRIBUTERS
-           sqmail/sqmail-4.3.16/doc/LOGGING
-           sqmail/sqmail-4.3.16/doc/Old/README.djbdns
-           sqmail/sqmail-4.3.16/doc/Old/README.mav
-           sqmail/sqmail-4.3.16/doc/Old/README.qmq
-           sqmail/sqmail-4.3.16/doc/Old/README.recipients
-           sqmail/sqmail-4.3.16/doc/Old/README.wildmat
-           sqmail/sqmail-4.3.16/doc/Qmail/BLURB
-           sqmail/sqmail-4.3.16/doc/Qmail/FAQ
-           sqmail/sqmail-4.3.16/doc/Qmail/INSTALL.alias
-           sqmail/sqmail-4.3.16/doc/Qmail/INSTALL.ctl
-           sqmail/sqmail-4.3.16/doc/Qmail/INSTALL.ids
-           sqmail/sqmail-4.3.16/doc/Qmail/INSTALL.maildir
-           sqmail/sqmail-4.3.16/doc/Qmail/INSTALL.mbox
-           sqmail/sqmail-4.3.16/doc/Qmail/INSTALL.qmail
-           sqmail/sqmail-4.3.16/doc/Qmail/INTERNALS
-           sqmail/sqmail-4.3.16/doc/Qmail/PIC.local2alias
-           sqmail/sqmail-4.3.16/doc/Qmail/PIC.local2ext
-           sqmail/sqmail-4.3.16/doc/Qmail/PIC.local2local
-           sqmail/sqmail-4.3.16/doc/Qmail/PIC.local2rem
-           sqmail/sqmail-4.3.16/doc/Qmail/PIC.local2virt
-           sqmail/sqmail-4.3.16/doc/Qmail/PIC.nullclient
-           sqmail/sqmail-4.3.16/doc/Qmail/PIC.relaybad
-           sqmail/sqmail-4.3.16/doc/Qmail/PIC.relaygood
-           sqmail/sqmail-4.3.16/doc/Qmail/PIC.rem2local
-           sqmail/sqmail-4.3.16/doc/Qmail/REMOVE.binmail
-           sqmail/sqmail-4.3.16/doc/Qmail/REMOVE.sendmail
-           sqmail/sqmail-4.3.16/doc/Qmail/SYSDEPS
-           sqmail/sqmail-4.3.16/doc/Qmail/TEST.deliver
-           sqmail/sqmail-4.3.16/doc/Qmail/TEST.receive
-           sqmail/sqmail-4.3.16/doc/Qmail/THANKS
-           sqmail/sqmail-4.3.16/doc/Qmail/TODO.djb
-           sqmail/sqmail-4.3.16/doc/Qmail/TODO.done
-           sqmail/sqmail-4.3.16/doc/README.clamav
-           sqmail/sqmail-4.3.16/doc/README.integrators
-           sqmail/sqmail-4.3.16/doc/README.smtpreply
-           sqmail/sqmail-4.3.16/doc/TODO
-           sqmail/sqmail-4.3.16/doc/smtpreplies
-           sqmail/sqmail-4.3.16/etc/qmail-mrtg.pop3d.sample
-           sqmail/sqmail-4.3.16/etc/qmail-mrtg.send.sample
-           sqmail/sqmail-4.3.16/etc/qmail-mrtg.smtpd.sample
-           sqmail/sqmail-4.3.16/man/Makefile
-           sqmail/sqmail-4.3.16/man/Makefile.mandoc
-           sqmail/sqmail-4.3.16/man/TARGETS
-           sqmail/sqmail-4.3.16/man/addresses.5
-           sqmail/sqmail-4.3.16/man/bouncesaying.1
-           sqmail/sqmail-4.3.16/man/columnt.1
-           sqmail/sqmail-4.3.16/man/condredirect.1
-           sqmail/sqmail-4.3.16/man/datetime.3
-           sqmail/sqmail-4.3.16/man/dnscname.8
-           sqmail/sqmail-4.3.16/man/dnsfq.8
-           sqmail/sqmail-4.3.16/man/dnsip.8
-           sqmail/sqmail-4.3.16/man/dnsmxip.8
-           sqmail/sqmail-4.3.16/man/dnsptr.8
-           sqmail/sqmail-4.3.16/man/dnstlsa.8
-           sqmail/sqmail-4.3.16/man/dnstxt.8
-           sqmail/sqmail-4.3.16/man/dot-qmail.9
-           sqmail/sqmail-4.3.16/man/envelopes.5
-           sqmail/sqmail-4.3.16/man/except.1
-           sqmail/sqmail-4.3.16/man/fastforward.1
-           sqmail/sqmail-4.3.16/man/forgeries.7
-           sqmail/sqmail-4.3.16/man/forward.1
-           sqmail/sqmail-4.3.16/man/hostname.8
-           sqmail/sqmail-4.3.16/man/ipmeprint.8
-           sqmail/sqmail-4.3.16/man/maildir.5
-           sqmail/sqmail-4.3.16/man/maildir2mbox.1
-           sqmail/sqmail-4.3.16/man/maildirmake.1
-           sqmail/sqmail-4.3.16/man/maildirwatch.1
-           sqmail/sqmail-4.3.16/man/mailsubj.1
-           sqmail/sqmail-4.3.16/man/matchup.1
-           sqmail/sqmail-4.3.16/man/mbox.5
-           sqmail/sqmail-4.3.16/man/newaliases.1
-           sqmail/sqmail-4.3.16/man/newinclude.1
-           sqmail/sqmail-4.3.16/man/preline.1
-           sqmail/sqmail-4.3.16/man/printforward.1
-           sqmail/sqmail-4.3.16/man/printmaillist.1
-           sqmail/sqmail-4.3.16/man/qbiff.1
-           sqmail/sqmail-4.3.16/man/qmail-authuser.9
-           sqmail/sqmail-4.3.16/man/qmail-badloadertypes.9
-           sqmail/sqmail-4.3.16/man/qmail-badmimetypes.9
-           sqmail/sqmail-4.3.16/man/qmail-clean.8
-           sqmail/sqmail-4.3.16/man/qmail-command.8
-           sqmail/sqmail-4.3.16/man/qmail-control.9
-           sqmail/sqmail-4.3.16/man/qmail-dkim.8
-           sqmail/sqmail-4.3.16/man/qmail-dksign.9
-           sqmail/sqmail-4.3.16/man/qmail-dkverify.8
-           sqmail/sqmail-4.3.16/man/qmail-getpw.9
-           sqmail/sqmail-4.3.16/man/qmail-header.5
-           sqmail/sqmail-4.3.16/man/qmail-inject.8
-           sqmail/sqmail-4.3.16/man/qmail-limits.9
-           sqmail/sqmail-4.3.16/man/qmail-local.8
-           sqmail/sqmail-4.3.16/man/qmail-log.5
-           sqmail/sqmail-4.3.16/man/qmail-lspawn.8
-           sqmail/sqmail-4.3.16/man/qmail-mfrules.9
-           sqmail/sqmail-4.3.16/man/qmail-mrtg.8
-           sqmail/sqmail-4.3.16/man/qmail-newmrh.9
-           sqmail/sqmail-4.3.16/man/qmail-newu.9
-           sqmail/sqmail-4.3.16/man/qmail-pop3d.8
-           sqmail/sqmail-4.3.16/man/qmail-popup.8
-           sqmail/sqmail-4.3.16/man/qmail-postgrey.8
-           sqmail/sqmail-4.3.16/man/qmail-pw2u.9
-           sqmail/sqmail-4.3.16/man/qmail-qmaint.8
-           sqmail/sqmail-4.3.16/man/qmail-qmqpc.8
-           sqmail/sqmail-4.3.16/man/qmail-qmqpd.8
-           sqmail/sqmail-4.3.16/man/qmail-qmtpd.8
-           sqmail/sqmail-4.3.16/man/qmail-qread.8
-           sqmail/sqmail-4.3.16/man/qmail-qstat.8
-           sqmail/sqmail-4.3.16/man/qmail-queue.8
-           sqmail/sqmail-4.3.16/man/qmail-recipients.9
-           sqmail/sqmail-4.3.16/man/qmail-remote.8
-           sqmail/sqmail-4.3.16/man/qmail-rspawn.8
-           sqmail/sqmail-4.3.16/man/qmail-send.9
-           sqmail/sqmail-4.3.16/man/qmail-showctl.8
-           sqmail/sqmail-4.3.16/man/qmail-smtpam.8
-           sqmail/sqmail-4.3.16/man/qmail-smtpd.8
-           sqmail/sqmail-4.3.16/man/qmail-start.9
-           sqmail/sqmail-4.3.16/man/qmail-tcpok.8
-           sqmail/sqmail-4.3.16/man/qmail-tcpto.8
-           sqmail/sqmail-4.3.16/man/qmail-todo.8
-           sqmail/sqmail-4.3.16/man/qmail-users.9
-           sqmail/sqmail-4.3.16/man/qmail-vmailuser.9
-           sqmail/sqmail-4.3.16/man/qreceipt.1
-           sqmail/sqmail-4.3.16/man/setforward.1
-           sqmail/sqmail-4.3.16/man/setmaillist.1
-           sqmail/sqmail-4.3.16/man/spfquery.8
-           sqmail/sqmail-4.3.16/man/splogger.8
-           sqmail/sqmail-4.3.16/man/sqmail.9
-           sqmail/sqmail-4.3.16/man/srsforward.1
-           sqmail/sqmail-4.3.16/man/srsreverse.9
-           sqmail/sqmail-4.3.16/man/tai64nfrac.5
-           sqmail/sqmail-4.3.16/man/tcp-environ.5
-           sqmail/sqmail-4.3.16/man/xqp.1
-           sqmail/sqmail-4.3.16/man/xrecipient.1
-           sqmail/sqmail-4.3.16/man/xsender.1
-           sqmail/sqmail-4.3.16/package/build
-           sqmail/sqmail-4.3.16/package/command-cp
-           sqmail/sqmail-4.3.16/package/command-ln
-           sqmail/sqmail-4.3.16/package/commands-analog
-           sqmail/sqmail-4.3.16/package/commands-base
-           sqmail/sqmail-4.3.16/package/commands-clients
-           sqmail/sqmail-4.3.16/package/commands-control
-           sqmail/sqmail-4.3.16/package/commands-dkim
-           sqmail/sqmail-4.3.16/package/commands-dns
-           sqmail/sqmail-4.3.16/package/commands-forward
-           sqmail/sqmail-4.3.16/package/commands-log
-           sqmail/sqmail-4.3.16/package/commands-mbox
-           sqmail/sqmail-4.3.16/package/commands-pam
-           sqmail/sqmail-4.3.16/package/commands-pop
-           sqmail/sqmail-4.3.16/package/commands-queue
-           sqmail/sqmail-4.3.16/package/commands-recipients
-           sqmail/sqmail-4.3.16/package/commands-scan
-           sqmail/sqmail-4.3.16/package/commands-server
-           sqmail/sqmail-4.3.16/package/commands-setup
-           sqmail/sqmail-4.3.16/package/commands-srs
-           sqmail/sqmail-4.3.16/package/commands-user
-           sqmail/sqmail-4.3.16/package/commands-x509
-           sqmail/sqmail-4.3.16/package/compile
-           sqmail/sqmail-4.3.16/package/control
-           sqmail/sqmail-4.3.16/package/dir
-           sqmail/sqmail-4.3.16/package/files
-           sqmail/sqmail-4.3.16/package/ids
-           sqmail/sqmail-4.3.16/package/install
-           sqmail/sqmail-4.3.16/package/legacy
-           sqmail/sqmail-4.3.16/package/man
-           sqmail/sqmail-4.3.16/package/path
-           sqmail/sqmail-4.3.16/package/qmq
-           sqmail/sqmail-4.3.16/package/report
-           sqmail/sqmail-4.3.16/package/rts
-           sqmail/sqmail-4.3.16/package/run
-           sqmail/sqmail-4.3.16/package/scripts
-           sqmail/sqmail-4.3.16/package/service
-           sqmail/sqmail-4.3.16/package/services=d
-           sqmail/sqmail-4.3.16/package/sslenv
-           sqmail/sqmail-4.3.16/package/ucspissl
-           sqmail/sqmail-4.3.16/package/upgrade
-           sqmail/sqmail-4.3.16/package/version
-           sqmail/sqmail-4.3.16/scripts/Makefile
-           sqmail/sqmail-4.3.16/scripts/README.md
-           sqmail/sqmail-4.3.16/scripts/TARGETS
-           sqmail/sqmail-4.3.16/scripts/it-pam=d
-           sqmail/sqmail-4.3.16/scripts/it-recipients=d
-           sqmail/sqmail-4.3.16/scripts/it-scan=d
-           sqmail/sqmail-4.3.16/scripts/it-x509=d
-           sqmail/sqmail-4.3.16/scripts/it=d
-           sqmail/sqmail-4.3.16/scripts/ksh-auto.sh
-           sqmail/sqmail-4.3.16/scripts/ldap-pam.pl
-           sqmail/sqmail-4.3.16/scripts/multiple-queues.sh
-           sqmail/sqmail-4.3.16/scripts/perl-auto.sh
-           sqmail/sqmail-4.3.16/scripts/qmail-alias2recipients.sh
-           sqmail/sqmail-4.3.16/scripts/qmail-queue-scan.sh
-           sqmail/sqmail-4.3.16/scripts/warn-auto.sh
-           sqmail/sqmail-4.3.16/scripts/x509fingerprint.sh
-           sqmail/sqmail-4.3.16/service/run_log
-           sqmail/sqmail-4.3.16/service/run_pop3d
-           sqmail/sqmail-4.3.16/service/run_pop3sd
-           sqmail/sqmail-4.3.16/service/run_postgrey
-           sqmail/sqmail-4.3.16/service/run_qmqpd
-           sqmail/sqmail-4.3.16/service/run_qmtpd
-           sqmail/sqmail-4.3.16/service/run_qmtpsd
-           sqmail/sqmail-4.3.16/service/run_send
-           sqmail/sqmail-4.3.16/service/run_smtpd
-           sqmail/sqmail-4.3.16/service/run_smtpsd
-           sqmail/sqmail-4.3.16/service/run_smtpsub
-           sqmail/sqmail-4.3.16/service/ssl.env
-           sqmail/sqmail-4.3.16/src/Makefile
-           sqmail/sqmail-4.3.16/src/TARGETS
-           sqmail/sqmail-4.3.16/src/auto-gid.c
-           sqmail/sqmail-4.3.16/src/auto-int.c
-           sqmail/sqmail-4.3.16/src/auto-int8.c
-           sqmail/sqmail-4.3.16/src/auto-str.c
-           sqmail/sqmail-4.3.16/src/auto-uid.c
-           sqmail/sqmail-4.3.16/src/base64.c
-           sqmail/sqmail-4.3.16/src/bouncesaying.c
-           sqmail/sqmail-4.3.16/src/chkshsgr.c
-           sqmail/sqmail-4.3.16/src/chkspawn.c
-           sqmail/sqmail-4.3.16/src/columnt.c
-           sqmail/sqmail-4.3.16/src/commands.c
-           sqmail/sqmail-4.3.16/src/condredirect.c
-           sqmail/sqmail-4.3.16/src/config-fast.sh
-           sqmail/sqmail-4.3.16/src/config.sh
-           sqmail/sqmail-4.3.16/src/constmap.c
-           sqmail/sqmail-4.3.16/src/control.c
-           sqmail/sqmail-4.3.16/src/crypt.lib
-           sqmail/sqmail-4.3.16/src/date822fmt.c
-           sqmail/sqmail-4.3.16/src/datemail.sh
-           sqmail/sqmail-4.3.16/src/datetime.c
-           sqmail/sqmail-4.3.16/src/ddist.sh
-           sqmail/sqmail-4.3.16/src/deferrals.sh
-           sqmail/sqmail-4.3.16/src/direntry.h1
-           sqmail/sqmail-4.3.16/src/direntry.h2
-           sqmail/sqmail-4.3.16/src/dns.c
-           sqmail/sqmail-4.3.16/src/dns_tlsa.c
-           sqmail/sqmail-4.3.16/src/dnscname.c
-           sqmail/sqmail-4.3.16/src/dnsdoe.c
-           sqmail/sqmail-4.3.16/src/dnsfq.c
-           sqmail/sqmail-4.3.16/src/dnsip.c
-           sqmail/sqmail-4.3.16/src/dnsmxip.c
-           sqmail/sqmail-4.3.16/src/dnsptr.c
-           sqmail/sqmail-4.3.16/src/dnstlsa.c
-           sqmail/sqmail-4.3.16/src/dnstxt.c
-           sqmail/sqmail-4.3.16/src/except.c
-           sqmail/sqmail-4.3.16/src/failures.sh
-           sqmail/sqmail-4.3.16/src/fastforward.c
-           sqmail/sqmail-4.3.16/src/fifo.c
-           sqmail/sqmail-4.3.16/src/find-systype.sh
-           sqmail/sqmail-4.3.16/src/fmtqfn.c
-           sqmail/sqmail-4.3.16/src/fork.h1
-           sqmail/sqmail-4.3.16/src/fork.h2
-           sqmail/sqmail-4.3.16/src/forward.c
-           sqmail/sqmail-4.3.16/src/gfrom.c
-           sqmail/sqmail-4.3.16/src/headerbody.c
-           sqmail/sqmail-4.3.16/src/hfield.c
-           sqmail/sqmail-4.3.16/src/hier.c
-           sqmail/sqmail-4.3.16/src/hmac_md5.c
-           sqmail/sqmail-4.3.16/src/hostname.c
-           sqmail/sqmail-4.3.16/src/include/auto_break.h
-           sqmail/sqmail-4.3.16/src/include/auto_patrn.h
-           sqmail/sqmail-4.3.16/src/include/auto_qmail.h
-           sqmail/sqmail-4.3.16/src/include/auto_queue.h
-           sqmail/sqmail-4.3.16/src/include/auto_spawn.h
-           sqmail/sqmail-4.3.16/src/include/auto_split.h
-           sqmail/sqmail-4.3.16/src/include/auto_uids.h
-           sqmail/sqmail-4.3.16/src/include/auto_usera.h
-           sqmail/sqmail-4.3.16/src/include/base64.h
-           sqmail/sqmail-4.3.16/src/include/commands.h
-           sqmail/sqmail-4.3.16/src/include/constmap.h
-           sqmail/sqmail-4.3.16/src/include/control.h
-           sqmail/sqmail-4.3.16/src/include/date822fmt.h
-           sqmail/sqmail-4.3.16/src/include/datetime.h
-           sqmail/sqmail-4.3.16/src/include/dns.h
-           sqmail/sqmail-4.3.16/src/include/dnsdoe.h
-           sqmail/sqmail-4.3.16/src/include/dnsgettxt.h
-           sqmail/sqmail-4.3.16/src/include/exit.h
-           sqmail/sqmail-4.3.16/src/include/extra.h
-           sqmail/sqmail-4.3.16/src/include/fifo.h
-           sqmail/sqmail-4.3.16/src/include/fmtqfn.h
-           sqmail/sqmail-4.3.16/src/include/gfrom.h
-           sqmail/sqmail-4.3.16/src/include/headerbody.h
-           sqmail/sqmail-4.3.16/src/include/hfield.h
-           sqmail/sqmail-4.3.16/src/include/hier.h
-           sqmail/sqmail-4.3.16/src/include/hmac_md5.h
-           sqmail/sqmail-4.3.16/src/include/ipalloc.h
-           sqmail/sqmail-4.3.16/src/include/ipme.h
-           sqmail/sqmail-4.3.16/src/include/maildir.h
-           sqmail/sqmail-4.3.16/src/include/mfrules.h
-           sqmail/sqmail-4.3.16/src/include/myctime.h
-           sqmail/sqmail-4.3.16/src/include/newfield.h
-           sqmail/sqmail-4.3.16/src/include/now.h
-           sqmail/sqmail-4.3.16/src/include/prioq.h
-           sqmail/sqmail-4.3.16/src/include/prot.h
-           sqmail/sqmail-4.3.16/src/include/qlx.h
-           sqmail/sqmail-4.3.16/src/include/qmail.h
-           sqmail/sqmail-4.3.16/src/include/qsutil.h
-           sqmail/sqmail-4.3.16/src/include/quote.h
-           sqmail/sqmail-4.3.16/src/include/rcpthosts.h
-           sqmail/sqmail-4.3.16/src/include/readsubdir.h
-           sqmail/sqmail-4.3.16/src/include/readwrite.h
-           sqmail/sqmail-4.3.16/src/include/received.h
-           sqmail/sqmail-4.3.16/src/include/recipients.h
-           sqmail/sqmail-4.3.16/src/include/sendtodo.h
-           sqmail/sqmail-4.3.16/src/include/sha1.h
-           sqmail/sqmail-4.3.16/src/include/sha256.h
-           sqmail/sqmail-4.3.16/src/include/smtpdlog.h
-           sqmail/sqmail-4.3.16/src/include/spf.h
-           sqmail/sqmail-4.3.16/src/include/strset.h
-           sqmail/sqmail-4.3.16/src/include/tcpto.h
-           sqmail/sqmail-4.3.16/src/include/tls_errors.h
-           sqmail/sqmail-4.3.16/src/include/tls_remote.h
-           sqmail/sqmail-4.3.16/src/include/tls_start.h
-           sqmail/sqmail-4.3.16/src/include/tls_timeoutio.h
-           sqmail/sqmail-4.3.16/src/include/token822.h
-           sqmail/sqmail-4.3.16/src/include/trigger.h
-           sqmail/sqmail-4.3.16/src/include/triggerpull.h
-           sqmail/sqmail-4.3.16/src/include/ucspitls.h
-           sqmail/sqmail-4.3.16/src/include/wildmat.h
-           sqmail/sqmail-4.3.16/src/install.c
-           sqmail/sqmail-4.3.16/src/instcheck.c
-           sqmail/sqmail-4.3.16/src/ipalloc.c
-           sqmail/sqmail-4.3.16/src/ipme.c
-           sqmail/sqmail-4.3.16/src/ipmeprint.c
-           sqmail/sqmail-4.3.16/src/it-analog=d
-           sqmail/sqmail-4.3.16/src/it-base=d
-           sqmail/sqmail-4.3.16/src/it-clients=d
-           sqmail/sqmail-4.3.16/src/it-control=d
-           sqmail/sqmail-4.3.16/src/it-dkim=d
-           sqmail/sqmail-4.3.16/src/it-dns=d
-           sqmail/sqmail-4.3.16/src/it-forward=d
-           sqmail/sqmail-4.3.16/src/it-log=d
-           sqmail/sqmail-4.3.16/src/it-mbox=d
-           sqmail/sqmail-4.3.16/src/it-pam=d
-           sqmail/sqmail-4.3.16/src/it-pop=d
-           sqmail/sqmail-4.3.16/src/it-queue=d
-           sqmail/sqmail-4.3.16/src/it-server=d
-           sqmail/sqmail-4.3.16/src/it-setup=d
-           sqmail/sqmail-4.3.16/src/it-srs=d
-           sqmail/sqmail-4.3.16/src/it-user=d
-           sqmail/sqmail-4.3.16/src/it=d
-           sqmail/sqmail-4.3.16/src/maildir.c
-           sqmail/sqmail-4.3.16/src/maildir2mbox.c
-           sqmail/sqmail-4.3.16/src/maildirmake.c
-           sqmail/sqmail-4.3.16/src/maildirwatch.c
-           sqmail/sqmail-4.3.16/src/mailsubj.sh
-           sqmail/sqmail-4.3.16/src/make-compile.sh
-           sqmail/sqmail-4.3.16/src/make-load.sh
-           sqmail/sqmail-4.3.16/src/make-makelib.sh
-           sqmail/sqmail-4.3.16/src/matchup.c
-           sqmail/sqmail-4.3.16/src/mfrules.c
-           sqmail/sqmail-4.3.16/src/migrate.sh
-           sqmail/sqmail-4.3.16/src/myctime.c
-           sqmail/sqmail-4.3.16/src/newaliases.c
-           sqmail/sqmail-4.3.16/src/newfield.c
-           sqmail/sqmail-4.3.16/src/newinclude.c
-           sqmail/sqmail-4.3.16/src/now.c
-           sqmail/sqmail-4.3.16/src/predate.c
-           sqmail/sqmail-4.3.16/src/preline.c
-           sqmail/sqmail-4.3.16/src/printforward.c
-           sqmail/sqmail-4.3.16/src/printmaillist.c
-           sqmail/sqmail-4.3.16/src/prioq.c
-           sqmail/sqmail-4.3.16/src/prot.c
-           sqmail/sqmail-4.3.16/src/qbiff.c
-           sqmail/sqmail-4.3.16/src/qmail-authuser.c
-           sqmail/sqmail-4.3.16/src/qmail-badloadertypes.c
-           sqmail/sqmail-4.3.16/src/qmail-badmimetypes.c
-           sqmail/sqmail-4.3.16/src/qmail-clean.c
-           sqmail/sqmail-4.3.16/src/qmail-dksign.c
-           sqmail/sqmail-4.3.16/src/qmail-dkverify.c
-           sqmail/sqmail-4.3.16/src/qmail-getpw.c
-           sqmail/sqmail-4.3.16/src/qmail-inject.c
-           sqmail/sqmail-4.3.16/src/qmail-ldapam.c
-           sqmail/sqmail-4.3.16/src/qmail-local.c
-           sqmail/sqmail-4.3.16/src/qmail-lspawn.c
-           sqmail/sqmail-4.3.16/src/qmail-mfrules.c
-           sqmail/sqmail-4.3.16/src/qmail-mrtg-queue.sh
-           sqmail/sqmail-4.3.16/src/qmail-mrtg.c
-           sqmail/sqmail-4.3.16/src/qmail-newmrh.c
-           sqmail/sqmail-4.3.16/src/qmail-newu.c
-           sqmail/sqmail-4.3.16/src/qmail-pop3d.c
-           sqmail/sqmail-4.3.16/src/qmail-popup.c
-           sqmail/sqmail-4.3.16/src/qmail-postgrey.c
-           sqmail/sqmail-4.3.16/src/qmail-pw2u.c
-           sqmail/sqmail-4.3.16/src/qmail-qmaint.c
-           sqmail/sqmail-4.3.16/src/qmail-qmqpc.c
-           sqmail/sqmail-4.3.16/src/qmail-qmqpd.c
-           sqmail/sqmail-4.3.16/src/qmail-qmtpd.c
-           sqmail/sqmail-4.3.16/src/qmail-qread.c
-           sqmail/sqmail-4.3.16/src/qmail-qstat.sh
-           sqmail/sqmail-4.3.16/src/qmail-queue.c
-           sqmail/sqmail-4.3.16/src/qmail-recipients.c
-           sqmail/sqmail-4.3.16/src/qmail-remote.c
-           sqmail/sqmail-4.3.16/src/qmail-rspawn.c
-           sqmail/sqmail-4.3.16/src/qmail-send.c
-           sqmail/sqmail-4.3.16/src/qmail-showctl.c
-           sqmail/sqmail-4.3.16/src/qmail-smtpam.c
-           sqmail/sqmail-4.3.16/src/qmail-smtpd.c
-           sqmail/sqmail-4.3.16/src/qmail-start.c
-           sqmail/sqmail-4.3.16/src/qmail-tcpok.c
-           sqmail/sqmail-4.3.16/src/qmail-tcpto.c
-           sqmail/sqmail-4.3.16/src/qmail-todo.c
-           sqmail/sqmail-4.3.16/src/qmail-upq.sh
-           sqmail/sqmail-4.3.16/src/qmail-vmailuser.c
-           sqmail/sqmail-4.3.16/src/qmail.c
-           sqmail/sqmail-4.3.16/src/qreceipt.c
-           sqmail/sqmail-4.3.16/src/qsutil.c
-           sqmail/sqmail-4.3.16/src/quote.c
-           sqmail/sqmail-4.3.16/src/rcpthosts.c
-           sqmail/sqmail-4.3.16/src/readsubdir.c
-           sqmail/sqmail-4.3.16/src/received.c
-           sqmail/sqmail-4.3.16/src/recipients.c
-           sqmail/sqmail-4.3.16/src/recipients.sh
-           sqmail/sqmail-4.3.16/src/rhosts.sh
-           sqmail/sqmail-4.3.16/src/rxdelay.sh
-           sqmail/sqmail-4.3.16/src/select.h1
-           sqmail/sqmail-4.3.16/src/select.h2
-           sqmail/sqmail-4.3.16/src/senders.sh
-           sqmail/sqmail-4.3.16/src/sendmail.c
-           sqmail/sqmail-4.3.16/src/setforward.c
-           sqmail/sqmail-4.3.16/src/setmaillist.c
-           sqmail/sqmail-4.3.16/src/sha1.c
-           sqmail/sqmail-4.3.16/src/sha256.c
-           sqmail/sqmail-4.3.16/src/smtpdlog.c
-           sqmail/sqmail-4.3.16/src/spawn.c
-           sqmail/sqmail-4.3.16/src/spf.c
-           sqmail/sqmail-4.3.16/src/spfdnsip.c
-           sqmail/sqmail-4.3.16/src/spfquery.c
-           sqmail/sqmail-4.3.16/src/splogger.c
-           sqmail/sqmail-4.3.16/src/srsforward.c
-           sqmail/sqmail-4.3.16/src/srsreverse.c
-           sqmail/sqmail-4.3.16/src/strset.c
-           sqmail/sqmail-4.3.16/src/successes.sh
-           sqmail/sqmail-4.3.16/src/suids.sh
-           sqmail/sqmail-4.3.16/src/tai64nfrac.c
-           sqmail/sqmail-4.3.16/src/tcpto.c
-           sqmail/sqmail-4.3.16/src/tcpto_clean.c
-           sqmail/sqmail-4.3.16/src/tls_errors.c
-           sqmail/sqmail-4.3.16/src/tls_remote.c
-           sqmail/sqmail-4.3.16/src/tls_start.c
-           sqmail/sqmail-4.3.16/src/tls_timeoutio.c
-           sqmail/sqmail-4.3.16/src/token822.c
-           sqmail/sqmail-4.3.16/src/trigger.c
-           sqmail/sqmail-4.3.16/src/triggerpull.c
-           sqmail/sqmail-4.3.16/src/trycpp.c
-           sqmail/sqmail-4.3.16/src/trydnsresolv.c
-           sqmail/sqmail-4.3.16/src/trydrent.c
-           sqmail/sqmail-4.3.16/src/tryflock.c
-           sqmail/sqmail-4.3.16/src/tryidn2.c
-           sqmail/sqmail-4.3.16/src/tryldap.c
-           sqmail/sqmail-4.3.16/src/trylsock.c
-           sqmail/sqmail-4.3.16/src/trymkffo.c
-           sqmail/sqmail-4.3.16/src/trynpbg1.c
-           sqmail/sqmail-4.3.16/src/tryqlibs.c
-           sqmail/sqmail-4.3.16/src/tryrsolv.c
-           sqmail/sqmail-4.3.16/src/trysalen.c
-           sqmail/sqmail-4.3.16/src/trysgact.c
-           sqmail/sqmail-4.3.16/src/trysgprm.c
-           sqmail/sqmail-4.3.16/src/tryshadow.c
-           sqmail/sqmail-4.3.16/src/tryshsgr.c
-           sqmail/sqmail-4.3.16/src/tryslib.c
-           sqmail/sqmail-4.3.16/src/tryspnam.c
-           sqmail/sqmail-4.3.16/src/trysysel.c
-           sqmail/sqmail-4.3.16/src/trysyslog.c
-           sqmail/sqmail-4.3.16/src/tryulong32.c
-           sqmail/sqmail-4.3.16/src/tryuserpw.c
-           sqmail/sqmail-4.3.16/src/tryutmp.c
-           sqmail/sqmail-4.3.16/src/tryvfork.c
-           sqmail/sqmail-4.3.16/src/trywaitp.c
-           sqmail/sqmail-4.3.16/src/warn-auto.sh
-           sqmail/sqmail-4.3.16/src/warn-shsgr
-           sqmail/sqmail-4.3.16/src/wildmat.c
-           sqmail/sqmail-4.3.16/src/xqp.sh
-           sqmail/sqmail-4.3.16/src/xrecipient.sh
-           sqmail/sqmail-4.3.16/src/xsender.sh
-           sqmail/sqmail-4.3.16/src/zddist.sh
-           sqmail/sqmail-4.3.16/src/zdeferrals.sh
-           sqmail/sqmail-4.3.16/src/zfailures.sh
-           sqmail/sqmail-4.3.16/src/zoverall.sh
-           sqmail/sqmail-4.3.16/src/zrecipients.sh
-           sqmail/sqmail-4.3.16/src/zrhosts.sh
-           sqmail/sqmail-4.3.16/src/zrxdelay.sh
-           sqmail/sqmail-4.3.16/src/zsenders.sh
-           sqmail/sqmail-4.3.16/src/zsendmail.sh
-           sqmail/sqmail-4.3.16/src/zsuccesses.sh
-           sqmail/sqmail-4.3.16/src/zsuids.sh
+Files:     INSTALL.md
+           README.md
+           addons/clamav-0.90.1_output.patch
+           conf-break
+           conf-cc
+           conf-delivery
+           conf-groups
+           conf-home
+           conf-idn2
+           conf-ids
+           conf-instances
+           conf-ld
+           conf-ldap
+           conf-log
+           conf-man
+           conf-patrn
+           conf-qlibs
+           conf-qmq
+           conf-queue
+           conf-spawn
+           conf-split
+           conf-svcdir
+           conf-ucspissl
+           conf-users
+           ctl/badloadertypes
+           ctl/badmailfrom
+           ctl/badmimetypes
+           ctl/badrcptto
+           ctl/locals
+           ctl/rules.qmtpd.cdb
+           ctl/rules.qmtpd.txt
+           ctl/rules.smtpd.cdb
+           ctl/rules.smtpd.txt
+           doc/BLURB
+           doc/CHANGELOG
+           doc/CHANGELOG_V3
+           doc/CONTRIBUTERS
+           doc/LOGGING
+           doc/Old/README.djbdns
+           doc/Old/README.mav
+           doc/Old/README.qmq
+           doc/Old/README.recipients
+           doc/Old/README.wildmat
+           doc/Qmail/BLURB
+           doc/Qmail/FAQ
+           doc/Qmail/INSTALL.alias
+           doc/Qmail/INSTALL.ctl
+           doc/Qmail/INSTALL.ids
+           doc/Qmail/INSTALL.maildir
+           doc/Qmail/INSTALL.mbox
+           doc/Qmail/INSTALL.qmail
+           doc/Qmail/INTERNALS
+           doc/Qmail/PIC.local2alias
+           doc/Qmail/PIC.local2ext
+           doc/Qmail/PIC.local2local
+           doc/Qmail/PIC.local2rem
+           doc/Qmail/PIC.local2virt
+           doc/Qmail/PIC.nullclient
+           doc/Qmail/PIC.relaybad
+           doc/Qmail/PIC.relaygood
+           doc/Qmail/PIC.rem2local
+           doc/Qmail/REMOVE.binmail
+           doc/Qmail/REMOVE.sendmail
+           doc/Qmail/SYSDEPS
+           doc/Qmail/TEST.deliver
+           doc/Qmail/TEST.receive
+           doc/Qmail/THANKS
+           doc/Qmail/TODO.djb
+           doc/Qmail/TODO.done
+           doc/README.clamav
+           doc/README.integrators
+           doc/README.smtpreply
+           doc/TODO
+           doc/smtpreplies
+           etc/qmail-mrtg.pop3d.sample
+           etc/qmail-mrtg.send.sample
+           etc/qmail-mrtg.smtpd.sample
+           man/Makefile
+           man/Makefile.mandoc
+           man/TARGETS
+           man/addresses.5
+           man/bouncesaying.1
+           man/columnt.1
+           man/condredirect.1
+           man/datetime.3
+           man/dnscname.8
+           man/dnsfq.8
+           man/dnsip.8
+           man/dnsmxip.8
+           man/dnsptr.8
+           man/dnstlsa.8
+           man/dnstxt.8
+           man/dot-qmail.9
+           man/envelopes.5
+           man/except.1
+           man/fastforward.1
+           man/forgeries.7
+           man/forward.1
+           man/hostname.8
+           man/ipmeprint.8
+           man/maildir.5
+           man/maildir2mbox.1
+           man/maildirmake.1
+           man/maildirwatch.1
+           man/mailsubj.1
+           man/matchup.1
+           man/mbox.5
+           man/newaliases.1
+           man/newinclude.1
+           man/preline.1
+           man/printforward.1
+           man/printmaillist.1
+           man/qbiff.1
+           man/qmail-authuser.9
+           man/qmail-badloadertypes.9
+           man/qmail-badmimetypes.9
+           man/qmail-clean.8
+           man/qmail-command.8
+           man/qmail-control.9
+           man/qmail-dkim.8
+           man/qmail-dksign.9
+           man/qmail-dkverify.8
+           man/qmail-getpw.9
+           man/qmail-header.5
+           man/qmail-inject.8
+           man/qmail-limits.9
+           man/qmail-local.8
+           man/qmail-log.5
+           man/qmail-lspawn.8
+           man/qmail-mfrules.9
+           man/qmail-mrtg.8
+           man/qmail-newmrh.9
+           man/qmail-newu.9
+           man/qmail-pop3d.8
+           man/qmail-popup.8
+           man/qmail-postgrey.8
+           man/qmail-pw2u.9
+           man/qmail-qmaint.8
+           man/qmail-qmqpc.8
+           man/qmail-qmqpd.8
+           man/qmail-qmtpd.8
+           man/qmail-qread.8
+           man/qmail-qstat.8
+           man/qmail-queue.8
+           man/qmail-recipients.9
+           man/qmail-remote.8
+           man/qmail-rspawn.8
+           man/qmail-send.9
+           man/qmail-showctl.8
+           man/qmail-smtpam.8
+           man/qmail-smtpd.8
+           man/qmail-start.9
+           man/qmail-tcpok.8
+           man/qmail-tcpto.8
+           man/qmail-todo.8
+           man/qmail-users.9
+           man/qmail-vmailuser.9
+           man/qreceipt.1
+           man/setforward.1
+           man/setmaillist.1
+           man/spfquery.8
+           man/splogger.8
+           man/sqmail.9
+           man/srsforward.1
+           man/srsreverse.9
+           man/tai64nfrac.5
+           man/tcp-environ.5
+           man/xqp.1
+           man/xrecipient.1
+           man/xsender.1
+           package/build
+           package/command-cp
+           package/command-ln
+           package/commands-analog
+           package/commands-base
+           package/commands-clients
+           package/commands-control
+           package/commands-dkim
+           package/commands-dns
+           package/commands-forward
+           package/commands-log
+           package/commands-mbox
+           package/commands-pam
+           package/commands-pop
+           package/commands-queue
+           package/commands-recipients
+           package/commands-scan
+           package/commands-server
+           package/commands-setup
+           package/commands-srs
+           package/commands-user
+           package/commands-x509
+           package/compile
+           package/control
+           package/dir
+           package/files
+           package/ids
+           package/install
+           package/legacy
+           package/man
+           package/path
+           package/qmq
+           package/report
+           package/rts
+           package/run
+           package/scripts
+           package/service
+           package/services=d
+           package/sslenv
+           package/ucspissl
+           package/upgrade
+           package/version
+           scripts/Makefile
+           scripts/README.md
+           scripts/TARGETS
+           scripts/it-pam=d
+           scripts/it-recipients=d
+           scripts/it-scan=d
+           scripts/it-x509=d
+           scripts/it=d
+           scripts/ksh-auto.sh
+           scripts/ldap-pam.pl
+           scripts/multiple-queues.sh
+           scripts/perl-auto.sh
+           scripts/qmail-alias2recipients.sh
+           scripts/qmail-queue-scan.sh
+           scripts/warn-auto.sh
+           scripts/x509fingerprint.sh
+           service/run_log
+           service/run_pop3d
+           service/run_pop3sd
+           service/run_postgrey
+           service/run_qmqpd
+           service/run_qmtpd
+           service/run_qmtpsd
+           service/run_send
+           service/run_smtpd
+           service/run_smtpsd
+           service/run_smtpsub
+           service/ssl.env
+           src/Makefile
+           src/TARGETS
+           src/auto-gid.c
+           src/auto-int.c
+           src/auto-int8.c
+           src/auto-str.c
+           src/auto-uid.c
+           src/base64.c
+           src/bouncesaying.c
+           src/chkshsgr.c
+           src/chkspawn.c
+           src/columnt.c
+           src/commands.c
+           src/condredirect.c
+           src/config-fast.sh
+           src/config.sh
+           src/constmap.c
+           src/control.c
+           src/crypt.lib
+           src/date822fmt.c
+           src/datemail.sh
+           src/datetime.c
+           src/ddist.sh
+           src/deferrals.sh
+           src/direntry.h1
+           src/direntry.h2
+           src/dns.c
+           src/dns_tlsa.c
+           src/dnscname.c
+           src/dnsdoe.c
+           src/dnsfq.c
+           src/dnsip.c
+           src/dnsmxip.c
+           src/dnsptr.c
+           src/dnstlsa.c
+           src/dnstxt.c
+           src/except.c
+           src/failures.sh
+           src/fastforward.c
+           src/fifo.c
+           src/find-systype.sh
+           src/fmtqfn.c
+           src/fork.h1
+           src/fork.h2
+           src/forward.c
+           src/gfrom.c
+           src/headerbody.c
+           src/hfield.c
+           src/hier.c
+           src/hmac_md5.c
+           src/hostname.c
+           src/include/auto_break.h
+           src/include/auto_patrn.h
+           src/include/auto_qmail.h
+           src/include/auto_queue.h
+           src/include/auto_spawn.h
+           src/include/auto_split.h
+           src/include/auto_uids.h
+           src/include/auto_usera.h
+           src/include/base64.h
+           src/include/commands.h
+           src/include/constmap.h
+           src/include/control.h
+           src/include/date822fmt.h
+           src/include/datetime.h
+           src/include/dns.h
+           src/include/dnsdoe.h
+           src/include/dnsgettxt.h
+           src/include/exit.h
+           src/include/extra.h
+           src/include/fifo.h
+           src/include/fmtqfn.h
+           src/include/gfrom.h
+           src/include/headerbody.h
+           src/include/hfield.h
+           src/include/hier.h
+           src/include/hmac_md5.h
+           src/include/ipalloc.h
+           src/include/ipme.h
+           src/include/maildir.h
+           src/include/mfrules.h
+           src/include/myctime.h
+           src/include/newfield.h
+           src/include/now.h
+           src/include/prioq.h
+           src/include/prot.h
+           src/include/qlx.h
+           src/include/qmail.h
+           src/include/qsutil.h
+           src/include/quote.h
+           src/include/rcpthosts.h
+           src/include/readsubdir.h
+           src/include/readwrite.h
+           src/include/received.h
+           src/include/recipients.h
+           src/include/sendtodo.h
+           src/include/sha1.h
+           src/include/sha256.h
+           src/include/smtpdlog.h
+           src/include/spf.h
+           src/include/strset.h
+           src/include/tcpto.h
+           src/include/tls_errors.h
+           src/include/tls_remote.h
+           src/include/tls_start.h
+           src/include/tls_timeoutio.h
+           src/include/token822.h
+           src/include/trigger.h
+           src/include/triggerpull.h
+           src/include/ucspitls.h
+           src/include/wildmat.h
+           src/install.c
+           src/instcheck.c
+           src/ipalloc.c
+           src/ipme.c
+           src/ipmeprint.c
+           src/it-analog=d
+           src/it-base=d
+           src/it-clients=d
+           src/it-control=d
+           src/it-dkim=d
+           src/it-dns=d
+           src/it-forward=d
+           src/it-log=d
+           src/it-mbox=d
+           src/it-pam=d
+           src/it-pop=d
+           src/it-queue=d
+           src/it-server=d
+           src/it-setup=d
+           src/it-srs=d
+           src/it-user=d
+           src/it=d
+           src/maildir.c
+           src/maildir2mbox.c
+           src/maildirmake.c
+           src/maildirwatch.c
+           src/mailsubj.sh
+           src/make-compile.sh
+           src/make-load.sh
+           src/make-makelib.sh
+           src/matchup.c
+           src/mfrules.c
+           src/migrate.sh
+           src/myctime.c
+           src/newaliases.c
+           src/newfield.c
+           src/newinclude.c
+           src/now.c
+           src/predate.c
+           src/preline.c
+           src/printforward.c
+           src/printmaillist.c
+           src/prioq.c
+           src/prot.c
+           src/qbiff.c
+           src/qmail-authuser.c
+           src/qmail-badloadertypes.c
+           src/qmail-badmimetypes.c
+           src/qmail-clean.c
+           src/qmail-dksign.c
+           src/qmail-dkverify.c
+           src/qmail-getpw.c
+           src/qmail-inject.c
+           src/qmail-ldapam.c
+           src/qmail-local.c
+           src/qmail-lspawn.c
+           src/qmail-mfrules.c
+           src/qmail-mrtg-queue.sh
+           src/qmail-mrtg.c
+           src/qmail-newmrh.c
+           src/qmail-newu.c
+           src/qmail-pop3d.c
+           src/qmail-popup.c
+           src/qmail-postgrey.c
+           src/qmail-pw2u.c
+           src/qmail-qmaint.c
+           src/qmail-qmqpc.c
+           src/qmail-qmqpd.c
+           src/qmail-qmtpd.c
+           src/qmail-qread.c
+           src/qmail-qstat.sh
+           src/qmail-queue.c
+           src/qmail-recipients.c
+           src/qmail-remote.c
+           src/qmail-rspawn.c
+           src/qmail-send.c
+           src/qmail-showctl.c
+           src/qmail-smtpam.c
+           src/qmail-smtpd.c
+           src/qmail-start.c
+           src/qmail-tcpok.c
+           src/qmail-tcpto.c
+           src/qmail-todo.c
+           src/qmail-upq.sh
+           src/qmail-vmailuser.c
+           src/qmail.c
+           src/qreceipt.c
+           src/qsutil.c
+           src/quote.c
+           src/rcpthosts.c
+           src/readsubdir.c
+           src/received.c
+           src/recipients.c
+           src/recipients.sh
+           src/rhosts.sh
+           src/rxdelay.sh
+           src/select.h1
+           src/select.h2
+           src/senders.sh
+           src/sendmail.c
+           src/setforward.c
+           src/setmaillist.c
+           src/sha1.c
+           src/sha256.c
+           src/smtpdlog.c
+           src/spawn.c
+           src/spf.c
+           src/spfdnsip.c
+           src/spfquery.c
+           src/splogger.c
+           src/srsforward.c
+           src/srsreverse.c
+           src/strset.c
+           src/successes.sh
+           src/suids.sh
+           src/tai64nfrac.c
+           src/tcpto.c
+           src/tcpto_clean.c
+           src/tls_errors.c
+           src/tls_remote.c
+           src/tls_start.c
+           src/tls_timeoutio.c
+           src/token822.c
+           src/trigger.c
+           src/triggerpull.c
+           src/trycpp.c
+           src/trydnsresolv.c
+           src/trydrent.c
+           src/tryflock.c
+           src/tryidn2.c
+           src/tryldap.c
+           src/trylsock.c
+           src/trymkffo.c
+           src/trynpbg1.c
+           src/tryqlibs.c
+           src/tryrsolv.c
+           src/trysalen.c
+           src/trysgact.c
+           src/trysgprm.c
+           src/tryshadow.c
+           src/tryshsgr.c
+           src/tryslib.c
+           src/tryspnam.c
+           src/trysysel.c
+           src/trysyslog.c
+           src/tryulong32.c
+           src/tryuserpw.c
+           src/tryutmp.c
+           src/tryvfork.c
+           src/trywaitp.c
+           src/warn-auto.sh
+           src/warn-shsgr
+           src/wildmat.c
+           src/xqp.sh
+           src/xrecipient.sh
+           src/xsender.sh
+           src/zddist.sh
+           src/zdeferrals.sh
+           src/zfailures.sh
+           src/zoverall.sh
+           src/zrecipients.sh
+           src/zrhosts.sh
+           src/zrxdelay.sh
+           src/zsenders.sh
+           src/zsendmail.sh
+           src/zsuccesses.sh
+           src/zsuids.sh
 Copyright: __NO_COPYRIGHT_NOR_LICENSE__
 License:   __NO_COPYRIGHT_NOR_LICENSE__
 
-Files:     sqmail/sqmail-4.3.16/src/dkim.cpp
-           sqmail/sqmail-4.3.16/src/dkimbase.cpp
-           sqmail/sqmail-4.3.16/src/dkimsign.cpp
-           sqmail/sqmail-4.3.16/src/dkimverify.cpp
-           sqmail/sqmail-4.3.16/src/include/dkim.h
-           sqmail/sqmail-4.3.16/src/include/dkimbase.h
-           sqmail/sqmail-4.3.16/src/include/dkimsign.h
-           sqmail/sqmail-4.3.16/src/include/dkimverify.h
+Files:     src/dkim.cpp
+           src/dkimbase.cpp
+           src/dkimsign.cpp
+           src/dkimverify.cpp
+           src/include/dkim.h
+           src/include/dkimbase.h
+           src/include/dkimsign.h
+           src/include/dkimverify.h
 Copyright: 2005 Alt-N Technologies, Ltd.
-           __NO_COPYRIGHT__ in: sqmail/sqmail-4.3.16/src/dkimverify.cpp
+           __NO_COPYRIGHT__ in: src/dkimverify.cpp
 License:   Apache-2.0
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
@@ -557,7 +557,7 @@ License:   Apache-2.0
  On Debian systems, the complete text of the Apache License Version 2.0
   can be found in `/usr/share/common-licenses/Apache-2.0'.
 
-Files:     sqmail/sqmail-4.3.16/src/srs2.c
+Files:     src/srs2.c
 Copyright: 2004 Shevek (srs@anarres.org)
 License:   GPL-2.0
  This file is a part of libsrs2 from http://www.libsrs2.org/
@@ -581,7 +581,7 @@ License:   GPL-2.0
  On Debian systems, the complete text of the GNU General Public License
  Version 2 can be found in `/usr/share/common-licenses/GPL-2'.
 
-Files:     sqmail/sqmail-4.3.16/src/include/srs2.h
+Files:     src/include/srs2.h
 Copyright: 2004 Shevek (srs@anarres.org)
 License:   GPL-2.0
  This file is a part of libsrs2 from http://www.libsrs2.org/
@@ -598,8 +598,8 @@ License:   GPL-2.0
  On Debian systems, the complete text of the GNU General Public License
  Version 2 can be found in `/usr/share/common-licenses/GPL-2'.
 
-Files:     sqmail/sqmail-4.3.16/scripts/mkdkimkey.sh
-Copyright: __NO_COPYRIGHT__ in: sqmail/sqmail-4.3.16/scripts/mkdkimkey.sh
+Files:     scripts/mkdkimkey.sh
+Copyright: __NO_COPYRIGHT__ in: scripts/mkdkimkey.sh
 License:   GPL-2.0
  Licence: This program is  Copyright(C) C2015 Kai Peter.  It can be copied and #
  modified according to the GNU GENERAL PUBLIC LICENSE (GPL) Version 2 #
@@ -619,7 +619,7 @@ License:   GPL-2.0
  On Debian systems, the complete text of the GNU General Public License
  Version 2 can be found in `/usr/share/common-licenses/GPL-2'.
 
-Files:     sqmail/sqmail-4.3.16/doc/Postgrey.txt
+Files:     doc/Postgrey.txt
 Copyright: 2007 Open Systems AG.
 License:   GPL-2.0+
  LICENSE
@@ -647,7 +647,7 @@ License:   GPL-2.0+
  On Debian systems, the complete text of the GNU General Public License
  Version 2 can be found in `/usr/share/common-licenses/GPL-2'.
 
-Files:     sqmail/sqmail-4.3.16/src/qmail-dkim.cpp
+Files:     src/qmail-dkim.cpp
 Copyright: 2005 Alt-N Technologies, Ltd.
 License:   Apache-2.0
  Licensed under the Apache License, Version 2.0 (the "License");
@@ -675,8 +675,8 @@ License:   Apache-2.0
  On Debian systems, the complete text of the Apache License Version 2.0
   can be found in `/usr/share/common-licenses/Apache-2.0'.
 
-Files:     sqmail/sqmail-4.3.16/doc/Old/PROPOSAL.mav
-Copyright: __NO_COPYRIGHT__ in: sqmail/sqmail-4.3.16/doc/Old/PROPOSAL.mav
+Files:     doc/Old/PROPOSAL.mav
+Copyright: __NO_COPYRIGHT__ in: doc/Old/PROPOSAL.mav
 License:   __UNKNOWN__
  Erwin Hoffmann, feh@fehcom.de
  .
@@ -789,7 +789,7 @@ License:   __UNKNOWN__
  Parts of the MAV approach was first introduced in the SPAMCONTROL
  patch for Qmail 1.03, based on ideas initiated by the LDI, Mainz, Germany.
 
-Files:     sqmail/sqmail-4.3.16/doc/Qmail/README
+Files:     doc/Qmail/README
 Copyright: 1998 D. J. Bernstein, qmail@pobox.com
 License:   __UNKNOWN__
  qmail is a secure, reliable, efficient, simple message transfer agent.
@@ -844,7 +844,7 @@ License:   __UNKNOWN__
  1.01: freebsd-2.1.0-release-:i386-:-:i486-dx-:- (tnx VV)
  1.01: freebsd-2.1.0-release-:i386-:-:i486.dx2-:- (tnx JLB)
 
-Files:     sqmail/sqmail-4.3.16/doc/EXTTODO
+Files:     doc/EXTTODO
 Copyright: 1998-2002 Internet Business Solutions Ltd.
 License:   __UNKNOWN__
  The EXTTODO patch is a part of the qmail-ldap patch.
@@ -856,7 +856,7 @@ License:   __UNKNOWN__
  .
  EXTTODO:
 
-Files:     sqmail/sqmail-4.3.16/src/md5c.c
+Files:     src/md5c.c
 Copyright: 1991 RSA Data Security, Inc. Created 1991. All rights reserved.
 License:   __UNKNOWN__
  License to copy and use this software is granted provided that it
@@ -879,8 +879,8 @@ License:   __UNKNOWN__
  .
  Redone with current POSIX integer data types -- feh, Aug 2024
 
-Files:     sqmail/sqmail-4.3.16/doc/Qmail/THOUGHTS
-Copyright: __NO_COPYRIGHT__ in: sqmail/sqmail-4.3.16/doc/Qmail/THOUGHTS
+Files:     doc/Qmail/THOUGHTS
+Copyright: __NO_COPYRIGHT__ in: doc/Qmail/THOUGHTS
 License:   __UNKNOWN__
  NFS is the primary enemy of security partitioning under UNIX. Here's the
  story. Sun knew from the start that NFS was completely insecure. It
@@ -893,7 +893,7 @@ License:   __UNKNOWN__
  operating system---he'll merely be able to wipe out all user files. This
  clueless policy means that, for example, all the qmail users have to be
 
-Files:     sqmail/sqmail-4.3.16/src/include/md5.h
+Files:     src/include/md5.h
 Copyright: 1991 RSA Data Security, Inc. Created 1991. All rights reserved.
 License:   __UNKNOWN__
  License to copy and use this software is granted provided that it
@@ -914,7 +914,7 @@ License:   __UNKNOWN__
  These notices must be retained in any copies of any part of this
  documentation and/or software.
 
-Files:     sqmail/sqmail-4.3.16/src/include/global.h
+Files:     src/include/global.h
 Copyright: 1991 RSA Laboratories, a division of RSA Data Security, Inc., created
 License:   __NO_LICENSE__
 
diff --git a/sqmail-deb/debian/patches/000-config.patch b/sqmail-deb/debian/patches/000-conf-path.patch
index 4cddde2..f2a60cb 100644
--- a/sqmail-deb/debian/patches/000-config.patch
+++ b/sqmail-deb/debian/patches/000-conf-path.patch
@@ -1,16 +1,16 @@
 Author: Jannis M. Hoffmann
 Description: change queue directory
 
---- sqmail-4.3.16.orig/sqmail/sqmail-4.3.16/conf-queue
-+++ sqmail-4.3.16/sqmail/sqmail-4.3.16/conf-queue
+--- sqmail.orig/conf-queue
++++ sqmail/conf-queue
 @@ -1,3 +1,3 @@
 -/var/qmail
 +/var/lib/qmail
  
  # Note: ./queue/ is added automatically!
 
---- sqmail-4.3.16.orig/sqmail/sqmail-4.3.16/conf-home
-+++ sqmail-4.3.16/sqmail/sqmail-4.3.16/conf-home
+--- sqmail.orig/conf-home
++++ sqmail/conf-home
 @@ -1,4 +1,4 @@
 -/var/qmail
 +/etc/qmail
diff --git a/sqmail-deb/debian/patches/000-make-ucspissl.patch b/sqmail-deb/debian/patches/000-make-ucspissl.patch
index 8c99d83..2775b88 100644
--- a/sqmail-deb/debian/patches/000-make-ucspissl.patch
+++ b/sqmail-deb/debian/patches/000-make-ucspissl.patch
@@ -1,8 +1,8 @@
 Author: Jannis M. Hoffmann
-Description: replace direct ucspissl.a with libucspissl
+Description: replace direct use of ucspissl.a with libucspissl
 
---- sqmail-4.3.16.orig/sqmail/sqmail-4.3.16/src/Makefile
-+++ sqmail-4.3.16/sqmail/sqmail-4.3.16/src/Makefile
+--- sqmail.orig/src/Makefile
++++ sqmail/src/Makefile
 @@ -1051,11 +1051,11 @@ qmail-remote: \
  load qmail-remote.o control.o tcpto.o now.o dns.o ipalloc.o ipme.o \
  quote.o tls_timeoutio.o tls_errors.o tls_remote.o dns_tlsa.o \
diff --git a/sqmail-deb/debian/patches/series b/sqmail-deb/debian/patches/series
index bb8dbf3..5312b47 100644
--- a/sqmail-deb/debian/patches/series
+++ b/sqmail-deb/debian/patches/series
@@ -1,3 +1,3 @@
 # You must remove unused comment lines for the released package.
-000-config.patch
 000-make-ucspissl.patch
+000-conf-path.patch
diff --git a/sqmail-deb/debian/rules b/sqmail-deb/debian/rules
index f079c3f..0446a08 100755
--- a/sqmail-deb/debian/rules
+++ b/sqmail-deb/debian/rules
@@ -8,27 +8,32 @@ export DEB_CFLAGS_MAINT_APPEND  = -g
 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 ../sqmail-$(UPSTREAM_VERSION).tgz --strip-components=2
+	rm sqmail-$(UPSTREAM_VERSION)/conf-cc
+	tar -czf ../sqmail_$(UPSTREAM_VERSION).orig.tar.gz sqmail-$(UPSTREAM_VERSION)
+	rm -r sqmail-$(UPSTREAM_VERSION)/
 
 %:
 	dh $@ --buildsystem=none
 
 override_dh_auto_clean:
-	-tar -xf ../sqmail_$(UPSTREAM_VERSION).orig.tar.gz --strip-components=1 --keep-newer-files
-	rm -f sqmail/sqmail-$(UPSTREAM_VERSION)/src/ssl.lib
-	rm -f sqmail/sqmail-$(UPSTREAM_VERSION)/conf-cc
-	$(MAKE) -C sqmail/sqmail-$(UPSTREAM_VERSION)/src clean
+	-tar -xf ../sqmail_$(UPSTREAM_VERSION).orig.tar.gz --strip-components=1 --skip-old-files
+	rm -f debian/sqmail-users.sysusers
+	rm -f src/ssl.lib
+	rm -f conf-cc
+	$(MAKE) -C src clean
 
 override_dh_auto_configure:
-	awk -f debian/contrib/convert_ids.awk sqmail/sqmail-$(UPSTREAM_VERSION)/conf-ids | expand -t 3,12,26,50 >debian/sqmail-users.sysusers
-	echo "-lssl -lcrypto" >sqmail/sqmail-$(UPSTREAM_VERSION)/src/ssl.lib
-	echo "$(CC) -Iinclude -I/usr/include/qlibs  $(CFLAGS)" >sqmail/sqmail-$(UPSTREAM_VERSION)/conf-cc
-	$(MAKE) -C sqmail/sqmail-$(UPSTREAM_VERSION)/src auto-uid
-	$(MAKE) -C sqmail/sqmail-$(UPSTREAM_VERSION)/src auto-gid
-	cp debian/contrib/auto_uids.c sqmail/sqmail-$(UPSTREAM_VERSION)/src/
+	awk -f debian/contrib/convert_ids.awk conf-ids | expand -t 3,12,26,50 >debian/sqmail-users.sysusers
+	echo "-lssl -lcrypto" >src/ssl.lib
+	echo "$(CC) -Iinclude `pkg-config -cflags qlibs` $(CFLAGS)" >conf-cc
+	$(MAKE) -C src auto-uid
+	$(MAKE) -C src auto-gid
+	cp debian/contrib/auto_uids.c src/
 
 override_dh_auto_build:
-	$(MAKE) -C sqmail/sqmail-$(UPSTREAM_VERSION)/src default
+	$(MAKE) -C src default
 
 override_dh_auto_install:
 	dh_installsysusers
diff --git a/sqmail-deb/debian/sqmail.install b/sqmail-deb/debian/sqmail.install
index 35e3208..3d48fec 100644
--- a/sqmail-deb/debian/sqmail.install
+++ b/sqmail-deb/debian/sqmail.install
@@ -1,143 +1,143 @@
 # base
-sqmail/sqmail-4.3.16/src/qmail-clean          usr/bin
-sqmail/sqmail-4.3.16/src/qmail-inject         usr/bin
-sqmail/sqmail-4.3.16/src/qmail-local          usr/bin
-sqmail/sqmail-4.3.16/src/qmail-lspawn         usr/bin
-sqmail/sqmail-4.3.16/src/qmail-send           usr/bin
-sqmail/sqmail-4.3.16/src/qmail-queue          usr/bin
-sqmail/sqmail-4.3.16/src/qmail-rspawn         usr/bin
-sqmail/sqmail-4.3.16/src/qmail-start          usr/bin
-sqmail/sqmail-4.3.16/src/qmail-todo           usr/bin
+src/qmail-clean          usr/bin
+src/qmail-inject         usr/bin
+src/qmail-local          usr/bin
+src/qmail-lspawn         usr/bin
+src/qmail-send           usr/bin
+src/qmail-queue          usr/bin
+src/qmail-rspawn         usr/bin
+src/qmail-start          usr/bin
+src/qmail-todo           usr/bin
 
 # clients
-sqmail/sqmail-4.3.16/src/mailsubj             usr/bin
-sqmail/sqmail-4.3.16/src/qmail-remote         usr/bin
-sqmail/sqmail-4.3.16/src/qmail-qmqpc          usr/bin
-sqmail/sqmail-4.3.16/src/sendmail             usr/bin
+src/mailsubj             usr/bin
+src/qmail-remote         usr/bin
+src/qmail-qmqpc          usr/bin
+src/sendmail             usr/bin
 
 # control
-sqmail/sqmail-4.3.16/src/qmail-mfrules        usr/bin
-sqmail/sqmail-4.3.16/src/qmail-showctl        usr/bin
-sqmail/sqmail-4.3.16/src/qmail-badloadertypes usr/bin
-sqmail/sqmail-4.3.16/src/qmail-badmimetypes   usr/bin
-sqmail/sqmail-4.3.16/src/qmail-recipients     usr/bin
+src/qmail-mfrules        usr/bin
+src/qmail-showctl        usr/bin
+src/qmail-badloadertypes usr/bin
+src/qmail-badmimetypes   usr/bin
+src/qmail-recipients     usr/bin
 
 # dkim
-sqmail/sqmail-4.3.16/src/qmail-dkim           usr/bin
-sqmail/sqmail-4.3.16/src/qmail-dksign         usr/bin
+src/qmail-dkim           usr/bin
+src/qmail-dksign         usr/bin
 
 # dns
-sqmail/sqmail-4.3.16/src/dnscname             usr/bin
-sqmail/sqmail-4.3.16/src/dnsfq                usr/bin
-sqmail/sqmail-4.3.16/src/dnsip                usr/bin
-sqmail/sqmail-4.3.16/src/dnsmxip              usr/bin
-sqmail/sqmail-4.3.16/src/dnsptr               usr/bin
-sqmail/sqmail-4.3.16/src/dnstlsa              usr/bin
-sqmail/sqmail-4.3.16/src/dnstxt               usr/bin
-sqmail/sqmail-4.3.16/src/hostname             usr/bin
-sqmail/sqmail-4.3.16/src/ipmeprint            usr/bin
-sqmail/sqmail-4.3.16/src/spfquery             usr/bin
+src/dnscname             usr/bin
+src/dnsfq                usr/bin
+src/dnsip                usr/bin
+src/dnsmxip              usr/bin
+src/dnsptr               usr/bin
+src/dnstlsa              usr/bin
+src/dnstxt               usr/bin
+src/hostname             usr/bin
+src/ipmeprint            usr/bin
+src/spfquery             usr/bin
 
 # forward
-sqmail/sqmail-4.3.16/src/fastforward          usr/bin
-sqmail/sqmail-4.3.16/src/forward              usr/bin
-sqmail/sqmail-4.3.16/src/setforward           usr/bin
-sqmail/sqmail-4.3.16/src/newaliases           usr/bin
-sqmail/sqmail-4.3.16/src/newinclude           usr/bin
-sqmail/sqmail-4.3.16/src/printforward         usr/bin
-sqmail/sqmail-4.3.16/src/printmaillist        usr/bin
-sqmail/sqmail-4.3.16/src/setmaillist          usr/bin
+src/fastforward          usr/bin
+src/forward              usr/bin
+src/setforward           usr/bin
+src/newaliases           usr/bin
+src/newinclude           usr/bin
+src/printforward         usr/bin
+src/printmaillist        usr/bin
+src/setmaillist          usr/bin
 
 # log
-sqmail/sqmail-4.3.16/src/qmail-mrtg           usr/bin
-sqmail/sqmail-4.3.16/src/qmail-mrtg-queue     usr/bin
-sqmail/sqmail-4.3.16/src/splogger             usr/bin
-sqmail/sqmail-4.3.16/src/tai64nfrac           usr/bin
+src/qmail-mrtg           usr/bin
+src/qmail-mrtg-queue     usr/bin
+src/splogger             usr/bin
+src/tai64nfrac           usr/bin
 
 # mbox
-sqmail/sqmail-4.3.16/src/condredirect         usr/bin
-sqmail/sqmail-4.3.16/src/bouncesaying         usr/bin
-sqmail/sqmail-4.3.16/src/except               usr/bin
-sqmail/sqmail-4.3.16/src/maildirmake          usr/bin
-sqmail/sqmail-4.3.16/src/maildir2mbox         usr/bin
-sqmail/sqmail-4.3.16/src/maildirwatch         usr/bin
-sqmail/sqmail-4.3.16/src/preline              usr/bin
-sqmail/sqmail-4.3.16/src/qbiff                usr/bin
-sqmail/sqmail-4.3.16/src/qreceipt             usr/bin
+src/condredirect         usr/bin
+src/bouncesaying         usr/bin
+src/except               usr/bin
+src/maildirmake          usr/bin
+src/maildir2mbox         usr/bin
+src/maildirwatch         usr/bin
+src/preline              usr/bin
+src/qbiff                usr/bin
+src/qreceipt             usr/bin
 
 # pam
-sqmail/sqmail-4.3.16/src/qmail-authuser       usr/bin
-sqmail/sqmail-4.3.16/src/qmail-smtpam         usr/bin
-sqmail/sqmail-4.3.16/src/qmail-vmailuser      usr/bin
-sqmail/sqmail-4.3.16/src/qmail-postgrey       usr/bin
+src/qmail-authuser       usr/bin
+src/qmail-smtpam         usr/bin
+src/qmail-vmailuser      usr/bin
+src/qmail-postgrey       usr/bin
 
 # pop
-sqmail/sqmail-4.3.16/src/qmail-pop3d          usr/bin
-sqmail/sqmail-4.3.16/src/qmail-popup          usr/bin
+src/qmail-pop3d          usr/bin
+src/qmail-popup          usr/bin
 
 # queue
-sqmail/sqmail-4.3.16/src/qmail-qread          usr/bin
-sqmail/sqmail-4.3.16/src/qmail-qstat          usr/bin
-sqmail/sqmail-4.3.16/src/qmail-tcpok          usr/bin
-sqmail/sqmail-4.3.16/src/qmail-tcpto          usr/bin
-sqmail/sqmail-4.3.16/src/qmail-qmaint         usr/bin
+src/qmail-qread          usr/bin
+src/qmail-qstat          usr/bin
+src/qmail-tcpok          usr/bin
+src/qmail-tcpto          usr/bin
+src/qmail-qmaint         usr/bin
 
 # recipients
-#sqmail/sqmail-4.3.16/src/qmail-alias2recipients usr/bin
+#src/qmail-alias2recipients usr/bin
 
 # scan
-#sqmail/sqmail-4.3.16/src/qmail-queue-scan     usr/bin
+#src/qmail-queue-scan     usr/bin
 
 # server
-sqmail/sqmail-4.3.16/src/qmail-qmtpd          usr/bin
-sqmail/sqmail-4.3.16/src/qmail-qmqpd          usr/bin
-sqmail/sqmail-4.3.16/src/qmail-smtpd          usr/bin
+src/qmail-qmtpd          usr/bin
+src/qmail-qmqpd          usr/bin
+src/qmail-smtpd          usr/bin
 
 # srs
-sqmail/sqmail-4.3.16/src/srsforward           usr/bin
-sqmail/sqmail-4.3.16/src/srsreverse           usr/bin
+src/srsforward           usr/bin
+src/srsreverse           usr/bin
 
 # user
-sqmail/sqmail-4.3.16/src/qmail-getpw          usr/bin
-sqmail/sqmail-4.3.16/src/qmail-newu           usr/bin
-sqmail/sqmail-4.3.16/src/qmail-newmrh         usr/bin
-sqmail/sqmail-4.3.16/src/qmail-pw2u           usr/bin
+src/qmail-getpw          usr/bin
+src/qmail-newu           usr/bin
+src/qmail-newmrh         usr/bin
+src/qmail-pw2u           usr/bin
 
 # x509
-#sqmail/sqmail-4.3.16/src/x509fingerprint      usr/bin
-#sqmail/sqmail-4.3.16/src/mkdkimkey            usr/bin
+#src/x509fingerprint      usr/bin
+#src/mkdkimkey            usr/bin
 
 # analog
-sqmail/sqmail-4.3.16/src/columnt              usr/bin
-sqmail/sqmail-4.3.16/src/ddist                usr/bin
-sqmail/sqmail-4.3.16/src/deferrals            usr/bin
-sqmail/sqmail-4.3.16/src/failures             usr/bin
-sqmail/sqmail-4.3.16/src/matchup              usr/bin
-sqmail/sqmail-4.3.16/src/recipients           usr/bin
-sqmail/sqmail-4.3.16/src/rhosts               usr/bin
-sqmail/sqmail-4.3.16/src/rxdelay              usr/bin
-sqmail/sqmail-4.3.16/src/senders              usr/bin
-sqmail/sqmail-4.3.16/src/successes            usr/bin
-sqmail/sqmail-4.3.16/src/suids                usr/bin
-sqmail/sqmail-4.3.16/src/xqp                  usr/bin
-sqmail/sqmail-4.3.16/src/xrecipient           usr/bin
-sqmail/sqmail-4.3.16/src/xsender              usr/bin
-sqmail/sqmail-4.3.16/src/zddist               usr/bin
-sqmail/sqmail-4.3.16/src/zdeferrals           usr/bin
-sqmail/sqmail-4.3.16/src/zfailures            usr/bin
-sqmail/sqmail-4.3.16/src/zoverall             usr/bin
-sqmail/sqmail-4.3.16/src/zrecipients          usr/bin
-sqmail/sqmail-4.3.16/src/zrhosts              usr/bin
-sqmail/sqmail-4.3.16/src/zrxdelay             usr/bin
-sqmail/sqmail-4.3.16/src/zsenders             usr/bin
-sqmail/sqmail-4.3.16/src/zsendmail            usr/bin
-sqmail/sqmail-4.3.16/src/zsuccesses           usr/bin
-sqmail/sqmail-4.3.16/src/zsuids               usr/bin
+src/columnt              usr/bin
+src/ddist                usr/bin
+src/deferrals            usr/bin
+src/failures             usr/bin
+src/matchup              usr/bin
+src/recipients           usr/bin
+src/rhosts               usr/bin
+src/rxdelay              usr/bin
+src/senders              usr/bin
+src/successes            usr/bin
+src/suids                usr/bin
+src/xqp                  usr/bin
+src/xrecipient           usr/bin
+src/xsender              usr/bin
+src/zddist               usr/bin
+src/zdeferrals           usr/bin
+src/zfailures            usr/bin
+src/zoverall             usr/bin
+src/zrecipients          usr/bin
+src/zrhosts              usr/bin
+src/zrxdelay             usr/bin
+src/zsenders             usr/bin
+src/zsendmail            usr/bin
+src/zsuccesses           usr/bin
+src/zsuids               usr/bin
 
 # other
-sqmail/sqmail-4.3.16/src/qmail-dkverify       usr/bin
+src/qmail-dkverify       usr/bin
 
-sqmail/sqmail-4.3.16/ctl/*                    etc/qmail/control
+ctl/*                    etc/qmail/control
 
 debian/contrib/sqmail-send.service         usr/lib/systemd/system
 debian/contrib/sqmail-smtpd.service        usr/lib/systemd/system
diff --git a/sqmail-deb/debian/sqmail.links b/sqmail-deb/debian/sqmail.links
index 666be0a..4ec4091 100644
--- a/sqmail-deb/debian/sqmail.links
+++ b/sqmail-deb/debian/sqmail.links
@@ -1 +1 @@
-/usr/bin/     etc/qmail/bin
+/usr/bin/  etc/qmail/bin
diff --git a/sqmail-deb/debian/sqmail.manpages b/sqmail-deb/debian/sqmail.manpages
index 3ce82c3..e74de00 100644
--- a/sqmail-deb/debian/sqmail.manpages
+++ b/sqmail-deb/debian/sqmail.manpages
@@ -1,8 +1,8 @@
-sqmail/sqmail-4.3.16/man/*.[13789]
-sqmail/sqmail-4.3.16/man/addresses.5
-sqmail/sqmail-4.3.16/man/envelopes.5
-sqmail/sqmail-4.3.16/man/maildir.5
-sqmail/sqmail-4.3.16/man/mbox.5
-sqmail/sqmail-4.3.16/man/qmail-header.5
-sqmail/sqmail-4.3.16/man/qmail-log.5
-sqmail/sqmail-4.3.16/man/tai64nfrac.5
+man/*.[13789]
+man/addresses.5
+man/envelopes.5
+man/maildir.5
+man/mbox.5
+man/qmail-header.5
+man/qmail-log.5
+man/tai64nfrac.5