apt: Update from 1.0.9.10 to 1.0.10.2

diff --git a/packages/apt/apt-get.patch b/packages/apt/apt-get.patch
deleted file mode 100644 (file)
index 8d50b64..0000000
--- a/packages/apt/apt-get.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-diff -u -r ../upstream.git/cmdline/apt-get.cc ./cmdline/apt-get.cc
---- ../upstream.git/cmdline/apt-get.cc 2014-03-14 09:05:18.000000000 +0100
-+++ ./cmdline/apt-get.cc       2014-04-15 21:01:01.072700439 +0200
-@@ -79,8 +79,11 @@
- #include <sys/ioctl.h>
- #include <sys/stat.h>
- #include <sys/statfs.h>
--#include <sys/statvfs.h>
-+#ifndef __ANDROID__
-+# include <sys/statvfs.h>
-+#endif
- #include <sys/wait.h>
-+#include <termios.h>
- #include <unistd.h>
- #include <algorithm>
- #include <fstream>
-@@ -854,14 +857,14 @@
-    unsigned long long DebBytes = Fetcher.TotalNeeded();
- 
-    // Check for enough free space
--   struct statvfs Buf;
-+   struct statfs Buf;
-    string OutputDir = ".";
--   if (statvfs(OutputDir.c_str(),&Buf) != 0) {
-+   if (statfs(OutputDir.c_str(),&Buf) != 0) {
-       if (errno == EOVERFLOW)
--       return _error->WarningE("statvfs",_("Couldn't determine free space in %s"),
-+       return _error->WarningE("statfs",_("Couldn't determine free space in %s"),
-                               OutputDir.c_str());
-       else
--       return _error->Errno("statvfs",_("Couldn't determine free space in %s"),
-+       return _error->Errno("statfs",_("Couldn't determine free space in %s"),
-                               OutputDir.c_str());
-    } else if (unsigned(Buf.f_bfree) < (FetchBytes - FetchPBytes)/Buf.f_bsize)
-      {

diff --git a/packages/apt/build.sh b/packages/apt/build.sh
index 6ffa3df..68ad3a8 100644 (file)
--- a/packages/apt/build.sh
+++ b/packages/apt/build.sh
@@ -1,7 +1,7 @@
 TERMUX_PKG_HOMEPAGE=https://packages.debian.org/apt
 TERMUX_PKG_DESCRIPTION="Front-end for the dpkg package manager"
 TERMUX_PKG_DEPENDS="libbz2, liblzma, libgnustl, dpkg, gnupg"
-TERMUX_PKG_VERSION=1.0.9.10
+TERMUX_PKG_VERSION=1.0.10.2
 TERMUX_PKG_SRCURL=http://ftp.debian.org/debian/pool/main/a/apt/apt_${TERMUX_PKG_VERSION}.tar.xz
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--host=${TERMUX_ARCH}-linux --disable-rpath acl_cv_rpath=$TERMUX_PREFIX/lib gt_cv_func_CFPreferencesCopyAppValue=no gt_cv_func_CFLocaleCopyCurrent=no ac_cv_c_bigendian=no --no-create"
 TERMUX_PKG_FOLDERNAME=apt-${TERMUX_PKG_VERSION}
@@ -31,8 +31,8 @@ termux_step_make () {
 
 termux_step_make_install () {
         cp $TERMUX_PKG_BUILDDIR/bin/apt{,-get,-cache,-config,-key} $TERMUX_PREFIX/bin/
-        cp $TERMUX_PKG_BUILDDIR/bin/libapt-{pkg.so.4.12,private.so.0.0} $TERMUX_PREFIX/lib/
-        (cd $TERMUX_PREFIX/lib; rm -f libapt-pkg.so; ln -s libapt-pkg.so.4.12 libapt-pkg.so) # used by python-apt
+        cp $TERMUX_PKG_BUILDDIR/bin/libapt-{pkg.so.4.16,private.so.0.0} $TERMUX_PREFIX/lib/
+        (cd $TERMUX_PREFIX/lib; rm -f libapt-pkg.so; ln -s libapt-pkg.so.4.16 libapt-pkg.so) # used by python-apt
         mkdir -p $TERMUX_PREFIX/lib/apt/methods $TERMUX_PREFIX/share/man/man{5,8}
         cp $TERMUX_PKG_BUILDDIR/docs/apt{,-cache,-get}.8 $TERMUX_PREFIX/share/man/man8/
         cp $TERMUX_PKG_BUILDDIR/docs/{apt.conf,sources.list}.5 $TERMUX_PREFIX/share/man/man5/

diff --git a/packages/apt/cdrumtl.patch b/packages/apt/cdrumtl.patch
deleted file mode 100644 (file)
index b75dee7..0000000
--- a/packages/apt/cdrumtl.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-diff -u -r ../apt-0.9.16.1/apt-pkg/contrib/cdromutl.cc ./apt-pkg/contrib/cdromutl.cc
---- ../apt-0.9.16.1/apt-pkg/contrib/cdromutl.cc        2014-03-15 17:26:21.000000000 +0100
-+++ ./apt-pkg/contrib/cdromutl.cc      2014-03-25 00:58:55.948730001 +0100
-@@ -24,7 +24,6 @@
- #include <iostream>
- #include <string>
- #include <vector>
--#include <sys/statvfs.h>
- #include <dirent.h>
- #include <fcntl.h>
- #include <sys/stat.h>
-@@ -239,6 +238,7 @@
-    closedir(D);
-    
-    // Some stats from the fsys
-+#ifndef __ANDROID__
-    if (_config->FindB("Debug::identcdrom",false) == false)
-    {
-       struct statvfs Buf;
-@@ -258,6 +258,7 @@
-    }
-    else
-       sprintf(S,"-%u.debug",Version);
-+#endif
-    
-    Res = Hash.Result().Value() + S;
-    return true;   
-@@ -266,6 +267,7 @@
- // FindMountPointForDevice - Find mountpoint for the given device     /*{{{*/
- string FindMountPointForDevice(const char *devnode)
- {
-+#ifndef __ANDROID__
-    // this is the order that mount uses as well
-    std::vector<std::string> const mounts = _config->FindVector("Dir::state::MountPoints", "/etc/mtab,/proc/mount");
- 
-@@ -290,7 +292,7 @@
-        }
-        fclose(f);
-       }
--
-+#endif
-    return string();
- }
-                                                                       /*}}}*/

diff --git a/packages/apt/private-install-no-statvfs.patch b/packages/apt/private-install-no-statvfs.patch
deleted file mode 100644 (file)
index d2eb3c1..0000000
--- a/packages/apt/private-install-no-statvfs.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff -u -r ../upstream.git/apt-private/private-install.cc ./apt-private/private-install.cc
---- ../upstream.git/apt-private/private-install.cc     2014-03-14 09:05:18.000000000 +0100
-+++ ./apt-private/private-install.cc   2014-04-15 20:58:34.416703941 +0200
-@@ -24,7 +24,9 @@
- #include <stdlib.h>
- #include <string.h>
- #include <sys/statfs.h>
--#include <sys/statvfs.h>
-+#ifndef __ANDROID__
-+# include <sys/statvfs.h>
-+#endif
- #include <algorithm>
- #include <iostream>
- #include <set>
-@@ -179,14 +181,14 @@
-    if (_config->FindB("APT::Get::Print-URIs") == false &&
-        _config->FindB("APT::Get::Download",true) == true)
-    {
--      struct statvfs Buf;
-+      struct statfs Buf;
-       std::string OutputDir = _config->FindDir("Dir::Cache::Archives");
--      if (statvfs(OutputDir.c_str(),&Buf) != 0) {
-+      if (statfs(OutputDir.c_str(),&Buf) != 0) {
-        if (errno == EOVERFLOW)
--          return _error->WarningE("statvfs",_("Couldn't determine free space in %s"),
-+          return _error->WarningE("statfs",_("Couldn't determine free space in %s"),
-                                OutputDir.c_str());
-        else
--          return _error->Errno("statvfs",_("Couldn't determine free space in %s"),
-+          return _error->Errno("statfs",_("Couldn't determine free space in %s"),
-                                OutputDir.c_str());
-       } else if (unsigned(Buf.f_bfree) < (FetchBytes - FetchPBytes)/Buf.f_bsize)
-       {