February 2015 - openSUSE Commits - openSUSE Mailing Lists

commit mathgl for openSUSE:Factory
by root＠hilbert.suse.de 18 Feb '15

18 Feb '15

Hello community, here is the log from the commit of package mathgl for openSUSE:Factory checked in at 2015-02-18 11:39:53 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mathgl (Old) and /work/SRC/openSUSE:Factory/.mathgl.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "mathgl" Changes: -------- --- /work/SRC/openSUSE:Factory/mathgl/mathgl.changes 2015-02-10 20:21:12.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.mathgl.new/mathgl.changes 2015-02-18 12:09:23.000000000 +0100 @@ -1,0 +2,5 @@ +Tue Feb 17 15:16:29 UTC 2015 - dmitry_r(a)opensuse.org + +- Use texinfo for documentation generation on openSUSE > 13.2 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mathgl.spec ++++++ --- /var/tmp/diff_new_pack.xgmF1b/_old 2015-02-18 12:09:24.000000000 +0100 +++ /var/tmp/diff_new_pack.xgmF1b/_new 2015-02-18 12:09:24.000000000 +0100 @@ -430,7 +430,9 @@ -Denable-mgltex=on \ -Denable-doc-html=on \ -Denable-doc-pdf-en=on \ + %if 0%{?suse_version} <= 1320 -Denable-texi2html=on \ + %endif . make %{?_smp_mflags} -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit java-1_9_0-openjdk for openSUSE:Factory
by root＠hilbert.suse.de 18 Feb '15

18 Feb '15

