X-Git-Url: https://git.distorted.org.uk/~mdw/termux-packages/blobdiff_plain/d4f510791670612eb271f3b86f1760a8ec3dc203..4b72be794567f4656698b5b05c0a63098e9fe0ec:/packages/apt/build.sh

diff --git a/packages/apt/build.sh b/packages/apt/build.sh
index 1a56e1f6..48cc9082 100644
--- a/packages/apt/build.sh
+++ b/packages/apt/build.sh
@@ -1,18 +1,16 @@
 TERMUX_PKG_HOMEPAGE=https://packages.debian.org/apt
 TERMUX_PKG_DESCRIPTION="Front-end for the dpkg package manager"
-TERMUX_PKG_DEPENDS="liblzma, dpkg, gpgv"
+TERMUX_PKG_DEPENDS="liblzma, dpkg, gpgv, libc++"
 # Wait with updating to later version until the NDK supports std::to_string() and other
 # functions (hopefully in r15, https://github.com/android-ndk/ndk/issues/82).
 # Updating to apt 1.4 will also get rid of the build hacks used as apt has transitioned
 # to a clean cmake build system.
 TERMUX_PKG_VERSION=1.2.12
-TERMUX_PKG_REVISION=1
+TERMUX_PKG_REVISION=3
 # TERMUX_PKG_SRCURL=http://ftp.debian.org/debian/pool/main/a/apt/apt_${TERMUX_PKG_VERSION}.tar.xz
 TERMUX_PKG_SRCURL=https://launchpad.net/ubuntu/+archive/primary/+files/apt_${TERMUX_PKG_VERSION}.tar.xz
-TERMUX_PKG_EXTRA_CONFIGURE_ARGS="\
---no-create
-ac_cv_c_bigendian=no
-ac_cv_lib_bz2_BZ2_bzopen=no"
+TERMUX_PKG_SHA256=e820d27cba73476df4abcff27dadd1b5847474bfe85f7e9202a9a07526973ea6
+TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--no-create"
 TERMUX_PKG_FOLDERNAME=apt-${TERMUX_PKG_VERSION}
 TERMUX_PKG_BUILD_IN_SRC=yes
 TERMUX_PKG_ESSENTIAL=yes
@@ -27,6 +25,8 @@ termux_step_pre_configure () {
 	perl -p -i -e "s/TERMUX_ARCH/$TERMUX_ARCH/" $TERMUX_PKG_SRCDIR/configure
 
 	rm $TERMUX_PKG_SRCDIR/apt-pkg/{cdrom.cc,indexcopy.cc}
+
+	export ac_cv_lib_bz2_BZ2_bzopen=no
 }
 
 termux_step_make_install () {
@@ -36,8 +36,9 @@ termux_step_make_install () {
 	mkdir -p $TERMUX_PREFIX/lib/apt/methods $TERMUX_PREFIX/share/man/man{5,8}
 	cp $TERMUX_PKG_BUILDDIR/build/docs/apt{,-cache,-get}.8 $TERMUX_PREFIX/share/man/man8/
 	cp $TERMUX_PKG_BUILDDIR/build/docs/{apt.conf,sources.list}.5 $TERMUX_PREFIX/share/man/man5/
-	cp $TERMUX_PKG_BUILDDIR/build/bin/methods/{copy,file,gpgv,gzip,http,https,store} $TERMUX_PREFIX/lib/apt/methods
+	cp $TERMUX_PKG_BUILDDIR/build/bin/methods/{copy,file,gpgv,gzip,http,https,rsh,store} $TERMUX_PREFIX/lib/apt/methods
 	(cd $TERMUX_PREFIX/lib/apt/methods; ln -f -s gzip xz)
+	(cd $TERMUX_PREFIX/lib/apt/methods; ln -f -s rsh ssh)
 
 	mkdir -p $TERMUX_PREFIX/etc/apt
 	printf "# The main termux repository:\ndeb [arch=all,${TERMUX_ARCH}] http://termux.net stable main\n" > $TERMUX_PREFIX/etc/apt/sources.list