Make packageable

Rearrange file layout for python packaging
Add setup.py
Use python3 style relative imports
Add calm and mksetupini script entry points
Fix tests to locate testdata in the same directory

209 files changed, 97 insertions, 49 deletions

diff --git a/.travis.yml b/.travis.yml
index e6c1776..a5b35c2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,4 +5,4 @@ python:
 install: "pip install pep8 dirq"
 script:
  - ./pep8
- - ./tests.py
+ - python -m unittest discover
diff --git a/calm b/calm
deleted file mode 100755
index ac1524e..0000000
--- a/calm
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/usr/bin/env bash
-base_dir=$(dirname "$0")
-exec python3 "$base_dir/calm.py" "$@"
diff --git a/calm.sh b/calm.sh
new file mode 100755
index 0000000..c8f73c0
--- /dev/null
+++ b/calm.sh
@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+export PYTHONPATH=$(dirname "$0")
+exec python3 -m calm.calm "$@"
diff --git a/testdata/homes/Blooey McFooey/x86/release/not-ready/-not-ready-0.9-1.tar.bz2 b/calm/__init__.py
index e69de29..e69de29 100644
--- a/testdata/homes/Blooey McFooey/x86/release/not-ready/-not-ready-0.9-1.tar.bz2
+++ b/calm/__init__.py
diff --git a/abeyance_handler.py b/calm/abeyance_handler.py
index 227de3c..227de3c 100644
--- a/abeyance_handler.py
+++ b/calm/abeyance_handler.py
diff --git a/buffering_smtp_handler.py b/calm/buffering_smtp_handler.py
index 0bf51a4..13fca18 100644
--- a/buffering_smtp_handler.py
+++ b/calm/buffering_smtp_handler.py
@@ -25,7 +25,7 @@ import logging
 import logging.handlers
 import email.message
 
-import common_constants
+from . import common_constants
 
 
 class BufferingSMTPHandler(logging.handlers.BufferingHandler):
diff --git a/calm.py b/calm/calm.py
index 4393597..c9e5bd9 100755
--- a/calm.py
+++ b/calm/calm.py
@@ -58,15 +58,15 @@ import shutil
 import sys
 import tempfile
 
-from abeyance_handler import AbeyanceHandler
-from buffering_smtp_handler import BufferingSMTPHandler
-import common_constants
-import maintainers
-import package
-import pkg2html
-import queue
-import setup_exe
-import uploads
+from .abeyance_handler import AbeyanceHandler
+from .buffering_smtp_handler import BufferingSMTPHandler
+from . import common_constants
+from . import maintainers
+from . import package
+from . import pkg2html
+from . import queue
+from . import setup_exe
+from . import uploads
 
 
 #
@@ -188,7 +188,7 @@ def process(args):
 #
 #
 
-def main(args):
+def do_main(args):
     # read package set and process uploads
     packages = process(args)
 
@@ -287,7 +287,7 @@ def mail_logs(enabled, toaddrs, subject, thresholdLevel, retainLevel=None):
 #
 #
 
-if __name__ == "__main__":
+def main():
     htdocs_default = os.path.join(common_constants.HTDOCS, 'packages')
     homedir_default = common_constants.HOMEDIR
     orphanmaint_default = common_constants.ORPHANMAINT
@@ -342,4 +342,12 @@ if __name__ == "__main__":
     if args.email:
         args.email = args.email.split(',')
 
-    sys.exit(main(args))
+    do_main(args)
+
+
+#
+#
+#
+
+if __name__ == "__main__":
+    sys.exit(main())
diff --git a/common_constants.py b/calm/common_constants.py
index de4bf46..de4bf46 100644
--- a/common_constants.py
+++ b/calm/common_constants.py
diff --git a/compare-arches b/calm/compare-arches
index d2d6594..d2d6594 100755
--- a/compare-arches
+++ b/calm/compare-arches
diff --git a/fix-missing-cygwin-dep.py b/calm/fix-missing-cygwin-dep.py
index 2a9b3ab..2a9b3ab 100755
--- a/fix-missing-cygwin-dep.py
+++ b/calm/fix-missing-cygwin-dep.py
diff --git a/hint.py b/calm/hint.py
index 2579fad..2579fad 100755
--- a/hint.py
+++ b/calm/hint.py
diff --git a/maintainers.py b/calm/maintainers.py
index 3d6d9c1..3d6d9c1 100644
--- a/maintainers.py
+++ b/calm/maintainers.py
diff --git a/mkmaintdir b/calm/mkmaintdir
index cadeaa6..cadeaa6 100755
--- a/mkmaintdir
+++ b/calm/mkmaintdir
diff --git a/mksetupini b/calm/mksetupini.py
index f87a53c..6add377 100755
--- a/mksetupini
+++ b/calm/mksetupini.py
@@ -33,9 +33,9 @@ import logging
 import os
 import sys
 
-import common_constants
-import hint
-import package
+from . import common_constants
+from . import hint
+from . import package
 
 try:
     import spelling
@@ -46,7 +46,7 @@ except ImportError:
 #
 #
 #
-def main(args):
+def do_main(args):
     # build package list
     packages = package.read_packages(args.rel_area, args.arch)
 
@@ -89,10 +89,11 @@ def stats(packages):
     for c in sorted(histogram, key=histogram.get, reverse=True):
         print('%16s: %4d' % (c, histogram[c]))
 
+
 #
 #
 #
-if __name__ == "__main__":
+def main():
     pkglist_default = common_constants.PKGMAINT
     relarea_default = common_constants.FTP
 
@@ -114,4 +115,12 @@ if __name__ == "__main__":
 
     logging.basicConfig(format=os.path.basename(sys.argv[0])+': %(message)s')
 
-    main(args)
+    do_main(args)
+
+
+#
+#
+#
+
+if __name__ == "__main__":
+    sys.exit(main())
diff --git a/package.py b/calm/package.py
index b515c2e..bf3d680 100755
--- a/package.py
+++ b/calm/package.py
@@ -37,11 +37,11 @@ import tarfile
 import textwrap
 import time
 
-from version import SetupVersion
-import common_constants
-import hint
-import maintainers
-import past_mistakes
+from .version import SetupVersion
+from . import common_constants
+from . import hint
+from . import maintainers
+from . import past_mistakes
 
 
 # information we keep about a package
diff --git a/past_mistakes.py b/calm/past_mistakes.py
index 5e1132f..5e1132f 100644
--- a/past_mistakes.py
+++ b/calm/past_mistakes.py
diff --git a/pkg2html.py b/calm/pkg2html.py
index 2e16076..c5bedb6 100755
--- a/pkg2html.py
+++ b/calm/pkg2html.py
@@ -49,8 +49,8 @@ import tarfile
 import textwrap
 import time
 
-import common_constants
-import package
+from . import common_constants
+from . import package
 
 
 #
diff --git a/queue.py b/calm/queue.py
index 1d352e2..31f3cbb 100644
--- a/queue.py
+++ b/calm/queue.py
@@ -26,7 +26,7 @@ import logging
 import os
 import re
 
-import uploads
+from . import uploads
 
 QUEUE = 'package_queue'
 
diff --git a/setup_exe.py b/calm/setup_exe.py
index d9d85be..d9d85be 100755
--- a/setup_exe.py
+++ b/calm/setup_exe.py
diff --git a/spelling.py b/calm/spelling.py
index 2b477c1..2b477c1 100644
--- a/spelling.py
+++ b/calm/spelling.py
diff --git a/uploads.py b/calm/uploads.py
index afb183b..9c11031 100644
--- a/uploads.py
+++ b/calm/uploads.py
@@ -33,7 +33,7 @@ import re
 import shutil
 import time
 
-import package
+from . import package
 
 # reminders will be issued daily
 REMINDER_INTERVAL = 60*60*24
diff --git a/version.py b/calm/version.py
index 027372f..027372f 100644
--- a/version.py
+++ b/calm/version.py
diff --git a/words.txt b/calm/words.txt
index 9809cce..9809cce 100644
--- a/words.txt
+++ b/calm/words.txt
diff --git a/pep8 b/pep8
index 572ac2d..88158d7 100755
--- a/pep8
+++ b/pep8
@@ -1,2 +1,2 @@
 #!/bin/sh
