From 950dbae51b47f54e5c5b76414bea2cdaf8c16544 Mon Sep 17 00:00:00 2001 From: Mark Wooding Date: Tue, 12 Jun 2018 11:30:42 +0100 Subject: [PATCH] mlib2, catacomb2: Update to new releases. We can drop the Catacomb patches since they're now included upstream. --- packages/catacomb2/build.sh | 6 +- .../configure-recognize-androideabi.patch | 27 -- packages/catacomb2/termux-logging-weirdness.patch | 345 --------------------- packages/mlib2/build.sh | 4 +- 4 files changed, 4 insertions(+), 378 deletions(-) delete mode 100644 packages/catacomb2/configure-recognize-androideabi.patch delete mode 100644 packages/catacomb2/termux-logging-weirdness.patch diff --git a/packages/catacomb2/build.sh b/packages/catacomb2/build.sh index 655a494f..54680e9b 100644 --- a/packages/catacomb2/build.sh +++ b/packages/catacomb2/build.sh @@ -5,12 +5,10 @@ TERMUX_PKG_MAINTAINER="Mark Wooding " TERMUX_PKG_DESCRIPTION="Catacomb is a cryptographic library." TERMUX_PKG_HOMEPAGE="https://git.distorted.org.uk/~mdw/catacomb/" -TERMUX_PKG_VERSION=2.4.1 -TERMUX_PKG_SHA256=aa6bb099eefe849f5879b3f5418966bf19db91063ab90edc139349290b647e46 +TERMUX_PKG_VERSION=2.4.2 +TERMUX_PKG_SHA256=8c54cfb0231e9cc1fd696bef2e373e8394a65c11a9027e9e1b9cbeae2d6361ba TERMUX_PKG_SRCURL="http://ftp.distorted.org.uk/u/mdw/catacomb-$TERMUX_PKG_VERSION.tar.gz" TERMUX_PKG_CLANG=no TERMUX_PKG_BUILD_DEPENDS="mlib2" TERMUX_PKG_DEPENDS="mlib2" - -TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--with-adns" diff --git a/packages/catacomb2/configure-recognize-androideabi.patch b/packages/catacomb2/configure-recognize-androideabi.patch deleted file mode 100644 index 1a545b22..00000000 --- a/packages/catacomb2/configure-recognize-androideabi.patch +++ /dev/null @@ -1,27 +0,0 @@ -Only in catacomb-2.4.1.hack/: autom4te.cache -diff -ru catacomb-2.4.1/configure catacomb-2.4.1.hack/configure ---- catacomb-2.4.1/configure 2018-05-21 00:46:57.986566575 +0100 -+++ catacomb-2.4.1.hack/configure 2018-05-21 00:47:39.147110561 +0100 -@@ -11868,7 +11868,7 @@ - - x86_64,*) CPUFAM=amd64 ABI=sysv ;; - -- arm,*-gnueabi | arm,*-gnueabihf | armv*,*-gnueabi | armv*,*-gnueabihf) CPUFAM=armel ABI=gnueabi ;; -+ arm,*-gnueabi | arm,*-gnueabihf | armv*,*-gnueabi | armv*,*-gnueabihf | arm,*-androideabi) CPUFAM=armel ABI=gnueabi ;; - - *) CPUFAM=nil ABI=nil ;; - esac -diff -ru catacomb-2.4.1/configure.ac catacomb-2.4.1.hack/configure.ac ---- catacomb-2.4.1/configure.ac 2018-05-21 00:46:57.986566575 +0100 -+++ catacomb-2.4.1.hack/configure.ac 2018-05-21 00:47:38.091096602 +0100 -@@ -97,7 +97,8 @@ - $1([x86_64,cygwin], [amd64], [win]) - $1([x86_64,*], [amd64], [sysv]) - $1([arm,*-gnueabi | arm,*-gnueabihf | dnl -- armv*,*-gnueabi | armv*,*-gnueabihf], [armel], [gnueabi])]) -+ armv*,*-gnueabi | armv*,*-gnueabihf | dnl -+ arm,*-androideabi], [armel], [gnueabi])]) - - dnl A utility to clear the `seen' flags, used so as to process each CPU or - dnl ABI once. -Only in catacomb-2.4.1.hack/: configure.ac.orig diff --git a/packages/catacomb2/termux-logging-weirdness.patch b/packages/catacomb2/termux-logging-weirdness.patch deleted file mode 100644 index 4b9c4f3d..00000000 --- a/packages/catacomb2/termux-logging-weirdness.patch +++ /dev/null @@ -1,345 +0,0 @@ -diff -ru catacomb-2.4.1/Makefile.in catacomb-2.4.1.hack/Makefile.in ---- catacomb-2.4.1/Makefile.in 2017-06-22 11:23:40.000000000 +0100 -+++ catacomb-2.4.1.hack/Makefile.in 2018-05-20 00:32:54.855517583 +0100 -@@ -414,6 +414,7 @@ - LIBTOOL_VERSION_INFO = @LIBTOOL_VERSION_INFO@ - LIPO = @LIPO@ - LN_S = @LN_S@ -+LOGLIBS = @LOGLIBS@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ - MANIFEST_TOOL = @MANIFEST_TOOL@ -@@ -502,6 +503,7 @@ - psdir = @psdir@ - pyexecdir = @pyexecdir@ - pythondir = @pythondir@ -+runstatedir = @runstatedir@ - sbindir = @sbindir@ - sharedstatedir = @sharedstatedir@ - srcdir = @srcdir@ -Only in catacomb-2.4.1.hack/: autom4te.cache -diff -ru catacomb-2.4.1/base/Makefile.in catacomb-2.4.1.hack/base/Makefile.in ---- catacomb-2.4.1/base/Makefile.in 2017-06-22 11:23:39.000000000 +0100 -+++ catacomb-2.4.1.hack/base/Makefile.in 2018-05-20 00:32:53.999505492 +0100 -@@ -349,6 +349,7 @@ - LIBTOOL_VERSION_INFO = @LIBTOOL_VERSION_INFO@ - LIPO = @LIPO@ - LN_S = @LN_S@ -+LOGLIBS = @LOGLIBS@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ - MANIFEST_TOOL = @MANIFEST_TOOL@ -@@ -437,6 +438,7 @@ - psdir = @psdir@ - pyexecdir = @pyexecdir@ - pythondir = @pythondir@ -+runstatedir = @runstatedir@ - sbindir = @sbindir@ - sharedstatedir = @sharedstatedir@ - srcdir = @srcdir@ -diff -ru catacomb-2.4.1/configure catacomb-2.4.1.hack/configure ---- catacomb-2.4.1/configure 2017-06-22 11:23:38.000000000 +0100 -+++ catacomb-2.4.1.hack/configure 2018-05-20 00:32:53.407497130 +0100 -@@ -663,6 +663,7 @@ - limits - type_bits - have_stdint_h -+LOGLIBS - MATHLIBS - CROSS_COMPILING_FALSE - CROSS_COMPILING_TRUE -@@ -798,6 +799,7 @@ - docdir - oldincludedir - includedir -+runstatedir - localstatedir - sharedstatedir - sysconfdir -@@ -888,6 +890,7 @@ - sysconfdir='${prefix}/etc' - sharedstatedir='${prefix}/com' - localstatedir='${prefix}/var' -+runstatedir='${localstatedir}/run' - includedir='${prefix}/include' - oldincludedir='/usr/include' - docdir='${datarootdir}/doc/${PACKAGE_TARNAME}' -@@ -1140,6 +1143,15 @@ - | -silent | --silent | --silen | --sile | --sil) - silent=yes ;; - -+ -runstatedir | --runstatedir | --runstatedi | --runstated \ -+ | --runstate | --runstat | --runsta | --runst | --runs \ -+ | --run | --ru | --r) -+ ac_prev=runstatedir ;; -+ -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \ -+ | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \ -+ | --run=* | --ru=* | --r=*) -+ runstatedir=$ac_optarg ;; -+ - -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) - ac_prev=sbindir ;; - -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ -@@ -1277,7 +1289,7 @@ - for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ - datadir sysconfdir sharedstatedir localstatedir includedir \ - oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ -- libdir localedir mandir -+ libdir localedir mandir runstatedir - do - eval ac_val=\$$ac_var - # Remove trailing slashes. -@@ -1430,6 +1442,7 @@ - --sysconfdir=DIR read-only single-machine data [PREFIX/etc] - --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] - --localstatedir=DIR modifiable single-machine data [PREFIX/var] -+ --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run] - --libdir=DIR object code libraries [EPREFIX/lib] - --includedir=DIR C header files [PREFIX/include] - --oldincludedir=DIR C header files for non-gcc [/usr/include] -@@ -12294,6 +12307,48 @@ - - LIBS=$mdw_ORIG_LIBS - -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking library needed for syslog" >&5 -+$as_echo_n "checking library needed for syslog... " >&6; } -+if ${mdw_cv_syslog_lib+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ mdw_ORIG_LIBS=$LIBS LIBS= -+ for i in 0 1; do -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+#include -+int -+main () -+{ -+openlog("test", LOG_PID, LOG_DAEMON); -+ syslog(LOG_ERR, "this is a test"); -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_link "$LINENO"; then : -+ ok=t -+else -+ ok=nil -+fi -+rm -f core conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext -+ case $i,$ok in -+ *,t) mdw_cv_syslog_lib=${LIBS:-none}; break ;; -+ 0,nil) LIBS="-llog" ;; -+ 1,nil) as_fn_error $? "\"failed to link test program\"" "$LINENO" 5 ;; -+ esac -+ done -+ LIBS=$mdw_ORIG_LIBS -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $mdw_cv_syslog_lib" >&5 -+$as_echo "$mdw_cv_syslog_lib" >&6; } -+case $mdw_cv_syslog_lib in -+ none) LOGLIBS= ;; -+ *) LOGLIBS=$mdw_cv_syslog_lib ;; -+esac -+ -+ - for ac_header in stdint.h - do : - ac_fn_c_check_header_mongrel "$LINENO" "stdint.h" "ac_cv_header_stdint_h" "$ac_includes_default" -diff -ru catacomb-2.4.1/configure.ac catacomb-2.4.1.hack/configure.ac ---- catacomb-2.4.1/configure.ac 2017-06-22 11:23:31.000000000 +0100 -+++ catacomb-2.4.1.hack/configure.ac 2018-05-20 00:32:52.387482722 +0100 -@@ -237,6 +237,29 @@ - AC_SUBST([MATHLIBS], [$LIBS]) - LIBS=$mdw_ORIG_LIBS - -+dnl Logging is weird under Termux. Unfortunately, it involves macros, so we -+dnl have to do this the hard way. -+AC_CACHE_CHECK( -+ [library needed for syslog], [mdw_cv_syslog_lib], -+ [mdw_ORIG_LIBS=$LIBS LIBS= -+ for i in 0 1; do -+ AC_TRY_LINK([#include ], -+ [openlog("test", LOG_PID, LOG_DAEMON); -+ syslog(LOG_ERR, "this is a test");], -+ [ok=t], [ok=nil]) -+ case $i,$ok in -+ *,t) mdw_cv_syslog_lib=${LIBS:-none}; break ;; -+ 0,nil) LIBS="-llog" ;; -+ 1,nil) AC_MSG_ERROR("failed to link test program") ;; -+ esac -+ done -+ LIBS=$mdw_ORIG_LIBS]) -+case $mdw_cv_syslog_lib in -+ none) LOGLIBS= ;; -+ *) LOGLIBS=$mdw_cv_syslog_lib ;; -+esac -+AC_SUBST([LOGLIBS]) -+ - dnl Find out whether very long integer types are available. - AC_CHECK_HEADERS([stdint.h]) - AC_SUBST([have_stdint_h]) -diff -ru catacomb-2.4.1/key/Makefile.in catacomb-2.4.1.hack/key/Makefile.in ---- catacomb-2.4.1/key/Makefile.in 2017-06-22 11:23:39.000000000 +0100 -+++ catacomb-2.4.1.hack/key/Makefile.in 2018-05-20 00:32:54.075506565 +0100 -@@ -351,6 +351,7 @@ - LIBTOOL_VERSION_INFO = @LIBTOOL_VERSION_INFO@ - LIPO = @LIPO@ - LN_S = @LN_S@ -+LOGLIBS = @LOGLIBS@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ - MANIFEST_TOOL = @MANIFEST_TOOL@ -@@ -439,6 +440,7 @@ - psdir = @psdir@ - pyexecdir = @pyexecdir@ - pythondir = @pythondir@ -+runstatedir = @runstatedir@ - sbindir = @sbindir@ - sharedstatedir = @sharedstatedir@ - srcdir = @srcdir@ -diff -ru catacomb-2.4.1/math/Makefile.in catacomb-2.4.1.hack/math/Makefile.in ---- catacomb-2.4.1/math/Makefile.in 2017-06-22 11:23:39.000000000 +0100 -+++ catacomb-2.4.1.hack/math/Makefile.in 2018-05-20 00:32:54.219508599 +0100 -@@ -461,6 +461,7 @@ - LIBTOOL_VERSION_INFO = @LIBTOOL_VERSION_INFO@ - LIPO = @LIPO@ - LN_S = @LN_S@ -+LOGLIBS = @LOGLIBS@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ - MANIFEST_TOOL = @MANIFEST_TOOL@ -@@ -549,6 +550,7 @@ - psdir = @psdir@ - pyexecdir = @pyexecdir@ - pythondir = @pythondir@ -+runstatedir = @runstatedir@ - sbindir = @sbindir@ - sharedstatedir = @sharedstatedir@ - srcdir = @srcdir@ -diff -ru catacomb-2.4.1/misc/Makefile.in catacomb-2.4.1.hack/misc/Makefile.in ---- catacomb-2.4.1/misc/Makefile.in 2017-06-22 11:23:39.000000000 +0100 -+++ catacomb-2.4.1.hack/misc/Makefile.in 2018-05-20 00:32:54.291509616 +0100 -@@ -354,6 +354,7 @@ - LIBTOOL_VERSION_INFO = @LIBTOOL_VERSION_INFO@ - LIPO = @LIPO@ - LN_S = @LN_S@ -+LOGLIBS = @LOGLIBS@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ - MANIFEST_TOOL = @MANIFEST_TOOL@ -@@ -442,6 +443,7 @@ - psdir = @psdir@ - pyexecdir = @pyexecdir@ - pythondir = @pythondir@ -+runstatedir = @runstatedir@ - sbindir = @sbindir@ - sharedstatedir = @sharedstatedir@ - srcdir = @srcdir@ -diff -ru catacomb-2.4.1/progs/Makefile.am catacomb-2.4.1.hack/progs/Makefile.am ---- catacomb-2.4.1/progs/Makefile.am 2017-06-22 11:23:31.000000000 +0100 -+++ catacomb-2.4.1.hack/progs/Makefile.am 2018-05-20 00:32:52.387482722 +0100 -@@ -101,7 +101,7 @@ - ## Remember passphrases for limited periods of time. - bin_PROGRAMS += pixie - pixie_SOURCES = pixie.c --pixie_LDADD = $(UTILS_LIBS) $(PIXIE_LIBS) -+pixie_LDADD = $(UTILS_LIBS) $(PIXIE_LIBS) $(LOGLIBS) - dist_man_MANS += pixie.1 - EXTRA_DIST += xpixie - -diff -ru catacomb-2.4.1/progs/Makefile.in catacomb-2.4.1.hack/progs/Makefile.in ---- catacomb-2.4.1/progs/Makefile.in 2017-06-22 11:23:40.000000000 +0100 -+++ catacomb-2.4.1.hack/progs/Makefile.in 2018-05-20 00:32:54.399511142 +0100 -@@ -190,7 +190,8 @@ - perftest_DEPENDENCIES = $(am__DEPENDENCIES_3) $(am__DEPENDENCIES_1) - am_pixie_OBJECTS = pixie.$(OBJEXT) - pixie_OBJECTS = $(am_pixie_OBJECTS) --pixie_DEPENDENCIES = $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1) -+pixie_DEPENDENCIES = $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1) \ -+ $(am__DEPENDENCIES_1) - rspit_SOURCES = rspit.c - rspit_OBJECTS = rspit.$(OBJEXT) - rspit_LDADD = $(LDADD) -@@ -418,6 +419,7 @@ - LIBTOOL_VERSION_INFO = @LIBTOOL_VERSION_INFO@ - LIPO = @LIPO@ - LN_S = @LN_S@ -+LOGLIBS = @LOGLIBS@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ - MANIFEST_TOOL = @MANIFEST_TOOL@ -@@ -506,6 +508,7 @@ - psdir = @psdir@ - pyexecdir = @pyexecdir@ - pythondir = @pythondir@ -+runstatedir = @runstatedir@ - sbindir = @sbindir@ - sharedstatedir = @sharedstatedir@ - srcdir = @srcdir@ -@@ -589,7 +592,7 @@ - mkphrase_LDADD = $(LDADD) $(MATHLIBS) - perftest_LDADD = $(LDADD) $(MATHLIBS) - pixie_SOURCES = pixie.c --pixie_LDADD = $(UTILS_LIBS) $(PIXIE_LIBS) -+pixie_LDADD = $(UTILS_LIBS) $(PIXIE_LIBS) $(LOGLIBS) - all: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) all-am - -diff -ru catacomb-2.4.1/pub/Makefile.in catacomb-2.4.1.hack/pub/Makefile.in ---- catacomb-2.4.1/pub/Makefile.in 2017-06-22 11:23:40.000000000 +0100 -+++ catacomb-2.4.1.hack/pub/Makefile.in 2018-05-20 00:32:54.479512272 +0100 -@@ -353,6 +353,7 @@ - LIBTOOL_VERSION_INFO = @LIBTOOL_VERSION_INFO@ - LIPO = @LIPO@ - LN_S = @LN_S@ -+LOGLIBS = @LOGLIBS@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ - MANIFEST_TOOL = @MANIFEST_TOOL@ -@@ -441,6 +442,7 @@ - psdir = @psdir@ - pyexecdir = @pyexecdir@ - pythondir = @pythondir@ -+runstatedir = @runstatedir@ - sbindir = @sbindir@ - sharedstatedir = @sharedstatedir@ - srcdir = @srcdir@ -diff -ru catacomb-2.4.1/rand/Makefile.in catacomb-2.4.1.hack/rand/Makefile.in ---- catacomb-2.4.1/rand/Makefile.in 2017-06-22 11:23:40.000000000 +0100 -+++ catacomb-2.4.1.hack/rand/Makefile.in 2018-05-20 00:32:54.555513345 +0100 -@@ -349,6 +349,7 @@ - LIBTOOL_VERSION_INFO = @LIBTOOL_VERSION_INFO@ - LIPO = @LIPO@ - LN_S = @LN_S@ -+LOGLIBS = @LOGLIBS@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ - MANIFEST_TOOL = @MANIFEST_TOOL@ -@@ -437,6 +438,7 @@ - psdir = @psdir@ - pyexecdir = @pyexecdir@ - pythondir = @pythondir@ -+runstatedir = @runstatedir@ - sbindir = @sbindir@ - sharedstatedir = @sharedstatedir@ - srcdir = @srcdir@ -diff -ru catacomb-2.4.1/symm/Makefile.in catacomb-2.4.1.hack/symm/Makefile.in ---- catacomb-2.4.1/symm/Makefile.in 2017-06-22 11:23:50.000000000 +0100 -+++ catacomb-2.4.1.hack/symm/Makefile.in 2018-05-20 00:32:54.771516396 +0100 -@@ -590,6 +590,7 @@ - LIBTOOL_VERSION_INFO = @LIBTOOL_VERSION_INFO@ - LIPO = @LIPO@ - LN_S = @LN_S@ -+LOGLIBS = @LOGLIBS@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ - MANIFEST_TOOL = @MANIFEST_TOOL@ -@@ -678,6 +679,7 @@ - psdir = @psdir@ - pyexecdir = @pyexecdir@ - pythondir = @pythondir@ -+runstatedir = @runstatedir@ - sbindir = @sbindir@ - sharedstatedir = @sharedstatedir@ - srcdir = @srcdir@ diff --git a/packages/mlib2/build.sh b/packages/mlib2/build.sh index 161b77fb..f9dedbc0 100644 --- a/packages/mlib2/build.sh +++ b/packages/mlib2/build.sh @@ -5,8 +5,8 @@ TERMUX_PKG_MAINTAINER="Mark Wooding " TERMUX_PKG_DESCRIPTION="The mLib library provides various handy utilities." TERMUX_PKG_HOMEPAGE="https://git.distorted.org.uk/~mdw/mLib/" -TERMUX_PKG_VERSION=2.2.4 -TERMUX_PKG_SHA256=8872093a2102f043c5d04f28bf16c2d7e23eea2c482d22a5f67b7ef6fb1b8dce +TERMUX_PKG_VERSION=2.3.2 +TERMUX_PKG_SHA256=4f622476a1db0ec009875d0ff73ac2235bd7ed17b1cb2cebeb24125265bc18c9 TERMUX_PKG_SRCURL="http://ftp.distorted.org.uk/u/mdw/mLib-$TERMUX_PKG_VERSION.tar.gz" TERMUX_PKG_CLANG=no -- 2.11.0