Update to apt 1.8.2

78 files changed, 279 insertions, 45 deletions

diff --git a/data/_apt1.8/_metadata/berkeleydb.dep b/data/_apt1.8/_metadata/berkeleydb.dep
new file mode 120000
index 000000000..f945cb1a2
--- /dev/null
+++ b/data/_apt1.8/_metadata/berkeleydb.dep
@@ -0,0 +1 @@
+../../berkeleydb
\ No newline at end of file
diff --git a/data/_apt1.8/_metadata/bzip2.dep b/data/_apt1.8/_metadata/bzip2.dep
new file mode 120000
index 000000000..15aa44a77
--- /dev/null
+++ b/data/_apt1.8/_metadata/bzip2.dep
@@ -0,0 +1 @@
+../../bzip2
\ No newline at end of file
diff --git a/data/_apt1.8/_metadata/curl.dep b/data/_apt1.8/_metadata/curl.dep
new file mode 120000
index 000000000..9c4438112
--- /dev/null
+++ b/data/_apt1.8/_metadata/curl.dep
@@ -0,0 +1 @@
+../../curl
\ No newline at end of file
diff --git a/data/_apt1.8/_metadata/dpkg.dep b/data/_apt1.8/_metadata/dpkg.dep
new file mode 120000
index 000000000..3e57eea03
--- /dev/null
+++ b/data/_apt1.8/_metadata/dpkg.dep
@@ -0,0 +1 @@
+../../dpkg
\ No newline at end of file
diff --git a/data/_apt1.8/_metadata/gnupg.dep b/data/_apt1.8/_metadata/gnupg.dep
new file mode 120000
index 000000000..277e892bf
--- /dev/null
+++ b/data/_apt1.8/_metadata/gnupg.dep
@@ -0,0 +1 @@
+../../gnupg
\ No newline at end of file
diff --git a/data/_apt1.8/_metadata/gnutls.dep b/data/_apt1.8/_metadata/gnutls.dep
new file mode 120000
index 000000000..2dbb733a2
--- /dev/null
+++ b/data/_apt1.8/_metadata/gnutls.dep
@@ -0,0 +1 @@
+../../gnutls
\ No newline at end of file
diff --git a/data/_apt1.8/_metadata/gzip.dep b/data/_apt1.8/_metadata/gzip.dep
new file mode 120000
index 000000000..c6c801e81
--- /dev/null
+++ b/data/_apt1.8/_metadata/gzip.dep
@@ -0,0 +1 @@
+../../gzip
\ No newline at end of file
diff --git a/data/_apt1.8/_metadata/license b/data/_apt1.8/_metadata/license
new file mode 100644
index 000000000..9e277e57d
--- /dev/null
+++ b/data/_apt1.8/_metadata/license
@@ -0,0 +1,142 @@
+Apt is copyright 1997, 1998, 1999 Jason Gunthorpe and others.
+
+Apt is licened under the terms of the GNU General Public License (GPL),
+version 2.0 or later, as published by the Free Software Foundation.  See
+the file COPYING.GPL [included], /usr/share/common-licenses/GPL, or
+<http://www.gnu.org/copyleft/gpl.txt> for the terms of the latest version
+of the GNU General Public License.
+
+In addition, prior to November 15th, 2000, apt may be distributed under
+terms identical to the above with the following addition:
+
+Works using apt may link against the GUI library "libqt", copyright by
+Troll Tech AS, Norway, provided that:
+
+1. The version of "libqt" is licensed under the terms of the "Qt Free Edition
+   License" published by Troll Tech AS.  The license terms identified as
+   the Qt Free Edition License below are the only such terms under which
+   distribution of works derived from both apt and "libqt" are permitted;
+
+and
+
+2. The source code of the version of "libqt" used is
+
+   a) Distributed with the binary version;
+
+   or
+
+   b) Downloadable by anyone, without fee, using a publicly-announced
+      URL on the Internet, for a duration of at least three years
+      starting with distribution of the binary version.
+
+On and after November 15th, 2000, the above additional terms lose all
+force, and apt will be licensed only under the terms of the GNU General
+Public License, version 2.0 or later.
+
+      _______________________________________________________________
+
+The following text, up to the text of the Qt Free Edition License, is
+informational and not part of the license terms on apt.
+
+Modifications to apt in either source or compiled form must be licensed
+under the terms of the GNU General Public License, version 2.0 (or later),
+but need not include the above clause permitting usage of the "libqt"
+library under the Qt Free Edition License.  Note that removal of this
+clause will result in software which is not licensed for binary
+redistribution linked against software governed by the Qt Free Edition
+License.  In the event that a version of "libqt" is released that is
+licensed under terms that do not conflict with the GPL, the additional
+clause above is not required to grant permission for distribution of works
+that are derived from both apt and "libqt".
+
+No part of apt is licensed under the Qt Free Edition License.  The terms
+below are provided to help identify the circumstances under which the
+"libqt" library may be used with apt (or a work derived from both).  The
+terms below are copied from the LICENSE file of the qt-1.44 distribution,
+as of November 10th, 1999.
+
+      _______________________________________________________________
+
+                        QT FREE EDITION LICENSE
+
+Copyright (C) 1992-1999 Troll Tech AS. All rights reserved. 
+
+This is the license for Qt Free Edition version 1.44; it covers private use,
+use of third-party application programs based on Qt, and development of
+free software for the free software community. 
+
+
+                      COPYRIGHT AND RESTRICTIONS
+
+The Qt toolkit is a product of Troll Tech AS. The Qt Free Edition is limited
+to use with the X Window System. 
+
+You may copy this version of the Qt Free Edition provided that the entire
+archive is distributed unchanged and as a whole, including this notice. 
+
+You may use this version of the Qt Free Edition to compile, link and run
+application programs legally developed by third parties. 
+
+You may use the Qt Free Edition to create application programs
+provided that: 
+
+      You accept this license. 
+      Your software does not require modifications to Qt Free Edition.
+      You satisfy ONE of the following three requirements 
+      EITHER 
+            Users of your software can freely obtain source code for the
+            software, freely modify the source code (possibly with
+            restrictions on copyright notices, attributions and legal
+            responsibility), and freely redistribute original or modified
+            versions of the software. 
+      OR 
+            Your software is distributed under the GNU GENERAL
+            PUBLIC LICENSE, version 2 or later, as defined by the
+            Free Software Foundation. 
+      OR 
+            Your software is distributed under the GNU LIBRARY
+            GENERAL PUBLIC LICENSE, version 2 or later, as
+            defined by the Free Software Foundation. 
+
+If you are paid to develop something with Qt Free Edition or it is a part of
+your job the following conditions also apply: 
+
+      Your software must not require libraries, programs, data or
+      documentation that are not available outside your organization in
+      order to compile or use. 
+      If and when your organization starts using the software, you must
+      notify Troll Tech AS of the following: 
+            Your organization's name and purpose. 
+            The software's name and purpose. 
+            The software's license. 
+            That your organization considers the software to be free
+            software. 
+
+You may also use the Qt Free Edition to create reusable components
+(such as libraries) provided that you accept the terms above, and in
+addition that: 
+
+      Your components' license includes the following text: 
+
+            [Your package] requires the Qt library, which is
+            copyright Troll Tech AS. Freely distributable
+            programs may generally use Qt Free Edition free of
+            charge, see [README.QT] for details. 
+
+      README.QT is distributed along with your components. 
+      Qt Free Edition is not distributed as an integral part of your
+      components. 
+
+                       LIMITATIONS OF LIABILITY
+
+Troll Tech AS makes no obligation under this license to support or
+upgrade Qt Free Edition, or assist in the use of Qt Free Edition. 
+
+In no event shall Troll Tech AS be liable for any lost revenue or profits or
+other direct, indirect, special, incidental or consequential damages, even
+if Troll Tech has been advised of the possibility of such damages. 
+
+QT FREE EDITION IS PROVIDED AS IS WITH NO WARRANTY OF ANY KIND,
+INCLUDING THE WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A
+PARTICULAR PURPOSE.
+      _______________________________________________________________
diff --git a/data/_apt1.8/_metadata/lz4.dep b/data/_apt1.8/_metadata/lz4.dep
new file mode 120000
index 000000000..bccb2875c
--- /dev/null
+++ b/data/_apt1.8/_metadata/lz4.dep
@@ -0,0 +1 @@
+../../lz4
\ No newline at end of file
diff --git a/data/_apt1.8/_metadata/lzma.dep b/data/_apt1.8/_metadata/lzma.dep
new file mode 120000
index 000000000..f84114cb9
--- /dev/null
+++ b/data/_apt1.8/_metadata/lzma.dep
@@ -0,0 +1 @@
+../../lzma
\ No newline at end of file
diff --git a/data/_apt1.8/_metadata/maintainer b/data/_apt1.8/_metadata/maintainer
new file mode 120000
index 000000000..573d7ebef
--- /dev/null
+++ b/data/_apt1.8/_metadata/maintainer
@@ -0,0 +1 @@
+../../../people/sbingner
\ No newline at end of file
diff --git a/data/_apt1.8/_metadata/notes b/data/_apt1.8/_metadata/notes
new file mode 100644
index 000000000..616ed7297
--- /dev/null
+++ b/data/_apt1.8/_metadata/notes
@@ -0,0 +1,2 @@
+http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=146877
+pkgIndexFile::CheckLanguageCode doesn't handle the common cases
diff --git a/data/libapt-dev/_metadata/section b/data/_apt1.8/_metadata/section
index 702b7b8d3..702b7b8d3 100644
--- a/data/libapt-dev/_metadata/section
+++ b/data/_apt1.8/_metadata/section
diff --git a/data/_apt1.8/_metadata/sed.dep b/data/_apt1.8/_metadata/sed.dep
new file mode 120000
index 000000000..315b5c89c
--- /dev/null
+++ b/data/_apt1.8/_metadata/sed.dep
@@ -0,0 +1 @@
+../../sed
\ No newline at end of file
diff --git a/data/_apt1.8/_metadata/tags b/data/_apt1.8/_metadata/tags
new file mode 100644
index 000000000..b7fdc65c3
--- /dev/null
+++ b/data/_apt1.8/_metadata/tags
@@ -0,0 +1 @@
+purpose::console, purpose::library
diff --git a/data/_apt1.8/_metadata/version b/data/_apt1.8/_metadata/version
new file mode 100644
index 000000000..53adb84c8
--- /dev/null
+++ b/data/_apt1.8/_metadata/version
@@ -0,0 +1 @@
+1.8.2
diff --git a/data/_apt1.8/apt-1.8+iphone.tar.lz b/data/_apt1.8/apt-1.8+iphone.tar.lz
new file mode 100644
index 000000000..4c4c43eeb
--- /dev/null
+++ b/data/_apt1.8/apt-1.8+iphone.tar.lz
diff --git a/data/_apt1.8/debugmake.sh b/data/_apt1.8/debugmake.sh
new file mode 100644
index 000000000..1c4d52497
--- /dev/null
+++ b/data/_apt1.8/debugmake.sh
@@ -0,0 +1,38 @@
+pkg:setup
+cat >iphoneos_toolchain.cmake <<EOF
+set(CMAKE_SYSTEM_NAME Darwin)  # Tell CMake we're cross-compiling
+set(CMAKE_CROSSCOMPILING true)
+#include(CMakeForceCompiler)
+# Prefix detection only works with compiler id "GNU"
+# CMake will look for prefixed g++, cpp, ld, etc. automatically
+set(CMAKE_SYSTEM_PROCESSOR aarch64)
+set(triple ${PKG_TARG})
+set(CMAKE_FIND_ROOT_PATH $(echo ${PKG_PATH} | sed -e s/:/' '/g))
+set(CMAKE_LIBRARY_PATH $(echo ${LIBRARY_PATH} | sed -e s/:/' '/g))
+set(CMAKE_INCLUDE_PATH $(echo ${INCLUDE_PATH} | sed -e s/:/' '/g))
+set(CMAKE_C_COMPILER ${PKG_TARG}-clang)
+set(CMAKE_CXX_COMPILER ${PKG_TARG}-clang++)
+set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
+set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
+set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
+set(DPKG_DATADIR /usr/share/dpkg)
+string(APPEND CMAKE_C_FLAGS_DEBUG "-O1 -fsanitize=address -fno-omit-frame-pointer ")
+string(APPEND CMAKE_CXX_FLAGS_DEBUG "-O1 -fsanitize=address -fno-omit-frame-pointer ")
+string(APPEND CMAKE_EXE_LINKER_FLAGS_DEBUG "-O1 -fsanitize=address -fno-omit-frame-pointer ")
+set(CMAKE_INSTALL_CONFIG_NAME "Debug")
+EOF
+
+#string(APPEND CMAKE_CXX_FLAGS_DEBUG "-O -g -fsanitize=address -fno-omit-frame-pointer ")
+cmake -j8 -DINSTALL_CONFIG_NAME="Debug" -DCMAKE_INSTALL_CONFIG_NAME="Debug" -DBUILD_TYPE="Debug" -DCMAKE_BUILD_TYPE="Debug" -DCMAKE_TOOLCHAIN_FILE=iphoneos_toolchain.cmake -DCMAKE_LOCALSTATEDIR="/private/var" -DCMAKE_INSTALL_NAME_DIR="/usr/lib" -DCMAKE_INSTALL_RPATH="/usr/" -DCMAKE_OSX_SYSROOT="${PKG_ROOT}" -DCMAKE_INSTALL_PREFIX="/usr/" -DCMAKE_SHARED_LINKER_FLAGS="-lresolv" -DCURRENT_VENDOR=debian -DUSE_NLS=0 -DWITH_DOC=0 -DCOMMON_ARCH=${PKG_ARCH} .
+make -j16 VERBOSE=1
+
+pkg: mkdir -p /etc/apt/apt.conf.d
+pkg: mkdir -p /etc/apt/preferences.d
+pkg: mkdir -p /etc/apt/sources.list.d
+pkg: mkdir -p /etc/apt/trusted.gpg.d
+pkg: mkdir -p /var/cache/apt/archives/partial
+pkg: mkdir -p /var/lib/apt/lists/partial
+pkg: mkdir -p /var/lib/apt/periodic
+pkg: mkdir -p /var/log/apt
+
+pkg:install
diff --git a/data/_apt1.8/make.sh b/data/_apt1.8/make.sh
new file mode 100644
index 000000000..8c8b118ac
--- /dev/null
+++ b/data/_apt1.8/make.sh
@@ -0,0 +1,37 @@
+pkg:setup
+cat >iphoneos_toolchain.cmake <<EOF
+set(CMAKE_BUILD_TYPE Release)
+set(CMAKE_SYSTEM_NAME Darwin)  # Tell CMake we're cross-compiling
+set(CMAKE_CROSSCOMPILING true)
+#include(CMakeForceCompiler)
+# Prefix detection only works with compiler id "GNU"
+# CMake will look for prefixed g++, cpp, ld, etc. automatically
+set(CMAKE_SYSTEM_PROCESSOR aarch64)
+set(triple ${PKG_TARG})
+set(CMAKE_FIND_ROOT_PATH $(echo ${PKG_PATH} | sed -e s/:/' '/g))
+set(CMAKE_LIBRARY_PATH $(echo ${LIBRARY_PATH} | sed -e s/:/' '/g))
+set(CMAKE_INCLUDE_PATH $(echo ${INCLUDE_PATH} | sed -e s/:/' '/g))
+set(CMAKE_C_COMPILER ${PKG_TARG}-gcc)
+set(CMAKE_CXX_COMPILER ${PKG_TARG}-g++)
+set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
+set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
+set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
+set(DPKG_DATADIR /usr/share/dpkg)
+set(CMAKE_C_FLAGS_RELEASE "-O2 -DNDEBUG ")
+set(CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG ")
+set(CMAKE_OSX_DEPLOYMENT_TARGET "${IPHONEOS_DEPLOYMENT_TARGET}" CACHE STRING "Min IOS version")
+EOF
+
+cmake -j8 -DCMAKE_TOOLCHAIN_FILE=iphoneos_toolchain.cmake -DCMAKE_LOCALSTATEDIR="/private/var" -DCMAKE_INSTALL_NAME_DIR="/usr/lib" -DCMAKE_INSTALL_RPATH="/usr/" -DCMAKE_OSX_SYSROOT="${PKG_ROOT}" -DCMAKE_INSTALL_PREFIX="/usr/" -DCMAKE_SHARED_LINKER_FLAGS="-lresolv" -DCURRENT_VENDOR=debian -DUSE_NLS=0 -DWITH_DOC=0 -DCOMMON_ARCH=${PKG_ARCH} .
+make -j16
+
+pkg: mkdir -p /etc/apt/apt.conf.d
+pkg: mkdir -p /etc/apt/preferences.d
+pkg: mkdir -p /etc/apt/sources.list.d
+pkg: mkdir -p /etc/apt/trusted.gpg.d
+pkg: mkdir -p /var/cache/apt/archives/partial
+pkg: mkdir -p /var/lib/apt/lists/partial
+pkg: mkdir -p /var/lib/apt/periodic
+pkg: mkdir -p /var/log/apt
+
+pkg:install
diff --git a/data/apt-key/_metadata/_apt1.4.dep b/data/apt-key/_metadata/_apt1.4.dep
deleted file mode 120000
index 902259693..000000000
--- a/data/apt-key/_metadata/_apt1.4.dep
+++ /dev/null
@@ -1 +0,0 @@
-../../_apt1.4
\ No newline at end of file
diff --git a/data/apt-key/_metadata/_apt1.8.dep b/data/apt-key/_metadata/_apt1.8.dep
new file mode 120000
index 000000000..41464f3be
--- /dev/null
+++ b/data/apt-key/_metadata/_apt1.8.dep
@@ -0,0 +1 @@
+../../_apt1.8
\ No newline at end of file
diff --git a/data/apt-key/_metadata/breaks b/data/apt-key/_metadata/breaks
index 9e36532b4..93773cd14 100644
--- a/data/apt-key/_metadata/breaks
+++ b/data/apt-key/_metadata/breaks
@@ -1 +1 @@
-apt7-key
+apt7-key (<<1:0)
diff --git a/data/apt-key/_metadata/in.1260.00 b/data/apt-key/_metadata/in.1260.00
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/data/apt-key/_metadata/in.1260.00
diff --git a/data/apt-key/_metadata/license b/data/apt-key/_metadata/license
index 4f7d70f3f..9d71f9909 120000
--- a/data/apt-key/_metadata/license
+++ b/data/apt-key/_metadata/license
@@ -1 +1 @@
-../../_apt1.4/_metadata/license
\ No newline at end of file
+../../_apt1.8/_metadata/license
\ No newline at end of file
diff --git a/data/apt-key/_metadata/maintainer b/data/apt-key/_metadata/maintainer
index 52845be09..32011c570 120000
--- a/data/apt-key/_metadata/maintainer
+++ b/data/apt-key/_metadata/maintainer
@@ -1 +1 @@
-../../_apt1.4/_metadata/maintainer
\ No newline at end of file
+../../_apt1.8/_metadata/maintainer
\ No newline at end of file
diff --git a/data/apt-key/_metadata/section b/data/apt-key/_metadata/section
index 0c5fdc049..f8a6484fe 120000
--- a/data/apt-key/_metadata/section
+++ b/data/apt-key/_metadata/section
@@ -1 +1 @@
-../../_apt1.4/_metadata/section
\ No newline at end of file
+../../_apt1.8/_metadata/section
\ No newline at end of file
diff --git a/data/apt-key/_metadata/version b/data/apt-key/_metadata/version
index 06c5113b0..a3826e12e 120000
--- a/data/apt-key/_metadata/version
+++ b/data/apt-key/_metadata/version
@@ -1 +1 @@
-../../_apt1.4/_metadata/version
\ No newline at end of file
+../../_apt1.8/_metadata/version
\ No newline at end of file
diff --git a/data/apt-key/make.sh b/data/apt-key/make.sh
index c280cbae8..62cd129ab 100644
--- a/data/apt-key/make.sh
+++ b/data/apt-key/make.sh
@@ -1,2 +1,2 @@
 pkg: mkdir -p /usr/bin
-cp -a "$(PKG_DEST_ _apt1.4)"/usr/bin/apt-key "${PKG_DEST}"/usr/bin
+cp -a "$(PKG_DEST_ _apt1.8)"/usr/bin/apt-key "${PKG_DEST}"/usr/bin
diff --git a/data/apt/_metadata/depends b/data/apt/_metadata/depends
index b8aab5a41..02b911629 100644
--- a/data/apt/_metadata/depends
+++ b/data/apt/_metadata/depends
@@ -1 +1 @@
-apt1.4
+apt1.8
diff --git a/data/apt1.8/_metadata/_apt1.8.dep b/data/apt1.8/_metadata/_apt1.8.dep
new file mode 120000
index 000000000..41464f3be
--- /dev/null
+++ b/data/apt1.8/_metadata/_apt1.8.dep
@@ -0,0 +1 @@
+../../_apt1.8
\ No newline at end of file
diff --git a/data/apt1.8/_metadata/conflicts b/data/apt1.8/_metadata/conflicts
new file mode 100644
index 000000000..12d9d6e1a
--- /dev/null
+++ b/data/apt1.8/_metadata/conflicts
@@ -0,0 +1 @@
+apt7 (<<1:0), apt1.4
diff --git a/data/apt1.8/_metadata/depends b/data/apt1.8/_metadata/depends
new file mode 100644
index 000000000..cd5643b98
--- /dev/null
+++ b/data/apt1.8/_metadata/depends
@@ -0,0 +1 @@
+libapt (>= %MYVERSION%), apt-key, berkeleydb
diff --git a/data/apt1.8/_metadata/description b/data/apt1.8/_metadata/description
new file mode 100644
index 000000000..e60725012
--- /dev/null
+++ b/data/apt1.8/_metadata/description
@@ -0,0 +1 @@
+the advanced packaging tool from Debian
diff --git a/data/apt1.8/_metadata/in.1260.00 b/data/apt1.8/_metadata/in.1260.00
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/data/apt1.8/_metadata/in.1260.00
diff --git a/data/apt1.8/_metadata/in.1443.00 b/data/apt1.8/_metadata/in.1443.00
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/data/apt1.8/_metadata/in.1443.00
diff --git a/data/apt1.8/_metadata/license b/data/apt1.8/_metadata/license
new file mode 120000
index 000000000..9d71f9909
--- /dev/null
+++ b/data/apt1.8/_metadata/license
@@ -0,0 +1 @@
+../../_apt1.8/_metadata/license
\ No newline at end of file
diff --git a/data/apt1.8/_metadata/maintainer b/data/apt1.8/_metadata/maintainer
new file mode 120000
index 000000000..32011c570
--- /dev/null
+++ b/data/apt1.8/_metadata/maintainer
@@ -0,0 +1 @@
+../../_apt1.8/_metadata/maintainer
\ No newline at end of file
diff --git a/data/apt1.8/_metadata/name b/data/apt1.8/_metadata/name
new file mode 100644
index 000000000..641ca3494
--- /dev/null
+++ b/data/apt1.8/_metadata/name
@@ -0,0 +1 @@
+APT 1.8 Strict
diff --git a/data/apt1.8/_metadata/priority b/data/apt1.8/_metadata/priority
new file mode 100644
index 000000000..a6a7b9cd7
--- /dev/null
+++ b/data/apt1.8/_metadata/priority
@@ -0,0 +1 @@
+standard
diff --git a/data/apt1.8/_metadata/role b/data/apt1.8/_metadata/role
new file mode 100644
index 000000000..52b4d7301
--- /dev/null
+++ b/data/apt1.8/_metadata/role
@@ -0,0 +1 @@
+hacker
diff --git a/data/apt1.8/_metadata/section b/data/apt1.8/_metadata/section
new file mode 120000
index 000000000..f8a6484fe
--- /dev/null
+++ b/data/apt1.8/_metadata/section
@@ -0,0 +1 @@
+../../_apt1.8/_metadata/section
\ No newline at end of file
diff --git a/data/apt1.8/_metadata/tags b/data/apt1.8/_metadata/tags
new file mode 100644
index 000000000..ad5d50831
--- /dev/null
+++ b/data/apt1.8/_metadata/tags
@@ -0,0 +1 @@
+purpose::console
diff --git a/data/apt1.8/_metadata/version b/data/apt1.8/_metadata/version
new file mode 120000
index 000000000..a3826e12e
--- /dev/null
+++ b/data/apt1.8/_metadata/version
@@ -0,0 +1 @@
+../../_apt1.8/_metadata/version
\ No newline at end of file
diff --git a/data/apt1.8/make.sh b/data/apt1.8/make.sh
new file mode 100644
index 000000000..8ce680acb
--- /dev/null
+++ b/data/apt1.8/make.sh
@@ -0,0 +1,3 @@
+pkg: mkdir -p /usr
+cp -a "$(PKG_DEST_ _apt1.8)"/usr/bin "${PKG_DEST}"/usr
+pkg: rm -f /usr/bin/apt-key
diff --git a/data/libapt-dev/_metadata/depends b/data/libapt-dev/_metadata/depends
deleted file mode 100644
index f9a484155..000000000
--- a/data/libapt-dev/_metadata/depends
+++ /dev/null
@@ -1 +0,0 @@
-libapt-pkg-dev
diff --git a/data/libapt-dev/_metadata/description b/data/libapt-dev/_metadata/description
deleted file mode 100644
index eee82441f..000000000
--- a/data/libapt-dev/_metadata/description
+++ /dev/null
@@ -1 +0,0 @@
-the advanced packaging library from Debian - development files
diff --git a/data/libapt-dev/_metadata/libapt.dep b/data/libapt-dev/_metadata/libapt.dep
deleted file mode 120000
index 280bf477b..000000000
--- a/data/libapt-dev/_metadata/libapt.dep
+++ /dev/null
@@ -1 +0,0 @@
-../../libapt
\ No newline at end of file
diff --git a/data/libapt-dev/_metadata/license b/data/libapt-dev/_metadata/license
deleted file mode 120000
index 4f7d70f3f..000000000
--- a/data/libapt-dev/_metadata/license
+++ /dev/null
@@ -1 +0,0 @@
-../../_apt1.4/_metadata/license
\ No newline at end of file
diff --git a/data/libapt-dev/_metadata/maintainer b/data/libapt-dev/_metadata/maintainer
deleted file mode 120000
index 52845be09..000000000
--- a/data/libapt-dev/_metadata/maintainer
+++ /dev/null
@@ -1 +0,0 @@
-../../_apt1.4/_metadata/maintainer
\ No newline at end of file
diff --git a/data/libapt-dev/_metadata/name b/data/libapt-dev/_metadata/name
deleted file mode 100644
index e4d808d08..000000000
--- a/data/libapt-dev/_metadata/name
+++ /dev/null
@@ -1 +0,0 @@
-APT Development (libapt-dev)
diff --git a/data/libapt-dev/_metadata/priority b/data/libapt-dev/_metadata/priority
deleted file mode 100644
index 134d9bc32..000000000
--- a/data/libapt-dev/_metadata/priority
+++ /dev/null
@@ -1 +0,0 @@
-optional
diff --git a/data/libapt-dev/_metadata/role b/data/libapt-dev/_metadata/role
deleted file mode 100644
index 8d0320866..000000000
--- a/data/libapt-dev/_metadata/role
+++ /dev/null
@@ -1 +0,0 @@
-developer
diff --git a/data/libapt-dev/_metadata/tags b/data/libapt-dev/_metadata/tags
deleted file mode 100644
index a8928cec8..000000000
--- a/data/libapt-dev/_metadata/tags
+++ /dev/null
@@ -1 +0,0 @@
-purpose::library
diff --git a/data/libapt-dev/_metadata/version b/data/libapt-dev/_metadata/version
deleted file mode 120000
index 06c5113b0..000000000
--- a/data/libapt-dev/_metadata/version
+++ /dev/null
@@ -1 +0,0 @@
-../../_apt1.4/_metadata/version
\ No newline at end of file
diff --git a/data/libapt-dev/make.sh b/data/libapt-dev/make.sh
deleted file mode 100644
index 28cbffbb0..000000000
--- a/data/libapt-dev/make.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-pkg: mkdir -p /usr/lib
-find "$(PKG_DEST_ _apt1.4)"/usr/lib -maxdepth 1 -type l -exec cp {} "${PKG_DEST}"/usr/lib/ \;
-rm -rf "${PKG_DEST}"/usr/lib/libapt-pkg* "${PKG_DEST}"/usr/lib/lib*.*.dylib
diff --git a/data/libapt-pkg-dev/_metadata/description b/data/libapt-pkg-dev/_metadata/description
index 6a395c66f..f4d39bddf 100644
--- a/data/libapt-pkg-dev/_metadata/description
+++ b/data/libapt-pkg-dev/_metadata/description
@@ -1 +1 @@
-the advanced packaging library from Debian
+development files for APT's libapt-pkg and libapt-inst
diff --git a/data/libapt-pkg-dev/_metadata/license b/data/libapt-pkg-dev/_metadata/license
index 4f7d70f3f..9d71f9909 120000
--- a/data/libapt-pkg-dev/_metadata/license
+++ b/data/libapt-pkg-dev/_metadata/license
@@ -1 +1 @@
-../../_apt1.4/_metadata/license
\ No newline at end of file
+../../_apt1.8/_metadata/license
\ No newline at end of file
diff --git a/data/libapt-pkg-dev/_metadata/maintainer b/data/libapt-pkg-dev/_metadata/maintainer
index 52845be09..32011c570 120000
--- a/data/libapt-pkg-dev/_metadata/maintainer
+++ b/data/libapt-pkg-dev/_metadata/maintainer
@@ -1 +1 @@
-../../_apt1.4/_metadata/maintainer
\ No newline at end of file
+../../_apt1.8/_metadata/maintainer
\ No newline at end of file
diff --git a/data/libapt-pkg-dev/_metadata/name b/data/libapt-pkg-dev/_metadata/name
index 04633ad5b..af6bf3d5e 100644
--- a/data/libapt-pkg-dev/_metadata/name
+++ b/data/libapt-pkg-dev/_metadata/name
@@ -1 +1 @@
-APT 1.4 Strict (libapt-pkg-dev)
+APT Development (libapt-pkg-dev)
diff --git a/data/libapt-pkg-dev/_metadata/section b/data/libapt-pkg-dev/_metadata/section
index 702b7b8d3..f8a6484fe 100644..120000
--- a/data/libapt-pkg-dev/_metadata/section
+++ b/data/libapt-pkg-dev/_metadata/section
@@ -1 +1 @@
-Packaging
+../../_apt1.8/_metadata/section
\ No newline at end of file
diff --git a/data/libapt-pkg-dev/_metadata/version b/data/libapt-pkg-dev/_metadata/version
index 06c5113b0..a3826e12e 120000
--- a/data/libapt-pkg-dev/_metadata/version
+++ b/data/libapt-pkg-dev/_metadata/version
@@ -1 +1 @@
-../../_apt1.4/_metadata/version
\ No newline at end of file
+../../_apt1.8/_metadata/version
\ No newline at end of file
diff --git a/data/libapt-pkg-dev/make.sh b/data/libapt-pkg-dev/make.sh
index 1054bd93d..acdbf74b9 100644
--- a/data/libapt-pkg-dev/make.sh
+++ b/data/libapt-pkg-dev/make.sh
@@ -1,3 +1,3 @@
-pkg: mkdir -p /usr/lib /usr/include
-cp -a "$(PKG_DEST_ _apt1.4)"/usr/lib/libapt-pkg.dylib "${PKG_DEST}"/usr/lib/
-cp -a "$(PKG_DEST_ _apt1.4)"/usr/include/apt-pkg "${PKG_DEST}"/usr/include
+pkg: mkdir -p /usr/lib
+cp -a "$(PKG_DEST_ _apt1.8)"/usr/lib/libapt-{pkg,inst}.dylib "${PKG_DEST}"/usr/lib/
+cp -a "$(PKG_DEST_ _apt1.8)"/usr/include "${PKG_DEST}"/usr
diff --git a/data/libapt-pkg5.0/_metadata/_apt1.4.dep b/data/libapt-pkg5.0/_metadata/_apt1.4.dep
deleted file mode 120000
index 902259693..000000000
--- a/data/libapt-pkg5.0/_metadata/_apt1.4.dep
+++ /dev/null
@@ -1 +0,0 @@
-../../_apt1.4
\ No newline at end of file
diff --git a/data/libapt-pkg5.0/_metadata/_apt1.8.dep b/data/libapt-pkg5.0/_metadata/_apt1.8.dep
new file mode 120000
index 000000000..41464f3be
--- /dev/null
+++ b/data/libapt-pkg5.0/_metadata/_apt1.8.dep
@@ -0,0 +1 @@
+../../_apt1.8
\ No newline at end of file
diff --git a/data/libapt-pkg5.0/_metadata/in.1260.00 b/data/libapt-pkg5.0/_metadata/in.1260.00
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/data/libapt-pkg5.0/_metadata/in.1260.00
diff --git a/data/libapt-pkg5.0/_metadata/license b/data/libapt-pkg5.0/_metadata/license
index 4f7d70f3f..9d71f9909 120000
--- a/data/libapt-pkg5.0/_metadata/license
+++ b/data/libapt-pkg5.0/_metadata/license
@@ -1 +1 @@
-../../_apt1.4/_metadata/license
\ No newline at end of file
+../../_apt1.8/_metadata/license
\ No newline at end of file
diff --git a/data/libapt-pkg5.0/_metadata/maintainer b/data/libapt-pkg5.0/_metadata/maintainer
index 52845be09..32011c570 120000
--- a/data/libapt-pkg5.0/_metadata/maintainer
+++ b/data/libapt-pkg5.0/_metadata/maintainer
@@ -1 +1 @@
-../../_apt1.4/_metadata/maintainer
\ No newline at end of file
+../../_apt1.8/_metadata/maintainer
\ No newline at end of file
diff --git a/data/libapt-pkg5.0/_metadata/name b/data/libapt-pkg5.0/_metadata/name
index 285a10452..121a305ff 100644
--- a/data/libapt-pkg5.0/_metadata/name
+++ b/data/libapt-pkg5.0/_metadata/name
@@ -1 +1 @@
-APT 1.4 Strict (libapt-pkg)
+APT 1.8 Strict (libapt-pkg)
diff --git a/data/libapt-pkg5.0/_metadata/version b/data/libapt-pkg5.0/_metadata/version
index 06c5113b0..a3826e12e 120000
--- a/data/libapt-pkg5.0/_metadata/version
+++ b/data/libapt-pkg5.0/_metadata/version
@@ -1 +1 @@
-../../_apt1.4/_metadata/version
\ No newline at end of file
+../../_apt1.8/_metadata/version
\ No newline at end of file
diff --git a/data/libapt-pkg5.0/make.sh b/data/libapt-pkg5.0/make.sh
index 97f810f9b..45c3944f6 100644
--- a/data/libapt-pkg5.0/make.sh
+++ b/data/libapt-pkg5.0/make.sh
@@ -1,2 +1,2 @@
 pkg: mkdir -p /usr/lib
-cp -a "$(PKG_DEST_ _apt1.4)"/usr/lib/libapt-pkg.5.0* "${PKG_DEST}"/usr/lib/
+cp -a "$(PKG_DEST_ _apt1.8)"/usr/lib/libapt-pkg.5.0* "${PKG_DEST}"/usr/lib/
diff --git a/data/libapt/_metadata/_apt1.4.dep b/data/libapt/_metadata/_apt1.4.dep
deleted file mode 120000
index 902259693..000000000
--- a/data/libapt/_metadata/_apt1.4.dep
+++ /dev/null
@@ -1 +0,0 @@
-../../_apt1.4
\ No newline at end of file
diff --git a/data/libapt/_metadata/_apt1.8.dep b/data/libapt/_metadata/_apt1.8.dep
new file mode 120000
index 000000000..41464f3be
--- /dev/null
+++ b/data/libapt/_metadata/_apt1.8.dep
@@ -0,0 +1 @@
+../../_apt1.8
\ No newline at end of file
diff --git a/data/libapt/_metadata/depends b/data/libapt/_metadata/depends
index 19efb3b09..1da4981a8 100644
--- a/data/libapt/_metadata/depends
+++ b/data/libapt/_metadata/depends
@@ -1 +1 @@
-libapt-pkg5.0 (>= %MYVERSION%)
+libapt-pkg5.0 (>= %MYVERSION%), gnutls
diff --git a/data/libapt/_metadata/in.1260.00 b/data/libapt/_metadata/in.1260.00
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/data/libapt/_metadata/in.1260.00
diff --git a/data/libapt/_metadata/license b/data/libapt/_metadata/license
index 4f7d70f3f..9d71f9909 120000
--- a/data/libapt/_metadata/license
+++ b/data/libapt/_metadata/license
@@ -1 +1 @@
-../../_apt1.4/_metadata/license
\ No newline at end of file
+../../_apt1.8/_metadata/license
\ No newline at end of file
diff --git a/data/libapt/_metadata/maintainer b/data/libapt/_metadata/maintainer
index 52845be09..32011c570 120000
--- a/data/libapt/_metadata/maintainer
+++ b/data/libapt/_metadata/maintainer
@@ -1 +1 @@
-../../_apt1.4/_metadata/maintainer
\ No newline at end of file
+../../_apt1.8/_metadata/maintainer
\ No newline at end of file
diff --git a/data/libapt/_metadata/version b/data/libapt/_metadata/version
index 06c5113b0..a3826e12e 120000
--- a/data/libapt/_metadata/version
+++ b/data/libapt/_metadata/version
@@ -1 +1 @@
-../../_apt1.4/_metadata/version
\ No newline at end of file
+../../_apt1.8/_metadata/version
\ No newline at end of file
diff --git a/data/libapt/make.sh b/data/libapt/make.sh
index 4accc54f1..46a6a6b7c 100644
--- a/data/libapt/make.sh
+++ b/data/libapt/make.sh
@@ -1,9 +1,9 @@
-cp -a "$(PKG_DEST_ _apt1.4)"/etc "${PKG_DEST}"
-cp -a "$(PKG_DEST_ _apt1.4)"/var "${PKG_DEST}"
+cp -a "$(PKG_DEST_ _apt1.8)"/etc "${PKG_DEST}"
+cp -a "$(PKG_DEST_ _apt1.8)"/var "${PKG_DEST}"
 
 pkg: mkdir -p /usr/lib
-cp -a "$(PKG_DEST_ _apt1.4)"/usr/lib/lib*.*.dylib "${PKG_DEST}"/usr/lib/
-cp -a "$(PKG_DEST_ _apt1.4)"/usr/libexec "${PKG_DEST}"/usr
+cp -a "$(PKG_DEST_ _apt1.8)"/usr/lib/lib*.*.dylib "${PKG_DEST}"/usr/lib/
+cp -a "$(PKG_DEST_ _apt1.8)"/usr/libexec "${PKG_DEST}"/usr
 rm -f "${PKG_DEST}"/usr/lib/libapt-pkg.*
 pkg: ln -s ../libexec/apt /usr/lib/apt
 pkg: rm -f /usr/libexec/apt/methods/https