From b6d05a89e7a985025cdb74f9ae344990b28ea247 Mon Sep 17 00:00:00 2001 From: Vishal Biswas Date: Mon, 10 Apr 2017 01:32:35 +0530 Subject: [PATCH] Updates for some disabled packages and add net-tools (#911) * liblzo: update from 2.09 to 2.10 * net-tools: add package * openvpn: update from 2.4.0 to 2.4.1 * squid: update from 3.5.24 to 3.5.25 --- disabled-packages/openvpn/build.sh | 42 ++++++++++++------------- disabled-packages/squid/build.sh | 16 +++++----- packages/liblzo/build.sh | 8 ++--- packages/net-tools/build.sh | 23 ++++++++++++++ packages/net-tools/ifconfig.c.patch | 10 ++++++ packages/net-tools/lib-inet.c.patch | 18 +++++++++++ packages/net-tools/lib-inet6.c.patch | 11 +++++++ packages/net-tools/lib-inet6_sr.c.patch | 10 ++++++ packages/net-tools/nameif.c.patch | 11 +++++++ 9 files changed, 115 insertions(+), 34 deletions(-) create mode 100644 packages/net-tools/build.sh create mode 100644 packages/net-tools/ifconfig.c.patch create mode 100644 packages/net-tools/lib-inet.c.patch create mode 100644 packages/net-tools/lib-inet6.c.patch create mode 100644 packages/net-tools/lib-inet6_sr.c.patch create mode 100644 packages/net-tools/nameif.c.patch diff --git a/disabled-packages/openvpn/build.sh b/disabled-packages/openvpn/build.sh index 9afb41dfb..f2c27dfe1 100644 --- a/disabled-packages/openvpn/build.sh +++ b/disabled-packages/openvpn/build.sh @@ -1,37 +1,35 @@ TERMUX_PKG_HOMEPAGE=https://openvpn.net -TERMUX_PKG_DESCRIPTION='An easy-to-use, robust, and highly configurable VPN (Virtual Private Network)' -TERMUX_PKG_VERSION=2.4.0 -TERMUX_PKG_DEPENDS="openssl, liblzo" +TERMUX_PKG_DESCRIPTION="An easy-to-use, robust, and highly configurable VPN (Virtual Private Network)" +TERMUX_PKG_VERSION=2.4.1 +TERMUX_PKG_DEPENDS="openssl, liblzo, net-tools" TERMUX_PKG_SRCURL=https://swupdate.openvpn.net/community/releases/openvpn-${TERMUX_PKG_VERSION}.tar.xz -TERMUX_PKG_SHA256=6f23ba49a1dbeb658f49c7ae17d9ea979de6d92c7357de3d55cd4525e1b2f87e -TERMUX_PKG_EXTRA_CONFIGURE_ARGS=' --disable-plugin-auth-pam --disable-systemd --disable-debug' -TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=' --enable-iproute2 --enable-small --enable-x509-alt-username' -TERMUX_PKG_MAINTAINER='Vishal Biswas @vishalbiswas' +TERMUX_PKG_SHA256=fde9e22c6df7a335d2d58c6a4d5967be76df173c766a5c51ece57fd044c76ee5 +TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" --disable-plugin-auth-pam +--disable-systemd +--disable-debug +--enable-iproute2 +--enable-small +--enable-x509-alt-username +ac_cv_func_getpwnam=yes +ac_cv_func_getpass=yes +IFCONFIG=$TERMUX_PREFIX/bin/ifconfig +ROUTE=$TERMUX_PREFIX/bin/route +IPROUTE=$TERMUX_PREFIX/bin/ip +NETSTAT=$TERMUX_PREFIX/bin/netstat" +TERMUX_PKG_MAINTAINER="Vishal Biswas @vishalbiswas" termux_step_pre_configure () { - # we modify configure.ac - # uncomment if you want to apply configure.patch - # autoreconf -i $TERMUX_PKG_SRCDIR - - export ac_cv_func_getpwnam='yes' # need to provide getpass, else you "can't get console input" - export ac_cv_func_getpass='yes' cp "$TERMUX_PKG_BUILDER_DIR/netbsd_getpass.c" "$TERMUX_PKG_SRCDIR/src/openvpn/" - # paths to external programs used by openvpn - export IFCONFIG="$TERMUX_PREFIX/bin/applets/ifconfig" - export ROUTE="$TERMUX_PREFIX/bin/applets/route" - export IPROUTE="$TERMUX_PREFIX/bin/ip" - export NETSTAT="$TERMUX_PREFIX/bin/applets/netstat" - # CFLAGS="$CFLAGS -DTARGET_ANDROID" LDFLAGS="$LDFLAGS -llog " } termux_step_post_make_install () { # helper script - install -m700 "${TERMUX_PKG_BUILDER_DIR}"/termux-openvpn "${TERMUX_PREFIX}"/bin/ + install -m700 "$TERMUX_PKG_BUILDER_DIR/termux-openvpn" "$TERMUX_PREFIX/bin/" # Install examples - install -d -m755 "${TERMUX_PREFIX}"/share/openvpn/examples - cp "${TERMUX_PKG_SRCDIR}"/sample/sample-config-files/* "${TERMUX_PREFIX}"/share/openvpn/examples + install -d -m755 "$TERMUX_PREFIX/share/openvpn/examples" + cp "$TERMUX_PKG_SRCDIR"/sample/sample-config-files/* "$TERMUX_PREFIX/share/openvpn/examples" } diff --git a/disabled-packages/squid/build.sh b/disabled-packages/squid/build.sh index 99f2eded9..e7e520911 100644 --- a/disabled-packages/squid/build.sh +++ b/disabled-packages/squid/build.sh @@ -1,16 +1,16 @@ TERMUX_PKG_HOMEPAGE=http://www.squid-cache.org -TERMUX_PKG_DESCRIPTION='Full-featured Web proxy cache server' -TERMUX_PKG_VERSION=3.5.24 -TERMUX_PKG_DEPENDS="libcrypt, krb5, openssl, libnettle" +TERMUX_PKG_DESCRIPTION="Full-featured Web proxy cache server" +TERMUX_PKG_VERSION=3.5.25 +TERMUX_PKG_DEPENDS="libcrypt, openssl" TERMUX_PKG_SRCURL=http://www.squid-cache.org/Versions/v3/3.5/squid-${TERMUX_PKG_VERSION}.tar.xz -TERMUX_PKG_SHA256=4fe29f582eef357faa541a53835b6885e24e6f28b80a3abcdf3b57f5393bbdb2 -# disk-io requires shmem, msgctl and store-io requires disk-io -TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" --disable-strict-error-checking --disable-auto-locale --disable-disk-io --disable-storeio" -TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" --with-openssl --enable-auth --with-nettle --disable-translation --with-size-optimizations" +TERMUX_PKG_SHA256=28959254c32b8cd87e9599b6beb97352cf0638524e0f5ac3e1754f08462f3585 +TERMUX_PKG_MAINTAINER="Vishal Biswas @vishalbiswas" +# disk-io requires msgctl and store-io requires disk-io +TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" --disable-strict-error-checking --disable-disk-io --disable-storeio --without-mit-krb5 --with-dl" +TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" --with-openssl --enable-auth --without-libnettle --enable-translation --with-size-optimizations --without-libxml2" TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" --libexecdir=$TERMUX_PREFIX/libexec/squid --sysconfdir=$TERMUX_PREFIX/etc/squid --datarootdir=$TERMUX_PREFIX/share/squid" termux_step_pre_configure () { - #CPPFLAGS="$CPPFLAGS -DTERMUX_SHMEM_STUBS" TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" squid_cv_gnu_atomics=yes" LDFLAGS="$LDFLAGS -llog" diff --git a/packages/liblzo/build.sh b/packages/liblzo/build.sh index 24e2764d3..d84a067a9 100644 --- a/packages/liblzo/build.sh +++ b/packages/liblzo/build.sh @@ -1,7 +1,7 @@ TERMUX_PKG_HOMEPAGE=http://www.oberhumer.com/opensource/lzo -TERMUX_PKG_DESCRIPTION='Portable lossless data compression library' -TERMUX_PKG_VERSION=2.09 +TERMUX_PKG_DESCRIPTION="Portable lossless data compression library" +TERMUX_PKG_VERSION=2.10 TERMUX_PKG_SRCURL=http://www.oberhumer.com/opensource/lzo/download/lzo-${TERMUX_PKG_VERSION}.tar.gz -TERMUX_PKG_MAINTAINER='Vishal Biswas @vishalbiswas' -TERMUX_PKG_SHA256=f294a7ced313063c057c504257f437c8335c41bfeed23531ee4e6a2b87bcb34c +TERMUX_PKG_MAINTAINER="Vishal Biswas @vishalbiswas" +TERMUX_PKG_SHA256=c0f892943208266f9b6543b3ae308fab6284c5c90e627931446fb49b4221a072 diff --git a/packages/net-tools/build.sh b/packages/net-tools/build.sh new file mode 100644 index 000000000..8f9171dc7 --- /dev/null +++ b/packages/net-tools/build.sh @@ -0,0 +1,23 @@ +TERMUX_PKG_HOMEPAGE=http://net-tools.sourceforge.net/ +TERMUX_PKG_VERSION=1.60.2017.02.21 +TERMUX_PKG_DESCRIPTION="Configuration tools for Linux networking" +_commit=479bb4a7e11a4084e2935c0a576388f92469225b +TERMUX_PKG_SRCURL=https://sourceforge.net/code-snapshots/git/n/ne/net-tools/code.git/net-tools-code-$_commit.zip +TERMUX_PKG_SHA256=7e9f8e8dcbabed0c8eeb976100496567abae7ac9d92c72cebd1a9d965473e943 +TERMUX_PKG_BUILD_IN_SRC=true +TERMUX_PKG_EXTRA_MAKE_ARGS="BINDIR=$TERMUX_PREFIX/bin SBINDIR=$TERMUX_PREFIX HAVE_HOSTNAME_TOOLS=0" + +termux_step_configure () { + CFLAGS="$CFLAGS -D_LINUX_IN6_H -Dindex=strchr -Drindex=strrchr" + LDFLAGS="$LDFLAGS -llog" + sed -i "s#/usr#$TERMUX_PREFIX#" $TERMUX_PKG_SRCDIR/man/Makefile + yes "" | make config || true +} + +termux_step_make () { + make -j5 $TERMUX_PKG_EXTRA_MAKE_ARGS +} + +termux_step_make_install () { + make $TERMUX_PKG_EXTRA_MAKE_ARGS update +} diff --git a/packages/net-tools/ifconfig.c.patch b/packages/net-tools/ifconfig.c.patch new file mode 100644 index 000000000..bb55d1d9c --- /dev/null +++ b/packages/net-tools/ifconfig.c.patch @@ -0,0 +1,10 @@ +--- ./ifconfig.c 2017-02-21 23:54:32.000000000 +0530 ++++ ../ifconfig.c 2017-04-09 14:12:07.253003297 +0530 +@@ -44,6 +44,7 @@ + #include + #include + #include ++#include + + /* Ugh. But libc5 doesn't provide POSIX types. */ + #include diff --git a/packages/net-tools/lib-inet.c.patch b/packages/net-tools/lib-inet.c.patch new file mode 100644 index 000000000..8e7bd38b9 --- /dev/null +++ b/packages/net-tools/lib-inet.c.patch @@ -0,0 +1,18 @@ +--- ./lib/inet.c 2017-02-21 23:54:32.000000000 +0530 ++++ ../inet.c 2017-04-09 14:43:19.639365853 +0530 +@@ -414,6 +414,7 @@ + } + } + endservent(); ++#if 0 + setprotoent(1); + while ((pe = getprotoent())) { + /* Allocate a service entry. */ +@@ -423,6 +424,7 @@ + add2list(&raw_name, item); + } + endprotoent(); ++#endif + return (0); + } + diff --git a/packages/net-tools/lib-inet6.c.patch b/packages/net-tools/lib-inet6.c.patch new file mode 100644 index 000000000..0621c3be6 --- /dev/null +++ b/packages/net-tools/lib-inet6.c.patch @@ -0,0 +1,11 @@ +--- ./lib/inet6.c 2017-02-21 23:54:32.000000000 +0530 ++++ ../inet6.c 2017-04-09 14:01:12.215538103 +0530 +@@ -46,7 +46,7 @@ + + static char *fix_v4_address(char *buf, const struct in6_addr *in6) + { +- if (IN6_IS_ADDR_V4MAPPED(in6->s6_addr)) { ++ if (IN6_IS_ADDR_V4MAPPED(in6)) { + char *s =strchr(buf, '.'); + if (s) { + while (s > buf && *s != ':') diff --git a/packages/net-tools/lib-inet6_sr.c.patch b/packages/net-tools/lib-inet6_sr.c.patch new file mode 100644 index 000000000..75ef90acb --- /dev/null +++ b/packages/net-tools/lib-inet6_sr.c.patch @@ -0,0 +1,10 @@ +--- ./lib/inet6_sr.c 2017-02-21 23:54:32.000000000 +0530 ++++ ../inet6_sr.c 2017-04-09 14:07:22.352743997 +0530 +@@ -35,6 +35,7 @@ + #include "intl.h" + #include "net-features.h" + #include "util.h" ++#include + + + extern struct aftype inet6_aftype; diff --git a/packages/net-tools/nameif.c.patch b/packages/net-tools/nameif.c.patch new file mode 100644 index 000000000..3157bbac1 --- /dev/null +++ b/packages/net-tools/nameif.c.patch @@ -0,0 +1,11 @@ +--- ./nameif.c 2017-02-21 23:54:32.000000000 +0530 ++++ ../nameif.c 2017-04-09 14:47:40.889765378 +0530 +@@ -10,7 +10,7 @@ + #endif + #include + #include +-#include ++#include + #include + #include + #include