version bump, closing bug #517730

(Portage version: 2.2.12/cvs/Linux x86_64, signed Manifest commit with key 0xB2EFA1D4)

3 files changed, 193 insertions, 0 deletions

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 <sera@gentoo.org>
+|Updated version for 3.5.25 by tomboy64 <tomboy64@sina.cn>
+|
+|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