From b6004d12cbb2d23572292809c728786ea28a4b82 Mon Sep 17 00:00:00 2001 From: Vishal Biswas Date: Sat, 1 Jul 2017 01:00:04 +0530 Subject: [PATCH] updates and fixes for unified headers (#1114) * openjdk: update to tag 172 * openjdk: update to tag 174 * valac: update from 0.36.3 to 0.36.4 * squid: fix building with unified headers * krb5: fix building with unified headers * tor: update from 0.3.0.8 to 0.3.0.9 --- .../openjdk-9-jre-headless/build.sh | 40 ++++++++++--------- .../consistency-configure.patch | 16 -------- packages/krb5/build.sh | 1 + packages/squid/sys-stat.h.patch | 21 ++++++++++ packages/tor/build.sh | 4 +- packages/valac/build.sh | 4 +- 6 files changed, 47 insertions(+), 39 deletions(-) delete mode 100644 disabled-packages/openjdk-9-jre-headless/consistency-configure.patch create mode 100644 packages/squid/sys-stat.h.patch diff --git a/disabled-packages/openjdk-9-jre-headless/build.sh b/disabled-packages/openjdk-9-jre-headless/build.sh index 8e3ade6eb..71b14b38d 100644 --- a/disabled-packages/openjdk-9-jre-headless/build.sh +++ b/disabled-packages/openjdk-9-jre-headless/build.sh @@ -1,9 +1,9 @@ TERMUX_PKG_HOMEPAGE=http://openjdk.java.net TERMUX_PKG_DESCRIPTION="OpenJDK 9 Java Runtime Environment (prerelease)" -_jbuild=168 +_jbuild=174 _hg_tag="jdk-9+${_jbuild}" _jvm_dir="lib/jvm/openjdk-9" -TERMUX_PKG_VERSION="9.2017.5.12" +TERMUX_PKG_VERSION="9.2017.6.24" TERMUX_PKG_MAINTAINER="Vishal Biswas @vishalbiswas" TERMUX_PKG_HOMEPAGE=http://openjdk.java.net/projects/jdk9 TERMUX_PKG_DEPENDS="freetype, libpng, ca-certificates-java" @@ -24,23 +24,23 @@ TERMUX_PKG_CLANG=no TERMUX_PKG_RM_AFTER_INSTALL="$_jvm_dir/demo $_jvm_dir/sample" _cups_ver=2.2.3 -changesets=('d3e4e68dc2a4' - 'b2218d41edef' - '2982a1d6ecfc' - '69b4c97b87b5' - '912cf69806d5' - '5d9d2a65fb26' - '0e522ff8b9f5' - '131e25008015') - -sha256sums=('6e38d7ff3ae082206b43973fd43c07c88d1e5b30985e0c4d8357c364f51cf66c' - '3173a9b6bc380ebdda014c512f0f88871a8ebdea3fda0d9ad350dba42a3493d6' - 'ff1342410d63ccec54f3e043b74fbc0549b01260bb15170515c68a8dfb4f7b0b' - 'cda559ee5cae0f8ab0c7ea19d70eaff58e7a44462786c78dfa8811f24d548aef' - 'a24208276b465e64085890d7daf5c4d25eb8abf629d636477f85e8849a7c978a' - 'a1b1a77118183000cf20bac7e10e7272145dc64e1120ccb4559b8df7160a48db' - '3f4517e94efb689a291dce74ac2a12e496767d417a05d7fc6c74c483f3d14cca' - '961adb3a0facfec181ff3b999b6fa079dffb1ff4a8f5607905f5ea28dcc597bf' +changesets=('b0ac0fef5b92' + 'dc78a3dd6b3a' + 'a81769cc0015' + 'ee95c24502f3' + 'a5d361b9d1f7' + '736412a8dcce' + '83f6eb009d8f' + '734b3209b6ed') + +sha256sums=('b269c630374c181840c126f8e82cd799147b556482cad3231c577741d0718373' + '7da8245591a3ea3c6c7d0aea6cd2c653e0039a2ea5511ff2cea988223b02c388' + '021b9b8f943087fc7967fe3640d68ab989b791ed1133966a402e1b49f4c6154e' + '77200280da08f56dd298a748b99a8107dddd113872d619677e0a02eeee88bc84' + '435d2e98df810ce45c36af511acbf8cf9b19c68371f9692e95c6aeef2b8fd473' + '43a89436e6f9c11939c7d93a4daa748bc3155e8f1d6fc6e6507310b3addf31a2' + 'c8341d99f315575a11d1f33b243f4cbdab25240caf53668eea8e09a9ecfaf2c5' + '52eeb4ea0c77054f7abb847f9798cedf653ac50de56a6e2d69b7277822738314' '66701fe15838f2c892052c913bde1ba106bbee2e0a953c955a62ecacce76885f') reponames=(dev corba hotspot jdk jaxws jaxp langtools nashorn cups) @@ -97,6 +97,8 @@ HERE # enable features specific to some arches if [ "$TERMUX_ARCH" == "aarch64" ] || [ "$TERMUX_ARCH" == "x86_64" ]; then JVM_FEATURES+=",jvmci,graal"; fi + test "$TERMUX_ARCH" == "aarch64" && CFLAGS="$CFLAGS -DUSE_LIBRARY_BASED_TLS_ONLY" + # remove sa_proc support rm $TERMUX_PKG_SRCDIR/hotspot/make/lib/Lib-jdk.hotspot.agent.gmk } diff --git a/disabled-packages/openjdk-9-jre-headless/consistency-configure.patch b/disabled-packages/openjdk-9-jre-headless/consistency-configure.patch deleted file mode 100644 index 0de579b51..000000000 --- a/disabled-packages/openjdk-9-jre-headless/consistency-configure.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- ./common/autoconf/generated-configure.sh 2017-05-12 23:47:56.000000000 +0530 -+++ ../generated-configure.sh 2017-05-13 10:06:09.764530254 +0530 -@@ -5195,13 +5195,7 @@ - #CUSTOM_AUTOCONF_INCLUDE - - # Do not change or remove the following line, it is needed for consistency checks: --<<<<<<< variant A --DATE_WHEN_GENERATED=1493303684 -->>>>>>> variant B - DATE_WHEN_GENERATED=1493884285 --####### Ancestor --DATE_WHEN_GENERATED=1492975963 --======= end - - ############################################################################### - # diff --git a/packages/krb5/build.sh b/packages/krb5/build.sh index c2509f6d5..d250d83c4 100644 --- a/packages/krb5/build.sh +++ b/packages/krb5/build.sh @@ -29,6 +29,7 @@ termux_step_pre_configure () { # bionic doesn't have getpass cp "$TERMUX_PKG_BUILDER_DIR/netbsd_getpass.c" "$TERMUX_PKG_SRCDIR/clients/kpasswd/" + CFLAGS="$CFLAGS -D_PASSWORD_LEN=PASS_MAX" LDFLAGS="$LDFLAGS -landroid-glob -llog" } diff --git a/packages/squid/sys-stat.h.patch b/packages/squid/sys-stat.h.patch new file mode 100644 index 000000000..62c54f199 --- /dev/null +++ b/packages/squid/sys-stat.h.patch @@ -0,0 +1,21 @@ +--- ./src/log/ModStdio.cc 2017-06-01 19:19:00.000000000 +0530 ++++ ../ModStdio.cc 2017-06-29 22:32:43.806756794 +0530 +@@ -18,6 +18,7 @@ + #include "SquidConfig.h" + + #include ++#include + + typedef struct { + int fd; +--- ./src/debug.cc 2017-06-01 19:19:00.000000000 +0530 ++++ ../debug.cc 2017-06-29 22:36:58.160488863 +0530 +@@ -17,6 +17,8 @@ + /* for shutting_down flag in xassert() */ + #include "globals.h" + ++#include ++ + char *Debug::debugOptions = NULL; + int Debug::override_X = 0; + int Debug::log_stderr = -1; diff --git a/packages/tor/build.sh b/packages/tor/build.sh index 4918cab5a..028bda9fd 100644 --- a/packages/tor/build.sh +++ b/packages/tor/build.sh @@ -1,9 +1,9 @@ TERMUX_PKG_HOMEPAGE=https://www.torproject.org TERMUX_PKG_DESCRIPTION="The Onion Router anonymizing overlay network" TERMUX_PKG_DEPENDS="libevent, openssl" -TERMUX_PKG_VERSION=0.3.0.8 +TERMUX_PKG_VERSION=0.3.0.9 TERMUX_PKG_SRCURL=https://www.torproject.org/dist/tor-$TERMUX_PKG_VERSION.tar.gz -TERMUX_PKG_SHA256=663a3ba7b8a124c0f8a7351eaa2dda6fd518de3f3c4ee28fff869bfb03860d48 +TERMUX_PKG_SHA256=48d4880bf6ccb19ce9af2abde6946d7cf0635cc807548badbf4a221a79581e42 TERMUX_PKG_CONFFILES="etc/tor/torrc" TERMUX_PKG_MAINTAINER="Vishal Biswas @vishalbiswas" diff --git a/packages/valac/build.sh b/packages/valac/build.sh index 1490eaa99..135d11279 100644 --- a/packages/valac/build.sh +++ b/packages/valac/build.sh @@ -1,10 +1,10 @@ TERMUX_PKG_HOMEPAGE=https://wiki.gnome.org/Projects/Vala _VALA_MAJOR=0 _VALA_MINOR=36 -_VALA_PATCH=3 +_VALA_PATCH=4 TERMUX_PKG_VERSION=$_VALA_MAJOR.$_VALA_MINOR.$_VALA_PATCH TERMUX_PKG_MAINTAINER="Vishal Biswas @vishalbiswas" TERMUX_PKG_SRCURL=https://download.gnome.org/sources/vala/$_VALA_MAJOR.$_VALA_MINOR/vala-$TERMUX_PKG_VERSION.tar.xz TERMUX_PKG_DESCRIPTION="C# like language for the GObject system" TERMUX_PKG_DEPENDS="clang, glib-dev, pkg-config" -TERMUX_PKG_SHA256=ac8a4ecd01f62d0c5f62ba50b7290d8c5a1edb308eec772a65b8e79be68f061c +TERMUX_PKG_SHA256=e9f23ce711c1a72ce664d10946fbc5953f01b0b7f2a3562e7a01e362d86de059