Update apt sources to really be 1.4.8

7 files changed, 1 insertions, 45 deletions

diff --git a/data/_apt1.4/apt-iphone.tar.lz b/data/_apt1.4/apt-iphone.tar.lz
new file mode 100644
index 000000000..4386f7ad1
--- /dev/null
+++ b/data/_apt1.4/apt-iphone.tar.lz
diff --git a/data/_apt1.4/apt-nito.tgz b/data/_apt1.4/apt-nito.tgz
deleted file mode 100644
index 8ebac625c..000000000
--- a/data/_apt1.4/apt-nito.tgz
+++ /dev/null
diff --git a/data/_apt1.4/cftype.diff b/data/_apt1.4/cftype.diff
deleted file mode 100644
index 2c21cba39..000000000
--- a/data/_apt1.4/cftype.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- apt/methods/http.cc	2018-07-30 21:45:07.000000000 -1000
-+++ apt+iPhone/methods/http.cc	2018-07-30 23:55:04.000000000 -1000
-@@ -603,7 +603,7 @@
- 
-    if (UniqueID_ == NULL)
-    if (void *lockdown = lockdown_connect()) {
--      UniqueID_ = lockdown_copy_value(lockdown, NULL, kLockdownUniqueDeviceIDKey);
-+      UniqueID_ = (CFStringRef)lockdown_copy_value(lockdown, NULL, kLockdownUniqueDeviceIDKey);
-       lockdown_disconnect(lockdown);
-    }
- 
diff --git a/data/_apt1.4/date-errors.diff b/data/_apt1.4/date-errors.diff
deleted file mode 100644
index 53ee7dd4b..000000000
--- a/data/_apt1.4/date-errors.diff
+++ /dev/null
@@ -1,12 +0,0 @@
---- apt/apt-pkg/deb/debmetaindex.cc	2018-07-30 21:45:07.000000000 -1000
-+++ apt+iPhone/apt-pkg/deb/debmetaindex.cc	2018-08-02 00:03:17.000000000 -1000
-@@ -458,9 +458,6 @@
- 
-    if (CheckValidUntil == true)
-    {
--      if (Date == 0)
--          _error->Warning( _("Invalid '%s' entry in Release file %s"), "Date", Filename.c_str());
--
-       std::string const Label = Section.FindS("Label");
-       std::string const StrValidUntil = Section.FindS("Valid-Until");
- 
diff --git a/data/_apt1.4/make.sh b/data/_apt1.4/make.sh
index 03f8b6868..2f77aa5cf 100644
--- a/data/_apt1.4/make.sh
+++ b/data/_apt1.4/make.sh
@@ -15,6 +15,7 @@ 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)
 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} .
diff --git a/data/_apt1.4/sandbox-errors.diff b/data/_apt1.4/sandbox-errors.diff
deleted file mode 100644
index 706aeb23c..000000000
--- a/data/_apt1.4/sandbox-errors.diff
+++ /dev/null
@@ -1,10 +0,0 @@
---- apt/apt-pkg/acquire.cc	2018-07-30 21:45:07.000000000 -1000
-+++ apt+iPhone/apt-pkg/acquire.cc	2018-08-02 00:04:25.000000000 -1000
-@@ -603,7 +603,6 @@
-    struct passwd const * const pw = getpwnam(SandboxUser.c_str());
-    if (pw == NULL)
-    {
--      _error->Warning(_("No sandbox user '%s' on the system, can not drop privileges"), SandboxUser.c_str());
-       _config->Set("APT::Sandbox::User", "");
-       return;
-    }
diff --git a/data/_apt1.4/sha1.diff b/data/_apt1.4/sha1.diff
deleted file mode 100644
index e681382ca..000000000
--- a/data/_apt1.4/sha1.diff
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur apt/methods/gpgv.cc apt+iPhone/methods/gpgv.cc
---- apt/methods/gpgv.cc	2018-07-30 21:45:07.000000000 -1000
-+++ apt+iPhone/methods/gpgv.cc	2018-08-03 20:59:27.000000000 -1000
-@@ -67,7 +67,7 @@
- static constexpr Digest Digests[] = {
-    {Digest::State::Untrusted, "Invalid digest"},
-    {Digest::State::Untrusted, "MD5"},
--   {Digest::State::Untrusted, "SHA1"},
-+   {Digest::State::Trusted, "SHA1"},
-    {Digest::State::Untrusted, "RIPE-MD/160"},
-    {Digest::State::Trusted, "Reserved digest"},
-    {Digest::State::Trusted, "Reserved digest"},