cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update tanukiwrapper to 0.9.46

Browse Source 
Changelog:https://wrapper.tanukisoftware.com/doc/english/release-notes.html#3.5.46

Update diff from maintainer
This commit is contained in:
rsadowski 2021-10-16 08:07:39 +00:00
parent 3e7ec8debb
commit a6e6492f78
4 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
java/tanukiwrapper/Makefile
View File

@ -1,11 +1,10 @@
# $OpenBSD: Makefile,v 1.22 2021/07/18 15:34:18 kurt Exp $
# $OpenBSD: Makefile,v 1.23 2021/10/16 08:07:39 rsadowski Exp $
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/

4
java/tanukiwrapper/distinfo
View File

@ -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

10
java/tanukiwrapper/patches/patch-build_xml
View File

@ -1,4 +1,4 @@
$OpenBSD: patch-build_xml,v 1.4 2021/07/18 15:34:18 kurt Exp $
$OpenBSD: patch-build_xml,v 1.5 2021/10/16 08:07:39 rsadowski Exp $
define OpenBSD property
@ -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"/>

12
java/tanukiwrapper/patches/patch-src_c_wrapper_c
View File

@ -1,11 +1,11 @@
$OpenBSD: patch-src_c_wrapper_c,v 1.4 2021/07/18 15:34:18 kurt Exp $
$OpenBSD: patch-src_c_wrapper_c,v 1.5 2021/10/16 08:07:39 rsadowski Exp $
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"),