-grep -s -l '^#!/usr/bin/env python' * | xargs python3 -m pep8 --count --show-source --max-line-length=240
+grep -s -l '^#!/usr/bin/env python' calm/* tests/* | xargs python3 -m pep8 --count --show-source --max-line-length=240
diff --git a/setup.py b/setup.py
new file mode 100644
index 0000000..9f7f513
--- /dev/null
+++ b/setup.py
@@ -0,0 +1,21 @@
+from setuptools import setup
+
+setup(
+    name='calm',
+    version='20160512',
+    description='Cygwin packaging maintenance tool',
+    long_description=open('README.md').read(),
+    author='Jon Turney',
+    author_email='jon.turney@dronecode.org.uk',
+    license='MIT',
+    packages=['calm'],
+    install_requires=['dirq'],
+    entry_points= {
+        'console_scripts': [
+            'calm = calm.calm:main',
+            'mksetupini = calm.mksetupini:main',
+        ],
+    },
+    url='https://cygwin.com/git/?p=cygwin-apps/calm.git',
+    test_suite='tests',
+)
diff --git a/test.sh b/test.sh
new file mode 100755
index 0000000..b4f1c39
--- /dev/null
+++ b/test.sh
@@ -0,0 +1,2 @@
+#!/usr/bin/bash
+exec python3 -m unittest discover
diff --git a/test/__init__.py b/test/__init__.py
new file mode 100644
index 0000000..2e574c0
--- /dev/null
+++ b/test/__init__.py
@@ -0,0 +1,2 @@
+from . import test_calm
+
diff --git a/tests.py b/test/test_calm.py
index 0881ab8..b97b4b7 100755
--- a/tests.py
+++ b/test/test_calm.py
@@ -35,13 +35,13 @@ import tempfile
 import types
 import unittest
 
-from version import SetupVersion
-import calm
-import hint
-import maintainers
-import package
-import pkg2html
-import uploads
+from calm.version import SetupVersion
+import calm.calm
+import calm.hint as hint
+import calm.maintainers as maintainers
+import calm.package as package
+import calm.pkg2html as pkg2html
+import calm.uploads as uploads
 
 
 #
@@ -90,7 +90,7 @@ def capture_dirtree(basedir):
 #
 #
 
-class TestMain(unittest.TestCase):
+class CalmTest(unittest.TestCase):
     def test_hint_parser(self):
         self.maxDiff = None
 
@@ -263,7 +263,7 @@ class TestMain(unittest.TestCase):
         for (f, t) in ready_fns:
             os.system('touch %s "%s"' % (t, f))
 
-        packages = calm.process(args)
+        packages = calm.calm.process(args)
         self.assertTrue(packages)
 
         pkg2html.update_package_listings(args, packages['x86'], 'x86')
@@ -275,14 +275,20 @@ class TestMain(unittest.TestCase):
                 compare_with_expected_file(self, 'testdata/process_arch', dirlist, d)
                 shutil.rmtree(getattr(args, d))
 
-if __name__ == '__main__':
-    # ensure sha512.sum files exist
-    os.system("find testdata/relarea/x86 testdata/relarea/noarch -type d -exec sh -c 'cd {} ; sha512sum * >sha512.sum 2>/dev/null' \;")
-    # should remove a sha512.sum file so that we test functioning when it's absent
-    os.unlink('testdata/relarea/x86/release/naim/sha512.sum')
-    # remove !ready files
-    os.system("find testdata/homes -name !ready -exec rm {} \;")
+    @classmethod
+    def setUpClass(cls):
+        # testdata is located in the same directory as this file
+        os.chdir(os.path.dirname(os.path.abspath(__file__)))
+
+        # ensure sha512.sum files exist
+        os.system("find testdata/relarea/x86 testdata/relarea/noarch -type d -exec sh -c 'cd {} ; sha512sum * >sha512.sum 2>/dev/null' \;")
+        # should remove a sha512.sum file so that we test functioning when it's absent
+        os.unlink('testdata/relarea/x86/release/naim/sha512.sum')
+        # remove !ready files
+        os.system("find testdata/homes -name !ready -exec rm {} \;")
 
+
+if __name__ == '__main__':
     logging.getLogger().setLevel(logging.INFO)
     logging.basicConfig(format='%(message)s')
     unittest.main()
diff --git a/testdata/.gitignore b/test/testdata/.gitignore
index 2dada27..2dada27 100644
--- a/testdata/.gitignore
+++ b/test/testdata/.gitignore
diff --git a/testdata/hints/noarch/release/perl-Net-SMTP-SSL/expected b/test/testdata/hints/noarch/release/perl-Net-SMTP-SSL/expected
index 9516e05..9516e05 100644
--- a/testdata/hints/noarch/release/perl-Net-SMTP-SSL/expected
+++ b/test/testdata/hints/noarch/release/perl-Net-SMTP-SSL/expected
diff --git a/testdata/hints/x86/release/arc/expected b/test/testdata/hints/x86/release/arc/expected
index d0cd27b..d0cd27b 100644
--- a/testdata/hints/x86/release/arc/expected
+++ b/test/testdata/hints/x86/release/arc/expected
diff --git a/testdata/hints/x86/release/base-cygwin/expected b/test/testdata/hints/x86/release/base-cygwin/expected
index 7505632..7505632 100644
--- a/testdata/hints/x86/release/base-cygwin/expected
+++ b/test/testdata/hints/x86/release/base-cygwin/expected
diff --git a/testdata/hints/x86/release/cygwin/cygwin-debuginfo/expected b/test/testdata/hints/x86/release/cygwin/cygwin-debuginfo/expected
index 7359321..7359321 100644
--- a/testdata/hints/x86/release/cygwin/cygwin-debuginfo/expected
+++ b/test/testdata/hints/x86/release/cygwin/cygwin-debuginfo/expected
diff --git a/testdata/hints/x86/release/cygwin/cygwin-devel/expected b/test/testdata/hints/x86/release/cygwin/cygwin-devel/expected
index 19c0b1e..19c0b1e 100644
--- a/testdata/hints/x86/release/cygwin/cygwin-devel/expected
+++ b/test/testdata/hints/x86/release/cygwin/cygwin-devel/expected
diff --git a/testdata/hints/x86/release/cygwin/expected b/test/testdata/hints/x86/release/cygwin/expected
index e2f3476..e2f3476 100644
--- a/testdata/hints/x86/release/cygwin/expected
+++ b/test/testdata/hints/x86/release/cygwin/expected
diff --git a/testdata/hints/x86/release/invalid/expected b/test/testdata/hints/x86/release/invalid/expected
index 95681a8..95681a8 100644
--- a/testdata/hints/x86/release/invalid/expected
+++ b/test/testdata/hints/x86/release/invalid/expected
diff --git a/testdata/hints/x86/release/keychain/expected b/test/testdata/hints/x86/release/keychain/expected
index 4113a2d..4113a2d 100644
--- a/testdata/hints/x86/release/keychain/expected
+++ b/test/testdata/hints/x86/release/keychain/expected
diff --git a/testdata/hints/x86/release/libspiro/expected b/test/testdata/hints/x86/release/libspiro/expected
index b16efe0..b16efe0 100644
--- a/testdata/hints/x86/release/libspiro/expected
+++ b/test/testdata/hints/x86/release/libspiro/expected
diff --git a/testdata/hints/x86/release/libspiro/libspiro-devel/expected b/test/testdata/hints/x86/release/libspiro/libspiro-devel/expected
index b16efe0..b16efe0 100644
--- a/testdata/hints/x86/release/libspiro/libspiro-devel/expected
+++ b/test/testdata/hints/x86/release/libspiro/libspiro-devel/expected
diff --git a/testdata/hints/x86/release/libspiro/libspiro0/expected b/test/testdata/hints/x86/release/libspiro/libspiro0/expected
index b16efe0..b16efe0 100644
--- a/testdata/hints/x86/release/libspiro/libspiro0/expected
+++ b/test/testdata/hints/x86/release/libspiro/libspiro0/expected
diff --git a/testdata/hints/x86/release/libtextcat/expected b/test/testdata/hints/x86/release/libtextcat/expected
index 498e7e5..498e7e5 100644
--- a/testdata/hints/x86/release/libtextcat/expected
+++ b/test/testdata/hints/x86/release/libtextcat/expected
diff --git a/testdata/hints/x86/release/libtextcat/libtextcat-devel/expected b/test/testdata/hints/x86/release/libtextcat/libtextcat-devel/expected
index aca0db6..aca0db6 100644
--- a/testdata/hints/x86/release/libtextcat/libtextcat-devel/expected
+++ b/test/testdata/hints/x86/release/libtextcat/libtextcat-devel/expected
diff --git a/testdata/hints/x86/release/libtextcat/libtextcat0/expected b/test/testdata/hints/x86/release/libtextcat/libtextcat0/expected
index 7f186d6..7f186d6 100644
--- a/testdata/hints/x86/release/libtextcat/libtextcat0/expected
+++ b/test/testdata/hints/x86/release/libtextcat/libtextcat0/expected
diff --git a/testdata/hints/x86/release/mDNSResponder/expected b/test/testdata/hints/x86/release/mDNSResponder/expected
index f02a324..f02a324 100644
--- a/testdata/hints/x86/release/mDNSResponder/expected
+++ b/test/testdata/hints/x86/release/mDNSResponder/expected
diff --git a/testdata/hints/x86/release/mDNSResponder/libdns_sd-devel/expected b/test/testdata/hints/x86/release/mDNSResponder/libdns_sd-devel/expected
index 8e93797..8e93797 100644
--- a/testdata/hints/x86/release/mDNSResponder/libdns_sd-devel/expected
+++ b/test/testdata/hints/x86/release/mDNSResponder/libdns_sd-devel/expected
diff --git a/testdata/hints/x86/release/mDNSResponder/libdns_sd1/expected b/test/testdata/hints/x86/release/mDNSResponder/libdns_sd1/expected
index 45d0032..45d0032 100644
--- a/testdata/hints/x86/release/mDNSResponder/libdns_sd1/expected
+++ b/test/testdata/hints/x86/release/mDNSResponder/libdns_sd1/expected
diff --git a/testdata/hints/x86/release/mingw64-i686-binutils/expected b/test/testdata/hints/x86/release/mingw64-i686-binutils/expected
index 114e53c..114e53c 100644
--- a/testdata/hints/x86/release/mingw64-i686-binutils/expected
+++ b/test/testdata/hints/x86/release/mingw64-i686-binutils/expected
diff --git a/testdata/hints/x86/release/mingw64-i686-binutils/mingw64-i686-binutils-debuginfo/expected b/test/testdata/hints/x86/release/mingw64-i686-binutils/mingw64-i686-binutils-debuginfo/expected
index c936ff6..c936ff6 100644
--- a/testdata/hints/x86/release/mingw64-i686-binutils/mingw64-i686-binutils-debuginfo/expected
+++ b/test/testdata/hints/x86/release/mingw64-i686-binutils/mingw64-i686-binutils-debuginfo/expected
diff --git a/testdata/hints/x86/release/naim/expected b/test/testdata/hints/x86/release/naim/expected
index 9f7710c..9f7710c 100644
--- a/testdata/hints/x86/release/naim/expected
+++ b/test/testdata/hints/x86/release/naim/expected
diff --git a/testdata/hints/x86/release/openssh/expected b/test/testdata/hints/x86/release/openssh/expected
index 8eeefad..8eeefad 100644
--- a/testdata/hints/x86/release/openssh/expected
+++ b/test/testdata/hints/x86/release/openssh/expected
diff --git a/testdata/hints/x86/release/proj/expected b/test/testdata/hints/x86/release/proj/expected
index 40db455..40db455 100644
--- a/testdata/hints/x86/release/proj/expected
+++ b/test/testdata/hints/x86/release/proj/expected
diff --git a/testdata/hints/x86/release/proj/libproj-devel/expected b/test/testdata/hints/x86/release/proj/libproj-devel/expected
index 620f019..620f019 100644
--- a/testdata/hints/x86/release/proj/libproj-devel/expected
+++ b/test/testdata/hints/x86/release/proj/libproj-devel/expected
diff --git a/testdata/hints/x86/release/proj/libproj1/expected b/test/testdata/hints/x86/release/proj/libproj1/expected
index cc05b73..cc05b73 100644
--- a/testdata/hints/x86/release/proj/libproj1/expected
+++ b/test/testdata/hints/x86/release/proj/libproj1/expected
diff --git a/testdata/hints/x86/release/proj/proj-debuginfo/expected b/test/testdata/hints/x86/release/proj/proj-debuginfo/expected
index 6af3a7b..6af3a7b 100644
--- a/testdata/hints/x86/release/proj/proj-debuginfo/expected
+++ b/test/testdata/hints/x86/release/proj/proj-debuginfo/expected
diff --git a/testdata/hints/x86/release/rpm-doc/expected b/test/testdata/hints/x86/release/rpm-doc/expected
index db48c82..db48c82 100644
--- a/testdata/hints/x86/release/rpm-doc/expected
+++ b/test/testdata/hints/x86/release/rpm-doc/expected
diff --git a/testdata/hints/x86/release/splint/expected b/test/testdata/hints/x86/release/splint/expected
index 5667e4b..5667e4b 100644
--- a/testdata/hints/x86/release/splint/expected
+++ b/test/testdata/hints/x86/release/splint/expected
diff --git a/testdata/hints/x86/release/testpackage/expected b/test/testdata/hints/x86/release/testpackage/expected
index de11656..de11656 100644
--- a/testdata/hints/x86/release/testpackage/expected
+++ b/test/testdata/hints/x86/release/testpackage/expected
diff --git a/testdata/homes/Blooey McFooey/noarch/release/perl-Net-SMTP-SSL/perl-Net-SMTP-SSL-1.03-2-src.tar.xz b/test/testdata/homes/Blooey McFooey/noarch/release/perl-Net-SMTP-SSL/perl-Net-SMTP-SSL-1.03-2-src.tar.xz
index 9e7f93d..9e7f93d 100644
--- a/testdata/homes/Blooey McFooey/noarch/release/perl-Net-SMTP-SSL/perl-Net-SMTP-SSL-1.03-2-src.tar.xz
+++ b/test/testdata/homes/Blooey McFooey/noarch/release/perl-Net-SMTP-SSL/perl-Net-SMTP-SSL-1.03-2-src.tar.xz
diff --git a/testdata/homes/Blooey McFooey/noarch/release/perl-Net-SMTP-SSL/perl-Net-SMTP-SSL-1.03-2.tar.xz b/test/testdata/homes/Blooey McFooey/noarch/release/perl-Net-SMTP-SSL/perl-Net-SMTP-SSL-1.03-2.tar.xz
index d986060..d986060 100644
--- a/testdata/homes/Blooey McFooey/noarch/release/perl-Net-SMTP-SSL/perl-Net-SMTP-SSL-1.03-2.tar.xz
+++ b/test/testdata/homes/Blooey McFooey/noarch/release/perl-Net-SMTP-SSL/perl-Net-SMTP-SSL-1.03-2.tar.xz
diff --git a/testdata/homes/Blooey McFooey/noarch/release/perl-Net-SMTP-SSL/setup.hint b/test/testdata/homes/Blooey McFooey/noarch/release/perl-Net-SMTP-SSL/setup.hint
index f91a0e1..f91a0e1 100644
--- a/testdata/homes/Blooey McFooey/noarch/release/perl-Net-SMTP-SSL/setup.hint
+++ b/test/testdata/homes/Blooey McFooey/noarch/release/perl-Net-SMTP-SSL/setup.hint
diff --git a/testdata/homes/Blooey McFooey/x86/release/after-ready/after-ready-1.0-1.tar.bz2 b/test/testdata/homes/Blooey McFooey/x86/release/after-ready/after-ready-1.0-1.tar.bz2
index a1145fb..a1145fb 100644
--- a/testdata/homes/Blooey McFooey/x86/release/after-ready/after-ready-1.0-1.tar.bz2
+++ b/test/testdata/homes/Blooey McFooey/x86/release/after-ready/after-ready-1.0-1.tar.bz2
diff --git a/testdata/homes/Blooey McFooey/x86/release/after-ready/setup.hint b/test/testdata/homes/Blooey McFooey/x86/release/after-ready/setup.hint
index 676f218..676f218 100644
--- a/testdata/homes/Blooey McFooey/x86/release/after-ready/setup.hint
+++ b/test/testdata/homes/Blooey McFooey/x86/release/after-ready/setup.hint
diff --git a/testdata/homes/Blooey McFooey/x86/release/not-on-maintainer-list/not-on-maintainer-list-1.0-1.tar.bz2 b/test/testdata/homes/Blooey McFooey/x86/release/not-on-maintainer-list/not-on-maintainer-list-1.0-1.tar.bz2
index a1145fb..a1145fb 100644
--- a/testdata/homes/Blooey McFooey/x86/release/not-on-maintainer-list/not-on-maintainer-list-1.0-1.tar.bz2
+++ b/test/testdata/homes/Blooey McFooey/x86/release/not-on-maintainer-list/not-on-maintainer-list-1.0-1.tar.bz2
diff --git a/testdata/homes/Blooey McFooey/x86/release/not-on-maintainer-list/setup.hint b/test/testdata/homes/Blooey McFooey/x86/release/not-on-maintainer-list/setup.hint
index c5cf25f..c5cf25f 100644
--- a/testdata/homes/Blooey McFooey/x86/release/not-on-maintainer-list/setup.hint
+++ b/test/testdata/homes/Blooey McFooey/x86/release/not-on-maintainer-list/setup.hint
diff --git a/testdata/homes/Blooey McFooey/x86/release/not-on-package-list/not-on-package-list-1.0-1.tar.bz2 b/test/testdata/homes/Blooey McFooey/x86/release/not-on-package-list/not-on-package-list-1.0-1.tar.bz2
index a1145fb..a1145fb 100644
--- a/testdata/homes/Blooey McFooey/x86/release/not-on-package-list/not-on-package-list-1.0-1.tar.bz2
+++ b/test/testdata/homes/Blooey McFooey/x86/release/not-on-package-list/not-on-package-list-1.0-1.tar.bz2
diff --git a/testdata/homes/Blooey McFooey/x86/release/not-on-package-list/setup.hint b/test/testdata/homes/Blooey McFooey/x86/release/not-on-package-list/setup.hint
index 3a5d066..3a5d066 100644
--- a/testdata/homes/Blooey McFooey/x86/release/not-on-package-list/setup.hint
+++ b/test/testdata/homes/Blooey McFooey/x86/release/not-on-package-list/setup.hint
diff --git a/testdata/homes/Blooey McFooey/x86/release/testpackage/-testpackage-0.1-1.tar.bz2 b/test/testdata/homes/Blooey McFooey/x86/release/not-ready/-not-ready-0.9-1.tar.bz2
index e69de29..e69de29 100644
--- a/testdata/homes/Blooey McFooey/x86/release/testpackage/-testpackage-0.1-1.tar.bz2
+++ b/test/testdata/homes/Blooey McFooey/x86/release/not-ready/-not-ready-0.9-1.tar.bz2
diff --git a/testdata/homes/Blooey McFooey/x86/release/not-ready/not-ready-1.0-1.tar.bz2 b/test/testdata/homes/Blooey McFooey/x86/release/not-ready/not-ready-1.0-1.tar.bz2
index a1145fb..a1145fb 100644
--- a/testdata/homes/Blooey McFooey/x86/release/not-ready/not-ready-1.0-1.tar.bz2
+++ b/test/testdata/homes/Blooey McFooey/x86/release/not-ready/not-ready-1.0-1.tar.bz2
diff --git a/testdata/homes/Blooey McFooey/x86/release/not-ready/setup.hint b/test/testdata/homes/Blooey McFooey/x86/release/not-ready/setup.hint
index f459a37..f459a37 100644
--- a/testdata/homes/Blooey McFooey/x86/release/not-ready/setup.hint
+++ b/test/testdata/homes/Blooey McFooey/x86/release/not-ready/setup.hint
diff --git a/testdata/homes/Blooey McFooey/x86/release/testpackage2/testpackage2-subpackage/inprogress.SftpXFR.1234 b/test/testdata/homes/Blooey McFooey/x86/release/testpackage/-testpackage-0.1-1.tar.bz2
index e69de29..e69de29 100644
--- a/testdata/homes/Blooey McFooey/x86/release/testpackage2/testpackage2-subpackage/inprogress.SftpXFR.1234
+++ b/test/testdata/homes/Blooey McFooey/x86/release/testpackage/-testpackage-0.1-1.tar.bz2
diff --git a/testdata/homes/Blooey McFooey/x86/release/testpackage/setup.hint b/test/testdata/homes/Blooey McFooey/x86/release/testpackage/setup.hint
index 290111b..290111b 100644
--- a/testdata/homes/Blooey McFooey/x86/release/testpackage/setup.hint
+++ b/test/testdata/homes/Blooey McFooey/x86/release/testpackage/setup.hint
diff --git a/testdata/homes/Blooey McFooey/x86/release/testpackage/testpackage-1.0-1-src.tar.bz2 b/test/testdata/homes/Blooey McFooey/x86/release/testpackage/testpackage-1.0-1-src.tar.bz2
index a1145fb..a1145fb 100644
--- a/testdata/homes/Blooey McFooey/x86/release/testpackage/testpackage-1.0-1-src.tar.bz2
+++ b/test/testdata/homes/Blooey McFooey/x86/release/testpackage/testpackage-1.0-1-src.tar.bz2
diff --git a/testdata/homes/Blooey McFooey/x86/release/testpackage/testpackage-1.0-1.tar.bz2 b/test/testdata/homes/Blooey McFooey/x86/release/testpackage/testpackage-1.0-1.tar.bz2
index a1145fb..a1145fb 100644
--- a/testdata/homes/Blooey McFooey/x86/release/testpackage/testpackage-1.0-1.tar.bz2
+++ b/test/testdata/homes/Blooey McFooey/x86/release/testpackage/testpackage-1.0-1.tar.bz2
diff --git a/testdata/homes/Blooey McFooey/x86/release/testpackage/testpackage-subpackage/setup.hint b/test/testdata/homes/Blooey McFooey/x86/release/testpackage/testpackage-subpackage/setup.hint
index 90f7384..90f7384 100644
--- a/testdata/homes/Blooey McFooey/x86/release/testpackage/testpackage-subpackage/setup.hint
+++ b/test/testdata/homes/Blooey McFooey/x86/release/testpackage/testpackage-subpackage/setup.hint
diff --git a/testdata/homes/Blooey McFooey/x86/release/testpackage/testpackage-subpackage/testpackage-subpackage-1.0-1.tar.bz2 b/test/testdata/homes/Blooey McFooey/x86/release/testpackage/testpackage-subpackage/testpackage-subpackage-1.0-1.tar.bz2
index a1145fb..a1145fb 100644
--- a/testdata/homes/Blooey McFooey/x86/release/testpackage/testpackage-subpackage/testpackage-subpackage-1.0-1.tar.bz2
+++ b/test/testdata/homes/Blooey McFooey/x86/release/testpackage/testpackage-subpackage/testpackage-subpackage-1.0-1.tar.bz2
diff --git a/testdata/homes/Blooey McFooey/x86/release/testpackage2/setup.hint b/test/testdata/homes/Blooey McFooey/x86/release/testpackage2/setup.hint
index 5ac3a09..5ac3a09 100644
--- a/testdata/homes/Blooey McFooey/x86/release/testpackage2/setup.hint
+++ b/test/testdata/homes/Blooey McFooey/x86/release/testpackage2/setup.hint
diff --git a/testdata/homes/Blooey McFooey/x86/release/testpackage2/testpackage2-1.0-1.tar.bz2 b/test/testdata/homes/Blooey McFooey/x86/release/testpackage2/testpackage2-1.0-1.tar.bz2
index a1145fb..a1145fb 100644
--- a/testdata/homes/Blooey McFooey/x86/release/testpackage2/testpackage2-1.0-1.tar.bz2
+++ b/test/testdata/homes/Blooey McFooey/x86/release/testpackage2/testpackage2-1.0-1.tar.bz2
diff --git a/testdata/homes/an_unexpected_file b/test/testdata/homes/Blooey McFooey/x86/release/testpackage2/testpackage2-subpackage/inprogress.SftpXFR.1234
index e69de29..e69de29 100644
--- a/testdata/homes/an_unexpected_file
+++ b/test/testdata/homes/Blooey McFooey/x86/release/testpackage2/testpackage2-subpackage/inprogress.SftpXFR.1234
diff --git a/testdata/homes/Blooey McFooey/x86/release/testpackage2/testpackage2-subpackage/setup.hint b/test/testdata/homes/Blooey McFooey/x86/release/testpackage2/testpackage2-subpackage/setup.hint
index 6871ea5..6871ea5 100644
--- a/testdata/homes/Blooey McFooey/x86/release/testpackage2/testpackage2-subpackage/setup.hint
+++ b/test/testdata/homes/Blooey McFooey/x86/release/testpackage2/testpackage2-subpackage/setup.hint
diff --git a/testdata/homes/Blooey McFooey/x86/release/testpackage2/testpackage2-subpackage/testpackage2-subpackage-1.0-1.tar.bz2 b/test/testdata/homes/Blooey McFooey/x86/release/testpackage2/testpackage2-subpackage/testpackage2-subpackage-1.0-1.tar.bz2
index a1145fb..a1145fb 100644
--- a/testdata/homes/Blooey McFooey/x86/release/testpackage2/testpackage2-subpackage/testpackage2-subpackage-1.0-1.tar.bz2
+++ b/test/testdata/homes/Blooey McFooey/x86/release/testpackage2/testpackage2-subpackage/testpackage2-subpackage-1.0-1.tar.bz2
diff --git a/testdata/homes/Jon Turney/!email b/test/testdata/homes/Jon Turney/!email
index 1c1f109..1c1f109 100644
--- a/testdata/homes/Jon Turney/!email
+++ b/test/testdata/homes/Jon Turney/!email
diff --git a/testdata/relarea/x86/release/cygwin/.this-should-be-ignored b/test/testdata/homes/an_unexpected_file
index e69de29..e69de29 100644
--- a/testdata/relarea/x86/release/cygwin/.this-should-be-ignored
+++ b/test/testdata/homes/an_unexpected_file
diff --git a/testdata/htdocs.expected/x86/.htaccess b/test/testdata/htdocs.expected/x86/.htaccess
index 1ea7b18..1ea7b18 100644
--- a/testdata/htdocs.expected/x86/.htaccess
+++ b/test/testdata/htdocs.expected/x86/.htaccess
diff --git a/testdata/htdocs.expected/x86/arc/.htaccess b/test/testdata/htdocs.expected/x86/arc/.htaccess
index 3196d64..3196d64 100644
--- a/testdata/htdocs.expected/x86/arc/.htaccess
+++ b/test/testdata/htdocs.expected/x86/arc/.htaccess
diff --git a/testdata/htdocs.expected/x86/arc/arc-4.32.7-10 b/test/testdata/htdocs.expected/x86/arc/arc-4.32.7-10
index caaa863..caaa863 100644
--- a/testdata/htdocs.expected/x86/arc/arc-4.32.7-10
+++ b/test/testdata/htdocs.expected/x86/arc/arc-4.32.7-10
diff --git a/testdata/htdocs.expected/x86/arc/arc-4.32.7-10-src b/test/testdata/htdocs.expected/x86/arc/arc-4.32.7-10-src
index d5ad98a..d5ad98a 100644
--- a/testdata/htdocs.expected/x86/arc/arc-4.32.7-10-src
+++ b/test/testdata/htdocs.expected/x86/arc/arc-4.32.7-10-src
diff --git a/testdata/htdocs.expected/x86/base-cygwin/.htaccess b/test/testdata/htdocs.expected/x86/base-cygwin/.htaccess
index 3196d64..3196d64 100644
--- a/testdata/htdocs.expected/x86/base-cygwin/.htaccess
+++ b/test/testdata/htdocs.expected/x86/base-cygwin/.htaccess
diff --git a/testdata/htdocs.expected/x86/base-cygwin/base-cygwin-3.6-1 b/test/testdata/htdocs.expected/x86/base-cygwin/base-cygwin-3.6-1
index a6c9d6c..a6c9d6c 100644
--- a/testdata/htdocs.expected/x86/base-cygwin/base-cygwin-3.6-1
+++ b/test/testdata/htdocs.expected/x86/base-cygwin/base-cygwin-3.6-1
diff --git a/testdata/htdocs.expected/x86/base-cygwin/base-cygwin-3.8-1 b/test/testdata/htdocs.expected/x86/base-cygwin/base-cygwin-3.8-1
index a6c9d6c..a6c9d6c 100644
--- a/testdata/htdocs.expected/x86/base-cygwin/base-cygwin-3.8-1
+++ b/test/testdata/htdocs.expected/x86/base-cygwin/base-cygwin-3.8-1
diff --git a/testdata/htdocs.expected/x86/cygwin-debuginfo/.htaccess b/test/testdata/htdocs.expected/x86/cygwin-debuginfo/.htaccess
index 3196d64..3196d64 100644
--- a/testdata/htdocs.expected/x86/cygwin-debuginfo/.htaccess
+++ b/test/testdata/htdocs.expected/x86/cygwin-debuginfo/.htaccess
diff --git a/testdata/htdocs.expected/x86/cygwin-debuginfo/cygwin-debuginfo-2.2.0-1 b/test/testdata/htdocs.expected/x86/cygwin-debuginfo/cygwin-debuginfo-2.2.0-1
index df6375b..df6375b 100644
--- a/testdata/htdocs.expected/x86/cygwin-debuginfo/cygwin-debuginfo-2.2.0-1
+++ b/test/testdata/htdocs.expected/x86/cygwin-debuginfo/cygwin-debuginfo-2.2.0-1
diff --git a/testdata/htdocs.expected/x86/cygwin-debuginfo/cygwin-debuginfo-2.2.1-1 b/test/testdata/htdocs.expected/x86/cygwin-debuginfo/cygwin-debuginfo-2.2.1-1
index df6375b..df6375b 100644
--- a/testdata/htdocs.expected/x86/cygwin-debuginfo/cygwin-debuginfo-2.2.1-1
+++ b/test/testdata/htdocs.expected/x86/cygwin-debuginfo/cygwin-debuginfo-2.2.1-1
diff --git a/testdata/htdocs.expected/x86/cygwin-debuginfo/cygwin-debuginfo-2.3.0-0.3 b/test/testdata/htdocs.expected/x86/cygwin-debuginfo/cygwin-debuginfo-2.3.0-0.3
index df6375b..df6375b 100644
--- a/testdata/htdocs.expected/x86/cygwin-debuginfo/cygwin-debuginfo-2.3.0-0.3
+++ b/test/testdata/htdocs.expected/x86/cygwin-debuginfo/cygwin-debuginfo-2.3.0-0.3
diff --git a/testdata/htdocs.expected/x86/cygwin-devel/.htaccess b/test/testdata/htdocs.expected/x86/cygwin-devel/.htaccess
index 3196d64..3196d64 100644
--- a/testdata/htdocs.expected/x86/cygwin-devel/.htaccess
+++ b/test/testdata/htdocs.expected/x86/cygwin-devel/.htaccess
diff --git a/testdata/htdocs.expected/x86/cygwin-devel/cygwin-devel-2.2.0-1 b/test/testdata/htdocs.expected/x86/cygwin-devel/cygwin-devel-2.2.0-1
index fe87025..fe87025 100644
--- a/testdata/htdocs.expected/x86/cygwin-devel/cygwin-devel-2.2.0-1
+++ b/test/testdata/htdocs.expected/x86/cygwin-devel/cygwin-devel-2.2.0-1
diff --git a/testdata/htdocs.expected/x86/cygwin-devel/cygwin-devel-2.2.1-1 b/test/testdata/htdocs.expected/x86/cygwin-devel/cygwin-devel-2.2.1-1
index fe87025..fe87025 100644
--- a/testdata/htdocs.expected/x86/cygwin-devel/cygwin-devel-2.2.1-1
+++ b/test/testdata/htdocs.expected/x86/cygwin-devel/cygwin-devel-2.2.1-1
diff --git a/testdata/htdocs.expected/x86/cygwin-devel/cygwin-devel-2.3.0-0.3 b/test/testdata/htdocs.expected/x86/cygwin-devel/cygwin-devel-2.3.0-0.3
index fe87025..fe87025 100644
--- a/testdata/htdocs.expected/x86/cygwin-devel/cygwin-devel-2.3.0-0.3
+++ b/test/testdata/htdocs.expected/x86/cygwin-devel/cygwin-devel-2.3.0-0.3
diff --git a/testdata/htdocs.expected/x86/cygwin/.htaccess b/test/testdata/htdocs.expected/x86/cygwin/.htaccess
index 3196d64..3196d64 100644
--- a/testdata/htdocs.expected/x86/cygwin/.htaccess
+++ b/test/testdata/htdocs.expected/x86/cygwin/.htaccess
diff --git a/testdata/htdocs.expected/x86/cygwin/cygwin-2.2.0-1 b/test/testdata/htdocs.expected/x86/cygwin/cygwin-2.2.0-1
index 11bb5f6..11bb5f6 100644
--- a/testdata/htdocs.expected/x86/cygwin/cygwin-2.2.0-1
+++ b/test/testdata/htdocs.expected/x86/cygwin/cygwin-2.2.0-1
diff --git a/testdata/htdocs.expected/x86/cygwin/cygwin-2.2.0-1-src b/test/testdata/htdocs.expected/x86/cygwin/cygwin-2.2.0-1-src
index ab98562..ab98562 100644
--- a/testdata/htdocs.expected/x86/cygwin/cygwin-2.2.0-1-src
+++ b/test/testdata/htdocs.expected/x86/cygwin/cygwin-2.2.0-1-src
diff --git a/testdata/htdocs.expected/x86/cygwin/cygwin-2.2.1-1 b/test/testdata/htdocs.expected/x86/cygwin/cygwin-2.2.1-1
index 11bb5f6..11bb5f6 100644
--- a/testdata/htdocs.expected/x86/cygwin/cygwin-2.2.1-1
+++ b/test/testdata/htdocs.expected/x86/cygwin/cygwin-2.2.1-1
diff --git a/testdata/htdocs.expected/x86/cygwin/cygwin-2.2.1-1-src b/test/testdata/htdocs.expected/x86/cygwin/cygwin-2.2.1-1-src
index ab98562..ab98562 100644
--- a/testdata/htdocs.expected/x86/cygwin/cygwin-2.2.1-1-src
+++ b/test/testdata/htdocs.expected/x86/cygwin/cygwin-2.2.1-1-src
diff --git a/testdata/htdocs.expected/x86/cygwin/cygwin-2.3.0-0.3 b/test/testdata/htdocs.expected/x86/cygwin/cygwin-2.3.0-0.3
index 11bb5f6..11bb5f6 100644
--- a/testdata/htdocs.expected/x86/cygwin/cygwin-2.3.0-0.3
+++ b/test/testdata/htdocs.expected/x86/cygwin/cygwin-2.3.0-0.3
diff --git a/testdata/htdocs.expected/x86/cygwin/cygwin-2.3.0-0.3-src b/test/testdata/htdocs.expected/x86/cygwin/cygwin-2.3.0-0.3-src
index ab98562..ab98562 100644
--- a/testdata/htdocs.expected/x86/cygwin/cygwin-2.3.0-0.3-src
+++ b/test/testdata/htdocs.expected/x86/cygwin/cygwin-2.3.0-0.3-src
diff --git a/testdata/htdocs.expected/x86/keychain/.htaccess b/test/testdata/htdocs.expected/x86/keychain/.htaccess
index 3196d64..3196d64 100644
--- a/testdata/htdocs.expected/x86/keychain/.htaccess
+++ b/test/testdata/htdocs.expected/x86/keychain/.htaccess
diff --git a/testdata/htdocs.expected/x86/keychain/keychain-2.6.8-1 b/test/testdata/htdocs.expected/x86/keychain/keychain-2.6.8-1
index 543226a..543226a 100644
--- a/testdata/htdocs.expected/x86/keychain/keychain-2.6.8-1
+++ b/test/testdata/htdocs.expected/x86/keychain/keychain-2.6.8-1
diff --git a/testdata/htdocs.expected/x86/keychain/keychain-2.6.8-1-src b/test/testdata/htdocs.expected/x86/keychain/keychain-2.6.8-1-src
index 0b4f281..0b4f281 100644
--- a/testdata/htdocs.expected/x86/keychain/keychain-2.6.8-1-src
+++ b/test/testdata/htdocs.expected/x86/keychain/keychain-2.6.8-1-src
diff --git a/testdata/htdocs.expected/x86/keychain/keychain-2.7.1-1 b/test/testdata/htdocs.expected/x86/keychain/keychain-2.7.1-1
index c6bfe4f..c6bfe4f 100644
--- a/testdata/htdocs.expected/x86/keychain/keychain-2.7.1-1
+++ b/test/testdata/htdocs.expected/x86/keychain/keychain-2.7.1-1
diff --git a/testdata/htdocs.expected/x86/keychain/keychain-2.7.1-1-src b/test/testdata/htdocs.expected/x86/keychain/keychain-2.7.1-1-src
index ce348ee..ce348ee 100644
--- a/testdata/htdocs.expected/x86/keychain/keychain-2.7.1-1-src
+++ b/test/testdata/htdocs.expected/x86/keychain/keychain-2.7.1-1-src
diff --git a/testdata/htdocs.expected/x86/libdns_sd-devel/.htaccess b/test/testdata/htdocs.expected/x86/libdns_sd-devel/.htaccess
index 3196d64..3196d64 100644
--- a/testdata/htdocs.expected/x86/libdns_sd-devel/.htaccess
+++ b/test/testdata/htdocs.expected/x86/libdns_sd-devel/.htaccess
diff --git a/testdata/htdocs.expected/x86/libdns_sd-devel/libdns_sd-devel-379.32.1-1 b/test/testdata/htdocs.expected/x86/libdns_sd-devel/libdns_sd-devel-379.32.1-1
index 487ca66..487ca66 100644
--- a/testdata/htdocs.expected/x86/libdns_sd-devel/libdns_sd-devel-379.32.1-1
+++ b/test/testdata/htdocs.expected/x86/libdns_sd-devel/libdns_sd-devel-379.32.1-1
diff --git a/testdata/htdocs.expected/x86/libdns_sd1/.htaccess b/test/testdata/htdocs.expected/x86/libdns_sd1/.htaccess
index 3196d64..3196d64 100644
--- a/testdata/htdocs.expected/x86/libdns_sd1/.htaccess
+++ b/test/testdata/htdocs.expected/x86/libdns_sd1/.htaccess
diff --git a/testdata/htdocs.expected/x86/libdns_sd1/libdns_sd1-379.32.1-1 b/test/testdata/htdocs.expected/x86/libdns_sd1/libdns_sd1-379.32.1-1
index ef59595..ef59595 100644
--- a/testdata/htdocs.expected/x86/libdns_sd1/libdns_sd1-379.32.1-1
+++ b/test/testdata/htdocs.expected/x86/libdns_sd1/libdns_sd1-379.32.1-1
diff --git a/testdata/htdocs.expected/x86/libtextcat-devel/.htaccess b/test/testdata/htdocs.expected/x86/libtextcat-devel/.htaccess
index 3196d64..3196d64 100644
--- a/testdata/htdocs.expected/x86/libtextcat-devel/.htaccess
+++ b/test/testdata/htdocs.expected/x86/libtextcat-devel/.htaccess
diff --git a/testdata/htdocs.expected/x86/libtextcat-devel/libtextcat-devel-2.2-2 b/test/testdata/htdocs.expected/x86/libtextcat-devel/libtextcat-devel-2.2-2
index 03d1ee6..03d1ee6 100644
--- a/testdata/htdocs.expected/x86/libtextcat-devel/libtextcat-devel-2.2-2
+++ b/test/testdata/htdocs.expected/x86/libtextcat-devel/libtextcat-devel-2.2-2
diff --git a/testdata/htdocs.expected/x86/libtextcat0/.htaccess b/test/testdata/htdocs.expected/x86/libtextcat0/.htaccess
index 3196d64..3196d64 100644
--- a/testdata/htdocs.expected/x86/libtextcat0/.htaccess
+++ b/test/testdata/htdocs.expected/x86/libtextcat0/.htaccess
diff --git a/testdata/htdocs.expected/x86/libtextcat0/libtextcat0-2.2-2 b/test/testdata/htdocs.expected/x86/libtextcat0/libtextcat0-2.2-2
index 076ed7a..076ed7a 100644
--- a/testdata/htdocs.expected/x86/libtextcat0/libtextcat0-2.2-2
+++ b/test/testdata/htdocs.expected/x86/libtextcat0/libtextcat0-2.2-2
diff --git a/testdata/htdocs.expected/x86/mDNSResponder/.htaccess b/test/testdata/htdocs.expected/x86/mDNSResponder/.htaccess
index 3196d64..3196d64 100644
--- a/testdata/htdocs.expected/x86/mDNSResponder/.htaccess
+++ b/test/testdata/htdocs.expected/x86/mDNSResponder/.htaccess
diff --git a/testdata/htdocs.expected/x86/mDNSResponder/mDNSResponder-379.32.1-1 b/test/testdata/htdocs.expected/x86/mDNSResponder/mDNSResponder-379.32.1-1
index 67c4449..67c4449 100644
--- a/testdata/htdocs.expected/x86/mDNSResponder/mDNSResponder-379.32.1-1
+++ b/test/testdata/htdocs.expected/x86/mDNSResponder/mDNSResponder-379.32.1-1
diff --git a/testdata/htdocs.expected/x86/mDNSResponder/mDNSResponder-379.32.1-1-src b/test/testdata/htdocs.expected/x86/mDNSResponder/mDNSResponder-379.32.1-1-src
index 9a7db69..9a7db69 100644
--- a/testdata/htdocs.expected/x86/mDNSResponder/mDNSResponder-379.32.1-1-src
+++ b/test/testdata/htdocs.expected/x86/mDNSResponder/mDNSResponder-379.32.1-1-src
diff --git a/testdata/htdocs.expected/x86/naim/.htaccess b/test/testdata/htdocs.expected/x86/naim/.htaccess
index 3196d64..3196d64 100644
--- a/testdata/htdocs.expected/x86/naim/.htaccess
+++ b/test/testdata/htdocs.expected/x86/naim/.htaccess
diff --git a/testdata/htdocs.expected/x86/openssh/.htaccess b/test/testdata/htdocs.expected/x86/openssh/.htaccess
index 3196d64..3196d64 100644
--- a/testdata/htdocs.expected/x86/openssh/.htaccess
+++ b/test/testdata/htdocs.expected/x86/openssh/.htaccess
diff --git a/testdata/htdocs.expected/x86/openssh/openssh-7.2p2-1 b/test/testdata/htdocs.expected/x86/openssh/openssh-7.2p2-1
index cb2b272..cb2b272 100644
--- a/testdata/htdocs.expected/x86/openssh/openssh-7.2p2-1
+++ b/test/testdata/htdocs.expected/x86/openssh/openssh-7.2p2-1
diff --git a/testdata/htdocs.expected/x86/openssh/openssh-7.2p2-1-src b/test/testdata/htdocs.expected/x86/openssh/openssh-7.2p2-1-src
index e85cbee..e85cbee 100644
--- a/testdata/htdocs.expected/x86/openssh/openssh-7.2p2-1-src
+++ b/test/testdata/htdocs.expected/x86/openssh/openssh-7.2p2-1-src
diff --git a/testdata/htdocs.expected/x86/packages.inc b/test/testdata/htdocs.expected/x86/packages.inc
index 289a07e..289a07e 100755
--- a/testdata/htdocs.expected/x86/packages.inc
+++ b/test/testdata/htdocs.expected/x86/packages.inc
diff --git a/testdata/htdocs.expected/x86/perl-Net-SMTP-SSL/.htaccess b/test/testdata/htdocs.expected/x86/perl-Net-SMTP-SSL/.htaccess
index 3196d64..3196d64 100644
--- a/testdata/htdocs.expected/x86/perl-Net-SMTP-SSL/.htaccess
+++ b/test/testdata/htdocs.expected/x86/perl-Net-SMTP-SSL/.htaccess
diff --git a/testdata/htdocs.expected/x86/perl-Net-SMTP-SSL/perl-Net-SMTP-SSL-1.03-1 b/test/testdata/htdocs.expected/x86/perl-Net-SMTP-SSL/perl-Net-SMTP-SSL-1.03-1
index 0f6212c..0f6212c 100644
--- a/testdata/htdocs.expected/x86/perl-Net-SMTP-SSL/perl-Net-SMTP-SSL-1.03-1
+++ b/test/testdata/htdocs.expected/x86/perl-Net-SMTP-SSL/perl-Net-SMTP-SSL-1.03-1
diff --git a/testdata/htdocs.expected/x86/perl-Net-SMTP-SSL/perl-Net-SMTP-SSL-1.03-1-src b/test/testdata/htdocs.expected/x86/perl-Net-SMTP-SSL/perl-Net-SMTP-SSL-1.03-1-src
index 76e9a50..76e9a50 100644
--- a/testdata/htdocs.expected/x86/perl-Net-SMTP-SSL/perl-Net-SMTP-SSL-1.03-1-src
+++ b/test/testdata/htdocs.expected/x86/perl-Net-SMTP-SSL/perl-Net-SMTP-SSL-1.03-1-src
diff --git a/testdata/htdocs.expected/x86/proj-debuginfo/.htaccess b/test/testdata/htdocs.expected/x86/proj-debuginfo/.htaccess
index 3196d64..3196d64 100644
--- a/testdata/htdocs.expected/x86/proj-debuginfo/.htaccess
+++ b/test/testdata/htdocs.expected/x86/proj-debuginfo/.htaccess
diff --git a/testdata/htdocs.expected/x86/proj-debuginfo/proj-debuginfo-4.8.0-1 b/test/testdata/htdocs.expected/x86/proj-debuginfo/proj-debuginfo-4.8.0-1
index d8a0fc4..d8a0fc4 100644
--- a/testdata/htdocs.expected/x86/proj-debuginfo/proj-debuginfo-4.8.0-1
+++ b/test/testdata/htdocs.expected/x86/proj-debuginfo/proj-debuginfo-4.8.0-1
diff --git a/testdata/htdocs.expected/x86/rpm-doc/.htaccess b/test/testdata/htdocs.expected/x86/rpm-doc/.htaccess
index 3196d64..3196d64 100644
--- a/testdata/htdocs.expected/x86/rpm-doc/.htaccess
+++ b/test/testdata/htdocs.expected/x86/rpm-doc/.htaccess
diff --git a/testdata/htdocs.expected/x86/rpm-doc/rpm-doc-4.1-2 b/test/testdata/htdocs.expected/x86/rpm-doc/rpm-doc-4.1-2
index 8ffbe70..8ffbe70 100644
--- a/testdata/htdocs.expected/x86/rpm-doc/rpm-doc-4.1-2
+++ b/test/testdata/htdocs.expected/x86/rpm-doc/rpm-doc-4.1-2
diff --git a/testdata/htdocs.expected/x86/rpm-doc/rpm-doc-4.1-2-src b/test/testdata/htdocs.expected/x86/rpm-doc/rpm-doc-4.1-2-src
index 3566e39..3566e39 100644
--- a/testdata/htdocs.expected/x86/rpm-doc/rpm-doc-4.1-2-src
+++ b/test/testdata/htdocs.expected/x86/rpm-doc/rpm-doc-4.1-2-src
diff --git a/testdata/htdocs.expected/x86/rpm-doc/rpm-doc-999-1 b/test/testdata/htdocs.expected/x86/rpm-doc/rpm-doc-999-1
index b5b04ec..b5b04ec 100644
--- a/testdata/htdocs.expected/x86/rpm-doc/rpm-doc-999-1
+++ b/test/testdata/htdocs.expected/x86/rpm-doc/rpm-doc-999-1
diff --git a/testdata/htdocs.expected/x86/testpackage/.htaccess b/test/testdata/htdocs.expected/x86/testpackage/.htaccess
index 3196d64..3196d64 100644
--- a/testdata/htdocs.expected/x86/testpackage/.htaccess
+++ b/test/testdata/htdocs.expected/x86/testpackage/.htaccess
diff --git a/testdata/htdocs.expected/x86/testpackage/testpackage-0.1-1 b/test/testdata/htdocs.expected/x86/testpackage/testpackage-0.1-1
index 76208aa..76208aa 100644
--- a/testdata/htdocs.expected/x86/testpackage/testpackage-0.1-1
+++ b/test/testdata/htdocs.expected/x86/testpackage/testpackage-0.1-1
diff --git a/testdata/inifile/setup.ini.expected b/test/testdata/inifile/setup.ini.expected
index c41865a..c41865a 100644
--- a/testdata/inifile/setup.ini.expected
+++ b/test/testdata/inifile/setup.ini.expected
diff --git a/testdata/pkglist/cygwin-pkg-maint b/test/testdata/pkglist/cygwin-pkg-maint
index c157e17..c157e17 100644
--- a/testdata/pkglist/cygwin-pkg-maint
+++ b/test/testdata/pkglist/cygwin-pkg-maint
diff --git a/testdata/pkglist/expected b/test/testdata/pkglist/expected
index c9cd92c..c9cd92c 100644
--- a/testdata/pkglist/expected
+++ b/test/testdata/pkglist/expected
diff --git a/testdata/process_arch/homedir.expected b/test/testdata/process_arch/homedir.expected
index 1c52158..1c52158 100644
--- a/testdata/process_arch/homedir.expected
+++ b/test/testdata/process_arch/homedir.expected
diff --git a/testdata/process_arch/htdocs.expected b/test/testdata/process_arch/htdocs.expected
index 4670972..4670972 100644
--- a/testdata/process_arch/htdocs.expected
+++ b/test/testdata/process_arch/htdocs.expected
diff --git a/testdata/process_arch/rel_area.expected b/test/testdata/process_arch/rel_area.expected
index 44161bf..44161bf 100644
--- a/testdata/process_arch/rel_area.expected
+++ b/test/testdata/process_arch/rel_area.expected
diff --git a/testdata/process_arch/vault.expected b/test/testdata/process_arch/vault.expected
index a87938b..a87938b 100644
--- a/testdata/process_arch/vault.expected
+++ b/test/testdata/process_arch/vault.expected
diff --git a/testdata/relarea/noarch/release/perl-Net-SMTP-SSL/perl-Net-SMTP-SSL-1.03-1-src.tar.xz b/test/testdata/relarea/noarch/release/perl-Net-SMTP-SSL/perl-Net-SMTP-SSL-1.03-1-src.tar.xz
index 9e7f93d..9e7f93d 100644
--- a/testdata/relarea/noarch/release/perl-Net-SMTP-SSL/perl-Net-SMTP-SSL-1.03-1-src.tar.xz
+++ b/test/testdata/relarea/noarch/release/perl-Net-SMTP-SSL/perl-Net-SMTP-SSL-1.03-1-src.tar.xz
diff --git a/testdata/relarea/noarch/release/perl-Net-SMTP-SSL/perl-Net-SMTP-SSL-1.03-1.tar.xz b/test/testdata/relarea/noarch/release/perl-Net-SMTP-SSL/perl-Net-SMTP-SSL-1.03-1.tar.xz
index d986060..d986060 100644
--- a/testdata/relarea/noarch/release/perl-Net-SMTP-SSL/perl-Net-SMTP-SSL-1.03-1.tar.xz
+++ b/test/testdata/relarea/noarch/release/perl-Net-SMTP-SSL/perl-Net-SMTP-SSL-1.03-1.tar.xz
diff --git a/testdata/relarea/noarch/release/perl-Net-SMTP-SSL/setup.hint b/test/testdata/relarea/noarch/release/perl-Net-SMTP-SSL/setup.hint
index f91a0e1..f91a0e1 100644
--- a/testdata/relarea/noarch/release/perl-Net-SMTP-SSL/setup.hint
+++ b/test/testdata/relarea/noarch/release/perl-Net-SMTP-SSL/setup.hint
diff --git a/testdata/relarea/x86/release/arc/arc-4.32.7-10-src.tar.bz2 b/test/testdata/relarea/x86/release/arc/arc-4.32.7-10-src.tar.bz2
index b56f3b9..b56f3b9 100644
--- a/testdata/relarea/x86/release/arc/arc-4.32.7-10-src.tar.bz2
+++ b/test/testdata/relarea/x86/release/arc/arc-4.32.7-10-src.tar.bz2
diff --git a/testdata/relarea/x86/release/arc/arc-4.32.7-10.tar.bz2 b/test/testdata/relarea/x86/release/arc/arc-4.32.7-10.tar.bz2
index b56f3b9..b56f3b9 100644
--- a/testdata/relarea/x86/release/arc/arc-4.32.7-10.tar.bz2
+++ b/test/testdata/relarea/x86/release/arc/arc-4.32.7-10.tar.bz2
diff --git a/testdata/relarea/x86/release/arc/setup.hint b/test/testdata/relarea/x86/release/arc/setup.hint
index 718cb55..718cb55 100644
--- a/testdata/relarea/x86/release/arc/setup.hint
+++ b/test/testdata/relarea/x86/release/arc/setup.hint
diff --git a/testdata/relarea/x86/release/base-cygwin/base-cygwin-3.6-1.tar.xz b/test/testdata/relarea/x86/release/base-cygwin/base-cygwin-3.6-1.tar.xz
index 0e6f1e8..0e6f1e8 100644
--- a/testdata/relarea/x86/release/base-cygwin/base-cygwin-3.6-1.tar.xz
+++ b/test/testdata/relarea/x86/release/base-cygwin/base-cygwin-3.6-1.tar.xz
diff --git a/testdata/relarea/x86/release/base-cygwin/base-cygwin-3.8-1.tar.xz b/test/testdata/relarea/x86/release/base-cygwin/base-cygwin-3.8-1.tar.xz
index 0e6f1e8..0e6f1e8 100644
--- a/testdata/relarea/x86/release/base-cygwin/base-cygwin-3.8-1.tar.xz
+++ b/test/testdata/relarea/x86/release/base-cygwin/base-cygwin-3.8-1.tar.xz
diff --git a/testdata/relarea/x86/release/base-cygwin/setup.hint b/test/testdata/relarea/x86/release/base-cygwin/setup.hint
index f6f64b2..f6f64b2 100644
--- a/testdata/relarea/x86/release/base-cygwin/setup.hint
+++ b/test/testdata/relarea/x86/release/base-cygwin/setup.hint
diff --git a/testdata/relarea/x86/release/testpackage/testpackage-0.1-1.tar.bz2 b/test/testdata/relarea/x86/release/cygwin/.this-should-be-ignored
index e69de29..e69de29 100644
--- a/testdata/relarea/x86/release/testpackage/testpackage-0.1-1.tar.bz2
+++ b/test/testdata/relarea/x86/release/cygwin/.this-should-be-ignored
diff --git a/testdata/relarea/x86/release/cygwin/cygwin-2.2.0-1-src.tar.xz b/test/testdata/relarea/x86/release/cygwin/cygwin-2.2.0-1-src.tar.xz
index 0e6f1e8..0e6f1e8 100644
--- a/testdata/relarea/x86/release/cygwin/cygwin-2.2.0-1-src.tar.xz
+++ b/test/testdata/relarea/x86/release/cygwin/cygwin-2.2.0-1-src.tar.xz
diff --git a/testdata/relarea/x86/release/cygwin/cygwin-2.2.0-1.tar.xz b/test/testdata/relarea/x86/release/cygwin/cygwin-2.2.0-1.tar.xz
index 0e6f1e8..0e6f1e8 100644
--- a/testdata/relarea/x86/release/cygwin/cygwin-2.2.0-1.tar.xz
+++ b/test/testdata/relarea/x86/release/cygwin/cygwin-2.2.0-1.tar.xz
diff --git a/testdata/relarea/x86/release/cygwin/cygwin-2.2.1-1-src.tar.xz b/test/testdata/relarea/x86/release/cygwin/cygwin-2.2.1-1-src.tar.xz
index 0e6f1e8..0e6f1e8 100644
--- a/testdata/relarea/x86/release/cygwin/cygwin-2.2.1-1-src.tar.xz
+++ b/test/testdata/relarea/x86/release/cygwin/cygwin-2.2.1-1-src.tar.xz
diff --git a/testdata/relarea/x86/release/cygwin/cygwin-2.2.1-1.tar.xz b/test/testdata/relarea/x86/release/cygwin/cygwin-2.2.1-1.tar.xz
index 0e6f1e8..0e6f1e8 100644
--- a/testdata/relarea/x86/release/cygwin/cygwin-2.2.1-1.tar.xz
+++ b/test/testdata/relarea/x86/release/cygwin/cygwin-2.2.1-1.tar.xz
diff --git a/testdata/relarea/x86/release/cygwin/cygwin-2.3.0-0.3-src.tar.xz b/test/testdata/relarea/x86/release/cygwin/cygwin-2.3.0-0.3-src.tar.xz
index 0e6f1e8..0e6f1e8 100644
--- a/testdata/relarea/x86/release/cygwin/cygwin-2.3.0-0.3-src.tar.xz
+++ b/test/testdata/relarea/x86/release/cygwin/cygwin-2.3.0-0.3-src.tar.xz
diff --git a/testdata/relarea/x86/release/cygwin/cygwin-2.3.0-0.3.tar.xz b/test/testdata/relarea/x86/release/cygwin/cygwin-2.3.0-0.3.tar.xz
index 0e6f1e8..0e6f1e8 100644
--- a/testdata/relarea/x86/release/cygwin/cygwin-2.3.0-0.3.tar.xz
+++ b/test/testdata/relarea/x86/release/cygwin/cygwin-2.3.0-0.3.tar.xz
diff --git a/testdata/relarea/x86/release/cygwin/cygwin-debuginfo/cygwin-debuginfo-2.2.0-1.tar.xz b/test/testdata/relarea/x86/release/cygwin/cygwin-debuginfo/cygwin-debuginfo-2.2.0-1.tar.xz
index 0e6f1e8..0e6f1e8 100644
--- a/testdata/relarea/x86/release/cygwin/cygwin-debuginfo/cygwin-debuginfo-2.2.0-1.tar.xz
+++ b/test/testdata/relarea/x86/release/cygwin/cygwin-debuginfo/cygwin-debuginfo-2.2.0-1.tar.xz
diff --git a/testdata/relarea/x86/release/cygwin/cygwin-debuginfo/cygwin-debuginfo-2.2.1-1.tar.xz b/test/testdata/relarea/x86/release/cygwin/cygwin-debuginfo/cygwin-debuginfo-2.2.1-1.tar.xz
index 0e6f1e8..0e6f1e8 100644
--- a/testdata/relarea/x86/release/cygwin/cygwin-debuginfo/cygwin-debuginfo-2.2.1-1.tar.xz
+++ b/test/testdata/relarea/x86/release/cygwin/cygwin-debuginfo/cygwin-debuginfo-2.2.1-1.tar.xz
diff --git a/testdata/relarea/x86/release/cygwin/cygwin-debuginfo/cygwin-debuginfo-2.3.0-0.3.tar.xz b/test/testdata/relarea/x86/release/cygwin/cygwin-debuginfo/cygwin-debuginfo-2.3.0-0.3.tar.xz
index 0e6f1e8..0e6f1e8 100644
--- a/testdata/relarea/x86/release/cygwin/cygwin-debuginfo/cygwin-debuginfo-2.3.0-0.3.tar.xz
+++ b/test/testdata/relarea/x86/release/cygwin/cygwin-debuginfo/cygwin-debuginfo-2.3.0-0.3.tar.xz
diff --git a/testdata/relarea/x86/release/cygwin/cygwin-debuginfo/setup.hint b/test/testdata/relarea/x86/release/cygwin/cygwin-debuginfo/setup.hint
index 5ed452c..5ed452c 100644
--- a/testdata/relarea/x86/release/cygwin/cygwin-debuginfo/setup.hint
+++ b/test/testdata/relarea/x86/release/cygwin/cygwin-debuginfo/setup.hint
diff --git a/testdata/relarea/x86/release/cygwin/cygwin-devel/cygwin-devel-2.2.0-1.tar.xz b/test/testdata/relarea/x86/release/cygwin/cygwin-devel/cygwin-devel-2.2.0-1.tar.xz
index 0e6f1e8..0e6f1e8 100644
--- a/testdata/relarea/x86/release/cygwin/cygwin-devel/cygwin-devel-2.2.0-1.tar.xz
+++ b/test/testdata/relarea/x86/release/cygwin/cygwin-devel/cygwin-devel-2.2.0-1.tar.xz
diff --git a/testdata/relarea/x86/release/cygwin/cygwin-devel/cygwin-devel-2.2.1-1.tar.xz b/test/testdata/relarea/x86/release/cygwin/cygwin-devel/cygwin-devel-2.2.1-1.tar.xz
index 0e6f1e8..0e6f1e8 100644
--- a/testdata/relarea/x86/release/cygwin/cygwin-devel/cygwin-devel-2.2.1-1.tar.xz
+++ b/test/testdata/relarea/x86/release/cygwin/cygwin-devel/cygwin-devel-2.2.1-1.tar.xz
diff --git a/testdata/relarea/x86/release/cygwin/cygwin-devel/cygwin-devel-2.3.0-0.3.tar.xz b/test/testdata/relarea/x86/release/cygwin/cygwin-devel/cygwin-devel-2.3.0-0.3.tar.xz
index 0e6f1e8..0e6f1e8 100644
--- a/testdata/relarea/x86/release/cygwin/cygwin-devel/cygwin-devel-2.3.0-0.3.tar.xz
+++ b/test/testdata/relarea/x86/release/cygwin/cygwin-devel/cygwin-devel-2.3.0-0.3.tar.xz
diff --git a/testdata/relarea/x86/release/cygwin/cygwin-devel/setup.hint b/test/testdata/relarea/x86/release/cygwin/cygwin-devel/setup.hint
index 97170e3..97170e3 100644
--- a/testdata/relarea/x86/release/cygwin/cygwin-devel/setup.hint
+++ b/test/testdata/relarea/x86/release/cygwin/cygwin-devel/setup.hint
diff --git a/testdata/relarea/x86/release/cygwin/setup.hint b/test/testdata/relarea/x86/release/cygwin/setup.hint
index d0c4b26..d0c4b26 100644
--- a/testdata/relarea/x86/release/cygwin/setup.hint
+++ b/test/testdata/relarea/x86/release/cygwin/setup.hint
diff --git a/testdata/relarea/x86/release/invalid/setup.hint b/test/testdata/relarea/x86/release/invalid/setup.hint
index 279c8c4..279c8c4 100644
--- a/testdata/relarea/x86/release/invalid/setup.hint
+++ b/test/testdata/relarea/x86/release/invalid/setup.hint
diff --git a/testdata/relarea/x86/release/keychain/keychain-2.6.8-1-src.tar.bz2 b/test/testdata/relarea/x86/release/keychain/keychain-2.6.8-1-src.tar.bz2
index ec4c57b..ec4c57b 100644
--- a/testdata/relarea/x86/release/keychain/keychain-2.6.8-1-src.tar.bz2
+++ b/test/testdata/relarea/x86/release/keychain/keychain-2.6.8-1-src.tar.bz2
diff --git a/testdata/relarea/x86/release/keychain/keychain-2.6.8-1.tar.bz2 b/test/testdata/relarea/x86/release/keychain/keychain-2.6.8-1.tar.bz2
index a8fd52f..a8fd52f 100644
--- a/testdata/relarea/x86/release/keychain/keychain-2.6.8-1.tar.bz2
+++ b/test/testdata/relarea/x86/release/keychain/keychain-2.6.8-1.tar.bz2
diff --git a/testdata/relarea/x86/release/keychain/keychain-2.7.1-1-src.tar.bz2 b/test/testdata/relarea/x86/release/keychain/keychain-2.7.1-1-src.tar.bz2
index 08be499..08be499 100644
--- a/testdata/relarea/x86/release/keychain/keychain-2.7.1-1-src.tar.bz2
+++ b/test/testdata/relarea/x86/release/keychain/keychain-2.7.1-1-src.tar.bz2
diff --git a/testdata/relarea/x86/release/keychain/keychain-2.7.1-1.tar.bz2 b/test/testdata/relarea/x86/release/keychain/keychain-2.7.1-1.tar.bz2
index 4982bf6..4982bf6 100644
--- a/testdata/relarea/x86/release/keychain/keychain-2.7.1-1.tar.bz2
+++ b/test/testdata/relarea/x86/release/keychain/keychain-2.7.1-1.tar.bz2
diff --git a/testdata/relarea/x86/release/keychain/setup.hint b/test/testdata/relarea/x86/release/keychain/setup.hint
index 7870969..7870969 100644
--- a/testdata/relarea/x86/release/keychain/setup.hint
+++ b/test/testdata/relarea/x86/release/keychain/setup.hint
diff --git a/testdata/relarea/x86/release/libspiro/libspiro-devel/setup.hint b/test/testdata/relarea/x86/release/libspiro/libspiro-devel/setup.hint
index 37dcfd7..37dcfd7 100644
--- a/testdata/relarea/x86/release/libspiro/libspiro-devel/setup.hint
+++ b/test/testdata/relarea/x86/release/libspiro/libspiro-devel/setup.hint
diff --git a/testdata/relarea/x86/release/libspiro/libspiro0/setup.hint b/test/testdata/relarea/x86/release/libspiro/libspiro0/setup.hint
index 4d9ef6a..4d9ef6a 100644
--- a/testdata/relarea/x86/release/libspiro/libspiro0/setup.hint
+++ b/test/testdata/relarea/x86/release/libspiro/libspiro0/setup.hint
diff --git a/testdata/relarea/x86/release/libspiro/setup.hint b/test/testdata/relarea/x86/release/libspiro/setup.hint
index 42f7126..42f7126 100644
--- a/testdata/relarea/x86/release/libspiro/setup.hint
+++ b/test/testdata/relarea/x86/release/libspiro/setup.hint
diff --git a/testdata/relarea/x86/release/libtextcat/libtextcat-2.2-2-src.tar.bz2 b/test/testdata/relarea/x86/release/libtextcat/libtextcat-2.2-2-src.tar.bz2
index a1145fb..a1145fb 100644
--- a/testdata/relarea/x86/release/libtextcat/libtextcat-2.2-2-src.tar.bz2
+++ b/test/testdata/relarea/x86/release/libtextcat/libtextcat-2.2-2-src.tar.bz2
diff --git a/testdata/relarea/x86/release/libtextcat/libtextcat-2.2-2.tar.bz2 b/test/testdata/relarea/x86/release/libtextcat/libtextcat-2.2-2.tar.bz2
index a1145fb..a1145fb 100644
--- a/testdata/relarea/x86/release/libtextcat/libtextcat-2.2-2.tar.bz2
+++ b/test/testdata/relarea/x86/release/libtextcat/libtextcat-2.2-2.tar.bz2
diff --git a/testdata/relarea/x86/release/libtextcat/libtextcat-devel/libtextcat-devel-2.2-2.tar.bz2 b/test/testdata/relarea/x86/release/libtextcat/libtextcat-devel/libtextcat-devel-2.2-2.tar.bz2
index a1145fb..a1145fb 100644
--- a/testdata/relarea/x86/release/libtextcat/libtextcat-devel/libtextcat-devel-2.2-2.tar.bz2
+++ b/test/testdata/relarea/x86/release/libtextcat/libtextcat-devel/libtextcat-devel-2.2-2.tar.bz2
diff --git a/testdata/relarea/x86/release/libtextcat/libtextcat-devel/setup.hint b/test/testdata/relarea/x86/release/libtextcat/libtextcat-devel/setup.hint
index f509126..f509126 100644
--- a/testdata/relarea/x86/release/libtextcat/libtextcat-devel/setup.hint
+++ b/test/testdata/relarea/x86/release/libtextcat/libtextcat-devel/setup.hint
diff --git a/testdata/relarea/x86/release/libtextcat/libtextcat0/libtextcat0-2.2-2.tar.bz2 b/test/testdata/relarea/x86/release/libtextcat/libtextcat0/libtextcat0-2.2-2.tar.bz2
index a1145fb..a1145fb 100644
--- a/testdata/relarea/x86/release/libtextcat/libtextcat0/libtextcat0-2.2-2.tar.bz2
+++ b/test/testdata/relarea/x86/release/libtextcat/libtextcat0/libtextcat0-2.2-2.tar.bz2
diff --git a/testdata/relarea/x86/release/libtextcat/libtextcat0/setup.hint b/test/testdata/relarea/x86/release/libtextcat/libtextcat0/setup.hint
index f3ae673..f3ae673 100644
--- a/testdata/relarea/x86/release/libtextcat/libtextcat0/setup.hint
+++ b/test/testdata/relarea/x86/release/libtextcat/libtextcat0/setup.hint
diff --git a/testdata/relarea/x86/release/libtextcat/setup.hint b/test/testdata/relarea/x86/release/libtextcat/setup.hint
index 5145c2d..5145c2d 100644
--- a/testdata/relarea/x86/release/libtextcat/setup.hint
+++ b/test/testdata/relarea/x86/release/libtextcat/setup.hint
diff --git a/testdata/relarea/x86/release/mDNSResponder/libdns_sd-devel/libdns_sd-devel-379.32.1-1.tar.bz2 b/test/testdata/relarea/x86/release/mDNSResponder/libdns_sd-devel/libdns_sd-devel-379.32.1-1.tar.bz2
index a1145fb..a1145fb 100644
--- a/testdata/relarea/x86/release/mDNSResponder/libdns_sd-devel/libdns_sd-devel-379.32.1-1.tar.bz2
+++ b/test/testdata/relarea/x86/release/mDNSResponder/libdns_sd-devel/libdns_sd-devel-379.32.1-1.tar.bz2
diff --git a/testdata/relarea/x86/release/mDNSResponder/libdns_sd-devel/setup.hint b/test/testdata/relarea/x86/release/mDNSResponder/libdns_sd-devel/setup.hint
index c285be7..c285be7 100644
--- a/testdata/relarea/x86/release/mDNSResponder/libdns_sd-devel/setup.hint
+++ b/test/testdata/relarea/x86/release/mDNSResponder/libdns_sd-devel/setup.hint
diff --git a/testdata/relarea/x86/release/mDNSResponder/libdns_sd1/libdns_sd1-379.32.1-1.tar.bz2 b/test/testdata/relarea/x86/release/mDNSResponder/libdns_sd1/libdns_sd1-379.32.1-1.tar.bz2
index a1145fb..a1145fb 100644
--- a/testdata/relarea/x86/release/mDNSResponder/libdns_sd1/libdns_sd1-379.32.1-1.tar.bz2
+++ b/test/testdata/relarea/x86/release/mDNSResponder/libdns_sd1/libdns_sd1-379.32.1-1.tar.bz2
diff --git a/testdata/relarea/x86/release/mDNSResponder/libdns_sd1/setup.hint b/test/testdata/relarea/x86/release/mDNSResponder/libdns_sd1/setup.hint
index 74a7a3f..74a7a3f 100644
--- a/testdata/relarea/x86/release/mDNSResponder/libdns_sd1/setup.hint
+++ b/test/testdata/relarea/x86/release/mDNSResponder/libdns_sd1/setup.hint
diff --git a/testdata/relarea/x86/release/mDNSResponder/mDNSResponder-379.32.1-1-src.tar.bz2 b/test/testdata/relarea/x86/release/mDNSResponder/mDNSResponder-379.32.1-1-src.tar.bz2
index a1145fb..a1145fb 100644
--- a/testdata/relarea/x86/release/mDNSResponder/mDNSResponder-379.32.1-1-src.tar.bz2
+++ b/test/testdata/relarea/x86/release/mDNSResponder/mDNSResponder-379.32.1-1-src.tar.bz2
diff --git a/testdata/relarea/x86/release/mDNSResponder/mDNSResponder-379.32.1-1.tar.bz2 b/test/testdata/relarea/x86/release/mDNSResponder/mDNSResponder-379.32.1-1.tar.bz2
index a1145fb..a1145fb 100644
--- a/testdata/relarea/x86/release/mDNSResponder/mDNSResponder-379.32.1-1.tar.bz2
+++ b/test/testdata/relarea/x86/release/mDNSResponder/mDNSResponder-379.32.1-1.tar.bz2
diff --git a/testdata/relarea/x86/release/mDNSResponder/setup.hint b/test/testdata/relarea/x86/release/mDNSResponder/setup.hint
index e50938b..e50938b 100644
--- a/testdata/relarea/x86/release/mDNSResponder/setup.hint
+++ b/test/testdata/relarea/x86/release/mDNSResponder/setup.hint
diff --git a/testdata/relarea/x86/release/mingw64-i686-binutils/mingw64-i686-binutils-debuginfo/setup.hint b/test/testdata/relarea/x86/release/mingw64-i686-binutils/mingw64-i686-binutils-debuginfo/setup.hint
index 55ba552..55ba552 100644
--- a/testdata/relarea/x86/release/mingw64-i686-binutils/mingw64-i686-binutils-debuginfo/setup.hint
+++ b/test/testdata/relarea/x86/release/mingw64-i686-binutils/mingw64-i686-binutils-debuginfo/setup.hint
diff --git a/testdata/relarea/x86/release/mingw64-i686-binutils/setup.hint b/test/testdata/relarea/x86/release/mingw64-i686-binutils/setup.hint
index f911d0d..f911d0d 100644
--- a/testdata/relarea/x86/release/mingw64-i686-binutils/setup.hint
+++ b/test/testdata/relarea/x86/release/mingw64-i686-binutils/setup.hint
diff --git a/testdata/relarea/x86/release/naim/setup.hint b/test/testdata/relarea/x86/release/naim/setup.hint
index 7de6e7b..7de6e7b 100644
--- a/testdata/relarea/x86/release/naim/setup.hint
+++ b/test/testdata/relarea/x86/release/naim/setup.hint
diff --git a/testdata/relarea/x86/release/openssh/openssh-7.2p2-1-src.tar.xz b/test/testdata/relarea/x86/release/openssh/openssh-7.2p2-1-src.tar.xz
index 0e6f1e8..0e6f1e8 100644
--- a/testdata/relarea/x86/release/openssh/openssh-7.2p2-1-src.tar.xz
+++ b/test/testdata/relarea/x86/release/openssh/openssh-7.2p2-1-src.tar.xz
diff --git a/testdata/relarea/x86/release/openssh/openssh-7.2p2-1.tar.xz b/test/testdata/relarea/x86/release/openssh/openssh-7.2p2-1.tar.xz
index 0e6f1e8..0e6f1e8 100644
--- a/testdata/relarea/x86/release/openssh/openssh-7.2p2-1.tar.xz
+++ b/test/testdata/relarea/x86/release/openssh/openssh-7.2p2-1.tar.xz
diff --git a/testdata/relarea/x86/release/openssh/setup.hint b/test/testdata/relarea/x86/release/openssh/setup.hint
index 83aa11a..83aa11a 100644
--- a/testdata/relarea/x86/release/openssh/setup.hint
+++ b/test/testdata/relarea/x86/release/openssh/setup.hint
diff --git a/testdata/relarea/x86/release/proj/libproj-devel/setup.hint b/test/testdata/relarea/x86/release/proj/libproj-devel/setup.hint
index 76d1555..76d1555 100644
--- a/testdata/relarea/x86/release/proj/libproj-devel/setup.hint
+++ b/test/testdata/relarea/x86/release/proj/libproj-devel/setup.hint
diff --git a/testdata/relarea/x86/release/proj/libproj1/setup.hint b/test/testdata/relarea/x86/release/proj/libproj1/setup.hint
index 22a79bd..22a79bd 100644
--- a/testdata/relarea/x86/release/proj/libproj1/setup.hint
+++ b/test/testdata/relarea/x86/release/proj/libproj1/setup.hint
diff --git a/testdata/relarea/x86/release/proj/setup.hint b/test/testdata/relarea/x86/release/proj/setup.hint
index c5da485..c5da485 100644
--- a/testdata/relarea/x86/release/proj/setup.hint
+++ b/test/testdata/relarea/x86/release/proj/setup.hint
diff --git a/testdata/relarea/x86/release/rpm-doc/rpm-doc-4.1-2-src.tar.bz2 b/test/testdata/relarea/x86/release/rpm-doc/rpm-doc-4.1-2-src.tar.bz2
index cbf838c..cbf838c 100644
--- a/testdata/relarea/x86/release/rpm-doc/rpm-doc-4.1-2-src.tar.bz2
+++ b/test/testdata/relarea/x86/release/rpm-doc/rpm-doc-4.1-2-src.tar.bz2
diff --git a/testdata/relarea/x86/release/rpm-doc/rpm-doc-4.1-2.tar.bz2 b/test/testdata/relarea/x86/release/rpm-doc/rpm-doc-4.1-2.tar.bz2
index c7436b3..c7436b3 100644
--- a/testdata/relarea/x86/release/rpm-doc/rpm-doc-4.1-2.tar.bz2
+++ b/test/testdata/relarea/x86/release/rpm-doc/rpm-doc-4.1-2.tar.bz2
diff --git a/testdata/relarea/x86/release/rpm-doc/rpm-doc-999-1.tar.bz2 b/test/testdata/relarea/x86/release/rpm-doc/rpm-doc-999-1.tar.bz2
index cbf838c..cbf838c 100644
--- a/testdata/relarea/x86/release/rpm-doc/rpm-doc-999-1.tar.bz2
+++ b/test/testdata/relarea/x86/release/rpm-doc/rpm-doc-999-1.tar.bz2
diff --git a/testdata/relarea/x86/release/rpm-doc/setup.hint b/test/testdata/relarea/x86/release/rpm-doc/setup.hint
index f3bbf78..f3bbf78 100644
--- a/testdata/relarea/x86/release/rpm-doc/setup.hint
+++ b/test/testdata/relarea/x86/release/rpm-doc/setup.hint
diff --git a/testdata/relarea/x86/release/splint/setup.hint b/test/testdata/relarea/x86/release/splint/setup.hint
index 52b56b9..52b56b9 100644
--- a/testdata/relarea/x86/release/splint/setup.hint
+++ b/test/testdata/relarea/x86/release/splint/setup.hint
diff --git a/testdata/relarea/x86/release/testpackage/setup.hint b/test/testdata/relarea/x86/release/testpackage/setup.hint
index 10ee390..10ee390 100644
--- a/testdata/relarea/x86/release/testpackage/setup.hint
+++ b/test/testdata/relarea/x86/release/testpackage/setup.hint
diff --git a/test/testdata/relarea/x86/release/testpackage/testpackage-0.1-1.tar.bz2 b/test/testdata/relarea/x86/release/testpackage/testpackage-0.1-1.tar.bz2
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/test/testdata/relarea/x86/release/testpackage/testpackage-0.1-1.tar.bz2
diff --git a/testdata/uploads/move.expected b/test/testdata/uploads/move.expected
index 47cb0af..47cb0af 100644
--- a/testdata/uploads/move.expected
+++ b/test/testdata/uploads/move.expected
diff --git a/testdata/uploads/pkglist.expected b/test/testdata/uploads/pkglist.expected
index bbe52b0..bbe52b0 100644
--- a/testdata/uploads/pkglist.expected
+++ b/test/testdata/uploads/pkglist.expected