/hg/icedtea6: 2 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Thu Aug 9 13:08:46 PDT 2012
changeset b20e2e867dd8 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=b20e2e867dd8
author: Stefan Ring <stefan at complang.tuwien.ac.at>
date: Thu Aug 09 14:01:53 2012 +0200
copy entire CACAO directory, including .hg
CACAO can make use of the repository in determining its Mercurial revision
since <http://mips.complang.tuwien.ac.at/hg/cacao/rev/75b2b23e443c>.
changeset 0ad57a8403af in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=0ad57a8403af
author: Andrew John Hughes <ahughes at redhat.com>
date: Thu Aug 09 21:08:15 2012 +0100
Merge
diffstat:
ChangeLog | 18 ++++
Makefile.am | 139 ++++++++++++++++++++++++++++++----
patches/nss-config.patch | 4 +-
patches/nss-not-enabled-config.patch | 4 +-
4 files changed, 144 insertions(+), 21 deletions(-)
diffs (235 lines):
diff -r ef9ac7b86cd8 -r 0ad57a8403af ChangeLog
--- a/ChangeLog Wed Aug 08 20:36:12 2012 +0100
+++ b/ChangeLog Thu Aug 09 21:08:15 2012 +0100
@@ -1,3 +1,21 @@
+2012-08-09 Stefan Ring <stefan at complang.tuwien.ac.at>
+
+ * Makefile.am: copy entire CACAO directory, including .hg
+
+2012-08-09 Andrew John Hughes <ahughes at redhat.com>
+
+ Apply NSS changes to java.security after
+ build.
+ * Makefile.am:
+ (ICEDTEA_PATCHES): Don't add NSS config patches.
+ (NSS_PATCHES): Add here instead.
+ (add-nss): Apply NSS_PATCHES.
+ (clean-add-nss): Revert java.security.
+ (add-nss-debug): Apply NSS_PATCHES to debug build.
+ (clean-add-nss-debug): Revert java.security for debug build.
+ (add-nss-ecj): Apply NSS_PATCHES to bootstrap build.
+ (clean-add-nss-ecj): Revert java.security for bootstrap build.
+
2012-08-08 Andrew John Hughes <ahughes at redhat.com>
* Makefile.am: Add new patch.
diff -r ef9ac7b86cd8 -r 0ad57a8403af Makefile.am
--- a/Makefile.am Wed Aug 08 20:36:12 2012 +0100
+++ b/Makefile.am Thu Aug 09 21:08:15 2012 +0100
@@ -468,9 +468,9 @@
endif
if ENABLE_NSS
-ICEDTEA_PATCHES += patches/nss-config.patch
+NSS_PATCHES = patches/nss-config.patch
else
-ICEDTEA_PATCHES += patches/nss-not-enabled-config.patch
+NSS_PATCHES = patches/nss-not-enabled-config.patch
endif
if HAS_PAX
@@ -1020,8 +1020,8 @@
set -e ; \
if ! test -d cacao ; \
then \
- mkdir -p cacao/cacao ; \
- cp -r $(ALT_CACAO_SRC_DIR)/* cacao/cacao/ ; \
+ mkdir cacao ; \
+ cp -rL $(ALT_CACAO_SRC_DIR) cacao/cacao ; \
fi
else
set -e ; \
@@ -1605,15 +1605,50 @@
rm -f stamps/add-pulseaudio-debug.stamp
stamps/add-nss.stamp: stamps/icedtea.stamp
- cp $(abs_top_builddir)/nss.cfg \
+ cp -v $(abs_top_builddir)/nss.cfg \
$(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/security
- cp $(abs_top_builddir)/nss.cfg \
+ cp -v $(abs_top_builddir)/nss.cfg \
$(BUILD_OUTPUT_DIR)/j2re-image/lib/security
- touch stamps/add-nss.stamp
+ rm -f stamps/add-nss.stamp.tmp
+ touch stamps/add-nss.stamp.tmp
+ all_patches_ok=yes; \
+ for dir in $(BUILD_OUTPUT_DIR)/{j2sdk-image/jre,j2re-image} ; \
+ do \
+ pushd $$dir ; \
+ cp -v $$dir/lib/security/java.security{,.old} ; \
+ for p in $(NSS_PATCHES) ; \
+ do \
+ if test x$${all_patches_ok} = "xyes" \
+ && echo Checking $$p \
+ && $(PATCH) -l -p0 --dry-run -s -t -f -F0 \
+ < $(abs_top_srcdir)/$$p ; \
+ then \
+ echo Applying $$p ; \
+ $(PATCH) -l -p0 -F0 < $(abs_top_srcdir)/$$p ; \
+ if ! grep "^\* $$(basename $$p)" $(abs_top_srcdir)/HACKING \
+ >> $(abs_top_builddir)/stamps/add-nss.stamp.tmp ; \
+ then \
+ echo "* $$(basename $$p): UNDOCUMENTED" \
+ >> $(abs_top_builddir)/stamps/add-nss.stamp.tmp ; \
+ fi ; \
+ else \
+ test x$${all_patches_ok} = "xyes" && all_patches_ok=$$p ; \
+ fi ; \
+ done ; \
+ popd ; \
+ done ; \
+ mv stamps/add-nss.stamp.tmp stamps/add-nss.stamp ; \
+ if ! test x$${all_patches_ok} = "xyes"; then \
+ echo ERROR patch $${all_patches_ok} FAILED! ; \
+ echo WARNING make clean-add-nss before retrying a fix ; \
+ exit 2; \
+ fi
clean-add-nss:
- rm -f $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/security/nss.cfg
- rm -f $(BUILD_OUTPUT_DIR)/j2re-image/lib/security/nss.cfg
+ rm -vf $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/security/nss.cfg
+ rm -vf $(BUILD_OUTPUT_DIR)/j2re-image/lib/security/nss.cfg
+ mv -vf $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/security/java.security{.old,}
+ mv -vf $(BUILD_OUTPUT_DIR)/j2re-image/lib/security/java.security{.old,}
rm -f stamps/add-nss.stamp
stamps/add-nss-debug.stamp: stamps/icedtea-debug.stamp
@@ -1621,11 +1656,46 @@
$(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/security;
cp $(abs_top_builddir)/nss.cfg \
$(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/security;
- touch stamps/add-nss-debug.stamp
+ rm -f stamps/add-nss-debug.stamp.tmp
+ touch stamps/add-nss-debug.stamp.tmp
+ all_patches_ok=yes; \
+ for dir in $(ECJ_BUILD_OUTPUT_DIR)/{j2sdk-image/jre,j2re-image} ; \
+ do \
+ pushd $$dir ; \
+ cp -v $$dir/lib/security/java.security{,.old} ; \
+ for p in $(NSS_PATCHES) ; \
+ do \
+ if test x$${all_patches_ok} = "xyes" \
+ && echo Checking $$p \
+ && $(PATCH) -l -p0 --dry-run -s -t -f -F0 \
+ < $(abs_top_srcdir)/$$p ; \
+ then \
+ echo Applying $$p ; \
+ $(PATCH) -l -p0 -F0 < $(abs_top_srcdir)/$$p ; \
+ if ! grep "^\* $$(basename $$p)" $(abs_top_srcdir)/HACKING \
+ >> $(abs_top_builddir)/stamps/add-nss-debug.stamp.tmp ; \
+ then \
+ echo "* $$(basename $$p): UNDOCUMENTED" \
+ >> $(abs_top_builddir)/stamps/add-nss-debug.stamp.tmp ; \
+ fi ; \
+ else \
+ test x$${all_patches_ok} = "xyes" && all_patches_ok=$$p ; \
+ fi ; \
+ done ; \
+ popd ; \
+ done ; \
+ mv stamps/add-nss-debug.stamp.tmp stamps/add-nss-debug.stamp ; \
+ if ! test x$${all_patches_ok} = "xyes"; then \
+ echo ERROR patch $${all_patches_ok} FAILED! ; \
+ echo WARNING make clean-add-nss-debug before retrying a fix ; \
+ exit 2; \
+ fi
clean-add-nss-debug:
- rm -f $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/security/nss.cfg
- rm -f $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/security/nss.cfg
+ rm -vf $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/security/nss.cfg
+ rm -vf $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/security/nss.cfg
+ mv -vf $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/security/java.security{.old,}
+ mv -vf $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/security/java.security{.old,}
rm -f stamps/add-nss-debug.stamp
stamps/add-tzdata-support.stamp: stamps/icedtea.stamp
@@ -1728,15 +1798,50 @@
rm -f stamps/add-pulseaudio-ecj.stamp
stamps/add-nss-ecj.stamp: stamps/icedtea-ecj.stamp
- cp $(abs_top_builddir)/nss.cfg \
+ cp -v $(abs_top_builddir)/nss.cfg \
$(ECJ_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/security;
- cp $(abs_top_builddir)/nss.cfg \
+ cp -v $(abs_top_builddir)/nss.cfg \
$(ECJ_BUILD_OUTPUT_DIR)/j2re-image/lib/security;
- touch stamps/add-nss-ecj.stamp
+ rm -f stamps/add-nss-ecj.stamp.tmp
+ touch stamps/add-nss-ecj.stamp.tmp
+ all_patches_ok=yes; \
+ for dir in $(ECJ_BUILD_OUTPUT_DIR)/{j2sdk-image/jre,j2re-image} ; \
+ do \
+ pushd $$dir ; \
+ cp -v $$dir/lib/security/java.security{,.old} ; \
+ for p in $(NSS_PATCHES) ; \
+ do \
+ if test x$${all_patches_ok} = "xyes" \
+ && echo Checking $$p \
+ && $(PATCH) -l -p0 --dry-run -s -t -f -F0 \
+ < $(abs_top_srcdir)/$$p ; \
+ then \
+ echo Applying $$p ; \
+ $(PATCH) -l -p0 -F0 < $(abs_top_srcdir)/$$p ; \
+ if ! grep "^\* $$(basename $$p)" $(abs_top_srcdir)/HACKING \
+ >> $(abs_top_builddir)/stamps/add-nss-ecj.stamp.tmp ; \
+ then \
+ echo "* $$(basename $$p): UNDOCUMENTED" \
+ >> $(abs_top_builddir)/stamps/add-nss-ecj.stamp.tmp ; \
+ fi ; \
+ else \
+ test x$${all_patches_ok} = "xyes" && all_patches_ok=$$p ; \
+ fi ; \
+ done ; \
+ popd ; \
+ done ; \
+ mv stamps/add-nss-ecj.stamp.tmp stamps/add-nss-ecj.stamp ; \
+ if ! test x$${all_patches_ok} = "xyes"; then \
+ echo ERROR patch $${all_patches_ok} FAILED! ; \
+ echo WARNING make clean-add-nss-ecj before retrying a fix ; \
+ exit 2; \
+ fi
clean-add-nss-ecj:
- rm -f $(ECJ_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/security/nss.cfg
- rm -f $(ECJ_BUILD_OUTPUT_DIR)/j2re-image/lib/security/nss.cfg
+ rm -vf $(ECJ_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/security/nss.cfg
+ rm -vf $(ECJ_BUILD_OUTPUT_DIR)/j2re-image/lib/security/nss.cfg
+ mv -vf $(ECJ_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/security/java.security{.old,}
+ mv -vf $(ECJ_BUILD_OUTPUT_DIR)/j2re-image/lib/security/java.security{.old,}
rm -f stamps/add-nss-ecj.stamp
stamps/add-tzdata-support-ecj.stamp: stamps/icedtea-ecj.stamp
diff -r ef9ac7b86cd8 -r 0ad57a8403af patches/nss-config.patch
--- a/patches/nss-config.patch Wed Aug 08 20:36:12 2012 +0100
+++ b/patches/nss-config.patch Thu Aug 09 21:08:15 2012 +0100
@@ -1,5 +1,5 @@
---- openjdk.orig/jdk/src/share/lib/security/java.security 2009-08-25 11:43:59.000000000 +0100
-+++ openjdk/jdk/src/share/lib/security/java.security 2009-08-27 14:23:54.000000000 +0100
+--- lib/security/java.security.old 2009-08-25 11:43:59.000000000 +0100
++++ lib/security/java.security 2009-08-27 14:23:54.000000000 +0100
@@ -51,6 +51,7 @@
security.provider.6=com.sun.security.sasl.Provider
security.provider.7=org.jcp.xml.dsig.internal.dom.XMLDSigRI
diff -r ef9ac7b86cd8 -r 0ad57a8403af patches/nss-not-enabled-config.patch
--- a/patches/nss-not-enabled-config.patch Wed Aug 08 20:36:12 2012 +0100
+++ b/patches/nss-not-enabled-config.patch Thu Aug 09 21:08:15 2012 +0100
@@ -1,5 +1,5 @@
---- openjdk.orig/jdk/src/share/lib/security/java.security 2009-08-25 11:43:59.000000000 +0100
-+++ openjdk/jdk/src/share/lib/security/java.security 2009-08-27 14:23:54.000000000 +0100
+--- lib/security/java.security.old 2009-08-25 11:43:59.000000000 +0100
++++ lib/security/java.security 2009-08-27 14:23:54.000000000 +0100
@@ -51,6 +51,10 @@
security.provider.6=com.sun.security.sasl.Provider
security.provider.7=org.jcp.xml.dsig.internal.dom.XMLDSigRI
More information about the distro-pkg-dev
mailing list