From 8bf3f3f0754ef45e97eb9b8f56ec6d893f43d577 Mon Sep 17 00:00:00 2001 From: Fredrik Fornwall Date: Sun, 8 Nov 2015 01:02:27 -0500 Subject: [PATCH] Minor version bumps --- packages/angband/build.sh | 2 +- packages/ant/build.sh | 2 +- packages/ca-certificates/build.sh | 4 +- packages/dropbear/build.sh | 3 +- packages/dropbear/dropbear.patch | 95 --------------------------------------- packages/dropbear/options.h.patch | 95 +++++++++++++++++++++++++++++++++++++++ 6 files changed, 100 insertions(+), 101 deletions(-) create mode 100644 packages/dropbear/options.h.patch diff --git a/packages/angband/build.sh b/packages/angband/build.sh index 7a5afea0..0cc02e6e 100644 --- a/packages/angband/build.sh +++ b/packages/angband/build.sh @@ -1,4 +1,4 @@ -TERMUX_PKG_VERSION=4.0.2 +TERMUX_PKG_VERSION=4.0.3 TERMUX_PKG_SRCURL=http://rephial.org/downloads/4.0/angband-${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_HOMEPAGE=http://rephial.org/ TERMUX_PKG_DESCRIPTION="Dungeon exploration game where you play an adventurer seeking riches, fighting monsters and preparing for a final battle with Morgoth, the Lord of Darkness" diff --git a/packages/ant/build.sh b/packages/ant/build.sh index fbf757db..2a50a299 100755 --- a/packages/ant/build.sh +++ b/packages/ant/build.sh @@ -1,6 +1,6 @@ TERMUX_PKG_HOMEPAGE=http://ant.apache.org/ TERMUX_PKG_DESCRIPTION="Java based build tool like make" -TERMUX_PKG_VERSION=1.9.5 +TERMUX_PKG_VERSION=1.9.6 TERMUX_PKG_SRCURL=http://apache.mirrors.spacedump.net//ant/binaries/apache-ant-${TERMUX_PKG_VERSION}-bin.tar.bz2 TERMUX_PKG_FOLDERNAME=apache-ant-${TERMUX_PKG_VERSION} TERMUX_PKG_BUILD_IN_SRC=yes diff --git a/packages/ca-certificates/build.sh b/packages/ca-certificates/build.sh index 87dda342..e09d5989 100644 --- a/packages/ca-certificates/build.sh +++ b/packages/ca-certificates/build.sh @@ -1,12 +1,12 @@ TERMUX_PKG_HOMEPAGE=http://curl.haxx.se/docs/caextract.html TERMUX_PKG_DESCRIPTION="Common CA certificates" -TERMUX_PKG_VERSION=20150427 +TERMUX_PKG_VERSION=20151028 TERMUX_PKG_BUILD_REVISION=1 termux_step_make_install () { CERTFILE=$TERMUX_PKG_TMPDIR/cert.pem curl -o $CERTFILE https://raw.githubusercontent.com/bagder/ca-bundle/master/ca-bundle.crt - if grep -q 'SHA1: ed3c0bbfb7912bcc00cd2033b0cb85c98d10559c' $CERTFILE; then + if grep -q 'SHA1: 6d7d2f0a4fae587e7431be191a081ac1257d300a' $CERTFILE; then CERT_DIR=$TERMUX_PREFIX/etc/tls mkdir -p $CERT_DIR mv $CERTFILE $CERT_DIR/cert.pem diff --git a/packages/dropbear/build.sh b/packages/dropbear/build.sh index afa13a84..a39016b2 100755 --- a/packages/dropbear/build.sh +++ b/packages/dropbear/build.sh @@ -1,7 +1,6 @@ TERMUX_PKG_HOMEPAGE=https://matt.ucc.asn.au/dropbear/dropbear.html TERMUX_PKG_DESCRIPTION="Small SSH server and client" -TERMUX_PKG_VERSION=2015.67 -TERMUX_PKG_BUILD_REVISION=1 +TERMUX_PKG_VERSION=2015.68 # Using mirror since main site was down 2015-06-13: # TERMUX_PKG_SRCURL=https://matt.ucc.asn.au/dropbear/releases/dropbear-${TERMUX_PKG_VERSION}.tar.bz2 TERMUX_PKG_SRCURL=https://dropbear.nl/mirror/dropbear-${TERMUX_PKG_VERSION}.tar.bz2 diff --git a/packages/dropbear/dropbear.patch b/packages/dropbear/dropbear.patch index a2ee9e1a..10a0b8d8 100644 --- a/packages/dropbear/dropbear.patch +++ b/packages/dropbear/dropbear.patch @@ -13,101 +13,6 @@ diff -u -r ../dropbear-2013.62/cli-auth.c ./cli-auth.c memset(&ses.authstate, 0, sizeof(ses.authstate)); #ifdef ENABLE_CLI_ANYTCPFWD -diff -u -r ../dropbear-2013.62/options.h ./options.h ---- ../dropbear-2013.62/options.h 2013-12-03 14:39:15.000000000 +0100 -+++ ./options.h 2014-01-05 21:21:37.930812382 +0100 -@@ -10,8 +10,10 @@ - - /* IMPORTANT: Many options will require "make clean" after changes */ -+ -+ - - #ifndef DROPBEAR_DEFPORT --#define DROPBEAR_DEFPORT "22" -+#define DROPBEAR_DEFPORT "8022" - #endif - - #ifndef DROPBEAR_DEFADDRESS -@@ -21,13 +23,13 @@ - - /* Default hostkey paths - these can be specified on the command line */ - #ifndef DSS_PRIV_FILENAME --#define DSS_PRIV_FILENAME "/etc/dropbear/dropbear_dss_host_key" -+#define DSS_PRIV_FILENAME "@TERMUX_PREFIX@/etc/dropbear/dropbear_dss_host_key" - #endif - #ifndef RSA_PRIV_FILENAME --#define RSA_PRIV_FILENAME "/etc/dropbear/dropbear_rsa_host_key" -+#define RSA_PRIV_FILENAME "@TERMUX_PREFIX@/etc/dropbear/dropbear_rsa_host_key" - #endif - #ifndef ECDSA_PRIV_FILENAME --#define ECDSA_PRIV_FILENAME "/etc/dropbear/dropbear_ecdsa_host_key" -+#define ECDSA_PRIV_FILENAME "@TERMUX_PREFIX@/etc/dropbear/dropbear_ecdsa_host_key" - #endif - - /* Set NON_INETD_MODE if you require daemon functionality (ie Dropbear listens -@@ -41,7 +43,7 @@ - * Both of these flags can be defined at once, don't compile without at least - * one of them. */ - #define NON_INETD_MODE --#define INETD_MODE -+#undef INETD_MODE - - /* Setting this disables the fast exptmod bignum code. It saves ~5kB, but is - * perhaps 20% slower for pubkey operations (it is probably worth experimenting -@@ -55,7 +57,7 @@ - #define DROPBEAR_SMALL_CODE - - /* Enable X11 Forwarding - server only */ --#define ENABLE_X11FWD -+#undef ENABLE_X11FWD - - /* Enable TCP Fowarding */ - /* 'Local' is "-L" style (client listening port forwarded via server) -@@ -179,7 +181,7 @@ - - /* The MOTD file path */ - #ifndef MOTD_FILENAME --#define MOTD_FILENAME "/etc/motd" -+#define MOTD_FILENAME "@TERMUX_PREFIX@/etc/motd" - #endif - - /* Authentication Types - at least one required. -@@ -192,7 +194,7 @@ - * PAM challenge/response. - * You can't enable both PASSWORD and PAM. */ - --#define ENABLE_SVR_PASSWORD_AUTH -+#undef ENABLE_SVR_PASSWORD_AUTH - /* PAM requires ./configure --enable-pam */ - /*#define ENABLE_SVR_PAM_AUTH */ - #define ENABLE_SVR_PUBKEY_AUTH -@@ -259,7 +261,7 @@ - /* The default file to store the daemon's process ID, for shutdown - scripts etc. This can be overridden with the -P flag */ - #ifndef DROPBEAR_PIDFILE --#define DROPBEAR_PIDFILE "/var/run/dropbear.pid" -+#define DROPBEAR_PIDFILE "@TERMUX_PREFIX@/var/run/dropbear.pid" - #endif - - /* The command to invoke for xauth when using X11 forwarding. -@@ -277,7 +279,7 @@ - - /* This is used by the scp binary when used as a client binary. If you're - * not using the Dropbear client, you'll need to change it */ --#define _PATH_SSH_PROGRAM "/usr/bin/dbclient" -+#define _PATH_SSH_PROGRAM "@TERMUX_PREFIX@/bin/dbclient" - - /* Whether to log commands executed by a client. This only logs the - * (single) command sent to the server, not what a user did in a -@@ -314,7 +316,7 @@ - #define DEFAULT_IDLE_TIMEOUT 0 - - /* The default path. This will often get replaced by the shell */ --#define DEFAULT_PATH "/usr/bin:/bin" -+#define DEFAULT_PATH "@TERMUX_PREFIX@:/system/bin" - - /* Some other defines (that mostly should be left alone) are defined - * in sysoptions.h */ diff -u -r ../dropbear-2013.62/sshpty.c ./sshpty.c --- ../dropbear-2013.62/sshpty.c 2013-12-03 14:39:15.000000000 +0100 +++ ./sshpty.c 2014-01-05 21:21:37.930812382 +0100 diff --git a/packages/dropbear/options.h.patch b/packages/dropbear/options.h.patch new file mode 100644 index 00000000..93adbefb --- /dev/null +++ b/packages/dropbear/options.h.patch @@ -0,0 +1,95 @@ +diff -u -r ../dropbear-2015.68/options.h ./options.h +--- ../dropbear-2015.68/options.h 2015-08-08 08:35:34.000000000 -0400 ++++ ./options.h 2015-11-08 00:49:34.079208221 -0500 +@@ -10,8 +10,10 @@ + + /* IMPORTANT: Many options will require "make clean" after changes */ + ++ ++ + #ifndef DROPBEAR_DEFPORT +-#define DROPBEAR_DEFPORT "22" ++#define DROPBEAR_DEFPORT "8022" + #endif + + #ifndef DROPBEAR_DEFADDRESS +@@ -21,13 +23,13 @@ + + /* Default hostkey paths - these can be specified on the command line */ + #ifndef DSS_PRIV_FILENAME +-#define DSS_PRIV_FILENAME "/etc/dropbear/dropbear_dss_host_key" ++#define DSS_PRIV_FILENAME "@TERMUX_PREFIX@/etc/dropbear/dropbear_dss_host_key" + #endif + #ifndef RSA_PRIV_FILENAME +-#define RSA_PRIV_FILENAME "/etc/dropbear/dropbear_rsa_host_key" ++#define RSA_PRIV_FILENAME "@TERMUX_PREFIX@/etc/dropbear/dropbear_rsa_host_key" + #endif + #ifndef ECDSA_PRIV_FILENAME +-#define ECDSA_PRIV_FILENAME "/etc/dropbear/dropbear_ecdsa_host_key" ++#define ECDSA_PRIV_FILENAME "@TERMUX_PREFIX@/etc/dropbear/dropbear_ecdsa_host_key" + #endif + + /* Set NON_INETD_MODE if you require daemon functionality (ie Dropbear listens +@@ -41,7 +43,7 @@ + * Both of these flags can be defined at once, don't compile without at least + * one of them. */ + #define NON_INETD_MODE +-#define INETD_MODE ++#undef INETD_MODE + + /* Setting this disables the fast exptmod bignum code. It saves ~5kB, but is + * perhaps 20% slower for pubkey operations (it is probably worth experimenting +@@ -55,7 +57,7 @@ + #define DROPBEAR_SMALL_CODE + + /* Enable X11 Forwarding - server only */ +-#define ENABLE_X11FWD ++#undef ENABLE_X11FWD + + /* Enable TCP Fowarding */ + /* 'Local' is "-L" style (client listening port forwarded via server) +@@ -193,7 +195,7 @@ + + /* The MOTD file path */ + #ifndef MOTD_FILENAME +-#define MOTD_FILENAME "/etc/motd" ++#define MOTD_FILENAME "@TERMUX_PREFIX@/etc/motd" + #endif + + /* Authentication Types - at least one required. +@@ -206,7 +208,7 @@ + * PAM challenge/response. + * You can't enable both PASSWORD and PAM. */ + +-#define ENABLE_SVR_PASSWORD_AUTH ++#undef ENABLE_SVR_PASSWORD_AUTH + /* PAM requires ./configure --enable-pam */ + /*#define ENABLE_SVR_PAM_AUTH */ + #define ENABLE_SVR_PUBKEY_AUTH +@@ -276,7 +278,7 @@ + /* The default file to store the daemon's process ID, for shutdown + scripts etc. This can be overridden with the -P flag */ + #ifndef DROPBEAR_PIDFILE +-#define DROPBEAR_PIDFILE "/var/run/dropbear.pid" ++#define DROPBEAR_PIDFILE "@TERMUX_PREFIX@/var/run/dropbear.pid" + #endif + + /* The command to invoke for xauth when using X11 forwarding. +@@ -294,7 +296,7 @@ + + /* This is used by the scp binary when used as a client binary. If you're + * not using the Dropbear client, you'll need to change it */ +-#define DROPBEAR_PATH_SSH_PROGRAM "/usr/bin/dbclient" ++#define DROPBEAR_PATH_SSH_PROGRAM "@TERMUX_PREFIX@/bin/dbclient" + + /* Whether to log commands executed by a client. This only logs the + * (single) command sent to the server, not what a user did in a +@@ -336,7 +338,7 @@ + #define DEFAULT_IDLE_TIMEOUT 0 + + /* The default path. This will often get replaced by the shell */ +-#define DEFAULT_PATH "/usr/bin:/bin" ++#define DEFAULT_PATH "@TERMUX_PREFIX@/bin:/system/bin" + + /* Some other defines (that mostly should be left alone) are defined + * in sysoptions.h */ -- 2.11.0