Hello community, here is the log from the commit of package java-1_9_0-openjdk for openSUSE:Factory checked in at 2015-02-18 11:39:50 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/java-1_9_0-openjdk (Old) and /work/SRC/openSUSE:Factory/.java-1_9_0-openjdk.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "java-1_9_0-openjdk" Changes: -------- --- /work/SRC/openSUSE:Factory/java-1_9_0-openjdk/java-1_9_0-openjdk.changes 2015-01-30 15:07:41.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.java-1_9_0-openjdk.new/java-1_9_0-openjdk.changes 2015-02-18 12:09:08.000000000 +0100 @@ -1,0 +2,11 @@ +Tue Feb 17 15:37:17 UTC 2015 - fstrba(a)suse.com + +- Upgrade to upstream tag jdk9-b50 +- Update the aarch64 hotspot to the current tip of aarch64-port + stage repository +- Added patch + * fix-system-jpeg-loading.patch + - correct the case mismatch that prevented JPEG decoder from + working correctly (boo#905950) + +------------------------------------------------------------------- Old: ---- 0064e246d83f.tar.bz2 33e7e6998048.tar.bz2 5b102fc29edf.tar.bz2 833051855168.tar.bz2 a13c49c5f289.tar.bz2 cc775a4a24c7.tar.bz2 ebb2eb7f1aec.tar.bz2 f08660f30051.tar.bz2 f624acc711e2.tar.bz2 New: ---- 00f3abb1f174.tar.bz2 1ccb6ef2f40b.tar.bz2 224f593393e5.tar.bz2 32e48a0d59e1.tar.bz2 45a30e7ee623.tar.bz2 74ead7bddde1.tar.bz2 d1f37d39ff24.tar.bz2 e0947f58c9c1.tar.bz2 f6b8edd397ee.tar.bz2 fix-system-jpeg-loading.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ java-1_9_0-openjdk.spec ++++++ --- /var/tmp/diff_new_pack.W7dlaq/_old 2015-02-18 12:09:11.000000000 +0100 +++ /var/tmp/diff_new_pack.W7dlaq/_new 2015-02-18 12:09:11.000000000 +0100 @@ -33,20 +33,20 @@ %global minorver 9 %global microver 0 %global updatever 0 -%global buildver b48 +%global buildver b50 %global root_project jdk9 %global root_repository jdk9 -%global root_revision 0064e246d83f -%global corba_revision a13c49c5f289 -%global hotspot_revision cc775a4a24c7 -%global jaxp_revision 833051855168 -%global jaxws_revision 33e7e6998048 -%global jdk_revision ebb2eb7f1aec -%global langtools_revision 5b102fc29edf -%global nashorn_revision f08660f30051 +%global root_revision d1f37d39ff24 +%global corba_revision 224f593393e5 +%global hotspot_revision e0947f58c9c1 +%global jaxp_revision 74ead7bddde1 +%global jaxws_revision 45a30e7ee623 +%global jdk_revision f6b8edd397ee +%global langtools_revision 1ccb6ef2f40b +%global nashorn_revision 32e48a0d59e1 %global aarch64_project aarch64-port %global aarch64_repository stage -%global aarch64_hotspot_revision f624acc711e2 +%global aarch64_hotspot_revision 00f3abb1f174 %global icedtea_sound_version 1.0.1 # priority must be 6 digits in total %global priority %(echo "10000 * %{majorver} + 1000 * %{minorver} + 100 * %{microver} + %{updatever}" | bc) @@ -224,6 +224,7 @@ # Patch for PPC/PPC64 Patch103: ppc-zero-hotspot.patch # Patches for system libraries +Patch203: fix-system-jpeg-loading.patch Patch204: system-giflib5.patch Patch205: link-with-as-needed.patch BuildRequires: alsa-lib-devel @@ -482,6 +483,7 @@ rm -rvf jdk/src/java.desktop/share/native/liblcms/cms* rm -rvf jdk/src/java.desktop/share/native/liblcms/lcms2* +%patch203 -p1 %patch204 -p1 %patch205 -p1 ++++++ 0064e246d83f.tar.bz2 -> 00f3abb1f174.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/java-1_9_0-openjdk/0064e246d83f.tar.bz2 /work/SRC/openSUSE:Factory/.java-1_9_0-openjdk.new/00f3abb1f174.tar.bz2 differ: char 11, line 1 ++++++ 0064e246d83f.tar.bz2 -> 1ccb6ef2f40b.tar.bz2 ++++++ ++++ 739084 lines of diff (skipped) ++++++ 5b102fc29edf.tar.bz2 -> 224f593393e5.tar.bz2 ++++++ ++++ 836697 lines of diff (skipped) ++++++ 0064e246d83f.tar.bz2 -> 32e48a0d59e1.tar.bz2 ++++++ ++++ 516145 lines of diff (skipped) ++++++ 0064e246d83f.tar.bz2 -> 45a30e7ee623.tar.bz2 ++++++ ++++ 694089 lines of diff (skipped) ++++++ 0064e246d83f.tar.bz2 -> 74ead7bddde1.tar.bz2 ++++++ ++++ 822130 lines of diff (skipped) ++++++ 0064e246d83f.tar.bz2 -> d1f37d39ff24.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jdk9-0064e246d83f/.hg_archival.txt new/jdk9-d1f37d39ff24/.hg_archival.txt --- old/jdk9-0064e246d83f/.hg_archival.txt 2015-01-25 08:22:16.000000000 +0100 +++ new/jdk9-d1f37d39ff24/.hg_archival.txt 2015-02-06 00:41:43.000000000 +0100 @@ -1,4 +1,4 @@ repo: cfeea66a3fa8ca3686a7cfa2d0ce8ab0169f168d -node: 0064e246d83f6f9fc245c19b6d05041ecaf4b6d4 +node: d1f37d39ff2421f956a6ddf316cf763807bc3363 branch: default -tag: jdk9-b48 +tag: jdk9-b50 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jdk9-0064e246d83f/.hgtags new/jdk9-d1f37d39ff24/.hgtags --- old/jdk9-0064e246d83f/.hgtags 2015-01-25 08:22:16.000000000 +0100 +++ new/jdk9-d1f37d39ff24/.hgtags 2015-02-06 00:41:43.000000000 +0100 @@ -290,3 +290,5 @@ 3dd628fde2086218d548841022ee8436b6b88185 jdk9-b45 12f1e276447bcc81516e85367d53e4f08897049d jdk9-b46 b6cca3e6175a69f39e5799b7349ddb0176630291 jdk9-b47 +0064e246d83f6f9fc245c19b6d05041ecaf4b6d4 jdk9-b48 +d91ed1951b948210590ce1394bea5515357246ba jdk9-b49 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jdk9-0064e246d83f/common/autoconf/basics.m4 new/jdk9-d1f37d39ff24/common/autoconf/basics.m4 --- old/jdk9-0064e246d83f/common/autoconf/basics.m4 2015-01-25 08:22:16.000000000 +0100 +++ new/jdk9-d1f37d39ff24/common/autoconf/basics.m4 2015-02-06 00:41:43.000000000 +0100 @@ -987,3 +987,26 @@ IS_RECONFIGURE=no fi ]) + +# Check for support for specific options in bash +AC_DEFUN_ONCE([BASIC_CHECK_BASH_OPTIONS], +[ + # Test if bash supports pipefail. + AC_MSG_CHECKING([if bash supports pipefail]) + if ${BASH} -c 'set -o pipefail'; then + BASH_ARGS="$BASH_ARGS -o pipefail" + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + fi + + AC_MSG_CHECKING([if bash supports errexit (-e)]) + if ${BASH} -e -c 'true'; then + BASH_ARGS="$BASH_ARGS -e" + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + fi + + AC_SUBST(BASH_ARGS) +]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jdk9-0064e246d83f/common/autoconf/bootcycle-spec.gmk.in new/jdk9-d1f37d39ff24/common/autoconf/bootcycle-spec.gmk.in --- old/jdk9-0064e246d83f/common/autoconf/bootcycle-spec.gmk.in 2015-01-25 08:22:16.000000000 +0100 +++ new/jdk9-d1f37d39ff24/common/autoconf/bootcycle-spec.gmk.in 2015-02-06 00:41:43.000000000 +0100 @@ -46,8 +46,12 @@ BOOT_JDK := $(JDK_IMAGE_DIR) # The bootcycle build has a different output directory -BUILD_OUTPUT:=@BUILD_OUTPUT@/bootcycle-build -SJAVAC_SERVER_DIR:=$(subst @BUILD_OUTPUT@,$(BUILD_OUTPUT),$(SJAVAC_SERVER_DIR)) +OLD_BUILD_OUTPUT:=@BUILD_OUTPUT@ +BUILD_OUTPUT:=$(OLD_BUILD_OUTPUT)/bootcycle-build +# The HOTSPOT_DIST dir is not defined relative to BUILD_OUTPUT in spec.gmk. Must not +# use space in this patsubst to avoid leading space in HOTSPOT_DIST. +HOTSPOT_DIST:=$(patsubst $(OLD_BUILD_OUTPUT)%,$(BUILD_OUTPUT)%,$(HOTSPOT_DIST)) +SJAVAC_SERVER_DIR:=$(patsubst $(OLD_BUILD_OUTPUT)%, $(BUILD_OUTPUT)%, $(SJAVAC_SERVER_DIR)) JAVA_CMD:=$(BOOT_JDK)/bin/java JAVAC_CMD:=$(BOOT_JDK)/bin/javac diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jdk9-0064e246d83f/common/autoconf/configure.ac new/jdk9-d1f37d39ff24/common/autoconf/configure.ac --- old/jdk9-0064e246d83f/common/autoconf/configure.ac 2015-01-25 08:22:16.000000000 +0100 +++ new/jdk9-d1f37d39ff24/common/autoconf/configure.ac 2015-02-06 00:41:43.000000000 +0100 @@ -113,6 +113,7 @@ # Setup tools that requires more complex handling, or that is not needed by the configure script. BASIC_SETUP_COMPLEX_TOOLS +BASIC_CHECK_BASH_OPTIONS # Check if pkg-config is available. PKG_PROG_PKG_CONFIG diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jdk9-0064e246d83f/common/autoconf/generated-configure.sh new/jdk9-d1f37d39ff24/common/autoconf/generated-configure.sh --- old/jdk9-0064e246d83f/common/autoconf/generated-configure.sh 2015-01-25 08:22:16.000000000 +0100 +++ new/jdk9-d1f37d39ff24/common/autoconf/generated-configure.sh 2015-02-06 00:41:43.000000000 +0100 @@ -853,6 +853,7 @@ OS_VERSION_MINOR OS_VERSION_MAJOR PKG_CONFIG +BASH_ARGS CODESIGN XATTR DSYMUTIL @@ -3522,6 +3523,9 @@ +# Check for support for specific options in bash + + # # Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -4329,7 +4333,7 @@ #CUSTOM_AUTOCONF_INCLUDE # Do not change or remove the following line, it is needed for consistency checks: -DATE_WHEN_GENERATED=1420811523 +DATE_WHEN_GENERATED=1421247827 ############################################################################### # @@ -19609,6 +19613,32 @@ fi + # Test if bash supports pipefail. + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if bash supports pipefail" >&5 +$as_echo_n "checking if bash supports pipefail... " >&6; } + if ${BASH} -c 'set -o pipefail'; then + BASH_ARGS="$BASH_ARGS -o pipefail" + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if bash supports errexit (-e)" >&5 +$as_echo_n "checking if bash supports errexit (-e)... " >&6; } + if ${BASH} -e -c 'true'; then + BASH_ARGS="$BASH_ARGS -e" + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + fi + + + + # Check if pkg-config is available. @@ -27408,8 +27438,8 @@ # The trailing space for everyone except PATH is no typo, but is needed due # to trailing \ in the Windows paths. These will be stripped later. $ECHO "$WINPATH_BASH -c 'echo VS_PATH="'\"$PATH\" > set-vs-env.sh' >> $EXTRACT_VC_ENV_BAT_FILE - $ECHO "$WINPATH_BASH -c 'echo VS_INCLUDE="'\"$INCLUDE\;$include \" >> set-vs-env.sh' >> $EXTRACT_VC_ENV_BAT_FILE - $ECHO "$WINPATH_BASH -c 'echo VS_LIB="'\"$LIB\;$lib \" >> set-vs-env.sh' >> $EXTRACT_VC_ENV_BAT_FILE + $ECHO "$WINPATH_BASH -c 'echo VS_INCLUDE="'\"$INCLUDE \" >> set-vs-env.sh' >> $EXTRACT_VC_ENV_BAT_FILE + $ECHO "$WINPATH_BASH -c 'echo VS_LIB="'\"$LIB \" >> set-vs-env.sh' >> $EXTRACT_VC_ENV_BAT_FILE $ECHO "$WINPATH_BASH -c 'echo VCINSTALLDIR="'\"$VCINSTALLDIR \" >> set-vs-env.sh' >> $EXTRACT_VC_ENV_BAT_FILE $ECHO "$WINPATH_BASH -c 'echo WindowsSdkDir="'\"$WindowsSdkDir \" >> set-vs-env.sh' >> $EXTRACT_VC_ENV_BAT_FILE $ECHO "$WINPATH_BASH -c 'echo WINDOWSSDKDIR="'\"$WINDOWSSDKDIR \" >> set-vs-env.sh' >> $EXTRACT_VC_ENV_BAT_FILE diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jdk9-0064e246d83f/common/autoconf/spec.gmk.in new/jdk9-d1f37d39ff24/common/autoconf/spec.gmk.in --- old/jdk9-0064e246d83f/common/autoconf/spec.gmk.in 2015-01-25 08:22:16.000000000 +0100 +++ new/jdk9-d1f37d39ff24/common/autoconf/spec.gmk.in 2015-02-06 00:41:43.000000000 +0100 @@ -78,6 +78,11 @@ OUTPUT_SYNC_SUPPORTED:=@OUTPUT_SYNC_SUPPORTED@ OUTPUT_SYNC:=@OUTPUT_SYNC@ +# Override the shell with bash +BASH:=@BASH@ +BASH_ARGS:=@BASH_ARGS@ +SHELL:=$(BASH) $(BASH_ARGS) + # The "human readable" name of this configuration CONF_NAME:=@CONF_NAME@ @@ -243,7 +248,7 @@ HOTSPOT_OUTPUTDIR=$(BUILD_OUTPUT)/hotspot JDK_OUTPUTDIR=$(BUILD_OUTPUT)/jdk IMAGES_OUTPUTDIR=$(BUILD_OUTPUT)/images -TESTMAKE_OUTPUTDIR=$(BUILD_OUTPUT)/testmake +TESTMAKE_OUTPUTDIR=$(BUILD_OUTPUT)/test-make MAKESUPPORT_OUTPUTDIR=$(BUILD_OUTPUT)/make-support HOTSPOT_DIST=@HOTSPOT_DIST@ @@ -495,7 +500,6 @@ # Tools adhering to a minimal and common standard of posix compliance. AWK:=@AWK@ BASENAME:=@BASENAME@ -BASH:=@BASH@ CAT:=@CAT@ CCACHE:=@CCACHE@ # CD is going away, but remains to cater for legacy makefiles. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jdk9-0064e246d83f/common/bin/unshuffle_list.txt new/jdk9-d1f37d39ff24/common/bin/unshuffle_list.txt --- old/jdk9-0064e246d83f/common/bin/unshuffle_list.txt 2015-01-25 08:22:16.000000000 +0100 +++ new/jdk9-d1f37d39ff24/common/bin/unshuffle_list.txt 2015-02-06 00:41:43.000000000 +0100 @@ -123,6 +123,7 @@ jdk/src/java.base/share/classes/java/math : jdk/src/share/classes/java/math jdk/src/java.base/share/classes/java/net : jdk/src/share/classes/java/net jdk/src/java.base/share/classes/java/nio : jdk/src/share/classes/java/nio +jdk/src/java.base/share/classes/java/security/acl : jdk/src/share/classes/java/security/acl jdk/src/java.base/share/classes/java/security/cert : jdk/src/share/classes/java/security/cert jdk/src/java.base/share/classes/java/security/interfaces : jdk/src/share/classes/java/security/interfaces jdk/src/java.base/share/classes/java/security : jdk/src/share/classes/java/security @@ -179,6 +180,7 @@ jdk/src/java.base/share/classes/sun/nio/cs : jdk/src/share/classes/sun/nio/cs jdk/src/java.base/share/classes/sun/nio/fs : jdk/src/share/classes/sun/nio/fs jdk/src/java.base/share/classes/sun/reflect : jdk/src/share/classes/sun/reflect +jdk/src/java.base/share/classes/sun/security/acl : jdk/src/share/classes/sun/security/acl jdk/src/java.base/share/classes/sun/security/action : jdk/src/share/classes/sun/security/action jdk/src/java.base/share/classes/sun/security/internal : jdk/src/share/classes/sun/security/internal jdk/src/java.base/share/classes/sun/security/jca : jdk/src/share/classes/sun/security/jca @@ -1211,8 +1213,6 @@ jdk/src/java.rmi/unix/bin/java-rmi.cgi.sh : jdk/src/solaris/bin/java-rmi.cgi.sh jdk/src/java.scripting/share/classes/javax/script : jdk/src/share/classes/javax/script jdk/src/java.scripting/share/classes/com/sun/tools/script/shell : jdk/src/share/classes/com/sun/tools/script/shell -jdk/src/java.security.acl/share/classes/java/security/acl : jdk/src/share/classes/java/security/acl -jdk/src/java.security.acl/share/classes/sun/security/acl : jdk/src/share/classes/sun/security/acl jdk/src/java.security.jgss/macosx/native/libosxkrb5/nativeccache.c : jdk/src/share/native/sun/security/krb5/nativeccache.c jdk/src/java.security.jgss/macosx/native/libosxkrb5/SCDynamicStoreConfig.m : jdk/src/macosx/native/sun/security/krb5/SCDynamicStoreConfig.m jdk/src/java.security.jgss/share/classes/javax/security/auth/kerberos : jdk/src/share/classes/javax/security/auth/kerberos diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jdk9-0064e246d83f/make/Images.gmk new/jdk9-d1f37d39ff24/make/Images.gmk --- old/jdk9-0064e246d83f/make/Images.gmk 2015-01-25 08:22:16.000000000 +0100 +++ new/jdk9-d1f37d39ff24/make/Images.gmk 2015-02-06 00:41:43.000000000 +0100 @@ -111,14 +111,16 @@ # Use this file inside the image as target for make rule JIMAGE_TARGET_FILE := bin/java$(EXE_SUFFIX) -$(JDK_IMAGE_DIR)/$(JIMAGE_TARGET_FILE): $(DEPENDENCIES) +$(JDK_IMAGE_DIR)/$(JIMAGE_TARGET_FILE): $(DEPENDENCIES) \ + $(call DependOnVariable, JDK_MODULES_LIST) $(ECHO) Creating jdk jimage $(RM) -r $(JDK_IMAGE_DIR) $(JDK_SORTED_MODULES) $(JIMAGE_TOOL) --mods $(JDK_MODULES_LIST) --output $(JDK_IMAGE_DIR) \ $(MODULES_XML) > $(JDK_SORTED_MODULES) $(TOUCH) $@ -$(JRE_IMAGE_DIR)/$(JIMAGE_TARGET_FILE): $(DEPENDENCIES) +$(JRE_IMAGE_DIR)/$(JIMAGE_TARGET_FILE): $(DEPENDENCIES) \ + $(call DependOnVariable, JRE_MODULES_LIST) $(ECHO) Creating jre jimage $(RM) -r $(JRE_IMAGE_DIR) $(JRE_SORTED_MODULES) $(JIMAGE_TOOL) --mods $(JRE_MODULES_LIST) --output $(JRE_IMAGE_DIR) \ @@ -131,7 +133,8 @@ COMPACT_EXTRA_MODULES := jdk.localedata jdk.crypto.pkcs11 jdk.crypto.ec -$(JRE_COMPACT1_IMAGE_DIR)/$(JIMAGE_TARGET_FILE): $(DEPENDENCIES) +$(JRE_COMPACT1_IMAGE_DIR)/$(JIMAGE_TARGET_FILE): $(DEPENDENCIES) \ + $(call DependOnVariable, JRE_COMPACT1_MODULES_LIST) $(ECHO) Creating jre compact1 jimage $(RM) -r $(JRE_COMPACT1_IMAGE_DIR) $(JRE_COMPACT1_SORTED_MODULES) $(JIMAGE_TOOL) \ @@ -140,7 +143,8 @@ $(MODULES_XML) > $(JRE_COMPACT1_SORTED_MODULES) $(TOUCH) $@ -$(JRE_COMPACT2_IMAGE_DIR)/$(JIMAGE_TARGET_FILE): $(DEPENDENCIES) +$(JRE_COMPACT2_IMAGE_DIR)/$(JIMAGE_TARGET_FILE): $(DEPENDENCIES) \ + $(call DependOnVariable, JRE_COMPACT2_MODULES_LIST) $(ECHO) Creating jre compact2 jimage $(RM) -r $(JRE_COMPACT2_IMAGE_DIR) $(JRE_COMPACT2_SORTED_MODULES) $(JIMAGE_TOOL) \ @@ -149,7 +153,8 @@ $(MODULES_XML) > $(JRE_COMPACT2_SORTED_MODULES) $(TOUCH) $@ -$(JRE_COMPACT3_IMAGE_DIR)/$(JIMAGE_TARGET_FILE): $(DEPENDENCIES) +$(JRE_COMPACT3_IMAGE_DIR)/$(JIMAGE_TARGET_FILE): $(DEPENDENCIES) \ + $(call DependOnVariable, JRE_COMPACT3_MODULES_LIST) $(ECHO) Creating jre compact3 jimage $(RM) -r $(JRE_COMPACT3_IMAGE_DIR) $(JRE_COMPACT3_SORTED_MODULES) $(JIMAGE_TOOL) \ @@ -368,45 +373,59 @@ # Common way to emit a line into the release or info file define info-file-item # name value - $(PRINTF) '%s="%s"\n' $1 $2 >> $@ + $(PRINTF) '%s="%s"\n' $1 $2 >> $@ endef # Param 1 - The file containing the MODULES list define create-info-file - $(ECHO) $(LOG_INFO) Generating $(patsubst $(OUTPUT_ROOT)/%,%,$@) - $(MKDIR) -p $(@D) - $(RM) $@ - $(call info-file-item, "JAVA_VERSION", "$(JDK_VERSION)") - $(call info-file-item, "OS_NAME", "$(REQUIRED_OS_NAME)") - $(call info-file-item, "OS_VERSION", "$(REQUIRED_OS_VERSION)") - $(call info-file-item, "OS_ARCH", "$(OPENJDK_TARGET_CPU_LEGACY)") - $(if $(JDK_ARCH_ABI_PROP_NAME), \ - $(call info-file-item, "SUN_ARCH_ABI", "$(JDK_ARCH_ABI_PROP_NAME)")) - $(call info-file-item, "SOURCE", "$(ALL_SOURCE_TIPS)") - $(call info-file-item, "MODULES", "`$(CAT) $1`") + $(call info-file-item, "JAVA_VERSION", "$(JDK_VERSION)") + $(call info-file-item, "OS_NAME", "$(REQUIRED_OS_NAME)") + $(call info-file-item, "OS_VERSION", "$(REQUIRED_OS_VERSION)") + $(call info-file-item, "OS_ARCH", "$(OPENJDK_TARGET_CPU_LEGACY)") + $(if $(JDK_ARCH_ABI_PROP_NAME), \ + $(call info-file-item, "SUN_ARCH_ABI", "$(JDK_ARCH_ABI_PROP_NAME)")) + $(call info-file-item, "SOURCE", "$(ALL_SOURCE_TIPS)") + $(call info-file-item, "MODULES", "`$(CAT) $1`") +endef + +# Param 1 - The file containing the MODULES list +define prepare-info-file + $(ECHO) $(LOG_INFO) Generating $(patsubst $(OUTPUT_ROOT)/%,%,$@) + $(MKDIR) -p $(@D) + $(RM) $@ +endef + +define info-file + $(call prepare-info-file, $1) + $(call create-info-file, $1) endef +# Create a variable dependency file common for all release info files. The +# sorted module list will only change if the image is regenerated, which will +# trigger a rebuild of these files anyway. +INFO_FILE_VARDEPS := $(call DependOnVariable, create-info-file) + ALL_SOURCE_TIPS = $(shell \ if [ -f $(SUPPORT_OUTPUTDIR)/source_tips ] ; then \ $(CAT) $(SUPPORT_OUTPUTDIR)/source_tips ; \ fi) -$(JRE_INFO_FILE): $(OUTPUT_ROOT)/spec.gmk $(SUPPORT_OUTPUTDIR)/source_tips - $(call create-info-file, $(JRE_SORTED_MODULES)) +$(JRE_INFO_FILE): $(INFO_FILE_VARDEPS) $(SUPPORT_OUTPUTDIR)/source_tips + $(call info-file, $(JRE_SORTED_MODULES)) -$(JDK_INFO_FILE): $(OUTPUT_ROOT)/spec.gmk $(SUPPORT_OUTPUTDIR)/source_tips - $(call create-info-file, $(JDK_SORTED_MODULES)) +$(JDK_INFO_FILE): $(INFO_FILE_VARDEPS) $(SUPPORT_OUTPUTDIR)/source_tips + $(call info-file, $(JDK_SORTED_MODULES)) -$(JRE_COMPACT1_INFO_FILE): $(OUTPUT_ROOT)/spec.gmk $(SUPPORT_OUTPUTDIR)/source_tips - $(call create-info-file, $(JRE_COMPACT1_SORTED_MODULES)) +$(JRE_COMPACT1_INFO_FILE): $(INFO_FILE_VARDEPS) $(SUPPORT_OUTPUTDIR)/source_tips + $(call info-file, $(JRE_COMPACT1_SORTED_MODULES)) $(call info-file-item, "JAVA_PROFILE", "compact1") -$(JRE_COMPACT2_INFO_FILE): $(OUTPUT_ROOT)/spec.gmk $(SUPPORT_OUTPUTDIR)/source_tips - $(call create-info-file, $(JRE_COMPACT2_SORTED_MODULES)) +$(JRE_COMPACT2_INFO_FILE): $(INFO_FILE_VARDEPS) $(SUPPORT_OUTPUTDIR)/source_tips + $(call info-file, $(JRE_COMPACT2_SORTED_MODULES)) $(call info-file-item, "JAVA_PROFILE", "compact2") -$(JRE_COMPACT3_INFO_FILE): $(OUTPUT_ROOT)/spec.gmk $(SUPPORT_OUTPUTDIR)/source_tips - $(call create-info-file, $(JRE_COMPACT3_SORTED_MODULES)) +$(JRE_COMPACT3_INFO_FILE): $(INFO_FILE_VARDEPS) $(SUPPORT_OUTPUTDIR)/source_tips + $(call info-file, $(JRE_COMPACT3_SORTED_MODULES)) $(call info-file-item, "JAVA_PROFILE", "compact3") JRE_TARGETS += $(JRE_INFO_FILE) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jdk9-0064e246d83f/make/Main.gmk new/jdk9-d1f37d39ff24/make/Main.gmk --- old/jdk9-0064e246d83f/make/Main.gmk 2015-01-25 08:22:16.000000000 +0100 +++ new/jdk9-d1f37d39ff24/make/Main.gmk 2015-02-06 00:41:43.000000000 +0100 @@ -402,6 +402,8 @@ verify-modules: exploded-image + test-make: clean-test-make + endif ################################################################################ @@ -446,7 +448,7 @@ # alias for ease of use. jdk: exploded-image -images: test-image jimages demos samples zip-security +images: test-image jimages demos samples zip-security verify-modules ifeq ($(OPENJDK_TARGET_OS), macosx) images: mac-bundles @@ -477,7 +479,7 @@ # file. CLEAN_DIRS += hotspot jdk bootcycle-build test buildtools support \ - images make-support + images make-support test-make CLEAN_DIR_TARGETS := $(addprefix clean-, $(CLEAN_DIRS)) CLEAN_PHASES := gensrc java native include CLEAN_PHASE_TARGETS := $(addprefix clean-, $(CLEAN_PHASES)) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jdk9-0064e246d83f/make/ZipSource.gmk new/jdk9-d1f37d39ff24/make/ZipSource.gmk --- old/jdk9-0064e246d83f/make/ZipSource.gmk 2015-01-25 08:22:16.000000000 +0100 +++ new/jdk9-d1f37d39ff24/make/ZipSource.gmk 2015-02-06 00:41:43.000000000 +0100 @@ -71,7 +71,7 @@ $(JDK_TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_API_DIR)/native/libjli/java_md*))) # This dir needs to exist before macro is evaluated to avoid warning from find. -$(eval $(call MakeDir, $(SUPPORT_OUTPUTDIR)/src)) +$(call MakeDir, $(SUPPORT_OUTPUTDIR)/src) $(eval $(call SetupZipArchive,BUILD_SRC_ZIP, \ SRC := $(SRC_ZIP_SRCS) $(SUPPORT_OUTPUTDIR)/src, \ INCLUDES := $(SRC_ZIP_INCLUDES) launcher, \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jdk9-0064e246d83f/make/common/IdlCompilation.gmk new/jdk9-d1f37d39ff24/make/common/IdlCompilation.gmk --- old/jdk9-0064e246d83f/make/common/IdlCompilation.gmk 2015-01-25 08:22:16.000000000 +0100 +++ new/jdk9-d1f37d39ff24/make/common/IdlCompilation.gmk 2015-02-06 00:41:43.000000000 +0100 @@ -99,7 +99,7 @@ $(if $(16),$(error Internal makefile error: Too many arguments to SetupIdlCompilation, please update IdlCompilation.gmk)) # Find all existing java files and existing class files. - $$(eval $$(call MakeDir,$$($1_BIN))) + $$(call MakeDir,$$($1_BIN)) $1_SRCS := $$(shell find $$($1_SRC) -name "*.idl") $1_BINS := $$(shell find $$($1_BIN) -name "*.java") # Prepend the source/bin path to the filter expressions. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jdk9-0064e246d83f/make/common/JavaCompilation.gmk new/jdk9-d1f37d39ff24/make/common/JavaCompilation.gmk --- old/jdk9-0064e246d83f/make/common/JavaCompilation.gmk 2015-01-25 08:22:16.000000000 +0100 +++ new/jdk9-d1f37d39ff24/make/common/JavaCompilation.gmk 2015-02-06 00:41:43.000000000 +0100 @@ -126,17 +126,20 @@ $1_FIND_PATTERNS:=$(FALSE_FIND_PATTERN) $$(patsubst %,$(SPACE)-o$(SPACE)-name$(SPACE)$(DQUOTE)*%$(DQUOTE),$$($1_SUFFIXES)) # On windows, a lot of includes/excludes risk making the command line too long, so # writing the grep patterns to files. + # Grep returns 1 if nothing is matched. Do not fail the build for this. ifneq (,$$($1_INCLUDES)) $1_GREP_INCLUDE_PATTERNS:=$$(call EscapeDollar, \ $$(foreach src,$$($1_SRCS), $$(addprefix $$(src)/,$$($1_INCLUDES)))) # If there are a lot of include patterns, output to file to shorten command lines ifeq ($$(word 20,$$($1_GREP_INCLUDE_PATTERNS)),) - $1_GREP_INCLUDES:=| $(GREP) $$(patsubst %,$(SPACE)-e$(SPACE)$(DQUOTE)%$(DQUOTE),$$($1_GREP_INCLUDE_PATTERNS)) + $1_GREP_INCLUDES:=| ( $(GREP) $$(patsubst %,$(SPACE)-e$(SPACE)$(DQUOTE)%$(DQUOTE),$$($1_GREP_INCLUDE_PATTERNS)) \ + || test "$$$$?" = "1" ) else $1_GREP_INCLUDE_OUTPUT:=$(RM) $$($1_BIN)/_the.$$($1_JARNAME)_include $$(NEWLINE) \ $$(call ListPathsSafely,$1_GREP_INCLUDE_PATTERNS,\n, \ >> $$($1_BIN)/_the.$$($1_JARNAME)_include) - $1_GREP_INCLUDES:=| $(GREP) -f $$($1_BIN)/_the.$$($1_JARNAME)_include + $1_GREP_INCLUDES:=| ( $(GREP) -f $$($1_BIN)/_the.$$($1_JARNAME)_include \ + || test "$$$$?" = "1" ) endif endif ifneq (,$$($1_EXCLUDES)$$($1_EXCLUDE_FILES)) @@ -145,12 +148,14 @@ $$($1_EXCLUDES) $$($1_EXCLUDE_FILES)))) # If there are a lot of include patterns, output to file to shorten command lines ifeq ($$(word 20,$$($1_GREP_EXCLUDE_PATTERNS)),) - $1_GREP_EXCLUDES:=| $(GREP) -v $$(patsubst %,$(SPACE)-e$(SPACE)$(DQUOTE)%$(DQUOTE),$$($1_GREP_EXCLUDE_PATTERNS)) + $1_GREP_EXCLUDES:=| ( $(GREP) -v $$(patsubst %,$(SPACE)-e$(SPACE)$(DQUOTE)%$(DQUOTE),$$($1_GREP_EXCLUDE_PATTERNS)) \ + || test "$$$$?" = "1" ) else $1_GREP_EXCLUDE_OUTPUT=$(RM) $$($1_BIN)/_the.$$($1_JARNAME)_exclude $$(NEWLINE) \ $$(call ListPathsSafely,$1_GREP_EXCLUDE_PATTERNS,\n, \ >> $$($1_BIN)/_the.$$($1_JARNAME)_exclude) - $1_GREP_EXCLUDES:=| $(GREP) -v -f $$($1_BIN)/_the.$$($1_JARNAME)_exclude + $1_GREP_EXCLUDES:=| ( $(GREP) -v -f $$($1_BIN)/_the.$$($1_JARNAME)_exclude \ + || test "$$$$?" = "1" ) endif endif @@ -222,9 +227,11 @@ $$($1_CAPTURE_EXTRA_FILES) # The capture metainf macro finds all files below the META-INF directory that are newer than the jar-file. + # Find returns non zero if the META-INF dir does not exist, ignore this. ifeq (,$$($1_SKIP_METAINF)) $1_CAPTURE_METAINF =$$(foreach src,$$($1_SRCS), \ - ( $(FIND) $$(src)/META-INF -type f -a -newer $$@ 2> /dev/null | $(SED) 's|$$(src)/|-C $$(src) |g' >> \ + ( ( $(FIND) $$(src)/META-INF -type f -a -newer $$@ 2> /dev/null || true ) \ + | $(SED) 's|$$(src)/|-C $$(src) |g' >> \ $$($1_BIN)/_the.$$($1_JARNAME)_contents ) $$(NEWLINE) ) endif # The capture deletes macro finds all deleted files and concatenates them. The resulting file @@ -248,9 +255,11 @@ >> $$($1_BIN)/_the.$$($1_JARNAME)_contents $$(NEWLINE)) \ $$($1_CAPTURE_EXTRA_FILES) + # Find returns non zero if the META-INF dir does not exist, ignore this. ifeq (,$$($1_SKIP_METAINF)) $1_SCAPTURE_METAINF=$$(foreach src,$$($1_SRCS), \ - ( $(FIND) $$(src)/META-INF -type f 2> /dev/null | $(SED) 's|$$(src)/|-C $$(src) |g' >> \ + ( ( $(FIND) $$(src)/META-INF -type f 2> /dev/null || true ) \ + | $(SED) 's|$$(src)/|-C $$(src) |g' >> \ $$($1_BIN)/_the.$$($1_JARNAME)_contents) $$(NEWLINE) ) endif $1_SUPDATE_CONTENTS=$(JAR) $$($1_JAR_UPDATE_OPTIONS) $$@ @$$($1_BIN)/_the.$$($1_JARNAME)_contents $$(NEWLINE) @@ -270,19 +279,37 @@ $1_JAR_UPDATE_OPTIONS := uf endif + # Include all variables of significance in the vardeps file + $1_VARDEPS := $(JAR) $$($1_JAR_CREATE_OPTIONS) $$($1_MANIFEST) $(RELEASE) $(COMPANY_NAME) \ + $$($1_JARMAIN) $$($1_EXTRA_MANIFEST_ATTR) + $1_VARDEPS_FILE := $$(call DependOnVariable, $1_VARDEPS, $$(dir $$($1_JAR))_the.$$($1_JARNAME).vardeps) + # Here is the rule that creates/updates the jar file. - $$($1_JAR) : $$($1_DEPS) + $$($1_JAR) : $$($1_DEPS) $$($1_MANIFEST) $$($1_VARDEPS_FILE) $(MKDIR) -p $$($1_BIN) $$($1_GREP_INCLUDE_OUTPUT) $$($1_GREP_EXCLUDE_OUTPUT) - $$(if $$($1_MANIFEST), \ - $(SED) -e "s#@@RELEASE@@#$(RELEASE)#" \ - -e "s#@@COMPANY_NAME@@#$(COMPANY_NAME)#" $$($1_MANIFEST) > $$($1_MANIFEST_FILE) \ + # If the vardeps file is part of the newer prereq list, it means that + # either the jar file does not exist, or we need to recreate it from + # from scratch anyway since a simple update will not catch all the + # potential changes. + $$(if $$(filter $$($1_VARDEPS_FILE) $$($1_MANIFEST), $$?), \ + $$(if $$($1_MANIFEST), \ + $(SED) -e "s#@@RELEASE@@#$(RELEASE)#" \ + -e "s#@@COMPANY_NAME@@#$(COMPANY_NAME)#" $$($1_MANIFEST) > $$($1_MANIFEST_FILE) $$(NEWLINE) \ + , \ + $(RM) $$($1_MANIFEST_FILE) && $(TOUCH) $$($1_MANIFEST_FILE) $$(NEWLINE)) \ + $$(if $$($1_JARMAIN), \ + $(ECHO) "Main-Class: $$(strip $$($1_JARMAIN))" >> $$($1_MANIFEST_FILE) $$(NEWLINE)) \ + $$(if $$($1_EXTRA_MANIFEST_ATTR), \ + $(PRINTF) "$$($1_EXTRA_MANIFEST_ATTR)\n" >> $$($1_MANIFEST_FILE) $$(NEWLINE)) \ + $(ECHO) Creating $$($1_NAME) $$(NEWLINE) \ + $(JAR) $$($1_JAR_CREATE_OPTIONS) $$@ $$($1_MANIFEST_FILE) $$(NEWLINE) \ + $$($1_SCAPTURE_CONTENTS) \ + $$($1_SCAPTURE_METAINF) \ + $$($1_SUPDATE_CONTENTS) \ + $$($1_JARINDEX) && true \ , \ - $(RM) $$($1_MANIFEST_FILE) && $(TOUCH) $$($1_MANIFEST_FILE)) - $$(if $$($1_JARMAIN),$(ECHO) "Main-Class: $$(strip $$($1_JARMAIN))" >> $$($1_MANIFEST_FILE)) - $$(if $$($1_EXTRA_MANIFEST_ATTR),$(PRINTF) "$$($1_EXTRA_MANIFEST_ATTR)\n" >> $$($1_MANIFEST_FILE)) - $$(if $$(wildcard $$@), \ $(ECHO) Modifying $$($1_NAME) $$(NEWLINE) \ $$($1_CAPTURE_CONTENTS) \ $$($1_CAPTURE_METAINF) \ @@ -294,12 +321,6 @@ $(ZIP) -q -d $$@ `$(CAT) $$($1_DELETESS_FILE)` ; \ fi $$(NEWLINE) \ $$($1_UPDATE_CONTENTS) true $$(NEWLINE) \ - $$($1_JARINDEX) && true \ - , \ - $(ECHO) Creating $$($1_NAME) && $(JAR) $$($1_JAR_CREATE_OPTIONS) $$@ $$($1_MANIFEST_FILE) $$(NEWLINE) \ - $$($1_SCAPTURE_CONTENTS) \ - $$($1_SCAPTURE_METAINF) \ - $$($1_SUPDATE_CONTENTS) \ $$($1_JARINDEX) && true ) # Add jar to target list @@ -431,7 +452,7 @@ $1_SRC:=$$(call ADD_SRCS,$$($1_SRC)) # Make sure the dirs exist. $$(foreach d,$$($1_SRC), $$(if $$(wildcard $$d),,$$(error SRC specified to SetupJavaCompilation $1 contains missing directory $$d))) - $$(eval $$(call MakeDir,$$($1_BIN))) + $$(call MakeDir,$$($1_BIN)) # Add all source roots to the find cache since we are likely going to run find # on these more than once. The cache will only be updated if necessary. $$(eval $$(call FillCacheFind,$$($1_SRC))) @@ -475,23 +496,23 @@ $1_ALL_COPIES += $$(filter $$(addprefix %,$$($1_COPY)),$$($1_ALL_SRCS)) # Copy these explicitly $1_ALL_COPIES += $$($1_COPY_FILES) - # Copy must also respect filters. - ifneq (,$$($1_INCLUDES)) - $1_ALL_COPIES := $$(filter $$($1_SRC_INCLUDES),$$($1_ALL_COPIES)) - endif - ifneq (,$$($1_EXCLUDES)) - $1_ALL_COPIES := $$(filter-out $$($1_SRC_EXCLUDES),$$($1_ALL_COPIES)) - endif - ifneq (,$$($1_EXCLUDE_FILES)) - $1_ALL_COPIES := $$(filter-out $$($1_EXCLUDE_FILES_PATTERN),$$($1_ALL_COPIES)) - endif endif - ifneq (,$$($1_ALL_COPIES)) - # Yep, there are files to be copied! - $1_ALL_COPY_TARGETS:= - $$(foreach i,$$($1_ALL_COPIES),$$(eval $$(call add_file_to_copy,$1,$$i))) - # Now we can depend on $$($1_ALL_COPY_TARGETS) to copy all files! - endif + # Copy must also respect filters. + ifneq (,$$($1_INCLUDES)) + $1_ALL_COPIES := $$(filter $$($1_SRC_INCLUDES),$$($1_ALL_COPIES)) + endif + ifneq (,$$($1_EXCLUDES)) + $1_ALL_COPIES := $$(filter-out $$($1_SRC_EXCLUDES),$$($1_ALL_COPIES)) + endif + ifneq (,$$($1_EXCLUDE_FILES)) + $1_ALL_COPIES := $$(filter-out $$($1_EXCLUDE_FILES_PATTERN),$$($1_ALL_COPIES)) + endif + ifneq (,$$($1_ALL_COPIES)) + # Yep, there are files to be copied! + $1_ALL_COPY_TARGETS:= + $$(foreach i,$$($1_ALL_COPIES),$$(eval $$(call add_file_to_copy,$1,$$i))) + # Now we can depend on $$($1_ALL_COPY_TARGETS) to copy all files! + endif # Find all property files to be copied and cleaned from source to bin. ifneq (,$$($1_CLEAN)$$($1_CLEAN_FILES)) @@ -535,9 +556,14 @@ $1_SJAVAC:=$$(subst com.sun.tools.javac.Main,com.sun.tools.sjavac.Main,$$($1_JAVAC)) # Set the $1_REMOTE to spawn a background javac server. - $1_REMOTE:=--server:portfile=$$($1_SJAVAC_PORTFILE),id=$1,sjavac=$$(subst $$(SPACE),%20,$$(subst $$(COMMA),%2C,$$(strip $$($1_SERVER_JVM) $$($1_SJAVAC)))) + $1_REMOTE:=--server:portfile=$$($1_SJAVAC_PORTFILE),id=$1,sjavac=$$(subst \ + $$(SPACE),%20,$$(subst $$(COMMA),%2C,$$(strip $$($1_SERVER_JVM) $$($1_SJAVAC)))) - $$($1_BIN)/_the.$1_batch: $$($1_SRCS) $$($1_DEPENDS) + $1_VARDEPS := $$($1_JVM) $$($1_SJAVAC) $$($1_SJAVAC_ARGS) $$($1_FLAGS) \ + $$($1_HEADERS_ARG) $$($1_BIN) + $1_VARDEPS_FILE := $$(call DependOnVariable, $1_VARDEPS, $$($1_BIN)/_the.$1.vardeps) + + $$($1_BIN)/_the.$1_batch: $$($1_SRCS) $$($1_DEPENDS) $$($1_VARDEPS_FILE) $(MKDIR) -p $$(@D) $$(dir $$($1_SJAVAC_PORTFILE)) # As a workaround for sjavac not tracking api changed from the classpath, force full # recompile if an external dependency, which is something other than a source @@ -592,8 +618,11 @@ $1_HEADER_TARGETS := $$($1_HEADERS)/_the.$1_headers endif + $1_VARDEPS := $$($1_JVM) $$($1_JAVAC) $$($1_FLAGS) $$($1_BIN) $$($1_HEADERS_ARG) + $1_VARDEPS_FILE := $$(call DependOnVariable, $1_VARDEPS, $$($1_BIN)/_the.$1.vardeps) + # When not using sjavac, pass along all sources to javac using an @file. - $$($1_BIN)/_the.$1_batch: $$($1_SRCS) $$($1_DEPENDS) + $$($1_BIN)/_the.$1_batch: $$($1_SRCS) $$($1_DEPENDS) $$($1_VARDEPS_FILE) $(MKDIR) -p $$(@D) $(RM) $$($1_BIN)/_the.$1_batch $$($1_BIN)/_the.$1_batch.tmp $$(call ListPathsSafely,$1_SRCS,\n, >> $$($1_BIN)/_the.$1_batch.tmp) @@ -659,4 +688,5 @@ $(if $(findstring yes, $(ENABLE_SJAVAC)), $(strip $2)/_the.$(strip $1)_pubapi, \ $(strip $2)/_the.$(strip $1)_batch) endef -endif + +endif # _JAVA_COMPILATION_GMK diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jdk9-0064e246d83f/make/common/MakeBase.gmk new/jdk9-d1f37d39ff24/make/common/MakeBase.gmk --- old/jdk9-0064e246d83f/make/common/MakeBase.gmk 2015-01-25 08:22:16.000000000 +0100 +++ new/jdk9-d1f37d39ff24/make/common/MakeBase.gmk 2015-02-06 00:41:43.000000000 +0100 @@ -349,7 +349,7 @@ # (and causing a crash on Cygwin). # Default shell seems to always be /bin/sh. Must override with bash to get this to work on Solaris. # Only use time if it's GNU time which supports format and output file. - WRAPPER_SHELL:=$$(BASH) $$(SRC_ROOT)/common/bin/shell-tracer.sh $$(if $$(findstring yes,$$(IS_GNU_TIME)),$$(TIME),-) $$(OUTPUT_ROOT)/build-trace-time.log $$(BASH) + WRAPPER_SHELL:=$$(BASH) $$(SRC_ROOT)/common/bin/shell-tracer.sh $$(if $$(findstring yes,$$(IS_GNU_TIME)),$$(TIME),-) $$(OUTPUT_ROOT)/build-trace-time.log $$(SHELL) SHELL=$$(warning $$(if $$@,Building $$@,Running shell command) $$(if $$<, (from $$<))$$(if $$?, ($$(wordlist 1, 20, $$?) $$(if $$(wordlist 21, 22, $$?), ... [in total $$(words $$?) files]) newer)))$$(WRAPPER_SHELL) endif # Never remove warning messages; this is just for completeness @@ -392,11 +392,9 @@ endef # Make directory without forking mkdir if not needed -define MakeDir - ifneq ($$(wildcard $1 $2 $3 $4 $5 $6 $7 $8 $9),$$(strip $1 $2 $3 $4 $5 $6 $7 $8 $9)) - $$(shell $(MKDIR) -p $1 $2 $3 $4 $5 $6 $7 $8 $9) - endif -endef +MakeDir = \ + $(strip $(if $(subst $(wildcard $1 $2 $3 $4 $5 $6 $7 $8 $9),,$(strip $1 $2 $3 $4 $5 $6 $7 $8 $9)),\ + $(shell $(MKDIR) -p $1 $2 $3 $4 $5 $6 $7 $8 $9))) ifeq ($(OPENJDK_TARGET_OS),solaris) # On Solaris, if the target is a symlink and exists, cp won't overwrite. @@ -446,6 +444,11 @@ # Filter out duplicate sub strings while preserving order. Keeps the first occurance. uniq = $(if $1,$(firstword $1) $(call uniq,$(filter-out $(firstword $1),$1))) +# String equals +equals = \ + $(and $(findstring $(strip $1),$(strip $2)),\ + $(findstring $(strip $2),$(strip $1))) + ifneq ($(DISABLE_CACHE_FIND), true) ################################################################################ # In Cygwin, finds are very costly, both because of expensive forks and because @@ -543,6 +546,80 @@ endef ################################################################################ +# ShellQuote +# +# Quotes a string with single quotes and replaces single quotes with '\'' so +# that the contents survives being given to the shell. + +ShellQuote = \ + $(SQUOTE)$(subst $(SQUOTE),$(SQUOTE)\$(SQUOTE)$(SQUOTE),$(strip $1))$(SQUOTE) + +################################################################################ +# Write to and read from file + +# Param 1 - File to read +ReadFile = \ + $(shell $(CAT) $1) + +# Param 1 - Text to write +# Param 2 - File to write to +# Use printf to get consistent behavior on all platforms. +WriteFile = \ + $(shell $(PRINTF) "%s" $(call ShellQuote, $1) > $2) + +################################################################################ +# DependOnVariable +# +# This macro takes a variable name and puts the value in a file only if the +# value has changed since last. The name of the file is returned. This can be +# used to create rule dependencies on make variable values. The following +# example would get rebuilt if the value of SOME_VAR was changed: +# +# path/to/some-file: $(call DependOnVariable, SOME_VAR) +# echo $(SOME_VAR) > $@ +# +# Note that leading and trailing white space in the value is ignored. +# + +# Defines the sub directory structure to store variable value file in +DependOnVariableDirName = \ + $(strip $(subst $(SRC_ROOT)/,,\ + $(if $(filter /%, $(firstword $(MAKEFILE_LIST))), \ + $(firstword $(MAKEFILE_LIST)), \ + $(CURDIR)/$(firstword $(MAKEFILE_LIST))))) + +# Defines the name of the file to store variable value in. Generates a name +# unless parameter 2 is given. +# Param 1 - Name of variable +# Param 2 - (optional) name of file to store value in +DependOnVariableFileName = \ + $(strip $(if $(strip $2), $2, \ + $(MAKESUPPORT_OUTPUTDIR)/vardeps/$(DependOnVariableDirName)/$(strip $1).vardeps)) + +# Does the actual work with parameters stripped. +# If the file exists AND the contents is the same as the variable, do nothing +# else print a new file. +# Always returns the name of the file where the value was printed. +# Param 1 - Name of variable +# Param 2 - (optional) name of file to store value in +DependOnVariableHelper = \ + $(strip $(if $(and $(wildcard $(call DependOnVariableFileName, $1, $2)),\ + $(call equals, $(strip $($1)), \ + $(call ReadFile, $(call DependOnVariableFileName, $1, $2)))),,\ + $(call MakeDir, $(dir $(call DependOnVariableFileName, $1, $2))) \ + $(if $(findstring $(LOG_LEVEL), trace), \ + $(info Variable $1: >$(strip $($1))<) \ + $(info File: >$(call ReadFile, $(call DependOnVariableFileName, $1, $2))<)) \ + $(call WriteFile, $($1), $(call DependOnVariableFileName, $1, $2))) \ + $(call DependOnVariableFileName, $1, $2)) + +# Main macro +# Param 1 - Name of variable +# Param 2 - (optional) name of file to store value in +DependOnVariable = \ + $(call DependOnVariableHelper,$(strip $1),$(strip $2)) + +################################################################################ # Hook to include the corresponding custom file, if present. $(eval $(call IncludeCustomExtension, , common/MakeBase.gmk)) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jdk9-0064e246d83f/make/common/NativeCompilation.gmk new/jdk9-d1f37d39ff24/make/common/NativeCompilation.gmk --- old/jdk9-0064e246d83f/make/common/NativeCompilation.gmk 2015-01-25 08:22:16.000000000 +0100 +++ new/jdk9-d1f37d39ff24/make/common/NativeCompilation.gmk 2015-02-06 00:41:43.000000000 +0100 @@ -114,7 +114,7 @@ endif endif - $$($1_$2_OBJ) : $2 | $$($1_BUILD_INFO) + $$($1_$2_OBJ) : $2 $$($1_COMPILE_VARDEPS_FILE) | $$($1_BUILD_INFO) $(ECHO) $(LOG_INFO) "Compiling $$(notdir $2) (for $$(notdir $$($1_TARGET)))" ifneq ($(TOOLCHAIN_TYPE), microsoft) # The Solaris studio compiler doesn't output the full path to the object file in the @@ -133,7 +133,8 @@ ($$($1_$2_COMP) $$($1_$2_FLAGS) -showIncludes $$($1_$2_DEBUG_OUT_FLAGS) \ $(CC_OUT_OPTION)$$($1_$2_OBJ) $2 ; echo $$$$? > $$($1_$2_DEP).exitvalue) \ | $(TEE) $$($1_$2_DEP).raw | $(GREP) -v -e "^Note: including file:" \ - -e "^$(notdir $2)$$$$" ; exit `cat $$($1_$2_DEP).exitvalue` + -e "^$(notdir $2)$$$$" || test "$$$$?" = "1" ; \ + exit `cat $$($1_$2_DEP).exitvalue` $(RM) $$($1_$2_DEP).exitvalue ($(ECHO) $$@: \\ \ && $(SED) $(WINDOWS_SHOWINCLUDE_SED_PATTERN) $$($1_$2_DEP).raw) > $$($1_$2_DEP) @@ -306,7 +307,7 @@ endif # Make sure the dirs exist. - $$(eval $$(call MakeDir,$$($1_OBJECT_DIR) $$($1_OUTPUT_DIR))) + $$(call MakeDir,$$($1_OBJECT_DIR) $$($1_OUTPUT_DIR)) $$(foreach d,$$($1_SRC), $$(if $$(wildcard $$d),,$$(error SRC specified to SetupNativeCompilation $1 contains missing directory $$d))) # Find all files in the source trees. Sort to remove duplicates. @@ -426,15 +427,16 @@ $1_BUILD_INFO := $$($1_OBJECT_DIR)/_build-info.marker - # Setup rule for printing progress info when compiling source files. - # This is a rough heuristic and may not always print accurate information. - $$($1_BUILD_INFO): $$($1_SRCS) - ifeq ($$(wildcard $$($1_TARGET)),) - $(ECHO) 'Creating $$($1_BASENAME) from $$(words $$?) file(s)' - else - $(ECHO) 'Updating $$($1_BASENAME) from $$(words $$?) file(s)' - endif - $(TOUCH) $$@ + # Track variable changes for all variables that affect the compilation command + # lines for all object files in this setup. This includes at least all the + # variables used in the call to add_native_source below. + $1_COMPILE_VARDEPS := $$($1_CFLAGS) $$($1_EXTRA_CFLAGS) $(SYSROOT_CFLAGS) \ + $$($1_CXXFLAGS) $$($1_EXTRA_CXXFLAGS) \ + $$($1_CC) $$($1_CXX) $$($1_OBJC) $$($1_ASFLAGS) \ + $$(foreach s, $$($1_SRCS), \ + $$($1_$$(notdir $$s)_CFLAGS) $$($1_$$(notdir $$s)_CXXFLAGS)) + $1_COMPILE_VARDEPS_FILE := $$(call DependOnVariable, $1_COMPILE_VARDEPS, \ + $$($1_OBJECT_DIR)/$$($1_NOSUFFIX).comp.vardeps) # Now call add_native_source for each source file we are going to compile. $$(foreach p,$$($1_SRCS), \ @@ -444,13 +446,28 @@ $$($1_CXXFLAGS) $$($1_EXTRA_CXXFLAGS) $(SYSROOT_CFLAGS), \ $$($1_CXX),$$($1_OBJC),$$($1_ASFLAGS)))) + # Setup rule for printing progress info when compiling source files. + # This is a rough heuristic and may not always print accurate information. + $$($1_BUILD_INFO): $$($1_SRCS) $$($1_COMPILE_VARDEPS_FILE) + ifeq ($$(wildcard $$($1_TARGET)),) + $(ECHO) 'Creating $$($1_BASENAME) from $$(words $$(filter-out %.vardeps, $$?)) file(s)' + else + $(ECHO) 'Updating $$($1_BASENAME) from $$(words $$(filter-out %.vardeps, $$?)) file(s)' + endif + $(TOUCH) $$@ + # On windows we need to create a resource file ifeq ($(OPENJDK_TARGET_OS), windows) ifneq (,$$($1_VERSIONINFO_RESOURCE)) $1_RES:=$$($1_OBJECT_DIR)/$$($1_BASENAME).res $1_RES_DEP:=$$($1_RES).d -include $$($1_RES_DEP) - $$($1_RES): $$($1_VERSIONINFO_RESOURCE) + + $1_RES_VARDEPS := $(RC) $$($1_RC_FLAGS) + $1_RES_VARDEPS_FILE := $$(call DependOnVariable, $1_RES_VARDEPS, \ + $$($1_RES).vardeps) + + $$($1_RES): $$($1_VERSIONINFO_RESOURCE) $$($1_RES_VARDEPS_FILE) $(ECHO) $(LOG_INFO) "Compiling resource $$(notdir $$($1_VERSIONINFO_RESOURCE)) (for $$(notdir $$($1_TARGET)))" $(RC) $$($1_RC_FLAGS) $(CC_OUT_OPTION)$$@ $$($1_VERSIONINFO_RESOURCE) # Windows RC compiler does not support -showIncludes, so we mis-use CL for this. @@ -462,7 +479,9 @@ ifneq (,$$($1_MANIFEST)) $1_GEN_MANIFEST:=$$($1_OBJECT_DIR)/$$($1_PROGRAM).manifest IMVERSIONVALUE:=$(JDK_MINOR_VERSION).$(JDK_MICRO_VERSION).$(JDK_UPDATE_VERSION).$(COOKED_BUILD_NUMBER) - $$($1_GEN_MANIFEST): $$($1_MANIFEST) + $1_MANIFEST_VARDEPS_FILE := $$(call DependOnVariable, IMVERSIONVALUE, \ + $$($1_GEN_MANIFEST).vardeps) + $$($1_GEN_MANIFEST): $$($1_MANIFEST) $$($1_MANIFEST_VARDEPS_FILE) $(SED) 's%IMVERSION%$$(IMVERSIONVALUE)%g;s%PROGRAM%$$($1_PROGRAM)%g' $$< > $$@ endif endif @@ -575,8 +594,13 @@ $1_EXTRA_LDFLAGS_SUFFIX += $(GLOBAL_LDFLAGS_SUFFIX) + $1_VARDEPS := $$($1_LD) $(SYSROOT_LDFLAGS) $$($1_LDFLAGS) $$($1_EXTRA_LDFLAGS) \ + $$($1_LDFLAGS_SUFFIX) $$($1_EXTRA_LDFLAGS_SUFFIX) + $1_VARDEPS_FILE := $$(call DependOnVariable, $1_VARDEPS, \ + $$($1_OBJECT_DIR)/$$($1_NOSUFFIX).vardeps) + $$($1_TARGET): $$($1_EXPECTED_OBJS) $$($1_RES) $$($1_REAL_MAPFILE) \ - $$($1_DEBUGINFO_EXTRA_DEPS) + $$($1_DEBUGINFO_EXTRA_DEPS) $$($1_VARDEPS_FILE) $(ECHO) $(LOG_INFO) "Linking $$($1_BASENAME)" $$($1_LD) $$($1_LDFLAGS) $$($1_EXTRA_LDFLAGS) $(SYSROOT_LDFLAGS) \ $(LD_OUT_OPTION)$$@ \ @@ -592,8 +616,12 @@ endif ifneq (,$$($1_STATIC_LIBRARY)) + $1_VARDEPS := $(AR) $$($1_ARFLAGS) $$($1_LDFLAGS_SUFFIX) $$($1_EXTRA_LDFLAGS_SUFFIX) + $1_VARDEPS_FILE := $$(call DependOnVariable, $1_VARDEPS, \ + $$($1_OBJECT_DIR)/$$($1_NOSUFFIX).vardeps) + # Generating a static library, ie object file archive. - $$($1_TARGET): $$($1_EXPECTED_OBJS) $$($1_RES) + $$($1_TARGET): $$($1_EXPECTED_OBJS) $$($1_RES) $$($1_VARDEPS_FILE) $(ECHO) $(LOG_INFO) "Archiving $$($1_STATIC_LIBRARY)" $(AR) $$($1_ARFLAGS) $(AR_OUT_OPTION)$$($1_TARGET) $$($1_EXPECTED_OBJS) \ $$($1_RES) $$($1_LDFLAGS_SUFFIX) $$($1_EXTRA_LDFLAGS_SUFFIX) @@ -603,8 +631,13 @@ # A executable binary has been specified, setup the target for it. $1_EXTRA_LDFLAGS_SUFFIX += $(GLOBAL_LDFLAGS_SUFFIX) + $1_VARDEPS := $$($1_LDEXE) $(SYSROOT_LDFLAGS) $$($1_LDFLAGS) $$($1_EXTRA_LDFLAGS) \ + $$($1_LDFLAGS_SUFFIX) $$($1_EXTRA_LDFLAGS_SUFFIX) + $1_VARDEPS_FILE := $$(call DependOnVariable, $1_VARDEPS, \ + $$($1_OBJECT_DIR)/$$($1_NOSUFFIX).vardeps) + $$($1_TARGET): $$($1_EXPECTED_OBJS) $$($1_RES) $$($1_GEN_MANIFEST) \ - $$($1_DEBUGINFO_EXTRA_DEPS) + $$($1_DEBUGINFO_EXTRA_DEPS) $$($1_VARDEPS_FILE) $(ECHO) $(LOG_INFO) "Linking executable $$($1_BASENAME)" $$($1_LDEXE) $$($1_LDFLAGS) $$($1_EXTRA_LDFLAGS) $(SYSROOT_LDFLAGS) \ $(EXE_OUT_OPTION)$$($1_TARGET) \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jdk9-0064e246d83f/make/common/TextFileProcessing.gmk new/jdk9-d1f37d39ff24/make/common/TextFileProcessing.gmk --- old/jdk9-0064e246d83f/make/common/TextFileProcessing.gmk 2015-01-25 08:22:16.000000000 +0100 +++ new/jdk9-d1f37d39ff24/make/common/TextFileProcessing.gmk 2015-02-06 00:41:43.000000000 +0100 @@ -34,7 +34,7 @@ # param 3 = the target base directory # param 4 = the target file name (possibly with a partial path) define SetupSingleTextFileForProcessing - $(strip $3)/$(strip $4): $2 + $(strip $3)/$(strip $4): $2 $$($1_VARDEPS_FILE) $(ECHO) $(LOG_INFO) "Processing $(strip $4)" $(MKDIR) -p '$$(@D)' $(RM) '$$@' '$$@.includes.tmp' '$$@.replacements.tmp' @@ -193,6 +193,9 @@ $1_INCLUDES_COMMAND_LINE := $(CAT) endif + $1_VARDEPS := $$($1_INCLUDES_COMMAND_LINE) $$($1_REPLACEMENTS_COMMAND_LINE) + $1_VARDEPS_FILE := $$(call DependOnVariable, $1_VARDEPS) + # Reset target list before populating it $1 := diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jdk9-0064e246d83f/modules.xml new/jdk9-d1f37d39ff24/modules.xml --- old/jdk9-0064e246d83f/modules.xml 2015-01-25 08:22:16.000000000 +0100 +++ new/jdk9-d1f37d39ff24/modules.xml 2015-02-06 00:41:43.000000000 +0100 @@ -108,6 +108,9 @@ <name>java.security</name> </export> <export> + <name>java.security.acl</name> + </export> + <export> <name>java.security.cert</name> </export> <export> @@ -446,7 +449,6 @@ <depend re-exports="true">java.management</depend> <depend re-exports="true">java.naming</depend> <depend re-exports="true">java.prefs</depend> - <depend re-exports="true">java.security.acl</depend> <depend re-exports="true">java.security.jgss</depend> <depend re-exports="true">java.security.sasl</depend> <depend re-exports="true">java.sql.rowset</depend> @@ -891,13 +893,6 @@ <depend re-exports="true">java.xml.ws</depend> </module> <module> - <name>java.security.acl</name> - <depend>java.base</depend> - <export> - <name>java.security.acl</name> - </export> - </module> - <module> <name>java.security.jgss</name> <depend>java.base</depend> <depend>java.naming</depend> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jdk9-0064e246d83f/test/make/TestJavaCompilation.gmk new/jdk9-d1f37d39ff24/test/make/TestJavaCompilation.gmk --- old/jdk9-0064e246d83f/test/make/TestJavaCompilation.gmk 2015-01-25 08:22:16.000000000 +0100 +++ new/jdk9-d1f37d39ff24/test/make/TestJavaCompilation.gmk 2015-02-06 00:41:43.000000000 +0100 @@ -50,6 +50,9 @@ clean-jar1: $(RM) -r $(OUTPUT_DIR)/_jar1* $(OUTPUT_DIR)/jar1* +$(JAR1_MANIFEST): | $(OUTPUT_DIR)/_jar1_created + $(ECHO) "Test-Attribute: value" > $(JAR1_MANIFEST) + $(OUTPUT_DIR)/_jar1_created: $(DEPS) $(RM) -r $(JAR1_SRC_ROOT) $(RM) $(JAR1_FILE) @@ -61,7 +64,6 @@ $(TOUCH) $(JAR1_SRC_ROOT)/dir1/file1.class $(TOUCH) $(JAR1_SRC_ROOT)/dir2/file2.class $(TOUCH) $(JAR1_SRC_ROOT)/META-INF/metafile - $(ECHO) "Test-Attribute: value" > $(JAR1_MANIFEST) $(TOUCH) $@ $(eval $(call SetupArchive,BUILD_JAR1, \ @@ -77,7 +79,7 @@ $(DIFF) -r $(JAR1_SRC_ROOT)/dir1 $(JAR1_UNZIP)/dir1 $(DIFF) -r $(JAR1_SRC_ROOT)/dir2 $(JAR1_UNZIP)/dir2 $(DIFF) -r $(JAR1_SRC_ROOT)/META-INF/metafile $(JAR1_UNZIP)/META-INF/metafile - if [ "`$(GREP) 'Test-Attribute: value' $(JAR1_MANIFEST)`" = "" ]; then \ + if [ "`$(GREP) 'Test-Attribute: value' $(JAR1_UNZIP)/META-INF/MANIFEST.MF`" = "" ]; then \ $(ECHO) "Could not find Test-Attribute in manifest of $(JAR1_FILE)"; \ exit 1; \ fi @@ -88,7 +90,7 @@ # Change a source file and call this makefile again to force the jar to be # updated. -$(OUTPUT_DIR)_jar1_updated: $(OUTPUT_DIR)/_jar1_verified +$(OUTPUT_DIR)/_jar1_updated: $(OUTPUT_DIR)/_jar1_verified $(ECHO) updated > $(JAR1_SRC_ROOT)/dir1/file1.class $(ECHO) updated > $(JAR1_SRC_ROOT)/META-INF/metafile $(TOUCH) $(OUTPUT_DIR)/_jar1_created @@ -96,9 +98,26 @@ $(TOUCH) $@ update-jar1: $(OUTPUT_DIR)_jar1_updated -TEST_TARGETS += $(OUTPUT_DIR)_jar1_updated -.PHONY: clean-jar1 create-jar1 update-jar1 +# Change the manifest file and call this makefile again to force the jar +# to be updated +$(OUTPUT_DIR)/_jar1_updated_manifest: $(OUTPUT_DIR)/_jar1_updated + $(ECHO) "Test-Attribute: foobar" > $(JAR1_MANIFEST) + +$(MAKE) -f $(THIS_FILE) $(BUILD_JAR1) + $(RM) -r $(JAR1_UNZIP) + $(MKDIR) -p $(JAR1_UNZIP) + $(CD) $(JAR1_UNZIP) && $(UNZIP) $(JAR1_FILE) $(LOG_DEBUG) + if [ "`$(GREP) 'Test-Attribute: foobar' $(JAR1_UNZIP)/META-INF/MANIFEST.MF`" = "" ]; then \ + $(ECHO) "Could not find Test-Attribute in manifest of $(JAR1_FILE)"; \ + exit 1; \ + fi + $(TOUCH) $@ + +update-jar1-manifest: $(OUTPUT_DIR)/_jar1_updated_manifest + +TEST_TARGETS += $(OUTPUT_DIR)/_jar1_updated $(OUTPUT_DIR)/_jar1_updated_manifest + +.PHONY: clean-jar1 create-jar1 update-jar1 update-jar1-manifest ################################################################################ # Test: jar2 @@ -139,14 +158,14 @@ create-jar2: $(OUTPUT_DIR)/_jar2_verified TEST_TARGETS += $(OUTPUT_DIR)/_jar2_verified -$(OUTPUT_DIR)_jar2_updated: $(OUTPUT_DIR)/_jar2_verified +$(OUTPUT_DIR)/_jar2_updated: $(OUTPUT_DIR)/_jar2_verified $(ECHO) updated > $(JAR2_SRC_ROOT1)/dir1/file1.class $(TOUCH) $(OUTPUT_DIR)/_jar2_created +$(MAKE) -f $(THIS_FILE) $(OUTPUT_DIR)/_jar2_verified $(TOUCH) $@ -update-jar2: $(OUTPUT_DIR)_jar2_updated -TEST_TARGETS += $(OUTPUT_DIR)_jar2_updated +update-jar2: $(OUTPUT_DIR)/_jar2_updated +TEST_TARGETS += $(OUTPUT_DIR)/_jar2_updated .PHONY: clean-jar2 create-jar2 update-jar2 @@ -200,14 +219,14 @@ create-jar3: $(OUTPUT_DIR)/_jar3_verified TEST_TARGETS += $(OUTPUT_DIR)/_jar3_verified -$(OUTPUT_DIR)_jar3_updated: $(OUTPUT_DIR)/_jar3_verified +$(OUTPUT_DIR)/_jar3_updated: $(OUTPUT_DIR)/_jar3_verified $(ECHO) updated > $(JAR3_SRC_ROOT2)/extra-file $(TOUCH) $(OUTPUT_DIR)/_jar3_created +$(MAKE) -f $(THIS_FILE) $(OUTPUT_DIR)/_jar3_verified $(TOUCH) $@ -update-jar3: $(OUTPUT_DIR)_jar3_updated -TEST_TARGETS += $(OUTPUT_DIR)_jar3_updated +update-jar3: $(OUTPUT_DIR)/_jar3_updated +TEST_TARGETS += $(OUTPUT_DIR)/_jar3_updated .PHONY: clean-jar3 create-jar3 update-jar3 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jdk9-0064e246d83f/test/make/TestMakeBase.gmk new/jdk9-d1f37d39ff24/test/make/TestMakeBase.gmk --- old/jdk9-0064e246d83f/test/make/TestMakeBase.gmk 2015-01-25 08:22:16.000000000 +0100 +++ new/jdk9-d1f37d39ff24/test/make/TestMakeBase.gmk 2015-02-06 00:41:43.000000000 +0100 @@ -33,7 +33,14 @@ $(SRC_ROOT)/make/common/MakeBase.gmk \ # +# On macosx, file system timestamps only have 1 second resultion so must add +# sleeps to properly test dependencies. +ifeq ($(OPENJDK_BUILD_OS), macosx) + SLEEP_ON_MAC := sleep 1 +endif + OUTPUT_DIR := $(TESTMAKE_OUTPUTDIR)/make-base +$(call MakeDir, $(OUTPUT_DIR)) ################################################################################ # Escape $ @@ -56,5 +63,124 @@ TEST_TARGETS += $(ESCAPE_DOLLAR_DIR)/_escape_dollar ################################################################################ +# Test Equals + +EQUALS_VALUE1 := value1$(SPACE) +EQUALS_VALUE2 := value2 + +ifneq ($(call equals, $(EQUALS_VALUE1), $(EQUALS_VALUE2)), ) + $(error The strings >$(EQUALS_VALUE1)< and >$(EQUALS_VALUE2)< are equal) +endif + +ifeq ($(call equals, $(EQUALS_VALUE1), $(EQUALS_VALUE1)), ) + $(error The strings >$(EQUALS_VALUE1)< and >$(EQUALS_VALUE1)< are not equal) +endif + +################################################################################ +# Test ShellQuote + +SHELL_QUOTE_VALUE := foo '""' "''" bar +SHELL_QUOTE_RESULT := $(shell $(ECHO) $(call ShellQuote, \ + $(SHELL_QUOTE_VALUE))) + +ifneq ($(SHELL_QUOTE_VALUE), $(SHELL_QUOTE_RESULT)) + $(error Expected: >$(SHELL_QUOTE_VALUE)< - Result: >$(SHELL_QUOTE_RESULT)<) +endif + +################################################################################ +# Test read and write to file + +READ_WRITE_FILE := $(OUTPUT_DIR)/read-write +READ_WRITE_VALUE := foo '""' "''" \t\n\\ bar +$(call WriteFile, $(READ_WRITE_VALUE), $(READ_WRITE_FILE)) +READ_WRITE_RESULT := $(call ReadFile, $(READ_WRITE_FILE)) + +ifneq ($(READ_WRITE_VALUE), $(READ_WRITE_RESULT)) + $(error Expected: >$(READ_WRITE_VALUE)< - Result: >$(READ_WRITE_RESULT)<) +endif + +################################################################################ +# Test creating dependencies on make variables + +VARDEP_DIR := $(OUTPUT_DIR)/vardep +VARDEP_SRC_FILE := $(VARDEP_DIR)/src-file +VARDEP_TARGET_FILE := $(VARDEP_DIR)/target-file +VARDEP_FLAG_FILE := $(VARDEP_DIR)/flag-file + +$(VARDEP_DIR)/src-file: + $(MKDIR) -p $(@D) + $(ECHO) "some string XXX" > $@ + +$(VARDEP_TARGET_FILE): $(VARDEP_DIR)/src-file \ + $(call DependOnVariable, VARDEP_TEST_VAR) + $(MKDIR) -p $(@D) + $(SED) -e 's/XXX/$(VARDEP_TEST_VAR)/g' $< > $@ + $(TOUCH) $(VARDEP_FLAG_FILE) + +test-vardep: + $(RM) $(VARDEP_SRC_FILE) $(VARDEP_TARGET_FILE) $(VARDEP_FLAG_FILE) + # + # Simply create the target file and verify that it has the correct value + # + $(MAKE) -f $(THIS_FILE) VARDEP_TEST_VAR=value1 $(VARDEP_TARGET_FILE) + $(PRINTF) "Expecting value1: %s\n" "`$(CAT) $(VARDEP_DIR)/target-file`" + test "some string value1" = "`$(CAT) $(VARDEP_DIR)/target-file`" + test -e $(VARDEP_FLAG_FILE) + # + # Make the target file again and verify that the value is updated with + # the new value + # + $(SLEEP_ON_MAC) + $(MAKE) -f $(THIS_FILE) VARDEP_TEST_VAR=value2 $(VARDEP_TARGET_FILE) + $(PRINTF) "Expecting value2: %s\n" "`$(CAT) $(VARDEP_DIR)/target-file`" + test "some string value2" = "`$(CAT) $(VARDEP_DIR)/target-file`" + test -e $(VARDEP_FLAG_FILE) + # + # Make the target again with the same value and verify that the recipe + # was never run by checking that the flag file was not recreated + # + $(SLEEP_ON_MAC) + $(RM) $(VARDEP_FLAG_FILE) + $(MAKE) -f $(THIS_FILE) VARDEP_TEST_VAR=value2 $(VARDEP_TARGET_FILE) + $(PRINTF) "Expecting value2: %s\n" "`$(CAT) $(VARDEP_DIR)/target-file`" + test "some string value2" = "`$(CAT) $(VARDEP_DIR)/target-file`" + test ! -e $(VARDEP_FLAG_FILE) + # + # Test running with spaces at the end and the middle of the value + # and verify that the file isn't rewritten the second time + # + $(MAKE) -f $(THIS_FILE) VARDEP_TEST_VAR="value3 foo " $(VARDEP_TARGET_FILE) + $(RM) $(VARDEP_FLAG_FILE) + $(MAKE) -f $(THIS_FILE) VARDEP_TEST_VAR="value3 foo" $(VARDEP_TARGET_FILE) + test ! -e $(VARDEP_FLAG_FILE) + $(MAKE) -f $(THIS_FILE) VARDEP_TEST_VAR=" value3 foo" $(VARDEP_TARGET_FILE) + test ! -e $(VARDEP_FLAG_FILE) + +# Test specifying a specific value file to store variable in +VARDEP_VALUE_FILE := $(VARDEP_DIR)/value-file +VARDEP_TEST_VAR2 := value3 + +VARDEP_RETURN_VALUE := $(call DependOnVariable, VARDEP_TEST_VAR2, $(VARDEP_VALUE_FILE)) +ifneq ($(VARDEP_VALUE_FILE), $(VARDEP_RETURN_VALUE)) + $(error Expected: $(VARDEP_VALUE_FILE) - DependOnVariable: $(VARDEP_RETURN_VALUE)) +endif +VARDEP_FILE_CONTENTS := $(shell $(CAT) $(VARDEP_VALUE_FILE)) +ifneq ($(VARDEP_TEST_VAR2), $(VARDEP_FILE_CONTENTS)) + $(error Expected: $(VARDEP_TEST_VAR2) - DependOnVariable file contained: \ + $(VARDEP_FILE_CONTENTS)) +endif + +# Test with a variable value containing some problematic characters +VARDEP_TEST_VAR3 := foo '""' "''" bar +VARDEP_VALUE_FILE := $(call DependOnVariable, VARDEP_TEST_VAR3) +VARDEP_FILE_CONTENTS := $(shell $(CAT) $(VARDEP_VALUE_FILE)) +ifneq ($(VARDEP_TEST_VAR3), $(VARDEP_FILE_CONTENTS)) + $(error Expected: >$(VARDEP_TEST_VAR3)< - DependOnVariable file contained: \ + >$(VARDEP_FILE_CONTENTS)<) +endif + +TEST_TARGETS += test-vardep + +################################################################################ all: $(TEST_TARGETS) ++++++ 0064e246d83f.tar.bz2 -> e0947f58c9c1.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/java-1_9_0-openjdk/0064e246d83f.tar.bz2 /work/SRC/openSUSE:Factory/.java-1_9_0-openjdk.new/e0947f58c9c1.tar.bz2 differ: char 11, line 1 ++++++ 0064e246d83f.tar.bz2 -> f6b8edd397ee.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/java-1_9_0-openjdk/0064e246d83f.tar.bz2 /work/SRC/openSUSE:Factory/.java-1_9_0-openjdk.new/f6b8edd397ee.tar.bz2 differ: char 11, line 1 ++++++ fix-system-jpeg-loading.patch ++++++ --- jdk9/jdk/make/lib/Awt2dLibraries.gmk 2015-02-06 00:43:20.000000000 +0100 +++ jdk9/jdk/make/lib/Awt2dLibraries.gmk 2015-02-17 16:35:03.242205439 +0100 @@ -476,7 +476,7 @@ ifeq ($(USE_EXTERNAL_LIBJPEG), true) LIBJPEG_LIBS := -ljpeg BUILD_LIBJAVAJPEG_INCLUDE_FILES := \ - imageIOJPEG.c \ + imageioJPEG.c \ jpegdecoder.c BUILD_LIBJAVAJPEG_HEADERS := else -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit systemd-ui for openSUSE:Factory
by root＠hilbert.suse.de 18 Feb '15

18 Feb '15

Hello community, here is the log from the commit of package systemd-ui for openSUSE:Factory checked in at 2015-02-18 11:39:48 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/systemd-ui (Old) and /work/SRC/openSUSE:Factory/.systemd-ui.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "systemd-ui" Changes: -------- --- /work/SRC/openSUSE:Factory/systemd-ui/systemd-ui.changes 2013-04-12 20:44:00.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.systemd-ui.new/systemd-ui.changes 2015-02-18 12:09:05.000000000 +0100 @@ -1,0 +2,11 @@ +Tue Feb 17 11:39:45 UTC 2015 - dimstar(a)opensuse.org + +- Update to version 3: + + systemadm: filter on slices and scopes too. + + Make various things resizable and scrollable. + + Update color scheme. + + gnome-ask-password-agent updates. +- Add systemd-ui-notification-clarification.patch. +- Drop fix-desktop.patch: fixed upstream. + +------------------------------------------------------------------- Old: ---- fix-desktop.patch systemd-ui-2.tar.xz New: ---- systemd-ui-3.tar.xz systemd-ui-notification-clarification.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ systemd-ui.spec ++++++ --- /var/tmp/diff_new_pack.QwNaeB/_old 2015-02-18 12:09:06.000000000 +0100 +++ /var/tmp/diff_new_pack.QwNaeB/_new 2015-02-18 12:09:06.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package systemd-ui # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,11 +18,12 @@ Name: systemd-ui Url: http://www.freedesktop.org/wiki/Software/systemd -Version: 2 +Version: 3 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: autoconf BuildRequires: automake +BuildRequires: update-desktop-files BuildRequires: vala-devel BuildRequires: xz BuildRequires: pkgconfig(dbus-1) >= 1.3.2 @@ -43,8 +44,8 @@ # Never add any patches to this package without the upstream commit id # in the patch. Any patches added here without a very good reason to make # an exception will be silently removed with the next version update. -# PATCH-FIX-UPSTREAM fix-desktop.patch fcrozat(a)suse.com -- Fix missing categories and GenericName -Patch0: fix-desktop.patch +# PATCH-FIX-UPSTREAM systemd-ui-notification-clarification.patch dimstar(a)opensuse.org -- Fix ambiguity between `GLib.Notification' and `Notify.Notification' +Patch0: systemd-ui-notification-clarification.patch %description Graphical front-end for systemd system and service manager. @@ -62,6 +63,7 @@ %install %makeinstall +%suse_update_desktop_file systemadm -r System Monitor %clean rm -rf %{buildroot} ++++++ systemd-ui-2.tar.xz -> systemd-ui-3.tar.xz ++++++ ++++ 17487 lines of diff (skipped) ++++++ systemd-ui-notification-clarification.patch ++++++ >From 282a352dff49c13e185d826af2a248b55988bc32 Mon Sep 17 00:00:00 2001 From: Michael Biebl <biebl(a)debian.org> Date: Tue, 29 Apr 2014 22:20:51 +0200 Subject: Fix ambiguity between `GLib.Notification' and `Notify.Notification' Notification is both defined by Notify and the latest GLib, resulting in a build failure. Use Notify.Notification instead to avoid this ambiguity. Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=746130 diff --git a/src/gnome-ask-password-agent.vala b/src/gnome-ask-password-agent.vala index 571cd94..f3887dd 100644 --- a/src/gnome-ask-password-agent.vala +++ b/src/gnome-ask-password-agent.vala @@ -80,7 +80,7 @@ public class MyStatusIcon : StatusIcon { string socket; PasswordDialog password_dialog; - Notification n; + Notify.Notification n; public MyStatusIcon() throws GLib.Error { GLib.Object(icon_name : "dialog-password"); @@ -183,7 +183,7 @@ public class MyStatusIcon : StatusIcon { } set_from_icon_name(icon); - n = new Notification(title, message, icon); + n = new Notify.Notification(title, message, icon); n.set_timeout(5000); n.closed.connect(() => { set_visible(true); -- cgit v0.10.2 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit lynis for openSUSE:Factory
by root＠hilbert.suse.de 18 Feb '15

18 Feb '15

Hello community, here is the log from the commit of package lynis for openSUSE:Factory checked in at 2015-02-18 11:39:45 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/lynis (Old) and /work/SRC/openSUSE:Factory/.lynis.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "lynis" Changes: -------- --- /work/SRC/openSUSE:Factory/lynis/lynis.changes 2014-12-21 12:04:28.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.lynis.new/lynis.changes 2015-02-18 12:09:04.000000000 +0100 @@ -1,0 +2,57 @@ +Tue Feb 17 12:32:20 UTC 2015 - astieger(a)suse.com + +- lynis 1.6.4: + * New: + + Boot loader detection for AIX + + Detection of getcap and lsvg binary + + Added filesystem_ext to report + + Detect rootsh + * Changes: + + Hide errors when RPM database is faulty and show suggestion instead + + Allow OpenBSD to gather information on listening network ports + + Don't trigger warning for Shellshock when doing segfault test + + Do not run Apache test on OpenBSD and strip control chars + + Extended AIDE test with configuration validation test + + Improved Shellshock test regarding non-Linux support + + Added support for gathering volume groups on AIX + + Properly parse PAM lines and add them to report + + Support for boot loader detection on OpenBSD + + Added uptime detection for OpenBSD systems + + Support for volume groups on AIX + + Redirect errors when searching for readlink binary +- includes changes from 1.6.3: + * New: + + Added tests for Shellshock bash vulnerability + + Added test to determine if Snoopy is used + + New test for qdaemon configuration file + + Test for GRUB boot loader password + + New test for qdaemon printer jobs + + Added ClamXav test for Mac OS X + + Gentoo vulnerable packages test + + New test for qdaemon status + + Gentoo package listing + + Running Lynis without root permissions will start non-privileged scan + + Systemd service and timer example file added + + Added grub2-install to binaries + * Changes: + + Adjustments so insecure SSL protocols are detected in nginx config + + Directories will be skipped when searching for nginx log files + + Only gather unique name servers from /etc/resolv.conf + + Properly detect mod_evasive on Gentoo and others + + Improved swap partition detection in /etc/fstab + + Improvements to kernel detection (e.g. Gentoo) + + Test for built-in security options in YUM + + Improved boot loader detection for GRUB2 + + Split GRUB test into two tests + + Added Mac OS uptime check + + Improved GetHostID function for systems having only ip binary + + Improved testing for symlinked binary directories + + Minor adjustments to log output + + Renamed dev directory to extras +- verify source signature +- adjust permissions of items in /usr/share/lynis/include/consts + to match those requested by main executable +- run spec_cleaner + + +------------------------------------------------------------------- Old: ---- lynis-1.6.2.tar.gz New: ---- lynis-1.6.4.tar.gz lynis-1.6.4.tar.gz.asc lynis.keyring ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lynis.spec ++++++ --- /var/tmp/diff_new_pack.LLt4Nl/_old 2015-02-18 12:09:05.000000000 +0100 +++ /var/tmp/diff_new_pack.LLt4Nl/_new 2015-02-18 12:09:05.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package lynis # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2009-2013 Sascha Manns <saigkill(a)opensuse.org> # # All modifications and additions to the file contributed by third parties @@ -19,20 +19,18 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - -%define _includedir /usr/share/lynis/include -%define _pluginsdir /usr/share/lynis/plugins -%define _dbdir /usr/share/lynis/db -%define _bindir /usr/bin - +%define _includedir %{_datadir}/lynis/include +%define _pluginsdir %{_datadir}/lynis/plugins +%define _dbdir %{_datadir}/lynis/db +%define _bindir %{_prefix}/bin Name: lynis -Version: 1.6.2 -Release: 1 +Version: 1.6.4 +Release: 0 Summary: Security and System auditing tool License: GPL-3.0 Group: System/Monitoring -Url: http://www.rootkit.nl/projects/lynis.html -Source0: http://cisofy.com/files/%{name}-%{version}.tar.gz +Url: https://cisofy.com/lynis/ +Source0: https://cisofy.com/files/%{name}-%{version}.tar.gz Source1: default.prf Source2: tests_binary_rpath Source3: tests_file_permissionsDB @@ -45,6 +43,8 @@ Source10: prepare_for_suse.sh Source11: dbus-whitelist.db.openSUSE_12.2_x86_64 Source12: fileperms.db.openSUSE_12.2_x86_64 +Source13: https://cisofy.com/files/%{name}-%{version}.tar.gz.asc +Source14: https://cisofy.com/files/cisofy-software.pub#/%{name}.keyring # PATCH-OPENSUSE-FIX -- thomas(a)novell.com - modifying for openSUSE Patch0: %{name}_1.3.5_lynis.diff # PATCH-OPENSUSE-FIX -- thomas(a)novell.com - modifying for openSUSE @@ -52,13 +52,14 @@ Patch5: %{name}_1.3.6_include-osdetection.diff BuildRequires: gcc-c++ BuildRequires: libxml2-devel -PreReq: %fillup_prereq Requires: bash Requires: cron Requires: findutils Requires: logrotate Requires: netcfg Requires: wget +# FIXME: use proper Requires(pre/post/preun/...) +PreReq: %fillup_prereq BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch @@ -72,8 +73,6 @@ Lynis is released as a GPL licensed project and free for everyone to use. -See http://www.rootkit.nl for a full description and documentation. - %prep %setup -q -n %{name} %patch0 @@ -85,35 +84,35 @@ %install # Install Profile (default.prf) -%__install -d %{buildroot}%{_sysconfdir}/%{name} -%__install -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/%{name}/default.prf +install -d %{buildroot}%{_sysconfdir}/%{name} +install -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/%{name}/default.prf # install binary -%__install -d %{buildroot}%{_bindir} -%__install -d %{buildroot}%{_datadir}/%{name} -%__install %{name} %{buildroot}%{_bindir} -%__install %{SOURCE10} %{buildroot}%{_datadir}/%{name} +install -d %{buildroot}%{_bindir} +install -d %{buildroot}%{_datadir}/%{name} +install %{name} %{buildroot}%{_bindir} +install %{SOURCE10} %{buildroot}%{_datadir}/%{name} # install man-page -%__install -d %{buildroot}%{_mandir}/man8 -%__install -pm 644 %{name}.8 %{buildroot}%{_mandir}/man8 +install -d %{buildroot}%{_mandir}/man8 +install -pm 644 %{name}.8 %{buildroot}%{_mandir}/man8 # install functions/includes -%__install -d %{buildroot}%{_includedir} -%__install include/* %{buildroot}%{_includedir} -%__install %{SOURCE2} %{buildroot}%{_includedir} -%__install %{SOURCE3} %{buildroot}%{_includedir} -%__install %{SOURCE4} %{buildroot}%{_includedir} -%__install %{SOURCE5} %{buildroot}%{_includedir} -%__install %{SOURCE6} %{buildroot}%{_includedir} -%__install %{SOURCE7} %{buildroot}%{_includedir} -%__install %{SOURCE8} %{buildroot}%{_includedir} -%__install %{SOURCE9} %{buildroot}%{_includedir} +install -d %{buildroot}%{_includedir} +install include/* %{buildroot}%{_includedir} +install %{SOURCE2} %{buildroot}%{_includedir} +install %{SOURCE3} %{buildroot}%{_includedir} +install %{SOURCE4} %{buildroot}%{_includedir} +install %{SOURCE5} %{buildroot}%{_includedir} +install %{SOURCE6} %{buildroot}%{_includedir} +install %{SOURCE7} %{buildroot}%{_includedir} +install %{SOURCE8} %{buildroot}%{_includedir} +install %{SOURCE9} %{buildroot}%{_includedir} # install plugins -%__install -d %{buildroot}%{_pluginsdir} -%__install -pm 644 plugins/* %{buildroot}%{_pluginsdir} +install -d %{buildroot}%{_pluginsdir} +install -pm 644 plugins/* %{buildroot}%{_pluginsdir} # install database files -%__install -d %{buildroot}%{_dbdir} -%__install -pm 644 db/* %{buildroot}%{_dbdir} -%__install -pm 644 %{SOURCE11} %{buildroot}%{_dbdir}/dbus-whitelist.db -%__install -pm 644 %{SOURCE12} %{buildroot}%{_dbdir}/fileperms.db +install -d %{buildroot}%{_dbdir} +install -pm 644 db/* %{buildroot}%{_dbdir} +install -pm 644 %{SOURCE11} %{buildroot}%{_dbdir}/dbus-whitelist.db +install -pm 644 %{SOURCE12} %{buildroot}%{_dbdir}/fileperms.db #rm %{buildroot}%{_dbdir}/fileperms.db #ln -s $(basename %{SOURCE11}) %{_dbdir}/dbus-whitelist.db #ln -s $(basename %{SOURCE12}) %{_dbdir}/fileperms.db @@ -134,6 +133,7 @@ %dir %{_datadir}/%{name} %dir %{_datadir}/%{name}/db %dir %{_datadir}/%{name}/include +%attr(640,root,root) %{_datadir}/%{name}/include/* %dir %{_datadir}/%{name}/plugins %doc CHANGELOG FAQ LICENSE README %doc %{_mandir}/man8/%{name}.8.* ++++++ lynis-1.6.2.tar.gz -> lynis-1.6.4.tar.gz ++++++ ++++ 4005 lines of diff (skipped) ++++++ lynis_1.3.1_include_consts.diff ++++++ --- /var/tmp/diff_new_pack.LLt4Nl/_old 2015-02-18 12:09:05.000000000 +0100 +++ /var/tmp/diff_new_pack.LLt4Nl/_new 2015-02-18 12:09:05.000000000 +0100 @@ -2,7 +2,7 @@ =================================================================== --- include/consts.orig +++ include/consts -@@ -71,6 +71,7 @@ unset LANG +@@ -72,6 +72,7 @@ unset LANG CHKROOTKITBINARY="" CHKCONFIGBINARY="" FILEVALUE="" ++++++ lynis_1.3.5_lynis.diff ++++++ --- /var/tmp/diff_new_pack.LLt4Nl/_old 2015-02-18 12:09:05.000000000 +0100 +++ /var/tmp/diff_new_pack.LLt4Nl/_new 2015-02-18 12:09:05.000000000 +0100 @@ -2,7 +2,7 @@ =================================================================== --- lynis.orig +++ lynis -@@ -716,7 +716,9 @@ +@@ -707,7 +707,9 @@ webservers ssh snmp databases ldap php squid logging \ insecure_services banners scheduling accounting \ time crypto virtualization mac_frameworks file_integrity hardening_tools tooling \ -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit deepin-music-player for openSUSE:Factory
by root＠hilbert.suse.de 18 Feb '15

18 Feb '15

Hello community, here is the log from the commit of package deepin-music-player for openSUSE:Factory checked in at 2015-02-18 11:39:40 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/deepin-music-player (Old) and /work/SRC/openSUSE:Factory/.deepin-music-player.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "deepin-music-player" Changes: -------- --- /work/SRC/openSUSE:Factory/deepin-music-player/deepin-music-player.changes 2014-07-10 14:55:11.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.deepin-music-player.new/deepin-music-player.changes 2015-02-18 12:09:01.000000000 +0100 @@ -1,0 +2,8 @@ +Tue Feb 17 07:36:12 UTC 2015 - hillwood(a)linuxfans.org + +- Update to 2.0git20150204. + * add installation script +- remove deepin-music-player.desktop and deepin-music-player.png, + upstream have included it. + +------------------------------------------------------------------- Old: ---- deepin-music-player.desktop deepin-music-player.png deepin-music-player_1+git20140505155847~5e110e40b9.tar.gz New: ---- deepin-music-player_1.1+20150204093722~081154cf7b.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ deepin-music-player.spec ++++++ --- /var/tmp/diff_new_pack.dEjeKk/_old 2015-02-18 12:09:03.000000000 +0100 +++ /var/tmp/diff_new_pack.dEjeKk/_new 2015-02-18 12:09:03.000000000 +0100 @@ -1,8 +1,8 @@ # # spec file for package deepin-music-player # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. -# Copyright (c) 2014 Hillwood Yang <hillwood(a)linuxfans.org> +# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013-2015 Hillwood Yang <hillwood(a)opensuse.org> # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -21,13 +21,11 @@ Summary: Deepin Music Playe License: GPL-3.0+ Group: Productivity/Multimedia/Sound/Players -Version: 2.0git20140505 +Version: 2.0git20150204 Release: 0 BuildArch: noarch Url: https://github.com/linuxdeepin/deepin-music-player -Source0: http://packages.linuxdeepin.com/deepin/pool/main/d/deepin-music-player/deep… -Source1: deepin-music-player.desktop -Source2: deepin-music-player.png +Source0: http://packages.linuxdeepin.com/deepin/pool/main/d/deepin-music-player/deep… BuildRequires: fdupes BuildRequires: python-devel BuildRequires: update-desktop-files @@ -56,54 +54,30 @@ %lang_package %prep -%setup -q -n %{name}-1+git20140505155847~5e110e40b9 +%setup -q -n %{name}-1.1+20150204093722~081154cf7b %build -cd locale -msgfmt zh_CN.po -o zh_CN.mo -msgfmt zh_HK.po -o zh_HK.mo -msgfmt zh_TW.po -o zh_TW.mo -# msgfmt ru_RU.po -o ru_RU.mo +make %install -chmod 644 AUTHORS -chmod 644 COPYING -mkdir -p %{buildroot}/%{_datadir}/applications -mkdir -p %{buildroot}/%{_datadir}/icons -mkdir -p %{buildroot}/%{_datadir}/%{name} -mkdir -p %{buildroot}/%{_datadir}/locale/zh_CN/LC_MESSAGES/ -mkdir -p %{buildroot}/%{_datadir}/locale/zh_HK/LC_MESSAGES/ -mkdir -p %{buildroot}/%{_datadir}/locale/zh_TW/LC_MESSAGES/ -# mkdir -p %{buildroot}/%{_datadir}/locale/ru_RU/LC_MESSAGES/ -mkdir -p %{buildroot}/%{_bindir} -cp %{S:1} %{buildroot}/%{_datadir}/applications/ -cp %{S:2} %{buildroot}/%{_datadir}/icons/ -cp -R app_theme %{buildroot}/%{_datadir}/%{name} -cp -R skin %{buildroot}/%{_datadir}/%{name} -cp -R src %{buildroot}/%{_datadir}/%{name} -cp -R plugins %{buildroot}/%{_datadir}/%{name} -cp -R tools %{buildroot}/%{_datadir}/%{name} -cp -R wizard %{buildroot}/%{_datadir}/%{name} -cp -R image %{buildroot}/%{_datadir}/%{name} -cp locale/zh_CN.mo %{buildroot}/%{_datadir}/locale/zh_CN/LC_MESSAGES/%{name}.mo -cp locale/zh_HK.mo %{buildroot}/%{_datadir}/locale/zh_HK/LC_MESSAGES/%{name}.mo -cp locale/zh_TW.mo %{buildroot}/%{_datadir}/locale/zh_TW/LC_MESSAGES/%{name}.mo -# cp locale/ru_RU.mo %{buildroot}/%{_datadir}/locale/ru_RU/LC_MESSAGES/%{name}.mo +make install PREFIX=%{buildroot}/%{_prefix} %fdupes %{buildroot} %find_lang %{name} %suse_update_desktop_file -r %{name} Player AudioVideo -cd %{buildroot}/%{_bindir} -ln -s ../share/%{name}/src/main.py %{name} +# fix Symlink points +rm %{buildroot}%{_bindir}/%{name} +cd %{buildroot}%{_bindir}/ +ln -s ../share/deepin-music/src/main.py %{name} %files %defattr(-, root, root, -) %doc AUTHORS COPYING %{_datadir}/applications/%{name}.desktop -%{_datadir}/icons/%{name}.png -%{_datadir}/%{name} +%{_datadir}/deepin-music %{_bindir}/%{name} +%{_datadir}/icons/hicolor %files lang -f %{name}.lang -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit liblightgrep for openSUSE:Factory
by root＠hilbert.suse.de 18 Feb '15

18 Feb '15

Hello community, here is the log from the commit of package liblightgrep for openSUSE:Factory checked in at 2015-02-18 11:39:38 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/liblightgrep (Old) and /work/SRC/openSUSE:Factory/.liblightgrep.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "liblightgrep" Changes: -------- --- /work/SRC/openSUSE:Factory/liblightgrep/liblightgrep.changes 2014-01-06 17:45:23.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.liblightgrep.new/liblightgrep.changes 2015-02-18 12:09:00.000000000 +0100 @@ -1,0 +2,8 @@ +Tue Feb 17 00:30:14 UTC 2015 - p.drouand(a)gmail.com + +- Update to version 1.4 + * Significant performance improvements +- Point Url to the home page instead of README github file +- Add pkg-config requirement; new dependency + +------------------------------------------------------------------- Old: ---- liblightgrep-1.2.1.tar.gz New: ---- liblightgrep-1.4.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ liblightgrep.spec ++++++ --- /var/tmp/diff_new_pack.Qkx4m0/_old 2015-02-18 12:09:01.000000000 +0100 +++ /var/tmp/diff_new_pack.Qkx4m0/_new 2015-02-18 12:09:01.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package liblightgrep # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -20,16 +20,17 @@ Name: liblightgrep %define lname %{name}%soname -Version: 1.2.1 +Version: 1.4 Release: 0 Summary: Not the worst forensics regexp engine License: GPL-3.0+ Group: Productivity/File utilities -Url: https://github.com/jonstewart/liblightgrep#readme -# not yet released, using "git clone --recursive git://github.com/LightboxTech/liblightgrep.git" -# DL-URL: https://github.com/LightboxTech/liblightgrep/archive/v1.2.1.tar.gz -Source: liblightgrep-1.2.1.tar.gz -Patch: ppc64le.patch +Url: https://github.com/jonstewart/liblightgrep +# The original archive contains tests : 155MB. As we don't run them, save space by removing them : +# /pytest, /re_gen and /test +#Source: https://github.com/LightboxTech/liblightgrep/archive/v%{version}.tar.gz +Source: %{name}-%{version}.tar.xz +Patch0: ppc64le.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: bison @@ -37,6 +38,7 @@ BuildRequires: gcc-c++ BuildRequires: libicu-devel BuildRequires: libtool +BuildRequires: pkg-config # With v1.2.1, to run the %check section, you may need extra modules: # - Boost::asio # - Boost::chrono @@ -89,7 +91,7 @@ %prep %setup -q -%patch -p1 +%patch0 -p1 #The test file test_kilopattern.CPP breaks ARM builds find . -name 'test_kilopattern.CPP' -delete @@ -120,5 +122,6 @@ %doc README.md COPYING %{_includedir}/lightgrep/ %{_libdir}/liblightgrep.so +%{_libdir}/pkgconfig/lightgrep.pc %changelog -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit java-1_8_0-openjdk for openSUSE:Factory
by root＠hilbert.suse.de 18 Feb '15

18 Feb '15

Hello community, here is the log from the commit of package java-1_8_0-openjdk for openSUSE:Factory checked in at 2015-02-18 11:39:37 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/java-1_8_0-openjdk (Old) and /work/SRC/openSUSE:Factory/.java-1_8_0-openjdk.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "java-1_8_0-openjdk" Changes: -------- --- /work/SRC/openSUSE:Factory/java-1_8_0-openjdk/java-1_8_0-openjdk.changes 2015-02-16 21:47:22.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.java-1_8_0-openjdk.new/java-1_8_0-openjdk.changes 2015-02-18 12:08:57.000000000 +0100 @@ -1,0 +2,8 @@ +Tue Feb 17 12:58:49 UTC 2015 - fstrba(a)suse.com + +- Modified patch + * system-libjpeg.patch + - correct the case mismatch that prevented JPEG decoder from + working correctly (bnc#905950) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ system-libjpeg.patch ++++++ --- /var/tmp/diff_new_pack.PEtYna/_old 2015-02-18 12:09:00.000000000 +0100 +++ /var/tmp/diff_new_pack.PEtYna/_new 2015-02-18 12:09:00.000000000 +0100 @@ -1,5 +1,5 @@ ---- jdk8/common/autoconf/libraries.m4 2014-09-26 08:39:36.237838684 +0200 -+++ jdk8/common/autoconf/libraries.m4 2014-09-26 08:40:42.582300554 +0200 +--- jdk8/common/autoconf/libraries.m4 2015-02-17 13:27:11.468829365 +0100 ++++ jdk8/common/autoconf/libraries.m4 2015-02-17 13:27:49.143980484 +0100 @@ -608,11 +608,36 @@ # Check for the jpeg library # @@ -41,8 +41,8 @@ AC_SUBST(USE_EXTERNAL_LIBJPEG) ############################################################################### ---- jdk8/jdk/make/lib/Awt2dLibraries.gmk 2014-09-26 08:39:35.205862611 +0200 -+++ jdk8/jdk/make/lib/Awt2dLibraries.gmk 2014-09-26 08:40:42.583300530 +0200 +--- jdk8/jdk/make/lib/Awt2dLibraries.gmk 2015-02-17 13:25:22.125292473 +0100 ++++ jdk8/jdk/make/lib/Awt2dLibraries.gmk 2015-02-17 13:28:30.812041352 +0100 @@ -704,18 +704,20 @@ ########################################################################################## @@ -70,7 +70,7 @@ endif endif -@@ -730,37 +732,50 @@ +@@ -730,37 +733,50 @@ # $(shell $(EXPR) $(CC_MAJORVER) \> 4 \| \ # $ $(CC_MAJORVER) = 4 \& $(CC_MINORVER) \>= 3 $ ) # ifeq ($(CC_43_OR_NEWER), 1) @@ -84,7 +84,7 @@ +ifeq ($(USE_EXTERNAL_LIBJPEG), true) + LIBJPEG_LIBS := -ljpeg + BUILD_LIBJAVAJPEG_INCLUDE_FILES := \ -+ imageIOJPEG.c \ ++ imageioJPEG.c \ + jpegdecoder.c + BUILD_LIBJAVAJPEG_HEADERS := +else @@ -135,7 +135,7 @@ ########################################################################################## -@@ -1206,6 +1221,13 @@ +@@ -1206,6 +1222,13 @@ GIFLIB_CFLAGS := -I$(JDK_TOPDIR)/src/share/native/sun/awt/giflib endif @@ -149,7 +149,7 @@ ifneq ($(OPENJDK_TARGET_OS), macosx) LIBSPLASHSCREEN_DIRS += $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/awt/splashscreen else -@@ -1268,11 +1290,13 @@ +@@ -1268,11 +1291,13 @@ EXCLUDE_FILES := imageioJPEG.c jpegdecoder.c pngtest.c, \ LANG := C, \ OPTIMIZATION := LOW, \ @@ -165,8 +165,8 @@ LDFLAGS_SUFFIX_solaris := -lc, \ VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \ RC_FLAGS := $(RC_FLAGS) \ ---- jdk8/jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageReader.java 2014-09-26 08:39:35.086865370 +0200 -+++ jdk8/jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageReader.java 2014-09-26 08:40:42.583300530 +0200 +--- jdk8/jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageReader.java 2015-02-17 13:25:22.295288644 +0100 ++++ jdk8/jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageReader.java 2015-02-17 13:27:49.145980439 +0100 @@ -89,7 +89,7 @@ java.security.AccessController.doPrivileged( new java.security.PrivilegedAction<Void>() { @@ -176,8 +176,8 @@ return null; } }); ---- jdk8/jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageWriter.java 2014-09-26 08:39:35.086865370 +0200 -+++ jdk8/jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageWriter.java 2014-09-26 08:40:42.584300507 +0200 +--- jdk8/jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageWriter.java 2015-02-17 13:25:22.295288644 +0100 ++++ jdk8/jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageWriter.java 2015-02-17 13:27:49.145980439 +0100 @@ -179,7 +179,7 @@ java.security.AccessController.doPrivileged( new java.security.PrivilegedAction<Void>() { @@ -187,8 +187,8 @@ return null; } }); ---- jdk8/jdk/src/share/classes/sun/awt/image/JPEGImageDecoder.java 2014-09-26 08:39:34.084888603 +0200 -+++ jdk8/jdk/src/share/classes/sun/awt/image/JPEGImageDecoder.java 2014-09-26 08:40:42.584300507 +0200 +--- jdk8/jdk/src/share/classes/sun/awt/image/JPEGImageDecoder.java 2015-02-17 13:25:22.170291459 +0100 ++++ jdk8/jdk/src/share/classes/sun/awt/image/JPEGImageDecoder.java 2015-02-17 13:27:49.146980416 +0100 @@ -56,7 +56,7 @@ java.security.AccessController.doPrivileged( new java.security.PrivilegedAction<Void>() { @@ -198,8 +198,8 @@ return null; } }); ---- jdk8/jdk/src/share/native/sun/awt/image/jpeg/imageioJPEG.c 2014-09-26 08:39:35.138864165 +0200 -+++ jdk8/jdk/src/share/native/sun/awt/image/jpeg/imageioJPEG.c 2014-09-26 08:40:42.584300507 +0200 +--- jdk8/jdk/src/share/native/sun/awt/image/jpeg/imageioJPEG.c 2015-02-17 13:25:22.531283329 +0100 ++++ jdk8/jdk/src/share/native/sun/awt/image/jpeg/imageioJPEG.c 2015-02-17 13:27:49.146980416 +0100 @@ -51,7 +51,7 @@ /* headers from the JPEG library */ @@ -209,8 +209,8 @@ #undef MAX #define MAX(a,b) ((a) > (b) ? (a) : (b)) ---- jdk8/jdk/src/share/native/sun/awt/splashscreen/splashscreen_jpeg.c 2014-09-26 08:39:35.138864165 +0200 -+++ jdk8/jdk/src/share/native/sun/awt/splashscreen/splashscreen_jpeg.c 2014-09-26 08:40:42.584300507 +0200 +--- jdk8/jdk/src/share/native/sun/awt/splashscreen/splashscreen_jpeg.c 2015-02-17 13:25:22.539283148 +0100 ++++ jdk8/jdk/src/share/native/sun/awt/splashscreen/splashscreen_jpeg.c 2015-02-17 13:27:49.147980394 +0100 @@ -25,9 +25,9 @@ #include "splashscreen_impl.h" -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libqt5-qtconnectivity for openSUSE:Factory
by root＠hilbert.suse.de 18 Feb '15

18 Feb '15

Hello community, here is the log from the commit of package libqt5-qtconnectivity for openSUSE:Factory checked in at 2015-02-18 11:39:35 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libqt5-qtconnectivity (Old) and /work/SRC/openSUSE:Factory/.libqt5-qtconnectivity.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libqt5-qtconnectivity" Changes: -------- --- /work/SRC/openSUSE:Factory/libqt5-qtconnectivity/libqt5-qtconnectivity.changes 2015-01-08 23:01:45.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libqt5-qtconnectivity.new/libqt5-qtconnectivity.changes 2015-02-18 12:08:56.000000000 +0100 @@ -1,0 +2,6 @@ +Mon Feb 16 11:57:46 UTC 2015 - schwab(a)suse.de + +- endian.patch: Use proper endian conversion functions + (https://codereview.qt-project.org/#/c/106263/) + +------------------------------------------------------------------- New: ---- endian.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libqt5-qtconnectivity.spec ++++++ --- /var/tmp/diff_new_pack.hKZOhY/_old 2015-02-18 12:08:57.000000000 +0100 +++ /var/tmp/diff_new_pack.hKZOhY/_new 2015-02-18 12:08:57.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package libqt5-qtconnectivity # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -31,6 +31,7 @@ Url: http://qt.digia.com Source: %{tar_version}.tar.xz Source1: baselibs.conf +Patch: endian.patch BuildRequires: fdupes BuildRequires: libqt5-qtbase-devel BuildRequires: libqt5-qtbase-private-headers-devel @@ -48,6 +49,7 @@ %prep %setup -q -n qtconnectivity-opensource-src-%{real_version} +%patch -p1 %package -n %{libname} Summary: Qt 5 Bluez Addon ++++++ endian.patch ++++++ Index: qtconnectivity-opensource-src-5.4.0/src/bluetooth/bluez/bluez_data_p.h =================================================================== --- qtconnectivity-opensource-src-5.4.0.orig/src/bluetooth/bluez/bluez_data_p.h +++ qtconnectivity-opensource-src-5.4.0/src/bluetooth/bluez/bluez_data_p.h @@ -46,6 +46,7 @@ // #include <QtCore/qglobal.h> +#include <QtCore/qendian.h> #include <sys/socket.h> #include <QtBluetooth/QBluetoothUuid> @@ -96,12 +97,12 @@ struct bt_security { #define btohl(d) (d) #define btohll(d) (d) #elif __BYTE_ORDER == __BIG_ENDIAN -#define htobs(d) bswap_16(d) -#define htobl(d) bswap_32(d) -#define htobll(d) bswap_64(d) -#define btohs(d) bswap_16(d) -#define btohl(d) bswap_32(d) -#define btohll(d) bswap_64(d) +#define htobs(d) qbswap((quint16)(d)) +#define htobl(d) qbswap((quint32)(d)) +#define htobll(d) qbswap((quint64)(d)) +#define btohs(d) qbswap((quint16)(d)) +#define btohl(d) qbswap((quint32)(d)) +#define btohll(d) qbswap((quint64)(d)) #else #error "Unknown byte order" #endif @@ -167,9 +168,9 @@ static inline uint16_t bt_get_le16(const return bt_get_unaligned((const uint16_t *) ptr); } #elif __BYTE_ORDER == __BIG_ENDIAN -static inline uint16_t bt_get_le16(const void *ptr) +static inline quint16 bt_get_le16(const void *ptr) { - return bswap_16(bt_get_unaligned((const uint16_t *) ptr)); + return qbswap(bt_get_unaligned((const quint16 *) ptr)); } static inline void btoh128(const quint128 *src, quint128 *dst) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit haproxy for openSUSE:Factory
by root＠hilbert.suse.de 18 Feb '15

18 Feb '15

Hello community, here is the log from the commit of package haproxy for openSUSE:Factory checked in at 2015-02-18 11:39:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/haproxy (Old) and /work/SRC/openSUSE:Factory/.haproxy.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "haproxy" Changes: -------- --- /work/SRC/openSUSE:Factory/haproxy/haproxy.changes 2015-02-03 15:35:28.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.haproxy.new/haproxy.changes 2015-02-18 12:08:55.000000000 +0100 @@ -1,0 +2,13 @@ +Wed Feb 11 12:38:06 GMT 2015 - aspiers(a)suse.com + +- haproxy.init: fix reload and force-reload not to start a stopped + service + +------------------------------------------------------------------- +Fri Feb 6 18:47:17 UTC 2015 - mrueckert(a)suse.de + +- pulled 2 patches from upstream: + 0001-BUG-MINOR-pattern-error-message-missing.patch + 0002-BUG-MEDIUM-pattern-some-entries-are-not-deleted-with.patch + +------------------------------------------------------------------- New: ---- 0001-BUG-MINOR-pattern-error-message-missing.patch 0002-BUG-MEDIUM-pattern-some-entries-are-not-deleted-with.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ haproxy.spec ++++++ --- /var/tmp/diff_new_pack.GTKmz3/_old 2015-02-18 12:08:56.000000000 +0100 +++ /var/tmp/diff_new_pack.GTKmz3/_new 2015-02-18 12:08:56.000000000 +0100 @@ -61,6 +61,8 @@ Patch2: haproxy-makefile_lib.patch Patch3: sec-options.patch Patch4: haproxy-1.5.8-fix-bashisms.patch +Patch5: 0001-BUG-MINOR-pattern-error-message-missing.patch +Patch6: 0002-BUG-MEDIUM-pattern-some-entries-are-not-deleted-with.patch # Source99: haproxy-rpmlintrc # @@ -95,6 +97,8 @@ %patch2 %patch3 %patch4 -p1 +%patch5 -p1 +%patch6 -p1 %build %{__make} \ ++++++ 0001-BUG-MINOR-pattern-error-message-missing.patch ++++++ >From e338a8741983acc9a4501a03ecd593d89e6fade3 Mon Sep 17 00:00:00 2001 From: Thierry FOURNIER <tfournier(a)exceliance.fr> Date: Fri, 6 Feb 2015 17:50:55 +0100 Subject: [PATCH 1/2] BUG/MINOR: pattern: error message missing This patch must be backported in 1.5 version. (cherry picked from commit 8aa8384e22dd0b66ded00c70a9c6034278b4bb69) --- src/pattern.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/pattern.c b/src/pattern.c index 208e33a..a6fc52d 100644 --- a/src/pattern.c +++ b/src/pattern.c @@ -989,8 +989,10 @@ int pat_idx_list_ptr(struct pattern_expr *expr, struct pattern *pat, char **err) /* allocate pattern */ patl = calloc(1, sizeof(*patl)); - if (!patl) + if (!patl) { + memprintf(err, "out of memory while indexing pattern"); return 0; + } /* duplicate pattern */ memcpy(&patl->pat, pat, sizeof(*pat)); -- 2.1.4 ++++++ 0002-BUG-MEDIUM-pattern-some-entries-are-not-deleted-with.patch ++++++ >From 623401b983185c1e0f6507e96557de3bc46fd41b Mon Sep 17 00:00:00 2001 From: Thierry FOURNIER <tfournier(a)exceliance.fr> Date: Fri, 6 Feb 2015 17:53:54 +0100 Subject: [PATCH 2/2] BUG/MEDIUM: pattern: some entries are not deleted with case insensitive match ACL or map entries are not deleted with the command "del acl" or "del map" if the case insentive flag is set. This is because the the case insensitive string are stored in a list and the default delete function associated with string looks in a tree. I add a check of the case insensitive flag and execute the delete function for lists if it is set. This patch must be backported in 1.5 version. (cherry picked from commit 73bc285be194f443dc7eab9c949e87e1dbe8f70c) --- src/pattern.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/pattern.c b/src/pattern.c index a6fc52d..b19ffe2 100644 --- a/src/pattern.c +++ b/src/pattern.c @@ -1308,6 +1308,10 @@ void pat_del_tree_str(struct pattern_expr *expr, struct pat_ref_elt *ref) struct ebmb_node *node, *next_node; struct pattern_tree *elt; + /* If the flag PAT_F_IGNORE_CASE is set, we cannot use trees */ + if (expr->mflags & PAT_MF_IGNORE_CASE) + return pat_del_list_ptr(expr, ref); + /* browse each node of the tree. */ for (node = ebmb_first(&expr->pattern_tree), next_node = node ? ebmb_next(node) : NULL; node; -- 2.1.4 ++++++ haproxy.init ++++++ --- /var/tmp/diff_new_pack.GTKmz3/_old 2015-02-18 12:08:56.000000000 +0100 +++ /var/tmp/diff_new_pack.GTKmz3/_new 2015-02-18 12:08:56.000000000 +0100 @@ -205,14 +205,12 @@ rc_status -v ;; reload|force-reload) - ## Like force-reload, but if daemon does not support - ## signaling, do nothing (!) - - haproxy_check - # If it supports signaling: - echo -n "Reload service haproxy " - $HAPROXY_BIN -p $HAPROXY_PID -D -f $HAPROXY_CONF -sf $(cat $HAPROXY_PID) - rc_status -v + if checkproc -p $HAPROXY_PID $HAPROXY_BIN; then + haproxy_check + echo -n "Reload service haproxy " + $HAPROXY_BIN -p $HAPROXY_PID -D -f $HAPROXY_CONF -sf $(cat $HAPROXY_PID) + rc_status -v + fi ;; status) echo -n "Checking for service haproxy " -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit python3-testtools for openSUSE:Factory
by root＠hilbert.suse.de 18 Feb '15

18 Feb '15

Hello community, here is the log from the commit of package python3-testtools for openSUSE:Factory checked in at 2015-02-18 11:39:32 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python3-testtools (Old) and /work/SRC/openSUSE:Factory/.python3-testtools.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python3-testtools" Changes: -------- --- /work/SRC/openSUSE:Factory/python3-testtools/python3-testtools.changes 2015-01-22 21:50:18.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.python3-testtools.new/python3-testtools.changes 2015-02-18 12:08:54.000000000 +0100 @@ -1,0 +2,104 @@ +Sun Jan 25 01:50:02 UTC 2015 - arun(a)gmx.de + +- specfile: + * added unittest2, setuptools requirement + * remove ifdefs to run tests + +- update to version 1.5.0: + * When an import error happens "testtools.run" will now show the + full error rather than just the name of the module that failed to + import. (Robert Collins) + +- changes from version 1.4.0: + * "testtools.TestCase" now inherits from unittest2.TestCase, which + provides a "setUpClass" for upcalls on Python 2.6. (Robert + Collins, #1393283) + +- changes from version 1.3.0: + * Fixed our setup.py to use setup_requires to ensure the import + dependencies for testtools are present before setup.py runs (as + setup.py imports testtools to read out the version + number). (Robert Collins) + * Support setUpClass skipping with self.skipException. Previously + this worked with unittest from 2.7 and above but was not supported + by testtools - it was a happy accident. Since we now hard depend + on unittest2, we need to invert our exception lookup priorities to + support it. Regular skips done through raise self.skipException + will continue to work, since they were always caught in our code - + its because the suite type being used to implement setUpClass has + changed that an issue occured. (Robert Collins, #1393068) + +- changes from version 1.2.1: + * Correctly express our unittest2 dependency: we don't work with old + releases. (Robert Collins) + +- changes from version 1.2.0: + * Depends on unittest2 for discovery functionality and the + "TestProgram" base class. This brings in many fixes made to + discovery where previously we were only using the discovery + package or the version in the release of Python that the test + execution was occuring on. (Robert Collins, #1271133) + * Fixed unit tests which were failing under pypy due to a change in + the way pypy formats tracebacks. (Thomi Richards) + * Fixed the testtools test suite to run correctly when run via + "unit2" or "testtools.run discover". + * Make `testtools.content.text_content` error if anything other than + text is given as content. (Thomi Richards) + * We now publish wheels of testtools. (Robert Collins, #issue84) + +- changes from version 1.1.0: + * Exceptions in a "fixture.getDetails" method will no longer mask + errors raised from the same fixture's "setUp" method. (Robert + Collins, #1368440) + +- changes from version 1.0.0: + * Fix a long-standing bug where tearDown and cleanUps would not be + called if the test run was interrupted. This should fix leaking + external resources from interrupted tests. (Robert Collins, + #1364188) + * Fix a long-standing bug where calling sys.exit(0) from within a + test would cause the test suite to exit with 0, without reporting + a failure of that test. We still allow the test suite to be exited + (since catching higher order exceptions requires exceptional + circumstances) but we now call a last-resort handler on the + TestCase, resulting in an error being reported for the test. + (Robert Collins, #1364188) + * Fix an issue where tests skipped with the "skip"* family of + decorators would still have their "setUp" and "tearDown" + functions called. (Thomi Richards, + #https://github.com/testing-cabal/testtools/issues/86) + * We have adopted a formal backwards compatibility statement (see + hacking.rst) (Robert Collins) + +- changes from version 0.9.39: + * Brown paper bag release - 0.9.38 was broken for some users, + _jython_aware_splitext was not defined entirely compatibly. + (Robert Collins, + #https://github.com/testing-cabal/testtools/issues/100) + +- changes from version 0.9.38: + * Discovery import error detection wasn't implemented for python 2.6 + (the 'discover' module). (Robert Collins) + * Discovery now executes load_tests (if present) in __init__ in all + packages. (Robert Collins, http://bugs.python.org/issue16662) + +- changes from version 0.9.37: + * "stdout" is now correctly honoured on "run.TestProgram" - + before the runner objects would be created with no stdout + parameter. If construction fails, the previous parameter list is + attempted, permitting compatibility with Runner classes that don't + accept stdout as a parameter. (Robert Collins) + * The "ExtendedToStreamDecorator" now handles content objects with + one less packet - the last packet of the source content is sent + with EOF set rather than an empty packet with EOF set being sent + after the last packet of the source content. (Robert Collins) + +- changes from version 0.9.36: + * Error if "setUp" or "tearDown" are called twice. (Robert + Collins, #882884) + * Make testtools compatible with the "unittest.expectedFailure" + decorator in Python 3.4. (Thomi Richards) + * Introduce the assert_that function, which allows matchers to be + used independent of testtools.TestCase. (Daniel Watkins, #1243834) + +------------------------------------------------------------------- Old: ---- testtools-0.9.35.tar.gz New: ---- testtools-1.5.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python3-testtools.spec ++++++ --- /var/tmp/diff_new_pack.ZqhrdT/_old 2015-02-18 12:08:55.000000000 +0100 +++ /var/tmp/diff_new_pack.ZqhrdT/_new 2015-02-18 12:08:55.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package python3-testtools # -# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,10 +18,9 @@ # A build cycle exists between python-extras and python-testtools. Thus, only # enable testing with a build conditional (off by default): -%bcond_with tests Name: python3-testtools -Version: 0.9.35 +Version: 1.5.0 Release: 0 Summary: Extensions to the Python Standard Library Unit Testing Framework License: MIT @@ -29,13 +28,14 @@ Url: https://launchpad.net/testtools Source: https://pypi.python.org/packages/source/t/testtools/testtools-%{version}.ta… BuildRequires: python3-devel +BuildRequires: python3-setuptools # Documentation requirements: BuildRequires: python3-Sphinx # Test requirements: -%if %{with tests} BuildRequires: python3-extras BuildRequires: python3-python-mimeparse -%endif +BuildRequires: python3-unittest2 +Requires: python3-unittest2 Requires: python3-extras Requires: python3-python-mimeparse BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -57,10 +57,8 @@ %install python3 setup.py install --prefix=%{_prefix} --root=%{buildroot} -%if %{with tests} %check python3 setup.py test -%endif %files %defattr(-,root,root,-) ++++++ testtools-0.9.35.tar.gz -> testtools-1.5.0.tar.gz ++++++ ++++ 2938 lines of diff (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0