From 8376ef56580626e9c0f796d5b85b53a0a1c7d5f5 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 14 Jul 2018 21:03:06 +0100 Subject: gentoo resync : 14.07.2018 --- dev-java/java-service-wrapper/Manifest | 6 + .../java-service-wrapper-3.5.25-as-needed.patch | 156 +++++++++++++++++++++ ...ce-wrapper-3.5.25-gentoo-wrapper-defaults.patch | 25 ++++ .../java-service-wrapper-3.5.25-testsuite.patch | 12 ++ .../java-service-wrapper-3.5.25-r1.ebuild | 71 ++++++++++ dev-java/java-service-wrapper/metadata.xml | 20 +++ 6 files changed, 290 insertions(+) create mode 100644 dev-java/java-service-wrapper/Manifest create mode 100644 dev-java/java-service-wrapper/files/java-service-wrapper-3.5.25-as-needed.patch create mode 100644 dev-java/java-service-wrapper/files/java-service-wrapper-3.5.25-gentoo-wrapper-defaults.patch create mode 100644 dev-java/java-service-wrapper/files/java-service-wrapper-3.5.25-testsuite.patch create mode 100644 dev-java/java-service-wrapper/java-service-wrapper-3.5.25-r1.ebuild create mode 100644 dev-java/java-service-wrapper/metadata.xml (limited to 'dev-java/java-service-wrapper') diff --git a/dev-java/java-service-wrapper/Manifest b/dev-java/java-service-wrapper/Manifest new file mode 100644 index 000000000000..14cc5924947f --- /dev/null +++ b/dev-java/java-service-wrapper/Manifest @@ -0,0 +1,6 @@ +AUX java-service-wrapper-3.5.25-as-needed.patch 6957 BLAKE2B 9e6aa50657ad0833ea4adc08bd5f6b71695df6369a12d0a0c91f62d587cb7e619a8337cfe6c34e5d278eed5bf5e060355751b2b61c891bdabd59b142865893b1 SHA512 f45dcda4ff87b98cf60d3db5bbd98b6f0dfced2d784076d49f0e29997b25f9f3eefe8b7d3410ff2df3e8cff11910a226996763982193d44b5c99aa03ade8aaef +AUX java-service-wrapper-3.5.25-gentoo-wrapper-defaults.patch 1256 BLAKE2B d1da7d6f8f195d690d687f4d1f48f302b45dd2a12612c75fcce5fae3881469a1dd237baedef5846861deb4c8c697633de3b24598f62ca650deb339f6f2dbb219 SHA512 907f07bcf3debd45d07639ea8b60c21be1190cb7939b28c05eaebdd8713e818402d8da9722be09a7d20fb5598a44d0682bb32a6897b97ef7faf2bd74ca9f8824 +AUX java-service-wrapper-3.5.25-testsuite.patch 463 BLAKE2B aa5f7e4e298265afd227d2eb0edede37650bb8dfa1c7a8e9a18109f34eabfb5ddc7b9db67c2922403b0448997cc96d8e83c96b62974b25da22a624d91dc500cf SHA512 c058363d17e0594ccce355183358d016acf8ec06dd88ff3dc3b360d143cd56fd1a70b5d7d9f5bf774451ea0eed5a78752c8b3fcc32422a1a97d52eb43e057e91 +DIST wrapper_3.5.25_src.tar.gz 556678 BLAKE2B bead95eb2feebe0c22f8c66ca948185c320a979e498fb5156de576d443ba6e3375efb6244a66db6af101fa7dc459d983b51631fc237ad4578505be47059cf2c7 SHA512 4ce8ab5dc7acc4d78e7b902a61bb1e3785b5455f81438aa61a877107647e88ade595075ff0b8d5db0ff2b33bb94d70c2b1331561d6d282e497998eea9494c6f4 +EBUILD java-service-wrapper-3.5.25-r1.ebuild 1476 BLAKE2B 8e3b5226a58ba3c6eda8edb566460b34744edfb11abb31f768ff949e7a4759660c9e3bfa578bb2c68c62a183ba108052635049f8725a011c6f1f1dfd1fccd3ba SHA512 ed5b5d2fdb8de0f97e617dc387fd42ea9e310841bb45dc5c17b38057743ed91a6b862b83aaaaaded5d5a4a85ba67ca30fbc1364c55f8c94428f51bb33122d10e +MISC metadata.xml 639 BLAKE2B 835791890bc6ee84347d2fd82601698b2c1c516b46971df7b567f2000b41ed065bc3bcf3fafb1a97a15ae6ef3c37397580079de48ca56523779f055a99eea8d6 SHA512 4df27ebd9d7503edc1c62e311dbf564bb991963820753df523459baf8e0d65e7464e6b42dbbe1ee6649791c66dae552991eed3cfa1e8e2d100ffe512a8e0df6f diff --git a/dev-java/java-service-wrapper/files/java-service-wrapper-3.5.25-as-needed.patch b/dev-java/java-service-wrapper/files/java-service-wrapper-3.5.25-as-needed.patch new file mode 100644 index 000000000000..d956ff0b0043 --- /dev/null +++ b/dev-java/java-service-wrapper/files/java-service-wrapper-3.5.25-as-needed.patch @@ -0,0 +1,156 @@ + +--- src/c/Makefile-linux-armel-32.make.old 2014-07-21 10:48:31.000000000 +0200 ++++ src/c/Makefile-linux-armel-32.make 2014-07-21 10:50:11.000000000 +0200 +@@ -33,14 +33,14 @@ + if test ! -d .deps; then mkdir .deps; fi + + wrapper: $(wrapper_SOURCE) +- $(COMPILE) -pthread $(wrapper_SOURCE) -lm -o $(BIN)/wrapper ++ $(COMPILE) $(CFLAGS) $(LDFLAGS) -pthread $(wrapper_SOURCE) -lm -o $(BIN)/wrapper + + libwrapper.so: $(libwrapper_so_OBJECTS) +- ${COMPILE} -shared $(libwrapper_so_OBJECTS) -o $(LIB)/libwrapper.so ++ ${COMPILE} $(LDFLAGS) -shared $(libwrapper_so_OBJECTS) -o $(LIB)/libwrapper.so + + %.o: %.c +- @echo '$(COMPILE) -c $<'; \ +- $(COMPILE) $(DEFS) -Wp,-MD,.deps/$(*F).pp -c $< ++ @echo '$(COMPILE) $(CFLAGS) -c $<'; \ ++ $(COMPILE) $(CFLAGS) $(DEFS) -Wp,-MD,.deps/$(*F).pp -c $< + @-cp .deps/$(*F).pp .deps/$(*F).P; \ + tr ' ' '\012' < .deps/$(*F).pp \ + | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ +--- src/c/Makefile-linux-armhf-32.make.old 2014-07-21 10:48:31.000000000 +0200 ++++ src/c/Makefile-linux-armhf-32.make 2014-07-21 10:51:05.000000000 +0200 +@@ -33,14 +33,14 @@ + if test ! -d .deps; then mkdir .deps; fi + + wrapper: $(wrapper_SOURCE) +- $(COMPILE) -pthread $(wrapper_SOURCE) -lm -o $(BIN)/wrapper ++ $(COMPILE) $(CFLAGS) $(LDFLAGS) -pthread $(wrapper_SOURCE) -lm -o $(BIN)/wrapper + + libwrapper.so: $(libwrapper_so_OBJECTS) +- ${COMPILE} -shared $(libwrapper_so_OBJECTS) -o $(LIB)/libwrapper.so ++ ${COMPILE} $(LDFLAGS) -shared $(libwrapper_so_OBJECTS) -o $(LIB)/libwrapper.so + + %.o: %.c +- @echo '$(COMPILE) -c $<'; \ +- $(COMPILE) $(DEFS) -Wp,-MD,.deps/$(*F).pp -c $< ++ @echo '$(COMPILE) $(CFLAGS) -c $<'; \ ++ $(COMPILE) $(CFLAGS) $(DEFS) -Wp,-MD,.deps/$(*F).pp -c $< + @-cp .deps/$(*F).pp .deps/$(*F).P; \ + tr ' ' '\012' < .deps/$(*F).pp \ + | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ +--- src/c/Makefile-linux-ia-64.make.old 2014-07-21 10:48:31.000000000 +0200 ++++ src/c/Makefile-linux-ia-64.make 2014-07-21 10:51:37.000000000 +0200 +@@ -33,14 +33,14 @@ + if test ! -d .deps; then mkdir .deps; fi + + wrapper: $(wrapper_SOURCE) +- $(COMPILE) -lm -pthread $(wrapper_SOURCE) -o $(BIN)/wrapper ++ $(COMPILE) $(CFLAGS) $(LDFLAGS) -lm -pthread $(wrapper_SOURCE) -o $(BIN)/wrapper + + libwrapper.so: $(libwrapper_so_OBJECTS) +- ${COMPILE} -lm -shared $(libwrapper_so_OBJECTS) -o $(LIB)/libwrapper.so ++ ${COMPILE} $(LDFLAGS) -lm -shared $(libwrapper_so_OBJECTS) -o $(LIB)/libwrapper.so + + %.o: %.c +- @echo '$(COMPILE) -c $<'; \ +- $(COMPILE) $(DEFS) -Wp,-MD,.deps/$(*F).pp -c $< ++ @echo '$(COMPILE) $(CFLAGS) -c $<'; \ ++ $(COMPILE) $(CFLAGS) $(DEFS) -Wp,-MD,.deps/$(*F).pp -c $< + @-cp .deps/$(*F).pp .deps/$(*F).P; \ + tr ' ' '\012' < .deps/$(*F).pp \ + | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ +--- src/c/Makefile-linux-ppc-32.make.old 2014-07-21 10:48:31.000000000 +0200 ++++ src/c/Makefile-linux-ppc-32.make 2014-07-21 10:52:05.000000000 +0200 +@@ -33,14 +33,14 @@ + if test ! -d .deps; then mkdir .deps; fi + + wrapper: $(wrapper_SOURCE) +- $(COMPILE) -lm -pthread $(wrapper_SOURCE) -o $(BIN)/wrapper ++ $(COMPILE) $(CFLAGS) $(LDFLAGS) -lm -pthread $(wrapper_SOURCE) -o $(BIN)/wrapper + + libwrapper.so: $(libwrapper_so_OBJECTS) +- ${COMPILE} -shared $(libwrapper_so_OBJECTS) -o $(LIB)/libwrapper.so ++ ${COMPILE} $(LDFLAGS) -shared $(libwrapper_so_OBJECTS) -o $(LIB)/libwrapper.so + + %.o: %.c +- @echo '$(COMPILE) -c $<'; \ +- $(COMPILE) $(DEFS) -Wp,-MD,.deps/$(*F).pp -c $< ++ @echo '$(COMPILE) $(CFLAGS) -c $<'; \ ++ $(COMPILE) $(CFLAGS) $(DEFS) -Wp,-MD,.deps/$(*F).pp -c $< + @-cp .deps/$(*F).pp .deps/$(*F).P; \ + tr ' ' '\012' < .deps/$(*F).pp \ + | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ +--- src/c/Makefile-linux-ppc-64.make.old 2014-07-21 10:48:31.000000000 +0200 ++++ src/c/Makefile-linux-ppc-64.make 2014-07-21 10:52:45.000000000 +0200 +@@ -33,14 +33,14 @@ + if test ! -d .deps; then mkdir .deps; fi + + wrapper: $(wrapper_SOURCE) +- $(COMPILE) -lm -pthread $(wrapper_SOURCE) -o $(BIN)/wrapper ++ $(COMPILE) $(CFLAGS) $(LDFLAGS) -lm -pthread $(wrapper_SOURCE) -o $(BIN)/wrapper + + libwrapper.so: $(libwrapper_so_OBJECTS) +- ${COMPILE} -shared $(libwrapper_so_OBJECTS) -o $(LIB)/libwrapper.so ++ ${COMPILE} $(LDFLAGS) -shared $(libwrapper_so_OBJECTS) -o $(LIB)/libwrapper.so + + %.o: %.c +- @echo '$(COMPILE) -c $<'; \ +- $(COMPILE) $(DEFS) -Wp,-MD,.deps/$(*F).pp -c $< ++ @echo '$(COMPILE) $(CFLAGS) -c $<'; \ ++ $(COMPILE) $(CFLAGS) $(DEFS) -Wp,-MD,.deps/$(*F).pp -c $< + @-cp .deps/$(*F).pp .deps/$(*F).P; \ + tr ' ' '\012' < .deps/$(*F).pp \ + | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ +--- src/c/Makefile-linux-x86-32.make.old 2014-07-21 10:48:31.000000000 +0200 ++++ src/c/Makefile-linux-x86-32.make 2014-07-21 10:53:39.000000000 +0200 +@@ -36,17 +36,17 @@ + if test ! -d .deps; then mkdir .deps; fi + + wrapper: $(wrapper_SOURCE) +- $(COMPILE) -pthread $(wrapper_SOURCE) -lm -o $(BIN)/wrapper ++ $(COMPILE) $(CFLAGS) $(LDFLAGS) -pthread $(wrapper_SOURCE) -lm -o $(BIN)/wrapper + + testsuite: $(testsuite_SOURCE) +- $(COMPILE) -DCUNIT $(testsuite_SOURCE) -lm -pthread -L/usr/local/lib -lncurses -lcunit -o $(TEST)/testsuite ++ $(COMPILE) $(CFLAGS) $(LDFLAGS) -DCUNIT $(testsuite_SOURCE) -lm -pthread -L/usr/local/lib -lncurses -lcunit -o $(TEST)/testsuite + + libwrapper.so: $(libwrapper_so_OBJECTS) +- ${COMPILE} -shared $(libwrapper_so_OBJECTS) -o $(LIB)/libwrapper.so ++ ${COMPILE} $(LDFLAGS) -shared $(libwrapper_so_OBJECTS) -o $(LIB)/libwrapper.so + + %.o: %.c +- @echo '$(COMPILE) -c $<'; \ +- $(COMPILE) $(DEFS) -Wp,-MD,.deps/$(*F).pp -c $< ++ @echo '$(COMPILE) $(CFLAGS) -c $<'; \ ++ $(COMPILE) $(CFLAGS) $(DEFS) -Wp,-MD,.deps/$(*F).pp -c $< + @-cp .deps/$(*F).pp .deps/$(*F).P; \ + tr ' ' '\012' < .deps/$(*F).pp \ + | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ +--- src/c/Makefile-linux-x86-64.make.old 2014-07-21 10:48:31.000000000 +0200 ++++ src/c/Makefile-linux-x86-64.make 2014-07-21 10:54:16.000000000 +0200 +@@ -36,17 +36,17 @@ + if test ! -d .deps; then mkdir .deps; fi + + wrapper: $(wrapper_SOURCE) +- $(COMPILE) -pthread $(wrapper_SOURCE) -lm -o $(BIN)/wrapper ++ $(COMPILE) $(CFLAGS) $(LDFLAGS) -pthread $(wrapper_SOURCE) -lm -o $(BIN)/wrapper + + testsuite: $(testsuite_SOURCE) +- $(COMPILE) -DCUNIT $(testsuite_SOURCE) -lm -pthread -L/usr/local/lib -lncurses -lcunit -o $(TEST)/testsuite ++ $(COMPILE) $(CFLAGS) $(LDFLAGS) -DCUNIT $(testsuite_SOURCE) -lm -pthread -L/usr/local/lib -lncurses -lcunit -o $(TEST)/testsuite + + libwrapper.so: $(libwrapper_so_OBJECTS) +- ${COMPILE} -shared $(libwrapper_so_OBJECTS) -o $(LIB)/libwrapper.so ++ ${COMPILE} $(LDFLAGS) -shared $(libwrapper_so_OBJECTS) -o $(LIB)/libwrapper.so + + %.o: %.c +- @echo '$(COMPILE) -c $<'; \ +- $(COMPILE) $(DEFS) -Wp,-MD,.deps/$(*F).pp -c $< ++ @echo '$(COMPILE) $(CFLAGS) -c $<'; \ ++ $(COMPILE) $(CFLAGS) $(DEFS) -Wp,-MD,.deps/$(*F).pp -c $< + @-cp .deps/$(*F).pp .deps/$(*F).P; \ + tr ' ' '\012' < .deps/$(*F).pp \ + | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ diff --git a/dev-java/java-service-wrapper/files/java-service-wrapper-3.5.25-gentoo-wrapper-defaults.patch b/dev-java/java-service-wrapper/files/java-service-wrapper-3.5.25-gentoo-wrapper-defaults.patch new file mode 100644 index 000000000000..34e94bb77ed6 --- /dev/null +++ b/dev-java/java-service-wrapper/files/java-service-wrapper-3.5.25-gentoo-wrapper-defaults.patch @@ -0,0 +1,25 @@ +|Original version of this patch by Ralph Sennhauser +|Updated version for 3.5.25 by tomboy64 +| +|Added in 3.5.4, make false default for Gentoo +| +|* Add a new wrapper.java.command.resolve property to control whether or not the +| Wrapper tries to resolve any symbolic links in the Java command, specified +| with the wrapper.java.command property. Historically, it has always done so, +| but some jvm started applications like run-java-tool on Gentoo will fail if +| it is run directly as they have a check to make sure it is launched via a +| symbolic link. +| + +--- src/c/wrapper.c.old 2014-07-21 09:12:55.000000000 +0200 ++++ src/c/wrapper.c 2014-07-21 09:13:22.000000000 +0200 +@@ -4908,7 +4908,7 @@ + if (!path) { + log_printf(WRAPPER_SOURCE_WRAPPER, LEVEL_WARN, TEXT("The configured wrapper.java.command could not be found, attempting to launch anyway: %s"), *para); + } else { +- replacePath = getBooleanProperty(properties, TEXT("wrapper.java.command.resolve"), TRUE); ++ replacePath = getBooleanProperty(properties, TEXT("wrapper.java.command.resolve"), FALSE); + if (replacePath == TRUE) { + free(*para); + *para = malloc((_tcslen(path) + 1) * sizeof(TCHAR)); + diff --git a/dev-java/java-service-wrapper/files/java-service-wrapper-3.5.25-testsuite.patch b/dev-java/java-service-wrapper/files/java-service-wrapper-3.5.25-testsuite.patch new file mode 100644 index 000000000000..d279cdf0f4ea --- /dev/null +++ b/dev-java/java-service-wrapper/files/java-service-wrapper-3.5.25-testsuite.patch @@ -0,0 +1,12 @@ +diff -u -r wrapper_3.5.25_src.orig/src/c/Makefile-linux-x86-64.make wrapper_3.5.25_src/src/c/Makefile-linux-x86-64.make +--- wrapper_3.5.25_src.orig/src/c/Makefile-linux-x86-64.make 2014-09-06 00:06:05.730644375 +0200 ++++ wrapper_3.5.25_src/src/c/Makefile-linux-x86-64.make 2014-09-06 00:06:51.130013387 +0200 +@@ -23,7 +23,7 @@ + LIB = ../../lib + TEST = ../../test + +-all: init wrapper libwrapper.so testsuite ++all: init wrapper libwrapper.so + + clean: + rm -f *.o diff --git a/dev-java/java-service-wrapper/java-service-wrapper-3.5.25-r1.ebuild b/dev-java/java-service-wrapper/java-service-wrapper-3.5.25-r1.ebuild new file mode 100644 index 000000000000..bb42be142af4 --- /dev/null +++ b/dev-java/java-service-wrapper/java-service-wrapper-3.5.25-r1.ebuild @@ -0,0 +1,71 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=5 + +WANT_ANT_TASKS="ant-nodeps" +JAVA_PKG_IUSE="doc source test" + +inherit eutils java-pkg-2 java-ant-2 + +MY_PN="wrapper" +MY_P="${MY_PN}_${PV}_src" +DESCRIPTION="A wrapper that makes it possible to install a Java Application as daemon" +HOMEPAGE="http://wrapper.tanukisoftware.org/" +SRC_URI="http://${MY_PN}.tanukisoftware.org/download/${PV}/${MY_P}.tar.gz" + +LICENSE="tanuki-community" +SLOT="0" +KEYWORDS="amd64 x86" +IUSE="" + +RDEPEND=" + >=virtual/jre-1.4" +DEPEND=" + >=virtual/jdk-1.4 + test? ( + dev-java/ant-junit + )" + +S="${WORKDIR}/${MY_P}" + +JAVA_ANT_REWRITE_CLASSPATH="true" + +PATCHES=( + "${FILESDIR}"/${P}-as-needed.patch + "${FILESDIR}"/${P}-gentoo-wrapper-defaults.patch + "${FILESDIR}"/${P}-testsuite.patch +) + +java_prepare() { + epatch "${PATCHES[@]}" + + cp "${S}/src/c/Makefile-linux-armel-32.make" "${S}/src/c/Makefile-linux-arm-32.make" +} + +src_compile() { + tc-export CC + BITS="32" + use amd64 && BITS="64" + eant -Dbits=${BITS} jar compile-c + if use doc; then + ejavadoc -d api -sourcepath src/java/ -subpackages org \ + || die "javadoc failed" + fi +} + +src_test() { + ANT_TASKS="ant-junit ant-nodeps" eant -Dbits="${BITS}" test +} + +src_install() { + java-pkg_dojar lib/wrapper.jar + java-pkg_doso lib/libwrapper.so + + dobin bin/wrapper + dodoc README*.txt || die + dodoc doc/revisions.txt || die + + use doc && java-pkg_dojavadoc api + use source && java-pkg_dosrc src/java/* +} diff --git a/dev-java/java-service-wrapper/metadata.xml b/dev-java/java-service-wrapper/metadata.xml new file mode 100644 index 000000000000..20395dafad7c --- /dev/null +++ b/dev-java/java-service-wrapper/metadata.xml @@ -0,0 +1,20 @@ + + + + + java@gentoo.org + Java + + + The Java Service Wrapper is an application which has evolved out of a desire + to solve a number of problems common to many Java applications: + + * Run as a Windows Service or Unix Daemon + * Application Reliability + * Standard, Out of the Box Scripting + * On Demand Restarts + * Flexible Configuration + * Ease Application Installations + * Logging + + -- cgit v1.2.3