From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2201) id C3FEF3858296; Sat, 26 Nov 2022 19:40:46 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org C3FEF3858296 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1669491646; bh=HatMtUSPUUEulB0Eg+TtDyVpOR9WlDIBIU7xsDlSN9s=; h=To:Subject:Date:From:From; b=g1hzlCCOXXVP0O+NJddELT5MwexPFO+E2mQ8Bg2AK8e/DIwEl0D/q7nTv58ABE/oq vchoxF5e0puFeYR/67llxFCEXX0LkQxOfyDqOruZWZc8kRJ2Ub5O8i9nos9jBmcRXx 9lYkzD6WH1jkOxqupD2K8yVsu/UQicvGPdhvJX54= To: cygwin-apps-cvs@sourceware.org Subject: [calm - Cygwin server-side packaging maintenance script] branch master, updated. 20220704-33-g1d34550 X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: 6087edd6a7097ec102f3a15647beda0099e3ebdf X-Git-Newrev: 1d345508ee7ed441330da4a9810f21af216c6e58 Message-Id: <20221126194046.C3FEF3858296@sourceware.org> Date: Sat, 26 Nov 2022 19:40:46 +0000 (GMT) From: Jon TURNEY List-Id: https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/calm.git;h=1d345508ee7ed441330da4a9810f21af216c6e58 commit 1d345508ee7ed441330da4a9810f21af216c6e58 Author: Jon Turney Date: Sat Nov 26 16:26:02 2022 +0000 Pin flake8 before 6.0, as it's incompatible with current flake-import-order https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/calm.git;h=66a91bcc7e241455f2f8cabab0663b3f68dfc70a commit 66a91bcc7e241455f2f8cabab0663b3f68dfc70a Author: Jon Turney Date: Sat Nov 5 16:54:01 2022 +0000 Drop x86-only past-mistakes https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/calm.git;h=407906be64a043824b8625a672e46c4ee9e81327 commit 407906be64a043824b8625a672e46c4ee9e81327 Author: Jon Turney Date: Sat Nov 5 16:23:24 2022 +0000 Ignore x86/ Stop looking in x86/ Stop generating setup.ini in x86/ Stop generating webpage for x86/ https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/calm.git;h=5310473529e6f46de886d2b8f1a7976225ca8bf4 commit 5310473529e6f46de886d2b8f1a7976225ca8bf4 Author: Jon Turney Date: Sat Nov 5 15:14:50 2022 +0000 Reject uploads to x86/ https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/calm.git;h=cba451e483733c806b386b49ac6bd9c6f2ee1c80 commit cba451e483733c806b386b49ac6bd9c6f2ee1c80 Author: Jon Turney Date: Sat Nov 5 15:21:51 2022 +0000 Change x86/ to x86_64/ in test data https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/calm.git;h=d1bc9c6f4bffe84aa53b773148d8f8cf5cab9f48 commit d1bc9c6f4bffe84aa53b773148d8f8cf5cab9f48 Author: Jon Turney Date: Sat Nov 5 13:20:13 2022 +0000 Rationalize path handling a little bit Diff: --- calm/calm.py | 2 +- calm/common_constants.py | 5 +- calm/package.py | 50 ++-- calm/past_mistakes.py | 82 +----- calm/pkg2html.py | 4 +- calm/uploads.py | 7 + requirements.txt | 2 +- test/test_calm.py | 106 ++++---- test/testdata/conflict/homedir.expected | 14 +- test/testdata/conflict/rel_area.expected | 276 ++++++++++---------- test/testdata/conflict/vault.expected | 28 +- .../release/arc/arc-4.32.7-10-src.expected | 0 .../release/arc/arc-4.32.7-10.expected | 0 .../release/base-cygwin/base-cygwin-3.6-1.expected | 0 .../release/base-cygwin/base-cygwin-3.8-1.expected | 0 .../release/corrupt/corrupt-2.0.0-1-src.expected | 0 .../release/corrupt/corrupt-2.0.0-1.expected | 0 .../release/cygwin/cygwin-2.2.0-1-src.expected | 0 .../release/cygwin/cygwin-2.2.0-1.expected | 0 .../release/cygwin/cygwin-2.2.1-1-src.expected | 0 .../release/cygwin/cygwin-2.2.1-1.expected | 0 .../release/cygwin/cygwin-2.3.0-0.3-src.expected | 0 .../release/cygwin/cygwin-2.3.0-0.3.expected | 0 .../cygwin-debuginfo-2.2.0-1.expected | 0 .../cygwin-debuginfo-2.2.1-1.expected | 0 .../cygwin-debuginfo-2.3.0-0.3.expected | 0 .../cygwin/cygwin-debuginfo/override.expected | 0 .../cygwin-devel/cygwin-devel-2.2.0-1.expected | 0 .../cygwin-devel/cygwin-devel-2.2.1-1.expected | 0 .../cygwin-devel/cygwin-devel-2.3.0-0.3.expected | 0 .../release/cygwin/cygwin-devel/override.expected | 0 .../release/cygwin/override.expected | 0 .../release/invalid/invalid-0.expected | 0 .../release/keychain/keychain-2.6.8-1-src.expected | 0 .../release/keychain/keychain-2.6.8-1.expected | 0 .../release/keychain/keychain-2.7.1-1-src.expected | 0 .../release/keychain/keychain-2.7.1-1.expected | 0 .../release/libspiro/libspiro-20071029-1.expected | 0 .../libspiro-devel-20071029-1.expected | 0 .../libspiro0/libspiro0-20071029-1.expected | 0 .../libtextcat/libtextcat-2.2-2-src.expected | 0 .../release/libtextcat/libtextcat-2.2-2.expected | 0 .../libtextcat-devel-2.2-2.expected | 0 .../libtextcat0/libtextcat0-2.2-2.expected | 0 .../libdns_sd-devel-379.32.1-1.expected | 0 .../libdns_sd1/libdns_sd1-379.32.1-1.expected | 0 .../mDNSResponder-379.32.1-1-src.expected | 0 .../mDNSResponder-379.32.1-1.expected | 0 ...ingw64-i686-binutils-2.29.1.787c9873-1.expected | 0 ...6-binutils-debuginfo-2.29.1.787c9873-1.expected | 0 .../release/openssh/openssh-7.2p2-1-src.expected | 0 .../release/openssh/openssh-7.2p2-1.expected | 0 .../per-version-incomplete/override.expected | 0 .../per-version-incomplete-36-1-src.expected | 0 .../per-version-incomplete-36-1.expected | 0 ...ersion-replacement-hint-only-1.0-1-src.expected | 0 ...er-version-replacement-hint-only-1.0-1.expected | 0 .../release/per-version/override.expected | 0 .../per-version/per-version-4.0-1-src.expected | 0 .../release/per-version/per-version-4.0-1.expected | 0 .../per-version/per-version-4.8-1-src.expected | 0 .../release/per-version/per-version-4.8-1.expected | 0 .../libproj-devel/libproj-devel-4.8.0-1.expected | 0 .../proj/libproj1/libproj1-4.8.0-1.expected | 0 .../release/proj/proj-4.8.0-1.expected | 0 .../release/rpm-doc/rpm-doc-4.1-2-src.expected | 0 .../release/rpm-doc/rpm-doc-4.1-2.expected | 0 .../release/rpm-doc/rpm-doc-999-1.expected | 0 .../release/splint/splint-3.1.2-1.expected | 0 .../release/staleversion/override.expected | 0 .../staleversion/staleversion-240-1-src.expected | 0 .../staleversion/staleversion-240-1.expected | 0 .../staleversion/staleversion-242-0-src.expected | 0 .../staleversion/staleversion-242-0.expected | 0 .../staleversion/staleversion-243-0-src.expected | 0 .../staleversion/staleversion-243-0.expected | 0 .../staleversion/staleversion-250-0-src.expected | 0 .../staleversion/staleversion-250-0.expected | 0 .../staleversion/staleversion-251-0-src.expected | 0 .../staleversion/staleversion-251-0.expected | 0 .../staleversion/staleversion-260-0-src.expected | 0 .../staleversion/staleversion-260-0.expected | 0 .../testpackage/testpackage-0.1-1-src.expected | 0 .../release/testpackage/testpackage-0.1-1.expected | 0 .../staleversion/staleversion-230-1-src.tar.xz | Bin .../release/staleversion/staleversion-230-1.hint | 0 .../release/staleversion/staleversion-230-1.tar.xz | Bin .../release/after-ready/after-ready-1.0-1.tar.bz2 | Bin .../{x86 => x86_64}/release/after-ready/setup.hint | 0 .../release/corrupt/corrupt-2.1.0-1-src.tar.xz | Bin .../release/corrupt/corrupt-2.1.0-1.tar.xz | Bin .../not-on-maintainer-list-1.0-1.tar.bz2 | Bin .../release/not-on-maintainer-list/setup.hint | 0 .../not-on-package-list-1.0-1.tar.bz2 | Bin .../release/not-on-package-list/setup.hint | 0 .../release/not-ready/-not-ready-0.9-1.tar.bz2 | 0 .../release/not-ready/not-ready-1.0-1.tar.bz2 | Bin .../{x86 => x86_64}/release/not-ready/setup.hint | 0 .../per-version-replacement-hint-only-1.0-1.hint | 0 .../release/per-version/override.hint | 0 .../per-version/per-version-5.0-1-src.tar.xz | Bin .../release/per-version/per-version-5.0-1.hint | 0 .../release/per-version/per-version-5.0-1.tar.xz | Bin .../testpackage-zstd-1.0-1-src.hint | 0 .../testpackage-zstd-1.0-1-src.tar.zst | Bin .../testpackage-zstd/testpackage-zstd-1.0-1.hint | 0 .../testpackage-zstd-1.0-1.tar.zst | Bin .../testpackage/-testpackage-0.1-1-src.tar.bz2 | 0 .../release/testpackage/-testpackage-0.1-1.tar.bz2 | 0 .../{x86 => x86_64}/release/testpackage/setup.hint | 0 .../testpackage/testpackage-1.0-1-src.tar.bz2 | Bin .../release/testpackage/testpackage-1.0-1.tar.bz2 | Bin .../testpackage/testpackage-subpackage/setup.hint | 0 .../testpackage-subpackage-1.0-1.tar.bz2 | Bin .../release/testpackage2/setup.hint | 0 .../testpackage2/testpackage2-1.0-1.tar.bz2 | Bin .../inprogress.SftpXFR.1234 | 0 .../testpackage2-subpackage/setup.hint | 0 .../testpackage2-subpackage-1.0-1.tar.bz2 | Bin test/testdata/htdocs.expected/dirtree.expected | 123 +++++---- test/testdata/htdocs.expected/summary/arc-src.html | 4 +- test/testdata/htdocs.expected/summary/arc.html | 4 +- .../htdocs.expected/summary/base-cygwin.html | 6 +- .../htdocs.expected/summary/corrupt-src.html | 4 +- test/testdata/htdocs.expected/summary/corrupt.html | 4 +- .../htdocs.expected/summary/cygwin-debuginfo.html | 8 +- .../htdocs.expected/summary/cygwin-devel.html | 8 +- .../htdocs.expected/summary/cygwin-src.html | 8 +- test/testdata/htdocs.expected/summary/cygwin.html | 8 +- .../htdocs.expected/summary/keychain-src.html | 6 +- .../testdata/htdocs.expected/summary/keychain.html | 6 +- .../htdocs.expected/summary/libdns_sd-devel.html | 4 +- .../htdocs.expected/summary/libdns_sd1.html | 4 +- .../htdocs.expected/summary/mDNSResponder-src.html | 4 +- .../htdocs.expected/summary/mDNSResponder.html | 4 +- .../htdocs.expected/summary/obs-a-src.html | 4 +- test/testdata/htdocs.expected/summary/obs-a.html | 4 +- .../htdocs.expected/summary/obs-b-src.html | 4 +- test/testdata/htdocs.expected/summary/obs-b.html | 4 +- .../htdocs.expected/summary/openssh-src.html | 4 +- test/testdata/htdocs.expected/summary/openssh.html | 4 +- .../per-version-replacement-hint-only-src.html | 4 +- .../summary/per-version-replacement-hint-only.html | 4 +- .../htdocs.expected/summary/per-version-src.html | 6 +- .../htdocs.expected/summary/per-version.html | 6 +- .../summary/perl-Net-SMTP-SSL-src.html | 8 +- .../htdocs.expected/summary/perl-Net-SMTP-SSL.html | 8 +- .../htdocs.expected/summary/rpm-doc-src.html | 4 +- test/testdata/htdocs.expected/summary/rpm-doc.html | 6 +- .../htdocs.expected/summary/staleversion-src.html | 14 +- .../htdocs.expected/summary/staleversion.html | 14 +- .../htdocs.expected/summary/test-c-src.html | 4 +- test/testdata/htdocs.expected/summary/test-c.html | 4 +- .../htdocs.expected/summary/test-d-src.html | 4 +- test/testdata/htdocs.expected/summary/test-d.html | 4 +- .../htdocs.expected/summary/test-e-src.html | 4 +- test/testdata/htdocs.expected/summary/test-e.html | 4 +- .../htdocs.expected/summary/testpackage-src.html | 4 +- .../htdocs.expected/summary/testpackage.html | 4 +- .../testdata/htdocs.expected/x86/arc-src/.htaccess | 2 - test/testdata/htdocs.expected/x86/arc/.htaccess | 2 - .../htdocs.expected/x86/base-cygwin/.htaccess | 2 - .../htdocs.expected/x86/corrupt-src/.htaccess | 2 - .../testdata/htdocs.expected/x86/corrupt/.htaccess | 2 - .../htdocs.expected/x86/cygwin-debuginfo/.htaccess | 2 - .../htdocs.expected/x86/cygwin-devel/.htaccess | 2 - .../htdocs.expected/x86/cygwin-src/.htaccess | 2 - test/testdata/htdocs.expected/x86/cygwin/.htaccess | 2 - .../htdocs.expected/x86/keychain-src/.htaccess | 2 - .../htdocs.expected/x86/keychain/.htaccess | 2 - .../htdocs.expected/x86/libdns_sd-devel/.htaccess | 2 - .../htdocs.expected/x86/libdns_sd1/.htaccess | 2 - .../x86/mDNSResponder-src/.htaccess | 2 - .../htdocs.expected/x86/mDNSResponder/.htaccess | 2 - .../htdocs.expected/x86/obs-a-src/.htaccess | 2 - test/testdata/htdocs.expected/x86/obs-a/.htaccess | 2 - .../htdocs.expected/x86/obs-b-src/.htaccess | 2 - test/testdata/htdocs.expected/x86/obs-b/.htaccess | 2 - .../htdocs.expected/x86/openssh-src/.htaccess | 2 - .../testdata/htdocs.expected/x86/openssh/.htaccess | 2 - .../.htaccess | 2 - .../per-version-replacement-hint-only/.htaccess | 2 - .../htdocs.expected/x86/per-version-src/.htaccess | 2 - .../htdocs.expected/x86/per-version/.htaccess | 2 - .../x86/perl-Net-SMTP-SSL-src/.htaccess | 2 - .../x86/perl-Net-SMTP-SSL/.htaccess | 2 - .../htdocs.expected/x86/rpm-doc-src/.htaccess | 2 - .../testdata/htdocs.expected/x86/rpm-doc/.htaccess | 2 - .../htdocs.expected/x86/staleversion-src/.htaccess | 2 - .../htdocs.expected/x86/staleversion/.htaccess | 2 - .../htdocs.expected/x86/test-c-src/.htaccess | 2 - test/testdata/htdocs.expected/x86/test-c/.htaccess | 2 - .../htdocs.expected/x86/test-d-src/.htaccess | 2 - test/testdata/htdocs.expected/x86/test-d/.htaccess | 2 - .../htdocs.expected/x86/test-e-src/.htaccess | 2 - test/testdata/htdocs.expected/x86/test-e/.htaccess | 2 - .../htdocs.expected/x86/testpackage-src/.htaccess | 2 - .../htdocs.expected/x86/testpackage/.htaccess | 2 - .../htdocs.expected/x86_64/arc-src/.htaccess | 2 + .../{x86 => x86_64}/arc-src/arc-4.32.7-10-src | 0 test/testdata/htdocs.expected/x86_64/arc/.htaccess | 2 + .../{x86 => x86_64}/arc/arc-4.32.7-10 | 0 .../{x86 => x86_64}/arc/arc-4.32.7-10-src | 0 .../htdocs.expected/x86_64/base-cygwin/.htaccess | 2 + .../{x86 => x86_64}/base-cygwin/base-cygwin-3.6-1 | 0 .../{x86 => x86_64}/base-cygwin/base-cygwin-3.8-1 | 0 .../htdocs.expected/x86_64/corrupt-src/.htaccess | 2 + .../corrupt-src/corrupt-2.0.0-1-src | 0 .../htdocs.expected/x86_64/corrupt/.htaccess | 2 + .../{x86 => x86_64}/corrupt/corrupt-2.0.0-1 | 0 .../{x86 => x86_64}/corrupt/corrupt-2.0.0-1-src | 0 .../x86_64/cygwin-debuginfo/.htaccess | 2 + .../cygwin-debuginfo/cygwin-debuginfo-2.2.0-1 | 0 .../cygwin-debuginfo/cygwin-debuginfo-2.2.1-1 | 0 .../cygwin-debuginfo/cygwin-debuginfo-2.3.0-0.3 | 0 .../htdocs.expected/x86_64/cygwin-devel/.htaccess | 2 + .../cygwin-devel/cygwin-devel-2.2.0-1 | 0 .../cygwin-devel/cygwin-devel-2.2.1-1 | 0 .../cygwin-devel/cygwin-devel-2.3.0-0.3 | 0 .../htdocs.expected/x86_64/cygwin-src/.htaccess | 2 + .../{x86 => x86_64}/cygwin-src/cygwin-2.2.0-1-src | 0 .../{x86 => x86_64}/cygwin-src/cygwin-2.2.1-1-src | 0 .../cygwin-src/cygwin-2.3.0-0.3-src | 0 .../htdocs.expected/x86_64/cygwin/.htaccess | 2 + .../{x86 => x86_64}/cygwin/cygwin-2.2.0-1 | 0 .../{x86 => x86_64}/cygwin/cygwin-2.2.0-1-src | 0 .../{x86 => x86_64}/cygwin/cygwin-2.2.1-1 | 0 .../{x86 => x86_64}/cygwin/cygwin-2.2.1-1-src | 0 .../{x86 => x86_64}/cygwin/cygwin-2.3.0-0.3 | 0 .../{x86 => x86_64}/cygwin/cygwin-2.3.0-0.3-src | 0 .../htdocs.expected/x86_64/keychain-src/.htaccess | 2 + .../keychain-src/keychain-2.6.8-1-src | 0 .../keychain-src/keychain-2.7.1-1-src | 0 .../htdocs.expected/x86_64/keychain/.htaccess | 2 + .../{x86 => x86_64}/keychain/keychain-2.6.8-1 | 0 .../{x86 => x86_64}/keychain/keychain-2.6.8-1-src | 0 .../{x86 => x86_64}/keychain/keychain-2.7.1-1 | 0 .../{x86 => x86_64}/keychain/keychain-2.7.1-1-src | 0 .../x86_64/libdns_sd-devel/.htaccess | 2 + .../libdns_sd-devel/libdns_sd-devel-379.32.1-1 | 0 .../htdocs.expected/x86_64/libdns_sd1/.htaccess | 2 + .../libdns_sd1/libdns_sd1-379.32.1-1 | 0 .../{x86 => x86_64}/libtextcat-devel/.htaccess | 0 .../libtextcat-devel/libtextcat-devel-2.2-2 | 0 .../{x86 => x86_64}/libtextcat0/.htaccess | 0 .../{x86 => x86_64}/libtextcat0/libtextcat0-2.2-2 | 0 .../x86_64/mDNSResponder-src/.htaccess | 2 + .../mDNSResponder-src/mDNSResponder-379.32.1-1-src | 0 .../htdocs.expected/x86_64/mDNSResponder/.htaccess | 2 + .../mDNSResponder/mDNSResponder-379.32.1-1 | 0 .../mDNSResponder/mDNSResponder-379.32.1-1-src | 0 .../htdocs.expected/{x86 => x86_64}/naim/.htaccess | 0 .../htdocs.expected/x86_64/obs-a-src/.htaccess | 2 + .../{x86 => x86_64}/obs-a-src/obs-a-1.0-1-src | 0 .../htdocs.expected/x86_64/obs-a/.htaccess | 2 + .../{x86 => x86_64}/obs-a/obs-a-1.0-1 | 0 .../{x86 => x86_64}/obs-a/obs-a-1.0-1-src | 0 .../htdocs.expected/x86_64/obs-b-src/.htaccess | 2 + .../{x86 => x86_64}/obs-b-src/obs-b-1.0-1-src | 0 .../htdocs.expected/x86_64/obs-b/.htaccess | 2 + .../{x86 => x86_64}/obs-b/obs-b-1.0-1 | 0 .../{x86 => x86_64}/obs-b/obs-b-1.0-1-src | 0 .../htdocs.expected/x86_64/openssh-src/.htaccess | 2 + .../openssh-src/openssh-7.2p2-1-src | 0 .../htdocs.expected/x86_64/openssh/.htaccess | 2 + .../{x86 => x86_64}/openssh/openssh-7.2p2-1 | 0 .../{x86 => x86_64}/openssh/openssh-7.2p2-1-src | 0 .../.htaccess | 2 + .../per-version-replacement-hint-only-1.0-1-src | 0 .../per-version-replacement-hint-only/.htaccess | 2 + .../per-version-replacement-hint-only-1.0-1 | 0 .../per-version-replacement-hint-only-1.0-1-src | 0 .../x86_64/per-version-src/.htaccess | 2 + .../per-version-src/per-version-4.0-1-src | 0 .../per-version-src/per-version-4.8-1-src | 0 .../htdocs.expected/x86_64/per-version/.htaccess | 2 + .../{x86 => x86_64}/per-version/per-version-4.0-1 | 0 .../per-version/per-version-4.0-1-src | 0 .../{x86 => x86_64}/per-version/per-version-4.8-1 | 0 .../per-version/per-version-4.8-1-src | 0 .../x86_64/perl-Net-SMTP-SSL-src/.htaccess | 2 + .../perl-Net-SMTP-SSL-1.01-1-src | 0 .../perl-Net-SMTP-SSL-1.02-1-src | 0 .../perl-Net-SMTP-SSL-1.03-1-src | 0 .../x86_64/perl-Net-SMTP-SSL/.htaccess | 2 + .../perl-Net-SMTP-SSL/perl-Net-SMTP-SSL-1.01-1 | 0 .../perl-Net-SMTP-SSL/perl-Net-SMTP-SSL-1.01-1-src | 0 .../perl-Net-SMTP-SSL/perl-Net-SMTP-SSL-1.02-1 | 0 .../perl-Net-SMTP-SSL/perl-Net-SMTP-SSL-1.02-1-src | 0 .../perl-Net-SMTP-SSL/perl-Net-SMTP-SSL-1.03-1 | 0 .../perl-Net-SMTP-SSL/perl-Net-SMTP-SSL-1.03-1-src | 0 .../{x86 => x86_64}/proj-debuginfo/.htaccess | 0 .../proj-debuginfo/proj-debuginfo-4.8.0-1 | 0 .../htdocs.expected/x86_64/rpm-doc-src/.htaccess | 2 + .../{x86 => x86_64}/rpm-doc-src/rpm-doc-4.1-2-src | 0 .../htdocs.expected/x86_64/rpm-doc/.htaccess | 2 + .../{x86 => x86_64}/rpm-doc/rpm-doc-4.1-2 | 0 .../{x86 => x86_64}/rpm-doc/rpm-doc-4.1-2-src | 0 .../{x86 => x86_64}/rpm-doc/rpm-doc-999-1 | 0 .../x86_64/staleversion-src/.htaccess | 2 + .../staleversion-src/staleversion-240-1-src | 0 .../staleversion-src/staleversion-242-0-src | 0 .../staleversion-src/staleversion-243-0-src | 0 .../staleversion-src/staleversion-250-0-src | 0 .../staleversion-src/staleversion-251-0-src | 0 .../staleversion-src/staleversion-260-0-src | 0 .../htdocs.expected/x86_64/staleversion/.htaccess | 2 + .../staleversion/staleversion-240-1 | 0 .../staleversion/staleversion-240-1-src | 0 .../staleversion/staleversion-242-0 | 0 .../staleversion/staleversion-242-0-src | 0 .../staleversion/staleversion-243-0 | 0 .../staleversion/staleversion-243-0-src | 0 .../staleversion/staleversion-250-0 | 0 .../staleversion/staleversion-250-0-src | 0 .../staleversion/staleversion-251-0 | 0 .../staleversion/staleversion-251-0-src | 0 .../staleversion/staleversion-260-0 | 0 .../staleversion/staleversion-260-0-src | 0 .../htdocs.expected/x86_64/test-c-src/.htaccess | 2 + .../{x86 => x86_64}/test-c-src/test-c-1.0-1-src | 0 .../htdocs.expected/x86_64/test-c/.htaccess | 2 + .../{x86 => x86_64}/test-c/test-c-1.0-1 | 0 .../{x86 => x86_64}/test-c/test-c-1.0-1-src | 0 .../htdocs.expected/x86_64/test-d-src/.htaccess | 2 + .../{x86 => x86_64}/test-d-src/test-d-1.0-1-src | 0 .../htdocs.expected/x86_64/test-d/.htaccess | 2 + .../{x86 => x86_64}/test-d/test-d-1.0-1 | 0 .../{x86 => x86_64}/test-d/test-d-1.0-1-src | 0 .../htdocs.expected/x86_64/test-e-src/.htaccess | 2 + .../{x86 => x86_64}/test-e-src/test-e-1.0-1-src | 0 .../htdocs.expected/x86_64/test-e/.htaccess | 2 + .../{x86 => x86_64}/test-e/test-e-1.0-1 | 0 .../{x86 => x86_64}/test-e/test-e-1.0-1-src | 0 .../x86_64/testpackage-src/.htaccess | 2 + .../testpackage-src/testpackage-0.1-1-src | 0 .../htdocs.expected/x86_64/testpackage/.htaccess | 2 + .../{x86 => x86_64}/testpackage/testpackage-0.1-1 | 0 .../testpackage/testpackage-0.1-1-src | 0 test/testdata/inifile/setup.ini.expected | 120 ++++----- test/testdata/process_arch/homedir.expected | 34 +-- test/testdata/process_arch/htdocs.expected | 83 +++--- test/testdata/process_arch/packages.json.expected | 28 +- test/testdata/process_arch/rel_area.expected | 288 +++++++++++---------- test/testdata/process_arch/setup.ini.expected | 116 ++++----- test/testdata/process_arch/vault.expected | 36 +-- .../release/arc/arc-4.32.7-10-src.hint | 0 .../release/arc/arc-4.32.7-10-src.tar.bz2 | Bin .../{x86 => x86_64}/release/arc/arc-4.32.7-10.hint | 0 .../release/arc/arc-4.32.7-10.tar.bz2 | Bin .../release/base-cygwin/base-cygwin-3.6-1.hint | 0 .../release/base-cygwin/base-cygwin-3.6-1.tar.xz | Bin .../release/base-cygwin/base-cygwin-3.8-1.hint | 0 .../release/base-cygwin/base-cygwin-3.8-1.tar.xz | Bin .../release/corrupt/corrupt-2.0.0-1-src.hint | 0 .../release/corrupt/corrupt-2.0.0-1-src.tar.xz | Bin .../release/corrupt/corrupt-2.0.0-1.hint | 0 .../release/corrupt/corrupt-2.0.0-1.tar.xz | 0 .../release/cygwin/.this-should-be-ignored | 0 .../release/cygwin/cygwin-2.2.0-1-src.hint | 0 .../release/cygwin/cygwin-2.2.0-1-src.tar.xz | Bin .../release/cygwin/cygwin-2.2.0-1.hint | 0 .../release/cygwin/cygwin-2.2.0-1.tar.xz | Bin .../release/cygwin/cygwin-2.2.1-1-src.hint | 0 .../release/cygwin/cygwin-2.2.1-1-src.tar.xz | Bin .../release/cygwin/cygwin-2.2.1-1.hint | 0 .../release/cygwin/cygwin-2.2.1-1.tar.xz | Bin .../release/cygwin/cygwin-2.3.0-0.3-src.hint | 0 .../release/cygwin/cygwin-2.3.0-0.3-src.tar.xz | Bin .../release/cygwin/cygwin-2.3.0-0.3.hint | 0 .../release/cygwin/cygwin-2.3.0-0.3.tar.xz | Bin .../cygwin-debuginfo/cygwin-debuginfo-2.2.0-1.hint | 0 .../cygwin-debuginfo-2.2.0-1.tar.xz | Bin .../cygwin-debuginfo/cygwin-debuginfo-2.2.1-1.hint | 0 .../cygwin-debuginfo-2.2.1-1.tar.xz | Bin .../cygwin-debuginfo-2.3.0-0.3.hint | 0 .../cygwin-debuginfo-2.3.0-0.3.tar.xz | Bin .../release/cygwin/cygwin-debuginfo/override.hint | 0 .../cygwin/cygwin-devel/cygwin-devel-2.2.0-1.hint | 0 .../cygwin-devel/cygwin-devel-2.2.0-1.tar.xz | Bin .../cygwin/cygwin-devel/cygwin-devel-2.2.1-1.hint | 0 .../cygwin-devel/cygwin-devel-2.2.1-1.tar.xz | Bin .../cygwin-devel/cygwin-devel-2.3.0-0.3.hint | 0 .../cygwin-devel/cygwin-devel-2.3.0-0.3.tar.xz | Bin .../release/cygwin/cygwin-devel/override.hint | 0 .../{x86 => x86_64}/release/cygwin/override.hint | 0 .../{x86 => x86_64}/release/invalid/invalid-0.hint | 0 .../release/keychain/keychain-2.6.8-1-src.hint | 0 .../release/keychain/keychain-2.6.8-1-src.tar.bz2 | Bin .../release/keychain/keychain-2.6.8-1.hint | 0 .../release/keychain/keychain-2.6.8-1.tar.bz2 | Bin .../release/keychain/keychain-2.7.1-1-src.hint | 0 .../release/keychain/keychain-2.7.1-1-src.tar.bz2 | Bin .../release/keychain/keychain-2.7.1-1.hint | 0 .../release/keychain/keychain-2.7.1-1.tar.bz2 | Bin .../release/libspiro/libspiro-20071029-1.hint | 0 .../libspiro-devel/libspiro-devel-20071029-1.hint | 0 .../libspiro/libspiro0/libspiro0-20071029-1.hint | 0 .../release/libtextcat/libtextcat-2.2-2-src.hint | 0 .../libtextcat/libtextcat-2.2-2-src.tar.bz2 | Bin .../release/libtextcat/libtextcat-2.2-2.hint | 0 .../release/libtextcat/libtextcat-2.2-2.tar.bz2 | Bin .../libtextcat-devel/libtextcat-devel-2.2-2.hint | 0 .../libtextcat-devel-2.2-2.tar.bz2 | Bin .../libtextcat/libtextcat0/libtextcat0-2.2-2.hint | 0 .../libtextcat0/libtextcat0-2.2-2.tar.bz2 | Bin .../libdns_sd-devel-379.32.1-1.hint | 0 .../libdns_sd-devel-379.32.1-1.tar.bz2 | Bin .../libdns_sd1/libdns_sd1-379.32.1-1.hint | 0 .../libdns_sd1/libdns_sd1-379.32.1-1.tar.bz2 | Bin .../mDNSResponder-379.32.1-1-src.hint | 0 .../mDNSResponder-379.32.1-1-src.tar.bz2 | Bin .../mDNSResponder/mDNSResponder-379.32.1-1.hint | 0 .../mDNSResponder/mDNSResponder-379.32.1-1.tar.bz2 | Bin .../mingw64-i686-binutils-2.29.1.787c9873-1.hint | 0 ...-i686-binutils-debuginfo-2.29.1.787c9873-1.hint | 0 .../release/openssh/openssh-7.2p2-1-src.hint | 0 .../release/openssh/openssh-7.2p2-1-src.tar.xz | Bin .../release/openssh/openssh-7.2p2-1.hint | 0 .../release/openssh/openssh-7.2p2-1.tar.xz | Bin .../release/per-version-incomplete/override.hint | 0 .../per-version-incomplete-36-1-src.hint | 0 .../per-version-incomplete-36-1-src.tar.xz | Bin .../per-version-incomplete-36-1.hint | 0 .../per-version-incomplete-36-1.tar.xz | Bin .../per-version-incomplete-39-1-src.tar.xz | Bin .../per-version-incomplete-39-1.tar.xz | Bin ...er-version-replacement-hint-only-1.0-1-src.hint | 0 ...-version-replacement-hint-only-1.0-1-src.tar.xz | Bin .../per-version-replacement-hint-only-1.0-1.hint | 0 .../per-version-replacement-hint-only-1.0-1.tar.xz | Bin .../release/per-version/override.hint | 0 .../release/per-version/per-version-4.0-1-src.hint | 0 .../per-version/per-version-4.0-1-src.tar.xz | Bin .../release/per-version/per-version-4.0-1.hint | 0 .../release/per-version/per-version-4.0-1.tar.xz | Bin .../release/per-version/per-version-4.8-1-src.hint | 0 .../per-version/per-version-4.8-1-src.tar.xz | Bin .../release/per-version/per-version-4.8-1.hint | 0 .../release/per-version/per-version-4.8-1.tar.xz | Bin .../proj/libproj-devel/libproj-devel-4.8.0-1.hint | 0 .../release/proj/libproj1/libproj1-4.8.0-1.hint | 0 .../{x86 => x86_64}/release/proj/proj-4.8.0-1.hint | 0 .../release/rpm-doc/rpm-doc-4.1-2-src.hint | 0 .../release/rpm-doc/rpm-doc-4.1-2-src.tar.bz2 | Bin .../release/rpm-doc/rpm-doc-4.1-2.hint | 0 .../release/rpm-doc/rpm-doc-4.1-2.tar.bz2 | Bin .../release/rpm-doc/rpm-doc-999-1.hint | 0 .../release/rpm-doc/rpm-doc-999-1.tar.bz2 | Bin .../release/splint/splint-3.1.2-1.hint | 0 .../release/staleversion/override.hint | 0 .../staleversion/staleversion-240-1-src.hint | 0 .../staleversion/staleversion-240-1-src.tar.xz | Bin .../release/staleversion/staleversion-240-1.hint | 0 .../release/staleversion/staleversion-240-1.tar.xz | Bin .../staleversion/staleversion-242-0-src.hint | 0 .../staleversion/staleversion-242-0-src.tar.xz | Bin .../release/staleversion/staleversion-242-0.hint | 0 .../release/staleversion/staleversion-242-0.tar.xz | Bin .../staleversion/staleversion-243-0-src.hint | 0 .../staleversion/staleversion-243-0-src.tar.xz | Bin .../release/staleversion/staleversion-243-0.hint | 0 .../release/staleversion/staleversion-243-0.tar.xz | Bin .../staleversion/staleversion-250-0-src.hint | 0 .../staleversion/staleversion-250-0-src.tar.xz | Bin .../release/staleversion/staleversion-250-0.hint | 0 .../release/staleversion/staleversion-250-0.tar.xz | Bin .../staleversion/staleversion-251-0-src.hint | 0 .../staleversion/staleversion-251-0-src.tar.xz | Bin .../release/staleversion/staleversion-251-0.hint | 0 .../release/staleversion/staleversion-251-0.tar.xz | Bin .../staleversion/staleversion-260-0-src.hint | 0 .../staleversion/staleversion-260-0-src.tar.xz | Bin .../release/staleversion/staleversion-260-0.hint | 0 .../release/staleversion/staleversion-260-0.tar.xz | Bin .../release/testpackage/testpackage-0.1-1-src.hint | 0 .../testpackage/testpackage-0.1-1-src.tar.bz2 | Bin .../release/testpackage/testpackage-0.1-1.hint | 0 .../release/testpackage/testpackage-0.1-1.tar.bz2 | Bin test/testdata/uploads/move.expected | 24 +- test/testdata/uploads/pkglist.expected | 12 +- 481 files changed, 874 insertions(+), 934 deletions(-) diff --git a/calm/calm.py b/calm/calm.py index 196d29b..173fe47 100755 --- a/calm/calm.py +++ b/calm/calm.py @@ -169,7 +169,7 @@ def process_maintainer_uploads(args, state, all_packages, m, basedir, desc): # for each arch and noarch scan_result = {} skip_maintainer = False - for arch in common_constants.ARCHES + ['noarch', 'src']: + for arch in common_constants.ARCHES + ['noarch', 'src'] + common_constants.ARCHIVED_ARCHES: logging.debug("reading uploaded arch %s packages from maintainer %s" % (arch, name)) # read uploads diff --git a/calm/common_constants.py b/calm/common_constants.py index 906a56a..a000588 100644 --- a/calm/common_constants.py +++ b/calm/common_constants.py @@ -58,7 +58,10 @@ ORPHANMAINT = '/'.join([ ]) # architectures we support -ARCHES = ['x86', 'x86_64'] +ARCHES = ['x86_64'] + +# architectures we no longer support +ARCHIVED_ARCHES = ['x86'] # base directory for HTML output HTDOCS = '/www/sourceware/htdocs/cygwin/' diff --git a/calm/package.py b/calm/package.py index 2b5bc85..43fc4cc 100755 --- a/calm/package.py +++ b/calm/package.py @@ -55,6 +55,25 @@ class Kind(Enum): source = 2 +# a path inside a package repository (e.g relative to relarea) +class RepoPath(): + def __init__(self, _arch=None, _path=None, _fn=None): + self.arch = _arch + self.path = _path + self.fn = _fn + + # convert to a path, absolute if given a base directory + def abspath(self, basedir=None): + pc = [self.arch, 'release', self.path, self.fn] + if basedir: + pc.insert(0, basedir) + return os.path.join(*pc) + + # convert to a MoveList tuple + def move(self): + return (os.path.join(self.arch, 'release', self.path), self.fn) + + # information we keep about a package class Package(object): def __init__(self): @@ -100,22 +119,20 @@ class Package(object): # information we keep about a tar file class Tar(object): def __init__(self): - self.path = None # path to tar, relative to release area - self.fn = None # filename + self.repopath = RepoPath() # pathname of tar archive self.sha512 = '' self.size = 0 self.is_empty = False self.is_used = False def __repr__(self): - return "Tar('%s', '%s', '%s', %d, %s)" % (self.fn, self.path, self.sha512, self.size, self.is_empty) + return "Tar('%s', '%s', '%s', %d, %s)" % (self.repopath.fn, os.path.join(self.repopath.arch, 'release', self.repopath.path), self.sha512, self.size, self.is_empty) # information we keep about a hint file class Hint(object): def __init__(self): - self.path = None # path to hint, relative to release area - self.fn = None # filename of hint + self.repopath = RepoPath() # pathname of hint file self.hints = {} # XXX: duplicates version_hints, for the moment @@ -322,7 +339,8 @@ def read_one_package(packages, p, relpath, dirpath, files, kind, strict): return True # check for duplicate package names at different paths - (_, _, pkgpath) = relpath.split(os.sep, 2) + (arch, release, pkgpath) = relpath.split(os.sep, 2) + assert release == 'release' pn = p + ('-src' if kind == Kind.source else '') if pn in packages: @@ -413,8 +431,9 @@ def read_one_package(packages, p, relpath, dirpath, files, kind, strict): # collect the attributes for each tar file t = Tar() - t.path = relpath - t.fn = f + t.repopath.arch = arch + t.repopath.path = pkgpath + t.repopath.fn = f t.size = os.path.getsize(os.path.join(dirpath, f)) t.is_empty = tarfile_is_empty(os.path.join(dirpath, f)) t.mtime = os.path.getmtime(os.path.join(dirpath, f)) @@ -458,8 +477,9 @@ def read_one_package(packages, p, relpath, dirpath, files, kind, strict): pvr_hint['external-source'] += '-src' hintobj = Hint() - hintobj.path = relpath - hintobj.fn = hint_fn + hintobj.repopath.arch = arch + hintobj.repopath.path = pkgpath + hintobj.repopath.fn = hint_fn hintobj.hints = pvr_hint version_hints[ovr] = pvr_hint @@ -1245,7 +1265,7 @@ def write_setup_ini(args, packages, arch): # helper function to output details for a particular tar file def tar_line(p, category, v, f): to = p.tar(v) - fn = os.path.join(to.path, to.fn) + fn = to.repopath.abspath() sha512 = to.sha512 size = to.size print("%s: %s %d %s" % (category, fn, size, sha512), file=f) @@ -1391,12 +1411,12 @@ def delete(packages, path, fn): for p in packages: if packages[p].pkgpath == pkgpath: for vr in packages[p].tarfiles: - if packages[p].tarfiles[vr].fn == fn: + if packages[p].tarfiles[vr].repopath.fn == fn: del packages[p].tarfiles[vr] break for h in packages[p].hints: - if packages[p].hints[h].fn == fn: + if packages[p].hints[h].repopath.fn == fn: del packages[p].hints[h] del packages[p].version_hints[h] break @@ -1576,7 +1596,7 @@ def stale_packages(packages): all_stale[v] = True if getattr(po.tar(v), 'fresh', Freshness.stale) != Freshness.fresh: to = po.tar(v) - stale.add(to.path, to.fn) + stale.add(*to.repopath.move()) logging.debug("package '%s' version '%s' is stale" % (pn, v)) else: all_stale[v] = False @@ -1586,7 +1606,7 @@ def stale_packages(packages): # same version (including version: overrides), move it as well ov = po.hints[v].hints.get('original-version', v) if all_stale.get(v, True) and all_stale.get(ov, True): - stale.add(po.hints[v].path, po.hints[v].fn) + stale.add(*po.hints[v].repopath.move()) logging.debug("package '%s' version '%s' hint is stale" % (pn, v)) # clean up freshness mark diff --git a/calm/past_mistakes.py b/calm/past_mistakes.py index 1403840..e338c53 100644 --- a/calm/past_mistakes.py +++ b/calm/past_mistakes.py @@ -33,16 +33,10 @@ hyphen_in_version = { 'email': ['3.2.1-git', '3.2.3-git'], 'email-debuginfo': ['3.2.1-git', '3.2.3-git'], 'fdupes': ['1.50-PR2'], - 'fftw3': ['3.3.6-pl1'], - 'fftw3-debuginfo': ['3.3.6-pl1'], - 'fftw3-doc': ['3.3.6-pl1'], 'gendef': ['1.0-svn2931'], 'gendef-debuginfo': ['1.0-svn2931'], 'hidapi': ['0.8.0-rc1'], 'hidapi-debuginfo': ['0.8.0-rc1'], - 'libfftw3_3': ['3.3.6-pl1'], - 'libfftw3-devel': ['3.3.6-pl1'], - 'libfftw3-omp3': ['3.3.6-pl1'], 'libhidapi-devel': ['0.8.0-rc1'], 'libhidapi0': ['0.8.0-rc1'], 'libmangle': ['1.0-svn2930'], @@ -54,15 +48,12 @@ hyphen_in_version = { 'mingw64-x86_64-hidapi-debuginfo': ['0.8.0-rc1'], 'recode': ['3.7-beta2'], 'recode-debuginfo': ['3.7-beta2'], - 'tack': ['1.07-20130713', '1.07-20150606'], - 'tack-debuginfo': ['1.07-20130713', '1.07-20150606'], - 'xemacs-mule-sumo': ['2007-04-27'], - 'xemacs-sumo': ['2007-04-27'], - 'xview': ['3.2p1.4-28'], - 'xview-devel': ['3.2p1.4-28'], + 'tack': ['1.07-20150606'], + 'tack-debuginfo': ['1.07-20150606'], } -# cygport places this into the requires of every debuginfo package +# cygport places this into the requires of every debuginfo package, including +# cygwin-debuginfo itself self_requires = [ 'cygwin-debuginfo' ] @@ -73,29 +64,8 @@ self_source = [ 'R_autorebase', '_update-info-dir', 'base-cygwin', - 'base-files', # older versions were self-source, but current one isn't 'chere', 'cygcheck-dep', - 'gcc4-core', - 'gcc4-g++', - 'tesseract-ocr-deu', # unclear how these are delivered by upstream and how they are packaged - 'tesseract-ocr-deu-f', - 'tesseract-ocr-eng', - 'tesseract-ocr-fra', - 'tesseract-ocr-ita', - 'tesseract-ocr-nld', - 'tesseract-ocr-por', - 'tesseract-ocr-spa', - 'tesseract-ocr-vie', - 'tesseract-training-core', - 'tesseract-training-deu', - 'tesseract-training-eng', - 'tesseract-training-fra', - 'tesseract-training-ita', - 'tesseract-training-nld', - 'tesseract-training-por', - 'tesseract-training-spa', - 'tesseract-training-vie', ] # these are packages which currently have versions different to all the other @@ -139,7 +109,6 @@ nonunique_versions = [ # # don't add to this list, use 'disable-check: empty-obsolete' in pvr.hint instead empty_but_not_obsolete = { - 'freeglut-doc': ['3.0.0-1', '3.2.1-1'], # should be obsoleted by libglut-devel which contains doc now 'isl': ['0.16.1-1'], # useless empty package, not autosupressed as it has depends 'libpopt-devel': ['1.16-1'], # version 1.16-1 was empty (x86_64) 'libpopt0': ['1.16-1'], # version 1.16-1 was empty @@ -153,21 +122,14 @@ empty_but_not_obsolete = { # # don't add to this list, use 'disable-check: curr-most-recent' in override.hint instead mtime_anomalies = [ - 'gcc-java', 'gcc-tools-epoch2-autoconf', 'gcc-tools-epoch2-autoconf-src', - 'gv-debuginfo', - 'libgcj-common', - 'libgcj16', - 'python-gtk2.0', ] # packages with maintainer anomalies # # don't add to this list, fix the package maint_anomalies = { - 'libelf0': ['0.8.13-2'], # libelf is called libelf0 in x86 arch - 'libelf0-devel': ['0.8.13-2'], 'manlint': ['1.6g-2'], # unclear why this is under man 'python3-h5py-debuginfo': ['2.9.0-1'], # superceded by python-h5py-debuginfo } @@ -196,8 +158,8 @@ missing_obsolete = { nonexistent_provides = [ '_windows', 'perl5_026', - 'rdiff-debuginfo', # not in x86 - 'rxvt-unicode-X-debuginfo', # not in x86_64 + 'rdiff-debuginfo', + 'rxvt-unicode-X-debuginfo', 'xfce4-mixer-debuginfo', 'python3-dbus-debuginfo', ] @@ -208,19 +170,8 @@ nonexistent_provides = [ # depends on it's replacement, and so are a lingering remnant of something not # properly obsoleted) empty_source = { - 'SuiteSparse-src': ['4.0.2-1'], - 'ash-src': ['20040127-5'], # obsoleted by dash - 'checkx-src': ['0.2.1-1'], # obsoleted by run2 - 'db4.8-src': ['4.8.30-2'], # obsoleted by db - 'gcc-tools-autoconf-src': ['2.59-11'], # obsoleted by gcc-tools-epoch{1,2}-autoconf - 'gcc-tools-automake-src': ['1.9.6-11'], # obsoleted by gcc-tools-epoch{1,2}-automake - 'lzma-src': ['4.32.7-10'], # obsoleted by xz - 'mlcscope-src': ['99-1'], # obsoleted by cscope - 'octave-forge-src': ['20140215-1'], 'octave-octcdf-src': ['1.1.7-99'], 'perl-File-Slurp-Unicode-src': ['0.7.1-2'], # obsoleted by perl-File-Slurp - 'pinentry-qt3-src': ['0.7.6-3'], # obsoleted by pinentry-qt - 'xerces-c-devel-src': ['2.8.0-1'], # obsoleted by libxerces-c-devel } # additional data for the heuristic for upgrading old-style obsoletion packages @@ -228,10 +179,6 @@ old_style_obsolete_by = { 'at-spi2-atk': 'libatk-bridge2.0_0', 'qt-gstreamer': 'libQtGStreamer1_0_0', 'lighttpd-mod_trigger_b4_dl': 'lighttpd', - # these require: both epoch1 and epoch2 replacements, but epoch1 contains - # the same version - 'gcc-tools-autoconf': 'gcc-tools-epoch1-autoconf', - 'gcc-tools-automake': 'gcc-tools-epoch1-automake', # these are odd and only exist to record an optional dependency on the # language runtime (dynamically loaded at runtime), which is also noted in # build-requires: @@ -240,21 +187,6 @@ old_style_obsolete_by = { 'vim-python': 'vim', 'vim-python3': 'vim', 'vim-ruby': 'vim', - # (An empty replacement means "don't apply this heuristic". We use that to - # not bother with some x86-only packages which have complex replacements, - # since they will be going away relatively soon anyhow...) - 'SuiteSparse': '', - 'libSuiteSparse-devel': '', + # (An empty replacement means "don't apply this heuristic") 'libksba': '', - 'libstdc++6-devel': '', - 'octave-forge': '', - 'plotutils-devel': '', - 'rpm-doc': '', - 'tetex-base': '', - 'tetex-bin': '', - 'tetex-extra': '', - 'tetex-tiny': '', - 'tetex-x11': '', - 'texlive-collection-langtibetan': '', - 'texlive-collection-texinfo': '', } diff --git a/calm/pkg2html.py b/calm/pkg2html.py index 4924847..2194a05 100755 --- a/calm/pkg2html.py +++ b/calm/pkg2html.py @@ -464,7 +464,7 @@ def write_arch_listing(args, packages, arch): listings = [] for to in packages[p].tarfiles.values(): - tn = to.fn + tn = to.repopath.fn fver = re.sub(r'\.tar.*$', '', tn) listing = os.path.join(dirpath, fver) @@ -492,7 +492,7 @@ def write_arch_listing(args, packages, arch):

%s: %s

''' % (p, desc, p, p, desc)), file=f)
 
-                        tf = os.path.join(args.rel_area, to.path, to.fn)
+                        tf = to.repopath.abspath(args.rel_area)
                         if not os.path.exists(tf):
                             # this shouldn't happen with a full mirror
                             logging.error("tarfile %s not found" % (tf))
diff --git a/calm/uploads.py b/calm/uploads.py
index 2f98fe5..ba18217 100644
--- a/calm/uploads.py
+++ b/calm/uploads.py
@@ -253,6 +253,13 @@ def scan(scandir, m, all_packages, arch, args):
                     files.remove(f)
                     continue
 
+            # ignore uploads for archived arches
+            if arch in common_constants.ARCHIVED_ARCHES:
+                logging.warning("discarding %s, %s architecture is archived and read-only" % (fn, arch))
+                files.remove(f)
+                remove.append(fn)
+                continue
+
             # does file already exist in release area?
             dest = os.path.join(args.rel_area, relpath, f)
             if os.path.isfile(dest):
diff --git a/requirements.txt b/requirements.txt
index b75566e..a172a9d 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,4 +1,4 @@
-flake8
+flake8<6
 flake8-blind-except
 flake8-bugbear ; python_version >= "3.5"
 flake8-builtins
diff --git a/test/test_calm.py b/test/test_calm.py
index ded5f27..0f1534c 100755
--- a/test/test_calm.py
+++ b/test/test_calm.py
@@ -154,9 +154,9 @@ class CalmTest(unittest.TestCase):
                             compare_with_expected_file(self, expected, results, name)
 
 #
-# something like "find -name results -exec sh -c 'cd `dirname {}` ; cp results
-# expected' \;" can be used to update the expected output (after you have
-# checked it to make sure it is really correct, of course :) )
+# something like "find -name results -execdir cp results expected \;" can be
+# used to update the expected output (after you have checked it to make sure it
+# is really correct, of course :) )
 #
 
     def test_html_writer(self):
@@ -164,7 +164,7 @@ class CalmTest(unittest.TestCase):
 
         htdocs = 'testdata/htdocs'
         args = types.SimpleNamespace()
-        args.arch = 'x86'
+        args.arch = 'x86_64'
         args.htdocs = htdocs
         args.rel_area = 'testdata/relarea'
         args.homedir = 'testdata/homes'
@@ -330,7 +330,7 @@ class CalmTest(unittest.TestCase):
         logging.info('test_root = %s', test_root)
 
         args = types.SimpleNamespace()
-        args.arch = 'x86'
+        args.arch = 'x86_64'
         args.rel_area = 'testdata/relarea'
         args.dryrun = False
 
@@ -345,11 +345,11 @@ class CalmTest(unittest.TestCase):
         m = mlist['Blooey McFooey']
         m.pkgs.extend(pkglist + ['not-on-package-list'])
 
-        ready_fns = [(os.path.join(m.homedir(), 'x86', 'release', 'testpackage', '!ready'), ''),
-                     (os.path.join(m.homedir(), 'x86', 'release', 'testpackage2', 'testpackage2-subpackage', '!ready'), ''),
-                     (os.path.join(m.homedir(), 'x86', 'release', 'testpackage-zstd', '!ready'), ''),
-                     (os.path.join(m.homedir(), 'x86', 'release', 'after-ready', '!ready'), '-t 198709011700'),
-                     (os.path.join(m.homedir(), 'x86', 'release', 'corrupt', '!ready'), '')]
+        ready_fns = [(os.path.join(m.homedir(), 'x86_64', 'release', 'testpackage', '!ready'), ''),
+                     (os.path.join(m.homedir(), 'x86_64', 'release', 'testpackage2', 'testpackage2-subpackage', '!ready'), ''),
+                     (os.path.join(m.homedir(), 'x86_64', 'release', 'testpackage-zstd', '!ready'), ''),
+                     (os.path.join(m.homedir(), 'x86_64', 'release', 'after-ready', '!ready'), '-t 198709011700'),
+                     (os.path.join(m.homedir(), 'x86_64', 'release', 'corrupt', '!ready'), '')]
         for (f, t) in ready_fns:
             os.system('touch %s "%s"' % (t, f))
 
@@ -360,9 +360,9 @@ class CalmTest(unittest.TestCase):
 
         self.assertEqual(scan_result.error, False)
         compare_with_expected_file(self, 'testdata/uploads', dict(scan_result.to_relarea.movelist), 'move')
-        self.assertCountEqual(scan_result.to_vault.movelist, {'x86/release/testpackage': ['x86/release/testpackage/testpackage-0.1-1.tar.bz2']})
+        self.assertCountEqual(scan_result.to_vault.movelist, {'x86_64/release/testpackage': ['x86_64/release/testpackage/testpackage-0.1-1.tar.bz2']})
         self.assertCountEqual(scan_result.remove_always, [f for (f, t) in ready_fns])
-        self.assertEqual(scan_result.remove_success, ['testdata/homes/Blooey McFooey/x86/release/testpackage/-testpackage-0.1-1-src.tar.bz2', 'testdata/homes/Blooey McFooey/x86/release/testpackage/-testpackage-0.1-1.tar.bz2'])
+        self.assertEqual(scan_result.remove_success, ['testdata/homes/Blooey McFooey/x86_64/release/testpackage/-testpackage-0.1-1-src.tar.bz2', 'testdata/homes/Blooey McFooey/x86_64/release/testpackage/-testpackage-0.1-1.tar.bz2'])
         with pprint_patch():
             compare_with_expected_file(self, 'testdata/uploads', dict(scan_result.packages), 'pkglist')
 
@@ -370,7 +370,7 @@ class CalmTest(unittest.TestCase):
         self.maxDiff = None
 
         args = types.SimpleNamespace()
-        args.arch = 'x86'
+        args.arch = 'x86_64'
         args.dryrun = False
         args.force = True
         args.inifile = 'testdata/inifile/setup.ini'
@@ -380,7 +380,7 @@ class CalmTest(unittest.TestCase):
         args.setup_version = '4.321'
 
         packages = package.read_packages(args.rel_area, args.arch)
-        package.delete(packages, 'x86/release/nonexistent', 'nosuchfile-1.0.0.tar.xz')
+        package.delete(packages, 'x86_64/release/nonexistent', 'nosuchfile-1.0.0.tar.xz')
         self.assertEqual(package.validate_packages(args, packages), True)
         package.write_setup_ini(args, packages, args.arch)
         with open(args.inifile) as inifile:
@@ -413,7 +413,7 @@ class CalmTest(unittest.TestCase):
 
         # set appropriate !ready
         m_homedir = os.path.join(args.homedir, 'Blooey McFooey')
-        os.system('touch "%s"' % (os.path.join(m_homedir, 'x86', 'release', 'staleversion', '!ready')))
+        os.system('touch "%s"' % (os.path.join(m_homedir, 'x86_64', 'release', 'staleversion', '!ready')))
 
         state = calm.calm.CalmState()
         state.packages = calm.calm.process_relarea(args, state)
@@ -453,13 +453,13 @@ class CalmTest(unittest.TestCase):
 
         # set appropriate !readys
         m_homedir = os.path.join(args.homedir, 'Blooey McFooey')
-        ready_fns = [(os.path.join(m_homedir, 'x86', 'release', 'testpackage', '!ready'), ''),
-                     (os.path.join(m_homedir, 'x86', 'release', 'testpackage2', 'testpackage2-subpackage', '!ready'), ''),
-                     (os.path.join(m_homedir, 'x86', 'release', 'after-ready', '!ready'), '-t 198709011700'),
+        ready_fns = [(os.path.join(m_homedir, 'x86_64', 'release', 'testpackage', '!ready'), ''),
+                     (os.path.join(m_homedir, 'x86_64', 'release', 'testpackage2', 'testpackage2-subpackage', '!ready'), ''),
+                     (os.path.join(m_homedir, 'x86_64', 'release', 'after-ready', '!ready'), '-t 198709011700'),
                      (os.path.join(m_homedir, 'noarch', 'release', 'perl-Net-SMTP-SSL', '!ready'), ''),
-                     (os.path.join(m_homedir, 'x86', 'release', 'corrupt', '!ready'), ''),
-                     (os.path.join(m_homedir, 'x86', 'release', 'per-version', '!ready'), ''),
-                     (os.path.join(m_homedir, 'x86', 'release', 'per-version-replacement-hint-only', '!ready'), '')]
+                     (os.path.join(m_homedir, 'x86_64', 'release', 'corrupt', '!ready'), ''),
+                     (os.path.join(m_homedir, 'x86_64', 'release', 'per-version', '!ready'), ''),
+                     (os.path.join(m_homedir, 'x86_64', 'release', 'per-version-replacement-hint-only', '!ready'), '')]
         for (f, t) in ready_fns:
             os.system('touch %s "%s"' % (t, f))
 
@@ -467,7 +467,7 @@ class CalmTest(unittest.TestCase):
         self.assertTrue(packages)
 
         pkg2html.update_package_listings(args, packages)
-        package.write_setup_ini(args, packages['x86'], 'x86')
+        package.write_setup_ini(args, packages['x86_64'], 'x86_64')
 
         with open(os.path.join(args.rel_area, 'setup.ini')) as inifile:
             results = inifile.read()
@@ -496,9 +496,9 @@ class CalmTest(unittest.TestCase):
         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' \\;")
+        os.system("find testdata/relarea/x86_64 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/arc/sha512.sum')
+        os.unlink('testdata/relarea/x86_64/release/arc/sha512.sum')
         # remove !ready files
         os.system("find testdata/homes -name !ready -exec rm {} \\;")
 
@@ -512,36 +512,36 @@ class CalmTest(unittest.TestCase):
                 os.system('touch "%s" -d %s' % (os.path.join(dirpath, f), '2018-03-02'))
 
         # then adjust packages where we need highest version to also be latest
-        relarea_x86 = os.path.join('testdata', 'relarea', 'x86', 'release')
+        relarea_arch = os.path.join('testdata', 'relarea', 'x86_64', 'release')
         relarea_noarch = os.path.join('testdata', 'relarea', 'noarch', 'release')
-        home_conflict = os.path.join('testdata', 'homes.conflict', 'Blooey McFooey', 'x86', 'release')
-        touches = [(os.path.join(relarea_x86, 'cygwin', 'cygwin-2.2.0-1.tar.xz'), '2016-11-01'),
-                   (os.path.join(relarea_x86, 'cygwin', 'cygwin-2.2.0-1-src.tar.xz'), '2016-11-01'),
-                   (os.path.join(relarea_x86, 'cygwin', 'cygwin-2.2.1-1.tar.xz'), '2016-11-02'),
-                   (os.path.join(relarea_x86, 'cygwin', 'cygwin-2.2.1-1-src.tar.xz'), '2016-11-02'),
-                   (os.path.join(relarea_x86, 'cygwin', 'cygwin-debuginfo', 'cygwin-debuginfo-2.2.0-1.tar.xz'), '2016-11-01'),
-                   (os.path.join(relarea_x86, 'cygwin', 'cygwin-debuginfo', 'cygwin-debuginfo-2.2.1-1.tar.xz'), '2016-11-02'),
-                   (os.path.join(relarea_x86, 'cygwin', 'cygwin-devel', 'cygwin-devel-2.2.0-1.tar.xz'), '2016-11-01'),
-                   (os.path.join(relarea_x86, 'cygwin', 'cygwin-devel', 'cygwin-devel-2.2.1-1.tar.xz'), '2016-11-02'),
-                   (os.path.join(relarea_x86, 'base-cygwin', 'base-cygwin-3.6-1.tar.xz'), '2016-11-02'),
-                   (os.path.join(relarea_x86, 'per-version', 'per-version-4.0-1.tar.xz'), '2017-04-09'),
-                   (os.path.join(relarea_x86, 'per-version', 'per-version-4.0-1-src.tar.xz'), '2017-04-09'),
-                   (os.path.join(relarea_x86, 'rpm-doc', 'rpm-doc-4.1-2.tar.bz2'), '2016-11-02'),
-                   (os.path.join(relarea_x86, 'rpm-doc', 'rpm-doc-4.1-2-src.tar.bz2'), '2016-11-02'),
-                   (os.path.join(relarea_x86, 'staleversion', 'staleversion-240-1.tar.xz'), '2017-04-07'),
-                   (os.path.join(relarea_x86, 'staleversion', 'staleversion-240-1-src.tar.xz'), '2017-04-07'),
-                   (os.path.join(relarea_x86, 'staleversion', 'staleversion-242-0.tar.xz'), '2017-04-08'),
-                   (os.path.join(relarea_x86, 'staleversion', 'staleversion-242-0-src.tar.xz'), '2017-04-08'),
-                   (os.path.join(relarea_x86, 'staleversion', 'staleversion-243-0.tar.xz'), '2017-04-09'),
-                   (os.path.join(relarea_x86, 'staleversion', 'staleversion-243-0-src.tar.xz'), '2017-04-09'),
-                   (os.path.join(relarea_x86, 'staleversion', 'staleversion-250-0.tar.xz'), '2017-04-10'),
-                   (os.path.join(relarea_x86, 'staleversion', 'staleversion-250-0-src.tar.xz'), '2017-04-10'),
-                   (os.path.join(relarea_x86, 'staleversion', 'staleversion-251-0.tar.xz'), '2017-04-09'),
-                   (os.path.join(relarea_x86, 'staleversion', 'staleversion-251-0-src.tar.xz'), '2017-04-09'),
-                   (os.path.join(relarea_x86, 'staleversion', 'staleversion-260-0.tar.xz'), '2017-04-12'),
-                   (os.path.join(relarea_x86, 'staleversion', 'staleversion-260-0-src.tar.xz'), '2017-04-12'),
-                   (os.path.join(relarea_x86, 'keychain', 'keychain-2.6.8-1.tar.bz2'), '2016-11-02'),
-                   (os.path.join(relarea_x86, 'keychain', 'keychain-2.6.8-1-src.tar.bz2'), '2016-11-02'),
+        home_conflict = os.path.join('testdata', 'homes.conflict', 'Blooey McFooey', 'x86_64', 'release')
+        touches = [(os.path.join(relarea_arch, 'cygwin', 'cygwin-2.2.0-1.tar.xz'), '2016-11-01'),
+                   (os.path.join(relarea_arch, 'cygwin', 'cygwin-2.2.0-1-src.tar.xz'), '2016-11-01'),
+                   (os.path.join(relarea_arch, 'cygwin', 'cygwin-2.2.1-1.tar.xz'), '2016-11-02'),
+                   (os.path.join(relarea_arch, 'cygwin', 'cygwin-2.2.1-1-src.tar.xz'), '2016-11-02'),
+                   (os.path.join(relarea_arch, 'cygwin', 'cygwin-debuginfo', 'cygwin-debuginfo-2.2.0-1.tar.xz'), '2016-11-01'),
+                   (os.path.join(relarea_arch, 'cygwin', 'cygwin-debuginfo', 'cygwin-debuginfo-2.2.1-1.tar.xz'), '2016-11-02'),
+                   (os.path.join(relarea_arch, 'cygwin', 'cygwin-devel', 'cygwin-devel-2.2.0-1.tar.xz'), '2016-11-01'),
+                   (os.path.join(relarea_arch, 'cygwin', 'cygwin-devel', 'cygwin-devel-2.2.1-1.tar.xz'), '2016-11-02'),
+                   (os.path.join(relarea_arch, 'base-cygwin', 'base-cygwin-3.6-1.tar.xz'), '2016-11-02'),
+                   (os.path.join(relarea_arch, 'per-version', 'per-version-4.0-1.tar.xz'), '2017-04-09'),
+                   (os.path.join(relarea_arch, 'per-version', 'per-version-4.0-1-src.tar.xz'), '2017-04-09'),
+                   (os.path.join(relarea_arch, 'rpm-doc', 'rpm-doc-4.1-2.tar.bz2'), '2016-11-02'),
+                   (os.path.join(relarea_arch, 'rpm-doc', 'rpm-doc-4.1-2-src.tar.bz2'), '2016-11-02'),
+                   (os.path.join(relarea_arch, 'staleversion', 'staleversion-240-1.tar.xz'), '2017-04-07'),
+                   (os.path.join(relarea_arch, 'staleversion', 'staleversion-240-1-src.tar.xz'), '2017-04-07'),
+                   (os.path.join(relarea_arch, 'staleversion', 'staleversion-242-0.tar.xz'), '2017-04-08'),
+                   (os.path.join(relarea_arch, 'staleversion', 'staleversion-242-0-src.tar.xz'), '2017-04-08'),
+                   (os.path.join(relarea_arch, 'staleversion', 'staleversion-243-0.tar.xz'), '2017-04-09'),
+                   (os.path.join(relarea_arch, 'staleversion', 'staleversion-243-0-src.tar.xz'), '2017-04-09'),
+                   (os.path.join(relarea_arch, 'staleversion', 'staleversion-250-0.tar.xz'), '2017-04-10'),
+                   (os.path.join(relarea_arch, 'staleversion', 'staleversion-250-0-src.tar.xz'), '2017-04-10'),
+                   (os.path.join(relarea_arch, 'staleversion', 'staleversion-251-0.tar.xz'), '2017-04-09'),
+                   (os.path.join(relarea_arch, 'staleversion', 'staleversion-251-0-src.tar.xz'), '2017-04-09'),
+                   (os.path.join(relarea_arch, 'staleversion', 'staleversion-260-0.tar.xz'), '2017-04-12'),
+                   (os.path.join(relarea_arch, 'staleversion', 'staleversion-260-0-src.tar.xz'), '2017-04-12'),
+                   (os.path.join(relarea_arch, 'keychain', 'keychain-2.6.8-1.tar.bz2'), '2016-11-02'),
+                   (os.path.join(relarea_arch, 'keychain', 'keychain-2.6.8-1-src.tar.bz2'), '2016-11-02'),
                    (os.path.join(relarea_noarch, 'perl-Net-SMTP-SSL', 'perl-Net-SMTP-SSL-1.01-1.tar.xz'), '2016-09-01'),
                    (os.path.join(relarea_noarch, 'perl-Net-SMTP-SSL', 'perl-Net-SMTP-SSL-1.01-1-src.tar.xz'), '2016-09-01'),
                    (os.path.join(relarea_noarch, 'perl-Net-SMTP-SSL', 'perl-Net-SMTP-SSL-1.02-1.tar.xz'), '2016-10-01'),
diff --git a/test/testdata/conflict/homedir.expected b/test/testdata/conflict/homedir.expected
index 0cb25e1..0c84693 100644
--- a/test/testdata/conflict/homedir.expected
+++ b/test/testdata/conflict/homedir.expected
@@ -1,9 +1,9 @@
 {'.': [],
  'Blooey McFooey': [],
- 'Blooey McFooey/x86': [],
- 'Blooey McFooey/x86/release': [],
- 'Blooey McFooey/x86/release/staleversion': ['staleversion-230-1-src.hint',
-                                             'staleversion-230-1-src.hint.bak',
-                                             'staleversion-230-1-src.tar.xz',
-                                             'staleversion-230-1.hint',
-                                             'staleversion-230-1.tar.xz']}
+ 'Blooey McFooey/x86_64': [],
+ 'Blooey McFooey/x86_64/release': [],
+ 'Blooey McFooey/x86_64/release/staleversion': ['staleversion-230-1-src.hint',
+                                                'staleversion-230-1-src.hint.bak',
+                                                'staleversion-230-1-src.tar.xz',
+                                                'staleversion-230-1.hint',
+                                                'staleversion-230-1.tar.xz']}
diff --git a/test/testdata/conflict/rel_area.expected b/test/testdata/conflict/rel_area.expected
index db7d029..ce4225b 100644
--- a/test/testdata/conflict/rel_area.expected
+++ b/test/testdata/conflict/rel_area.expected
@@ -39,142 +39,144 @@
                            'test-e-1.0-1-src.tar.xz',
                            'test-e-1.0-1.hint',
                            'test-e-1.0-1.tar.xz'],
- 'x86': ['sha512.sum'],
- 'x86/release': ['sha512.sum'],
- 'x86/release/arc': ['arc-4.32.7-10-src.hint',
-                     'arc-4.32.7-10-src.tar.bz2',
-                     'arc-4.32.7-10.hint',
-                     'arc-4.32.7-10.tar.bz2'],
- 'x86/release/base-cygwin': ['base-cygwin-3.6-1.hint',
-                             'base-cygwin-3.6-1.tar.xz',
-                             'base-cygwin-3.8-1.hint',
-                             'base-cygwin-3.8-1.tar.xz',
-                             'sha512.sum'],
- 'x86/release/corrupt': ['corrupt-2.0.0-1-src.hint',
-                         'corrupt-2.0.0-1-src.tar.xz',
-                         'corrupt-2.0.0-1.hint',
-                         'corrupt-2.0.0-1.tar.xz',
-                         'sha512.sum'],
- 'x86/release/cygwin': ['.this-should-be-ignored',
-                        'cygwin-2.2.0-1-src.hint',
-                        'cygwin-2.2.0-1-src.tar.xz',
-                        'cygwin-2.2.0-1.hint',
-                        'cygwin-2.2.0-1.tar.xz',
-                        'cygwin-2.2.1-1-src.hint',
-                        'cygwin-2.2.1-1-src.tar.xz',
-                        'cygwin-2.2.1-1.hint',
-                        'cygwin-2.2.1-1.tar.xz',
-                        'cygwin-2.3.0-0.3-src.hint',
-                        'cygwin-2.3.0-0.3-src.tar.xz',
-                        'cygwin-2.3.0-0.3.hint',
-                        'cygwin-2.3.0-0.3.tar.xz',
-                        'override.hint',
-                        'sha512.sum'],
- 'x86/release/cygwin/cygwin-debuginfo': ['cygwin-debuginfo-2.2.0-1.hint',
-                                         'cygwin-debuginfo-2.2.0-1.tar.xz',
-                                         'cygwin-debuginfo-2.2.1-1.hint',
-                                         'cygwin-debuginfo-2.2.1-1.tar.xz',
-                                         'cygwin-debuginfo-2.3.0-0.3.hint',
-                                         'cygwin-debuginfo-2.3.0-0.3.tar.xz',
-                                         'override.hint',
-                                         'sha512.sum'],
- 'x86/release/cygwin/cygwin-devel': ['cygwin-devel-2.2.0-1.hint',
-                                     'cygwin-devel-2.2.0-1.tar.xz',
-                                     'cygwin-devel-2.2.1-1.hint',
-                                     'cygwin-devel-2.2.1-1.tar.xz',
-                                     'cygwin-devel-2.3.0-0.3.hint',
-                                     'cygwin-devel-2.3.0-0.3.tar.xz',
-                                     'override.hint',
-                                     'sha512.sum'],
- 'x86/release/invalid': ['invalid-0.hint', 'sha512.sum'],
- 'x86/release/keychain': ['keychain-2.6.8-1-src.hint',
-                          'keychain-2.6.8-1-src.tar.bz2',
-                          'keychain-2.6.8-1.hint',
-                          'keychain-2.6.8-1.tar.bz2',
-                          'keychain-2.7.1-1-src.hint',
-                          'keychain-2.7.1-1-src.tar.bz2',
-                          'keychain-2.7.1-1.hint',
-                          'keychain-2.7.1-1.tar.bz2',
-                          'sha512.sum'],
- 'x86/release/libspiro': ['libspiro-20071029-1.hint', 'sha512.sum'],
- 'x86/release/libspiro/libspiro-devel': ['libspiro-devel-20071029-1.hint', 'sha512.sum'],
- 'x86/release/libspiro/libspiro0': ['libspiro0-20071029-1.hint', 'sha512.sum'],
- 'x86/release/libtextcat': ['libtextcat-2.2-2-src.hint',
-                            'libtextcat-2.2-2-src.tar.bz2',
-                            'libtextcat-2.2-2.hint',
-                            'libtextcat-2.2-2.tar.bz2',
+ 'x86_64': ['sha512.sum'],
+ 'x86_64/release': ['sha512.sum'],
+ 'x86_64/release/arc': ['arc-4.32.7-10-src.hint',
+                        'arc-4.32.7-10-src.tar.bz2',
+                        'arc-4.32.7-10.hint',
+                        'arc-4.32.7-10.tar.bz2'],
+ 'x86_64/release/base-cygwin': ['base-cygwin-3.6-1.hint',
+                                'base-cygwin-3.6-1.tar.xz',
+                                'base-cygwin-3.8-1.hint',
+                                'base-cygwin-3.8-1.tar.xz',
+                                'sha512.sum'],
+ 'x86_64/release/corrupt': ['corrupt-2.0.0-1-src.hint',
+                            'corrupt-2.0.0-1-src.tar.xz',
+                            'corrupt-2.0.0-1.hint',
+                            'corrupt-2.0.0-1.tar.xz',
                             'sha512.sum'],
- 'x86/release/libtextcat/libtextcat-devel': ['libtextcat-devel-2.2-2.hint',
-                                             'libtextcat-devel-2.2-2.tar.bz2',
-                                             'sha512.sum'],
- 'x86/release/libtextcat/libtextcat0': ['libtextcat0-2.2-2.hint', 'libtextcat0-2.2-2.tar.bz2', 'sha512.sum'],
- 'x86/release/mDNSResponder': ['mDNSResponder-379.32.1-1-src.hint',
-                               'mDNSResponder-379.32.1-1-src.tar.bz2',
-                               'mDNSResponder-379.32.1-1.hint',
-                               'mDNSResponder-379.32.1-1.tar.bz2',
-                               'sha512.sum'],
- 'x86/release/mDNSResponder/libdns_sd-devel': ['libdns_sd-devel-379.32.1-1.hint',
-                                               'libdns_sd-devel-379.32.1-1.tar.bz2',
-                                               'sha512.sum'],
- 'x86/release/mDNSResponder/libdns_sd1': ['libdns_sd1-379.32.1-1.hint', 'libdns_sd1-379.32.1-1.tar.bz2', 'sha512.sum'],
- 'x86/release/mingw64-i686-binutils': ['mingw64-i686-binutils-2.29.1.787c9873-1.hint', 'sha512.sum'],
- 'x86/release/mingw64-i686-binutils/mingw64-i686-binutils-debuginfo': ['mingw64-i686-binutils-debuginfo-2.29.1.787c9873-1.hint',
-                                                                       'sha512.sum'],
- 'x86/release/openssh': ['openssh-7.2p2-1-src.hint',
-                         'openssh-7.2p2-1-src.tar.xz',
-                         'openssh-7.2p2-1.hint',
-                         'openssh-7.2p2-1.tar.xz',
-                         'sha512.sum'],
- 'x86/release/per-version': ['override.hint',
-                             'per-version-4.0-1-src.hint',
-                             'per-version-4.0-1-src.tar.xz',
-                             'per-version-4.0-1.hint',
-                             'per-version-4.0-1.tar.xz',
-                             'per-version-4.8-1-src.hint',
-                             'per-version-4.8-1-src.tar.xz',
-                             'per-version-4.8-1.hint',
-                             'per-version-4.8-1.tar.xz',
-                             'sha512.sum'],
- 'x86/release/per-version-incomplete': ['override.hint',
-                                        'per-version-incomplete-36-1-src.hint',
-                                        'per-version-incomplete-36-1-src.tar.xz',
-                                        'per-version-incomplete-36-1.hint',
-                                        'per-version-incomplete-36-1.tar.xz',
-                                        'per-version-incomplete-39-1-src.tar.xz',
-                                        'per-version-incomplete-39-1.tar.xz',
+ 'x86_64/release/cygwin': ['.this-should-be-ignored',
+                           'cygwin-2.2.0-1-src.hint',
+                           'cygwin-2.2.0-1-src.tar.xz',
+                           'cygwin-2.2.0-1.hint',
+                           'cygwin-2.2.0-1.tar.xz',
+                           'cygwin-2.2.1-1-src.hint',
+                           'cygwin-2.2.1-1-src.tar.xz',
+                           'cygwin-2.2.1-1.hint',
+                           'cygwin-2.2.1-1.tar.xz',
+                           'cygwin-2.3.0-0.3-src.hint',
+                           'cygwin-2.3.0-0.3-src.tar.xz',
+                           'cygwin-2.3.0-0.3.hint',
+                           'cygwin-2.3.0-0.3.tar.xz',
+                           'override.hint',
+                           'sha512.sum'],
+ 'x86_64/release/cygwin/cygwin-debuginfo': ['cygwin-debuginfo-2.2.0-1.hint',
+                                            'cygwin-debuginfo-2.2.0-1.tar.xz',
+                                            'cygwin-debuginfo-2.2.1-1.hint',
+                                            'cygwin-debuginfo-2.2.1-1.tar.xz',
+                                            'cygwin-debuginfo-2.3.0-0.3.hint',
+                                            'cygwin-debuginfo-2.3.0-0.3.tar.xz',
+                                            'override.hint',
+                                            'sha512.sum'],
+ 'x86_64/release/cygwin/cygwin-devel': ['cygwin-devel-2.2.0-1.hint',
+                                        'cygwin-devel-2.2.0-1.tar.xz',
+                                        'cygwin-devel-2.2.1-1.hint',
+                                        'cygwin-devel-2.2.1-1.tar.xz',
+                                        'cygwin-devel-2.3.0-0.3.hint',
+                                        'cygwin-devel-2.3.0-0.3.tar.xz',
+                                        'override.hint',
                                         'sha512.sum'],
- 'x86/release/per-version-replacement-hint-only': ['per-version-replacement-hint-only-1.0-1-src.hint',
-                                                   'per-version-replacement-hint-only-1.0-1-src.tar.xz',
-                                                   'per-version-replacement-hint-only-1.0-1.hint',
-                                                   'per-version-replacement-hint-only-1.0-1.tar.xz',
-                                                   'sha512.sum'],
- 'x86/release/proj': ['proj-4.8.0-1.hint', 'sha512.sum'],
- 'x86/release/proj/libproj-devel': ['libproj-devel-4.8.0-1.hint', 'sha512.sum'],
- 'x86/release/proj/libproj1': ['libproj1-4.8.0-1.hint', 'sha512.sum'],
- 'x86/release/rpm-doc': ['rpm-doc-4.1-2-src.hint',
-                         'rpm-doc-4.1-2-src.tar.bz2',
-                         'rpm-doc-4.1-2.hint',
-                         'rpm-doc-4.1-2.tar.bz2',
-                         'rpm-doc-999-1.hint',
-                         'rpm-doc-999-1.tar.bz2',
-                         'sha512.sum'],
- 'x86/release/splint': ['sha512.sum', 'splint-3.1.2-1.hint'],
- 'x86/release/staleversion': ['override.hint',
-                              'sha512.sum',
-                              'staleversion-243-0-src.hint',
-                              'staleversion-243-0-src.tar.xz',
-                              'staleversion-243-0.hint',
-                              'staleversion-243-0.tar.xz',
-                              'staleversion-250-0-src.hint',
-                              'staleversion-250-0-src.tar.xz',
-                              'staleversion-250-0.hint',
-                              'staleversion-250-0.tar.xz',
-                              'staleversion-260-0-src.hint',
-                              'staleversion-260-0-src.tar.xz',
-                              'staleversion-260-0.hint',
-                              'staleversion-260-0.tar.xz'],
- 'x86/release/testpackage': ['sha512.sum',
-                             'testpackage-0.1-1-src.hint',
-                             'testpackage-0.1-1-src.tar.bz2',
-                             'testpackage-0.1-1.hint',
-                             'testpackage-0.1-1.tar.bz2']}
+ 'x86_64/release/invalid': ['invalid-0.hint', 'sha512.sum'],
+ 'x86_64/release/keychain': ['keychain-2.6.8-1-src.hint',
+                             'keychain-2.6.8-1-src.tar.bz2',
+                             'keychain-2.6.8-1.hint',
+                             'keychain-2.6.8-1.tar.bz2',
+                             'keychain-2.7.1-1-src.hint',
+                             'keychain-2.7.1-1-src.tar.bz2',
+                             'keychain-2.7.1-1.hint',
+                             'keychain-2.7.1-1.tar.bz2',
+                             'sha512.sum'],
+ 'x86_64/release/libspiro': ['libspiro-20071029-1.hint', 'sha512.sum'],
+ 'x86_64/release/libspiro/libspiro-devel': ['libspiro-devel-20071029-1.hint', 'sha512.sum'],
+ 'x86_64/release/libspiro/libspiro0': ['libspiro0-20071029-1.hint', 'sha512.sum'],
+ 'x86_64/release/libtextcat': ['libtextcat-2.2-2-src.hint',
+                               'libtextcat-2.2-2-src.tar.bz2',
+                               'libtextcat-2.2-2.hint',
+                               'libtextcat-2.2-2.tar.bz2',
+                               'sha512.sum'],
+ 'x86_64/release/libtextcat/libtextcat-devel': ['libtextcat-devel-2.2-2.hint',
+                                                'libtextcat-devel-2.2-2.tar.bz2',
+                                                'sha512.sum'],
+ 'x86_64/release/libtextcat/libtextcat0': ['libtextcat0-2.2-2.hint', 'libtextcat0-2.2-2.tar.bz2', 'sha512.sum'],
+ 'x86_64/release/mDNSResponder': ['mDNSResponder-379.32.1-1-src.hint',
+                                  'mDNSResponder-379.32.1-1-src.tar.bz2',
+                                  'mDNSResponder-379.32.1-1.hint',
+                                  'mDNSResponder-379.32.1-1.tar.bz2',
+                                  'sha512.sum'],
+ 'x86_64/release/mDNSResponder/libdns_sd-devel': ['libdns_sd-devel-379.32.1-1.hint',
+                                                  'libdns_sd-devel-379.32.1-1.tar.bz2',
+                                                  'sha512.sum'],
+ 'x86_64/release/mDNSResponder/libdns_sd1': ['libdns_sd1-379.32.1-1.hint',
+                                             'libdns_sd1-379.32.1-1.tar.bz2',
+                                             'sha512.sum'],
+ 'x86_64/release/mingw64-i686-binutils': ['mingw64-i686-binutils-2.29.1.787c9873-1.hint', 'sha512.sum'],
+ 'x86_64/release/mingw64-i686-binutils/mingw64-i686-binutils-debuginfo': ['mingw64-i686-binutils-debuginfo-2.29.1.787c9873-1.hint',
+                                                                          'sha512.sum'],
+ 'x86_64/release/openssh': ['openssh-7.2p2-1-src.hint',
+                            'openssh-7.2p2-1-src.tar.xz',
+                            'openssh-7.2p2-1.hint',
+                            'openssh-7.2p2-1.tar.xz',
+                            'sha512.sum'],
+ 'x86_64/release/per-version': ['override.hint',
+                                'per-version-4.0-1-src.hint',
+                                'per-version-4.0-1-src.tar.xz',
+                                'per-version-4.0-1.hint',
+                                'per-version-4.0-1.tar.xz',
+                                'per-version-4.8-1-src.hint',
+                                'per-version-4.8-1-src.tar.xz',
+                                'per-version-4.8-1.hint',
+                                'per-version-4.8-1.tar.xz',
+                                'sha512.sum'],
+ 'x86_64/release/per-version-incomplete': ['override.hint',
+                                           'per-version-incomplete-36-1-src.hint',
+                                           'per-version-incomplete-36-1-src.tar.xz',
+                                           'per-version-incomplete-36-1.hint',
+                                           'per-version-incomplete-36-1.tar.xz',
+                                           'per-version-incomplete-39-1-src.tar.xz',
+                                           'per-version-incomplete-39-1.tar.xz',
+                                           'sha512.sum'],
+ 'x86_64/release/per-version-replacement-hint-only': ['per-version-replacement-hint-only-1.0-1-src.hint',
+                                                      'per-version-replacement-hint-only-1.0-1-src.tar.xz',
+                                                      'per-version-replacement-hint-only-1.0-1.hint',
+                                                      'per-version-replacement-hint-only-1.0-1.tar.xz',
+                                                      'sha512.sum'],
+ 'x86_64/release/proj': ['proj-4.8.0-1.hint', 'sha512.sum'],
+ 'x86_64/release/proj/libproj-devel': ['libproj-devel-4.8.0-1.hint', 'sha512.sum'],
+ 'x86_64/release/proj/libproj1': ['libproj1-4.8.0-1.hint', 'sha512.sum'],
+ 'x86_64/release/rpm-doc': ['rpm-doc-4.1-2-src.hint',
+                            'rpm-doc-4.1-2-src.tar.bz2',
+                            'rpm-doc-4.1-2.hint',
+                            'rpm-doc-4.1-2.tar.bz2',
+                            'rpm-doc-999-1.hint',
+                            'rpm-doc-999-1.tar.bz2',
+                            'sha512.sum'],
+ 'x86_64/release/splint': ['sha512.sum', 'splint-3.1.2-1.hint'],
+ 'x86_64/release/staleversion': ['override.hint',
+                                 'sha512.sum',
+                                 'staleversion-243-0-src.hint',
+                                 'staleversion-243-0-src.tar.xz',
+                                 'staleversion-243-0.hint',
+                                 'staleversion-243-0.tar.xz',
+                                 'staleversion-250-0-src.hint',
+                                 'staleversion-250-0-src.tar.xz',
+                                 'staleversion-250-0.hint',
+                                 'staleversion-250-0.tar.xz',
+                                 'staleversion-260-0-src.hint',
+                                 'staleversion-260-0-src.tar.xz',
+                                 'staleversion-260-0.hint',
+                                 'staleversion-260-0.tar.xz'],
+ 'x86_64/release/testpackage': ['sha512.sum',
+                                'testpackage-0.1-1-src.hint',
+                                'testpackage-0.1-1-src.tar.bz2',
+                                'testpackage-0.1-1.hint',
+                                'testpackage-0.1-1.tar.bz2']}
diff --git a/test/testdata/conflict/vault.expected b/test/testdata/conflict/vault.expected
index e5cb944..edf2c65 100644
--- a/test/testdata/conflict/vault.expected
+++ b/test/testdata/conflict/vault.expected
@@ -1,15 +1,15 @@
 {'.': [],
- 'x86': [],
- 'x86/release': [],
- 'x86/release/staleversion': ['staleversion-240-1-src.hint',
-                              'staleversion-240-1-src.tar.xz',
-                              'staleversion-240-1.hint',
-                              'staleversion-240-1.tar.xz',
-                              'staleversion-242-0-src.hint',
-                              'staleversion-242-0-src.tar.xz',
-                              'staleversion-242-0.hint',
-                              'staleversion-242-0.tar.xz',
-                              'staleversion-251-0-src.hint',
-                              'staleversion-251-0-src.tar.xz',
-                              'staleversion-251-0.hint',
-                              'staleversion-251-0.tar.xz']}
+ 'x86_64': [],
+ 'x86_64/release': [],
+ 'x86_64/release/staleversion': ['staleversion-240-1-src.hint',
+                                 'staleversion-240-1-src.tar.xz',
+                                 'staleversion-240-1.hint',
+                                 'staleversion-240-1.tar.xz',
+                                 'staleversion-242-0-src.hint',
+                                 'staleversion-242-0-src.tar.xz',
+                                 'staleversion-242-0.hint',
+                                 'staleversion-242-0.tar.xz',
+                                 'staleversion-251-0-src.hint',
+                                 'staleversion-251-0-src.tar.xz',
+                                 'staleversion-251-0.hint',
+                                 'staleversion-251-0.tar.xz']}
diff --git a/test/testdata/hints/x86/release/arc/arc-4.32.7-10-src.expected b/test/testdata/hints/x86_64/release/arc/arc-4.32.7-10-src.expected
similarity index 100%
rename from test/testdata/hints/x86/release/arc/arc-4.32.7-10-src.expected
rename to test/testdata/hints/x86_64/release/arc/arc-4.32.7-10-src.expected
diff --git a/test/testdata/hints/x86/release/arc/arc-4.32.7-10.expected b/test/testdata/hints/x86_64/release/arc/arc-4.32.7-10.expected
similarity index 100%
rename from test/testdata/hints/x86/release/arc/arc-4.32.7-10.expected
rename to test/testdata/hints/x86_64/release/arc/arc-4.32.7-10.expected
diff --git a/test/testdata/hints/x86/release/base-cygwin/base-cygwin-3.6-1.expected b/test/testdata/hints/x86_64/release/base-cygwin/base-cygwin-3.6-1.expected
similarity index 100%
rename from test/testdata/hints/x86/release/base-cygwin/base-cygwin-3.6-1.expected
rename to test/testdata/hints/x86_64/release/base-cygwin/base-cygwin-3.6-1.expected
diff --git a/test/testdata/hints/x86/release/base-cygwin/base-cygwin-3.8-1.expected b/test/testdata/hints/x86_64/release/base-cygwin/base-cygwin-3.8-1.expected
similarity index 100%
rename from test/testdata/hints/x86/release/base-cygwin/base-cygwin-3.8-1.expected
rename to test/testdata/hints/x86_64/release/base-cygwin/base-cygwin-3.8-1.expected
diff --git a/test/testdata/hints/x86/release/corrupt/corrupt-2.0.0-1-src.expected b/test/testdata/hints/x86_64/release/corrupt/corrupt-2.0.0-1-src.expected
similarity index 100%
rename from test/testdata/hints/x86/release/corrupt/corrupt-2.0.0-1-src.expected
rename to test/testdata/hints/x86_64/release/corrupt/corrupt-2.0.0-1-src.expected
diff --git a/test/testdata/hints/x86/release/corrupt/corrupt-2.0.0-1.expected b/test/testdata/hints/x86_64/release/corrupt/corrupt-2.0.0-1.expected
similarity index 100%
rename from test/testdata/hints/x86/release/corrupt/corrupt-2.0.0-1.expected
rename to test/testdata/hints/x86_64/release/corrupt/corrupt-2.0.0-1.expected
diff --git a/test/testdata/hints/x86/release/cygwin/cygwin-2.2.0-1-src.expected b/test/testdata/hints/x86_64/release/cygwin/cygwin-2.2.0-1-src.expected
similarity index 100%
rename from test/testdata/hints/x86/release/cygwin/cygwin-2.2.0-1-src.expected
rename to test/testdata/hints/x86_64/release/cygwin/cygwin-2.2.0-1-src.expected
diff --git a/test/testdata/hints/x86/release/cygwin/cygwin-2.2.0-1.expected b/test/testdata/hints/x86_64/release/cygwin/cygwin-2.2.0-1.expected
similarity index 100%
rename from test/testdata/hints/x86/release/cygwin/cygwin-2.2.0-1.expected
rename to test/testdata/hints/x86_64/release/cygwin/cygwin-2.2.0-1.expected
diff --git a/test/testdata/hints/x86/release/cygwin/cygwin-2.2.1-1-src.expected b/test/testdata/hints/x86_64/release/cygwin/cygwin-2.2.1-1-src.expected
similarity index 100%
rename from test/testdata/hints/x86/release/cygwin/cygwin-2.2.1-1-src.expected
rename to test/testdata/hints/x86_64/release/cygwin/cygwin-2.2.1-1-src.expected
diff --git a/test/testdata/hints/x86/release/cygwin/cygwin-2.2.1-1.expected b/test/testdata/hints/x86_64/release/cygwin/cygwin-2.2.1-1.expected
similarity index 100%
rename from test/testdata/hints/x86/release/cygwin/cygwin-2.2.1-1.expected
rename to test/testdata/hints/x86_64/release/cygwin/cygwin-2.2.1-1.expected
diff --git a/test/testdata/hints/x86/release/cygwin/cygwin-2.3.0-0.3-src.expected b/test/testdata/hints/x86_64/release/cygwin/cygwin-2.3.0-0.3-src.expected
similarity index 100%
rename from test/testdata/hints/x86/release/cygwin/cygwin-2.3.0-0.3-src.expected
rename to test/testdata/hints/x86_64/release/cygwin/cygwin-2.3.0-0.3-src.expected
diff --git a/test/testdata/hints/x86/release/cygwin/cygwin-2.3.0-0.3.expected b/test/testdata/hints/x86_64/release/cygwin/cygwin-2.3.0-0.3.expected
similarity index 100%
rename from test/testdata/hints/x86/release/cygwin/cygwin-2.3.0-0.3.expected
rename to test/testdata/hints/x86_64/release/cygwin/cygwin-2.3.0-0.3.expected
diff --git a/test/testdata/hints/x86/release/cygwin/cygwin-debuginfo/cygwin-debuginfo-2.2.0-1.expected b/test/testdata/hints/x86_64/release/cygwin/cygwin-debuginfo/cygwin-debuginfo-2.2.0-1.expected
similarity index 100%
rename from test/testdata/hints/x86/release/cygwin/cygwin-debuginfo/cygwin-debuginfo-2.2.0-1.expected
rename to test/testdata/hints/x86_64/release/cygwin/cygwin-debuginfo/cygwin-debuginfo-2.2.0-1.expected
diff --git a/test/testdata/hints/x86/release/cygwin/cygwin-debuginfo/cygwin-debuginfo-2.2.1-1.expected b/test/testdata/hints/x86_64/release/cygwin/cygwin-debuginfo/cygwin-debuginfo-2.2.1-1.expected
similarity index 100%
rename from test/testdata/hints/x86/release/cygwin/cygwin-debuginfo/cygwin-debuginfo-2.2.1-1.expected
rename to test/testdata/hints/x86_64/release/cygwin/cygwin-debuginfo/cygwin-debuginfo-2.2.1-1.expected
diff --git a/test/testdata/hints/x86/release/cygwin/cygwin-debuginfo/cygwin-debuginfo-2.3.0-0.3.expected b/test/testdata/hints/x86_64/release/cygwin/cygwin-debuginfo/cygwin-debuginfo-2.3.0-0.3.expected
similarity index 100%
rename from test/testdata/hints/x86/release/cygwin/cygwin-debuginfo/cygwin-debuginfo-2.3.0-0.3.expected
rename to test/testdata/hints/x86_64/release/cygwin/cygwin-debuginfo/cygwin-debuginfo-2.3.0-0.3.expected
diff --git a/test/testdata/hints/x86/release/cygwin/cygwin-debuginfo/override.expected b/test/testdata/hints/x86_64/release/cygwin/cygwin-debuginfo/override.expected
similarity index 100%
rename from test/testdata/hints/x86/release/cygwin/cygwin-debuginfo/override.expected
rename to test/testdata/hints/x86_64/release/cygwin/cygwin-debuginfo/override.expected
diff --git a/test/testdata/hints/x86/release/cygwin/cygwin-devel/cygwin-devel-2.2.0-1.expected b/test/testdata/hints/x86_64/release/cygwin/cygwin-devel/cygwin-devel-2.2.0-1.expected
similarity index 100%
rename from test/testdata/hints/x86/release/cygwin/cygwin-devel/cygwin-devel-2.2.0-1.expected
rename to test/testdata/hints/x86_64/release/cygwin/cygwin-devel/cygwin-devel-2.2.0-1.expected
diff --git a/test/testdata/hints/x86/release/cygwin/cygwin-devel/cygwin-devel-2.2.1-1.expected b/test/testdata/hints/x86_64/release/cygwin/cygwin-devel/cygwin-devel-2.2.1-1.expected
similarity index 100%
rename from test/testdata/hints/x86/release/cygwin/cygwin-devel/cygwin-devel-2.2.1-1.expected
rename to test/testdata/hints/x86_64/release/cygwin/cygwin-devel/cygwin-devel-2.2.1-1.expected
diff --git a/test/testdata/hints/x86/release/cygwin/cygwin-devel/cygwin-devel-2.3.0-0.3.expected b/test/testdata/hints/x86_64/release/cygwin/cygwin-devel/cygwin-devel-2.3.0-0.3.expected
similarity index 100%
rename from test/testdata/hints/x86/release/cygwin/cygwin-devel/cygwin-devel-2.3.0-0.3.expected
rename to test/testdata/hints/x86_64/release/cygwin/cygwin-devel/cygwin-devel-2.3.0-0.3.expected
diff --git a/test/testdata/hints/x86/release/cygwin/cygwin-devel/override.expected b/test/testdata/hints/x86_64/release/cygwin/cygwin-devel/override.expected
similarity index 100%
rename from test/testdata/hints/x86/release/cygwin/cygwin-devel/override.expected
rename to test/testdata/hints/x86_64/release/cygwin/cygwin-devel/override.expected
diff --git a/test/testdata/hints/x86/release/cygwin/override.expected b/test/testdata/hints/x86_64/release/cygwin/override.expected
similarity index 100%
rename from test/testdata/hints/x86/release/cygwin/override.expected
rename to test/testdata/hints/x86_64/release/cygwin/override.expected
diff --git a/test/testdata/hints/x86/release/invalid/invalid-0.expected b/test/testdata/hints/x86_64/release/invalid/invalid-0.expected
similarity index 100%
rename from test/testdata/hints/x86/release/invalid/invalid-0.expected
rename to test/testdata/hints/x86_64/release/invalid/invalid-0.expected
diff --git a/test/testdata/hints/x86/release/keychain/keychain-2.6.8-1-src.expected b/test/testdata/hints/x86_64/release/keychain/keychain-2.6.8-1-src.expected
similarity index 100%
rename from test/testdata/hints/x86/release/keychain/keychain-2.6.8-1-src.expected
rename to test/testdata/hints/x86_64/release/keychain/keychain-2.6.8-1-src.expected
diff --git a/test/testdata/hints/x86/release/keychain/keychain-2.6.8-1.expected b/test/testdata/hints/x86_64/release/keychain/keychain-2.6.8-1.expected
similarity index 100%
rename from test/testdata/hints/x86/release/keychain/keychain-2.6.8-1.expected
rename to test/testdata/hints/x86_64/release/keychain/keychain-2.6.8-1.expected
diff --git a/test/testdata/hints/x86/release/keychain/keychain-2.7.1-1-src.expected b/test/testdata/hints/x86_64/release/keychain/keychain-2.7.1-1-src.expected
similarity index 100%
rename from test/testdata/hints/x86/release/keychain/keychain-2.7.1-1-src.expected
rename to test/testdata/hints/x86_64/release/keychain/keychain-2.7.1-1-src.expected
diff --git a/test/testdata/hints/x86/release/keychain/keychain-2.7.1-1.expected b/test/testdata/hints/x86_64/release/keychain/keychain-2.7.1-1.expected
similarity index 100%
rename from test/testdata/hints/x86/release/keychain/keychain-2.7.1-1.expected
rename to test/testdata/hints/x86_64/release/keychain/keychain-2.7.1-1.expected
diff --git a/test/testdata/hints/x86/release/libspiro/libspiro-20071029-1.expected b/test/testdata/hints/x86_64/release/libspiro/libspiro-20071029-1.expected
similarity index 100%
rename from test/testdata/hints/x86/release/libspiro/libspiro-20071029-1.expected
rename to test/testdata/hints/x86_64/release/libspiro/libspiro-20071029-1.expected
diff --git a/test/testdata/hints/x86/release/libspiro/libspiro-devel/libspiro-devel-20071029-1.expected b/test/testdata/hints/x86_64/release/libspiro/libspiro-devel/libspiro-devel-20071029-1.expected
similarity index 100%
rename from test/testdata/hints/x86/release/libspiro/libspiro-devel/libspiro-devel-20071029-1.expected
rename to test/testdata/hints/x86_64/release/libspiro/libspiro-devel/libspiro-devel-20071029-1.expected
diff --git a/test/testdata/hints/x86/release/libspiro/libspiro0/libspiro0-20071029-1.expected b/test/testdata/hints/x86_64/release/libspiro/libspiro0/libspiro0-20071029-1.expected
similarity index 100%
rename from test/testdata/hints/x86/release/libspiro/libspiro0/libspiro0-20071029-1.expected
rename to test/testdata/hints/x86_64/release/libspiro/libspiro0/libspiro0-20071029-1.expected
diff --git a/test/testdata/hints/x86/release/libtextcat/libtextcat-2.2-2-src.expected b/test/testdata/hints/x86_64/release/libtextcat/libtextcat-2.2-2-src.expected
similarity index 100%
rename from test/testdata/hints/x86/release/libtextcat/libtextcat-2.2-2-src.expected
rename to test/testdata/hints/x86_64/release/libtextcat/libtextcat-2.2-2-src.expected
diff --git a/test/testdata/hints/x86/release/libtextcat/libtextcat-2.2-2.expected b/test/testdata/hints/x86_64/release/libtextcat/libtextcat-2.2-2.expected
similarity index 100%
rename from test/testdata/hints/x86/release/libtextcat/libtextcat-2.2-2.expected
rename to test/testdata/hints/x86_64/release/libtextcat/libtextcat-2.2-2.expected
diff --git a/test/testdata/hints/x86/release/libtextcat/libtextcat-devel/libtextcat-devel-2.2-2.expected b/test/testdata/hints/x86_64/release/libtextcat/libtextcat-devel/libtextcat-devel-2.2-2.expected
similarity index 100%
rename from test/testdata/hints/x86/release/libtextcat/libtextcat-devel/libtextcat-devel-2.2-2.expected
rename to test/testdata/hints/x86_64/release/libtextcat/libtextcat-devel/libtextcat-devel-2.2-2.expected
diff --git a/test/testdata/hints/x86/release/libtextcat/libtextcat0/libtextcat0-2.2-2.expected b/test/testdata/hints/x86_64/release/libtextcat/libtextcat0/libtextcat0-2.2-2.expected
similarity index 100%
rename from test/testdata/hints/x86/release/libtextcat/libtextcat0/libtextcat0-2.2-2.expected
rename to test/testdata/hints/x86_64/release/libtextcat/libtextcat0/libtextcat0-2.2-2.expected
diff --git a/test/testdata/hints/x86/release/mDNSResponder/libdns_sd-devel/libdns_sd-devel-379.32.1-1.expected b/test/testdata/hints/x86_64/release/mDNSResponder/libdns_sd-devel/libdns_sd-devel-379.32.1-1.expected
similarity index 100%
rename from test/testdata/hints/x86/release/mDNSResponder/libdns_sd-devel/libdns_sd-devel-379.32.1-1.expected
rename to test/testdata/hints/x86_64/release/mDNSResponder/libdns_sd-devel/libdns_sd-devel-379.32.1-1.expected
diff --git a/test/testdata/hints/x86/release/mDNSResponder/libdns_sd1/libdns_sd1-379.32.1-1.expected b/test/testdata/hints/x86_64/release/mDNSResponder/libdns_sd1/libdns_sd1-379.32.1-1.expected
similarity index 100%
rename from test/testdata/hints/x86/release/mDNSResponder/libdns_sd1/libdns_sd1-379.32.1-1.expected
rename to test/testdata/hints/x86_64/release/mDNSResponder/libdns_sd1/libdns_sd1-379.32.1-1.expected
diff --git a/test/testdata/hints/x86/release/mDNSResponder/mDNSResponder-379.32.1-1-src.expected b/test/testdata/hints/x86_64/release/mDNSResponder/mDNSResponder-379.32.1-1-src.expected
similarity index 100%
rename from test/testdata/hints/x86/release/mDNSResponder/mDNSResponder-379.32.1-1-src.expected
rename to test/testdata/hints/x86_64/release/mDNSResponder/mDNSResponder-379.32.1-1-src.expected
diff --git a/test/testdata/hints/x86/release/mDNSResponder/mDNSResponder-379.32.1-1.expected b/test/testdata/hints/x86_64/release/mDNSResponder/mDNSResponder-379.32.1-1.expected
similarity index 100%
rename from test/testdata/hints/x86/release/mDNSResponder/mDNSResponder-379.32.1-1.expected
rename to test/testdata/hints/x86_64/release/mDNSResponder/mDNSResponder-379.32.1-1.expected
diff --git a/test/testdata/hints/x86/release/mingw64-i686-binutils/mingw64-i686-binutils-2.29.1.787c9873-1.expected b/test/testdata/hints/x86_64/release/mingw64-i686-binutils/mingw64-i686-binutils-2.29.1.787c9873-1.expected
similarity index 100%
rename from test/testdata/hints/x86/release/mingw64-i686-binutils/mingw64-i686-binutils-2.29.1.787c9873-1.expected
rename to test/testdata/hints/x86_64/release/mingw64-i686-binutils/mingw64-i686-binutils-2.29.1.787c9873-1.expected
diff --git a/test/testdata/hints/x86/release/mingw64-i686-binutils/mingw64-i686-binutils-debuginfo/mingw64-i686-binutils-debuginfo-2.29.1.787c9873-1.expected b/test/testdata/hints/x86_64/release/mingw64-i686-binutils/mingw64-i686-binutils-debuginfo/mingw64-i686-binutils-debuginfo-2.29.1.787c9873-1.expected
similarity index 100%
rename from test/testdata/hints/x86/release/mingw64-i686-binutils/mingw64-i686-binutils-debuginfo/mingw64-i686-binutils-debuginfo-2.29.1.787c9873-1.expected
rename to test/testdata/hints/x86_64/release/mingw64-i686-binutils/mingw64-i686-binutils-debuginfo/mingw64-i686-binutils-debuginfo-2.29.1.787c9873-1.expected
diff --git a/test/testdata/hints/x86/release/openssh/openssh-7.2p2-1-src.expected b/test/testdata/hints/x86_64/release/openssh/openssh-7.2p2-1-src.expected
similarity index 100%
rename from test/testdata/hints/x86/release/openssh/openssh-7.2p2-1-src.expected
rename to test/testdata/hints/x86_64/release/openssh/openssh-7.2p2-1-src.expected
diff --git a/test/testdata/hints/x86/release/openssh/openssh-7.2p2-1.expected b/test/testdata/hints/x86_64/release/openssh/openssh-7.2p2-1.expected
similarity index 100%
rename from test/testdata/hints/x86/release/openssh/openssh-7.2p2-1.expected
rename to test/testdata/hints/x86_64/release/openssh/openssh-7.2p2-1.expected
diff --git a/test/testdata/hints/x86/release/per-version-incomplete/override.expected b/test/testdata/hints/x86_64/release/per-version-incomplete/override.expected
similarity index 100%
rename from test/testdata/hints/x86/release/per-version-incomplete/override.expected
rename to test/testdata/hints/x86_64/release/per-version-incomplete/override.expected
diff --git a/test/testdata/hints/x86/release/per-version-incomplete/per-version-incomplete-36-1-src.expected b/test/testdata/hints/x86_64/release/per-version-incomplete/per-version-incomplete-36-1-src.expected
similarity index 100%
rename from test/testdata/hints/x86/release/per-version-incomplete/per-version-incomplete-36-1-src.expected
rename to test/testdata/hints/x86_64/release/per-version-incomplete/per-version-incomplete-36-1-src.expected
diff --git a/test/testdata/hints/x86/release/per-version-incomplete/per-version-incomplete-36-1.expected b/test/testdata/hints/x86_64/release/per-version-incomplete/per-version-incomplete-36-1.expected
similarity index 100%
rename from test/testdata/hints/x86/release/per-version-incomplete/per-version-incomplete-36-1.expected
rename to test/testdata/hints/x86_64/release/per-version-incomplete/per-version-incomplete-36-1.expected
diff --git a/test/testdata/hints/x86/release/per-version-replacement-hint-only/per-version-replacement-hint-only-1.0-1-src.expected b/test/testdata/hints/x86_64/release/per-version-replacement-hint-only/per-version-replacement-hint-only-1.0-1-src.expected
similarity index 100%
rename from test/testdata/hints/x86/release/per-version-replacement-hint-only/per-version-replacement-hint-only-1.0-1-src.expected
rename to test/testdata/hints/x86_64/release/per-version-replacement-hint-only/per-version-replacement-hint-only-1.0-1-src.expected
diff --git a/test/testdata/hints/x86/release/per-version-replacement-hint-only/per-version-replacement-hint-only-1.0-1.expected b/test/testdata/hints/x86_64/release/per-version-replacement-hint-only/per-version-replacement-hint-only-1.0-1.expected
similarity index 100%
rename from test/testdata/hints/x86/release/per-version-replacement-hint-only/per-version-replacement-hint-only-1.0-1.expected
rename to test/testdata/hints/x86_64/release/per-version-replacement-hint-only/per-version-replacement-hint-only-1.0-1.expected
diff --git a/test/testdata/hints/x86/release/per-version/override.expected b/test/testdata/hints/x86_64/release/per-version/override.expected
similarity index 100%
rename from test/testdata/hints/x86/release/per-version/override.expected
rename to test/testdata/hints/x86_64/release/per-version/override.expected
diff --git a/test/testdata/hints/x86/release/per-version/per-version-4.0-1-src.expected b/test/testdata/hints/x86_64/release/per-version/per-version-4.0-1-src.expected
similarity index 100%
rename from test/testdata/hints/x86/release/per-version/per-version-4.0-1-src.expected
rename to test/testdata/hints/x86_64/release/per-version/per-version-4.0-1-src.expected
diff --git a/test/testdata/hints/x86/release/per-version/per-version-4.0-1.expected b/test/testdata/hints/x86_64/release/per-version/per-version-4.0-1.expected
similarity index 100%
rename from test/testdata/hints/x86/release/per-version/per-version-4.0-1.expected
rename to test/testdata/hints/x86_64/release/per-version/per-version-4.0-1.expected
diff --git a/test/testdata/hints/x86/release/per-version/per-version-4.8-1-src.expected b/test/testdata/hints/x86_64/release/per-version/per-version-4.8-1-src.expected
similarity index 100%
rename from test/testdata/hints/x86/release/per-version/per-version-4.8-1-src.expected
rename to test/testdata/hints/x86_64/release/per-version/per-version-4.8-1-src.expected
diff --git a/test/testdata/hints/x86/release/per-version/per-version-4.8-1.expected b/test/testdata/hints/x86_64/release/per-version/per-version-4.8-1.expected
similarity index 100%
rename from test/testdata/hints/x86/release/per-version/per-version-4.8-1.expected
rename to test/testdata/hints/x86_64/release/per-version/per-version-4.8-1.expected
diff --git a/test/testdata/hints/x86/release/proj/libproj-devel/libproj-devel-4.8.0-1.expected b/test/testdata/hints/x86_64/release/proj/libproj-devel/libproj-devel-4.8.0-1.expected
similarity index 100%
rename from test/testdata/hints/x86/release/proj/libproj-devel/libproj-devel-4.8.0-1.expected
rename to test/testdata/hints/x86_64/release/proj/libproj-devel/libproj-devel-4.8.0-1.expected
diff --git a/test/testdata/hints/x86/release/proj/libproj1/libproj1-4.8.0-1.expected b/test/testdata/hints/x86_64/release/proj/libproj1/libproj1-4.8.0-1.expected
similarity index 100%
rename from test/testdata/hints/x86/release/proj/libproj1/libproj1-4.8.0-1.expected
rename to test/testdata/hints/x86_64/release/proj/libproj1/libproj1-4.8.0-1.expected
diff --git a/test/testdata/hints/x86/release/proj/proj-4.8.0-1.expected b/test/testdata/hints/x86_64/release/proj/proj-4.8.0-1.expected
similarity index 100%
rename from test/testdata/hints/x86/release/proj/proj-4.8.0-1.expected
rename to test/testdata/hints/x86_64/release/proj/proj-4.8.0-1.expected
diff --git a/test/testdata/hints/x86/release/rpm-doc/rpm-doc-4.1-2-src.expected b/test/testdata/hints/x86_64/release/rpm-doc/rpm-doc-4.1-2-src.expected
similarity index 100%
rename from test/testdata/hints/x86/release/rpm-doc/rpm-doc-4.1-2-src.expected
rename to test/testdata/hints/x86_64/release/rpm-doc/rpm-doc-4.1-2-src.expected
diff --git a/test/testdata/hints/x86/release/rpm-doc/rpm-doc-4.1-2.expected b/test/testdata/hints/x86_64/release/rpm-doc/rpm-doc-4.1-2.expected
similarity index 100%
rename from test/testdata/hints/x86/release/rpm-doc/rpm-doc-4.1-2.expected
rename to test/testdata/hints/x86_64/release/rpm-doc/rpm-doc-4.1-2.expected
diff --git a/test/testdata/hints/x86/release/rpm-doc/rpm-doc-999-1.expected b/test/testdata/hints/x86_64/release/rpm-doc/rpm-doc-999-1.expected
similarity index 100%
rename from test/testdata/hints/x86/release/rpm-doc/rpm-doc-999-1.expected
rename to test/testdata/hints/x86_64/release/rpm-doc/rpm-doc-999-1.expected
diff --git a/test/testdata/hints/x86/release/splint/splint-3.1.2-1.expected b/test/testdata/hints/x86_64/release/splint/splint-3.1.2-1.expected
similarity index 100%
rename from test/testdata/hints/x86/release/splint/splint-3.1.2-1.expected
rename to test/testdata/hints/x86_64/release/splint/splint-3.1.2-1.expected
diff --git a/test/testdata/hints/x86/release/staleversion/override.expected b/test/testdata/hints/x86_64/release/staleversion/override.expected
similarity index 100%
rename from test/testdata/hints/x86/release/staleversion/override.expected
rename to test/testdata/hints/x86_64/release/staleversion/override.expected
diff --git a/test/testdata/hints/x86/release/staleversion/staleversion-240-1-src.expected b/test/testdata/hints/x86_64/release/staleversion/staleversion-240-1-src.expected
similarity index 100%
rename from test/testdata/hints/x86/release/staleversion/staleversion-240-1-src.expected
rename to test/testdata/hints/x86_64/release/staleversion/staleversion-240-1-src.expected
diff --git a/test/testdata/hints/x86/release/staleversion/staleversion-240-1.expected b/test/testdata/hints/x86_64/release/staleversion/staleversion-240-1.expected
similarity index 100%
rename from test/testdata/hints/x86/release/staleversion/staleversion-240-1.expected
rename to test/testdata/hints/x86_64/release/staleversion/staleversion-240-1.expected
diff --git a/test/testdata/hints/x86/release/staleversion/staleversion-242-0-src.expected b/test/testdata/hints/x86_64/release/staleversion/staleversion-242-0-src.expected
similarity index 100%
rename from test/testdata/hints/x86/release/staleversion/staleversion-242-0-src.expected
rename to test/testdata/hints/x86_64/release/staleversion/staleversion-242-0-src.expected
diff --git a/test/testdata/hints/x86/release/staleversion/staleversion-242-0.expected b/test/testdata/hints/x86_64/release/staleversion/staleversion-242-0.expected
similarity index 100%
rename from test/testdata/hints/x86/release/staleversion/staleversion-242-0.expected
rename to test/testdata/hints/x86_64/release/staleversion/staleversion-242-0.expected
diff --git a/test/testdata/hints/x86/release/staleversion/staleversion-243-0-src.expected b/test/testdata/hints/x86_64/release/staleversion/staleversion-243-0-src.expected
similarity index 100%
rename from test/testdata/hints/x86/release/staleversion/staleversion-243-0-src.expected
rename to test/testdata/hints/x86_64/release/staleversion/staleversion-243-0-src.expected
diff --git a/test/testdata/hints/x86/release/staleversion/staleversion-243-0.expected b/test/testdata/hints/x86_64/release/staleversion/staleversion-243-0.expected
similarity index 100%
rename from test/testdata/hints/x86/release/staleversion/staleversion-243-0.expected
rename to test/testdata/hints/x86_64/release/staleversion/staleversion-243-0.expected
diff --git a/test/testdata/hints/x86/release/staleversion/staleversion-250-0-src.expected b/test/testdata/hints/x86_64/release/staleversion/staleversion-250-0-src.expected
similarity index 100%
rename from test/testdata/hints/x86/release/staleversion/staleversion-250-0-src.expected
rename to test/testdata/hints/x86_64/release/staleversion/staleversion-250-0-src.expected
diff --git a/test/testdata/hints/x86/release/staleversion/staleversion-250-0.expected b/test/testdata/hints/x86_64/release/staleversion/staleversion-250-0.expected
similarity index 100%
rename from test/testdata/hints/x86/release/staleversion/staleversion-250-0.expected
rename to test/testdata/hints/x86_64/release/staleversion/staleversion-250-0.expected
diff --git a/test/testdata/hints/x86/release/staleversion/staleversion-251-0-src.expected b/test/testdata/hints/x86_64/release/staleversion/staleversion-251-0-src.expected
similarity index 100%
rename from test/testdata/hints/x86/release/staleversion/staleversion-251-0-src.expected
rename to test/testdata/hints/x86_64/release/staleversion/staleversion-251-0-src.expected
diff --git a/test/testdata/hints/x86/release/staleversion/staleversion-251-0.expected b/test/testdata/hints/x86_64/release/staleversion/staleversion-251-0.expected
similarity index 100%
rename from test/testdata/hints/x86/release/staleversion/staleversion-251-0.expected
rename to test/testdata/hints/x86_64/release/staleversion/staleversion-251-0.expected
diff --git a/test/testdata/hints/x86/release/staleversion/staleversion-260-0-src.expected b/test/testdata/hints/x86_64/release/staleversion/staleversion-260-0-src.expected
similarity index 100%
rename from test/testdata/hints/x86/release/staleversion/staleversion-260-0-src.expected
rename to test/testdata/hints/x86_64/release/staleversion/staleversion-260-0-src.expected
diff --git a/test/testdata/hints/x86/release/staleversion/staleversion-260-0.expected b/test/testdata/hints/x86_64/release/staleversion/staleversion-260-0.expected
similarity index 100%
rename from test/testdata/hints/x86/release/staleversion/staleversion-260-0.expected
rename to test/testdata/hints/x86_64/release/staleversion/staleversion-260-0.expected
diff --git a/test/testdata/hints/x86/release/testpackage/testpackage-0.1-1-src.expected b/test/testdata/hints/x86_64/release/testpackage/testpackage-0.1-1-src.expected
similarity index 100%
rename from test/testdata/hints/x86/release/testpackage/testpackage-0.1-1-src.expected
rename to test/testdata/hints/x86_64/release/testpackage/testpackage-0.1-1-src.expected
diff --git a/test/testdata/hints/x86/release/testpackage/testpackage-0.1-1.expected b/test/testdata/hints/x86_64/release/testpackage/testpackage-0.1-1.expected
similarity index 100%
rename from test/testdata/hints/x86/release/testpackage/testpackage-0.1-1.expected
rename to test/testdata/hints/x86_64/release/testpackage/testpackage-0.1-1.expected
diff --git a/test/testdata/homes.conflict/Blooey McFooey/x86/release/staleversion/staleversion-230-1-src.tar.xz b/test/testdata/homes.conflict/Blooey McFooey/x86_64/release/staleversion/staleversion-230-1-src.tar.xz
similarity index 100%
rename from test/testdata/homes.conflict/Blooey McFooey/x86/release/staleversion/staleversion-230-1-src.tar.xz
rename to test/testdata/homes.conflict/Blooey McFooey/x86_64/release/staleversion/staleversion-230-1-src.tar.xz
diff --git a/test/testdata/homes.conflict/Blooey McFooey/x86/release/staleversion/staleversion-230-1.hint b/test/testdata/homes.conflict/Blooey McFooey/x86_64/release/staleversion/staleversion-230-1.hint
similarity index 100%
rename from test/testdata/homes.conflict/Blooey McFooey/x86/release/staleversion/staleversion-230-1.hint
rename to test/testdata/homes.conflict/Blooey McFooey/x86_64/release/staleversion/staleversion-230-1.hint
diff --git a/test/testdata/homes.conflict/Blooey McFooey/x86/release/staleversion/staleversion-230-1.tar.xz b/test/testdata/homes.conflict/Blooey McFooey/x86_64/release/staleversion/staleversion-230-1.tar.xz
similarity index 100%
rename from test/testdata/homes.conflict/Blooey McFooey/x86/release/staleversion/staleversion-230-1.tar.xz
rename to test/testdata/homes.conflict/Blooey McFooey/x86_64/release/staleversion/staleversion-230-1.tar.xz
diff --git a/test/testdata/homes/Blooey McFooey/x86/release/after-ready/after-ready-1.0-1.tar.bz2 b/test/testdata/homes/Blooey McFooey/x86_64/release/after-ready/after-ready-1.0-1.tar.bz2
similarity index 100%
rename from test/testdata/homes/Blooey McFooey/x86/release/after-ready/after-ready-1.0-1.tar.bz2
rename to test/testdata/homes/Blooey McFooey/x86_64/release/after-ready/after-ready-1.0-1.tar.bz2
diff --git a/test/testdata/homes/Blooey McFooey/x86/release/after-ready/setup.hint b/test/testdata/homes/Blooey McFooey/x86_64/release/after-ready/setup.hint
similarity index 100%
rename from test/testdata/homes/Blooey McFooey/x86/release/after-ready/setup.hint
rename to test/testdata/homes/Blooey McFooey/x86_64/release/after-ready/setup.hint
diff --git a/test/testdata/homes/Blooey McFooey/x86/release/corrupt/corrupt-2.1.0-1-src.tar.xz b/test/testdata/homes/Blooey McFooey/x86_64/release/corrupt/corrupt-2.1.0-1-src.tar.xz
similarity index 100%
rename from test/testdata/homes/Blooey McFooey/x86/release/corrupt/corrupt-2.1.0-1-src.tar.xz
rename to test/testdata/homes/Blooey McFooey/x86_64/release/corrupt/corrupt-2.1.0-1-src.tar.xz
diff --git a/test/testdata/homes/Blooey McFooey/x86/release/corrupt/corrupt-2.1.0-1.tar.xz b/test/testdata/homes/Blooey McFooey/x86_64/release/corrupt/corrupt-2.1.0-1.tar.xz
similarity index 100%
rename from test/testdata/homes/Blooey McFooey/x86/release/corrupt/corrupt-2.1.0-1.tar.xz
rename to test/testdata/homes/Blooey McFooey/x86_64/release/corrupt/corrupt-2.1.0-1.tar.xz
diff --git a/test/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_64/release/not-on-maintainer-list/not-on-maintainer-list-1.0-1.tar.bz2
similarity index 100%
rename from test/testdata/homes/Blooey McFooey/x86/release/not-on-maintainer-list/not-on-maintainer-list-1.0-1.tar.bz2
rename to test/testdata/homes/Blooey McFooey/x86_64/release/not-on-maintainer-list/not-on-maintainer-list-1.0-1.tar.bz2
diff --git a/test/testdata/homes/Blooey McFooey/x86/release/not-on-maintainer-list/setup.hint b/test/testdata/homes/Blooey McFooey/x86_64/release/not-on-maintainer-list/setup.hint
similarity index 100%
rename from test/testdata/homes/Blooey McFooey/x86/release/not-on-maintainer-list/setup.hint
rename to test/testdata/homes/Blooey McFooey/x86_64/release/not-on-maintainer-list/setup.hint
diff --git a/test/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_64/release/not-on-package-list/not-on-package-list-1.0-1.tar.bz2
similarity index 100%
rename from test/testdata/homes/Blooey McFooey/x86/release/not-on-package-list/not-on-package-list-1.0-1.tar.bz2
rename to test/testdata/homes/Blooey McFooey/x86_64/release/not-on-package-list/not-on-package-list-1.0-1.tar.bz2
diff --git a/test/testdata/homes/Blooey McFooey/x86/release/not-on-package-list/setup.hint b/test/testdata/homes/Blooey McFooey/x86_64/release/not-on-package-list/setup.hint
similarity index 100%
rename from test/testdata/homes/Blooey McFooey/x86/release/not-on-package-list/setup.hint
rename to test/testdata/homes/Blooey McFooey/x86_64/release/not-on-package-list/setup.hint
diff --git a/test/testdata/homes/Blooey McFooey/x86/release/not-ready/-not-ready-0.9-1.tar.bz2 b/test/testdata/homes/Blooey McFooey/x86_64/release/not-ready/-not-ready-0.9-1.tar.bz2
similarity index 100%
rename from test/testdata/homes/Blooey McFooey/x86/release/not-ready/-not-ready-0.9-1.tar.bz2
rename to test/testdata/homes/Blooey McFooey/x86_64/release/not-ready/-not-ready-0.9-1.tar.bz2
diff --git a/test/testdata/homes/Blooey McFooey/x86/release/not-ready/not-ready-1.0-1.tar.bz2 b/test/testdata/homes/Blooey McFooey/x86_64/release/not-ready/not-ready-1.0-1.tar.bz2
similarity index 100%
rename from test/testdata/homes/Blooey McFooey/x86/release/not-ready/not-ready-1.0-1.tar.bz2
rename to test/testdata/homes/Blooey McFooey/x86_64/release/not-ready/not-ready-1.0-1.tar.bz2
diff --git a/test/testdata/homes/Blooey McFooey/x86/release/not-ready/setup.hint b/test/testdata/homes/Blooey McFooey/x86_64/release/not-ready/setup.hint
similarity index 100%
rename from test/testdata/homes/Blooey McFooey/x86/release/not-ready/setup.hint
rename to test/testdata/homes/Blooey McFooey/x86_64/release/not-ready/setup.hint
diff --git a/test/testdata/homes/Blooey McFooey/x86/release/per-version-replacement-hint-only/per-version-replacement-hint-only-1.0-1.hint b/test/testdata/homes/Blooey McFooey/x86_64/release/per-version-replacement-hint-only/per-version-replacement-hint-only-1.0-1.hint
similarity index 100%
rename from test/testdata/homes/Blooey McFooey/x86/release/per-version-replacement-hint-only/per-version-replacement-hint-only-1.0-1.hint
rename to test/testdata/homes/Blooey McFooey/x86_64/release/per-version-replacement-hint-only/per-version-replacement-hint-only-1.0-1.hint
diff --git a/test/testdata/homes/Blooey McFooey/x86/release/per-version/override.hint b/test/testdata/homes/Blooey McFooey/x86_64/release/per-version/override.hint
similarity index 100%
rename from test/testdata/homes/Blooey McFooey/x86/release/per-version/override.hint
rename to test/testdata/homes/Blooey McFooey/x86_64/release/per-version/override.hint
diff --git a/test/testdata/homes/Blooey McFooey/x86/release/per-version/per-version-5.0-1-src.tar.xz b/test/testdata/homes/Blooey McFooey/x86_64/release/per-version/per-version-5.0-1-src.tar.xz
similarity index 100%
rename from test/testdata/homes/Blooey McFooey/x86/release/per-version/per-version-5.0-1-src.tar.xz
rename to test/testdata/homes/Blooey McFooey/x86_64/release/per-version/per-version-5.0-1-src.tar.xz
diff --git a/test/testdata/homes/Blooey McFooey/x86/release/per-version/per-version-5.0-1.hint b/test/testdata/homes/Blooey McFooey/x86_64/release/per-version/per-version-5.0-1.hint
similarity index 100%
rename from test/testdata/homes/Blooey McFooey/x86/release/per-version/per-version-5.0-1.hint
rename to test/testdata/homes/Blooey McFooey/x86_64/release/per-version/per-version-5.0-1.hint
diff --git a/test/testdata/homes/Blooey McFooey/x86/release/per-version/per-version-5.0-1.tar.xz b/test/testdata/homes/Blooey McFooey/x86_64/release/per-version/per-version-5.0-1.tar.xz
similarity index 100%
rename from test/testdata/homes/Blooey McFooey/x86/release/per-version/per-version-5.0-1.tar.xz
rename to test/testdata/homes/Blooey McFooey/x86_64/release/per-version/per-version-5.0-1.tar.xz
diff --git a/test/testdata/homes/Blooey McFooey/x86/release/testpackage-zstd/testpackage-zstd-1.0-1-src.hint b/test/testdata/homes/Blooey McFooey/x86_64/release/testpackage-zstd/testpackage-zstd-1.0-1-src.hint
similarity index 100%
rename from test/testdata/homes/Blooey McFooey/x86/release/testpackage-zstd/testpackage-zstd-1.0-1-src.hint
rename to test/testdata/homes/Blooey McFooey/x86_64/release/testpackage-zstd/testpackage-zstd-1.0-1-src.hint
diff --git a/test/testdata/homes/Blooey McFooey/x86/release/testpackage-zstd/testpackage-zstd-1.0-1-src.tar.zst b/test/testdata/homes/Blooey McFooey/x86_64/release/testpackage-zstd/testpackage-zstd-1.0-1-src.tar.zst
similarity index 100%
rename from test/testdata/homes/Blooey McFooey/x86/release/testpackage-zstd/testpackage-zstd-1.0-1-src.tar.zst
rename to test/testdata/homes/Blooey McFooey/x86_64/release/testpackage-zstd/testpackage-zstd-1.0-1-src.tar.zst
diff --git a/test/testdata/homes/Blooey McFooey/x86/release/testpackage-zstd/testpackage-zstd-1.0-1.hint b/test/testdata/homes/Blooey McFooey/x86_64/release/testpackage-zstd/testpackage-zstd-1.0-1.hint
similarity index 100%
rename from test/testdata/homes/Blooey McFooey/x86/release/testpackage-zstd/testpackage-zstd-1.0-1.hint
rename to test/testdata/homes/Blooey McFooey/x86_64/release/testpackage-zstd/testpackage-zstd-1.0-1.hint
diff --git a/test/testdata/homes/Blooey McFooey/x86/release/testpackage-zstd/testpackage-zstd-1.0-1.tar.zst b/test/testdata/homes/Blooey McFooey/x86_64/release/testpackage-zstd/testpackage-zstd-1.0-1.tar.zst
similarity index 100%
rename from test/testdata/homes/Blooey McFooey/x86/release/testpackage-zstd/testpackage-zstd-1.0-1.tar.zst
rename to test/testdata/homes/Blooey McFooey/x86_64/release/testpackage-zstd/testpackage-zstd-1.0-1.tar.zst
diff --git a/test/testdata/homes/Blooey McFooey/x86/release/testpackage/-testpackage-0.1-1-src.tar.bz2 b/test/testdata/homes/Blooey McFooey/x86_64/release/testpackage/-testpackage-0.1-1-src.tar.bz2
similarity index 100%
rename from test/testdata/homes/Blooey McFooey/x86/release/testpackage/-testpackage-0.1-1-src.tar.bz2
rename to test/testdata/homes/Blooey McFooey/x86_64/release/testpackage/-testpackage-0.1-1-src.tar.bz2
diff --git a/test/testdata/homes/Blooey McFooey/x86/release/testpackage/-testpackage-0.1-1.tar.bz2 b/test/testdata/homes/Blooey McFooey/x86_64/release/testpackage/-testpackage-0.1-1.tar.bz2
similarity index 100%
rename from test/testdata/homes/Blooey McFooey/x86/release/testpackage/-testpackage-0.1-1.tar.bz2
rename to test/testdata/homes/Blooey McFooey/x86_64/release/testpackage/-testpackage-0.1-1.tar.bz2
diff --git a/test/testdata/homes/Blooey McFooey/x86/release/testpackage/setup.hint b/test/testdata/homes/Blooey McFooey/x86_64/release/testpackage/setup.hint
similarity index 100%
rename from test/testdata/homes/Blooey McFooey/x86/release/testpackage/setup.hint
rename to test/testdata/homes/Blooey McFooey/x86_64/release/testpackage/setup.hint
diff --git a/test/testdata/homes/Blooey McFooey/x86/release/testpackage/testpackage-1.0-1-src.tar.bz2 b/test/testdata/homes/Blooey McFooey/x86_64/release/testpackage/testpackage-1.0-1-src.tar.bz2
similarity index 100%
rename from test/testdata/homes/Blooey McFooey/x86/release/testpackage/testpackage-1.0-1-src.tar.bz2
rename to test/testdata/homes/Blooey McFooey/x86_64/release/testpackage/testpackage-1.0-1-src.tar.bz2
diff --git a/test/testdata/homes/Blooey McFooey/x86/release/testpackage/testpackage-1.0-1.tar.bz2 b/test/testdata/homes/Blooey McFooey/x86_64/release/testpackage/testpackage-1.0-1.tar.bz2
similarity index 100%
rename from test/testdata/homes/Blooey McFooey/x86/release/testpackage/testpackage-1.0-1.tar.bz2
rename to test/testdata/homes/Blooey McFooey/x86_64/release/testpackage/testpackage-1.0-1.tar.bz2
diff --git a/test/testdata/homes/Blooey McFooey/x86/release/testpackage/testpackage-subpackage/setup.hint b/test/testdata/homes/Blooey McFooey/x86_64/release/testpackage/testpackage-subpackage/setup.hint
similarity index 100%
rename from test/testdata/homes/Blooey McFooey/x86/release/testpackage/testpackage-subpackage/setup.hint
rename to test/testdata/homes/Blooey McFooey/x86_64/release/testpackage/testpackage-subpackage/setup.hint
diff --git a/test/testdata/homes/Blooey McFooey/x86/release/testpackage/testpackage-subpackage/testpackage-subpackage-1.0-1.tar.bz2 b/test/testdata/homes/Blooey McFooey/x86_64/release/testpackage/testpackage-subpackage/testpackage-subpackage-1.0-1.tar.bz2
similarity index 100%
rename from test/testdata/homes/Blooey McFooey/x86/release/testpackage/testpackage-subpackage/testpackage-subpackage-1.0-1.tar.bz2
rename to test/testdata/homes/Blooey McFooey/x86_64/release/testpackage/testpackage-subpackage/testpackage-subpackage-1.0-1.tar.bz2
diff --git a/test/testdata/homes/Blooey McFooey/x86/release/testpackage2/setup.hint b/test/testdata/homes/Blooey McFooey/x86_64/release/testpackage2/setup.hint
similarity index 100%
rename from test/testdata/homes/Blooey McFooey/x86/release/testpackage2/setup.hint
rename to test/testdata/homes/Blooey McFooey/x86_64/release/testpackage2/setup.hint
diff --git a/test/testdata/homes/Blooey McFooey/x86/release/testpackage2/testpackage2-1.0-1.tar.bz2 b/test/testdata/homes/Blooey McFooey/x86_64/release/testpackage2/testpackage2-1.0-1.tar.bz2
similarity index 100%
rename from test/testdata/homes/Blooey McFooey/x86/release/testpackage2/testpackage2-1.0-1.tar.bz2
rename to test/testdata/homes/Blooey McFooey/x86_64/release/testpackage2/testpackage2-1.0-1.tar.bz2
diff --git a/test/testdata/homes/Blooey McFooey/x86/release/testpackage2/testpackage2-subpackage/inprogress.SftpXFR.1234 b/test/testdata/homes/Blooey McFooey/x86_64/release/testpackage2/testpackage2-subpackage/inprogress.SftpXFR.1234
similarity index 100%
rename from test/testdata/homes/Blooey McFooey/x86/release/testpackage2/testpackage2-subpackage/inprogress.SftpXFR.1234
rename to test/testdata/homes/Blooey McFooey/x86_64/release/testpackage2/testpackage2-subpackage/inprogress.SftpXFR.1234
diff --git a/test/testdata/homes/Blooey McFooey/x86/release/testpackage2/testpackage2-subpackage/setup.hint b/test/testdata/homes/Blooey McFooey/x86_64/release/testpackage2/testpackage2-subpackage/setup.hint
similarity index 100%
rename from test/testdata/homes/Blooey McFooey/x86/release/testpackage2/testpackage2-subpackage/setup.hint
rename to test/testdata/homes/Blooey McFooey/x86_64/release/testpackage2/testpackage2-subpackage/setup.hint
diff --git a/test/testdata/homes/Blooey McFooey/x86/release/testpackage2/testpackage2-subpackage/testpackage2-subpackage-1.0-1.tar.bz2 b/test/testdata/homes/Blooey McFooey/x86_64/release/testpackage2/testpackage2-subpackage/testpackage2-subpackage-1.0-1.tar.bz2
similarity index 100%
rename from test/testdata/homes/Blooey McFooey/x86/release/testpackage2/testpackage2-subpackage/testpackage2-subpackage-1.0-1.tar.bz2
rename to test/testdata/homes/Blooey McFooey/x86_64/release/testpackage2/testpackage2-subpackage/testpackage2-subpackage-1.0-1.tar.bz2
diff --git a/test/testdata/htdocs.expected/dirtree.expected b/test/testdata/htdocs.expected/dirtree.expected
index 5908ca9..ec63f08 100644
--- a/test/testdata/htdocs.expected/dirtree.expected
+++ b/test/testdata/htdocs.expected/dirtree.expected
@@ -38,65 +38,64 @@
              'test-e.html',
              'testpackage-src.html',
              'testpackage.html'],
- 'x86': ['.htaccess'],
- 'x86/arc': ['.htaccess', 'arc-4.32.7-10'],
- 'x86/arc-src': ['.htaccess', 'arc-4.32.7-10-src'],
- 'x86/base-cygwin': ['.htaccess', 'base-cygwin-3.6-1', 'base-cygwin-3.8-1'],
- 'x86/corrupt': ['.htaccess', 'corrupt-2.0.0-1'],
- 'x86/corrupt-src': ['.htaccess', 'corrupt-2.0.0-1-src'],
- 'x86/cygwin': ['.htaccess', 'cygwin-2.2.0-1', 'cygwin-2.2.1-1', 'cygwin-2.3.0-0.3'],
- 'x86/cygwin-debuginfo': ['.htaccess',
-                          'cygwin-debuginfo-2.2.0-1',
-                          'cygwin-debuginfo-2.2.1-1',
-                          'cygwin-debuginfo-2.3.0-0.3'],
- 'x86/cygwin-devel': ['.htaccess', 'cygwin-devel-2.2.0-1', 'cygwin-devel-2.2.1-1', 'cygwin-devel-2.3.0-0.3'],
- 'x86/cygwin-src': ['.htaccess', 'cygwin-2.2.0-1-src', 'cygwin-2.2.1-1-src', 'cygwin-2.3.0-0.3-src'],
- 'x86/keychain': ['.htaccess', 'keychain-2.6.8-1', 'keychain-2.7.1-1'],
- 'x86/keychain-src': ['.htaccess', 'keychain-2.6.8-1-src', 'keychain-2.7.1-1-src'],
- 'x86/libdns_sd-devel': ['.htaccess', 'libdns_sd-devel-379.32.1-1'],
- 'x86/libdns_sd1': ['.htaccess', 'libdns_sd1-379.32.1-1'],
- 'x86/mDNSResponder': ['.htaccess', 'mDNSResponder-379.32.1-1'],
- 'x86/mDNSResponder-src': ['.htaccess', 'mDNSResponder-379.32.1-1-src'],
- 'x86/obs-a': ['.htaccess', 'obs-a-1.0-1'],
- 'x86/obs-a-src': ['.htaccess', 'obs-a-1.0-1-src'],
- 'x86/obs-b': ['.htaccess', 'obs-b-1.0-1'],
- 'x86/obs-b-src': ['.htaccess', 'obs-b-1.0-1-src'],
- 'x86/openssh': ['.htaccess', 'openssh-7.2p2-1'],
- 'x86/openssh-src': ['.htaccess', 'openssh-7.2p2-1-src'],
- 'x86/per-version': ['.htaccess', 'per-version-4.0-1', 'per-version-4.8-1'],
- 'x86/per-version-replacement-hint-only': ['.htaccess', 'per-version-replacement-hint-only-1.0-1'],
- 'x86/per-version-replacement-hint-only-src': ['.htaccess', 'per-version-replacement-hint-only-1.0-1-src'],
- 'x86/per-version-src': ['.htaccess', 'per-version-4.0-1-src', 'per-version-4.8-1-src'],
- 'x86/perl-Net-SMTP-SSL': ['.htaccess',
-                           'perl-Net-SMTP-SSL-1.01-1',
-                           'perl-Net-SMTP-SSL-1.02-1',
-                           'perl-Net-SMTP-SSL-1.03-1'],
- 'x86/perl-Net-SMTP-SSL-src': ['.htaccess',
-                               'perl-Net-SMTP-SSL-1.01-1-src',
-                               'perl-Net-SMTP-SSL-1.02-1-src',
-                               'perl-Net-SMTP-SSL-1.03-1-src'],
- 'x86/rpm-doc': ['.htaccess', 'rpm-doc-4.1-2', 'rpm-doc-999-1'],
- 'x86/rpm-doc-src': ['.htaccess', 'rpm-doc-4.1-2-src'],
- 'x86/staleversion': ['.htaccess',
-                      'staleversion-240-1',
-                      'staleversion-242-0',
-                      'staleversion-243-0',
-                      'staleversion-250-0',
-                      'staleversion-251-0',
-                      'staleversion-260-0'],
- 'x86/staleversion-src': ['.htaccess',
-                          'staleversion-240-1-src',
-                          'staleversion-242-0-src',
-                          'staleversion-243-0-src',
-                          'staleversion-250-0-src',
-                          'staleversion-251-0-src',
-                          'staleversion-260-0-src'],
- 'x86/test-c': ['.htaccess', 'test-c-1.0-1'],
- 'x86/test-c-src': ['.htaccess', 'test-c-1.0-1-src'],
- 'x86/test-d': ['.htaccess', 'test-d-1.0-1'],
- 'x86/test-d-src': ['.htaccess', 'test-d-1.0-1-src'],
- 'x86/test-e': ['.htaccess', 'test-e-1.0-1'],
- 'x86/test-e-src': ['.htaccess', 'test-e-1.0-1-src'],
- 'x86/testpackage': ['.htaccess', 'testpackage-0.1-1'],
- 'x86/testpackage-src': ['.htaccess', 'testpackage-0.1-1-src'],
- 'x86_64': ['.htaccess']}
+ 'x86_64': ['.htaccess'],
+ 'x86_64/arc': ['.htaccess', 'arc-4.32.7-10'],
+ 'x86_64/arc-src': ['.htaccess', 'arc-4.32.7-10-src'],
+ 'x86_64/base-cygwin': ['.htaccess', 'base-cygwin-3.6-1', 'base-cygwin-3.8-1'],
+ 'x86_64/corrupt': ['.htaccess', 'corrupt-2.0.0-1'],
+ 'x86_64/corrupt-src': ['.htaccess', 'corrupt-2.0.0-1-src'],
+ 'x86_64/cygwin': ['.htaccess', 'cygwin-2.2.0-1', 'cygwin-2.2.1-1', 'cygwin-2.3.0-0.3'],
+ 'x86_64/cygwin-debuginfo': ['.htaccess',
+                             'cygwin-debuginfo-2.2.0-1',
+                             'cygwin-debuginfo-2.2.1-1',
+                             'cygwin-debuginfo-2.3.0-0.3'],
+ 'x86_64/cygwin-devel': ['.htaccess', 'cygwin-devel-2.2.0-1', 'cygwin-devel-2.2.1-1', 'cygwin-devel-2.3.0-0.3'],
+ 'x86_64/cygwin-src': ['.htaccess', 'cygwin-2.2.0-1-src', 'cygwin-2.2.1-1-src', 'cygwin-2.3.0-0.3-src'],
+ 'x86_64/keychain': ['.htaccess', 'keychain-2.6.8-1', 'keychain-2.7.1-1'],
+ 'x86_64/keychain-src': ['.htaccess', 'keychain-2.6.8-1-src', 'keychain-2.7.1-1-src'],
+ 'x86_64/libdns_sd-devel': ['.htaccess', 'libdns_sd-devel-379.32.1-1'],
+ 'x86_64/libdns_sd1': ['.htaccess', 'libdns_sd1-379.32.1-1'],
+ 'x86_64/mDNSResponder': ['.htaccess', 'mDNSResponder-379.32.1-1'],
+ 'x86_64/mDNSResponder-src': ['.htaccess', 'mDNSResponder-379.32.1-1-src'],
+ 'x86_64/obs-a': ['.htaccess', 'obs-a-1.0-1'],
+ 'x86_64/obs-a-src': ['.htaccess', 'obs-a-1.0-1-src'],
+ 'x86_64/obs-b': ['.htaccess', 'obs-b-1.0-1'],
+ 'x86_64/obs-b-src': ['.htaccess', 'obs-b-1.0-1-src'],
+ 'x86_64/openssh': ['.htaccess', 'openssh-7.2p2-1'],
+ 'x86_64/openssh-src': ['.htaccess', 'openssh-7.2p2-1-src'],
+ 'x86_64/per-version': ['.htaccess', 'per-version-4.0-1', 'per-version-4.8-1'],
+ 'x86_64/per-version-replacement-hint-only': ['.htaccess', 'per-version-replacement-hint-only-1.0-1'],
+ 'x86_64/per-version-replacement-hint-only-src': ['.htaccess', 'per-version-replacement-hint-only-1.0-1-src'],
+ 'x86_64/per-version-src': ['.htaccess', 'per-version-4.0-1-src', 'per-version-4.8-1-src'],
+ 'x86_64/perl-Net-SMTP-SSL': ['.htaccess',
+                              'perl-Net-SMTP-SSL-1.01-1',
+                              'perl-Net-SMTP-SSL-1.02-1',
+                              'perl-Net-SMTP-SSL-1.03-1'],
+ 'x86_64/perl-Net-SMTP-SSL-src': ['.htaccess',
+                                  'perl-Net-SMTP-SSL-1.01-1-src',
+                                  'perl-Net-SMTP-SSL-1.02-1-src',
+                                  'perl-Net-SMTP-SSL-1.03-1-src'],
+ 'x86_64/rpm-doc': ['.htaccess', 'rpm-doc-4.1-2', 'rpm-doc-999-1'],
+ 'x86_64/rpm-doc-src': ['.htaccess', 'rpm-doc-4.1-2-src'],
+ 'x86_64/staleversion': ['.htaccess',
+                         'staleversion-240-1',
+                         'staleversion-242-0',
+                         'staleversion-243-0',
+                         'staleversion-250-0',
+                         'staleversion-251-0',
+                         'staleversion-260-0'],
+ 'x86_64/staleversion-src': ['.htaccess',
+                             'staleversion-240-1-src',
+                             'staleversion-242-0-src',
+                             'staleversion-243-0-src',
+                             'staleversion-250-0-src',
+                             'staleversion-251-0-src',
+                             'staleversion-260-0-src'],
+ 'x86_64/test-c': ['.htaccess', 'test-c-1.0-1'],
+ 'x86_64/test-c-src': ['.htaccess', 'test-c-1.0-1-src'],
+ 'x86_64/test-d': ['.htaccess', 'test-d-1.0-1'],
+ 'x86_64/test-d-src': ['.htaccess', 'test-d-1.0-1-src'],
+ 'x86_64/test-e': ['.htaccess', 'test-e-1.0-1'],
+ 'x86_64/test-e-src': ['.htaccess', 'test-e-1.0-1-src'],
+ 'x86_64/testpackage': ['.htaccess', 'testpackage-0.1-1'],
+ 'x86_64/testpackage-src': ['.htaccess', 'testpackage-0.1-1-src']}
diff --git a/test/testdata/htdocs.expected/summary/arc-src.html b/test/testdata/htdocs.expected/summary/arc-src.html
index 895f091..49fcead 100755
--- a/test/testdata/htdocs.expected/summary/arc-src.html
+++ b/test/testdata/htdocs.expected/summary/arc-src.html
@@ -24,10 +24,10 @@ the best of packing, squeezing, or crunching is used.


 Do not contact the maintainer(s) directly.)
 


 
    
-
  • x86
    • 
+
  • x86_64
    • 
 
-
+
    
 
    VersionPackage SizeDateFilesStatus
    4.32.7-10 (source)1 KiB2018-03-02 00:00[list of files]stable
    4.32.7-10 (source)1 KiB2018-03-02 00:00[list of files]stable
    
 

    
 

 
diff --git a/test/testdata/htdocs.expected/summary/arc.html b/test/testdata/htdocs.expected/summary/arc.html
index dd80e6d..2662c07 100644
--- a/test/testdata/htdocs.expected/summary/arc.html
+++ b/test/testdata/htdocs.expected/summary/arc.html
@@ -24,10 +24,10 @@ the best of packing, squeezing, or crunching is used.


 Do not contact the maintainer(s) directly.)
 


 
    
-
  • x86
    • 
+
  • x86_64
    • 
 
-
+
    
 
    VersionPackage SizeDateFilesStatus
    4.32.7-101 KiB2018-03-02 00:00[list of files]stable
    4.32.7-101 KiB2018-03-02 00:00[list of files]stable
    
 

    
 

 
diff --git a/test/testdata/htdocs.expected/summary/base-cygwin.html b/test/testdata/htdocs.expected/summary/base-cygwin.html
index 6dffc03..2ab918b 100644
--- a/test/testdata/htdocs.expected/summary/base-cygwin.html
+++ b/test/testdata/htdocs.expected/summary/base-cygwin.html
@@ -20,11 +20,11 @@
 Do not contact the maintainer(s) directly.)
 


 
 
diff --git a/test/testdata/htdocs.expected/summary/corrupt-src.html b/test/testdata/htdocs.expected/summary/corrupt-src.html
index 1ea1507..76dc66d 100755
--- a/test/testdata/htdocs.expected/summary/corrupt-src.html
+++ b/test/testdata/htdocs.expected/summary/corrupt-src.html
@@ -19,10 +19,10 @@
 Do not contact the maintainer(s) directly.)
 


 
    
-
  • x86
    • 
+
  • x86_64
    • 
 
-
+
    
 
    VersionPackage SizeDateFilesStatus
    2.0.0-1 (source)354 KiB2018-03-02 00:00[list of files]stable
    2.0.0-1 (source)354 KiB2018-03-02 00:00[list of files]stable
    
 

    
 

 
diff --git a/test/testdata/htdocs.expected/summary/corrupt.html b/test/testdata/htdocs.expected/summary/corrupt.html
index e6647bd..ccc03e5 100644
--- a/test/testdata/htdocs.expected/summary/corrupt.html
+++ b/test/testdata/htdocs.expected/summary/corrupt.html
@@ -19,10 +19,10 @@
 Do not contact the maintainer(s) directly.)
 


 
    
-
  • x86
    • 
+
  • x86_64
    • 
 
-
+
    
 
    VersionPackage SizeDateFilesStatus
    2.0.0-11 KiB2018-03-02 00:00[list of files]stable
    2.0.0-11 KiB2018-03-02 00:00[list of files]stable
    
 

    
 

 
diff --git a/test/testdata/htdocs.expected/summary/cygwin-debuginfo.html b/test/testdata/htdocs.expected/summary/cygwin-debuginfo.html
index 2d78c35..3f2ccff 100644
--- a/test/testdata/htdocs.expected/summary/cygwin-debuginfo.html
+++ b/test/testdata/htdocs.expected/summary/cygwin-debuginfo.html
@@ -21,12 +21,12 @@ cygwin package with gdb.


 Do not contact the maintainer(s) directly.)
 


 
 
diff --git a/test/testdata/htdocs.expected/summary/cygwin-devel.html b/test/testdata/htdocs.expected/summary/cygwin-devel.html
index 9d0edde..8081737 100644
--- a/test/testdata/htdocs.expected/summary/cygwin-devel.html
+++ b/test/testdata/htdocs.expected/summary/cygwin-devel.html
@@ -19,12 +19,12 @@
 Do not contact the maintainer(s) directly.)
 


 
 
diff --git a/test/testdata/htdocs.expected/summary/cygwin-src.html b/test/testdata/htdocs.expected/summary/cygwin-src.html
index 4720b17..87d13f0 100755
--- a/test/testdata/htdocs.expected/summary/cygwin-src.html
+++ b/test/testdata/htdocs.expected/summary/cygwin-src.html
@@ -22,12 +22,12 @@
 Do not contact the maintainer(s) directly.)
 


 
    
-
  • x86
    • 
+
  • x86_64
    • 
 
-
-
-
+
+
+
    
 
    VersionPackage SizeDateFilesStatus
    2.2.0-1 (source)1 KiB2016-11-01 00:00[list of files]stable
    2.2.1-1 (source)1 KiB2016-11-02 00:00[list of files]stable
    2.3.0-0.3 (source)1 KiB2018-03-02 00:00[list of files]test
    2.2.0-1 (source)1 KiB2016-11-01 00:00[list of files]stable
    2.2.1-1 (source)1 KiB2016-11-02 00:00[list of files]stable
    2.3.0-0.3 (source)1 KiB2018-03-02 00:00[list of files]test
    
 

    
 

 
diff --git a/test/testdata/htdocs.expected/summary/cygwin.html b/test/testdata/htdocs.expected/summary/cygwin.html
index 035b059..c3fffef 100644
--- a/test/testdata/htdocs.expected/summary/cygwin.html
+++ b/test/testdata/htdocs.expected/summary/cygwin.html
@@ -20,12 +20,12 @@
 Do not contact the maintainer(s) directly.)
 


 
 
diff --git a/test/testdata/htdocs.expected/summary/keychain-src.html b/test/testdata/htdocs.expected/summary/keychain-src.html
index de059a7..5dd1558 100755
--- a/test/testdata/htdocs.expected/summary/keychain-src.html
+++ b/test/testdata/htdocs.expected/summary/keychain-src.html
@@ -27,11 +27,11 @@ necessary


 Do not contact the maintainer(s) directly.)
 


 
    
-
  • x86
    • 
+
  • x86_64
    • 
 
-
-
+
+
    
 
    VersionPackage SizeDateFilesStatus
    2.6.8-1 (source)36 KiB2016-11-02 00:00[list of files]stable
    2.7.1-1 (source)132 KiB2018-03-02 00:00[list of files]stable
    2.6.8-1 (source)36 KiB2016-11-02 00:00[list of files]stable
    2.7.1-1 (source)132 KiB2018-03-02 00:00[list of files]stable
    
 

    
 

 
diff --git a/test/testdata/htdocs.expected/summary/keychain.html b/test/testdata/htdocs.expected/summary/keychain.html
index d07d34e..d2b7ac9 100644
--- a/test/testdata/htdocs.expected/summary/keychain.html
+++ b/test/testdata/htdocs.expected/summary/keychain.html
@@ -28,11 +28,11 @@ necessary


 Do not contact the maintainer(s) directly.)
 


 
 
diff --git a/test/testdata/htdocs.expected/summary/libdns_sd-devel.html b/test/testdata/htdocs.expected/summary/libdns_sd-devel.html
index 8e36ee4..7596bd2 100644
--- a/test/testdata/htdocs.expected/summary/libdns_sd-devel.html
+++ b/test/testdata/htdocs.expected/summary/libdns_sd-devel.html
@@ -22,10 +22,10 @@ industry standard IP protocols.


 Do not contact the maintainer(s) directly.)
 


 
    
-
  • x86
    • 
+
  • x86_64
    • 
 
-
+
    
 
    VersionPackage SizeDateFilesStatus
    379.32.1-11 KiB2018-03-02 00:00[list of files]stable
    379.32.1-11 KiB2018-03-02 00:00[list of files]stable
    
 

    
 

 
diff --git a/test/testdata/htdocs.expected/summary/libdns_sd1.html b/test/testdata/htdocs.expected/summary/libdns_sd1.html
index 4a2ad36..964a73a 100644
--- a/test/testdata/htdocs.expected/summary/libdns_sd1.html
+++ b/test/testdata/htdocs.expected/summary/libdns_sd1.html
@@ -21,10 +21,10 @@ industry standard IP protocols.


 Do not contact the maintainer(s) directly.)
 


 
    
-
  • x86
    • 
+
  • x86_64
    • 
 
-
+
    
 
    VersionPackage SizeDateFilesStatus
    379.32.1-11 KiB2018-03-02 00:00[list of files]stable
    379.32.1-11 KiB2018-03-02 00:00[list of files]stable
    
 

    
 

 
diff --git a/test/testdata/htdocs.expected/summary/mDNSResponder-src.html b/test/testdata/htdocs.expected/summary/mDNSResponder-src.html
index b186322..3c22768 100755
--- a/test/testdata/htdocs.expected/summary/mDNSResponder-src.html
+++ b/test/testdata/htdocs.expected/summary/mDNSResponder-src.html
@@ -21,10 +21,10 @@ industry standard IP protocols.


 Do not contact the maintainer(s) directly.)
 


 
    
-
  • x86
    • 
+
  • x86_64
    • 
 
-
+
    
 
    VersionPackage SizeDateFilesStatus
    379.32.1-1 (source)1 KiB2018-03-02 00:00[list of files]stable
    379.32.1-1 (source)1 KiB2018-03-02 00:00[list of files]stable
    
 

    
 

 
diff --git a/test/testdata/htdocs.expected/summary/mDNSResponder.html b/test/testdata/htdocs.expected/summary/mDNSResponder.html
index 646485a..07697eb 100644
--- a/test/testdata/htdocs.expected/summary/mDNSResponder.html
+++ b/test/testdata/htdocs.expected/summary/mDNSResponder.html
@@ -22,10 +22,10 @@ industry standard IP protocols.


 Do not contact the maintainer(s) directly.)
 


 
    
-
  • x86
    • 
+
  • x86_64
    • 
 
-
+
    
 
    VersionPackage SizeDateFilesStatus
    379.32.1-11 KiB2018-03-02 00:00[list of files]stable
    379.32.1-11 KiB2018-03-02 00:00[list of files]stable
    
 

    
 

 
diff --git a/test/testdata/htdocs.expected/summary/obs-a-src.html b/test/testdata/htdocs.expected/summary/obs-a-src.html
index b3e08fc..5c445a6 100755
--- a/test/testdata/htdocs.expected/summary/obs-a-src.html
+++ b/test/testdata/htdocs.expected/summary/obs-a-src.html
@@ -19,10 +19,10 @@
 Do not contact the maintainer(s) directly.)
 


 
    
-
  • x86
    • 
+
  • x86_64
    • 
 
-
+
    
 
    VersionPackage SizeDateFilesStatus
    1.0-1 (source)1 KiB2018-03-02 00:00[list of files]stable
    1.0-1 (source)1 KiB2018-03-02 00:00[list of files]stable
    
 

    
 

 
diff --git a/test/testdata/htdocs.expected/summary/obs-a.html b/test/testdata/htdocs.expected/summary/obs-a.html
index 3e99784..32c9da9 100644
--- a/test/testdata/htdocs.expected/summary/obs-a.html
+++ b/test/testdata/htdocs.expected/summary/obs-a.html
@@ -19,10 +19,10 @@
 Do not contact the maintainer(s) directly.)
 


 
    
-
  • x86
    • 
+
  • x86_64
    • 
 
-
+
    
 
    VersionPackage SizeDateFilesStatus
    1.0-11 KiB2018-03-02 00:00[list of files]stable
    1.0-11 KiB2018-03-02 00:00[list of files]stable
    
 

    
 

 
diff --git a/test/testdata/htdocs.expected/summary/obs-b-src.html b/test/testdata/htdocs.expected/summary/obs-b-src.html
index 43f5509..14e8c1f 100755
--- a/test/testdata/htdocs.expected/summary/obs-b-src.html
+++ b/test/testdata/htdocs.expected/summary/obs-b-src.html
@@ -19,10 +19,10 @@
 Do not contact the maintainer(s) directly.)
 


 
    
-
  • x86
    • 
+
  • x86_64
    • 
 
-
+
    
 
    VersionPackage SizeDateFilesStatus
    1.0-1 (source)1 KiB2018-03-02 00:00[list of files]stable
    1.0-1 (source)1 KiB2018-03-02 00:00[list of files]stable
    
 

    
 

 
diff --git a/test/testdata/htdocs.expected/summary/obs-b.html b/test/testdata/htdocs.expected/summary/obs-b.html
index 15b2a02..935c0c5 100644
--- a/test/testdata/htdocs.expected/summary/obs-b.html
+++ b/test/testdata/htdocs.expected/summary/obs-b.html
@@ -19,10 +19,10 @@
 Do not contact the maintainer(s) directly.)
 


 
    
-
  • x86
    • 
+
  • x86_64
    • 
 
-
+
    
 
    VersionPackage SizeDateFilesStatus
    1.0-11 KiB2018-03-02 00:00[list of files]stable
    1.0-11 KiB2018-03-02 00:00[list of files]stable
    
 

    
 

 
diff --git a/test/testdata/htdocs.expected/summary/openssh-src.html b/test/testdata/htdocs.expected/summary/openssh-src.html
index eb21d8e..9c58103 100755
--- a/test/testdata/htdocs.expected/summary/openssh-src.html
+++ b/test/testdata/htdocs.expected/summary/openssh-src.html
@@ -21,10 +21,10 @@
 Do not contact the maintainer(s) directly.)
 


 
    
-
  • x86
    • 
+
  • x86_64
    • 
 
-
+
    
 
    VersionPackage SizeDateFilesStatus
    7.2p2-1 (source)1 KiB2018-03-02 00:00[list of files]stable
    7.2p2-1 (source)1 KiB2018-03-02 00:00[list of files]stable
    
 

    
 

 
diff --git a/test/testdata/htdocs.expected/summary/openssh.html b/test/testdata/htdocs.expected/summary/openssh.html
index b657c9e..2f77ed8 100644
--- a/test/testdata/htdocs.expected/summary/openssh.html
+++ b/test/testdata/htdocs.expected/summary/openssh.html
@@ -21,10 +21,10 @@
 Do not contact the maintainer(s) directly.)
 


 
    
-
  • x86
    • 
+
  • x86_64
    • 
 
-
+
    
 
    VersionPackage SizeDateFilesStatus
    7.2p2-11 KiB2018-03-02 00:00[list of files]stable
    7.2p2-11 KiB2018-03-02 00:00[list of files]stable
    
 

    
 

 
diff --git a/test/testdata/htdocs.expected/summary/per-version-replacement-hint-only-src.html b/test/testdata/htdocs.expected/summary/per-version-replacement-hint-only-src.html
index 54e0896..f8fd5d6 100755
--- a/test/testdata/htdocs.expected/summary/per-version-replacement-hint-only-src.html
+++ b/test/testdata/htdocs.expected/summary/per-version-replacement-hint-only-src.html
@@ -19,10 +19,10 @@
 Do not contact the maintainer(s) directly.)
 


 
    
-
  • x86
    • 
+
  • x86_64
    • 
 
-
+
    
 
    VersionPackage SizeDateFilesStatus
    1.0-1 (source)1 KiB2018-03-02 00:00[list of files]stable
    1.0-1 (source)1 KiB2018-03-02 00:00[list of files]stable
    
 

    
 

 
diff --git a/test/testdata/htdocs.expected/summary/per-version-replacement-hint-only.html b/test/testdata/htdocs.expected/summary/per-version-replacement-hint-only.html
index ecfc108..247fe1d 100644
--- a/test/testdata/htdocs.expected/summary/per-version-replacement-hint-only.html
+++ b/test/testdata/htdocs.expected/summary/per-version-replacement-hint-only.html
@@ -20,10 +20,10 @@
 Do not contact the maintainer(s) directly.)
 


 
    
-
  • x86
    • 
+
  • x86_64
    • 
 
-
+
    
 
    VersionPackage SizeDateFilesStatus
    1.0-11 KiB2018-03-02 00:00[list of files]stable
    1.0-11 KiB2018-03-02 00:00[list of files]stable
    
 

    
 

 
diff --git a/test/testdata/htdocs.expected/summary/per-version-src.html b/test/testdata/htdocs.expected/summary/per-version-src.html
index e4041dc..f265123 100755
--- a/test/testdata/htdocs.expected/summary/per-version-src.html
+++ b/test/testdata/htdocs.expected/summary/per-version-src.html
@@ -19,11 +19,11 @@
 Do not contact the maintainer(s) directly.)
 


 
    
-
  • x86
    • 
+
  • x86_64
    • 
 
-
-
+
+
    
 
    VersionPackage SizeDateFilesStatus
    4.0-1 (source)1 KiB2017-04-09 00:00[list of files]stable
    4.8-1 (source)1 KiB2018-03-02 00:00[list of files]stable
    4.0-1 (source)1 KiB2017-04-09 00:00[list of files]stable
    4.8-1 (source)1 KiB2018-03-02 00:00[list of files]stable
    
 

    
 

 
diff --git a/test/testdata/htdocs.expected/summary/per-version.html b/test/testdata/htdocs.expected/summary/per-version.html
index 4d9a74f..dc4bdc0 100644
--- a/test/testdata/htdocs.expected/summary/per-version.html
+++ b/test/testdata/htdocs.expected/summary/per-version.html
@@ -20,11 +20,11 @@
 Do not contact the maintainer(s) directly.)
 


 
 
diff --git a/test/testdata/htdocs.expected/summary/perl-Net-SMTP-SSL-src.html b/test/testdata/htdocs.expected/summary/perl-Net-SMTP-SSL-src.html
index 263ffe4..f9cec36 100755
--- a/test/testdata/htdocs.expected/summary/perl-Net-SMTP-SSL-src.html
+++ b/test/testdata/htdocs.expected/summary/perl-Net-SMTP-SSL-src.html
@@ -20,12 +20,12 @@ its network operations in order to support encrypted connections.


 Do not contact the maintainer(s) directly.)
 


 
    
-
  • x86
    • 
+
  • x86_64
    • 
 
-
-
-
+
+
+
    
 
    VersionPackage SizeDateFilesStatus
    1.01-1 (source)3 KiB2016-09-01 00:00[list of files]stable
    1.02-1 (source)3 KiB2016-10-01 00:00[list of files]stable
    1.03-1 (source)3 KiB2016-11-01 00:00[list of files]stable
    1.01-1 (source)3 KiB2016-09-01 00:00[list of files]stable
    1.02-1 (source)3 KiB2016-10-01 00:00[list of files]stable
    1.03-1 (source)3 KiB2016-11-01 00:00[list of files]stable
    
 

    
 

 
diff --git a/test/testdata/htdocs.expected/summary/perl-Net-SMTP-SSL.html b/test/testdata/htdocs.expected/summary/perl-Net-SMTP-SSL.html
index 0043d58..10e040f 100644
--- a/test/testdata/htdocs.expected/summary/perl-Net-SMTP-SSL.html
+++ b/test/testdata/htdocs.expected/summary/perl-Net-SMTP-SSL.html
@@ -20,12 +20,12 @@ its network operations in order to support encrypted connections.


 Do not contact the maintainer(s) directly.)
 


 
 
diff --git a/test/testdata/htdocs.expected/summary/rpm-doc-src.html b/test/testdata/htdocs.expected/summary/rpm-doc-src.html
index 0a6b59d..a84abfe 100755
--- a/test/testdata/htdocs.expected/summary/rpm-doc-src.html
+++ b/test/testdata/htdocs.expected/summary/rpm-doc-src.html
@@ -15,10 +15,10 @@
 categories: _obsolete


 install package(s): rpm-doc


 
    
-
  • x86
    • 
+
  • x86_64
    • 
 
-
+
    
 
    VersionPackage SizeDateFilesStatus
    4.1-2 (source)1 KiB2016-11-02 00:00[list of files]stable
    4.1-2 (source)1 KiB2016-11-02 00:00[list of files]stable
    
 

    
 

 
diff --git a/test/testdata/htdocs.expected/summary/rpm-doc.html b/test/testdata/htdocs.expected/summary/rpm-doc.html
index b4337b6..c48107e 100644
--- a/test/testdata/htdocs.expected/summary/rpm-doc.html
+++ b/test/testdata/htdocs.expected/summary/rpm-doc.html
@@ -15,11 +15,11 @@
 categories: _obsolete


 source package: rpm-doc


 
 
diff --git a/test/testdata/htdocs.expected/summary/staleversion-src.html b/test/testdata/htdocs.expected/summary/staleversion-src.html
index 6b6bdea..afa229b 100755
--- a/test/testdata/htdocs.expected/summary/staleversion-src.html
+++ b/test/testdata/htdocs.expected/summary/staleversion-src.html
@@ -19,15 +19,15 @@
 Do not contact the maintainer(s) directly.)
 


 
 
diff --git a/test/testdata/htdocs.expected/summary/staleversion.html b/test/testdata/htdocs.expected/summary/staleversion.html
index 4d889d2..4a86f5e 100644
--- a/test/testdata/htdocs.expected/summary/staleversion.html
+++ b/test/testdata/htdocs.expected/summary/staleversion.html
@@ -19,15 +19,15 @@
 Do not contact the maintainer(s) directly.)
 


 
 
diff --git a/test/testdata/htdocs.expected/summary/test-c-src.html b/test/testdata/htdocs.expected/summary/test-c-src.html
index 41cb341..c5d1af7 100755
--- a/test/testdata/htdocs.expected/summary/test-c-src.html
+++ b/test/testdata/htdocs.expected/summary/test-c-src.html
@@ -19,10 +19,10 @@
 Do not contact the maintainer(s) directly.)
 


 
    
-
  • x86
    • 
+
  • x86_64
    • 
 
-
+
    
 
    VersionPackage SizeDateFilesStatus
    1.0-1 (source)1 KiB2018-03-02 00:00[list of files]stable
    1.0-1 (source)1 KiB2018-03-02 00:00[list of files]stable
    
 

    
 

 
diff --git a/test/testdata/htdocs.expected/summary/test-c.html b/test/testdata/htdocs.expected/summary/test-c.html
index 200bd7b..78f4796 100644
--- a/test/testdata/htdocs.expected/summary/test-c.html
+++ b/test/testdata/htdocs.expected/summary/test-c.html
@@ -21,10 +21,10 @@
 Do not contact the maintainer(s) directly.)
 


 
    
-
  • x86
    • 
+
  • x86_64
    • 
 
-
+
    
 
    VersionPackage SizeDateFilesStatus
    1.0-11 KiB2018-03-02 00:00[list of files]stable
    1.0-11 KiB2018-03-02 00:00[list of files]stable
    
 

    
 

 
diff --git a/test/testdata/htdocs.expected/summary/test-d-src.html b/test/testdata/htdocs.expected/summary/test-d-src.html
index c8c0b56..082e997 100755
--- a/test/testdata/htdocs.expected/summary/test-d-src.html
+++ b/test/testdata/htdocs.expected/summary/test-d-src.html
@@ -19,10 +19,10 @@
 Do not contact the maintainer(s) directly.)
 


 
    
-
  • x86
    • 
+
  • x86_64
    • 
 
-
+
    
 
    VersionPackage SizeDateFilesStatus
    1.0.42590-1 (source)1 KiB2018-03-02 00:00[list of files]stable
    1.0.42590-1 (source)1 KiB2018-03-02 00:00[list of files]stable
    
 

    
 

 
diff --git a/test/testdata/htdocs.expected/summary/test-d.html b/test/testdata/htdocs.expected/summary/test-d.html
index 1d61e97..79458ea 100644
--- a/test/testdata/htdocs.expected/summary/test-d.html
+++ b/test/testdata/htdocs.expected/summary/test-d.html
@@ -19,10 +19,10 @@
 Do not contact the maintainer(s) directly.)
 


 
    
-
  • x86
    • 
+
  • x86_64
    • 
 
-
+
    
 
    VersionPackage SizeDateFilesStatus
    1.0.42590-11 KiB2018-03-02 00:00[list of files]stable
    1.0.42590-11 KiB2018-03-02 00:00[list of files]stable
    
 

    
 

 
diff --git a/test/testdata/htdocs.expected/summary/test-e-src.html b/test/testdata/htdocs.expected/summary/test-e-src.html
index 29e59fd..a1358ab 100755
--- a/test/testdata/htdocs.expected/summary/test-e-src.html
+++ b/test/testdata/htdocs.expected/summary/test-e-src.html
@@ -20,10 +20,10 @@
 Do not contact the maintainer(s) directly.)
 


 
    
-
  • x86
    • 
+
  • x86_64
    • 
 
-
+
    
 
    VersionPackage SizeDateFilesStatus
    1.0-1 (source)1 KiB2018-03-02 00:00[list of files]stable
    1.0-1 (source)1 KiB2018-03-02 00:00[list of files]stable
    
 

    
 

 
diff --git a/test/testdata/htdocs.expected/summary/test-e.html b/test/testdata/htdocs.expected/summary/test-e.html
index 70e31a3..ed22284 100644
--- a/test/testdata/htdocs.expected/summary/test-e.html
+++ b/test/testdata/htdocs.expected/summary/test-e.html
@@ -19,10 +19,10 @@
 Do not contact the maintainer(s) directly.)
 


 
    
-
  • x86
    • 
+
  • x86_64
    • 
 
-
+
    
 
    VersionPackage SizeDateFilesStatus
    1.0-11 KiB2018-03-02 00:00[list of files]stable
    1.0-11 KiB2018-03-02 00:00[list of files]stable
    
 

    
 

 
diff --git a/test/testdata/htdocs.expected/summary/testpackage-src.html b/test/testdata/htdocs.expected/summary/testpackage-src.html
index 5a46faa..5864662 100755
--- a/test/testdata/htdocs.expected/summary/testpackage-src.html
+++ b/test/testdata/htdocs.expected/summary/testpackage-src.html
@@ -19,10 +19,10 @@
 Do not contact the maintainer(s) directly.)
 


 
    
-
  • x86
    • 
+
  • x86_64
    • 
 
-
+
    
 
    VersionPackage SizeDateFilesStatus
    0.1-1 (source)1 KiB2018-03-02 00:00[list of files]stable
    0.1-1 (source)1 KiB2018-03-02 00:00[list of files]stable
    
 

    
 

 
diff --git a/test/testdata/htdocs.expected/summary/testpackage.html b/test/testdata/htdocs.expected/summary/testpackage.html
index bc0cfa3..ee6b282 100644
--- a/test/testdata/htdocs.expected/summary/testpackage.html
+++ b/test/testdata/htdocs.expected/summary/testpackage.html
@@ -19,10 +19,10 @@
 Do not contact the maintainer(s) directly.)
 


 
    
-
  • x86
    • 
+
  • x86_64
    • 
 
-
+
    
 
    VersionPackage SizeDateFilesStatus
    0.1-11 KiB2018-03-02 00:00[list of files]stable
    0.1-11 KiB2018-03-02 00:00[list of files]stable
    
 

    
 

 
diff --git a/test/testdata/htdocs.expected/x86/arc-src/.htaccess b/test/testdata/htdocs.expected/x86/arc-src/.htaccess
deleted file mode 100644
index c846ada..0000000
--- a/test/testdata/htdocs.expected/x86/arc-src/.htaccess
+++ /dev/null
@@ -1,2 +0,0 @@
-RedirectMatch temp /packages/x86/arc-src/$ /packages/summary/arc-src.html
-ForceType text/html
diff --git a/test/testdata/htdocs.expected/x86/arc/.htaccess b/test/testdata/htdocs.expected/x86/arc/.htaccess
deleted file mode 100644
index e0e8ed7..0000000
--- a/test/testdata/htdocs.expected/x86/arc/.htaccess
+++ /dev/null
@@ -1,2 +0,0 @@
-RedirectMatch temp /packages/x86/arc/$ /packages/summary/arc.html
-ForceType text/html
diff --git a/test/testdata/htdocs.expected/x86/base-cygwin/.htaccess b/test/testdata/htdocs.expected/x86/base-cygwin/.htaccess
deleted file mode 100644
index 5e486b7..0000000
--- a/test/testdata/htdocs.expected/x86/base-cygwin/.htaccess
+++ /dev/null
@@ -1,2 +0,0 @@
-RedirectMatch temp /packages/x86/base-cygwin/$ /packages/summary/base-cygwin.html
-ForceType text/html
diff --git a/test/testdata/htdocs.expected/x86/corrupt-src/.htaccess b/test/testdata/htdocs.expected/x86/corrupt-src/.htaccess
deleted file mode 100644
index 7389214..0000000
--- a/test/testdata/htdocs.expected/x86/corrupt-src/.htaccess
+++ /dev/null
@@ -1,2 +0,0 @@
-RedirectMatch temp /packages/x86/corrupt-src/$ /packages/summary/corrupt-src.html
-ForceType text/html
diff --git a/test/testdata/htdocs.expected/x86/corrupt/.htaccess b/test/testdata/htdocs.expected/x86/corrupt/.htaccess
deleted file mode 100644
index dc680b2..0000000
--- a/test/testdata/htdocs.expected/x86/corrupt/.htaccess
+++ /dev/null
@@ -1,2 +0,0 @@
-RedirectMatch temp /packages/x86/corrupt/$ /packages/summary/corrupt.html
-ForceType text/html
diff --git a/test/testdata/htdocs.expected/x86/cygwin-debuginfo/.htaccess b/test/testdata/htdocs.expected/x86/cygwin-debuginfo/.htaccess
deleted file mode 100644
index 4f50a18..0000000
--- a/test/testdata/htdocs.expected/x86/cygwin-debuginfo/.htaccess
+++ /dev/null
@@ -1,2 +0,0 @@
-RedirectMatch temp /packages/x86/cygwin-debuginfo/$ /packages/summary/cygwin-debuginfo.html
-ForceType text/html
diff --git a/test/testdata/htdocs.expected/x86/cygwin-devel/.htaccess b/test/testdata/htdocs.expected/x86/cygwin-devel/.htaccess
deleted file mode 100644
index f92bc48..0000000
--- a/test/testdata/htdocs.expected/x86/cygwin-devel/.htaccess
+++ /dev/null
@@ -1,2 +0,0 @@
-RedirectMatch temp /packages/x86/cygwin-devel/$ /packages/summary/cygwin-devel.html
-ForceType text/html
diff --git a/test/testdata/htdocs.expected/x86/cygwin-src/.htaccess b/test/testdata/htdocs.expected/x86/cygwin-src/.htaccess
deleted file mode 100644
index 0f3a4c0..0000000
--- a/test/testdata/htdocs.expected/x86/cygwin-src/.htaccess
+++ /dev/null
@@ -1,2 +0,0 @@
-RedirectMatch temp /packages/x86/cygwin-src/$ /packages/summary/cygwin-src.html
-ForceType text/html
diff --git a/test/testdata/htdocs.expected/x86/cygwin/.htaccess b/test/testdata/htdocs.expected/x86/cygwin/.htaccess
deleted file mode 100644
index 43660ff..0000000
--- a/test/testdata/htdocs.expected/x86/cygwin/.htaccess
+++ /dev/null
@@ -1,2 +0,0 @@
-RedirectMatch temp /packages/x86/cygwin/$ /packages/summary/cygwin.html
-ForceType text/html
diff --git a/test/testdata/htdocs.expected/x86/keychain-src/.htaccess b/test/testdata/htdocs.expected/x86/keychain-src/.htaccess
deleted file mode 100644
index b1467ae..0000000
--- a/test/testdata/htdocs.expected/x86/keychain-src/.htaccess
+++ /dev/null
@@ -1,2 +0,0 @@
-RedirectMatch temp /packages/x86/keychain-src/$ /packages/summary/keychain-src.html
-ForceType text/html
diff --git a/test/testdata/htdocs.expected/x86/keychain/.htaccess b/test/testdata/htdocs.expected/x86/keychain/.htaccess
deleted file mode 100644
index 46abb74..0000000
--- a/test/testdata/htdocs.expected/x86/keychain/.htaccess
+++ /dev/null
@@ -1,2 +0,0 @@
-RedirectMatch temp /packages/x86/keychain/$ /packages/summary/keychain.html
-ForceType text/html
diff --git a/test/testdata/htdocs.expected/x86/libdns_sd-devel/.htaccess b/test/testdata/htdocs.expected/x86/libdns_sd-devel/.htaccess
deleted file mode 100644
index 978905a..0000000
--- a/test/testdata/htdocs.expected/x86/libdns_sd-devel/.htaccess
+++ /dev/null
@@ -1,2 +0,0 @@
-RedirectMatch temp /packages/x86/libdns_sd-devel/$ /packages/summary/libdns_sd-devel.html
-ForceType text/html
diff --git a/test/testdata/htdocs.expected/x86/libdns_sd1/.htaccess b/test/testdata/htdocs.expected/x86/libdns_sd1/.htaccess
deleted file mode 100644
index 7d807df..0000000
--- a/test/testdata/htdocs.expected/x86/libdns_sd1/.htaccess
+++ /dev/null
@@ -1,2 +0,0 @@
-RedirectMatch temp /packages/x86/libdns_sd1/$ /packages/summary/libdns_sd1.html
-ForceType text/html
diff --git a/test/testdata/htdocs.expected/x86/mDNSResponder-src/.htaccess b/test/testdata/htdocs.expected/x86/mDNSResponder-src/.htaccess
deleted file mode 100644
index a47ee41..0000000
--- a/test/testdata/htdocs.expected/x86/mDNSResponder-src/.htaccess
+++ /dev/null
@@ -1,2 +0,0 @@
-RedirectMatch temp /packages/x86/mDNSResponder-src/$ /packages/summary/mDNSResponder-src.html
-ForceType text/html
diff --git a/test/testdata/htdocs.expected/x86/mDNSResponder/.htaccess b/test/testdata/htdocs.expected/x86/mDNSResponder/.htaccess
deleted file mode 100644
index 328ef83..0000000
--- a/test/testdata/htdocs.expected/x86/mDNSResponder/.htaccess
+++ /dev/null
@@ -1,2 +0,0 @@
-RedirectMatch temp /packages/x86/mDNSResponder/$ /packages/summary/mDNSResponder.html
-ForceType text/html
diff --git a/test/testdata/htdocs.expected/x86/obs-a-src/.htaccess b/test/testdata/htdocs.expected/x86/obs-a-src/.htaccess
deleted file mode 100644
index 8728151..0000000
--- a/test/testdata/htdocs.expected/x86/obs-a-src/.htaccess
+++ /dev/null
@@ -1,2 +0,0 @@
-RedirectMatch temp /packages/x86/obs-a-src/$ /packages/summary/obs-a-src.html
-ForceType text/html
diff --git a/test/testdata/htdocs.expected/x86/obs-a/.htaccess b/test/testdata/htdocs.expected/x86/obs-a/.htaccess
deleted file mode 100644
index c90412c..0000000
--- a/test/testdata/htdocs.expected/x86/obs-a/.htaccess
+++ /dev/null
@@ -1,2 +0,0 @@
-RedirectMatch temp /packages/x86/obs-a/$ /packages/summary/obs-a.html
-ForceType text/html
diff --git a/test/testdata/htdocs.expected/x86/obs-b-src/.htaccess b/test/testdata/htdocs.expected/x86/obs-b-src/.htaccess
deleted file mode 100644
index d8e7f90..0000000
--- a/test/testdata/htdocs.expected/x86/obs-b-src/.htaccess
+++ /dev/null
@@ -1,2 +0,0 @@
-RedirectMatch temp /packages/x86/obs-b-src/$ /packages/summary/obs-b-src.html
-ForceType text/html
diff --git a/test/testdata/htdocs.expected/x86/obs-b/.htaccess b/test/testdata/htdocs.expected/x86/obs-b/.htaccess
deleted file mode 100644
index e5f2850..0000000
--- a/test/testdata/htdocs.expected/x86/obs-b/.htaccess
+++ /dev/null
@@ -1,2 +0,0 @@
-RedirectMatch temp /packages/x86/obs-b/$ /packages/summary/obs-b.html
-ForceType text/html
diff --git a/test/testdata/htdocs.expected/x86/openssh-src/.htaccess b/test/testdata/htdocs.expected/x86/openssh-src/.htaccess
deleted file mode 100644
index efcc95b..0000000
--- a/test/testdata/htdocs.expected/x86/openssh-src/.htaccess
+++ /dev/null
@@ -1,2 +0,0 @@
-RedirectMatch temp /packages/x86/openssh-src/$ /packages/summary/openssh-src.html
-ForceType text/html
diff --git a/test/testdata/htdocs.expected/x86/openssh/.htaccess b/test/testdata/htdocs.expected/x86/openssh/.htaccess
deleted file mode 100644
index db91b67..0000000
--- a/test/testdata/htdocs.expected/x86/openssh/.htaccess
+++ /dev/null
@@ -1,2 +0,0 @@
-RedirectMatch temp /packages/x86/openssh/$ /packages/summary/openssh.html
-ForceType text/html
diff --git a/test/testdata/htdocs.expected/x86/per-version-replacement-hint-only-src/.htaccess b/test/testdata/htdocs.expected/x86/per-version-replacement-hint-only-src/.htaccess
deleted file mode 100644
index 146cc84..0000000
--- a/test/testdata/htdocs.expected/x86/per-version-replacement-hint-only-src/.htaccess
+++ /dev/null
@@ -1,2 +0,0 @@
-RedirectMatch temp /packages/x86/per-version-replacement-hint-only-src/$ /packages/summary/per-version-replacement-hint-only-src.html
-ForceType text/html
diff --git a/test/testdata/htdocs.expected/x86/per-version-replacement-hint-only/.htaccess b/test/testdata/htdocs.expected/x86/per-version-replacement-hint-only/.htaccess
deleted file mode 100644
index 57fcc7d..0000000
--- a/test/testdata/htdocs.expected/x86/per-version-replacement-hint-only/.htaccess
+++ /dev/null
@@ -1,2 +0,0 @@
-RedirectMatch temp /packages/x86/per-version-replacement-hint-only/$ /packages/summary/per-version-replacement-hint-only.html
-ForceType text/html
diff --git a/test/testdata/htdocs.expected/x86/per-version-src/.htaccess b/test/testdata/htdocs.expected/x86/per-version-src/.htaccess
deleted file mode 100644
index dc4da58..0000000
--- a/test/testdata/htdocs.expected/x86/per-version-src/.htaccess
+++ /dev/null
@@ -1,2 +0,0 @@
-RedirectMatch temp /packages/x86/per-version-src/$ /packages/summary/per-version-src.html
-ForceType text/html
diff --git a/test/testdata/htdocs.expected/x86/per-version/.htaccess b/test/testdata/htdocs.expected/x86/per-version/.htaccess
deleted file mode 100644
index ccdcb07..0000000
--- a/test/testdata/htdocs.expected/x86/per-version/.htaccess
+++ /dev/null
@@ -1,2 +0,0 @@
-RedirectMatch temp /packages/x86/per-version/$ /packages/summary/per-version.html
-ForceType text/html
diff --git a/test/testdata/htdocs.expected/x86/perl-Net-SMTP-SSL-src/.htaccess b/test/testdata/htdocs.expected/x86/perl-Net-SMTP-SSL-src/.htaccess
deleted file mode 100644
index 7934f37..0000000
--- a/test/testdata/htdocs.expected/x86/perl-Net-SMTP-SSL-src/.htaccess
+++ /dev/null
@@ -1,2 +0,0 @@
-RedirectMatch temp /packages/x86/perl-Net-SMTP-SSL-src/$ /packages/summary/perl-Net-SMTP-SSL-src.html
-ForceType text/html
diff --git a/test/testdata/htdocs.expected/x86/perl-Net-SMTP-SSL/.htaccess b/test/testdata/htdocs.expected/x86/perl-Net-SMTP-SSL/.htaccess
deleted file mode 100644
index 99fd802..0000000
--- a/test/testdata/htdocs.expected/x86/perl-Net-SMTP-SSL/.htaccess
+++ /dev/null
@@ -1,2 +0,0 @@
-RedirectMatch temp /packages/x86/perl-Net-SMTP-SSL/$ /packages/summary/perl-Net-SMTP-SSL.html
-ForceType text/html
diff --git a/test/testdata/htdocs.expected/x86/rpm-doc-src/.htaccess b/test/testdata/htdocs.expected/x86/rpm-doc-src/.htaccess
deleted file mode 100644
index c588cef..0000000
--- a/test/testdata/htdocs.expected/x86/rpm-doc-src/.htaccess
+++ /dev/null
@@ -1,2 +0,0 @@
-RedirectMatch temp /packages/x86/rpm-doc-src/$ /packages/summary/rpm-doc-src.html
-ForceType text/html
diff --git a/test/testdata/htdocs.expected/x86/rpm-doc/.htaccess b/test/testdata/htdocs.expected/x86/rpm-doc/.htaccess
deleted file mode 100644
index 08ffd45..0000000
--- a/test/testdata/htdocs.expected/x86/rpm-doc/.htaccess
+++ /dev/null
@@ -1,2 +0,0 @@
-RedirectMatch temp /packages/x86/rpm-doc/$ /packages/summary/rpm-doc.html
-ForceType text/html
diff --git a/test/testdata/htdocs.expected/x86/staleversion-src/.htaccess b/test/testdata/htdocs.expected/x86/staleversion-src/.htaccess
deleted file mode 100644
index b6ffc09..0000000
--- a/test/testdata/htdocs.expected/x86/staleversion-src/.htaccess
+++ /dev/null
@@ -1,2 +0,0 @@
-RedirectMatch temp /packages/x86/staleversion-src/$ /packages/summary/staleversion-src.html
-ForceType text/html
diff --git a/test/testdata/htdocs.expected/x86/staleversion/.htaccess b/test/testdata/htdocs.expected/x86/staleversion/.htaccess
deleted file mode 100644
index fb62c8b..0000000
--- a/test/testdata/htdocs.expected/x86/staleversion/.htaccess
+++ /dev/null
@@ -1,2 +0,0 @@
-RedirectMatch temp /packages/x86/staleversion/$ /packages/summary/staleversion.html
-ForceType text/html
diff --git a/test/testdata/htdocs.expected/x86/test-c-src/.htaccess b/test/testdata/htdocs.expected/x86/test-c-src/.htaccess
deleted file mode 100644
index a134807..0000000
--- a/test/testdata/htdocs.expected/x86/test-c-src/.htaccess
+++ /dev/null
@@ -1,2 +0,0 @@
-RedirectMatch temp /packages/x86/test-c-src/$ /packages/summary/test-c-src.html
-ForceType text/html
diff --git a/test/testdata/htdocs.expected/x86/test-c/.htaccess b/test/testdata/htdocs.expected/x86/test-c/.htaccess
deleted file mode 100644
index 117af97..0000000
--- a/test/testdata/htdocs.expected/x86/test-c/.htaccess
+++ /dev/null
@@ -1,2 +0,0 @@
-RedirectMatch temp /packages/x86/test-c/$ /packages/summary/test-c.html
-ForceType text/html
diff --git a/test/testdata/htdocs.expected/x86/test-d-src/.htaccess b/test/testdata/htdocs.expected/x86/test-d-src/.htaccess
deleted file mode 100644
index b58f463..0000000
--- a/test/testdata/htdocs.expected/x86/test-d-src/.htaccess
+++ /dev/null
@@ -1,2 +0,0 @@
-RedirectMatch temp /packages/x86/test-d-src/$ /packages/summary/test-d-src.html
-ForceType text/html
diff --git a/test/testdata/htdocs.expected/x86/test-d/.htaccess b/test/testdata/htdocs.expected/x86/test-d/.htaccess
deleted file mode 100644
index 53c678a..0000000
--- a/test/testdata/htdocs.expected/x86/test-d/.htaccess
+++ /dev/null
@@ -1,2 +0,0 @@
-RedirectMatch temp /packages/x86/test-d/$ /packages/summary/test-d.html
-ForceType text/html
diff --git a/test/testdata/htdocs.expected/x86/test-e-src/.htaccess b/test/testdata/htdocs.expected/x86/test-e-src/.htaccess
deleted file mode 100644
index ac45df5..0000000
--- a/test/testdata/htdocs.expected/x86/test-e-src/.htaccess
+++ /dev/null
@@ -1,2 +0,0 @@
-RedirectMatch temp /packages/x86/test-e-src/$ /packages/summary/test-e-src.html
-ForceType text/html
diff --git a/test/testdata/htdocs.expected/x86/test-e/.htaccess b/test/testdata/htdocs.expected/x86/test-e/.htaccess
deleted file mode 100644
index c2bbfec..0000000
--- a/test/testdata/htdocs.expected/x86/test-e/.htaccess
+++ /dev/null
@@ -1,2 +0,0 @@
-RedirectMatch temp /packages/x86/test-e/$ /packages/summary/test-e.html
-ForceType text/html
diff --git a/test/testdata/htdocs.expected/x86/testpackage-src/.htaccess b/test/testdata/htdocs.expected/x86/testpackage-src/.htaccess
deleted file mode 100644
index def9360..0000000
--- a/test/testdata/htdocs.expected/x86/testpackage-src/.htaccess
+++ /dev/null
@@ -1,2 +0,0 @@
-RedirectMatch temp /packages/x86/testpackage-src/$ /packages/summary/testpackage-src.html
-ForceType text/html
diff --git a/test/testdata/htdocs.expected/x86/testpackage/.htaccess b/test/testdata/htdocs.expected/x86/testpackage/.htaccess
deleted file mode 100644
index 1d452b0..0000000
--- a/test/testdata/htdocs.expected/x86/testpackage/.htaccess
+++ /dev/null
@@ -1,2 +0,0 @@
-RedirectMatch temp /packages/x86/testpackage/$ /packages/summary/testpackage.html
-ForceType text/html
diff --git a/test/testdata/htdocs.expected/x86_64/arc-src/.htaccess b/test/testdata/htdocs.expected/x86_64/arc-src/.htaccess
new file mode 100644
index 0000000..f6b0a8c
--- /dev/null
+++ b/test/testdata/htdocs.expected/x86_64/arc-src/.htaccess
@@ -0,0 +1,2 @@
+RedirectMatch temp /packages/x86_64/arc-src/$ /packages/summary/arc-src.html
+ForceType text/html
diff --git a/test/testdata/htdocs.expected/x86/arc-src/arc-4.32.7-10-src b/test/testdata/htdocs.expected/x86_64/arc-src/arc-4.32.7-10-src
similarity index 100%
rename from test/testdata/htdocs.expected/x86/arc-src/arc-4.32.7-10-src
rename to test/testdata/htdocs.expected/x86_64/arc-src/arc-4.32.7-10-src
diff --git a/test/testdata/htdocs.expected/x86_64/arc/.htaccess b/test/testdata/htdocs.expected/x86_64/arc/.htaccess
new file mode 100644
index 0000000..d60d6e2
--- /dev/null
+++ b/test/testdata/htdocs.expected/x86_64/arc/.htaccess
@@ -0,0 +1,2 @@
+RedirectMatch temp /packages/x86_64/arc/$ /packages/summary/arc.html
+ForceType text/html
diff --git a/test/testdata/htdocs.expected/x86/arc/arc-4.32.7-10 b/test/testdata/htdocs.expected/x86_64/arc/arc-4.32.7-10
similarity index 100%
rename from test/testdata/htdocs.expected/x86/arc/arc-4.32.7-10
rename to test/testdata/htdocs.expected/x86_64/arc/arc-4.32.7-10
diff --git a/test/testdata/htdocs.expected/x86/arc/arc-4.32.7-10-src b/test/testdata/htdocs.expected/x86_64/arc/arc-4.32.7-10-src
similarity index 100%
rename from test/testdata/htdocs.expected/x86/arc/arc-4.32.7-10-src
rename to test/testdata/htdocs.expected/x86_64/arc/arc-4.32.7-10-src
diff --git a/test/testdata/htdocs.expected/x86_64/base-cygwin/.htaccess b/test/testdata/htdocs.expected/x86_64/base-cygwin/.htaccess
new file mode 100644
index 0000000..c78b3ea
--- /dev/null
+++ b/test/testdata/htdocs.expected/x86_64/base-cygwin/.htaccess
@@ -0,0 +1,2 @@
+RedirectMatch temp /packages/x86_64/base-cygwin/$ /packages/summary/base-cygwin.html
+ForceType text/html
diff --git a/test/testdata/htdocs.expected/x86/base-cygwin/base-cygwin-3.6-1 b/test/testdata/htdocs.expected/x86_64/base-cygwin/base-cygwin-3.6-1
similarity index 100%
rename from test/testdata/htdocs.expected/x86/base-cygwin/base-cygwin-3.6-1
rename to test/testdata/htdocs.expected/x86_64/base-cygwin/base-cygwin-3.6-1
diff --git a/test/testdata/htdocs.expected/x86/base-cygwin/base-cygwin-3.8-1 b/test/testdata/htdocs.expected/x86_64/base-cygwin/base-cygwin-3.8-1
similarity index 100%
rename from test/testdata/htdocs.expected/x86/base-cygwin/base-cygwin-3.8-1
rename to test/testdata/htdocs.expected/x86_64/base-cygwin/base-cygwin-3.8-1
diff --git a/test/testdata/htdocs.expected/x86_64/corrupt-src/.htaccess b/test/testdata/htdocs.expected/x86_64/corrupt-src/.htaccess
new file mode 100644
index 0000000..42d4188
--- /dev/null
+++ b/test/testdata/htdocs.expected/x86_64/corrupt-src/.htaccess
@@ -0,0 +1,2 @@
+RedirectMatch temp /packages/x86_64/corrupt-src/$ /packages/summary/corrupt-src.html
+ForceType text/html
diff --git a/test/testdata/htdocs.expected/x86/corrupt-src/corrupt-2.0.0-1-src b/test/testdata/htdocs.expected/x86_64/corrupt-src/corrupt-2.0.0-1-src
similarity index 100%
rename from test/testdata/htdocs.expected/x86/corrupt-src/corrupt-2.0.0-1-src
rename to test/testdata/htdocs.expected/x86_64/corrupt-src/corrupt-2.0.0-1-src
diff --git a/test/testdata/htdocs.expected/x86_64/corrupt/.htaccess b/test/testdata/htdocs.expected/x86_64/corrupt/.htaccess
new file mode 100644
index 0000000..ab88a1e
--- /dev/null
+++ b/test/testdata/htdocs.expected/x86_64/corrupt/.htaccess
@@ -0,0 +1,2 @@
+RedirectMatch temp /packages/x86_64/corrupt/$ /packages/summary/corrupt.html
+ForceType text/html
diff --git a/test/testdata/htdocs.expected/x86/corrupt/corrupt-2.0.0-1 b/test/testdata/htdocs.expected/x86_64/corrupt/corrupt-2.0.0-1
similarity index 100%
rename from test/testdata/htdocs.expected/x86/corrupt/corrupt-2.0.0-1
rename to test/testdata/htdocs.expected/x86_64/corrupt/corrupt-2.0.0-1
diff --git a/test/testdata/htdocs.expected/x86/corrupt/corrupt-2.0.0-1-src b/test/testdata/htdocs.expected/x86_64/corrupt/corrupt-2.0.0-1-src
similarity index 100%
rename from test/testdata/htdocs.expected/x86/corrupt/corrupt-2.0.0-1-src
rename to test/testdata/htdocs.expected/x86_64/corrupt/corrupt-2.0.0-1-src
diff --git a/test/testdata/htdocs.expected/x86_64/cygwin-debuginfo/.htaccess b/test/testdata/htdocs.expected/x86_64/cygwin-debuginfo/.htaccess
new file mode 100644
index 0000000..697578c
--- /dev/null
+++ b/test/testdata/htdocs.expected/x86_64/cygwin-debuginfo/.htaccess
@@ -0,0 +1,2 @@
+RedirectMatch temp /packages/x86_64/cygwin-debuginfo/$ /packages/summary/cygwin-debuginfo.html
+ForceType text/html
diff --git a/test/testdata/htdocs.expected/x86/cygwin-debuginfo/cygwin-debuginfo-2.2.0-1 b/test/testdata/htdocs.expected/x86_64/cygwin-debuginfo/cygwin-debuginfo-2.2.0-1
similarity index 100%
rename from test/testdata/htdocs.expected/x86/cygwin-debuginfo/cygwin-debuginfo-2.2.0-1
rename to test/testdata/htdocs.expected/x86_64/cygwin-debuginfo/cygwin-debuginfo-2.2.0-1
diff --git a/test/testdata/htdocs.expected/x86/cygwin-debuginfo/cygwin-debuginfo-2.2.1-1 b/test/testdata/htdocs.expected/x86_64/cygwin-debuginfo/cygwin-debuginfo-2.2.1-1
similarity index 100%
rename from test/testdata/htdocs.expected/x86/cygwin-debuginfo/cygwin-debuginfo-2.2.1-1
rename to test/testdata/htdocs.expected/x86_64/cygwin-debuginfo/cygwin-debuginfo-2.2.1-1
diff --git a/test/testdata/htdocs.expected/x86/cygwin-debuginfo/cygwin-debuginfo-2.3.0-0.3 b/test/testdata/htdocs.expected/x86_64/cygwin-debuginfo/cygwin-debuginfo-2.3.0-0.3
similarity index 100%
rename from test/testdata/htdocs.expected/x86/cygwin-debuginfo/cygwin-debuginfo-2.3.0-0.3
rename to test/testdata/htdocs.expected/x86_64/cygwin-debuginfo/cygwin-debuginfo-2.3.0-0.3
diff --git a/test/testdata/htdocs.expected/x86_64/cygwin-devel/.htaccess b/test/testdata/htdocs.expected/x86_64/cygwin-devel/.htaccess
new file mode 100644
index 0000000..7f81ddf
--- /dev/null
+++ b/test/testdata/htdocs.expected/x86_64/cygwin-devel/.htaccess
@@ -0,0 +1,2 @@
+RedirectMatch temp /packages/x86_64/cygwin-devel/$ /packages/summary/cygwin-devel.html
+ForceType text/html
diff --git a/test/testdata/htdocs.expected/x86/cygwin-devel/cygwin-devel-2.2.0-1 b/test/testdata/htdocs.expected/x86_64/cygwin-devel/cygwin-devel-2.2.0-1
similarity index 100%
rename from test/testdata/htdocs.expected/x86/cygwin-devel/cygwin-devel-2.2.0-1
rename to test/testdata/htdocs.expected/x86_64/cygwin-devel/cygwin-devel-2.2.0-1
diff --git a/test/testdata/htdocs.expected/x86/cygwin-devel/cygwin-devel-2.2.1-1 b/test/testdata/htdocs.expected/x86_64/cygwin-devel/cygwin-devel-2.2.1-1
similarity index 100%
rename from test/testdata/htdocs.expected/x86/cygwin-devel/cygwin-devel-2.2.1-1
rename to test/testdata/htdocs.expected/x86_64/cygwin-devel/cygwin-devel-2.2.1-1
diff --git a/test/testdata/htdocs.expected/x86/cygwin-devel/cygwin-devel-2.3.0-0.3 b/test/testdata/htdocs.expected/x86_64/cygwin-devel/cygwin-devel-2.3.0-0.3
similarity index 100%
rename from test/testdata/htdocs.expected/x86/cygwin-devel/cygwin-devel-2.3.0-0.3
rename to test/testdata/htdocs.expected/x86_64/cygwin-devel/cygwin-devel-2.3.0-0.3
diff --git a/test/testdata/htdocs.expected/x86_64/cygwin-src/.htaccess b/test/testdata/htdocs.expected/x86_64/cygwin-src/.htaccess
new file mode 100644
index 0000000..8b1dae6
--- /dev/null
+++ b/test/testdata/htdocs.expected/x86_64/cygwin-src/.htaccess
@@ -0,0 +1,2 @@
+RedirectMatch temp /packages/x86_64/cygwin-src/$ /packages/summary/cygwin-src.html
+ForceType text/html
diff --git a/test/testdata/htdocs.expected/x86/cygwin-src/cygwin-2.2.0-1-src b/test/testdata/htdocs.expected/x86_64/cygwin-src/cygwin-2.2.0-1-src
similarity index 100%
rename from test/testdata/htdocs.expected/x86/cygwin-src/cygwin-2.2.0-1-src
rename to test/testdata/htdocs.expected/x86_64/cygwin-src/cygwin-2.2.0-1-src
diff --git a/test/testdata/htdocs.expected/x86/cygwin-src/cygwin-2.2.1-1-src b/test/testdata/htdocs.expected/x86_64/cygwin-src/cygwin-2.2.1-1-src
similarity index 100%
rename from test/testdata/htdocs.expected/x86/cygwin-src/cygwin-2.2.1-1-src
rename to test/testdata/htdocs.expected/x86_64/cygwin-src/cygwin-2.2.1-1-src
diff --git a/test/testdata/htdocs.expected/x86/cygwin-src/cygwin-2.3.0-0.3-src b/test/testdata/htdocs.expected/x86_64/cygwin-src/cygwin-2.3.0-0.3-src
similarity index 100%
rename from test/testdata/htdocs.expected/x86/cygwin-src/cygwin-2.3.0-0.3-src
rename to test/testdata/htdocs.expected/x86_64/cygwin-src/cygwin-2.3.0-0.3-src
diff --git a/test/testdata/htdocs.expected/x86_64/cygwin/.htaccess b/test/testdata/htdocs.expected/x86_64/cygwin/.htaccess
new file mode 100644
index 0000000..a401464
--- /dev/null
+++ b/test/testdata/htdocs.expected/x86_64/cygwin/.htaccess
@@ -0,0 +1,2 @@
+RedirectMatch temp /packages/x86_64/cygwin/$ /packages/summary/cygwin.html
+ForceType text/html
diff --git a/test/testdata/htdocs.expected/x86/cygwin/cygwin-2.2.0-1 b/test/testdata/htdocs.expected/x86_64/cygwin/cygwin-2.2.0-1
similarity index 100%
rename from test/testdata/htdocs.expected/x86/cygwin/cygwin-2.2.0-1
rename to test/testdata/htdocs.expected/x86_64/cygwin/cygwin-2.2.0-1
diff --git a/test/testdata/htdocs.expected/x86/cygwin/cygwin-2.2.0-1-src b/test/testdata/htdocs.expected/x86_64/cygwin/cygwin-2.2.0-1-src
similarity index 100%
rename from test/testdata/htdocs.expected/x86/cygwin/cygwin-2.2.0-1-src
rename to test/testdata/htdocs.expected/x86_64/cygwin/cygwin-2.2.0-1-src
diff --git a/test/testdata/htdocs.expected/x86/cygwin/cygwin-2.2.1-1 b/test/testdata/htdocs.expected/x86_64/cygwin/cygwin-2.2.1-1
similarity index 100%
rename from test/testdata/htdocs.expected/x86/cygwin/cygwin-2.2.1-1
rename to test/testdata/htdocs.expected/x86_64/cygwin/cygwin-2.2.1-1
diff --git a/test/testdata/htdocs.expected/x86/cygwin/cygwin-2.2.1-1-src b/test/testdata/htdocs.expected/x86_64/cygwin/cygwin-2.2.1-1-src
similarity index 100%
rename from test/testdata/htdocs.expected/x86/cygwin/cygwin-2.2.1-1-src
rename to test/testdata/htdocs.expected/x86_64/cygwin/cygwin-2.2.1-1-src
diff --git a/test/testdata/htdocs.expected/x86/cygwin/cygwin-2.3.0-0.3 b/test/testdata/htdocs.expected/x86_64/cygwin/cygwin-2.3.0-0.3
similarity index 100%
rename from test/testdata/htdocs.expected/x86/cygwin/cygwin-2.3.0-0.3
rename to test/testdata/htdocs.expected/x86_64/cygwin/cygwin-2.3.0-0.3
diff --git a/test/testdata/htdocs.expected/x86/cygwin/cygwin-2.3.0-0.3-src b/test/testdata/htdocs.expected/x86_64/cygwin/cygwin-2.3.0-0.3-src
similarity index 100%
rename from test/testdata/htdocs.expected/x86/cygwin/cygwin-2.3.0-0.3-src
rename to test/testdata/htdocs.expected/x86_64/cygwin/cygwin-2.3.0-0.3-src
diff --git a/test/testdata/htdocs.expected/x86_64/keychain-src/.htaccess b/test/testdata/htdocs.expected/x86_64/keychain-src/.htaccess
new file mode 100644
index 0000000..d9d0524
--- /dev/null
+++ b/test/testdata/htdocs.expected/x86_64/keychain-src/.htaccess
@@ -0,0 +1,2 @@
+RedirectMatch temp /packages/x86_64/keychain-src/$ /packages/summary/keychain-src.html
+ForceType text/html
diff --git a/test/testdata/htdocs.expected/x86/keychain-src/keychain-2.6.8-1-src b/test/testdata/htdocs.expected/x86_64/keychain-src/keychain-2.6.8-1-src
similarity index 100%
rename from test/testdata/htdocs.expected/x86/keychain-src/keychain-2.6.8-1-src
rename to test/testdata/htdocs.expected/x86_64/keychain-src/keychain-2.6.8-1-src
diff --git a/test/testdata/htdocs.expected/x86/keychain-src/keychain-2.7.1-1-src b/test/testdata/htdocs.expected/x86_64/keychain-src/keychain-2.7.1-1-src
similarity index 100%
rename from test/testdata/htdocs.expected/x86/keychain-src/keychain-2.7.1-1-src
rename to test/testdata/htdocs.expected/x86_64/keychain-src/keychain-2.7.1-1-src
diff --git a/test/testdata/htdocs.expected/x86_64/keychain/.htaccess b/test/testdata/htdocs.expected/x86_64/keychain/.htaccess
new file mode 100644
index 0000000..493c769
--- /dev/null
+++ b/test/testdata/htdocs.expected/x86_64/keychain/.htaccess
@@ -0,0 +1,2 @@
+RedirectMatch temp /packages/x86_64/keychain/$ /packages/summary/keychain.html
+ForceType text/html
diff --git a/test/testdata/htdocs.expected/x86/keychain/keychain-2.6.8-1 b/test/testdata/htdocs.expected/x86_64/keychain/keychain-2.6.8-1
similarity index 100%
rename from test/testdata/htdocs.expected/x86/keychain/keychain-2.6.8-1
rename to test/testdata/htdocs.expected/x86_64/keychain/keychain-2.6.8-1
diff --git a/test/testdata/htdocs.expected/x86/keychain/keychain-2.6.8-1-src b/test/testdata/htdocs.expected/x86_64/keychain/keychain-2.6.8-1-src
similarity index 100%
rename from test/testdata/htdocs.expected/x86/keychain/keychain-2.6.8-1-src
rename to test/testdata/htdocs.expected/x86_64/keychain/keychain-2.6.8-1-src
diff --git a/test/testdata/htdocs.expected/x86/keychain/keychain-2.7.1-1 b/test/testdata/htdocs.expected/x86_64/keychain/keychain-2.7.1-1
similarity index 100%
rename from test/testdata/htdocs.expected/x86/keychain/keychain-2.7.1-1
rename to test/testdata/htdocs.expected/x86_64/keychain/keychain-2.7.1-1
diff --git a/test/testdata/htdocs.expected/x86/keychain/keychain-2.7.1-1-src b/test/testdata/htdocs.expected/x86_64/keychain/keychain-2.7.1-1-src
similarity index 100%
rename from test/testdata/htdocs.expected/x86/keychain/keychain-2.7.1-1-src
rename to test/testdata/htdocs.expected/x86_64/keychain/keychain-2.7.1-1-src
diff --git a/test/testdata/htdocs.expected/x86_64/libdns_sd-devel/.htaccess b/test/testdata/htdocs.expected/x86_64/libdns_sd-devel/.htaccess
new file mode 100644
index 0000000..32a34ee
--- /dev/null
+++ b/test/testdata/htdocs.expected/x86_64/libdns_sd-devel/.htaccess
@@ -0,0 +1,2 @@
+RedirectMatch temp /packages/x86_64/libdns_sd-devel/$ /packages/summary/libdns_sd-devel.html
+ForceType text/html
diff --git a/test/testdata/htdocs.expected/x86/libdns_sd-devel/libdns_sd-devel-379.32.1-1 b/test/testdata/htdocs.expected/x86_64/libdns_sd-devel/libdns_sd-devel-379.32.1-1
similarity index 100%
rename from test/testdata/htdocs.expected/x86/libdns_sd-devel/libdns_sd-devel-379.32.1-1
rename to test/testdata/htdocs.expected/x86_64/libdns_sd-devel/libdns_sd-devel-379.32.1-1
diff --git a/test/testdata/htdocs.expected/x86_64/libdns_sd1/.htaccess b/test/testdata/htdocs.expected/x86_64/libdns_sd1/.htaccess
new file mode 100644
index 0000000..3ff606d
--- /dev/null
+++ b/test/testdata/htdocs.expected/x86_64/libdns_sd1/.htaccess
@@ -0,0 +1,2 @@
+RedirectMatch temp /packages/x86_64/libdns_sd1/$ /packages/summary/libdns_sd1.html
+ForceType text/html
diff --git a/test/testdata/htdocs.expected/x86/libdns_sd1/libdns_sd1-379.32.1-1 b/test/testdata/htdocs.expected/x86_64/libdns_sd1/libdns_sd1-379.32.1-1
similarity index 100%
rename from test/testdata/htdocs.expected/x86/libdns_sd1/libdns_sd1-379.32.1-1
rename to test/testdata/htdocs.expected/x86_64/libdns_sd1/libdns_sd1-379.32.1-1
diff --git a/test/testdata/htdocs.expected/x86/libtextcat-devel/.htaccess b/test/testdata/htdocs.expected/x86_64/libtextcat-devel/.htaccess
similarity index 100%
rename from test/testdata/htdocs.expected/x86/libtextcat-devel/.htaccess
rename to test/testdata/htdocs.expected/x86_64/libtextcat-devel/.htaccess
diff --git a/test/testdata/htdocs.expected/x86/libtextcat-devel/libtextcat-devel-2.2-2 b/test/testdata/htdocs.expected/x86_64/libtextcat-devel/libtextcat-devel-2.2-2
similarity index 100%
rename from test/testdata/htdocs.expected/x86/libtextcat-devel/libtextcat-devel-2.2-2
rename to test/testdata/htdocs.expected/x86_64/libtextcat-devel/libtextcat-devel-2.2-2
diff --git a/test/testdata/htdocs.expected/x86/libtextcat0/.htaccess b/test/testdata/htdocs.expected/x86_64/libtextcat0/.htaccess
similarity index 100%
rename from test/testdata/htdocs.expected/x86/libtextcat0/.htaccess
rename to test/testdata/htdocs.expected/x86_64/libtextcat0/.htaccess
diff --git a/test/testdata/htdocs.expected/x86/libtextcat0/libtextcat0-2.2-2 b/test/testdata/htdocs.expected/x86_64/libtextcat0/libtextcat0-2.2-2
similarity index 100%
rename from test/testdata/htdocs.expected/x86/libtextcat0/libtextcat0-2.2-2
rename to test/testdata/htdocs.expected/x86_64/libtextcat0/libtextcat0-2.2-2
diff --git a/test/testdata/htdocs.expected/x86_64/mDNSResponder-src/.htaccess b/test/testdata/htdocs.expected/x86_64/mDNSResponder-src/.htaccess
new file mode 100644
index 0000000..ba4831c
--- /dev/null
+++ b/test/testdata/htdocs.expected/x86_64/mDNSResponder-src/.htaccess
@@ -0,0 +1,2 @@
+RedirectMatch temp /packages/x86_64/mDNSResponder-src/$ /packages/summary/mDNSResponder-src.html
+ForceType text/html
diff --git a/test/testdata/htdocs.expected/x86/mDNSResponder-src/mDNSResponder-379.32.1-1-src b/test/testdata/htdocs.expected/x86_64/mDNSResponder-src/mDNSResponder-379.32.1-1-src
similarity index 100%
rename from test/testdata/htdocs.expected/x86/mDNSResponder-src/mDNSResponder-379.32.1-1-src
rename to test/testdata/htdocs.expected/x86_64/mDNSResponder-src/mDNSResponder-379.32.1-1-src
diff --git a/test/testdata/htdocs.expected/x86_64/mDNSResponder/.htaccess b/test/testdata/htdocs.expected/x86_64/mDNSResponder/.htaccess
new file mode 100644
index 0000000..1e135f1
--- /dev/null
+++ b/test/testdata/htdocs.expected/x86_64/mDNSResponder/.htaccess
@@ -0,0 +1,2 @@
+RedirectMatch temp /packages/x86_64/mDNSResponder/$ /packages/summary/mDNSResponder.html
+ForceType text/html
diff --git a/test/testdata/htdocs.expected/x86/mDNSResponder/mDNSResponder-379.32.1-1 b/test/testdata/htdocs.expected/x86_64/mDNSResponder/mDNSResponder-379.32.1-1
similarity index 100%
rename from test/testdata/htdocs.expected/x86/mDNSResponder/mDNSResponder-379.32.1-1
rename to test/testdata/htdocs.expected/x86_64/mDNSResponder/mDNSResponder-379.32.1-1
diff --git a/test/testdata/htdocs.expected/x86/mDNSResponder/mDNSResponder-379.32.1-1-src b/test/testdata/htdocs.expected/x86_64/mDNSResponder/mDNSResponder-379.32.1-1-src
similarity index 100%
rename from test/testdata/htdocs.expected/x86/mDNSResponder/mDNSResponder-379.32.1-1-src
rename to test/testdata/htdocs.expected/x86_64/mDNSResponder/mDNSResponder-379.32.1-1-src
diff --git a/test/testdata/htdocs.expected/x86/naim/.htaccess b/test/testdata/htdocs.expected/x86_64/naim/.htaccess
similarity index 100%
rename from test/testdata/htdocs.expected/x86/naim/.htaccess
rename to test/testdata/htdocs.expected/x86_64/naim/.htaccess
diff --git a/test/testdata/htdocs.expected/x86_64/obs-a-src/.htaccess b/test/testdata/htdocs.expected/x86_64/obs-a-src/.htaccess
new file mode 100644
index 0000000..0b84073
--- /dev/null
+++ b/test/testdata/htdocs.expected/x86_64/obs-a-src/.htaccess
@@ -0,0 +1,2 @@
+RedirectMatch temp /packages/x86_64/obs-a-src/$ /packages/summary/obs-a-src.html
+ForceType text/html
diff --git a/test/testdata/htdocs.expected/x86/obs-a-src/obs-a-1.0-1-src b/test/testdata/htdocs.expected/x86_64/obs-a-src/obs-a-1.0-1-src
similarity index 100%
rename from test/testdata/htdocs.expected/x86/obs-a-src/obs-a-1.0-1-src
rename to test/testdata/htdocs.expected/x86_64/obs-a-src/obs-a-1.0-1-src
diff --git a/test/testdata/htdocs.expected/x86_64/obs-a/.htaccess b/test/testdata/htdocs.expected/x86_64/obs-a/.htaccess
new file mode 100644
index 0000000..7d7cfb3
--- /dev/null
+++ b/test/testdata/htdocs.expected/x86_64/obs-a/.htaccess
@@ -0,0 +1,2 @@
+RedirectMatch temp /packages/x86_64/obs-a/$ /packages/summary/obs-a.html
+ForceType text/html
diff --git a/test/testdata/htdocs.expected/x86/obs-a/obs-a-1.0-1 b/test/testdata/htdocs.expected/x86_64/obs-a/obs-a-1.0-1
similarity index 100%
rename from test/testdata/htdocs.expected/x86/obs-a/obs-a-1.0-1
rename to test/testdata/htdocs.expected/x86_64/obs-a/obs-a-1.0-1
diff --git a/test/testdata/htdocs.expected/x86/obs-a/obs-a-1.0-1-src b/test/testdata/htdocs.expected/x86_64/obs-a/obs-a-1.0-1-src
similarity index 100%
rename from test/testdata/htdocs.expected/x86/obs-a/obs-a-1.0-1-src
rename to test/testdata/htdocs.expected/x86_64/obs-a/obs-a-1.0-1-src
diff --git a/test/testdata/htdocs.expected/x86_64/obs-b-src/.htaccess b/test/testdata/htdocs.expected/x86_64/obs-b-src/.htaccess
new file mode 100644
index 0000000..a400931
--- /dev/null
+++ b/test/testdata/htdocs.expected/x86_64/obs-b-src/.htaccess
@@ -0,0 +1,2 @@
+RedirectMatch temp /packages/x86_64/obs-b-src/$ /packages/summary/obs-b-src.html
+ForceType text/html
diff --git a/test/testdata/htdocs.expected/x86/obs-b-src/obs-b-1.0-1-src b/test/testdata/htdocs.expected/x86_64/obs-b-src/obs-b-1.0-1-src
similarity index 100%
rename from test/testdata/htdocs.expected/x86/obs-b-src/obs-b-1.0-1-src
rename to test/testdata/htdocs.expected/x86_64/obs-b-src/obs-b-1.0-1-src
diff --git a/test/testdata/htdocs.expected/x86_64/obs-b/.htaccess b/test/testdata/htdocs.expected/x86_64/obs-b/.htaccess
new file mode 100644
index 0000000..7a44be8
--- /dev/null
+++ b/test/testdata/htdocs.expected/x86_64/obs-b/.htaccess
@@ -0,0 +1,2 @@
+RedirectMatch temp /packages/x86_64/obs-b/$ /packages/summary/obs-b.html
+ForceType text/html
diff --git a/test/testdata/htdocs.expected/x86/obs-b/obs-b-1.0-1 b/test/testdata/htdocs.expected/x86_64/obs-b/obs-b-1.0-1
similarity index 100%
rename from test/testdata/htdocs.expected/x86/obs-b/obs-b-1.0-1
rename to test/testdata/htdocs.expected/x86_64/obs-b/obs-b-1.0-1
diff --git a/test/testdata/htdocs.expected/x86/obs-b/obs-b-1.0-1-src b/test/testdata/htdocs.expected/x86_64/obs-b/obs-b-1.0-1-src
similarity index 100%
rename from test/testdata/htdocs.expected/x86/obs-b/obs-b-1.0-1-src
rename to test/testdata/htdocs.expected/x86_64/obs-b/obs-b-1.0-1-src
diff --git a/test/testdata/htdocs.expected/x86_64/openssh-src/.htaccess b/test/testdata/htdocs.expected/x86_64/openssh-src/.htaccess
new file mode 100644
index 0000000..454cc2c
--- /dev/null
+++ b/test/testdata/htdocs.expected/x86_64/openssh-src/.htaccess
@@ -0,0 +1,2 @@
+RedirectMatch temp /packages/x86_64/openssh-src/$ /packages/summary/openssh-src.html
+ForceType text/html
diff --git a/test/testdata/htdocs.expected/x86/openssh-src/openssh-7.2p2-1-src b/test/testdata/htdocs.expected/x86_64/openssh-src/openssh-7.2p2-1-src
similarity index 100%
rename from test/testdata/htdocs.expected/x86/openssh-src/openssh-7.2p2-1-src
rename to test/testdata/htdocs.expected/x86_64/openssh-src/openssh-7.2p2-1-src
diff --git a/test/testdata/htdocs.expected/x86_64/openssh/.htaccess b/test/testdata/htdocs.expected/x86_64/openssh/.htaccess
new file mode 100644
index 0000000..85f25b7
--- /dev/null
+++ b/test/testdata/htdocs.expected/x86_64/openssh/.htaccess
@@ -0,0 +1,2 @@
+RedirectMatch temp /packages/x86_64/openssh/$ /packages/summary/openssh.html
+ForceType text/html
diff --git a/test/testdata/htdocs.expected/x86/openssh/openssh-7.2p2-1 b/test/testdata/htdocs.expected/x86_64/openssh/openssh-7.2p2-1
similarity index 100%
rename from test/testdata/htdocs.expected/x86/openssh/openssh-7.2p2-1
rename to test/testdata/htdocs.expected/x86_64/openssh/openssh-7.2p2-1
diff --git a/test/testdata/htdocs.expected/x86/openssh/openssh-7.2p2-1-src b/test/testdata/htdocs.expected/x86_64/openssh/openssh-7.2p2-1-src
similarity index 100%
rename from test/testdata/htdocs.expected/x86/openssh/openssh-7.2p2-1-src
rename to test/testdata/htdocs.expected/x86_64/openssh/openssh-7.2p2-1-src
diff --git a/test/testdata/htdocs.expected/x86_64/per-version-replacement-hint-only-src/.htaccess b/test/testdata/htdocs.expected/x86_64/per-version-replacement-hint-only-src/.htaccess
new file mode 100644
index 0000000..b9fef64
--- /dev/null
+++ b/test/testdata/htdocs.expected/x86_64/per-version-replacement-hint-only-src/.htaccess
@@ -0,0 +1,2 @@
+RedirectMatch temp /packages/x86_64/per-version-replacement-hint-only-src/$ /packages/summary/per-version-replacement-hint-only-src.html
+ForceType text/html
diff --git a/test/testdata/htdocs.expected/x86/per-version-replacement-hint-only-src/per-version-replacement-hint-only-1.0-1-src b/test/testdata/htdocs.expected/x86_64/per-version-replacement-hint-only-src/per-version-replacement-hint-only-1.0-1-src
similarity index 100%
rename from test/testdata/htdocs.expected/x86/per-version-replacement-hint-only-src/per-version-replacement-hint-only-1.0-1-src
rename to test/testdata/htdocs.expected/x86_64/per-version-replacement-hint-only-src/per-version-replacement-hint-only-1.0-1-src
diff --git a/test/testdata/htdocs.expected/x86_64/per-version-replacement-hint-only/.htaccess b/test/testdata/htdocs.expected/x86_64/per-version-replacement-hint-only/.htaccess
new file mode 100644
index 0000000..d01b94d
--- /dev/null
+++ b/test/testdata/htdocs.expected/x86_64/per-version-replacement-hint-only/.htaccess
@@ -0,0 +1,2 @@
+RedirectMatch temp /packages/x86_64/per-version-replacement-hint-only/$ /packages/summary/per-version-replacement-hint-only.html
+ForceType text/html
diff --git a/test/testdata/htdocs.expected/x86/per-version-replacement-hint-only/per-version-replacement-hint-only-1.0-1 b/test/testdata/htdocs.expected/x86_64/per-version-replacement-hint-only/per-version-replacement-hint-only-1.0-1
similarity index 100%
rename from test/testdata/htdocs.expected/x86/per-version-replacement-hint-only/per-version-replacement-hint-only-1.0-1
rename to test/testdata/htdocs.expected/x86_64/per-version-replacement-hint-only/per-version-replacement-hint-only-1.0-1
diff --git a/test/testdata/htdocs.expected/x86/per-version-replacement-hint-only/per-version-replacement-hint-only-1.0-1-src b/test/testdata/htdocs.expected/x86_64/per-version-replacement-hint-only/per-version-replacement-hint-only-1.0-1-src
similarity index 100%
rename from test/testdata/htdocs.expected/x86/per-version-replacement-hint-only/per-version-replacement-hint-only-1.0-1-src
rename to test/testdata/htdocs.expected/x86_64/per-version-replacement-hint-only/per-version-replacement-hint-only-1.0-1-src
diff --git a/test/testdata/htdocs.expected/x86_64/per-version-src/.htaccess b/test/testdata/htdocs.expected/x86_64/per-version-src/.htaccess
new file mode 100644
index 0000000..bcfded8
--- /dev/null
+++ b/test/testdata/htdocs.expected/x86_64/per-version-src/.htaccess
@@ -0,0 +1,2 @@
+RedirectMatch temp /packages/x86_64/per-version-src/$ /packages/summary/per-version-src.html
+ForceType text/html
diff --git a/test/testdata/htdocs.expected/x86/per-version-src/per-version-4.0-1-src b/test/testdata/htdocs.expected/x86_64/per-version-src/per-version-4.0-1-src
similarity index 100%
rename from test/testdata/htdocs.expected/x86/per-version-src/per-version-4.0-1-src
rename to test/testdata/htdocs.expected/x86_64/per-version-src/per-version-4.0-1-src
diff --git a/test/testdata/htdocs.expected/x86/per-version-src/per-version-4.8-1-src b/test/testdata/htdocs.expected/x86_64/per-version-src/per-version-4.8-1-src
similarity index 100%
rename from test/testdata/htdocs.expected/x86/per-version-src/per-version-4.8-1-src
rename to test/testdata/htdocs.expected/x86_64/per-version-src/per-version-4.8-1-src
diff --git a/test/testdata/htdocs.expected/x86_64/per-version/.htaccess b/test/testdata/htdocs.expected/x86_64/per-version/.htaccess
new file mode 100644
index 0000000..6486bbe
--- /dev/null
+++ b/test/testdata/htdocs.expected/x86_64/per-version/.htaccess
@@ -0,0 +1,2 @@
+RedirectMatch temp /packages/x86_64/per-version/$ /packages/summary/per-version.html
+ForceType text/html
diff --git a/test/testdata/htdocs.expected/x86/per-version/per-version-4.0-1 b/test/testdata/htdocs.expected/x86_64/per-version/per-version-4.0-1
similarity index 100%
rename from test/testdata/htdocs.expected/x86/per-version/per-version-4.0-1
rename to test/testdata/htdocs.expected/x86_64/per-version/per-version-4.0-1
diff --git a/test/testdata/htdocs.expected/x86/per-version/per-version-4.0-1-src b/test/testdata/htdocs.expected/x86_64/per-version/per-version-4.0-1-src
similarity index 100%
rename from test/testdata/htdocs.expected/x86/per-version/per-version-4.0-1-src
rename to test/testdata/htdocs.expected/x86_64/per-version/per-version-4.0-1-src
diff --git a/test/testdata/htdocs.expected/x86/per-version/per-version-4.8-1 b/test/testdata/htdocs.expected/x86_64/per-version/per-version-4.8-1
similarity index 100%
rename from test/testdata/htdocs.expected/x86/per-version/per-version-4.8-1
rename to test/testdata/htdocs.expected/x86_64/per-version/per-version-4.8-1
diff --git a/test/testdata/htdocs.expected/x86/per-version/per-version-4.8-1-src b/test/testdata/htdocs.expected/x86_64/per-version/per-version-4.8-1-src
similarity index 100%
rename from test/testdata/htdocs.expected/x86/per-version/per-version-4.8-1-src
rename to test/testdata/htdocs.expected/x86_64/per-version/per-version-4.8-1-src
diff --git a/test/testdata/htdocs.expected/x86_64/perl-Net-SMTP-SSL-src/.htaccess b/test/testdata/htdocs.expected/x86_64/perl-Net-SMTP-SSL-src/.htaccess
new file mode 100644
index 0000000..7d9395a
--- /dev/null
+++ b/test/testdata/htdocs.expected/x86_64/perl-Net-SMTP-SSL-src/.htaccess
@@ -0,0 +1,2 @@
+RedirectMatch temp /packages/x86_64/perl-Net-SMTP-SSL-src/$ /packages/summary/perl-Net-SMTP-SSL-src.html
+ForceType text/html
diff --git a/test/testdata/htdocs.expected/x86/perl-Net-SMTP-SSL-src/perl-Net-SMTP-SSL-1.01-1-src b/test/testdata/htdocs.expected/x86_64/perl-Net-SMTP-SSL-src/perl-Net-SMTP-SSL-1.01-1-src
similarity index 100%
rename from test/testdata/htdocs.expected/x86/perl-Net-SMTP-SSL-src/perl-Net-SMTP-SSL-1.01-1-src
rename to test/testdata/htdocs.expected/x86_64/perl-Net-SMTP-SSL-src/perl-Net-SMTP-SSL-1.01-1-src
diff --git a/test/testdata/htdocs.expected/x86/perl-Net-SMTP-SSL-src/perl-Net-SMTP-SSL-1.02-1-src b/test/testdata/htdocs.expected/x86_64/perl-Net-SMTP-SSL-src/perl-Net-SMTP-SSL-1.02-1-src
similarity index 100%
rename from test/testdata/htdocs.expected/x86/perl-Net-SMTP-SSL-src/perl-Net-SMTP-SSL-1.02-1-src
rename to test/testdata/htdocs.expected/x86_64/perl-Net-SMTP-SSL-src/perl-Net-SMTP-SSL-1.02-1-src
diff --git a/test/testdata/htdocs.expected/x86/perl-Net-SMTP-SSL-src/perl-Net-SMTP-SSL-1.03-1-src b/test/testdata/htdocs.expected/x86_64/perl-Net-SMTP-SSL-src/perl-Net-SMTP-SSL-1.03-1-src
similarity index 100%
rename from test/testdata/htdocs.expected/x86/perl-Net-SMTP-SSL-src/perl-Net-SMTP-SSL-1.03-1-src
rename to test/testdata/htdocs.expected/x86_64/perl-Net-SMTP-SSL-src/perl-Net-SMTP-SSL-1.03-1-src
diff --git a/test/testdata/htdocs.expected/x86_64/perl-Net-SMTP-SSL/.htaccess b/test/testdata/htdocs.expected/x86_64/perl-Net-SMTP-SSL/.htaccess
new file mode 100644
index 0000000..30662d1
--- /dev/null
+++ b/test/testdata/htdocs.expected/x86_64/perl-Net-SMTP-SSL/.htaccess
@@ -0,0 +1,2 @@
+RedirectMatch temp /packages/x86_64/perl-Net-SMTP-SSL/$ /packages/summary/perl-Net-SMTP-SSL.html
+ForceType text/html
diff --git a/test/testdata/htdocs.expected/x86/perl-Net-SMTP-SSL/perl-Net-SMTP-SSL-1.01-1 b/test/testdata/htdocs.expected/x86_64/perl-Net-SMTP-SSL/perl-Net-SMTP-SSL-1.01-1
similarity index 100%
rename from test/testdata/htdocs.expected/x86/perl-Net-SMTP-SSL/perl-Net-SMTP-SSL-1.01-1
rename to test/testdata/htdocs.expected/x86_64/perl-Net-SMTP-SSL/perl-Net-SMTP-SSL-1.01-1
diff --git a/test/testdata/htdocs.expected/x86/perl-Net-SMTP-SSL/perl-Net-SMTP-SSL-1.01-1-src b/test/testdata/htdocs.expected/x86_64/perl-Net-SMTP-SSL/perl-Net-SMTP-SSL-1.01-1-src
similarity index 100%
rename from test/testdata/htdocs.expected/x86/perl-Net-SMTP-SSL/perl-Net-SMTP-SSL-1.01-1-src
rename to test/testdata/htdocs.expected/x86_64/perl-Net-SMTP-SSL/perl-Net-SMTP-SSL-1.01-1-src
diff --git a/test/testdata/htdocs.expected/x86/perl-Net-SMTP-SSL/perl-Net-SMTP-SSL-1.02-1 b/test/testdata/htdocs.expected/x86_64/perl-Net-SMTP-SSL/perl-Net-SMTP-SSL-1.02-1
similarity index 100%
rename from test/testdata/htdocs.expected/x86/perl-Net-SMTP-SSL/perl-Net-SMTP-SSL-1.02-1
rename to test/testdata/htdocs.expected/x86_64/perl-Net-SMTP-SSL/perl-Net-SMTP-SSL-1.02-1
diff --git a/test/testdata/htdocs.expected/x86/perl-Net-SMTP-SSL/perl-Net-SMTP-SSL-1.02-1-src b/test/testdata/htdocs.expected/x86_64/perl-Net-SMTP-SSL/perl-Net-SMTP-SSL-1.02-1-src
similarity index 100%
rename from test/testdata/htdocs.expected/x86/perl-Net-SMTP-SSL/perl-Net-SMTP-SSL-1.02-1-src
rename to test/testdata/htdocs.expected/x86_64/perl-Net-SMTP-SSL/perl-Net-SMTP-SSL-1.02-1-src
diff --git a/test/testdata/htdocs.expected/x86/perl-Net-SMTP-SSL/perl-Net-SMTP-SSL-1.03-1 b/test/testdata/htdocs.expected/x86_64/perl-Net-SMTP-SSL/perl-Net-SMTP-SSL-1.03-1
similarity index 100%
rename from test/testdata/htdocs.expected/x86/perl-Net-SMTP-SSL/perl-Net-SMTP-SSL-1.03-1
rename to test/testdata/htdocs.expected/x86_64/perl-Net-SMTP-SSL/perl-Net-SMTP-SSL-1.03-1
diff --git a/test/testdata/htdocs.expected/x86/perl-Net-SMTP-SSL/perl-Net-SMTP-SSL-1.03-1-src b/test/testdata/htdocs.expected/x86_64/perl-Net-SMTP-SSL/perl-Net-SMTP-SSL-1.03-1-src
similarity index 100%
rename from test/testdata/htdocs.expected/x86/perl-Net-SMTP-SSL/perl-Net-SMTP-SSL-1.03-1-src
rename to test/testdata/htdocs.expected/x86_64/perl-Net-SMTP-SSL/perl-Net-SMTP-SSL-1.03-1-src
diff --git a/test/testdata/htdocs.expected/x86/proj-debuginfo/.htaccess b/test/testdata/htdocs.expected/x86_64/proj-debuginfo/.htaccess
similarity index 100%
rename from test/testdata/htdocs.expected/x86/proj-debuginfo/.htaccess
rename to test/testdata/htdocs.expected/x86_64/proj-debuginfo/.htaccess
diff --git a/test/testdata/htdocs.expected/x86/proj-debuginfo/proj-debuginfo-4.8.0-1 b/test/testdata/htdocs.expected/x86_64/proj-debuginfo/proj-debuginfo-4.8.0-1
similarity index 100%
rename from test/testdata/htdocs.expected/x86/proj-debuginfo/proj-debuginfo-4.8.0-1
rename to test/testdata/htdocs.expected/x86_64/proj-debuginfo/proj-debuginfo-4.8.0-1
diff --git a/test/testdata/htdocs.expected/x86_64/rpm-doc-src/.htaccess b/test/testdata/htdocs.expected/x86_64/rpm-doc-src/.htaccess
new file mode 100644
index 0000000..afea2d3
--- /dev/null
+++ b/test/testdata/htdocs.expected/x86_64/rpm-doc-src/.htaccess
@@ -0,0 +1,2 @@
+RedirectMatch temp /packages/x86_64/rpm-doc-src/$ /packages/summary/rpm-doc-src.html
+ForceType text/html
diff --git a/test/testdata/htdocs.expected/x86/rpm-doc-src/rpm-doc-4.1-2-src b/test/testdata/htdocs.expected/x86_64/rpm-doc-src/rpm-doc-4.1-2-src
similarity index 100%
rename from test/testdata/htdocs.expected/x86/rpm-doc-src/rpm-doc-4.1-2-src
rename to test/testdata/htdocs.expected/x86_64/rpm-doc-src/rpm-doc-4.1-2-src
diff --git a/test/testdata/htdocs.expected/x86_64/rpm-doc/.htaccess b/test/testdata/htdocs.expected/x86_64/rpm-doc/.htaccess
new file mode 100644
index 0000000..bd25abd
--- /dev/null
+++ b/test/testdata/htdocs.expected/x86_64/rpm-doc/.htaccess
@@ -0,0 +1,2 @@
+RedirectMatch temp /packages/x86_64/rpm-doc/$ /packages/summary/rpm-doc.html
+ForceType text/html
diff --git a/test/testdata/htdocs.expected/x86/rpm-doc/rpm-doc-4.1-2 b/test/testdata/htdocs.expected/x86_64/rpm-doc/rpm-doc-4.1-2
similarity index 100%
rename from test/testdata/htdocs.expected/x86/rpm-doc/rpm-doc-4.1-2
rename to test/testdata/htdocs.expected/x86_64/rpm-doc/rpm-doc-4.1-2
diff --git a/test/testdata/htdocs.expected/x86/rpm-doc/rpm-doc-4.1-2-src b/test/testdata/htdocs.expected/x86_64/rpm-doc/rpm-doc-4.1-2-src
similarity index 100%
rename from test/testdata/htdocs.expected/x86/rpm-doc/rpm-doc-4.1-2-src
rename to test/testdata/htdocs.expected/x86_64/rpm-doc/rpm-doc-4.1-2-src
diff --git a/test/testdata/htdocs.expected/x86/rpm-doc/rpm-doc-999-1 b/test/testdata/htdocs.expected/x86_64/rpm-doc/rpm-doc-999-1
similarity index 100%
rename from test/testdata/htdocs.expected/x86/rpm-doc/rpm-doc-999-1
rename to test/testdata/htdocs.expected/x86_64/rpm-doc/rpm-doc-999-1
diff --git a/test/testdata/htdocs.expected/x86_64/staleversion-src/.htaccess b/test/testdata/htdocs.expected/x86_64/staleversion-src/.htaccess
new file mode 100644
index 0000000..223261d
--- /dev/null
+++ b/test/testdata/htdocs.expected/x86_64/staleversion-src/.htaccess
@@ -0,0 +1,2 @@
+RedirectMatch temp /packages/x86_64/staleversion-src/$ /packages/summary/staleversion-src.html
+ForceType text/html
diff --git a/test/testdata/htdocs.expected/x86/staleversion-src/staleversion-240-1-src b/test/testdata/htdocs.expected/x86_64/staleversion-src/staleversion-240-1-src
similarity index 100%
rename from test/testdata/htdocs.expected/x86/staleversion-src/staleversion-240-1-src
rename to test/testdata/htdocs.expected/x86_64/staleversion-src/staleversion-240-1-src
diff --git a/test/testdata/htdocs.expected/x86/staleversion-src/staleversion-242-0-src b/test/testdata/htdocs.expected/x86_64/staleversion-src/staleversion-242-0-src
similarity index 100%
rename from test/testdata/htdocs.expected/x86/staleversion-src/staleversion-242-0-src
rename to test/testdata/htdocs.expected/x86_64/staleversion-src/staleversion-242-0-src
diff --git a/test/testdata/htdocs.expected/x86/staleversion-src/staleversion-243-0-src b/test/testdata/htdocs.expected/x86_64/staleversion-src/staleversion-243-0-src
similarity index 100%
rename from test/testdata/htdocs.expected/x86/staleversion-src/staleversion-243-0-src
rename to test/testdata/htdocs.expected/x86_64/staleversion-src/staleversion-243-0-src
diff --git a/test/testdata/htdocs.expected/x86/staleversion-src/staleversion-250-0-src b/test/testdata/htdocs.expected/x86_64/staleversion-src/staleversion-250-0-src
similarity index 100%
rename from test/testdata/htdocs.expected/x86/staleversion-src/staleversion-250-0-src
rename to test/testdata/htdocs.expected/x86_64/staleversion-src/staleversion-250-0-src
diff --git a/test/testdata/htdocs.expected/x86/staleversion-src/staleversion-251-0-src b/test/testdata/htdocs.expected/x86_64/staleversion-src/staleversion-251-0-src
similarity index 100%
rename from test/testdata/htdocs.expected/x86/staleversion-src/staleversion-251-0-src
rename to test/testdata/htdocs.expected/x86_64/staleversion-src/staleversion-251-0-src
diff --git a/test/testdata/htdocs.expected/x86/staleversion-src/staleversion-260-0-src b/test/testdata/htdocs.expected/x86_64/staleversion-src/staleversion-260-0-src
similarity index 100%
rename from test/testdata/htdocs.expected/x86/staleversion-src/staleversion-260-0-src
rename to test/testdata/htdocs.expected/x86_64/staleversion-src/staleversion-260-0-src
diff --git a/test/testdata/htdocs.expected/x86_64/staleversion/.htaccess b/test/testdata/htdocs.expected/x86_64/staleversion/.htaccess
new file mode 100644
index 0000000..3a5a5d8
--- /dev/null
+++ b/test/testdata/htdocs.expected/x86_64/staleversion/.htaccess
@@ -0,0 +1,2 @@
+RedirectMatch temp /packages/x86_64/staleversion/$ /packages/summary/staleversion.html
+ForceType text/html
diff --git a/test/testdata/htdocs.expected/x86/staleversion/staleversion-240-1 b/test/testdata/htdocs.expected/x86_64/staleversion/staleversion-240-1
similarity index 100%
rename from test/testdata/htdocs.expected/x86/staleversion/staleversion-240-1
rename to test/testdata/htdocs.expected/x86_64/staleversion/staleversion-240-1
diff --git a/test/testdata/htdocs.expected/x86/staleversion/staleversion-240-1-src b/test/testdata/htdocs.expected/x86_64/staleversion/staleversion-240-1-src
similarity index 100%
rename from test/testdata/htdocs.expected/x86/staleversion/staleversion-240-1-src
rename to test/testdata/htdocs.expected/x86_64/staleversion/staleversion-240-1-src
diff --git a/test/testdata/htdocs.expected/x86/staleversion/staleversion-242-0 b/test/testdata/htdocs.expected/x86_64/staleversion/staleversion-242-0
similarity index 100%
rename from test/testdata/htdocs.expected/x86/staleversion/staleversion-242-0
rename to test/testdata/htdocs.expected/x86_64/staleversion/staleversion-242-0
diff --git a/test/testdata/htdocs.expected/x86/staleversion/staleversion-242-0-src b/test/testdata/htdocs.expected/x86_64/staleversion/staleversion-242-0-src
similarity index 100%
rename from test/testdata/htdocs.expected/x86/staleversion/staleversion-242-0-src
rename to test/testdata/htdocs.expected/x86_64/staleversion/staleversion-242-0-src
diff --git a/test/testdata/htdocs.expected/x86/staleversion/staleversion-243-0 b/test/testdata/htdocs.expected/x86_64/staleversion/staleversion-243-0
similarity index 100%
rename from test/testdata/htdocs.expected/x86/staleversion/staleversion-243-0
rename to test/testdata/htdocs.expected/x86_64/staleversion/staleversion-243-0
diff --git a/test/testdata/htdocs.expected/x86/staleversion/staleversion-243-0-src b/test/testdata/htdocs.expected/x86_64/staleversion/staleversion-243-0-src
similarity index 100%
rename from test/testdata/htdocs.expected/x86/staleversion/staleversion-243-0-src
rename to test/testdata/htdocs.expected/x86_64/staleversion/staleversion-243-0-src
diff --git a/test/testdata/htdocs.expected/x86/staleversion/staleversion-250-0 b/test/testdata/htdocs.expected/x86_64/staleversion/staleversion-250-0
similarity index 100%
rename from test/testdata/htdocs.expected/x86/staleversion/staleversion-250-0
rename to test/testdata/htdocs.expected/x86_64/staleversion/staleversion-250-0
diff --git a/test/testdata/htdocs.expected/x86/staleversion/staleversion-250-0-src b/test/testdata/htdocs.expected/x86_64/staleversion/staleversion-250-0-src
similarity index 100%
rename from test/testdata/htdocs.expected/x86/staleversion/staleversion-250-0-src
rename to test/testdata/htdocs.expected/x86_64/staleversion/staleversion-250-0-src
diff --git a/test/testdata/htdocs.expected/x86/staleversion/staleversion-251-0 b/test/testdata/htdocs.expected/x86_64/staleversion/staleversion-251-0
similarity index 100%
rename from test/testdata/htdocs.expected/x86/staleversion/staleversion-251-0
rename to test/testdata/htdocs.expected/x86_64/staleversion/staleversion-251-0
diff --git a/test/testdata/htdocs.expected/x86/staleversion/staleversion-251-0-src b/test/testdata/htdocs.expected/x86_64/staleversion/staleversion-251-0-src
similarity index 100%
rename from test/testdata/htdocs.expected/x86/staleversion/staleversion-251-0-src
rename to test/testdata/htdocs.expected/x86_64/staleversion/staleversion-251-0-src
diff --git a/test/testdata/htdocs.expected/x86/staleversion/staleversion-260-0 b/test/testdata/htdocs.expected/x86_64/staleversion/staleversion-260-0
similarity index 100%
rename from test/testdata/htdocs.expected/x86/staleversion/staleversion-260-0
rename to test/testdata/htdocs.expected/x86_64/staleversion/staleversion-260-0
diff --git a/test/testdata/htdocs.expected/x86/staleversion/staleversion-260-0-src b/test/testdata/htdocs.expected/x86_64/staleversion/staleversion-260-0-src
similarity index 100%
rename from test/testdata/htdocs.expected/x86/staleversion/staleversion-260-0-src
rename to test/testdata/htdocs.expected/x86_64/staleversion/staleversion-260-0-src
diff --git a/test/testdata/htdocs.expected/x86_64/test-c-src/.htaccess b/test/testdata/htdocs.expected/x86_64/test-c-src/.htaccess
new file mode 100644
index 0000000..3a6cda7
--- /dev/null
+++ b/test/testdata/htdocs.expected/x86_64/test-c-src/.htaccess
@@ -0,0 +1,2 @@
+RedirectMatch temp /packages/x86_64/test-c-src/$ /packages/summary/test-c-src.html
+ForceType text/html
diff --git a/test/testdata/htdocs.expected/x86/test-c-src/test-c-1.0-1-src b/test/testdata/htdocs.expected/x86_64/test-c-src/test-c-1.0-1-src
similarity index 100%
rename from test/testdata/htdocs.expected/x86/test-c-src/test-c-1.0-1-src
rename to test/testdata/htdocs.expected/x86_64/test-c-src/test-c-1.0-1-src
diff --git a/test/testdata/htdocs.expected/x86_64/test-c/.htaccess b/test/testdata/htdocs.expected/x86_64/test-c/.htaccess
new file mode 100644
index 0000000..6a259a6
--- /dev/null
+++ b/test/testdata/htdocs.expected/x86_64/test-c/.htaccess
@@ -0,0 +1,2 @@
+RedirectMatch temp /packages/x86_64/test-c/$ /packages/summary/test-c.html
+ForceType text/html
diff --git a/test/testdata/htdocs.expected/x86/test-c/test-c-1.0-1 b/test/testdata/htdocs.expected/x86_64/test-c/test-c-1.0-1
similarity index 100%
rename from test/testdata/htdocs.expected/x86/test-c/test-c-1.0-1
rename to test/testdata/htdocs.expected/x86_64/test-c/test-c-1.0-1
diff --git a/test/testdata/htdocs.expected/x86/test-c/test-c-1.0-1-src b/test/testdata/htdocs.expected/x86_64/test-c/test-c-1.0-1-src
similarity index 100%
rename from test/testdata/htdocs.expected/x86/test-c/test-c-1.0-1-src
rename to test/testdata/htdocs.expected/x86_64/test-c/test-c-1.0-1-src
diff --git a/test/testdata/htdocs.expected/x86_64/test-d-src/.htaccess b/test/testdata/htdocs.expected/x86_64/test-d-src/.htaccess
new file mode 100644
index 0000000..ccad7c2
--- /dev/null
+++ b/test/testdata/htdocs.expected/x86_64/test-d-src/.htaccess
@@ -0,0 +1,2 @@
+RedirectMatch temp /packages/x86_64/test-d-src/$ /packages/summary/test-d-src.html
+ForceType text/html
diff --git a/test/testdata/htdocs.expected/x86/test-d-src/test-d-1.0-1-src b/test/testdata/htdocs.expected/x86_64/test-d-src/test-d-1.0-1-src
similarity index 100%
rename from test/testdata/htdocs.expected/x86/test-d-src/test-d-1.0-1-src
rename to test/testdata/htdocs.expected/x86_64/test-d-src/test-d-1.0-1-src
diff --git a/test/testdata/htdocs.expected/x86_64/test-d/.htaccess b/test/testdata/htdocs.expected/x86_64/test-d/.htaccess
new file mode 100644
index 0000000..27b0b34
--- /dev/null
+++ b/test/testdata/htdocs.expected/x86_64/test-d/.htaccess
@@ -0,0 +1,2 @@
+RedirectMatch temp /packages/x86_64/test-d/$ /packages/summary/test-d.html
+ForceType text/html
diff --git a/test/testdata/htdocs.expected/x86/test-d/test-d-1.0-1 b/test/testdata/htdocs.expected/x86_64/test-d/test-d-1.0-1
similarity index 100%
rename from test/testdata/htdocs.expected/x86/test-d/test-d-1.0-1
rename to test/testdata/htdocs.expected/x86_64/test-d/test-d-1.0-1
diff --git a/test/testdata/htdocs.expected/x86/test-d/test-d-1.0-1-src b/test/testdata/htdocs.expected/x86_64/test-d/test-d-1.0-1-src
similarity index 100%
rename from test/testdata/htdocs.expected/x86/test-d/test-d-1.0-1-src
rename to test/testdata/htdocs.expected/x86_64/test-d/test-d-1.0-1-src
diff --git a/test/testdata/htdocs.expected/x86_64/test-e-src/.htaccess b/test/testdata/htdocs.expected/x86_64/test-e-src/.htaccess
new file mode 100644
index 0000000..71e2bac
--- /dev/null
+++ b/test/testdata/htdocs.expected/x86_64/test-e-src/.htaccess
@@ -0,0 +1,2 @@
+RedirectMatch temp /packages/x86_64/test-e-src/$ /packages/summary/test-e-src.html
+ForceType text/html
diff --git a/test/testdata/htdocs.expected/x86/test-e-src/test-e-1.0-1-src b/test/testdata/htdocs.expected/x86_64/test-e-src/test-e-1.0-1-src
similarity index 100%
rename from test/testdata/htdocs.expected/x86/test-e-src/test-e-1.0-1-src
rename to test/testdata/htdocs.expected/x86_64/test-e-src/test-e-1.0-1-src
diff --git a/test/testdata/htdocs.expected/x86_64/test-e/.htaccess b/test/testdata/htdocs.expected/x86_64/test-e/.htaccess
new file mode 100644
index 0000000..dbd0a7d
--- /dev/null
+++ b/test/testdata/htdocs.expected/x86_64/test-e/.htaccess
@@ -0,0 +1,2 @@
+RedirectMatch temp /packages/x86_64/test-e/$ /packages/summary/test-e.html
+ForceType text/html
diff --git a/test/testdata/htdocs.expected/x86/test-e/test-e-1.0-1 b/test/testdata/htdocs.expected/x86_64/test-e/test-e-1.0-1
similarity index 100%
rename from test/testdata/htdocs.expected/x86/test-e/test-e-1.0-1
rename to test/testdata/htdocs.expected/x86_64/test-e/test-e-1.0-1
diff --git a/test/testdata/htdocs.expected/x86/test-e/test-e-1.0-1-src b/test/testdata/htdocs.expected/x86_64/test-e/test-e-1.0-1-src
similarity index 100%
rename from test/testdata/htdocs.expected/x86/test-e/test-e-1.0-1-src
rename to test/testdata/htdocs.expected/x86_64/test-e/test-e-1.0-1-src
diff --git a/test/testdata/htdocs.expected/x86_64/testpackage-src/.htaccess b/test/testdata/htdocs.expected/x86_64/testpackage-src/.htaccess
new file mode 100644
index 0000000..f3e4385
--- /dev/null
+++ b/test/testdata/htdocs.expected/x86_64/testpackage-src/.htaccess
@@ -0,0 +1,2 @@
+RedirectMatch temp /packages/x86_64/testpackage-src/$ /packages/summary/testpackage-src.html
+ForceType text/html
diff --git a/test/testdata/htdocs.expected/x86/testpackage-src/testpackage-0.1-1-src b/test/testdata/htdocs.expected/x86_64/testpackage-src/testpackage-0.1-1-src
similarity index 100%
rename from test/testdata/htdocs.expected/x86/testpackage-src/testpackage-0.1-1-src
rename to test/testdata/htdocs.expected/x86_64/testpackage-src/testpackage-0.1-1-src
diff --git a/test/testdata/htdocs.expected/x86_64/testpackage/.htaccess b/test/testdata/htdocs.expected/x86_64/testpackage/.htaccess
new file mode 100644
index 0000000..d5b6c9f
--- /dev/null
+++ b/test/testdata/htdocs.expected/x86_64/testpackage/.htaccess
@@ -0,0 +1,2 @@
+RedirectMatch temp /packages/x86_64/testpackage/$ /packages/summary/testpackage.html
+ForceType text/html
diff --git a/test/testdata/htdocs.expected/x86/testpackage/testpackage-0.1-1 b/test/testdata/htdocs.expected/x86_64/testpackage/testpackage-0.1-1
similarity index 100%
rename from test/testdata/htdocs.expected/x86/testpackage/testpackage-0.1-1
rename to test/testdata/htdocs.expected/x86_64/testpackage/testpackage-0.1-1
diff --git a/test/testdata/htdocs.expected/x86/testpackage/testpackage-0.1-1-src b/test/testdata/htdocs.expected/x86_64/testpackage/testpackage-0.1-1-src
similarity index 100%
rename from test/testdata/htdocs.expected/x86/testpackage/testpackage-0.1-1-src
rename to test/testdata/htdocs.expected/x86_64/testpackage/testpackage-0.1-1-src
diff --git a/test/testdata/inifile/setup.ini.expected b/test/testdata/inifile/setup.ini.expected
index aaf6805..4e6b989 100644
--- a/test/testdata/inifile/setup.ini.expected
+++ b/test/testdata/inifile/setup.ini.expected
@@ -6,7 +6,7 @@
  '# See https://sourceware.org/cygwin-apps/setup.ini.html for a description\n'
  '# of the format.\n'
  'release: testing\n'
- 'arch: x86\n'
+ 'arch: x86_64\n'
  'setup-timestamp: 1458221800\n'
  'include-setup: setup <2.878 not supported\n'
  'setup-minimum-version: 2.903\n'
@@ -22,9 +22,9 @@
  'the best of packing, squeezing, or crunching is used."\n'
  'category: Archive\n'
  'version: 4.32.7-10\n'
- 'install: x86/release/arc/arc-4.32.7-10.tar.bz2 782 '
+ 'install: x86_64/release/arc/arc-4.32.7-10.tar.bz2 782 '
  '76e134c85d92f80689cc6f688ff0593f142a963a40ec0c2d9ddcf1dcbdc5ae924677e40b71ac2380f09ae174ba94cc6e1117cdf3282b2ae18a51b5392bafd8c3\n'
- 'source: x86/release/arc/arc-4.32.7-10-src.tar.bz2 782 '
+ 'source: x86_64/release/arc/arc-4.32.7-10-src.tar.bz2 782 '
  '76e134c85d92f80689cc6f688ff0593f142a963a40ec0c2d9ddcf1dcbdc5ae924677e40b71ac2380f09ae174ba94cc6e1117cdf3282b2ae18a51b5392bafd8c3\n'
  '\n'
  '@ base-cygwin\n'
@@ -32,12 +32,12 @@
  'ldesc: "Initial base installation helper script."\n'
  'category: Base\n'
  'version: 3.8-1\n'
- 'install: x86/release/base-cygwin/base-cygwin-3.8-1.tar.xz 228 '
+ 'install: x86_64/release/base-cygwin/base-cygwin-3.8-1.tar.xz 228 '
  'e675b0ac4bc2c3e1c4971bc56d77b0cd53a9bdf5632873a235d7582e29dfd3e8a7bb04b28f6cdee3e6b3d14c25ed39392538e3f628a9bfda6c905646ebc3c225\n'
  'depends2: cygwin-api0_291\n'
  '[prev]\n'
  'version: 3.6-1\n'
- 'install: x86/release/base-cygwin/base-cygwin-3.6-1.tar.xz 228 '
+ 'install: x86_64/release/base-cygwin/base-cygwin-3.6-1.tar.xz 228 '
  'e675b0ac4bc2c3e1c4971bc56d77b0cd53a9bdf5632873a235d7582e29dfd3e8a7bb04b28f6cdee3e6b3d14c25ed39392538e3f628a9bfda6c905646ebc3c225\n'
  '\n'
  '@ corrupt\n'
@@ -45,9 +45,9 @@
  'ldesc: "A package containing corrupt archives"\n'
  'category: Devel\n'
  'version: 2.0.0-1\n'
- 'install: x86/release/corrupt/corrupt-2.0.0-1.tar.xz 128 '
+ 'install: x86_64/release/corrupt/corrupt-2.0.0-1.tar.xz 128 '
  '1f7a858f21049e9b13b8f4bbb9325582a304c8829d67c7cd302a33d78bc59808b6a84a0f6f19c87cc3c331aeaa60613437d35b0bae3390a78fd9118ac156d3f1\n'
- 'source: x86/release/corrupt/corrupt-2.0.0-1-src.tar.xz 362012 '
+ 'source: x86_64/release/corrupt/corrupt-2.0.0-1-src.tar.xz 362012 '
  '26a2a77ce2ab0691bbd20b720d34285dcf814888649810a70edadf398b7dca264dba7ba4449f51f20f2d1cd9617844919e2f2718b6014b37ab564d2463cc366b\n'
  '\n'
  '@ cygwin\n'
@@ -55,23 +55,23 @@
  'ldesc: "The UNIX emulation engine"\n'
  'category: Base\n'
  'version: 2.2.1-1\n'
- 'install: x86/release/cygwin/cygwin-2.2.1-1.tar.xz 228 '
+ 'install: x86_64/release/cygwin/cygwin-2.2.1-1.tar.xz 228 '
  'e675b0ac4bc2c3e1c4971bc56d77b0cd53a9bdf5632873a235d7582e29dfd3e8a7bb04b28f6cdee3e6b3d14c25ed39392538e3f628a9bfda6c905646ebc3c225\n'
- 'source: x86/release/cygwin/cygwin-2.2.1-1-src.tar.xz 228 '
+ 'source: x86_64/release/cygwin/cygwin-2.2.1-1-src.tar.xz 228 '
  'e675b0ac4bc2c3e1c4971bc56d77b0cd53a9bdf5632873a235d7582e29dfd3e8a7bb04b28f6cdee3e6b3d14c25ed39392538e3f628a9bfda6c905646ebc3c225\n'
  'depends2: base-cygwin\n'
  '[prev]\n'
  'version: 2.2.0-1\n'
- 'install: x86/release/cygwin/cygwin-2.2.0-1.tar.xz 228 '
+ 'install: x86_64/release/cygwin/cygwin-2.2.0-1.tar.xz 228 '
  'e675b0ac4bc2c3e1c4971bc56d77b0cd53a9bdf5632873a235d7582e29dfd3e8a7bb04b28f6cdee3e6b3d14c25ed39392538e3f628a9bfda6c905646ebc3c225\n'
- 'source: x86/release/cygwin/cygwin-2.2.0-1-src.tar.xz 228 '
+ 'source: x86_64/release/cygwin/cygwin-2.2.0-1-src.tar.xz 228 '
  'e675b0ac4bc2c3e1c4971bc56d77b0cd53a9bdf5632873a235d7582e29dfd3e8a7bb04b28f6cdee3e6b3d14c25ed39392538e3f628a9bfda6c905646ebc3c225\n'
  'depends2: base-cygwin\n'
  '[test]\n'
  'version: 2.3.0-0.3\n'
- 'install: x86/release/cygwin/cygwin-2.3.0-0.3.tar.xz 228 '
+ 'install: x86_64/release/cygwin/cygwin-2.3.0-0.3.tar.xz 228 '
  'e675b0ac4bc2c3e1c4971bc56d77b0cd53a9bdf5632873a235d7582e29dfd3e8a7bb04b28f6cdee3e6b3d14c25ed39392538e3f628a9bfda6c905646ebc3c225\n'
- 'source: x86/release/cygwin/cygwin-2.3.0-0.3-src.tar.xz 228 '
+ 'source: x86_64/release/cygwin/cygwin-2.3.0-0.3-src.tar.xz 228 '
  'e675b0ac4bc2c3e1c4971bc56d77b0cd53a9bdf5632873a235d7582e29dfd3e8a7bb04b28f6cdee3e6b3d14c25ed39392538e3f628a9bfda6c905646ebc3c225\n'
  'depends2: _windows ( >= 6.0 ), base-cygwin\n'
  'provides: cygwin-api0_291\n'
@@ -83,23 +83,23 @@
  'cygwin package with gdb."\n'
  'category: Debug\n'
  'version: 2.2.1-1\n'
- 'install: x86/release/cygwin/cygwin-debuginfo/cygwin-debuginfo-2.2.1-1.tar.xz 228 '
+ 'install: x86_64/release/cygwin/cygwin-debuginfo/cygwin-debuginfo-2.2.1-1.tar.xz 228 '
  'e675b0ac4bc2c3e1c4971bc56d77b0cd53a9bdf5632873a235d7582e29dfd3e8a7bb04b28f6cdee3e6b3d14c25ed39392538e3f628a9bfda6c905646ebc3c225\n'
- 'source: x86/release/cygwin/cygwin-2.2.1-1-src.tar.xz 228 '
+ 'source: x86_64/release/cygwin/cygwin-2.2.1-1-src.tar.xz 228 '
  'e675b0ac4bc2c3e1c4971bc56d77b0cd53a9bdf5632873a235d7582e29dfd3e8a7bb04b28f6cdee3e6b3d14c25ed39392538e3f628a9bfda6c905646ebc3c225\n'
  'depends2: cygwin-debuginfo\n'
  '[prev]\n'
  'version: 2.2.0-1\n'
- 'install: x86/release/cygwin/cygwin-debuginfo/cygwin-debuginfo-2.2.0-1.tar.xz 228 '
+ 'install: x86_64/release/cygwin/cygwin-debuginfo/cygwin-debuginfo-2.2.0-1.tar.xz 228 '
  'e675b0ac4bc2c3e1c4971bc56d77b0cd53a9bdf5632873a235d7582e29dfd3e8a7bb04b28f6cdee3e6b3d14c25ed39392538e3f628a9bfda6c905646ebc3c225\n'
- 'source: x86/release/cygwin/cygwin-2.2.0-1-src.tar.xz 228 '
+ 'source: x86_64/release/cygwin/cygwin-2.2.0-1-src.tar.xz 228 '
  'e675b0ac4bc2c3e1c4971bc56d77b0cd53a9bdf5632873a235d7582e29dfd3e8a7bb04b28f6cdee3e6b3d14c25ed39392538e3f628a9bfda6c905646ebc3c225\n'
  'depends2: cygwin-debuginfo\n'
  '[test]\n'
  'version: 2.3.0-0.3\n'
- 'install: x86/release/cygwin/cygwin-debuginfo/cygwin-debuginfo-2.3.0-0.3.tar.xz 228 '
+ 'install: x86_64/release/cygwin/cygwin-debuginfo/cygwin-debuginfo-2.3.0-0.3.tar.xz 228 '
  'e675b0ac4bc2c3e1c4971bc56d77b0cd53a9bdf5632873a235d7582e29dfd3e8a7bb04b28f6cdee3e6b3d14c25ed39392538e3f628a9bfda6c905646ebc3c225\n'
- 'source: x86/release/cygwin/cygwin-2.3.0-0.3-src.tar.xz 228 '
+ 'source: x86_64/release/cygwin/cygwin-2.3.0-0.3-src.tar.xz 228 '
  'e675b0ac4bc2c3e1c4971bc56d77b0cd53a9bdf5632873a235d7582e29dfd3e8a7bb04b28f6cdee3e6b3d14c25ed39392538e3f628a9bfda6c905646ebc3c225\n'
  'depends2: cygwin-debuginfo\n'
  '\n'
@@ -108,21 +108,21 @@
  'ldesc: "Core development files required to build Cygwin packages"\n'
  'category: Devel\n'
  'version: 2.2.1-1\n'
- 'install: x86/release/cygwin/cygwin-devel/cygwin-devel-2.2.1-1.tar.xz 228 '
+ 'install: x86_64/release/cygwin/cygwin-devel/cygwin-devel-2.2.1-1.tar.xz 228 '
  'e675b0ac4bc2c3e1c4971bc56d77b0cd53a9bdf5632873a235d7582e29dfd3e8a7bb04b28f6cdee3e6b3d14c25ed39392538e3f628a9bfda6c905646ebc3c225\n'
- 'source: x86/release/cygwin/cygwin-2.2.1-1-src.tar.xz 228 '
+ 'source: x86_64/release/cygwin/cygwin-2.2.1-1-src.tar.xz 228 '
  'e675b0ac4bc2c3e1c4971bc56d77b0cd53a9bdf5632873a235d7582e29dfd3e8a7bb04b28f6cdee3e6b3d14c25ed39392538e3f628a9bfda6c905646ebc3c225\n'
  '[prev]\n'
  'version: 2.2.0-1\n'
- 'install: x86/release/cygwin/cygwin-devel/cygwin-devel-2.2.0-1.tar.xz 228 '
+ 'install: x86_64/release/cygwin/cygwin-devel/cygwin-devel-2.2.0-1.tar.xz 228 '
  'e675b0ac4bc2c3e1c4971bc56d77b0cd53a9bdf5632873a235d7582e29dfd3e8a7bb04b28f6cdee3e6b3d14c25ed39392538e3f628a9bfda6c905646ebc3c225\n'
- 'source: x86/release/cygwin/cygwin-2.2.0-1-src.tar.xz 228 '
+ 'source: x86_64/release/cygwin/cygwin-2.2.0-1-src.tar.xz 228 '
  'e675b0ac4bc2c3e1c4971bc56d77b0cd53a9bdf5632873a235d7582e29dfd3e8a7bb04b28f6cdee3e6b3d14c25ed39392538e3f628a9bfda6c905646ebc3c225\n'
  '[test]\n'
  'version: 2.3.0-0.3\n'
- 'install: x86/release/cygwin/cygwin-devel/cygwin-devel-2.3.0-0.3.tar.xz 228 '
+ 'install: x86_64/release/cygwin/cygwin-devel/cygwin-devel-2.3.0-0.3.tar.xz 228 '
  'e675b0ac4bc2c3e1c4971bc56d77b0cd53a9bdf5632873a235d7582e29dfd3e8a7bb04b28f6cdee3e6b3d14c25ed39392538e3f628a9bfda6c905646ebc3c225\n'
- 'source: x86/release/cygwin/cygwin-2.3.0-0.3-src.tar.xz 228 '
+ 'source: x86_64/release/cygwin/cygwin-2.3.0-0.3-src.tar.xz 228 '
  'e675b0ac4bc2c3e1c4971bc56d77b0cd53a9bdf5632873a235d7582e29dfd3e8a7bb04b28f6cdee3e6b3d14c25ed39392538e3f628a9bfda6c905646ebc3c225\n'
  '\n'
  '@ keychain\n'
@@ -138,16 +138,16 @@
  'necessary"\n'
  'category: Utils\n'
  'version: 2.7.1-1\n'
- 'install: x86/release/keychain/keychain-2.7.1-1.tar.bz2 32219 '
+ 'install: x86_64/release/keychain/keychain-2.7.1-1.tar.bz2 32219 '
  '0c7b7ad2636b6e23e40e8cb593196b3fabe9c44f7618ea9b2021b89ecdc08720a7f824be0beaa75c9e62dda9a7b5ed7e9c1ed147a1875c582e80866ad09533a2\n'
- 'source: x86/release/keychain/keychain-2.7.1-1-src.tar.bz2 134875 '
+ 'source: x86_64/release/keychain/keychain-2.7.1-1-src.tar.bz2 134875 '
  'cef733c5f1ba7380088ce4b12be0a70c3d657fd0e26beae11cf96bbbc2a02c492dafef700adac1059ee643208d76b5f19042e01d9628b2463b916b3dea13aa54\n'
  'depends2: openssh\n'
  '[prev]\n'
  'version: 2.6.8-1\n'
- 'install: x86/release/keychain/keychain-2.6.8-1.tar.bz2 30476 '
+ 'install: x86_64/release/keychain/keychain-2.6.8-1.tar.bz2 30476 '
  '05af40c0fabbd2ea8f8b74719434371a47c7751986fe6411c17e18cda7d03947c5785ed164dfe59b7238831cc10d8e29f4f88bf3414420bd3231423f424c00bd\n'
- 'source: x86/release/keychain/keychain-2.6.8-1-src.tar.bz2 36347 '
+ 'source: x86_64/release/keychain/keychain-2.6.8-1-src.tar.bz2 36347 '
  '2151b73a9ec2ece63a842ddad6de19bcfdf097b86d4cae932eeadfc64640997051254001f31081e80272e020887b9599188990368c833ba10886f0ba32a3415e\n'
  'depends2: openssh\n'
  '\n'
@@ -158,9 +158,9 @@
  'industry standard IP protocols."\n'
  'category: Net\n'
  'version: 379.32.1-1\n'
- 'install: x86/release/mDNSResponder/libdns_sd-devel/libdns_sd-devel-379.32.1-1.tar.bz2 195 '
+ 'install: x86_64/release/mDNSResponder/libdns_sd-devel/libdns_sd-devel-379.32.1-1.tar.bz2 195 '
  'aff488008bee3486e25b539fe6ccd1397bd3c5c0ba2ee2cf34af279554baa195af7493ee51d6f8510735c9a2ea54436d776a71e768165716762aec286abbbf83\n'
- 'source: x86/release/mDNSResponder/mDNSResponder-379.32.1-1-src.tar.bz2 195 '
+ 'source: x86_64/release/mDNSResponder/mDNSResponder-379.32.1-1-src.tar.bz2 195 '
  'aff488008bee3486e25b539fe6ccd1397bd3c5c0ba2ee2cf34af279554baa195af7493ee51d6f8510735c9a2ea54436d776a71e768165716762aec286abbbf83\n'
  'depends2: libdns_sd1\n'
  '\n'
@@ -171,9 +171,9 @@
  'industry standard IP protocols."\n'
  'category: Net\n'
  'version: 379.32.1-1\n'
- 'install: x86/release/mDNSResponder/libdns_sd1/libdns_sd1-379.32.1-1.tar.bz2 195 '
+ 'install: x86_64/release/mDNSResponder/libdns_sd1/libdns_sd1-379.32.1-1.tar.bz2 195 '
  'aff488008bee3486e25b539fe6ccd1397bd3c5c0ba2ee2cf34af279554baa195af7493ee51d6f8510735c9a2ea54436d776a71e768165716762aec286abbbf83\n'
- 'source: x86/release/mDNSResponder/mDNSResponder-379.32.1-1-src.tar.bz2 195 '
+ 'source: x86_64/release/mDNSResponder/mDNSResponder-379.32.1-1-src.tar.bz2 195 '
  'aff488008bee3486e25b539fe6ccd1397bd3c5c0ba2ee2cf34af279554baa195af7493ee51d6f8510735c9a2ea54436d776a71e768165716762aec286abbbf83\n'
  '\n'
  '@ mDNSResponder\n'
@@ -187,9 +187,9 @@
  'a number of popular Windows programs), then you can download it at\n'
  'http://support.apple.com/kb/DL999"\n'
  'version: 379.32.1-1\n'
- 'install: x86/release/mDNSResponder/mDNSResponder-379.32.1-1.tar.bz2 195 '
+ 'install: x86_64/release/mDNSResponder/mDNSResponder-379.32.1-1.tar.bz2 195 '
  'aff488008bee3486e25b539fe6ccd1397bd3c5c0ba2ee2cf34af279554baa195af7493ee51d6f8510735c9a2ea54436d776a71e768165716762aec286abbbf83\n'
- 'source: x86/release/mDNSResponder/mDNSResponder-379.32.1-1-src.tar.bz2 195 '
+ 'source: x86_64/release/mDNSResponder/mDNSResponder-379.32.1-1-src.tar.bz2 195 '
  'aff488008bee3486e25b539fe6ccd1397bd3c5c0ba2ee2cf34af279554baa195af7493ee51d6f8510735c9a2ea54436d776a71e768165716762aec286abbbf83\n'
  'depends2: libdns_sd1\n'
  '\n'
@@ -218,9 +218,9 @@
  '\tproviding encrypted communication between two machines."\n'
  'category: Net\n'
  'version: 7.2p2-1\n'
- 'install: x86/release/openssh/openssh-7.2p2-1.tar.xz 228 '
+ 'install: x86_64/release/openssh/openssh-7.2p2-1.tar.xz 228 '
  'e675b0ac4bc2c3e1c4971bc56d77b0cd53a9bdf5632873a235d7582e29dfd3e8a7bb04b28f6cdee3e6b3d14c25ed39392538e3f628a9bfda6c905646ebc3c225\n'
- 'source: x86/release/openssh/openssh-7.2p2-1-src.tar.xz 228 '
+ 'source: x86_64/release/openssh/openssh-7.2p2-1-src.tar.xz 228 '
  'e675b0ac4bc2c3e1c4971bc56d77b0cd53a9bdf5632873a235d7582e29dfd3e8a7bb04b28f6cdee3e6b3d14c25ed39392538e3f628a9bfda6c905646ebc3c225\n'
  '\n'
  '@ per-version\n'
@@ -228,16 +228,16 @@
  'ldesc: "Per-version hint test package"\n'
  'category: Base\n'
  'version: 4.8-1\n'
- 'install: x86/release/per-version/per-version-4.8-1.tar.xz 228 '
+ 'install: x86_64/release/per-version/per-version-4.8-1.tar.xz 228 '
  'e675b0ac4bc2c3e1c4971bc56d77b0cd53a9bdf5632873a235d7582e29dfd3e8a7bb04b28f6cdee3e6b3d14c25ed39392538e3f628a9bfda6c905646ebc3c225\n'
- 'source: x86/release/per-version/per-version-4.8-1-src.tar.xz 228 '
+ 'source: x86_64/release/per-version/per-version-4.8-1-src.tar.xz 228 '
  'e675b0ac4bc2c3e1c4971bc56d77b0cd53a9bdf5632873a235d7582e29dfd3e8a7bb04b28f6cdee3e6b3d14c25ed39392538e3f628a9bfda6c905646ebc3c225\n'
  'depends2: base-cygwin\n'
  '[prev]\n'
  'version: 4.0-1\n'
- 'install: x86/release/per-version/per-version-4.0-1.tar.xz 228 '
+ 'install: x86_64/release/per-version/per-version-4.0-1.tar.xz 228 '
  'e675b0ac4bc2c3e1c4971bc56d77b0cd53a9bdf5632873a235d7582e29dfd3e8a7bb04b28f6cdee3e6b3d14c25ed39392538e3f628a9bfda6c905646ebc3c225\n'
- 'source: x86/release/per-version/per-version-4.0-1-src.tar.xz 228 '
+ 'source: x86_64/release/per-version/per-version-4.0-1-src.tar.xz 228 '
  'e675b0ac4bc2c3e1c4971bc56d77b0cd53a9bdf5632873a235d7582e29dfd3e8a7bb04b28f6cdee3e6b3d14c25ed39392538e3f628a9bfda6c905646ebc3c225\n'
  'depends2: cygwin\n'
  '\n'
@@ -246,9 +246,9 @@
  'ldesc: "Per-version hint test package"\n'
  'category: Base\n'
  'version: 1.0-1\n'
- 'install: x86/release/per-version-replacement-hint-only/per-version-replacement-hint-only-1.0-1.tar.xz 228 '
+ 'install: x86_64/release/per-version-replacement-hint-only/per-version-replacement-hint-only-1.0-1.tar.xz 228 '
  'e675b0ac4bc2c3e1c4971bc56d77b0cd53a9bdf5632873a235d7582e29dfd3e8a7bb04b28f6cdee3e6b3d14c25ed39392538e3f628a9bfda6c905646ebc3c225\n'
- 'source: x86/release/per-version-replacement-hint-only/per-version-replacement-hint-only-1.0-1-src.tar.xz 228 '
+ 'source: x86_64/release/per-version-replacement-hint-only/per-version-replacement-hint-only-1.0-1-src.tar.xz 228 '
  'e675b0ac4bc2c3e1c4971bc56d77b0cd53a9bdf5632873a235d7582e29dfd3e8a7bb04b28f6cdee3e6b3d14c25ed39392538e3f628a9bfda6c905646ebc3c225\n'
  'depends2: cygwin\n'
  '\n'
@@ -279,13 +279,13 @@
  'sdesc: "Obsolete package for RPM package management system manual pages (extra text to so repr is not one line)"\n'
  'category: _obsolete\n'
  'version: 999-1\n'
- 'install: x86/release/rpm-doc/rpm-doc-999-1.tar.bz2 42 '
+ 'install: x86_64/release/rpm-doc/rpm-doc-999-1.tar.bz2 42 '
  '28c70b843fe01d90a3eeab4a3617551d236cd0b7d69668d1b1b6c8b14a9fd050e4039c192894c93bdf31575771c58c1fea2a41c24c8da22d10080d8b032b6369\n'
  '[prev]\n'
  'version: 4.1-2\n'
- 'install: x86/release/rpm-doc/rpm-doc-4.1-2.tar.bz2 50941 '
+ 'install: x86_64/release/rpm-doc/rpm-doc-4.1-2.tar.bz2 50941 '
  '7cc9db802364252e3206ce9f75c8ca53813d8308a22a425b50ef695dd8e51568740b06739d3aa3399a83fb3d3e1345ab7e2ad03a1e9d47c02dded3363bf4f493\n'
- 'source: x86/release/rpm-doc/rpm-doc-4.1-2-src.tar.bz2 188 '
+ 'source: x86_64/release/rpm-doc/rpm-doc-4.1-2-src.tar.bz2 188 '
  'a4ee9121cfff2ccd5b4d84ffd18d2cff0ea071cef3c5416b8825d7b7f7cff8a8873c71832f3f3cb8742d004f9db34e9d160ad613b5df839723a3f986f0901402\n'
  '\n'
  '@ staleversion\n'
@@ -293,39 +293,39 @@
  'ldesc: "Test package for stale version removal"\n'
  'category: Shells Base\n'
  'version: 250-0\n'
- 'install: x86/release/staleversion/staleversion-250-0.tar.xz 228 '
+ 'install: x86_64/release/staleversion/staleversion-250-0.tar.xz 228 '
  'e675b0ac4bc2c3e1c4971bc56d77b0cd53a9bdf5632873a235d7582e29dfd3e8a7bb04b28f6cdee3e6b3d14c25ed39392538e3f628a9bfda6c905646ebc3c225\n'
- 'source: x86/release/staleversion/staleversion-250-0-src.tar.xz 228 '
+ 'source: x86_64/release/staleversion/staleversion-250-0-src.tar.xz 228 '
  'e675b0ac4bc2c3e1c4971bc56d77b0cd53a9bdf5632873a235d7582e29dfd3e8a7bb04b28f6cdee3e6b3d14c25ed39392538e3f628a9bfda6c905646ebc3c225\n'
  '[test]\n'
  'version: 251-0\n'
- 'install: x86/release/staleversion/staleversion-251-0.tar.xz 228 '
+ 'install: x86_64/release/staleversion/staleversion-251-0.tar.xz 228 '
  'e675b0ac4bc2c3e1c4971bc56d77b0cd53a9bdf5632873a235d7582e29dfd3e8a7bb04b28f6cdee3e6b3d14c25ed39392538e3f628a9bfda6c905646ebc3c225\n'
- 'source: x86/release/staleversion/staleversion-251-0-src.tar.xz 228 '
+ 'source: x86_64/release/staleversion/staleversion-251-0-src.tar.xz 228 '
  'e675b0ac4bc2c3e1c4971bc56d77b0cd53a9bdf5632873a235d7582e29dfd3e8a7bb04b28f6cdee3e6b3d14c25ed39392538e3f628a9bfda6c905646ebc3c225\n'
  '[prev]\n'
  'version: 242-0\n'
- 'install: x86/release/staleversion/staleversion-242-0.tar.xz 228 '
+ 'install: x86_64/release/staleversion/staleversion-242-0.tar.xz 228 '
  'e675b0ac4bc2c3e1c4971bc56d77b0cd53a9bdf5632873a235d7582e29dfd3e8a7bb04b28f6cdee3e6b3d14c25ed39392538e3f628a9bfda6c905646ebc3c225\n'
- 'source: x86/release/staleversion/staleversion-242-0-src.tar.xz 228 '
+ 'source: x86_64/release/staleversion/staleversion-242-0-src.tar.xz 228 '
  'e675b0ac4bc2c3e1c4971bc56d77b0cd53a9bdf5632873a235d7582e29dfd3e8a7bb04b28f6cdee3e6b3d14c25ed39392538e3f628a9bfda6c905646ebc3c225\n'
  '[prev]\n'
  'version: 240-1\n'
- 'install: x86/release/staleversion/staleversion-240-1.tar.xz 228 '
+ 'install: x86_64/release/staleversion/staleversion-240-1.tar.xz 228 '
  'e675b0ac4bc2c3e1c4971bc56d77b0cd53a9bdf5632873a235d7582e29dfd3e8a7bb04b28f6cdee3e6b3d14c25ed39392538e3f628a9bfda6c905646ebc3c225\n'
- 'source: x86/release/staleversion/staleversion-240-1-src.tar.xz 228 '
+ 'source: x86_64/release/staleversion/staleversion-240-1-src.tar.xz 228 '
  'e675b0ac4bc2c3e1c4971bc56d77b0cd53a9bdf5632873a235d7582e29dfd3e8a7bb04b28f6cdee3e6b3d14c25ed39392538e3f628a9bfda6c905646ebc3c225\n'
  '[prev]\n'
  'version: 243-0\n'
- 'install: x86/release/staleversion/staleversion-243-0.tar.xz 228 '
+ 'install: x86_64/release/staleversion/staleversion-243-0.tar.xz 228 '
  'e675b0ac4bc2c3e1c4971bc56d77b0cd53a9bdf5632873a235d7582e29dfd3e8a7bb04b28f6cdee3e6b3d14c25ed39392538e3f628a9bfda6c905646ebc3c225\n'
- 'source: x86/release/staleversion/staleversion-243-0-src.tar.xz 228 '
+ 'source: x86_64/release/staleversion/staleversion-243-0-src.tar.xz 228 '
  'e675b0ac4bc2c3e1c4971bc56d77b0cd53a9bdf5632873a235d7582e29dfd3e8a7bb04b28f6cdee3e6b3d14c25ed39392538e3f628a9bfda6c905646ebc3c225\n'
  '[test]\n'
  'version: 260-0\n'
- 'install: x86/release/staleversion/staleversion-260-0.tar.xz 228 '
+ 'install: x86_64/release/staleversion/staleversion-260-0.tar.xz 228 '
  'e675b0ac4bc2c3e1c4971bc56d77b0cd53a9bdf5632873a235d7582e29dfd3e8a7bb04b28f6cdee3e6b3d14c25ed39392538e3f628a9bfda6c905646ebc3c225\n'
- 'source: x86/release/staleversion/staleversion-260-0-src.tar.xz 228 '
+ 'source: x86_64/release/staleversion/staleversion-260-0-src.tar.xz 228 '
  'e675b0ac4bc2c3e1c4971bc56d77b0cd53a9bdf5632873a235d7582e29dfd3e8a7bb04b28f6cdee3e6b3d14c25ed39392538e3f628a9bfda6c905646ebc3c225\n'
  '\n'
  '@ test-c\n'
@@ -363,7 +363,7 @@
  'ldesc: "A test package (stuff & other stuff)"\n'
  'category: Devel\n'
  'version: 0.1-1\n'
- 'install: x86/release/testpackage/testpackage-0.1-1.tar.bz2 782 '
+ 'install: x86_64/release/testpackage/testpackage-0.1-1.tar.bz2 782 '
  '76e134c85d92f80689cc6f688ff0593f142a963a40ec0c2d9ddcf1dcbdc5ae924677e40b71ac2380f09ae174ba94cc6e1117cdf3282b2ae18a51b5392bafd8c3\n'
- 'source: x86/release/testpackage/testpackage-0.1-1-src.tar.bz2 782 '
+ 'source: x86_64/release/testpackage/testpackage-0.1-1-src.tar.bz2 782 '
  '76e134c85d92f80689cc6f688ff0593f142a963a40ec0c2d9ddcf1dcbdc5ae924677e40b71ac2380f09ae174ba94cc6e1117cdf3282b2ae18a51b5392bafd8c3\n',)
diff --git a/test/testdata/process_arch/homedir.expected b/test/testdata/process_arch/homedir.expected
index 0e6408e..9d1c89b 100644
--- a/test/testdata/process_arch/homedir.expected
+++ b/test/testdata/process_arch/homedir.expected
@@ -3,21 +3,21 @@
  'Blooey McFooey/noarch': [],
  'Blooey McFooey/noarch/release': [],
  'Blooey McFooey/noarch/release/perl-Net-SMTP-SSL': ['perl-Net-SMTP-SSL-1.03-2-src.hint.bak'],
- 'Blooey McFooey/x86': [],
- 'Blooey McFooey/x86/release': [],
- 'Blooey McFooey/x86/release/after-ready': ['after-ready-1.0-1.tar.bz2', 'setup.hint'],
- 'Blooey McFooey/x86/release/corrupt': ['corrupt-2.1.0-1-src.tar.xz', 'corrupt-2.1.0-1.tar.xz'],
- 'Blooey McFooey/x86/release/not-on-maintainer-list': ['not-on-maintainer-list-1.0-1.tar.bz2', 'setup.hint'],
- 'Blooey McFooey/x86/release/not-on-package-list': ['not-on-package-list-1.0-1.tar.bz2', 'setup.hint'],
- 'Blooey McFooey/x86/release/not-ready': ['-not-ready-0.9-1.tar.bz2', 'not-ready-1.0-1.tar.bz2', 'setup.hint'],
- 'Blooey McFooey/x86/release/per-version': ['per-version-5.0-1-src.hint.bak'],
- 'Blooey McFooey/x86/release/testpackage': ['testpackage-1.0-1-src.hint.bak'],
- 'Blooey McFooey/x86/release/testpackage-zstd': ['testpackage-zstd-1.0-1-src.hint',
-                                                 'testpackage-zstd-1.0-1-src.tar.zst',
-                                                 'testpackage-zstd-1.0-1.hint',
-                                                 'testpackage-zstd-1.0-1.tar.zst'],
- 'Blooey McFooey/x86/release/testpackage2': ['setup.hint', 'testpackage2-1.0-1.tar.bz2'],
- 'Blooey McFooey/x86/release/testpackage2/testpackage2-subpackage': ['inprogress.SftpXFR.1234',
-                                                                     'setup.hint',
-                                                                     'testpackage2-subpackage-1.0-1.tar.bz2'],
+ 'Blooey McFooey/x86_64': [],
+ 'Blooey McFooey/x86_64/release': [],
+ 'Blooey McFooey/x86_64/release/after-ready': ['after-ready-1.0-1.tar.bz2', 'setup.hint'],
+ 'Blooey McFooey/x86_64/release/corrupt': ['corrupt-2.1.0-1-src.tar.xz', 'corrupt-2.1.0-1.tar.xz'],
+ 'Blooey McFooey/x86_64/release/not-on-maintainer-list': ['not-on-maintainer-list-1.0-1.tar.bz2', 'setup.hint'],
+ 'Blooey McFooey/x86_64/release/not-on-package-list': ['not-on-package-list-1.0-1.tar.bz2', 'setup.hint'],
+ 'Blooey McFooey/x86_64/release/not-ready': ['-not-ready-0.9-1.tar.bz2', 'not-ready-1.0-1.tar.bz2', 'setup.hint'],
+ 'Blooey McFooey/x86_64/release/per-version': ['per-version-5.0-1-src.hint.bak'],
+ 'Blooey McFooey/x86_64/release/testpackage': ['testpackage-1.0-1-src.hint.bak'],
+ 'Blooey McFooey/x86_64/release/testpackage-zstd': ['testpackage-zstd-1.0-1-src.hint',
+                                                    'testpackage-zstd-1.0-1-src.tar.zst',
+                                                    'testpackage-zstd-1.0-1.hint',
+                                                    'testpackage-zstd-1.0-1.tar.zst'],
+ 'Blooey McFooey/x86_64/release/testpackage2': ['setup.hint', 'testpackage2-1.0-1.tar.bz2'],
+ 'Blooey McFooey/x86_64/release/testpackage2/testpackage2-subpackage': ['inprogress.SftpXFR.1234',
+                                                                        'setup.hint',
+                                                                        'testpackage2-subpackage-1.0-1.tar.bz2'],
  'Jon Turney': ['!email']}
diff --git a/test/testdata/process_arch/htdocs.expected b/test/testdata/process_arch/htdocs.expected
index c1cb232..46462d6 100644
--- a/test/testdata/process_arch/htdocs.expected
+++ b/test/testdata/process_arch/htdocs.expected
@@ -39,61 +39,35 @@
              'testpackage-src.html',
              'testpackage-subpackage.html',
              'testpackage.html'],
- 'x86': ['.htaccess'],
- 'x86/arc': ['.htaccess', 'arc-4.32.7-10'],
- 'x86/arc-src': ['.htaccess', 'arc-4.32.7-10-src'],
- 'x86/base-cygwin': ['.htaccess', 'base-cygwin-3.6-1', 'base-cygwin-3.8-1'],
- 'x86/corrupt': ['.htaccess', 'corrupt-2.0.0-1'],
- 'x86/corrupt-src': ['.htaccess', 'corrupt-2.0.0-1-src'],
- 'x86/cygwin': ['.htaccess', 'cygwin-2.2.0-1', 'cygwin-2.2.1-1', 'cygwin-2.3.0-0.3'],
- 'x86/cygwin-debuginfo': ['.htaccess',
-                          'cygwin-debuginfo-2.2.0-1',
-                          'cygwin-debuginfo-2.2.1-1',
-                          'cygwin-debuginfo-2.3.0-0.3'],
- 'x86/cygwin-devel': ['.htaccess', 'cygwin-devel-2.2.0-1', 'cygwin-devel-2.2.1-1', 'cygwin-devel-2.3.0-0.3'],
- 'x86/cygwin-src': ['.htaccess', 'cygwin-2.2.0-1-src', 'cygwin-2.2.1-1-src', 'cygwin-2.3.0-0.3-src'],
- 'x86/keychain': ['.htaccess', 'keychain-2.6.8-1', 'keychain-2.7.1-1'],
- 'x86/keychain-src': ['.htaccess', 'keychain-2.6.8-1-src', 'keychain-2.7.1-1-src'],
- 'x86/libdns_sd-devel': ['.htaccess', 'libdns_sd-devel-379.32.1-1'],
- 'x86/libdns_sd1': ['.htaccess', 'libdns_sd1-379.32.1-1'],
- 'x86/mDNSResponder': ['.htaccess', 'mDNSResponder-379.32.1-1'],
- 'x86/mDNSResponder-src': ['.htaccess', 'mDNSResponder-379.32.1-1-src'],
- 'x86/obs-a': ['.htaccess', 'obs-a-1.0-1'],
- 'x86/obs-a-src': ['.htaccess', 'obs-a-1.0-1-src'],
- 'x86/obs-b': ['.htaccess', 'obs-b-1.0-1'],
- 'x86/obs-b-src': ['.htaccess', 'obs-b-1.0-1-src'],
- 'x86/openssh': ['.htaccess', 'openssh-7.2p2-1'],
- 'x86/openssh-src': ['.htaccess', 'openssh-7.2p2-1-src'],
- 'x86/per-version': ['.htaccess', 'per-version-4.0-1', 'per-version-4.8-1', 'per-version-5.0-1'],
- 'x86/per-version-replacement-hint-only': ['.htaccess', 'per-version-replacement-hint-only-1.0-1'],
- 'x86/per-version-replacement-hint-only-src': ['.htaccess', 'per-version-replacement-hint-only-1.0-1-src'],
- 'x86/per-version-src': ['.htaccess', 'per-version-4.0-1-src', 'per-version-4.8-1-src', 'per-version-5.0-1-src'],
- 'x86/perl-Net-SMTP-SSL': ['.htaccess',
-                           'perl-Net-SMTP-SSL-1.02-1',
-                           'perl-Net-SMTP-SSL-1.03-1',
-                           'perl-Net-SMTP-SSL-1.03-2'],
- 'x86/perl-Net-SMTP-SSL-src': ['.htaccess',
-                               'perl-Net-SMTP-SSL-1.02-1-src',
-                               'perl-Net-SMTP-SSL-1.03-1-src',
-                               'perl-Net-SMTP-SSL-1.03-2-src'],
- 'x86/rpm-doc': ['.htaccess', 'rpm-doc-4.1-2', 'rpm-doc-999-1'],
- 'x86/rpm-doc-src': ['.htaccess', 'rpm-doc-4.1-2-src'],
- 'x86/staleversion': ['.htaccess', 'staleversion-243-0', 'staleversion-250-0', 'staleversion-260-0'],
- 'x86/staleversion-src': ['.htaccess', 'staleversion-243-0-src', 'staleversion-250-0-src', 'staleversion-260-0-src'],
- 'x86/test-c': ['.htaccess', 'test-c-1.0-1'],
- 'x86/test-c-src': ['.htaccess', 'test-c-1.0-1-src'],
- 'x86/test-d': ['.htaccess', 'test-d-1.0-1'],
- 'x86/test-d-src': ['.htaccess', 'test-d-1.0-1-src'],
- 'x86/test-e': ['.htaccess', 'test-e-1.0-1'],
- 'x86/test-e-src': ['.htaccess', 'test-e-1.0-1-src'],
- 'x86/testpackage': ['.htaccess', 'testpackage-1.0-1'],
- 'x86/testpackage-src': ['.htaccess', 'testpackage-1.0-1-src'],
- 'x86/testpackage-subpackage': ['.htaccess', 'testpackage-subpackage-1.0-1'],
  'x86_64': ['.htaccess'],
+ 'x86_64/arc': ['.htaccess', 'arc-4.32.7-10'],
+ 'x86_64/arc-src': ['.htaccess', 'arc-4.32.7-10-src'],
+ 'x86_64/base-cygwin': ['.htaccess', 'base-cygwin-3.6-1', 'base-cygwin-3.8-1'],
+ 'x86_64/corrupt': ['.htaccess', 'corrupt-2.0.0-1'],
+ 'x86_64/corrupt-src': ['.htaccess', 'corrupt-2.0.0-1-src'],
+ 'x86_64/cygwin': ['.htaccess', 'cygwin-2.2.0-1', 'cygwin-2.2.1-1', 'cygwin-2.3.0-0.3'],
+ 'x86_64/cygwin-debuginfo': ['.htaccess',
+                             'cygwin-debuginfo-2.2.0-1',
+                             'cygwin-debuginfo-2.2.1-1',
+                             'cygwin-debuginfo-2.3.0-0.3'],
+ 'x86_64/cygwin-devel': ['.htaccess', 'cygwin-devel-2.2.0-1', 'cygwin-devel-2.2.1-1', 'cygwin-devel-2.3.0-0.3'],
+ 'x86_64/cygwin-src': ['.htaccess', 'cygwin-2.2.0-1-src', 'cygwin-2.2.1-1-src', 'cygwin-2.3.0-0.3-src'],
+ 'x86_64/keychain': ['.htaccess', 'keychain-2.6.8-1', 'keychain-2.7.1-1'],
+ 'x86_64/keychain-src': ['.htaccess', 'keychain-2.6.8-1-src', 'keychain-2.7.1-1-src'],
+ 'x86_64/libdns_sd-devel': ['.htaccess', 'libdns_sd-devel-379.32.1-1'],
+ 'x86_64/libdns_sd1': ['.htaccess', 'libdns_sd1-379.32.1-1'],
+ 'x86_64/mDNSResponder': ['.htaccess', 'mDNSResponder-379.32.1-1'],
+ 'x86_64/mDNSResponder-src': ['.htaccess', 'mDNSResponder-379.32.1-1-src'],
  'x86_64/obs-a': ['.htaccess', 'obs-a-1.0-1'],
  'x86_64/obs-a-src': ['.htaccess', 'obs-a-1.0-1-src'],
  'x86_64/obs-b': ['.htaccess', 'obs-b-1.0-1'],
  'x86_64/obs-b-src': ['.htaccess', 'obs-b-1.0-1-src'],
+ 'x86_64/openssh': ['.htaccess', 'openssh-7.2p2-1'],
+ 'x86_64/openssh-src': ['.htaccess', 'openssh-7.2p2-1-src'],
+ 'x86_64/per-version': ['.htaccess', 'per-version-4.0-1', 'per-version-4.8-1', 'per-version-5.0-1'],
+ 'x86_64/per-version-replacement-hint-only': ['.htaccess', 'per-version-replacement-hint-only-1.0-1'],
+ 'x86_64/per-version-replacement-hint-only-src': ['.htaccess', 'per-version-replacement-hint-only-1.0-1-src'],
+ 'x86_64/per-version-src': ['.htaccess', 'per-version-4.0-1-src', 'per-version-4.8-1-src', 'per-version-5.0-1-src'],
  'x86_64/perl-Net-SMTP-SSL': ['.htaccess',
                               'perl-Net-SMTP-SSL-1.02-1',
                               'perl-Net-SMTP-SSL-1.03-1',
@@ -102,9 +76,16 @@
                                   'perl-Net-SMTP-SSL-1.02-1-src',
                                   'perl-Net-SMTP-SSL-1.03-1-src',
                                   'perl-Net-SMTP-SSL-1.03-2-src'],
+ 'x86_64/rpm-doc': ['.htaccess', 'rpm-doc-4.1-2', 'rpm-doc-999-1'],
+ 'x86_64/rpm-doc-src': ['.htaccess', 'rpm-doc-4.1-2-src'],
+ 'x86_64/staleversion': ['.htaccess', 'staleversion-243-0', 'staleversion-250-0', 'staleversion-260-0'],
+ 'x86_64/staleversion-src': ['.htaccess', 'staleversion-243-0-src', 'staleversion-250-0-src', 'staleversion-260-0-src'],
  'x86_64/test-c': ['.htaccess', 'test-c-1.0-1'],
  'x86_64/test-c-src': ['.htaccess', 'test-c-1.0-1-src'],
  'x86_64/test-d': ['.htaccess', 'test-d-1.0-1'],
  'x86_64/test-d-src': ['.htaccess', 'test-d-1.0-1-src'],
  'x86_64/test-e': ['.htaccess', 'test-e-1.0-1'],
- 'x86_64/test-e-src': ['.htaccess', 'test-e-1.0-1-src']}
+ 'x86_64/test-e-src': ['.htaccess', 'test-e-1.0-1-src'],
+ 'x86_64/testpackage': ['.htaccess', 'testpackage-1.0-1'],
+ 'x86_64/testpackage-src': ['.htaccess', 'testpackage-1.0-1-src'],
+ 'x86_64/testpackage-subpackage': ['.htaccess', 'testpackage-subpackage-1.0-1']}
diff --git a/test/testdata/process_arch/packages.json.expected b/test/testdata/process_arch/packages.json.expected
index be21cfa..0a2a7df 100644
--- a/test/testdata/process_arch/packages.json.expected
+++ b/test/testdata/process_arch/packages.json.expected
@@ -3,7 +3,7 @@
  '    "packages": [\n'
  '        {\n'
  '            "arches": [\n'
- '                "x86"\n'
+ '                "x86_64"\n'
  '            ],\n'
  '            "maintainers": [\n'
  '                "Jari Aalto"\n'
@@ -26,7 +26,7 @@
  '        },\n'
  '        {\n'
  '            "arches": [\n'
- '                "x86"\n'
+ '                "x86_64"\n'
  '            ],\n'
  '            "maintainers": [\n'
  '                "Blooey McFooey"\n'
@@ -49,7 +49,7 @@
  '        },\n'
  '        {\n'
  '            "arches": [\n'
- '                "x86"\n'
+ '                "x86_64"\n'
  '            ],\n'
  '            "license": "LGPL-3.0-or-later WITH LGPL-3.0-linking-exception",\n'
  '            "maintainers": [\n'
@@ -90,7 +90,7 @@
  '        },\n'
  '        {\n'
  '            "arches": [\n'
- '                "x86"\n'
+ '                "x86_64"\n'
  '            ],\n'
  '            "maintainers": [\n'
  '                "Jari Aalto"\n'
@@ -114,7 +114,7 @@
  '        },\n'
  '        {\n'
  '            "arches": [\n'
- '                "x86"\n'
+ '                "x86_64"\n'
  '            ],\n'
  '            "maintainers": [\n'
  '                "Yaakov Selkowitz"\n'
@@ -149,7 +149,6 @@
  '        },\n'
  '        {\n'
  '            "arches": [\n'
- '                "x86",\n'
  '                "x86_64"\n'
  '            ],\n'
  '            "name": "obs-a",\n'
@@ -170,7 +169,6 @@
  '        },\n'
  '        {\n'
  '            "arches": [\n'
- '                "x86",\n'
  '                "x86_64"\n'
  '            ],\n'
  '            "name": "obs-b",\n'
@@ -191,7 +189,7 @@
  '        },\n'
  '        {\n'
  '            "arches": [\n'
- '                "x86"\n'
+ '                "x86_64"\n'
  '            ],\n'
  '            "maintainers": [\n'
  '                "Corinna Vinschen"\n'
@@ -214,7 +212,7 @@
  '        },\n'
  '        {\n'
  '            "arches": [\n'
- '                "x86"\n'
+ '                "x86_64"\n'
  '            ],\n'
  '            "maintainers": [\n'
  '                "Blooey McFooey"\n'
@@ -237,7 +235,7 @@
  '        },\n'
  '        {\n'
  '            "arches": [\n'
- '                "x86"\n'
+ '                "x86_64"\n'
  '            ],\n'
  '            "maintainers": [\n'
  '                "Blooey McFooey"\n'
@@ -264,7 +262,6 @@
  '        },\n'
  '        {\n'
  '            "arches": [\n'
- '                "x86",\n'
  '                "x86_64"\n'
  '            ],\n'
  '            "homepage": "https://metacpan.org/release/RJBS/Net-SMTP-SSL-1.04",\n'
@@ -292,7 +289,7 @@
  '        },\n'
  '        {\n'
  '            "arches": [\n'
- '                "x86"\n'
+ '                "x86_64"\n'
  '            ],\n'
  '            "name": "rpm-doc",\n'
  '            "subpackages": [\n'
@@ -313,7 +310,7 @@
  '        },\n'
  '        {\n'
  '            "arches": [\n'
- '                "x86"\n'
+ '                "x86_64"\n'
  '            ],\n'
  '            "maintainers": [\n'
  '                "Blooey McFooey"\n'
@@ -341,7 +338,6 @@
  '        },\n'
  '        {\n'
  '            "arches": [\n'
- '                "x86",\n'
  '                "x86_64"\n'
  '            ],\n'
  '            "name": "test-c",\n'
@@ -362,7 +358,6 @@
  '        },\n'
  '        {\n'
  '            "arches": [\n'
- '                "x86",\n'
  '                "x86_64"\n'
  '            ],\n'
  '            "name": "test-d",\n'
@@ -383,7 +378,6 @@
  '        },\n'
  '        {\n'
  '            "arches": [\n'
- '                "x86",\n'
  '                "x86_64"\n'
  '            ],\n'
  '            "name": "test-e",\n'
@@ -404,7 +398,7 @@
  '        },\n'
  '        {\n'
  '            "arches": [\n'
- '                "x86"\n'
+ '                "x86_64"\n'
  '            ],\n'
  '            "homepage": "http://homepage.url",\n'
  '            "maintainers": [\n'
diff --git a/test/testdata/process_arch/rel_area.expected b/test/testdata/process_arch/rel_area.expected
index 6751999..723abdd 100644
--- a/test/testdata/process_arch/rel_area.expected
+++ b/test/testdata/process_arch/rel_area.expected
@@ -39,148 +39,150 @@
                            'test-e-1.0-1-src.tar.xz',
                            'test-e-1.0-1.hint',
                            'test-e-1.0-1.tar.xz'],
- 'x86': ['sha512.sum'],
- 'x86/release': ['sha512.sum'],
- 'x86/release/arc': ['arc-4.32.7-10-src.hint',
-                     'arc-4.32.7-10-src.tar.bz2',
-                     'arc-4.32.7-10.hint',
-                     'arc-4.32.7-10.tar.bz2'],
- 'x86/release/base-cygwin': ['base-cygwin-3.6-1.hint',
-                             'base-cygwin-3.6-1.tar.xz',
-                             'base-cygwin-3.8-1.hint',
-                             'base-cygwin-3.8-1.tar.xz',
-                             'sha512.sum'],
- 'x86/release/corrupt': ['corrupt-2.0.0-1-src.hint',
-                         'corrupt-2.0.0-1-src.tar.xz',
-                         'corrupt-2.0.0-1.hint',
-                         'corrupt-2.0.0-1.tar.xz',
-                         'sha512.sum'],
- 'x86/release/cygwin': ['.this-should-be-ignored',
-                        'cygwin-2.2.0-1-src.hint',
-                        'cygwin-2.2.0-1-src.tar.xz',
-                        'cygwin-2.2.0-1.hint',
-                        'cygwin-2.2.0-1.tar.xz',
-                        'cygwin-2.2.1-1-src.hint',
-                        'cygwin-2.2.1-1-src.tar.xz',
-                        'cygwin-2.2.1-1.hint',
-                        'cygwin-2.2.1-1.tar.xz',
-                        'cygwin-2.3.0-0.3-src.hint',
-                        'cygwin-2.3.0-0.3-src.tar.xz',
-                        'cygwin-2.3.0-0.3.hint',
-                        'cygwin-2.3.0-0.3.tar.xz',
-                        'override.hint',
-                        'sha512.sum'],
- 'x86/release/cygwin/cygwin-debuginfo': ['cygwin-debuginfo-2.2.0-1.hint',
-                                         'cygwin-debuginfo-2.2.0-1.tar.xz',
-                                         'cygwin-debuginfo-2.2.1-1.hint',
-                                         'cygwin-debuginfo-2.2.1-1.tar.xz',
-                                         'cygwin-debuginfo-2.3.0-0.3.hint',
-                                         'cygwin-debuginfo-2.3.0-0.3.tar.xz',
-                                         'override.hint',
-                                         'sha512.sum'],
- 'x86/release/cygwin/cygwin-devel': ['cygwin-devel-2.2.0-1.hint',
-                                     'cygwin-devel-2.2.0-1.tar.xz',
-                                     'cygwin-devel-2.2.1-1.hint',
-                                     'cygwin-devel-2.2.1-1.tar.xz',
-                                     'cygwin-devel-2.3.0-0.3.hint',
-                                     'cygwin-devel-2.3.0-0.3.tar.xz',
-                                     'override.hint',
-                                     'sha512.sum'],
- 'x86/release/invalid': ['invalid-0.hint', 'sha512.sum'],
- 'x86/release/keychain': ['keychain-2.6.8-1-src.hint',
-                          'keychain-2.6.8-1-src.tar.bz2',
-                          'keychain-2.6.8-1.hint',
-                          'keychain-2.6.8-1.tar.bz2',
-                          'keychain-2.7.1-1-src.hint',
-                          'keychain-2.7.1-1-src.tar.bz2',
-                          'keychain-2.7.1-1.hint',
-                          'keychain-2.7.1-1.tar.bz2',
-                          'sha512.sum'],
- 'x86/release/libspiro': ['libspiro-20071029-1.hint', 'sha512.sum'],
- 'x86/release/libspiro/libspiro-devel': ['libspiro-devel-20071029-1.hint', 'sha512.sum'],
- 'x86/release/libspiro/libspiro0': ['libspiro0-20071029-1.hint', 'sha512.sum'],
- 'x86/release/libtextcat': ['libtextcat-2.2-2-src.hint',
-                            'libtextcat-2.2-2-src.tar.bz2',
-                            'libtextcat-2.2-2.hint',
-                            'libtextcat-2.2-2.tar.bz2',
+ 'x86_64': ['sha512.sum'],
+ 'x86_64/release': ['sha512.sum'],
+ 'x86_64/release/arc': ['arc-4.32.7-10-src.hint',
+                        'arc-4.32.7-10-src.tar.bz2',
+                        'arc-4.32.7-10.hint',
+                        'arc-4.32.7-10.tar.bz2'],
+ 'x86_64/release/base-cygwin': ['base-cygwin-3.6-1.hint',
+                                'base-cygwin-3.6-1.tar.xz',
+                                'base-cygwin-3.8-1.hint',
+                                'base-cygwin-3.8-1.tar.xz',
+                                'sha512.sum'],
+ 'x86_64/release/corrupt': ['corrupt-2.0.0-1-src.hint',
+                            'corrupt-2.0.0-1-src.tar.xz',
+                            'corrupt-2.0.0-1.hint',
+                            'corrupt-2.0.0-1.tar.xz',
                             'sha512.sum'],
- 'x86/release/libtextcat/libtextcat-devel': ['libtextcat-devel-2.2-2.hint',
-                                             'libtextcat-devel-2.2-2.tar.bz2',
-                                             'sha512.sum'],
- 'x86/release/libtextcat/libtextcat0': ['libtextcat0-2.2-2.hint', 'libtextcat0-2.2-2.tar.bz2', 'sha512.sum'],
- 'x86/release/mDNSResponder': ['mDNSResponder-379.32.1-1-src.hint',
-                               'mDNSResponder-379.32.1-1-src.tar.bz2',
-                               'mDNSResponder-379.32.1-1.hint',
-                               'mDNSResponder-379.32.1-1.tar.bz2',
-                               'sha512.sum'],
- 'x86/release/mDNSResponder/libdns_sd-devel': ['libdns_sd-devel-379.32.1-1.hint',
-                                               'libdns_sd-devel-379.32.1-1.tar.bz2',
-                                               'sha512.sum'],
- 'x86/release/mDNSResponder/libdns_sd1': ['libdns_sd1-379.32.1-1.hint', 'libdns_sd1-379.32.1-1.tar.bz2', 'sha512.sum'],
- 'x86/release/mingw64-i686-binutils': ['mingw64-i686-binutils-2.29.1.787c9873-1.hint', 'sha512.sum'],
- 'x86/release/mingw64-i686-binutils/mingw64-i686-binutils-debuginfo': ['mingw64-i686-binutils-debuginfo-2.29.1.787c9873-1.hint',
-                                                                       'sha512.sum'],
- 'x86/release/openssh': ['openssh-7.2p2-1-src.hint',
-                         'openssh-7.2p2-1-src.tar.xz',
-                         'openssh-7.2p2-1.hint',
-                         'openssh-7.2p2-1.tar.xz',
-                         'sha512.sum'],
- 'x86/release/per-version': ['override.hint',
-                             'per-version-4.0-1-src.hint',
-                             'per-version-4.0-1-src.tar.xz',
-                             'per-version-4.0-1.hint',
-                             'per-version-4.0-1.tar.xz',
-                             'per-version-4.8-1-src.hint',
-                             'per-version-4.8-1-src.tar.xz',
-                             'per-version-4.8-1.hint',
-                             'per-version-4.8-1.tar.xz',
-                             'per-version-5.0-1-src.hint',
-                             'per-version-5.0-1-src.tar.xz',
-                             'per-version-5.0-1.hint',
-                             'per-version-5.0-1.tar.xz',
-                             'sha512.sum'],
- 'x86/release/per-version-incomplete': ['override.hint',
-                                        'per-version-incomplete-36-1-src.hint',
-                                        'per-version-incomplete-36-1-src.tar.xz',
-                                        'per-version-incomplete-36-1.hint',
-                                        'per-version-incomplete-36-1.tar.xz',
-                                        'per-version-incomplete-39-1-src.tar.xz',
-                                        'per-version-incomplete-39-1.tar.xz',
+ 'x86_64/release/cygwin': ['.this-should-be-ignored',
+                           'cygwin-2.2.0-1-src.hint',
+                           'cygwin-2.2.0-1-src.tar.xz',
+                           'cygwin-2.2.0-1.hint',
+                           'cygwin-2.2.0-1.tar.xz',
+                           'cygwin-2.2.1-1-src.hint',
+                           'cygwin-2.2.1-1-src.tar.xz',
+                           'cygwin-2.2.1-1.hint',
+                           'cygwin-2.2.1-1.tar.xz',
+                           'cygwin-2.3.0-0.3-src.hint',
+                           'cygwin-2.3.0-0.3-src.tar.xz',
+                           'cygwin-2.3.0-0.3.hint',
+                           'cygwin-2.3.0-0.3.tar.xz',
+                           'override.hint',
+                           'sha512.sum'],
+ 'x86_64/release/cygwin/cygwin-debuginfo': ['cygwin-debuginfo-2.2.0-1.hint',
+                                            'cygwin-debuginfo-2.2.0-1.tar.xz',
+                                            'cygwin-debuginfo-2.2.1-1.hint',
+                                            'cygwin-debuginfo-2.2.1-1.tar.xz',
+                                            'cygwin-debuginfo-2.3.0-0.3.hint',
+                                            'cygwin-debuginfo-2.3.0-0.3.tar.xz',
+                                            'override.hint',
+                                            'sha512.sum'],
+ 'x86_64/release/cygwin/cygwin-devel': ['cygwin-devel-2.2.0-1.hint',
+                                        'cygwin-devel-2.2.0-1.tar.xz',
+                                        'cygwin-devel-2.2.1-1.hint',
+                                        'cygwin-devel-2.2.1-1.tar.xz',
+                                        'cygwin-devel-2.3.0-0.3.hint',
+                                        'cygwin-devel-2.3.0-0.3.tar.xz',
+                                        'override.hint',
                                         'sha512.sum'],
- 'x86/release/per-version-replacement-hint-only': ['per-version-replacement-hint-only-1.0-1-src.hint',
-                                                   'per-version-replacement-hint-only-1.0-1-src.tar.xz',
-                                                   'per-version-replacement-hint-only-1.0-1.hint',
-                                                   'per-version-replacement-hint-only-1.0-1.tar.xz',
-                                                   'sha512.sum'],
- 'x86/release/proj': ['proj-4.8.0-1.hint', 'sha512.sum'],
- 'x86/release/proj/libproj-devel': ['libproj-devel-4.8.0-1.hint', 'sha512.sum'],
- 'x86/release/proj/libproj1': ['libproj1-4.8.0-1.hint', 'sha512.sum'],
- 'x86/release/rpm-doc': ['rpm-doc-4.1-2-src.hint',
-                         'rpm-doc-4.1-2-src.tar.bz2',
-                         'rpm-doc-4.1-2.hint',
-                         'rpm-doc-4.1-2.tar.bz2',
-                         'rpm-doc-999-1.hint',
-                         'rpm-doc-999-1.tar.bz2',
-                         'sha512.sum'],
- 'x86/release/splint': ['sha512.sum', 'splint-3.1.2-1.hint'],
- 'x86/release/staleversion': ['override.hint',
-                              'sha512.sum',
-                              'staleversion-243-0-src.hint',
-                              'staleversion-243-0-src.tar.xz',
-                              'staleversion-243-0.hint',
-                              'staleversion-243-0.tar.xz',
-                              'staleversion-250-0-src.hint',
-                              'staleversion-250-0-src.tar.xz',
-                              'staleversion-250-0.hint',
-                              'staleversion-250-0.tar.xz',
-                              'staleversion-260-0-src.hint',
-                              'staleversion-260-0-src.tar.xz',
-                              'staleversion-260-0.hint',
-                              'staleversion-260-0.tar.xz'],
- 'x86/release/testpackage': ['sha512.sum',
-                             'testpackage-1.0-1-src.hint',
-                             'testpackage-1.0-1-src.tar.bz2',
-                             'testpackage-1.0-1.hint',
-                             'testpackage-1.0-1.tar.bz2'],
- 'x86/release/testpackage/testpackage-subpackage': ['testpackage-subpackage-1.0-1.hint',
-                                                    'testpackage-subpackage-1.0-1.tar.bz2']}
+ 'x86_64/release/invalid': ['invalid-0.hint', 'sha512.sum'],
+ 'x86_64/release/keychain': ['keychain-2.6.8-1-src.hint',
+                             'keychain-2.6.8-1-src.tar.bz2',
+                             'keychain-2.6.8-1.hint',
+                             'keychain-2.6.8-1.tar.bz2',
+                             'keychain-2.7.1-1-src.hint',
+                             'keychain-2.7.1-1-src.tar.bz2',
+                             'keychain-2.7.1-1.hint',
+                             'keychain-2.7.1-1.tar.bz2',
+                             'sha512.sum'],
+ 'x86_64/release/libspiro': ['libspiro-20071029-1.hint', 'sha512.sum'],
+ 'x86_64/release/libspiro/libspiro-devel': ['libspiro-devel-20071029-1.hint', 'sha512.sum'],
+ 'x86_64/release/libspiro/libspiro0': ['libspiro0-20071029-1.hint', 'sha512.sum'],
+ 'x86_64/release/libtextcat': ['libtextcat-2.2-2-src.hint',
+                               'libtextcat-2.2-2-src.tar.bz2',
+                               'libtextcat-2.2-2.hint',
+                               'libtextcat-2.2-2.tar.bz2',
+                               'sha512.sum'],
+ 'x86_64/release/libtextcat/libtextcat-devel': ['libtextcat-devel-2.2-2.hint',
+                                                'libtextcat-devel-2.2-2.tar.bz2',
+                                                'sha512.sum'],
+ 'x86_64/release/libtextcat/libtextcat0': ['libtextcat0-2.2-2.hint', 'libtextcat0-2.2-2.tar.bz2', 'sha512.sum'],
+ 'x86_64/release/mDNSResponder': ['mDNSResponder-379.32.1-1-src.hint',
+                                  'mDNSResponder-379.32.1-1-src.tar.bz2',
+                                  'mDNSResponder-379.32.1-1.hint',
+                                  'mDNSResponder-379.32.1-1.tar.bz2',
+                                  'sha512.sum'],
+ 'x86_64/release/mDNSResponder/libdns_sd-devel': ['libdns_sd-devel-379.32.1-1.hint',
+                                                  'libdns_sd-devel-379.32.1-1.tar.bz2',
+                                                  'sha512.sum'],
+ 'x86_64/release/mDNSResponder/libdns_sd1': ['libdns_sd1-379.32.1-1.hint',
+                                             'libdns_sd1-379.32.1-1.tar.bz2',
+                                             'sha512.sum'],
+ 'x86_64/release/mingw64-i686-binutils': ['mingw64-i686-binutils-2.29.1.787c9873-1.hint', 'sha512.sum'],
+ 'x86_64/release/mingw64-i686-binutils/mingw64-i686-binutils-debuginfo': ['mingw64-i686-binutils-debuginfo-2.29.1.787c9873-1.hint',
+                                                                          'sha512.sum'],
+ 'x86_64/release/openssh': ['openssh-7.2p2-1-src.hint',
+                            'openssh-7.2p2-1-src.tar.xz',
+                            'openssh-7.2p2-1.hint',
+                            'openssh-7.2p2-1.tar.xz',
+                            'sha512.sum'],
+ 'x86_64/release/per-version': ['override.hint',
+                                'per-version-4.0-1-src.hint',
+                                'per-version-4.0-1-src.tar.xz',
+                                'per-version-4.0-1.hint',
+                                'per-version-4.0-1.tar.xz',
+                                'per-version-4.8-1-src.hint',
+                                'per-version-4.8-1-src.tar.xz',
+                                'per-version-4.8-1.hint',
+                                'per-version-4.8-1.tar.xz',
+                                'per-version-5.0-1-src.hint',
+                                'per-version-5.0-1-src.tar.xz',
+                                'per-version-5.0-1.hint',
+                                'per-version-5.0-1.tar.xz',
+                                'sha512.sum'],
+ 'x86_64/release/per-version-incomplete': ['override.hint',
+                                           'per-version-incomplete-36-1-src.hint',
+                                           'per-version-incomplete-36-1-src.tar.xz',
+                                           'per-version-incomplete-36-1.hint',
+                                           'per-version-incomplete-36-1.tar.xz',
+                                           'per-version-incomplete-39-1-src.tar.xz',
+                                           'per-version-incomplete-39-1.tar.xz',
+                                           'sha512.sum'],
+ 'x86_64/release/per-version-replacement-hint-only': ['per-version-replacement-hint-only-1.0-1-src.hint',
+                                                      'per-version-replacement-hint-only-1.0-1-src.tar.xz',
+                                                      'per-version-replacement-hint-only-1.0-1.hint',
+                                                      'per-version-replacement-hint-only-1.0-1.tar.xz',
+                                                      'sha512.sum'],
+ 'x86_64/release/proj': ['proj-4.8.0-1.hint', 'sha512.sum'],
+ 'x86_64/release/proj/libproj-devel': ['libproj-devel-4.8.0-1.hint', 'sha512.sum'],
+ 'x86_64/release/proj/libproj1': ['libproj1-4.8.0-1.hint', 'sha512.sum'],
+ 'x86_64/release/rpm-doc': ['rpm-doc-4.1-2-src.hint',
+                            'rpm-doc-4.1-2-src.tar.bz2',
+                            'rpm-doc-4.1-2.hint',
+                            'rpm-doc-4.1-2.tar.bz2',
+                            'rpm-doc-999-1.hint',
+                            'rpm-doc-999-1.tar.bz2',
+                            'sha512.sum'],
+ 'x86_64/release/splint': ['sha512.sum', 'splint-3.1.2-1.hint'],
+ 'x86_64/release/staleversion': ['override.hint',
+                                 'sha512.sum',
+                                 'staleversion-243-0-src.hint',
+                                 'staleversion-243-0-src.tar.xz',
+                                 'staleversion-243-0.hint',
+                                 'staleversion-243-0.tar.xz',
+                                 'staleversion-250-0-src.hint',
+                                 'staleversion-250-0-src.tar.xz',
+                                 'staleversion-250-0.hint',
+                                 'staleversion-250-0.tar.xz',
+                                 'staleversion-260-0-src.hint',
+                                 'staleversion-260-0-src.tar.xz',
+                                 'staleversion-260-0.hint',
+                                 'staleversion-260-0.tar.xz'],
+ 'x86_64/release/testpackage': ['sha512.sum',
+                                'testpackage-1.0-1-src.hint',
+                                'testpackage-1.0-1-src.tar.bz2',
+                                'testpackage-1.0-1.hint',
+                                'testpackage-1.0-1.tar.bz2'],
+ 'x86_64/release/testpackage/testpackage-subpackage': ['testpackage-subpackage-1.0-1.hint',
+                                                       'testpackage-subpackage-1.0-1.tar.bz2']}
diff --git a/test/testdata/process_arch/setup.ini.expected b/test/testdata/process_arch/setup.ini.expected
index 288ff40..93446da 100644
--- a/test/testdata/process_arch/setup.ini.expected
+++ b/test/testdata/process_arch/setup.ini.expected
@@ -6,7 +6,7 @@
  '# See https://sourceware.org/cygwin-apps/setup.ini.html for a description\n'
  '# of the format.\n'
  'release: trial\n'
- 'arch: x86\n'
+ 'arch: x86_64\n'
  'setup-timestamp: 1473797080\n'
  'include-setup: setup <2.878 not supported\n'
  'setup-minimum-version: 2.903\n'
@@ -22,9 +22,9 @@
  'the best of packing, squeezing, or crunching is used."\n'
  'category: Archive\n'
  'version: 4.32.7-10\n'
- 'install: x86/release/arc/arc-4.32.7-10.tar.bz2 782 '
+ 'install: x86_64/release/arc/arc-4.32.7-10.tar.bz2 782 '
  '76e134c85d92f80689cc6f688ff0593f142a963a40ec0c2d9ddcf1dcbdc5ae924677e40b71ac2380f09ae174ba94cc6e1117cdf3282b2ae18a51b5392bafd8c3\n'
- 'source: x86/release/arc/arc-4.32.7-10-src.tar.bz2 782 '
+ 'source: x86_64/release/arc/arc-4.32.7-10-src.tar.bz2 782 '
  '76e134c85d92f80689cc6f688ff0593f142a963a40ec0c2d9ddcf1dcbdc5ae924677e40b71ac2380f09ae174ba94cc6e1117cdf3282b2ae18a51b5392bafd8c3\n'
  '\n'
  '@ base-cygwin\n'
@@ -32,12 +32,12 @@
  'ldesc: "Initial base installation helper script."\n'
  'category: Base\n'
  'version: 3.8-1\n'
- 'install: x86/release/base-cygwin/base-cygwin-3.8-1.tar.xz 228 '
+ 'install: x86_64/release/base-cygwin/base-cygwin-3.8-1.tar.xz 228 '
  'e675b0ac4bc2c3e1c4971bc56d77b0cd53a9bdf5632873a235d7582e29dfd3e8a7bb04b28f6cdee3e6b3d14c25ed39392538e3f628a9bfda6c905646ebc3c225\n'
  'depends2: cygwin-api0_291\n'
  '[prev]\n'
  'version: 3.6-1\n'
- 'install: x86/release/base-cygwin/base-cygwin-3.6-1.tar.xz 228 '
+ 'install: x86_64/release/base-cygwin/base-cygwin-3.6-1.tar.xz 228 '
  'e675b0ac4bc2c3e1c4971bc56d77b0cd53a9bdf5632873a235d7582e29dfd3e8a7bb04b28f6cdee3e6b3d14c25ed39392538e3f628a9bfda6c905646ebc3c225\n'
  '\n'
  '@ corrupt\n'
@@ -45,9 +45,9 @@
  'ldesc: "A package containing corrupt archives"\n'
  'category: Devel\n'
  'version: 2.0.0-1\n'
- 'install: x86/release/corrupt/corrupt-2.0.0-1.tar.xz 128 '
+ 'install: x86_64/release/corrupt/corrupt-2.0.0-1.tar.xz 128 '
  '1f7a858f21049e9b13b8f4bbb9325582a304c8829d67c7cd302a33d78bc59808b6a84a0f6f19c87cc3c331aeaa60613437d35b0bae3390a78fd9118ac156d3f1\n'
- 'source: x86/release/corrupt/corrupt-2.0.0-1-src.tar.xz 362012 '
+ 'source: x86_64/release/corrupt/corrupt-2.0.0-1-src.tar.xz 362012 '
  '26a2a77ce2ab0691bbd20b720d34285dcf814888649810a70edadf398b7dca264dba7ba4449f51f20f2d1cd9617844919e2f2718b6014b37ab564d2463cc366b\n'
  '\n'
  '@ cygwin\n'
@@ -55,23 +55,23 @@
  'ldesc: "The UNIX emulation engine"\n'
  'category: Base\n'
  'version: 2.2.1-1\n'
- 'install: x86/release/cygwin/cygwin-2.2.1-1.tar.xz 228 '
+ 'install: x86_64/release/cygwin/cygwin-2.2.1-1.tar.xz 228 '
  'e675b0ac4bc2c3e1c4971bc56d77b0cd53a9bdf5632873a235d7582e29dfd3e8a7bb04b28f6cdee3e6b3d14c25ed39392538e3f628a9bfda6c905646ebc3c225\n'
- 'source: x86/release/cygwin/cygwin-2.2.1-1-src.tar.xz 228 '
+ 'source: x86_64/release/cygwin/cygwin-2.2.1-1-src.tar.xz 228 '
  'e675b0ac4bc2c3e1c4971bc56d77b0cd53a9bdf5632873a235d7582e29dfd3e8a7bb04b28f6cdee3e6b3d14c25ed39392538e3f628a9bfda6c905646ebc3c225\n'
  'depends2: base-cygwin\n'
  '[prev]\n'
  'version: 2.2.0-1\n'
- 'install: x86/release/cygwin/cygwin-2.2.0-1.tar.xz 228 '
+ 'install: x86_64/release/cygwin/cygwin-2.2.0-1.tar.xz 228 '
  'e675b0ac4bc2c3e1c4971bc56d77b0cd53a9bdf5632873a235d7582e29dfd3e8a7bb04b28f6cdee3e6b3d14c25ed39392538e3f628a9bfda6c905646ebc3c225\n'
- 'source: x86/release/cygwin/cygwin-2.2.0-1-src.tar.xz 228 '
+ 'source: x86_64/release/cygwin/cygwin-2.2.0-1-src.tar.xz 228 '
  'e675b0ac4bc2c3e1c4971bc56d77b0cd53a9bdf5632873a235d7582e29dfd3e8a7bb04b28f6cdee3e6b3d14c25ed39392538e3f628a9bfda6c905646ebc3c225\n'
  'depends2: base-cygwin\n'
  '[test]\n'
  'version: 2.3.0-0.3\n'
- 'install: x86/release/cygwin/cygwin-2.3.0-0.3.tar.xz 228 '
+ 'install: x86_64/release/cygwin/cygwin-2.3.0-0.3.tar.xz 228 '
  'e675b0ac4bc2c3e1c4971bc56d77b0cd53a9bdf5632873a235d7582e29dfd3e8a7bb04b28f6cdee3e6b3d14c25ed39392538e3f628a9bfda6c905646ebc3c225\n'
- 'source: x86/release/cygwin/cygwin-2.3.0-0.3-src.tar.xz 228 '
+ 'source: x86_64/release/cygwin/cygwin-2.3.0-0.3-src.tar.xz 228 '
  'e675b0ac4bc2c3e1c4971bc56d77b0cd53a9bdf5632873a235d7582e29dfd3e8a7bb04b28f6cdee3e6b3d14c25ed39392538e3f628a9bfda6c905646ebc3c225\n'
  'depends2: _windows ( >= 6.0 ), base-cygwin\n'
  'provides: cygwin-api0_291\n'
@@ -83,23 +83,23 @@
  'cygwin package with gdb."\n'
  'category: Debug\n'
  'version: 2.2.1-1\n'
- 'install: x86/release/cygwin/cygwin-debuginfo/cygwin-debuginfo-2.2.1-1.tar.xz 228 '
+ 'install: x86_64/release/cygwin/cygwin-debuginfo/cygwin-debuginfo-2.2.1-1.tar.xz 228 '
  'e675b0ac4bc2c3e1c4971bc56d77b0cd53a9bdf5632873a235d7582e29dfd3e8a7bb04b28f6cdee3e6b3d14c25ed39392538e3f628a9bfda6c905646ebc3c225\n'
- 'source: x86/release/cygwin/cygwin-2.2.1-1-src.tar.xz 228 '
+ 'source: x86_64/release/cygwin/cygwin-2.2.1-1-src.tar.xz 228 '
  'e675b0ac4bc2c3e1c4971bc56d77b0cd53a9bdf5632873a235d7582e29dfd3e8a7bb04b28f6cdee3e6b3d14c25ed39392538e3f628a9bfda6c905646ebc3c225\n'
  'depends2: cygwin-debuginfo\n'
  '[prev]\n'
  'version: 2.2.0-1\n'
- 'install: x86/release/cygwin/cygwin-debuginfo/cygwin-debuginfo-2.2.0-1.tar.xz 228 '
+ 'install: x86_64/release/cygwin/cygwin-debuginfo/cygwin-debuginfo-2.2.0-1.tar.xz 228 '
  'e675b0ac4bc2c3e1c4971bc56d77b0cd53a9bdf5632873a235d7582e29dfd3e8a7bb04b28f6cdee3e6b3d14c25ed39392538e3f628a9bfda6c905646ebc3c225\n'
- 'source: x86/release/cygwin/cygwin-2.2.0-1-src.tar.xz 228 '
+ 'source: x86_64/release/cygwin/cygwin-2.2.0-1-src.tar.xz 228 '
  'e675b0ac4bc2c3e1c4971bc56d77b0cd53a9bdf5632873a235d7582e29dfd3e8a7bb04b28f6cdee3e6b3d14c25ed39392538e3f628a9bfda6c905646ebc3c225\n'
  'depends2: cygwin-debuginfo\n'
  '[test]\n'
  'version: 2.3.0-0.3\n'
- 'install: x86/release/cygwin/cygwin-debuginfo/cygwin-debuginfo-2.3.0-0.3.tar.xz 228 '
+ 'install: x86_64/release/cygwin/cygwin-debuginfo/cygwin-debuginfo-2.3.0-0.3.tar.xz 228 '
  'e675b0ac4bc2c3e1c4971bc56d77b0cd53a9bdf5632873a235d7582e29dfd3e8a7bb04b28f6cdee3e6b3d14c25ed39392538e3f628a9bfda6c905646ebc3c225\n'
- 'source: x86/release/cygwin/cygwin-2.3.0-0.3-src.tar.xz 228 '
+ 'source: x86_64/release/cygwin/cygwin-2.3.0-0.3-src.tar.xz 228 '
  'e675b0ac4bc2c3e1c4971bc56d77b0cd53a9bdf5632873a235d7582e29dfd3e8a7bb04b28f6cdee3e6b3d14c25ed39392538e3f628a9bfda6c905646ebc3c225\n'
  'depends2: cygwin-debuginfo\n'
  '\n'
@@ -108,21 +108,21 @@
  'ldesc: "Core development files required to build Cygwin packages"\n'
  'category: Devel\n'
  'version: 2.2.1-1\n'
- 'install: x86/release/cygwin/cygwin-devel/cygwin-devel-2.2.1-1.tar.xz 228 '
+ 'install: x86_64/release/cygwin/cygwin-devel/cygwin-devel-2.2.1-1.tar.xz 228 '
  'e675b0ac4bc2c3e1c4971bc56d77b0cd53a9bdf5632873a235d7582e29dfd3e8a7bb04b28f6cdee3e6b3d14c25ed39392538e3f628a9bfda6c905646ebc3c225\n'
- 'source: x86/release/cygwin/cygwin-2.2.1-1-src.tar.xz 228 '
+ 'source: x86_64/release/cygwin/cygwin-2.2.1-1-src.tar.xz 228 '
  'e675b0ac4bc2c3e1c4971bc56d77b0cd53a9bdf5632873a235d7582e29dfd3e8a7bb04b28f6cdee3e6b3d14c25ed39392538e3f628a9bfda6c905646ebc3c225\n'
  '[prev]\n'
  'version: 2.2.0-1\n'
- 'install: x86/release/cygwin/cygwin-devel/cygwin-devel-2.2.0-1.tar.xz 228 '
+ 'install: x86_64/release/cygwin/cygwin-devel/cygwin-devel-2.2.0-1.tar.xz 228 '
  'e675b0ac4bc2c3e1c4971bc56d77b0cd53a9bdf5632873a235d7582e29dfd3e8a7bb04b28f6cdee3e6b3d14c25ed39392538e3f628a9bfda6c905646ebc3c225\n'
- 'source: x86/release/cygwin/cygwin-2.2.0-1-src.tar.xz 228 '
+ 'source: x86_64/release/cygwin/cygwin-2.2.0-1-src.tar.xz 228 '
  'e675b0ac4bc2c3e1c4971bc56d77b0cd53a9bdf5632873a235d7582e29dfd3e8a7bb04b28f6cdee3e6b3d14c25ed39392538e3f628a9bfda6c905646ebc3c225\n'
  '[test]\n'
  'version: 2.3.0-0.3\n'
- 'install: x86/release/cygwin/cygwin-devel/cygwin-devel-2.3.0-0.3.tar.xz 228 '
+ 'install: x86_64/release/cygwin/cygwin-devel/cygwin-devel-2.3.0-0.3.tar.xz 228 '
  'e675b0ac4bc2c3e1c4971bc56d77b0cd53a9bdf5632873a235d7582e29dfd3e8a7bb04b28f6cdee3e6b3d14c25ed39392538e3f628a9bfda6c905646ebc3c225\n'
- 'source: x86/release/cygwin/cygwin-2.3.0-0.3-src.tar.xz 228 '
+ 'source: x86_64/release/cygwin/cygwin-2.3.0-0.3-src.tar.xz 228 '
  'e675b0ac4bc2c3e1c4971bc56d77b0cd53a9bdf5632873a235d7582e29dfd3e8a7bb04b28f6cdee3e6b3d14c25ed39392538e3f628a9bfda6c905646ebc3c225\n'
  '\n'
  '@ keychain\n'
@@ -138,16 +138,16 @@
  'necessary"\n'
  'category: Utils\n'
  'version: 2.7.1-1\n'
- 'install: x86/release/keychain/keychain-2.7.1-1.tar.bz2 32219 '
+ 'install: x86_64/release/keychain/keychain-2.7.1-1.tar.bz2 32219 '
  '0c7b7ad2636b6e23e40e8cb593196b3fabe9c44f7618ea9b2021b89ecdc08720a7f824be0beaa75c9e62dda9a7b5ed7e9c1ed147a1875c582e80866ad09533a2\n'
- 'source: x86/release/keychain/keychain-2.7.1-1-src.tar.bz2 134875 '
+ 'source: x86_64/release/keychain/keychain-2.7.1-1-src.tar.bz2 134875 '
  'cef733c5f1ba7380088ce4b12be0a70c3d657fd0e26beae11cf96bbbc2a02c492dafef700adac1059ee643208d76b5f19042e01d9628b2463b916b3dea13aa54\n'
  'depends2: openssh\n'
  '[prev]\n'
  'version: 2.6.8-1\n'
- 'install: x86/release/keychain/keychain-2.6.8-1.tar.bz2 30476 '
+ 'install: x86_64/release/keychain/keychain-2.6.8-1.tar.bz2 30476 '
  '05af40c0fabbd2ea8f8b74719434371a47c7751986fe6411c17e18cda7d03947c5785ed164dfe59b7238831cc10d8e29f4f88bf3414420bd3231423f424c00bd\n'
- 'source: x86/release/keychain/keychain-2.6.8-1-src.tar.bz2 36347 '
+ 'source: x86_64/release/keychain/keychain-2.6.8-1-src.tar.bz2 36347 '
  '2151b73a9ec2ece63a842ddad6de19bcfdf097b86d4cae932eeadfc64640997051254001f31081e80272e020887b9599188990368c833ba10886f0ba32a3415e\n'
  'depends2: openssh\n'
  '\n'
@@ -158,9 +158,9 @@
  'industry standard IP protocols."\n'
  'category: Net\n'
  'version: 379.32.1-1\n'
- 'install: x86/release/mDNSResponder/libdns_sd-devel/libdns_sd-devel-379.32.1-1.tar.bz2 195 '
+ 'install: x86_64/release/mDNSResponder/libdns_sd-devel/libdns_sd-devel-379.32.1-1.tar.bz2 195 '
  'aff488008bee3486e25b539fe6ccd1397bd3c5c0ba2ee2cf34af279554baa195af7493ee51d6f8510735c9a2ea54436d776a71e768165716762aec286abbbf83\n'
- 'source: x86/release/mDNSResponder/mDNSResponder-379.32.1-1-src.tar.bz2 195 '
+ 'source: x86_64/release/mDNSResponder/mDNSResponder-379.32.1-1-src.tar.bz2 195 '
  'aff488008bee3486e25b539fe6ccd1397bd3c5c0ba2ee2cf34af279554baa195af7493ee51d6f8510735c9a2ea54436d776a71e768165716762aec286abbbf83\n'
  'depends2: libdns_sd1\n'
  '\n'
@@ -171,9 +171,9 @@
  'industry standard IP protocols."\n'
  'category: Net\n'
  'version: 379.32.1-1\n'
- 'install: x86/release/mDNSResponder/libdns_sd1/libdns_sd1-379.32.1-1.tar.bz2 195 '
+ 'install: x86_64/release/mDNSResponder/libdns_sd1/libdns_sd1-379.32.1-1.tar.bz2 195 '
  'aff488008bee3486e25b539fe6ccd1397bd3c5c0ba2ee2cf34af279554baa195af7493ee51d6f8510735c9a2ea54436d776a71e768165716762aec286abbbf83\n'
- 'source: x86/release/mDNSResponder/mDNSResponder-379.32.1-1-src.tar.bz2 195 '
+ 'source: x86_64/release/mDNSResponder/mDNSResponder-379.32.1-1-src.tar.bz2 195 '
  'aff488008bee3486e25b539fe6ccd1397bd3c5c0ba2ee2cf34af279554baa195af7493ee51d6f8510735c9a2ea54436d776a71e768165716762aec286abbbf83\n'
  '\n'
  '@ mDNSResponder\n'
@@ -187,9 +187,9 @@
  'a number of popular Windows programs), then you can download it at\n'
  'http://support.apple.com/kb/DL999"\n'
  'version: 379.32.1-1\n'
- 'install: x86/release/mDNSResponder/mDNSResponder-379.32.1-1.tar.bz2 195 '
+ 'install: x86_64/release/mDNSResponder/mDNSResponder-379.32.1-1.tar.bz2 195 '
  'aff488008bee3486e25b539fe6ccd1397bd3c5c0ba2ee2cf34af279554baa195af7493ee51d6f8510735c9a2ea54436d776a71e768165716762aec286abbbf83\n'
- 'source: x86/release/mDNSResponder/mDNSResponder-379.32.1-1-src.tar.bz2 195 '
+ 'source: x86_64/release/mDNSResponder/mDNSResponder-379.32.1-1-src.tar.bz2 195 '
  'aff488008bee3486e25b539fe6ccd1397bd3c5c0ba2ee2cf34af279554baa195af7493ee51d6f8510735c9a2ea54436d776a71e768165716762aec286abbbf83\n'
  'depends2: libdns_sd1\n'
  '\n'
@@ -218,9 +218,9 @@
  '\tproviding encrypted communication between two machines."\n'
  'category: Net\n'
  'version: 7.2p2-1\n'
- 'install: x86/release/openssh/openssh-7.2p2-1.tar.xz 228 '
+ 'install: x86_64/release/openssh/openssh-7.2p2-1.tar.xz 228 '
  'e675b0ac4bc2c3e1c4971bc56d77b0cd53a9bdf5632873a235d7582e29dfd3e8a7bb04b28f6cdee3e6b3d14c25ed39392538e3f628a9bfda6c905646ebc3c225\n'
- 'source: x86/release/openssh/openssh-7.2p2-1-src.tar.xz 228 '
+ 'source: x86_64/release/openssh/openssh-7.2p2-1-src.tar.xz 228 '
  'e675b0ac4bc2c3e1c4971bc56d77b0cd53a9bdf5632873a235d7582e29dfd3e8a7bb04b28f6cdee3e6b3d14c25ed39392538e3f628a9bfda6c905646ebc3c225\n'
  '\n'
  '@ per-version\n'
@@ -228,23 +228,23 @@
  'ldesc: "Per-version hint test package"\n'
  'category: Base\n'
  'version: 4.8-1\n'
- 'install: x86/release/per-version/per-version-4.8-1.tar.xz 228 '
+ 'install: x86_64/release/per-version/per-version-4.8-1.tar.xz 228 '
  'e675b0ac4bc2c3e1c4971bc56d77b0cd53a9bdf5632873a235d7582e29dfd3e8a7bb04b28f6cdee3e6b3d14c25ed39392538e3f628a9bfda6c905646ebc3c225\n'
- 'source: x86/release/per-version/per-version-4.8-1-src.tar.xz 228 '
+ 'source: x86_64/release/per-version/per-version-4.8-1-src.tar.xz 228 '
  'e675b0ac4bc2c3e1c4971bc56d77b0cd53a9bdf5632873a235d7582e29dfd3e8a7bb04b28f6cdee3e6b3d14c25ed39392538e3f628a9bfda6c905646ebc3c225\n'
  'depends2: base-cygwin\n'
  '[prev]\n'
  'version: 4.0-1\n'
- 'install: x86/release/per-version/per-version-4.0-1.tar.xz 228 '
+ 'install: x86_64/release/per-version/per-version-4.0-1.tar.xz 228 '
  'e675b0ac4bc2c3e1c4971bc56d77b0cd53a9bdf5632873a235d7582e29dfd3e8a7bb04b28f6cdee3e6b3d14c25ed39392538e3f628a9bfda6c905646ebc3c225\n'
- 'source: x86/release/per-version/per-version-4.0-1-src.tar.xz 228 '
+ 'source: x86_64/release/per-version/per-version-4.0-1-src.tar.xz 228 '
  'e675b0ac4bc2c3e1c4971bc56d77b0cd53a9bdf5632873a235d7582e29dfd3e8a7bb04b28f6cdee3e6b3d14c25ed39392538e3f628a9bfda6c905646ebc3c225\n'
  'depends2: cygwin\n'
  '[test]\n'
  'version: 5.0-1\n'
- 'install: x86/release/per-version/per-version-5.0-1.tar.xz 228 '
+ 'install: x86_64/release/per-version/per-version-5.0-1.tar.xz 228 '
  'e675b0ac4bc2c3e1c4971bc56d77b0cd53a9bdf5632873a235d7582e29dfd3e8a7bb04b28f6cdee3e6b3d14c25ed39392538e3f628a9bfda6c905646ebc3c225\n'
- 'source: x86/release/per-version/per-version-5.0-1-src.tar.xz 296 '
+ 'source: x86_64/release/per-version/per-version-5.0-1-src.tar.xz 296 '
  '3937b5bedff65c8eaee1705661ca2d1402c5af417b258f0d87adcc377b815024a559b591651adc00d069454582183512c234ce915276bdf7c276efd6a9bdf354\n'
  'depends2: base-cygwin\n'
  '\n'
@@ -253,9 +253,9 @@
  'ldesc: "Replacement per-version hint test package - updated"\n'
  'category: Base\n'
  'version: 1.0-1\n'
- 'install: x86/release/per-version-replacement-hint-only/per-version-replacement-hint-only-1.0-1.tar.xz 228 '
+ 'install: x86_64/release/per-version-replacement-hint-only/per-version-replacement-hint-only-1.0-1.tar.xz 228 '
  'e675b0ac4bc2c3e1c4971bc56d77b0cd53a9bdf5632873a235d7582e29dfd3e8a7bb04b28f6cdee3e6b3d14c25ed39392538e3f628a9bfda6c905646ebc3c225\n'
- 'source: x86/release/per-version-replacement-hint-only/per-version-replacement-hint-only-1.0-1-src.tar.xz 228 '
+ 'source: x86_64/release/per-version-replacement-hint-only/per-version-replacement-hint-only-1.0-1-src.tar.xz 228 '
  'e675b0ac4bc2c3e1c4971bc56d77b0cd53a9bdf5632873a235d7582e29dfd3e8a7bb04b28f6cdee3e6b3d14c25ed39392538e3f628a9bfda6c905646ebc3c225\n'
  'depends2: base-cygwin, per-version\n'
  '\n'
@@ -286,13 +286,13 @@
  'sdesc: "Obsolete package for RPM package management system manual pages (extra text to so repr is not one line)"\n'
  'category: _obsolete\n'
  'version: 999-1\n'
- 'install: x86/release/rpm-doc/rpm-doc-999-1.tar.bz2 42 '
+ 'install: x86_64/release/rpm-doc/rpm-doc-999-1.tar.bz2 42 '
  '28c70b843fe01d90a3eeab4a3617551d236cd0b7d69668d1b1b6c8b14a9fd050e4039c192894c93bdf31575771c58c1fea2a41c24c8da22d10080d8b032b6369\n'
  '[prev]\n'
  'version: 4.1-2\n'
- 'install: x86/release/rpm-doc/rpm-doc-4.1-2.tar.bz2 50941 '
+ 'install: x86_64/release/rpm-doc/rpm-doc-4.1-2.tar.bz2 50941 '
  '7cc9db802364252e3206ce9f75c8ca53813d8308a22a425b50ef695dd8e51568740b06739d3aa3399a83fb3d3e1345ab7e2ad03a1e9d47c02dded3363bf4f493\n'
- 'source: x86/release/rpm-doc/rpm-doc-4.1-2-src.tar.bz2 188 '
+ 'source: x86_64/release/rpm-doc/rpm-doc-4.1-2-src.tar.bz2 188 '
  'a4ee9121cfff2ccd5b4d84ffd18d2cff0ea071cef3c5416b8825d7b7f7cff8a8873c71832f3f3cb8742d004f9db34e9d160ad613b5df839723a3f986f0901402\n'
  '\n'
  '@ staleversion\n'
@@ -300,21 +300,21 @@
  'ldesc: "Test package for stale version removal"\n'
  'category: Shells Base\n'
  'version: 250-0\n'
- 'install: x86/release/staleversion/staleversion-250-0.tar.xz 228 '
+ 'install: x86_64/release/staleversion/staleversion-250-0.tar.xz 228 '
  'e675b0ac4bc2c3e1c4971bc56d77b0cd53a9bdf5632873a235d7582e29dfd3e8a7bb04b28f6cdee3e6b3d14c25ed39392538e3f628a9bfda6c905646ebc3c225\n'
- 'source: x86/release/staleversion/staleversion-250-0-src.tar.xz 228 '
+ 'source: x86_64/release/staleversion/staleversion-250-0-src.tar.xz 228 '
  'e675b0ac4bc2c3e1c4971bc56d77b0cd53a9bdf5632873a235d7582e29dfd3e8a7bb04b28f6cdee3e6b3d14c25ed39392538e3f628a9bfda6c905646ebc3c225\n'
  '[prev]\n'
  'version: 243-0\n'
- 'install: x86/release/staleversion/staleversion-243-0.tar.xz 228 '
+ 'install: x86_64/release/staleversion/staleversion-243-0.tar.xz 228 '
  'e675b0ac4bc2c3e1c4971bc56d77b0cd53a9bdf5632873a235d7582e29dfd3e8a7bb04b28f6cdee3e6b3d14c25ed39392538e3f628a9bfda6c905646ebc3c225\n'
- 'source: x86/release/staleversion/staleversion-243-0-src.tar.xz 228 '
+ 'source: x86_64/release/staleversion/staleversion-243-0-src.tar.xz 228 '
  'e675b0ac4bc2c3e1c4971bc56d77b0cd53a9bdf5632873a235d7582e29dfd3e8a7bb04b28f6cdee3e6b3d14c25ed39392538e3f628a9bfda6c905646ebc3c225\n'
  '[test]\n'
  'version: 260-0\n'
- 'install: x86/release/staleversion/staleversion-260-0.tar.xz 228 '
+ 'install: x86_64/release/staleversion/staleversion-260-0.tar.xz 228 '
  'e675b0ac4bc2c3e1c4971bc56d77b0cd53a9bdf5632873a235d7582e29dfd3e8a7bb04b28f6cdee3e6b3d14c25ed39392538e3f628a9bfda6c905646ebc3c225\n'
- 'source: x86/release/staleversion/staleversion-260-0-src.tar.xz 228 '
+ 'source: x86_64/release/staleversion/staleversion-260-0-src.tar.xz 228 '
  'e675b0ac4bc2c3e1c4971bc56d77b0cd53a9bdf5632873a235d7582e29dfd3e8a7bb04b28f6cdee3e6b3d14c25ed39392538e3f628a9bfda6c905646ebc3c225\n'
  '\n'
  '@ test-c\n'
@@ -354,9 +354,9 @@
  'Like it’s you’re Markup Language™ Nokogiri’s tool―that Bézier."\n'
  'category: Devel\n'
  'version: 1.0-1\n'
- 'install: x86/release/testpackage/testpackage-1.0-1.tar.bz2 195 '
+ 'install: x86_64/release/testpackage/testpackage-1.0-1.tar.bz2 195 '
  'aff488008bee3486e25b539fe6ccd1397bd3c5c0ba2ee2cf34af279554baa195af7493ee51d6f8510735c9a2ea54436d776a71e768165716762aec286abbbf83\n'
- 'source: x86/release/testpackage/testpackage-1.0-1-src.tar.bz2 266 '
+ 'source: x86_64/release/testpackage/testpackage-1.0-1-src.tar.bz2 266 '
  'acfd77df3347e6432ccf29c12989964bc680a158d574f85dfa7ef222759f411006c7bd2773e37c5abdee628bea769b2da9aae213db615cd91402fd385373933d\n'
  'depends2: cygwin\n'
  '\n'
@@ -365,7 +365,7 @@
  'ldesc: "A test subpackage"\n'
  'category: Devel\n'
  'version: 1.0-1\n'
- 'install: x86/release/testpackage/testpackage-subpackage/testpackage-subpackage-1.0-1.tar.bz2 195 '
+ 'install: x86_64/release/testpackage/testpackage-subpackage/testpackage-subpackage-1.0-1.tar.bz2 195 '
  'aff488008bee3486e25b539fe6ccd1397bd3c5c0ba2ee2cf34af279554baa195af7493ee51d6f8510735c9a2ea54436d776a71e768165716762aec286abbbf83\n'
- 'source: x86/release/testpackage/testpackage-1.0-1-src.tar.bz2 266 '
+ 'source: x86_64/release/testpackage/testpackage-1.0-1-src.tar.bz2 266 '
  'acfd77df3347e6432ccf29c12989964bc680a158d574f85dfa7ef222759f411006c7bd2773e37c5abdee628bea769b2da9aae213db615cd91402fd385373933d\n',)
diff --git a/test/testdata/process_arch/vault.expected b/test/testdata/process_arch/vault.expected
index 5276fcb..764e804 100644
--- a/test/testdata/process_arch/vault.expected
+++ b/test/testdata/process_arch/vault.expected
@@ -5,21 +5,21 @@
                                       'perl-Net-SMTP-SSL-1.01-1-src.tar.xz',
                                       'perl-Net-SMTP-SSL-1.01-1.hint',
                                       'perl-Net-SMTP-SSL-1.01-1.tar.xz'],
- 'x86': [],
- 'x86/release': [],
- 'x86/release/staleversion': ['staleversion-240-1-src.hint',
-                              'staleversion-240-1-src.tar.xz',
-                              'staleversion-240-1.hint',
-                              'staleversion-240-1.tar.xz',
-                              'staleversion-242-0-src.hint',
-                              'staleversion-242-0-src.tar.xz',
-                              'staleversion-242-0.hint',
-                              'staleversion-242-0.tar.xz',
-                              'staleversion-251-0-src.hint',
-                              'staleversion-251-0-src.tar.xz',
-                              'staleversion-251-0.hint',
-                              'staleversion-251-0.tar.xz'],
- 'x86/release/testpackage': ['testpackage-0.1-1-src.hint',
-                             'testpackage-0.1-1-src.tar.bz2',
-                             'testpackage-0.1-1.hint',
-                             'testpackage-0.1-1.tar.bz2']}
+ 'x86_64': [],
+ 'x86_64/release': [],
+ 'x86_64/release/staleversion': ['staleversion-240-1-src.hint',
+                                 'staleversion-240-1-src.tar.xz',
+                                 'staleversion-240-1.hint',
+                                 'staleversion-240-1.tar.xz',
+                                 'staleversion-242-0-src.hint',
+                                 'staleversion-242-0-src.tar.xz',
+                                 'staleversion-242-0.hint',
+                                 'staleversion-242-0.tar.xz',
+                                 'staleversion-251-0-src.hint',
+                                 'staleversion-251-0-src.tar.xz',
+                                 'staleversion-251-0.hint',
+                                 'staleversion-251-0.tar.xz'],
+ 'x86_64/release/testpackage': ['testpackage-0.1-1-src.hint',
+                                'testpackage-0.1-1-src.tar.bz2',
+                                'testpackage-0.1-1.hint',
+                                'testpackage-0.1-1.tar.bz2']}
diff --git a/test/testdata/relarea/x86/release/arc/arc-4.32.7-10-src.hint b/test/testdata/relarea/x86_64/release/arc/arc-4.32.7-10-src.hint
similarity index 100%
rename from test/testdata/relarea/x86/release/arc/arc-4.32.7-10-src.hint
rename to test/testdata/relarea/x86_64/release/arc/arc-4.32.7-10-src.hint
diff --git a/test/testdata/relarea/x86/release/arc/arc-4.32.7-10-src.tar.bz2 b/test/testdata/relarea/x86_64/release/arc/arc-4.32.7-10-src.tar.bz2
similarity index 100%
rename from test/testdata/relarea/x86/release/arc/arc-4.32.7-10-src.tar.bz2
rename to test/testdata/relarea/x86_64/release/arc/arc-4.32.7-10-src.tar.bz2
diff --git a/test/testdata/relarea/x86/release/arc/arc-4.32.7-10.hint b/test/testdata/relarea/x86_64/release/arc/arc-4.32.7-10.hint
similarity index 100%
rename from test/testdata/relarea/x86/release/arc/arc-4.32.7-10.hint
rename to test/testdata/relarea/x86_64/release/arc/arc-4.32.7-10.hint
diff --git a/test/testdata/relarea/x86/release/arc/arc-4.32.7-10.tar.bz2 b/test/testdata/relarea/x86_64/release/arc/arc-4.32.7-10.tar.bz2
similarity index 100%
rename from test/testdata/relarea/x86/release/arc/arc-4.32.7-10.tar.bz2
rename to test/testdata/relarea/x86_64/release/arc/arc-4.32.7-10.tar.bz2
diff --git a/test/testdata/relarea/x86/release/base-cygwin/base-cygwin-3.6-1.hint b/test/testdata/relarea/x86_64/release/base-cygwin/base-cygwin-3.6-1.hint
similarity index 100%
rename from test/testdata/relarea/x86/release/base-cygwin/base-cygwin-3.6-1.hint
rename to test/testdata/relarea/x86_64/release/base-cygwin/base-cygwin-3.6-1.hint
diff --git a/test/testdata/relarea/x86/release/base-cygwin/base-cygwin-3.6-1.tar.xz b/test/testdata/relarea/x86_64/release/base-cygwin/base-cygwin-3.6-1.tar.xz
similarity index 100%
rename from test/testdata/relarea/x86/release/base-cygwin/base-cygwin-3.6-1.tar.xz
rename to test/testdata/relarea/x86_64/release/base-cygwin/base-cygwin-3.6-1.tar.xz
diff --git a/test/testdata/relarea/x86/release/base-cygwin/base-cygwin-3.8-1.hint b/test/testdata/relarea/x86_64/release/base-cygwin/base-cygwin-3.8-1.hint
similarity index 100%
rename from test/testdata/relarea/x86/release/base-cygwin/base-cygwin-3.8-1.hint
rename to test/testdata/relarea/x86_64/release/base-cygwin/base-cygwin-3.8-1.hint
diff --git a/test/testdata/relarea/x86/release/base-cygwin/base-cygwin-3.8-1.tar.xz b/test/testdata/relarea/x86_64/release/base-cygwin/base-cygwin-3.8-1.tar.xz
similarity index 100%
rename from test/testdata/relarea/x86/release/base-cygwin/base-cygwin-3.8-1.tar.xz
rename to test/testdata/relarea/x86_64/release/base-cygwin/base-cygwin-3.8-1.tar.xz
diff --git a/test/testdata/relarea/x86/release/corrupt/corrupt-2.0.0-1-src.hint b/test/testdata/relarea/x86_64/release/corrupt/corrupt-2.0.0-1-src.hint
similarity index 100%
rename from test/testdata/relarea/x86/release/corrupt/corrupt-2.0.0-1-src.hint
rename to test/testdata/relarea/x86_64/release/corrupt/corrupt-2.0.0-1-src.hint
diff --git a/test/testdata/relarea/x86/release/corrupt/corrupt-2.0.0-1-src.tar.xz b/test/testdata/relarea/x86_64/release/corrupt/corrupt-2.0.0-1-src.tar.xz
similarity index 100%
rename from test/testdata/relarea/x86/release/corrupt/corrupt-2.0.0-1-src.tar.xz
rename to test/testdata/relarea/x86_64/release/corrupt/corrupt-2.0.0-1-src.tar.xz
diff --git a/test/testdata/relarea/x86/release/corrupt/corrupt-2.0.0-1.hint b/test/testdata/relarea/x86_64/release/corrupt/corrupt-2.0.0-1.hint
similarity index 100%
rename from test/testdata/relarea/x86/release/corrupt/corrupt-2.0.0-1.hint
rename to test/testdata/relarea/x86_64/release/corrupt/corrupt-2.0.0-1.hint
diff --git a/test/testdata/relarea/x86/release/corrupt/corrupt-2.0.0-1.tar.xz b/test/testdata/relarea/x86_64/release/corrupt/corrupt-2.0.0-1.tar.xz
similarity index 100%
rename from test/testdata/relarea/x86/release/corrupt/corrupt-2.0.0-1.tar.xz
rename to test/testdata/relarea/x86_64/release/corrupt/corrupt-2.0.0-1.tar.xz
diff --git a/test/testdata/relarea/x86/release/cygwin/.this-should-be-ignored b/test/testdata/relarea/x86_64/release/cygwin/.this-should-be-ignored
similarity index 100%
rename from test/testdata/relarea/x86/release/cygwin/.this-should-be-ignored
rename to test/testdata/relarea/x86_64/release/cygwin/.this-should-be-ignored
diff --git a/test/testdata/relarea/x86/release/cygwin/cygwin-2.2.0-1-src.hint b/test/testdata/relarea/x86_64/release/cygwin/cygwin-2.2.0-1-src.hint
similarity index 100%
rename from test/testdata/relarea/x86/release/cygwin/cygwin-2.2.0-1-src.hint
rename to test/testdata/relarea/x86_64/release/cygwin/cygwin-2.2.0-1-src.hint
diff --git a/test/testdata/relarea/x86/release/cygwin/cygwin-2.2.0-1-src.tar.xz b/test/testdata/relarea/x86_64/release/cygwin/cygwin-2.2.0-1-src.tar.xz
similarity index 100%
rename from test/testdata/relarea/x86/release/cygwin/cygwin-2.2.0-1-src.tar.xz
rename to test/testdata/relarea/x86_64/release/cygwin/cygwin-2.2.0-1-src.tar.xz
diff --git a/test/testdata/relarea/x86/release/cygwin/cygwin-2.2.0-1.hint b/test/testdata/relarea/x86_64/release/cygwin/cygwin-2.2.0-1.hint
similarity index 100%
rename from test/testdata/relarea/x86/release/cygwin/cygwin-2.2.0-1.hint
rename to test/testdata/relarea/x86_64/release/cygwin/cygwin-2.2.0-1.hint
diff --git a/test/testdata/relarea/x86/release/cygwin/cygwin-2.2.0-1.tar.xz b/test/testdata/relarea/x86_64/release/cygwin/cygwin-2.2.0-1.tar.xz
similarity index 100%
rename from test/testdata/relarea/x86/release/cygwin/cygwin-2.2.0-1.tar.xz
rename to test/testdata/relarea/x86_64/release/cygwin/cygwin-2.2.0-1.tar.xz
diff --git a/test/testdata/relarea/x86/release/cygwin/cygwin-2.2.1-1-src.hint b/test/testdata/relarea/x86_64/release/cygwin/cygwin-2.2.1-1-src.hint
similarity index 100%
rename from test/testdata/relarea/x86/release/cygwin/cygwin-2.2.1-1-src.hint
rename to test/testdata/relarea/x86_64/release/cygwin/cygwin-2.2.1-1-src.hint
diff --git a/test/testdata/relarea/x86/release/cygwin/cygwin-2.2.1-1-src.tar.xz b/test/testdata/relarea/x86_64/release/cygwin/cygwin-2.2.1-1-src.tar.xz
similarity index 100%
rename from test/testdata/relarea/x86/release/cygwin/cygwin-2.2.1-1-src.tar.xz
rename to test/testdata/relarea/x86_64/release/cygwin/cygwin-2.2.1-1-src.tar.xz
diff --git a/test/testdata/relarea/x86/release/cygwin/cygwin-2.2.1-1.hint b/test/testdata/relarea/x86_64/release/cygwin/cygwin-2.2.1-1.hint
similarity index 100%
rename from test/testdata/relarea/x86/release/cygwin/cygwin-2.2.1-1.hint
rename to test/testdata/relarea/x86_64/release/cygwin/cygwin-2.2.1-1.hint
diff --git a/test/testdata/relarea/x86/release/cygwin/cygwin-2.2.1-1.tar.xz b/test/testdata/relarea/x86_64/release/cygwin/cygwin-2.2.1-1.tar.xz
similarity index 100%
rename from test/testdata/relarea/x86/release/cygwin/cygwin-2.2.1-1.tar.xz
rename to test/testdata/relarea/x86_64/release/cygwin/cygwin-2.2.1-1.tar.xz
diff --git a/test/testdata/relarea/x86/release/cygwin/cygwin-2.3.0-0.3-src.hint b/test/testdata/relarea/x86_64/release/cygwin/cygwin-2.3.0-0.3-src.hint
similarity index 100%
rename from test/testdata/relarea/x86/release/cygwin/cygwin-2.3.0-0.3-src.hint
rename to test/testdata/relarea/x86_64/release/cygwin/cygwin-2.3.0-0.3-src.hint
diff --git a/test/testdata/relarea/x86/release/cygwin/cygwin-2.3.0-0.3-src.tar.xz b/test/testdata/relarea/x86_64/release/cygwin/cygwin-2.3.0-0.3-src.tar.xz
similarity index 100%
rename from test/testdata/relarea/x86/release/cygwin/cygwin-2.3.0-0.3-src.tar.xz
rename to test/testdata/relarea/x86_64/release/cygwin/cygwin-2.3.0-0.3-src.tar.xz
diff --git a/test/testdata/relarea/x86/release/cygwin/cygwin-2.3.0-0.3.hint b/test/testdata/relarea/x86_64/release/cygwin/cygwin-2.3.0-0.3.hint
similarity index 100%
rename from test/testdata/relarea/x86/release/cygwin/cygwin-2.3.0-0.3.hint
rename to test/testdata/relarea/x86_64/release/cygwin/cygwin-2.3.0-0.3.hint
diff --git a/test/testdata/relarea/x86/release/cygwin/cygwin-2.3.0-0.3.tar.xz b/test/testdata/relarea/x86_64/release/cygwin/cygwin-2.3.0-0.3.tar.xz
similarity index 100%
rename from test/testdata/relarea/x86/release/cygwin/cygwin-2.3.0-0.3.tar.xz
rename to test/testdata/relarea/x86_64/release/cygwin/cygwin-2.3.0-0.3.tar.xz
diff --git a/test/testdata/relarea/x86/release/cygwin/cygwin-debuginfo/cygwin-debuginfo-2.2.0-1.hint b/test/testdata/relarea/x86_64/release/cygwin/cygwin-debuginfo/cygwin-debuginfo-2.2.0-1.hint
similarity index 100%
rename from test/testdata/relarea/x86/release/cygwin/cygwin-debuginfo/cygwin-debuginfo-2.2.0-1.hint
rename to test/testdata/relarea/x86_64/release/cygwin/cygwin-debuginfo/cygwin-debuginfo-2.2.0-1.hint
diff --git a/test/testdata/relarea/x86/release/cygwin/cygwin-debuginfo/cygwin-debuginfo-2.2.0-1.tar.xz b/test/testdata/relarea/x86_64/release/cygwin/cygwin-debuginfo/cygwin-debuginfo-2.2.0-1.tar.xz
similarity index 100%
rename from test/testdata/relarea/x86/release/cygwin/cygwin-debuginfo/cygwin-debuginfo-2.2.0-1.tar.xz
rename to test/testdata/relarea/x86_64/release/cygwin/cygwin-debuginfo/cygwin-debuginfo-2.2.0-1.tar.xz
diff --git a/test/testdata/relarea/x86/release/cygwin/cygwin-debuginfo/cygwin-debuginfo-2.2.1-1.hint b/test/testdata/relarea/x86_64/release/cygwin/cygwin-debuginfo/cygwin-debuginfo-2.2.1-1.hint
similarity index 100%
rename from test/testdata/relarea/x86/release/cygwin/cygwin-debuginfo/cygwin-debuginfo-2.2.1-1.hint
rename to test/testdata/relarea/x86_64/release/cygwin/cygwin-debuginfo/cygwin-debuginfo-2.2.1-1.hint
diff --git a/test/testdata/relarea/x86/release/cygwin/cygwin-debuginfo/cygwin-debuginfo-2.2.1-1.tar.xz b/test/testdata/relarea/x86_64/release/cygwin/cygwin-debuginfo/cygwin-debuginfo-2.2.1-1.tar.xz
similarity index 100%
rename from test/testdata/relarea/x86/release/cygwin/cygwin-debuginfo/cygwin-debuginfo-2.2.1-1.tar.xz
rename to test/testdata/relarea/x86_64/release/cygwin/cygwin-debuginfo/cygwin-debuginfo-2.2.1-1.tar.xz
diff --git a/test/testdata/relarea/x86/release/cygwin/cygwin-debuginfo/cygwin-debuginfo-2.3.0-0.3.hint b/test/testdata/relarea/x86_64/release/cygwin/cygwin-debuginfo/cygwin-debuginfo-2.3.0-0.3.hint
similarity index 100%
rename from test/testdata/relarea/x86/release/cygwin/cygwin-debuginfo/cygwin-debuginfo-2.3.0-0.3.hint
rename to test/testdata/relarea/x86_64/release/cygwin/cygwin-debuginfo/cygwin-debuginfo-2.3.0-0.3.hint
diff --git a/test/testdata/relarea/x86/release/cygwin/cygwin-debuginfo/cygwin-debuginfo-2.3.0-0.3.tar.xz b/test/testdata/relarea/x86_64/release/cygwin/cygwin-debuginfo/cygwin-debuginfo-2.3.0-0.3.tar.xz
similarity index 100%
rename from test/testdata/relarea/x86/release/cygwin/cygwin-debuginfo/cygwin-debuginfo-2.3.0-0.3.tar.xz
rename to test/testdata/relarea/x86_64/release/cygwin/cygwin-debuginfo/cygwin-debuginfo-2.3.0-0.3.tar.xz
diff --git a/test/testdata/relarea/x86/release/cygwin/cygwin-debuginfo/override.hint b/test/testdata/relarea/x86_64/release/cygwin/cygwin-debuginfo/override.hint
similarity index 100%
rename from test/testdata/relarea/x86/release/cygwin/cygwin-debuginfo/override.hint
rename to test/testdata/relarea/x86_64/release/cygwin/cygwin-debuginfo/override.hint
diff --git a/test/testdata/relarea/x86/release/cygwin/cygwin-devel/cygwin-devel-2.2.0-1.hint b/test/testdata/relarea/x86_64/release/cygwin/cygwin-devel/cygwin-devel-2.2.0-1.hint
similarity index 100%
rename from test/testdata/relarea/x86/release/cygwin/cygwin-devel/cygwin-devel-2.2.0-1.hint
rename to test/testdata/relarea/x86_64/release/cygwin/cygwin-devel/cygwin-devel-2.2.0-1.hint
diff --git a/test/testdata/relarea/x86/release/cygwin/cygwin-devel/cygwin-devel-2.2.0-1.tar.xz b/test/testdata/relarea/x86_64/release/cygwin/cygwin-devel/cygwin-devel-2.2.0-1.tar.xz
similarity index 100%
rename from test/testdata/relarea/x86/release/cygwin/cygwin-devel/cygwin-devel-2.2.0-1.tar.xz
rename to test/testdata/relarea/x86_64/release/cygwin/cygwin-devel/cygwin-devel-2.2.0-1.tar.xz
diff --git a/test/testdata/relarea/x86/release/cygwin/cygwin-devel/cygwin-devel-2.2.1-1.hint b/test/testdata/relarea/x86_64/release/cygwin/cygwin-devel/cygwin-devel-2.2.1-1.hint
similarity index 100%
rename from test/testdata/relarea/x86/release/cygwin/cygwin-devel/cygwin-devel-2.2.1-1.hint
rename to test/testdata/relarea/x86_64/release/cygwin/cygwin-devel/cygwin-devel-2.2.1-1.hint
diff --git a/test/testdata/relarea/x86/release/cygwin/cygwin-devel/cygwin-devel-2.2.1-1.tar.xz b/test/testdata/relarea/x86_64/release/cygwin/cygwin-devel/cygwin-devel-2.2.1-1.tar.xz
similarity index 100%
rename from test/testdata/relarea/x86/release/cygwin/cygwin-devel/cygwin-devel-2.2.1-1.tar.xz
rename to test/testdata/relarea/x86_64/release/cygwin/cygwin-devel/cygwin-devel-2.2.1-1.tar.xz
diff --git a/test/testdata/relarea/x86/release/cygwin/cygwin-devel/cygwin-devel-2.3.0-0.3.hint b/test/testdata/relarea/x86_64/release/cygwin/cygwin-devel/cygwin-devel-2.3.0-0.3.hint
similarity index 100%
rename from test/testdata/relarea/x86/release/cygwin/cygwin-devel/cygwin-devel-2.3.0-0.3.hint
rename to test/testdata/relarea/x86_64/release/cygwin/cygwin-devel/cygwin-devel-2.3.0-0.3.hint
diff --git a/test/testdata/relarea/x86/release/cygwin/cygwin-devel/cygwin-devel-2.3.0-0.3.tar.xz b/test/testdata/relarea/x86_64/release/cygwin/cygwin-devel/cygwin-devel-2.3.0-0.3.tar.xz
similarity index 100%
rename from test/testdata/relarea/x86/release/cygwin/cygwin-devel/cygwin-devel-2.3.0-0.3.tar.xz
rename to test/testdata/relarea/x86_64/release/cygwin/cygwin-devel/cygwin-devel-2.3.0-0.3.tar.xz
diff --git a/test/testdata/relarea/x86/release/cygwin/cygwin-devel/override.hint b/test/testdata/relarea/x86_64/release/cygwin/cygwin-devel/override.hint
similarity index 100%
rename from test/testdata/relarea/x86/release/cygwin/cygwin-devel/override.hint
rename to test/testdata/relarea/x86_64/release/cygwin/cygwin-devel/override.hint
diff --git a/test/testdata/relarea/x86/release/cygwin/override.hint b/test/testdata/relarea/x86_64/release/cygwin/override.hint
similarity index 100%
rename from test/testdata/relarea/x86/release/cygwin/override.hint
rename to test/testdata/relarea/x86_64/release/cygwin/override.hint
diff --git a/test/testdata/relarea/x86/release/invalid/invalid-0.hint b/test/testdata/relarea/x86_64/release/invalid/invalid-0.hint
similarity index 100%
rename from test/testdata/relarea/x86/release/invalid/invalid-0.hint
rename to test/testdata/relarea/x86_64/release/invalid/invalid-0.hint
diff --git a/test/testdata/relarea/x86/release/keychain/keychain-2.6.8-1-src.hint b/test/testdata/relarea/x86_64/release/keychain/keychain-2.6.8-1-src.hint
similarity index 100%
rename from test/testdata/relarea/x86/release/keychain/keychain-2.6.8-1-src.hint
rename to test/testdata/relarea/x86_64/release/keychain/keychain-2.6.8-1-src.hint
diff --git a/test/testdata/relarea/x86/release/keychain/keychain-2.6.8-1-src.tar.bz2 b/test/testdata/relarea/x86_64/release/keychain/keychain-2.6.8-1-src.tar.bz2
similarity index 100%
rename from test/testdata/relarea/x86/release/keychain/keychain-2.6.8-1-src.tar.bz2
rename to test/testdata/relarea/x86_64/release/keychain/keychain-2.6.8-1-src.tar.bz2
diff --git a/test/testdata/relarea/x86/release/keychain/keychain-2.6.8-1.hint b/test/testdata/relarea/x86_64/release/keychain/keychain-2.6.8-1.hint
similarity index 100%
rename from test/testdata/relarea/x86/release/keychain/keychain-2.6.8-1.hint
rename to test/testdata/relarea/x86_64/release/keychain/keychain-2.6.8-1.hint
diff --git a/test/testdata/relarea/x86/release/keychain/keychain-2.6.8-1.tar.bz2 b/test/testdata/relarea/x86_64/release/keychain/keychain-2.6.8-1.tar.bz2
similarity index 100%
rename from test/testdata/relarea/x86/release/keychain/keychain-2.6.8-1.tar.bz2
rename to test/testdata/relarea/x86_64/release/keychain/keychain-2.6.8-1.tar.bz2
diff --git a/test/testdata/relarea/x86/release/keychain/keychain-2.7.1-1-src.hint b/test/testdata/relarea/x86_64/release/keychain/keychain-2.7.1-1-src.hint
similarity index 100%
rename from test/testdata/relarea/x86/release/keychain/keychain-2.7.1-1-src.hint
rename to test/testdata/relarea/x86_64/release/keychain/keychain-2.7.1-1-src.hint
diff --git a/test/testdata/relarea/x86/release/keychain/keychain-2.7.1-1-src.tar.bz2 b/test/testdata/relarea/x86_64/release/keychain/keychain-2.7.1-1-src.tar.bz2
similarity index 100%
rename from test/testdata/relarea/x86/release/keychain/keychain-2.7.1-1-src.tar.bz2
rename to test/testdata/relarea/x86_64/release/keychain/keychain-2.7.1-1-src.tar.bz2
diff --git a/test/testdata/relarea/x86/release/keychain/keychain-2.7.1-1.hint b/test/testdata/relarea/x86_64/release/keychain/keychain-2.7.1-1.hint
similarity index 100%
rename from test/testdata/relarea/x86/release/keychain/keychain-2.7.1-1.hint
rename to test/testdata/relarea/x86_64/release/keychain/keychain-2.7.1-1.hint
diff --git a/test/testdata/relarea/x86/release/keychain/keychain-2.7.1-1.tar.bz2 b/test/testdata/relarea/x86_64/release/keychain/keychain-2.7.1-1.tar.bz2
similarity index 100%
rename from test/testdata/relarea/x86/release/keychain/keychain-2.7.1-1.tar.bz2
rename to test/testdata/relarea/x86_64/release/keychain/keychain-2.7.1-1.tar.bz2
diff --git a/test/testdata/relarea/x86/release/libspiro/libspiro-20071029-1.hint b/test/testdata/relarea/x86_64/release/libspiro/libspiro-20071029-1.hint
similarity index 100%
rename from test/testdata/relarea/x86/release/libspiro/libspiro-20071029-1.hint
rename to test/testdata/relarea/x86_64/release/libspiro/libspiro-20071029-1.hint
diff --git a/test/testdata/relarea/x86/release/libspiro/libspiro-devel/libspiro-devel-20071029-1.hint b/test/testdata/relarea/x86_64/release/libspiro/libspiro-devel/libspiro-devel-20071029-1.hint
similarity index 100%
rename from test/testdata/relarea/x86/release/libspiro/libspiro-devel/libspiro-devel-20071029-1.hint
rename to test/testdata/relarea/x86_64/release/libspiro/libspiro-devel/libspiro-devel-20071029-1.hint
diff --git a/test/testdata/relarea/x86/release/libspiro/libspiro0/libspiro0-20071029-1.hint b/test/testdata/relarea/x86_64/release/libspiro/libspiro0/libspiro0-20071029-1.hint
similarity index 100%
rename from test/testdata/relarea/x86/release/libspiro/libspiro0/libspiro0-20071029-1.hint
rename to test/testdata/relarea/x86_64/release/libspiro/libspiro0/libspiro0-20071029-1.hint
diff --git a/test/testdata/relarea/x86/release/libtextcat/libtextcat-2.2-2-src.hint b/test/testdata/relarea/x86_64/release/libtextcat/libtextcat-2.2-2-src.hint
similarity index 100%
rename from test/testdata/relarea/x86/release/libtextcat/libtextcat-2.2-2-src.hint
rename to test/testdata/relarea/x86_64/release/libtextcat/libtextcat-2.2-2-src.hint
diff --git a/test/testdata/relarea/x86/release/libtextcat/libtextcat-2.2-2-src.tar.bz2 b/test/testdata/relarea/x86_64/release/libtextcat/libtextcat-2.2-2-src.tar.bz2
similarity index 100%
rename from test/testdata/relarea/x86/release/libtextcat/libtextcat-2.2-2-src.tar.bz2
rename to test/testdata/relarea/x86_64/release/libtextcat/libtextcat-2.2-2-src.tar.bz2
diff --git a/test/testdata/relarea/x86/release/libtextcat/libtextcat-2.2-2.hint b/test/testdata/relarea/x86_64/release/libtextcat/libtextcat-2.2-2.hint
similarity index 100%
rename from test/testdata/relarea/x86/release/libtextcat/libtextcat-2.2-2.hint
rename to test/testdata/relarea/x86_64/release/libtextcat/libtextcat-2.2-2.hint
diff --git a/test/testdata/relarea/x86/release/libtextcat/libtextcat-2.2-2.tar.bz2 b/test/testdata/relarea/x86_64/release/libtextcat/libtextcat-2.2-2.tar.bz2
similarity index 100%
rename from test/testdata/relarea/x86/release/libtextcat/libtextcat-2.2-2.tar.bz2
rename to test/testdata/relarea/x86_64/release/libtextcat/libtextcat-2.2-2.tar.bz2
diff --git a/test/testdata/relarea/x86/release/libtextcat/libtextcat-devel/libtextcat-devel-2.2-2.hint b/test/testdata/relarea/x86_64/release/libtextcat/libtextcat-devel/libtextcat-devel-2.2-2.hint
similarity index 100%
rename from test/testdata/relarea/x86/release/libtextcat/libtextcat-devel/libtextcat-devel-2.2-2.hint
rename to test/testdata/relarea/x86_64/release/libtextcat/libtextcat-devel/libtextcat-devel-2.2-2.hint
diff --git a/test/testdata/relarea/x86/release/libtextcat/libtextcat-devel/libtextcat-devel-2.2-2.tar.bz2 b/test/testdata/relarea/x86_64/release/libtextcat/libtextcat-devel/libtextcat-devel-2.2-2.tar.bz2
similarity index 100%
rename from test/testdata/relarea/x86/release/libtextcat/libtextcat-devel/libtextcat-devel-2.2-2.tar.bz2
rename to test/testdata/relarea/x86_64/release/libtextcat/libtextcat-devel/libtextcat-devel-2.2-2.tar.bz2
diff --git a/test/testdata/relarea/x86/release/libtextcat/libtextcat0/libtextcat0-2.2-2.hint b/test/testdata/relarea/x86_64/release/libtextcat/libtextcat0/libtextcat0-2.2-2.hint
similarity index 100%
rename from test/testdata/relarea/x86/release/libtextcat/libtextcat0/libtextcat0-2.2-2.hint
rename to test/testdata/relarea/x86_64/release/libtextcat/libtextcat0/libtextcat0-2.2-2.hint
diff --git a/test/testdata/relarea/x86/release/libtextcat/libtextcat0/libtextcat0-2.2-2.tar.bz2 b/test/testdata/relarea/x86_64/release/libtextcat/libtextcat0/libtextcat0-2.2-2.tar.bz2
similarity index 100%
rename from test/testdata/relarea/x86/release/libtextcat/libtextcat0/libtextcat0-2.2-2.tar.bz2
rename to test/testdata/relarea/x86_64/release/libtextcat/libtextcat0/libtextcat0-2.2-2.tar.bz2
diff --git a/test/testdata/relarea/x86/release/mDNSResponder/libdns_sd-devel/libdns_sd-devel-379.32.1-1.hint b/test/testdata/relarea/x86_64/release/mDNSResponder/libdns_sd-devel/libdns_sd-devel-379.32.1-1.hint
similarity index 100%
rename from test/testdata/relarea/x86/release/mDNSResponder/libdns_sd-devel/libdns_sd-devel-379.32.1-1.hint
rename to test/testdata/relarea/x86_64/release/mDNSResponder/libdns_sd-devel/libdns_sd-devel-379.32.1-1.hint
diff --git a/test/testdata/relarea/x86/release/mDNSResponder/libdns_sd-devel/libdns_sd-devel-379.32.1-1.tar.bz2 b/test/testdata/relarea/x86_64/release/mDNSResponder/libdns_sd-devel/libdns_sd-devel-379.32.1-1.tar.bz2
similarity index 100%
rename from test/testdata/relarea/x86/release/mDNSResponder/libdns_sd-devel/libdns_sd-devel-379.32.1-1.tar.bz2
rename to test/testdata/relarea/x86_64/release/mDNSResponder/libdns_sd-devel/libdns_sd-devel-379.32.1-1.tar.bz2
diff --git a/test/testdata/relarea/x86/release/mDNSResponder/libdns_sd1/libdns_sd1-379.32.1-1.hint b/test/testdata/relarea/x86_64/release/mDNSResponder/libdns_sd1/libdns_sd1-379.32.1-1.hint
similarity index 100%
rename from test/testdata/relarea/x86/release/mDNSResponder/libdns_sd1/libdns_sd1-379.32.1-1.hint
rename to test/testdata/relarea/x86_64/release/mDNSResponder/libdns_sd1/libdns_sd1-379.32.1-1.hint
diff --git a/test/testdata/relarea/x86/release/mDNSResponder/libdns_sd1/libdns_sd1-379.32.1-1.tar.bz2 b/test/testdata/relarea/x86_64/release/mDNSResponder/libdns_sd1/libdns_sd1-379.32.1-1.tar.bz2
similarity index 100%
rename from test/testdata/relarea/x86/release/mDNSResponder/libdns_sd1/libdns_sd1-379.32.1-1.tar.bz2
rename to test/testdata/relarea/x86_64/release/mDNSResponder/libdns_sd1/libdns_sd1-379.32.1-1.tar.bz2
diff --git a/test/testdata/relarea/x86/release/mDNSResponder/mDNSResponder-379.32.1-1-src.hint b/test/testdata/relarea/x86_64/release/mDNSResponder/mDNSResponder-379.32.1-1-src.hint
similarity index 100%
rename from test/testdata/relarea/x86/release/mDNSResponder/mDNSResponder-379.32.1-1-src.hint
rename to test/testdata/relarea/x86_64/release/mDNSResponder/mDNSResponder-379.32.1-1-src.hint
diff --git a/test/testdata/relarea/x86/release/mDNSResponder/mDNSResponder-379.32.1-1-src.tar.bz2 b/test/testdata/relarea/x86_64/release/mDNSResponder/mDNSResponder-379.32.1-1-src.tar.bz2
similarity index 100%
rename from test/testdata/relarea/x86/release/mDNSResponder/mDNSResponder-379.32.1-1-src.tar.bz2
rename to test/testdata/relarea/x86_64/release/mDNSResponder/mDNSResponder-379.32.1-1-src.tar.bz2
diff --git a/test/testdata/relarea/x86/release/mDNSResponder/mDNSResponder-379.32.1-1.hint b/test/testdata/relarea/x86_64/release/mDNSResponder/mDNSResponder-379.32.1-1.hint
similarity index 100%
rename from test/testdata/relarea/x86/release/mDNSResponder/mDNSResponder-379.32.1-1.hint
rename to test/testdata/relarea/x86_64/release/mDNSResponder/mDNSResponder-379.32.1-1.hint
diff --git a/test/testdata/relarea/x86/release/mDNSResponder/mDNSResponder-379.32.1-1.tar.bz2 b/test/testdata/relarea/x86_64/release/mDNSResponder/mDNSResponder-379.32.1-1.tar.bz2
similarity index 100%
rename from test/testdata/relarea/x86/release/mDNSResponder/mDNSResponder-379.32.1-1.tar.bz2
rename to test/testdata/relarea/x86_64/release/mDNSResponder/mDNSResponder-379.32.1-1.tar.bz2
diff --git a/test/testdata/relarea/x86/release/mingw64-i686-binutils/mingw64-i686-binutils-2.29.1.787c9873-1.hint b/test/testdata/relarea/x86_64/release/mingw64-i686-binutils/mingw64-i686-binutils-2.29.1.787c9873-1.hint
similarity index 100%
rename from test/testdata/relarea/x86/release/mingw64-i686-binutils/mingw64-i686-binutils-2.29.1.787c9873-1.hint
rename to test/testdata/relarea/x86_64/release/mingw64-i686-binutils/mingw64-i686-binutils-2.29.1.787c9873-1.hint
diff --git a/test/testdata/relarea/x86/release/mingw64-i686-binutils/mingw64-i686-binutils-debuginfo/mingw64-i686-binutils-debuginfo-2.29.1.787c9873-1.hint b/test/testdata/relarea/x86_64/release/mingw64-i686-binutils/mingw64-i686-binutils-debuginfo/mingw64-i686-binutils-debuginfo-2.29.1.787c9873-1.hint
similarity index 100%
rename from test/testdata/relarea/x86/release/mingw64-i686-binutils/mingw64-i686-binutils-debuginfo/mingw64-i686-binutils-debuginfo-2.29.1.787c9873-1.hint
rename to test/testdata/relarea/x86_64/release/mingw64-i686-binutils/mingw64-i686-binutils-debuginfo/mingw64-i686-binutils-debuginfo-2.29.1.787c9873-1.hint
diff --git a/test/testdata/relarea/x86/release/openssh/openssh-7.2p2-1-src.hint b/test/testdata/relarea/x86_64/release/openssh/openssh-7.2p2-1-src.hint
similarity index 100%
rename from test/testdata/relarea/x86/release/openssh/openssh-7.2p2-1-src.hint
rename to test/testdata/relarea/x86_64/release/openssh/openssh-7.2p2-1-src.hint
diff --git a/test/testdata/relarea/x86/release/openssh/openssh-7.2p2-1-src.tar.xz b/test/testdata/relarea/x86_64/release/openssh/openssh-7.2p2-1-src.tar.xz
similarity index 100%
rename from test/testdata/relarea/x86/release/openssh/openssh-7.2p2-1-src.tar.xz
rename to test/testdata/relarea/x86_64/release/openssh/openssh-7.2p2-1-src.tar.xz
diff --git a/test/testdata/relarea/x86/release/openssh/openssh-7.2p2-1.hint b/test/testdata/relarea/x86_64/release/openssh/openssh-7.2p2-1.hint
similarity index 100%
rename from test/testdata/relarea/x86/release/openssh/openssh-7.2p2-1.hint
rename to test/testdata/relarea/x86_64/release/openssh/openssh-7.2p2-1.hint
diff --git a/test/testdata/relarea/x86/release/openssh/openssh-7.2p2-1.tar.xz b/test/testdata/relarea/x86_64/release/openssh/openssh-7.2p2-1.tar.xz
similarity index 100%
rename from test/testdata/relarea/x86/release/openssh/openssh-7.2p2-1.tar.xz
rename to test/testdata/relarea/x86_64/release/openssh/openssh-7.2p2-1.tar.xz
diff --git a/test/testdata/relarea/x86/release/per-version-incomplete/override.hint b/test/testdata/relarea/x86_64/release/per-version-incomplete/override.hint
similarity index 100%
rename from test/testdata/relarea/x86/release/per-version-incomplete/override.hint
rename to test/testdata/relarea/x86_64/release/per-version-incomplete/override.hint
diff --git a/test/testdata/relarea/x86/release/per-version-incomplete/per-version-incomplete-36-1-src.hint b/test/testdata/relarea/x86_64/release/per-version-incomplete/per-version-incomplete-36-1-src.hint
similarity index 100%
rename from test/testdata/relarea/x86/release/per-version-incomplete/per-version-incomplete-36-1-src.hint
rename to test/testdata/relarea/x86_64/release/per-version-incomplete/per-version-incomplete-36-1-src.hint
diff --git a/test/testdata/relarea/x86/release/per-version-incomplete/per-version-incomplete-36-1-src.tar.xz b/test/testdata/relarea/x86_64/release/per-version-incomplete/per-version-incomplete-36-1-src.tar.xz
similarity index 100%
rename from test/testdata/relarea/x86/release/per-version-incomplete/per-version-incomplete-36-1-src.tar.xz
rename to test/testdata/relarea/x86_64/release/per-version-incomplete/per-version-incomplete-36-1-src.tar.xz
diff --git a/test/testdata/relarea/x86/release/per-version-incomplete/per-version-incomplete-36-1.hint b/test/testdata/relarea/x86_64/release/per-version-incomplete/per-version-incomplete-36-1.hint
similarity index 100%
rename from test/testdata/relarea/x86/release/per-version-incomplete/per-version-incomplete-36-1.hint
rename to test/testdata/relarea/x86_64/release/per-version-incomplete/per-version-incomplete-36-1.hint
diff --git a/test/testdata/relarea/x86/release/per-version-incomplete/per-version-incomplete-36-1.tar.xz b/test/testdata/relarea/x86_64/release/per-version-incomplete/per-version-incomplete-36-1.tar.xz
similarity index 100%
rename from test/testdata/relarea/x86/release/per-version-incomplete/per-version-incomplete-36-1.tar.xz
rename to test/testdata/relarea/x86_64/release/per-version-incomplete/per-version-incomplete-36-1.tar.xz
diff --git a/test/testdata/relarea/x86/release/per-version-incomplete/per-version-incomplete-39-1-src.tar.xz b/test/testdata/relarea/x86_64/release/per-version-incomplete/per-version-incomplete-39-1-src.tar.xz
similarity index 100%
rename from test/testdata/relarea/x86/release/per-version-incomplete/per-version-incomplete-39-1-src.tar.xz
rename to test/testdata/relarea/x86_64/release/per-version-incomplete/per-version-incomplete-39-1-src.tar.xz
diff --git a/test/testdata/relarea/x86/release/per-version-incomplete/per-version-incomplete-39-1.tar.xz b/test/testdata/relarea/x86_64/release/per-version-incomplete/per-version-incomplete-39-1.tar.xz
similarity index 100%
rename from test/testdata/relarea/x86/release/per-version-incomplete/per-version-incomplete-39-1.tar.xz
rename to test/testdata/relarea/x86_64/release/per-version-incomplete/per-version-incomplete-39-1.tar.xz
diff --git a/test/testdata/relarea/x86/release/per-version-replacement-hint-only/per-version-replacement-hint-only-1.0-1-src.hint b/test/testdata/relarea/x86_64/release/per-version-replacement-hint-only/per-version-replacement-hint-only-1.0-1-src.hint
similarity index 100%
rename from test/testdata/relarea/x86/release/per-version-replacement-hint-only/per-version-replacement-hint-only-1.0-1-src.hint
rename to test/testdata/relarea/x86_64/release/per-version-replacement-hint-only/per-version-replacement-hint-only-1.0-1-src.hint
diff --git a/test/testdata/relarea/x86/release/per-version-replacement-hint-only/per-version-replacement-hint-only-1.0-1-src.tar.xz b/test/testdata/relarea/x86_64/release/per-version-replacement-hint-only/per-version-replacement-hint-only-1.0-1-src.tar.xz
similarity index 100%
rename from test/testdata/relarea/x86/release/per-version-replacement-hint-only/per-version-replacement-hint-only-1.0-1-src.tar.xz
rename to test/testdata/relarea/x86_64/release/per-version-replacement-hint-only/per-version-replacement-hint-only-1.0-1-src.tar.xz
diff --git a/test/testdata/relarea/x86/release/per-version-replacement-hint-only/per-version-replacement-hint-only-1.0-1.hint b/test/testdata/relarea/x86_64/release/per-version-replacement-hint-only/per-version-replacement-hint-only-1.0-1.hint
similarity index 100%
rename from test/testdata/relarea/x86/release/per-version-replacement-hint-only/per-version-replacement-hint-only-1.0-1.hint
rename to test/testdata/relarea/x86_64/release/per-version-replacement-hint-only/per-version-replacement-hint-only-1.0-1.hint
diff --git a/test/testdata/relarea/x86/release/per-version-replacement-hint-only/per-version-replacement-hint-only-1.0-1.tar.xz b/test/testdata/relarea/x86_64/release/per-version-replacement-hint-only/per-version-replacement-hint-only-1.0-1.tar.xz
similarity index 100%
rename from test/testdata/relarea/x86/release/per-version-replacement-hint-only/per-version-replacement-hint-only-1.0-1.tar.xz
rename to test/testdata/relarea/x86_64/release/per-version-replacement-hint-only/per-version-replacement-hint-only-1.0-1.tar.xz
diff --git a/test/testdata/relarea/x86/release/per-version/override.hint b/test/testdata/relarea/x86_64/release/per-version/override.hint
similarity index 100%
rename from test/testdata/relarea/x86/release/per-version/override.hint
rename to test/testdata/relarea/x86_64/release/per-version/override.hint
diff --git a/test/testdata/relarea/x86/release/per-version/per-version-4.0-1-src.hint b/test/testdata/relarea/x86_64/release/per-version/per-version-4.0-1-src.hint
similarity index 100%
rename from test/testdata/relarea/x86/release/per-version/per-version-4.0-1-src.hint
rename to test/testdata/relarea/x86_64/release/per-version/per-version-4.0-1-src.hint
diff --git a/test/testdata/relarea/x86/release/per-version/per-version-4.0-1-src.tar.xz b/test/testdata/relarea/x86_64/release/per-version/per-version-4.0-1-src.tar.xz
similarity index 100%
rename from test/testdata/relarea/x86/release/per-version/per-version-4.0-1-src.tar.xz
rename to test/testdata/relarea/x86_64/release/per-version/per-version-4.0-1-src.tar.xz
diff --git a/test/testdata/relarea/x86/release/per-version/per-version-4.0-1.hint b/test/testdata/relarea/x86_64/release/per-version/per-version-4.0-1.hint
similarity index 100%
rename from test/testdata/relarea/x86/release/per-version/per-version-4.0-1.hint
rename to test/testdata/relarea/x86_64/release/per-version/per-version-4.0-1.hint
diff --git a/test/testdata/relarea/x86/release/per-version/per-version-4.0-1.tar.xz b/test/testdata/relarea/x86_64/release/per-version/per-version-4.0-1.tar.xz
similarity index 100%
rename from test/testdata/relarea/x86/release/per-version/per-version-4.0-1.tar.xz
rename to test/testdata/relarea/x86_64/release/per-version/per-version-4.0-1.tar.xz
diff --git a/test/testdata/relarea/x86/release/per-version/per-version-4.8-1-src.hint b/test/testdata/relarea/x86_64/release/per-version/per-version-4.8-1-src.hint
similarity index 100%
rename from test/testdata/relarea/x86/release/per-version/per-version-4.8-1-src.hint
rename to test/testdata/relarea/x86_64/release/per-version/per-version-4.8-1-src.hint
diff --git a/test/testdata/relarea/x86/release/per-version/per-version-4.8-1-src.tar.xz b/test/testdata/relarea/x86_64/release/per-version/per-version-4.8-1-src.tar.xz
similarity index 100%
rename from test/testdata/relarea/x86/release/per-version/per-version-4.8-1-src.tar.xz
rename to test/testdata/relarea/x86_64/release/per-version/per-version-4.8-1-src.tar.xz
diff --git a/test/testdata/relarea/x86/release/per-version/per-version-4.8-1.hint b/test/testdata/relarea/x86_64/release/per-version/per-version-4.8-1.hint
similarity index 100%
rename from test/testdata/relarea/x86/release/per-version/per-version-4.8-1.hint
rename to test/testdata/relarea/x86_64/release/per-version/per-version-4.8-1.hint
diff --git a/test/testdata/relarea/x86/release/per-version/per-version-4.8-1.tar.xz b/test/testdata/relarea/x86_64/release/per-version/per-version-4.8-1.tar.xz
similarity index 100%
rename from test/testdata/relarea/x86/release/per-version/per-version-4.8-1.tar.xz
rename to test/testdata/relarea/x86_64/release/per-version/per-version-4.8-1.tar.xz
diff --git a/test/testdata/relarea/x86/release/proj/libproj-devel/libproj-devel-4.8.0-1.hint b/test/testdata/relarea/x86_64/release/proj/libproj-devel/libproj-devel-4.8.0-1.hint
similarity index 100%
rename from test/testdata/relarea/x86/release/proj/libproj-devel/libproj-devel-4.8.0-1.hint
rename to test/testdata/relarea/x86_64/release/proj/libproj-devel/libproj-devel-4.8.0-1.hint
diff --git a/test/testdata/relarea/x86/release/proj/libproj1/libproj1-4.8.0-1.hint b/test/testdata/relarea/x86_64/release/proj/libproj1/libproj1-4.8.0-1.hint
similarity index 100%
rename from test/testdata/relarea/x86/release/proj/libproj1/libproj1-4.8.0-1.hint
rename to test/testdata/relarea/x86_64/release/proj/libproj1/libproj1-4.8.0-1.hint
diff --git a/test/testdata/relarea/x86/release/proj/proj-4.8.0-1.hint b/test/testdata/relarea/x86_64/release/proj/proj-4.8.0-1.hint
similarity index 100%
rename from test/testdata/relarea/x86/release/proj/proj-4.8.0-1.hint
rename to test/testdata/relarea/x86_64/release/proj/proj-4.8.0-1.hint
diff --git a/test/testdata/relarea/x86/release/rpm-doc/rpm-doc-4.1-2-src.hint b/test/testdata/relarea/x86_64/release/rpm-doc/rpm-doc-4.1-2-src.hint
similarity index 100%
rename from test/testdata/relarea/x86/release/rpm-doc/rpm-doc-4.1-2-src.hint
rename to test/testdata/relarea/x86_64/release/rpm-doc/rpm-doc-4.1-2-src.hint
diff --git a/test/testdata/relarea/x86/release/rpm-doc/rpm-doc-4.1-2-src.tar.bz2 b/test/testdata/relarea/x86_64/release/rpm-doc/rpm-doc-4.1-2-src.tar.bz2
similarity index 100%
rename from test/testdata/relarea/x86/release/rpm-doc/rpm-doc-4.1-2-src.tar.bz2
rename to test/testdata/relarea/x86_64/release/rpm-doc/rpm-doc-4.1-2-src.tar.bz2
diff --git a/test/testdata/relarea/x86/release/rpm-doc/rpm-doc-4.1-2.hint b/test/testdata/relarea/x86_64/release/rpm-doc/rpm-doc-4.1-2.hint
similarity index 100%
rename from test/testdata/relarea/x86/release/rpm-doc/rpm-doc-4.1-2.hint
rename to test/testdata/relarea/x86_64/release/rpm-doc/rpm-doc-4.1-2.hint
diff --git a/test/testdata/relarea/x86/release/rpm-doc/rpm-doc-4.1-2.tar.bz2 b/test/testdata/relarea/x86_64/release/rpm-doc/rpm-doc-4.1-2.tar.bz2
similarity index 100%
rename from test/testdata/relarea/x86/release/rpm-doc/rpm-doc-4.1-2.tar.bz2
rename to test/testdata/relarea/x86_64/release/rpm-doc/rpm-doc-4.1-2.tar.bz2
diff --git a/test/testdata/relarea/x86/release/rpm-doc/rpm-doc-999-1.hint b/test/testdata/relarea/x86_64/release/rpm-doc/rpm-doc-999-1.hint
similarity index 100%
rename from test/testdata/relarea/x86/release/rpm-doc/rpm-doc-999-1.hint
rename to test/testdata/relarea/x86_64/release/rpm-doc/rpm-doc-999-1.hint
diff --git a/test/testdata/relarea/x86/release/rpm-doc/rpm-doc-999-1.tar.bz2 b/test/testdata/relarea/x86_64/release/rpm-doc/rpm-doc-999-1.tar.bz2
similarity index 100%
rename from test/testdata/relarea/x86/release/rpm-doc/rpm-doc-999-1.tar.bz2
rename to test/testdata/relarea/x86_64/release/rpm-doc/rpm-doc-999-1.tar.bz2
diff --git a/test/testdata/relarea/x86/release/splint/splint-3.1.2-1.hint b/test/testdata/relarea/x86_64/release/splint/splint-3.1.2-1.hint
similarity index 100%
rename from test/testdata/relarea/x86/release/splint/splint-3.1.2-1.hint
rename to test/testdata/relarea/x86_64/release/splint/splint-3.1.2-1.hint
diff --git a/test/testdata/relarea/x86/release/staleversion/override.hint b/test/testdata/relarea/x86_64/release/staleversion/override.hint
similarity index 100%
rename from test/testdata/relarea/x86/release/staleversion/override.hint
rename to test/testdata/relarea/x86_64/release/staleversion/override.hint
diff --git a/test/testdata/relarea/x86/release/staleversion/staleversion-240-1-src.hint b/test/testdata/relarea/x86_64/release/staleversion/staleversion-240-1-src.hint
similarity index 100%
rename from test/testdata/relarea/x86/release/staleversion/staleversion-240-1-src.hint
rename to test/testdata/relarea/x86_64/release/staleversion/staleversion-240-1-src.hint
diff --git a/test/testdata/relarea/x86/release/staleversion/staleversion-240-1-src.tar.xz b/test/testdata/relarea/x86_64/release/staleversion/staleversion-240-1-src.tar.xz
similarity index 100%
rename from test/testdata/relarea/x86/release/staleversion/staleversion-240-1-src.tar.xz
rename to test/testdata/relarea/x86_64/release/staleversion/staleversion-240-1-src.tar.xz
diff --git a/test/testdata/relarea/x86/release/staleversion/staleversion-240-1.hint b/test/testdata/relarea/x86_64/release/staleversion/staleversion-240-1.hint
similarity index 100%
rename from test/testdata/relarea/x86/release/staleversion/staleversion-240-1.hint
rename to test/testdata/relarea/x86_64/release/staleversion/staleversion-240-1.hint
diff --git a/test/testdata/relarea/x86/release/staleversion/staleversion-240-1.tar.xz b/test/testdata/relarea/x86_64/release/staleversion/staleversion-240-1.tar.xz
similarity index 100%
rename from test/testdata/relarea/x86/release/staleversion/staleversion-240-1.tar.xz
rename to test/testdata/relarea/x86_64/release/staleversion/staleversion-240-1.tar.xz
diff --git a/test/testdata/relarea/x86/release/staleversion/staleversion-242-0-src.hint b/test/testdata/relarea/x86_64/release/staleversion/staleversion-242-0-src.hint
similarity index 100%
rename from test/testdata/relarea/x86/release/staleversion/staleversion-242-0-src.hint
rename to test/testdata/relarea/x86_64/release/staleversion/staleversion-242-0-src.hint
diff --git a/test/testdata/relarea/x86/release/staleversion/staleversion-242-0-src.tar.xz b/test/testdata/relarea/x86_64/release/staleversion/staleversion-242-0-src.tar.xz
similarity index 100%
rename from test/testdata/relarea/x86/release/staleversion/staleversion-242-0-src.tar.xz
rename to test/testdata/relarea/x86_64/release/staleversion/staleversion-242-0-src.tar.xz
diff --git a/test/testdata/relarea/x86/release/staleversion/staleversion-242-0.hint b/test/testdata/relarea/x86_64/release/staleversion/staleversion-242-0.hint
similarity index 100%
rename from test/testdata/relarea/x86/release/staleversion/staleversion-242-0.hint
rename to test/testdata/relarea/x86_64/release/staleversion/staleversion-242-0.hint
diff --git a/test/testdata/relarea/x86/release/staleversion/staleversion-242-0.tar.xz b/test/testdata/relarea/x86_64/release/staleversion/staleversion-242-0.tar.xz
similarity index 100%
rename from test/testdata/relarea/x86/release/staleversion/staleversion-242-0.tar.xz
rename to test/testdata/relarea/x86_64/release/staleversion/staleversion-242-0.tar.xz
diff --git a/test/testdata/relarea/x86/release/staleversion/staleversion-243-0-src.hint b/test/testdata/relarea/x86_64/release/staleversion/staleversion-243-0-src.hint
similarity index 100%
rename from test/testdata/relarea/x86/release/staleversion/staleversion-243-0-src.hint
rename to test/testdata/relarea/x86_64/release/staleversion/staleversion-243-0-src.hint
diff --git a/test/testdata/relarea/x86/release/staleversion/staleversion-243-0-src.tar.xz b/test/testdata/relarea/x86_64/release/staleversion/staleversion-243-0-src.tar.xz
similarity index 100%
rename from test/testdata/relarea/x86/release/staleversion/staleversion-243-0-src.tar.xz
rename to test/testdata/relarea/x86_64/release/staleversion/staleversion-243-0-src.tar.xz
diff --git a/test/testdata/relarea/x86/release/staleversion/staleversion-243-0.hint b/test/testdata/relarea/x86_64/release/staleversion/staleversion-243-0.hint
similarity index 100%
rename from test/testdata/relarea/x86/release/staleversion/staleversion-243-0.hint
rename to test/testdata/relarea/x86_64/release/staleversion/staleversion-243-0.hint
diff --git a/test/testdata/relarea/x86/release/staleversion/staleversion-243-0.tar.xz b/test/testdata/relarea/x86_64/release/staleversion/staleversion-243-0.tar.xz
similarity index 100%
rename from test/testdata/relarea/x86/release/staleversion/staleversion-243-0.tar.xz
rename to test/testdata/relarea/x86_64/release/staleversion/staleversion-243-0.tar.xz
diff --git a/test/testdata/relarea/x86/release/staleversion/staleversion-250-0-src.hint b/test/testdata/relarea/x86_64/release/staleversion/staleversion-250-0-src.hint
similarity index 100%
rename from test/testdata/relarea/x86/release/staleversion/staleversion-250-0-src.hint
rename to test/testdata/relarea/x86_64/release/staleversion/staleversion-250-0-src.hint
diff --git a/test/testdata/relarea/x86/release/staleversion/staleversion-250-0-src.tar.xz b/test/testdata/relarea/x86_64/release/staleversion/staleversion-250-0-src.tar.xz
similarity index 100%
rename from test/testdata/relarea/x86/release/staleversion/staleversion-250-0-src.tar.xz
rename to test/testdata/relarea/x86_64/release/staleversion/staleversion-250-0-src.tar.xz
diff --git a/test/testdata/relarea/x86/release/staleversion/staleversion-250-0.hint b/test/testdata/relarea/x86_64/release/staleversion/staleversion-250-0.hint
similarity index 100%
rename from test/testdata/relarea/x86/release/staleversion/staleversion-250-0.hint
rename to test/testdata/relarea/x86_64/release/staleversion/staleversion-250-0.hint
diff --git a/test/testdata/relarea/x86/release/staleversion/staleversion-250-0.tar.xz b/test/testdata/relarea/x86_64/release/staleversion/staleversion-250-0.tar.xz
similarity index 100%
rename from test/testdata/relarea/x86/release/staleversion/staleversion-250-0.tar.xz
rename to test/testdata/relarea/x86_64/release/staleversion/staleversion-250-0.tar.xz
diff --git a/test/testdata/relarea/x86/release/staleversion/staleversion-251-0-src.hint b/test/testdata/relarea/x86_64/release/staleversion/staleversion-251-0-src.hint
similarity index 100%
rename from test/testdata/relarea/x86/release/staleversion/staleversion-251-0-src.hint
rename to test/testdata/relarea/x86_64/release/staleversion/staleversion-251-0-src.hint
diff --git a/test/testdata/relarea/x86/release/staleversion/staleversion-251-0-src.tar.xz b/test/testdata/relarea/x86_64/release/staleversion/staleversion-251-0-src.tar.xz
similarity index 100%
rename from test/testdata/relarea/x86/release/staleversion/staleversion-251-0-src.tar.xz
rename to test/testdata/relarea/x86_64/release/staleversion/staleversion-251-0-src.tar.xz
diff --git a/test/testdata/relarea/x86/release/staleversion/staleversion-251-0.hint b/test/testdata/relarea/x86_64/release/staleversion/staleversion-251-0.hint
similarity index 100%
rename from test/testdata/relarea/x86/release/staleversion/staleversion-251-0.hint
rename to test/testdata/relarea/x86_64/release/staleversion/staleversion-251-0.hint
diff --git a/test/testdata/relarea/x86/release/staleversion/staleversion-251-0.tar.xz b/test/testdata/relarea/x86_64/release/staleversion/staleversion-251-0.tar.xz
similarity index 100%
rename from test/testdata/relarea/x86/release/staleversion/staleversion-251-0.tar.xz
rename to test/testdata/relarea/x86_64/release/staleversion/staleversion-251-0.tar.xz
diff --git a/test/testdata/relarea/x86/release/staleversion/staleversion-260-0-src.hint b/test/testdata/relarea/x86_64/release/staleversion/staleversion-260-0-src.hint
similarity index 100%
rename from test/testdata/relarea/x86/release/staleversion/staleversion-260-0-src.hint
rename to test/testdata/relarea/x86_64/release/staleversion/staleversion-260-0-src.hint
diff --git a/test/testdata/relarea/x86/release/staleversion/staleversion-260-0-src.tar.xz b/test/testdata/relarea/x86_64/release/staleversion/staleversion-260-0-src.tar.xz
similarity index 100%
rename from test/testdata/relarea/x86/release/staleversion/staleversion-260-0-src.tar.xz
rename to test/testdata/relarea/x86_64/release/staleversion/staleversion-260-0-src.tar.xz
diff --git a/test/testdata/relarea/x86/release/staleversion/staleversion-260-0.hint b/test/testdata/relarea/x86_64/release/staleversion/staleversion-260-0.hint
similarity index 100%
rename from test/testdata/relarea/x86/release/staleversion/staleversion-260-0.hint
rename to test/testdata/relarea/x86_64/release/staleversion/staleversion-260-0.hint
diff --git a/test/testdata/relarea/x86/release/staleversion/staleversion-260-0.tar.xz b/test/testdata/relarea/x86_64/release/staleversion/staleversion-260-0.tar.xz
similarity index 100%
rename from test/testdata/relarea/x86/release/staleversion/staleversion-260-0.tar.xz
rename to test/testdata/relarea/x86_64/release/staleversion/staleversion-260-0.tar.xz
diff --git a/test/testdata/relarea/x86/release/testpackage/testpackage-0.1-1-src.hint b/test/testdata/relarea/x86_64/release/testpackage/testpackage-0.1-1-src.hint
similarity index 100%
rename from test/testdata/relarea/x86/release/testpackage/testpackage-0.1-1-src.hint
rename to test/testdata/relarea/x86_64/release/testpackage/testpackage-0.1-1-src.hint
diff --git a/test/testdata/relarea/x86/release/testpackage/testpackage-0.1-1-src.tar.bz2 b/test/testdata/relarea/x86_64/release/testpackage/testpackage-0.1-1-src.tar.bz2
similarity index 100%
rename from test/testdata/relarea/x86/release/testpackage/testpackage-0.1-1-src.tar.bz2
rename to test/testdata/relarea/x86_64/release/testpackage/testpackage-0.1-1-src.tar.bz2
diff --git a/test/testdata/relarea/x86/release/testpackage/testpackage-0.1-1.hint b/test/testdata/relarea/x86_64/release/testpackage/testpackage-0.1-1.hint
similarity index 100%
rename from test/testdata/relarea/x86/release/testpackage/testpackage-0.1-1.hint
rename to test/testdata/relarea/x86_64/release/testpackage/testpackage-0.1-1.hint
diff --git a/test/testdata/relarea/x86/release/testpackage/testpackage-0.1-1.tar.bz2 b/test/testdata/relarea/x86_64/release/testpackage/testpackage-0.1-1.tar.bz2
similarity index 100%
rename from test/testdata/relarea/x86/release/testpackage/testpackage-0.1-1.tar.bz2
rename to test/testdata/relarea/x86_64/release/testpackage/testpackage-0.1-1.tar.bz2
diff --git a/test/testdata/uploads/move.expected b/test/testdata/uploads/move.expected
index c0112d2..e68c930 100644
--- a/test/testdata/uploads/move.expected
+++ b/test/testdata/uploads/move.expected
@@ -1,12 +1,12 @@
-{'x86/release/testpackage': ['testpackage-1.0-1-src.hint',
-                             'testpackage-1.0-1-src.tar.bz2',
-                             'testpackage-1.0-1.hint',
-                             'testpackage-1.0-1.tar.bz2'],
- 'x86/release/testpackage-zstd': ['testpackage-zstd-1.0-1-src.hint',
-                                  'testpackage-zstd-1.0-1-src.tar.zst',
-                                  'testpackage-zstd-1.0-1.hint',
-                                  'testpackage-zstd-1.0-1.tar.zst'],
- 'x86/release/testpackage/testpackage-subpackage': ['testpackage-subpackage-1.0-1.hint',
-                                                    'testpackage-subpackage-1.0-1.tar.bz2'],
- 'x86/release/testpackage2/testpackage2-subpackage': ['testpackage2-subpackage-1.0-1.hint',
-                                                      'testpackage2-subpackage-1.0-1.tar.bz2']}
+{'x86_64/release/testpackage': ['testpackage-1.0-1-src.hint',
+                                'testpackage-1.0-1-src.tar.bz2',
+                                'testpackage-1.0-1.hint',
+                                'testpackage-1.0-1.tar.bz2'],
+ 'x86_64/release/testpackage-zstd': ['testpackage-zstd-1.0-1-src.hint',
+                                     'testpackage-zstd-1.0-1-src.tar.zst',
+                                     'testpackage-zstd-1.0-1.hint',
+                                     'testpackage-zstd-1.0-1.tar.zst'],
+ 'x86_64/release/testpackage/testpackage-subpackage': ['testpackage-subpackage-1.0-1.hint',
+                                                       'testpackage-subpackage-1.0-1.tar.bz2'],
+ 'x86_64/release/testpackage2/testpackage2-subpackage': ['testpackage2-subpackage-1.0-1.hint',
+                                                         'testpackage2-subpackage-1.0-1.tar.bz2']}
diff --git a/test/testdata/uploads/pkglist.expected b/test/testdata/uploads/pkglist.expected
index 538f40f..72489ac 100644
--- a/test/testdata/uploads/pkglist.expected
+++ b/test/testdata/uploads/pkglist.expected
@@ -1,11 +1,11 @@
-{'testpackage': Package('testpackage', {'1.0-1': Tar('testpackage-1.0-1.tar.bz2', 'x86/release/testpackage', 'aff488008bee3486e25b539fe6ccd1397bd3c5c0ba2ee2cf34af279554baa195af7493ee51d6f8510735c9a2ea54436d776a71e768165716762aec286abbbf83', 195, False)}, {'1.0-1': {'sdesc': '"A test package"',
+{'testpackage': Package('testpackage', {'1.0-1': Tar('testpackage-1.0-1.tar.bz2', 'x86_64/release/testpackage', 'aff488008bee3486e25b539fe6ccd1397bd3c5c0ba2ee2cf34af279554baa195af7493ee51d6f8510735c9a2ea54436d776a71e768165716762aec286abbbf83', 195, False)}, {'1.0-1': {'sdesc': '"A test package"',
            'ldesc': '"A test package\n'
                     "It's description might contains some unicode junk\n"
                     'Like it’s you’re Markup Language™ Nokogiri’s tool―that '
                     'Bézier."',
            'category': 'Devel',
            'depends': 'cygwin'}}, {}, False),
- 'testpackage-src': Package('testpackage', {'1.0-1': Tar('testpackage-1.0-1-src.tar.bz2', 'x86/release/testpackage', 'acfd77df3347e6432ccf29c12989964bc680a158d574f85dfa7ef222759f411006c7bd2773e37c5abdee628bea769b2da9aae213db615cd91402fd385373933d', 266, False)}, {'1.0-1': {'sdesc': '"A test package"',
+ 'testpackage-src': Package('testpackage', {'1.0-1': Tar('testpackage-1.0-1-src.tar.bz2', 'x86_64/release/testpackage', 'acfd77df3347e6432ccf29c12989964bc680a158d574f85dfa7ef222759f411006c7bd2773e37c5abdee628bea769b2da9aae213db615cd91402fd385373933d', 266, False)}, {'1.0-1': {'sdesc': '"A test package"',
            'ldesc': '"A test package\n'
                     "It's description might contains some unicode junk\n"
                     'Like it’s you’re Markup Language™ Nokogiri’s tool―that '
@@ -14,16 +14,16 @@
            'homepage': 'http://homepage.url',
            'parse-warnings': ["key 'license' missing"],
            'depends': ''}}, {}, False),
- 'testpackage-subpackage': Package('testpackage/testpackage-subpackage', {'1.0-1': Tar('testpackage-subpackage-1.0-1.tar.bz2', 'x86/release/testpackage/testpackage-subpackage', 'aff488008bee3486e25b539fe6ccd1397bd3c5c0ba2ee2cf34af279554baa195af7493ee51d6f8510735c9a2ea54436d776a71e768165716762aec286abbbf83', 195, False)}, {'1.0-1': {'sdesc': '"A test subpackage"',
+ 'testpackage-subpackage': Package('testpackage/testpackage-subpackage', {'1.0-1': Tar('testpackage-subpackage-1.0-1.tar.bz2', 'x86_64/release/testpackage/testpackage-subpackage', 'aff488008bee3486e25b539fe6ccd1397bd3c5c0ba2ee2cf34af279554baa195af7493ee51d6f8510735c9a2ea54436d776a71e768165716762aec286abbbf83', 195, False)}, {'1.0-1': {'sdesc': '"A test subpackage"',
            'ldesc': '"A test subpackage"',
            'category': 'Devel',
            'external-source': 'testpackage-src',
            'depends': ''}}, {}, False),
- 'testpackage-zstd': Package('testpackage-zstd', {'1.0-1': Tar('testpackage-zstd-1.0-1.tar.zst', 'x86/release/testpackage-zstd', '044066c54c036190f9b0496ccf31f74748d209cce961352e19631876d5abd79ef6d2b34edfb955b8d1a7a781294ee0636bb1305afe410b34562367a2cb77988d', 98, False)}, {'1.0-1': {'category': 'Base',
+ 'testpackage-zstd': Package('testpackage-zstd', {'1.0-1': Tar('testpackage-zstd-1.0-1.tar.zst', 'x86_64/release/testpackage-zstd', '044066c54c036190f9b0496ccf31f74748d209cce961352e19631876d5abd79ef6d2b34edfb955b8d1a7a781294ee0636bb1305afe410b34562367a2cb77988d', 98, False)}, {'1.0-1': {'category': 'Base',
            'sdesc': '"test package (zstd compressed)"',
            'ldesc': '"test package (zstd compressed)"',
            'depends': ''}}, {}, False),
- 'testpackage-zstd-src': Package('testpackage-zstd', {'1.0-1': Tar('testpackage-zstd-1.0-1-src.tar.zst', 'x86/release/testpackage-zstd', '90561ec4dad76268773856cbdda891b0e7b53f26492777f1ff76757844cb47124396feb76f1e30bc1baa680f1d788de21d89e612faeb30b5039b210ca9186434', 313, False)}, {'1.0-1': {'category': 'Base',
+ 'testpackage-zstd-src': Package('testpackage-zstd', {'1.0-1': Tar('testpackage-zstd-1.0-1-src.tar.zst', 'x86_64/release/testpackage-zstd', '90561ec4dad76268773856cbdda891b0e7b53f26492777f1ff76757844cb47124396feb76f1e30bc1baa680f1d788de21d89e612faeb30b5039b210ca9186434', 313, False)}, {'1.0-1': {'category': 'Base',
            'build-depends': 'cygport',
            'sdesc': '"test package (zstd compressed)"',
            'ldesc': '"test package (zstd compressed)"',
@@ -31,7 +31,7 @@
            'skip': '',
            'parse-warnings': ["key 'license' missing"],
            'depends': ''}}, {}, False),
- 'testpackage2-subpackage': Package('testpackage2/testpackage2-subpackage', {'1.0-1': Tar('testpackage2-subpackage-1.0-1.tar.bz2', 'x86/release/testpackage2/testpackage2-subpackage', 'c4bf8e28d71b532e2b741e2931906dec0f0a70d4d051c0503476f864a5228f43765ae3342aafcebfd5a1738073537726b2bfbbd89c6da939a5f46d95aca3feaf', 46, True)}, {'1.0-1': {'sdesc': '"A test subpackage 2"',
+ 'testpackage2-subpackage': Package('testpackage2/testpackage2-subpackage', {'1.0-1': Tar('testpackage2-subpackage-1.0-1.tar.bz2', 'x86_64/release/testpackage2/testpackage2-subpackage', 'c4bf8e28d71b532e2b741e2931906dec0f0a70d4d051c0503476f864a5228f43765ae3342aafcebfd5a1738073537726b2bfbbd89c6da939a5f46d95aca3feaf', 46, True)}, {'1.0-1': {'sdesc': '"A test subpackage 2"',
            'ldesc': '"A test subpackage 2"',
            'category': 'Devel',
            'depends': ''}}, {}, False)}