On Wed Oct 13, 2021 at 03:10:29PM +0000, Dimitri Karamazov wrote:
> Update java/tanukiwrapper to 0.9.46
>
> Changelog:https://wrapper.tanukisoftware.com/doc/english/release-notes.html#3.5.46
Committed, thanks
>
> Build & Run tested with i2p-1.5.0
>
> regards,
> Dimitri
>
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/java/tanukiwrapper/Makefile,v
> retrieving revision 1.22
> diff -u -p -r1.22 Makefile
> --- Makefile 18 Jul 2021 15:34:18 -0000 1.22
> +++ Makefile 13 Oct 2021 15:02:30 -0000
> @@ -2,10 +2,9 @@
>
> COMMENT= Tanuki Java Service Wrapper
>
> -V= 3.5.45
> +V= 3.5.46
> DISTNAME= wrapper_${V}_src
> PKGNAME= java-tanukiwrapper-${V}
> -REVISION= 1
> CATEGORIES= java
>
> HOMEPAGE= https://wrapper.tanukisoftware.com/
> Index: distinfo
> ===================================================================
> RCS file: /cvs/ports/java/tanukiwrapper/distinfo,v
> retrieving revision 1.5
> diff -u -p -r1.5 distinfo
> --- distinfo 6 Jan 2021 13:30:22 -0000 1.5
> +++ distinfo 13 Oct 2021 15:02:30 -0000
> @@ -1,2 +1,2 @@
> -SHA256 (wrapper_3.5.45_src.tar.gz) =
> rnlloa0DicWT1RlP2szDvBINvT5/RZ17GOarUzvX1AI=
> -SIZE (wrapper_3.5.45_src.tar.gz) = 748917
> +SHA256 (wrapper_3.5.46_src.tar.gz) =
> guHQyFSI0TidAuOr4zWaf3WRGeNW4+Or1sbWdhWuWtg=
> +SIZE (wrapper_3.5.46_src.tar.gz) = 758300
> Index: patches/patch-build_xml
> ===================================================================
> RCS file: /cvs/ports/java/tanukiwrapper/patches/patch-build_xml,v
> retrieving revision 1.4
> diff -u -p -r1.4 patch-build_xml
> --- patches/patch-build_xml 18 Jul 2021 15:34:18 -0000 1.4
> +++ patches/patch-build_xml 13 Oct 2021 15:02:30 -0000
> @@ -15,7 +15,7 @@ Index: build.xml
> <property name="dist.os" value="${os.name}"/>
>
> <!-- Resolve an architecture to use in release names. -->
> -@@ -421,6 +424,7 @@
> +@@ -427,6 +430,7 @@
> <condition property="make.name" value="gmake">
> <or>
> <isset property="is.freebsd"/>
> @@ -23,7 +23,7 @@ Index: build.xml
> <isset property="is.solaris"/>
> </or>
> </condition>
> -@@ -438,6 +442,7 @@
> +@@ -444,6 +448,7 @@
> <or>
> <isset property="is.linux"/>
> <isset property="is.freebsd"/>
> @@ -31,10 +31,10 @@ Index: build.xml
> <isset property="is.solaris"/>
> </or>
> </condition>
> -@@ -1881,6 +1886,10 @@ wrapper.filter.action.999=NONE]]></replacevalue>
> +@@ -1846,6 +1851,10 @@ wrapper.filter.action.999=NONE]]></replacevalue>
> <release-delta-extract-platform osname="linux" osarch="armel"
> bits="32" wrapperbinhead="wrapper" wrapperbintail=""
> wrapperlibhead="libwrapper" wrapperlibtail=".so" archivetype="tar.gz"/>
> <release-delta-extract-platform osname="linux" osarch="armhf"
> bits="32" wrapperbinhead="wrapper" wrapperbintail=""
> wrapperlibhead="libwrapper" wrapperlibtail=".so" archivetype="tar.gz"/>
> - <release-delta-extract-platform osname="linux" osarch="armhf"
> bits="64" wrapperbinhead="wrapper" wrapperbintail=""
> wrapperlibhead="libwrapper" wrapperlibtail=".so" archivetype="tar.gz"/>
> + <release-delta-extract-platform osname="linux" osarch="arm"
> bits="64" wrapperbinhead="wrapper" wrapperbintail=""
> wrapperlibhead="libwrapper" wrapperlibtail=".so" archivetype="tar.gz"/>
> + <release-delta-extract-platform osname="openbsd" osarch="x86"
> bits="32" wrapperbinhead="wrapper" wrapperbintail=""
> wrapperlibhead="libwrapper" wrapperlibtail=".so" archivetype="tar.gz"/>
> + <release-delta-extract-platform osname="openbsd" osarch="x86"
> bits="64" wrapperbinhead="wrapper" wrapperbintail=""
> wrapperlibhead="libwrapper" wrapperlibtail=".so" archivetype="tar.gz"/>
> + <release-delta-extract-platform osname="openbsd" osarch="armhf"
> bits="64" wrapperbinhead="wrapper" wrapperbintail=""
> wrapperlibhead="libwrapper" wrapperlibtail=".so" archivetype="tar.gz"/>
> Index: patches/patch-src_c_wrapper_c
> ===================================================================
> RCS file: /cvs/ports/java/tanukiwrapper/patches/patch-src_c_wrapper_c,v
> retrieving revision 1.4
> diff -u -p -r1.4 patch-src_c_wrapper_c
> --- patches/patch-src_c_wrapper_c 18 Jul 2021 15:34:18 -0000 1.4
> +++ patches/patch-src_c_wrapper_c 13 Oct 2021 15:02:30 -0000
> @@ -5,7 +5,7 @@ add OpenBSD support
> Index: src/c/wrapper.c
> --- src/c/wrapper.c.orig
> +++ src/c/wrapper.c
> -@@ -104,7 +104,7 @@
> +@@ -105,7 +105,7 @@
> #include <sys/errno.h>
> #include <sys/fcntl.h>
> #elif defined(AIX) || defined(HPUX) || defined(MACOSX)
> @@ -14,7 +14,7 @@ Index: src/c/wrapper.c
> #include <sys/param.h>
> #include <errno.h>
> #else /* LINUX */
> -@@ -5885,7 +5885,7 @@ int wrapperRunCommonInner() {
> +@@ -5886,7 +5886,7 @@ int wrapperRunCommonInner() {
> tz1 = tzname[0];
> tz2 = tzname[1];
> #endif
> @@ -23,7 +23,7 @@ Index: src/c/wrapper.c
> log_printf(WRAPPER_SOURCE_WRAPPER, LEVEL_DEBUG,
> TEXT("Timezone: %s (%s) Offset: %ld, hasDaylight: %d"),
> tz1, tz2, timezone, daylight);
> #else
> -@@ -6560,7 +6560,7 @@ int checkIfBinary(const TCHAR *filename) {
> +@@ -6561,7 +6561,7 @@ int checkIfBinary(const TCHAR *filename) {
> log_printf(WRAPPER_SOURCE_WRAPPER, LEVEL_DEBUG, TEXT("Magic
> number for file %s: 0x%02x%02x%02x%02x"), filename, head[0], head[1],
> head[2], head[3]);
> }
>
> @@ -32,7 +32,7 @@ Index: src/c/wrapper.c
> if (head[1] == 'E' && head[2] == 'L' && head[3] == 'F') {
> return 1; /*ELF */
> #elif defined(AIX)
> -@@ -8226,7 +8226,7 @@ int wrapperBuildJavaCommandArrayInner(TCHAR **strings,
> +@@ -8282,7 +8282,7 @@ int wrapperBuildJavaCommandArrayInner(TCHAR **strings,
>
> /* See if the auto bits parameter is set. Ignored by all but the
> following platforms. */
>
> @@ -41,7 +41,7 @@ Index: src/c/wrapper.c
>
> if (wrapperData->javaVersion->major < 9) {
> if (getBooleanProperty(properties,
> -@@ -8241,6 +8241,8 @@ int wrapperBuildJavaCommandArrayInner(TCHAR **strings,
> +@@ -8297,6 +8297,8 @@ int wrapperBuildJavaCommandArrayInner(TCHAR **strings,
>
> TEXT("wrapper.java.additional.auto_bits.solaris"),
> #elif defined(FREEBSD)
>
> TEXT("wrapper.java.additional.auto_bits.freebsd"),
>
