rpms/java-1.6.0-openjdk/EL-5 java-1.6.0-openjdk-securitypatches.patch, 1.1, 1.2

Lubomir Rintel lkundrak at fedoraproject.org
Tue May 5 05:15:39 UTC 2009 

Author: lkundrak

Update of /cvs/pkgs/rpms/java-1.6.0-openjdk/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10761

Modified Files:
	java-1.6.0-openjdk-securitypatches.patch 
Log Message:
Adjust the security patch to apply

java-1.6.0-openjdk-securitypatches.patch:

Index: java-1.6.0-openjdk-securitypatches.patch
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/EL-5/java-1.6.0-openjdk-securitypatches.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- java-1.6.0-openjdk-securitypatches.patch	4 May 2009 19:00:53 -0000	1.1
+++ java-1.6.0-openjdk-securitypatches.patch	5 May 2009 05:15:09 -0000	1.2
@@ -63,198 +63,6 @@ diff -Nurp icedtea6-1.3.1/Makefile.am ic
  	  then \
  	    echo Applying $$p ; \
  	    $(PATCH) -l -p0 < $(abs_top_srcdir)/$$p ; \
-diff -Nurp icedtea6-1.3.1/Makefile.am.orig icedtea6-1.3.1.patched/Makefile.am.orig
---- icedtea6-1.3.1/Makefile.am.orig	2008-10-22 19:20:45.000000000 +0200
-+++ icedtea6-1.3.1.patched/Makefile.am.orig	2009-05-04 18:49:16.000000000 +0200
-@@ -349,46 +349,6 @@ else
- endif
- endif
- endif
--if WITH_VISUALVM
--if USE_ALT_NETBEANS_BASIC_CLUSTER_SRC_ZIP
--else
--	if ! echo "$(NETBEANS_BASIC_CLUSTER_MD5SUM) $(NETBEANS_BASIC_CLUSTER_SRC_ZIP)" \
--	  | $(MD5SUM) --check ; \
--	then \
--	  if [ $(NETBEANS_BASIC_CLUSTER_SRC_ZIP) ] ; \
--	  then \
--	    mv $(NETBEANS_BASIC_CLUSTER_SRC_ZIP) $(NETBEANS_BASIC_CLUSTER_SRC_ZIP).old ; \
--	  fi ; \
--	$(WGET) $(NETBEANS_BASIC_CLUSTER_URL)$(NETBEANS_BASIC_CLUSTER_SRC_ZIP) \
--	  -O $(NETBEANS_BASIC_CLUSTER_SRC_ZIP) ; \
--	fi
--endif
--if USE_ALT_NETBEANS_PROFILER_SRC_ZIP
--else
--	if ! echo "$(NETBEANS_PROFILER_MD5SUM) $(NETBEANS_PROFILER_SRC_ZIP)" \
--	  | $(MD5SUM) --check ; \
--	then \
--	  if [ $(NETBEANS_PROFILER_SRC_ZIP) ] ; \
--	  then \
--	    mv $(NETBEANS_PROFILER_SRC_ZIP) $(NETBEANS_PROFILER_SRC_ZIP).old ; \
--	  fi ; \
--	  $(WGET) $(NETBEANS_PROFILER_URL)$(NETBEANS_PROFILER_SRC_ZIP) \
--	    -O $(NETBEANS_PROFILER_SRC_ZIP) ; \
--	fi
--endif
--if USE_ALT_VISUALVM_SRC_ZIP
--else
--	if ! echo "$(VISUALVM_MD5SUM) $(VISUALVM_SRC_ZIP)" \
--	  | $(MD5SUM) --check ; \
--	then \
--	  if [ $(VISUALVM_SRC_ZIP) ] ; \
--	  then \
--	    mv $(VISUALVM_SRC_ZIP) $(VISUALVM_SRC_ZIP).old ; \
--	  fi ; \
--	  $(WGET) $(VISUALVM_URL)$(VISUALVM_SRC_ZIP) -O $(VISUALVM_SRC_ZIP) ; \
--	fi
--endif
--endif
- 	mkdir -p stamps
- 	touch stamps/download.stamp
- 
-@@ -561,7 +521,6 @@ stamps/extract.stamp: stamps/download.st
- 	  mkdir openjdk ; \
- 	  $(TAR) xf $(OPENJDK_SRC_ZIP) -C openjdk; \
- 	  chmod -R ug+w openjdk ; \
--	  sh $(abs_top_srcdir)/fsg.sh ; \
- 	fi
- if WITH_CACAO
- if !USE_SYSTEM_CACAO
-@@ -606,7 +565,7 @@ endif
- clean-extract:
- 	rm -f stamps/extract.stamp
- 
--stamps/patch.stamp: stamps/patch-fsg.stamp
-+stamps/patch.stamp: stamps/extract.stamp
- 	mkdir -p stamps ; \
- 	rm -f stamps/patch.stamp.tmp ; \
- 	touch stamps/patch.stamp.tmp ; \
-diff -Nurp icedtea6-1.3.1/Makefile.in icedtea6-1.3.1.patched/Makefile.in
---- icedtea6-1.3.1/Makefile.in	2008-10-22 19:54:12.000000000 +0200
-+++ icedtea6-1.3.1.patched/Makefile.in	2009-05-04 19:31:33.572209706 +0200
-@@ -102,6 +102,7 @@ ALT_JAR_CMD = @ALT_JAR_CMD@
- ALT_NETBEANS_BASIC_CLUSTER_SRC_ZIP = @ALT_NETBEANS_BASIC_CLUSTER_SRC_ZIP@
- ALT_NETBEANS_PROFILER_SRC_ZIP = @ALT_NETBEANS_PROFILER_SRC_ZIP@
- ALT_OPENJDK_SRC_ZIP = @ALT_OPENJDK_SRC_ZIP@
-+ALT_OPT_CFLAGS = @ALT_OPT_CFLAGS@
- ALT_VISUALVM_SRC_ZIP = @ALT_VISUALVM_SRC_ZIP@
- AMTAR = @AMTAR@
- ANT = @ANT@
-@@ -283,6 +284,7 @@ sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
-+top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- OPENJDK_DATE = 28_aug_2008
-@@ -536,8 +538,23 @@ ICEDTEA_PATCHES = $(ZERO_PATCHES_COND) \
- 	patches/icedtea-jdk-use-ssize_t.patch \
- 	patches/icedtea-hotspot-use-idx_t.patch \
- 	patches/icedtea-hotspot-params-cast-size_t.patch \
--	patches/icedtea-clean-crypto.patch $(SHARK_PATCH) $(GCC_PATCH) \
--	patches/icedtea-arch.patch patches/icedtea-lc_ctype.patch \
-+	patches/icedtea-clean-crypto.patch \
-+	patches/icedtea-4486841.patch patches/icedtea-6484091.patch \
-+	patches/icedtea-6497740.patch patches/icedtea-6536193.patch \
-+	patches/icedtea-6588160.patch patches/icedtea-6592792.patch \
-+	patches/icedtea-6610888.patch patches/icedtea-6610896.patch \
-+	patches/icedtea-6630639.patch patches/icedtea-6632886.patch \
-+	patches/icedtea-6636360.patch patches/icedtea-6652463.patch \
-+	patches/icedtea-6656633.patch patches/icedtea-6658158.patch \
-+	patches/icedtea-6691246.patch patches/icedtea-6717680.patch \
-+	patches/icedtea-6721651.patch patches/icedtea-6721753.patch \
-+	patches/icedtea-6726779.patch patches/icedtea-6733959.patch \
-+	patches/icedtea-6734167.patch patches/icedtea-6737315.patch \
-+	patches/icedtea-6755943.patch patches/icedtea-6766136.patch \
-+	patches/icedtea-6792554.patch patches/icedtea-6804996.patch \
-+	patches/icedtea-6804997.patch patches/icedtea-6804998.patch \
-+	$(SHARK_PATCH) $(GCC_PATCH) patches/icedtea-arch.patch \
-+	patches/icedtea-lc_ctype.patch \
- 	patches/icedtea-messageutils.patch \
- 	patches/icedtea-6open-6616825.patch \
- 	patches/icedtea-6open-6651382.patch \
-@@ -953,35 +970,6 @@ stamps/download.stamp:
- @USE_ALT_CACAO_SRC_ZIP_FALSE@@USE_SYSTEM_CACAO_FALSE@@WITH_CACAO_TRUE@	 fi ; \
- @USE_ALT_CACAO_SRC_ZIP_FALSE@@USE_SYSTEM_CACAO_FALSE@@WITH_CACAO_TRUE@	 $(WGET) $(CACAO_URL)$(CACAO_SRC_ZIP) -O $(CACAO_SRC_ZIP); \
- @USE_ALT_CACAO_SRC_ZIP_FALSE@@USE_SYSTEM_CACAO_FALSE@@WITH_CACAO_TRUE@	fi
-- at USE_ALT_NETBEANS_BASIC_CLUSTER_SRC_ZIP_FALSE@@WITH_VISUALVM_TRUE@	if ! echo "$(NETBEANS_BASIC_CLUSTER_MD5SUM) $(NETBEANS_BASIC_CLUSTER_SRC_ZIP)" \
-- at USE_ALT_NETBEANS_BASIC_CLUSTER_SRC_ZIP_FALSE@@WITH_VISUALVM_TRUE@	  | $(MD5SUM) --check ; \
-- at USE_ALT_NETBEANS_BASIC_CLUSTER_SRC_ZIP_FALSE@@WITH_VISUALVM_TRUE@	then \
-- at USE_ALT_NETBEANS_BASIC_CLUSTER_SRC_ZIP_FALSE@@WITH_VISUALVM_TRUE@	  if [ $(NETBEANS_BASIC_CLUSTER_SRC_ZIP) ] ; \
-- at USE_ALT_NETBEANS_BASIC_CLUSTER_SRC_ZIP_FALSE@@WITH_VISUALVM_TRUE@	  then \
-- at USE_ALT_NETBEANS_BASIC_CLUSTER_SRC_ZIP_FALSE@@WITH_VISUALVM_TRUE@	    mv $(NETBEANS_BASIC_CLUSTER_SRC_ZIP) $(NETBEANS_BASIC_CLUSTER_SRC_ZIP).old ; \
-- at USE_ALT_NETBEANS_BASIC_CLUSTER_SRC_ZIP_FALSE@@WITH_VISUALVM_TRUE@	  fi ; \
-- at USE_ALT_NETBEANS_BASIC_CLUSTER_SRC_ZIP_FALSE@@WITH_VISUALVM_TRUE@	$(WGET) $(NETBEANS_BASIC_CLUSTER_URL)$(NETBEANS_BASIC_CLUSTER_SRC_ZIP) \
-- at USE_ALT_NETBEANS_BASIC_CLUSTER_SRC_ZIP_FALSE@@WITH_VISUALVM_TRUE@	  -O $(NETBEANS_BASIC_CLUSTER_SRC_ZIP) ; \
-- at USE_ALT_NETBEANS_BASIC_CLUSTER_SRC_ZIP_FALSE@@WITH_VISUALVM_TRUE@	fi
-- at USE_ALT_NETBEANS_PROFILER_SRC_ZIP_FALSE@@WITH_VISUALVM_TRUE@	if ! echo "$(NETBEANS_PROFILER_MD5SUM) $(NETBEANS_PROFILER_SRC_ZIP)" \
-- at USE_ALT_NETBEANS_PROFILER_SRC_ZIP_FALSE@@WITH_VISUALVM_TRUE@	  | $(MD5SUM) --check ; \
-- at USE_ALT_NETBEANS_PROFILER_SRC_ZIP_FALSE@@WITH_VISUALVM_TRUE@	then \
-- at USE_ALT_NETBEANS_PROFILER_SRC_ZIP_FALSE@@WITH_VISUALVM_TRUE@	  if [ $(NETBEANS_PROFILER_SRC_ZIP) ] ; \
-- at USE_ALT_NETBEANS_PROFILER_SRC_ZIP_FALSE@@WITH_VISUALVM_TRUE@	  then \
-- at USE_ALT_NETBEANS_PROFILER_SRC_ZIP_FALSE@@WITH_VISUALVM_TRUE@	    mv $(NETBEANS_PROFILER_SRC_ZIP) $(NETBEANS_PROFILER_SRC_ZIP).old ; \
-- at USE_ALT_NETBEANS_PROFILER_SRC_ZIP_FALSE@@WITH_VISUALVM_TRUE@	  fi ; \
-- at USE_ALT_NETBEANS_PROFILER_SRC_ZIP_FALSE@@WITH_VISUALVM_TRUE@	  $(WGET) $(NETBEANS_PROFILER_URL)$(NETBEANS_PROFILER_SRC_ZIP) \
-- at USE_ALT_NETBEANS_PROFILER_SRC_ZIP_FALSE@@WITH_VISUALVM_TRUE@	    -O $(NETBEANS_PROFILER_SRC_ZIP) ; \
-- at USE_ALT_NETBEANS_PROFILER_SRC_ZIP_FALSE@@WITH_VISUALVM_TRUE@	fi
-- at USE_ALT_VISUALVM_SRC_ZIP_FALSE@@WITH_VISUALVM_TRUE@	if ! echo "$(VISUALVM_MD5SUM) $(VISUALVM_SRC_ZIP)" \
-- at USE_ALT_VISUALVM_SRC_ZIP_FALSE@@WITH_VISUALVM_TRUE@	  | $(MD5SUM) --check ; \
-- at USE_ALT_VISUALVM_SRC_ZIP_FALSE@@WITH_VISUALVM_TRUE@	then \
-- at USE_ALT_VISUALVM_SRC_ZIP_FALSE@@WITH_VISUALVM_TRUE@	  if [ $(VISUALVM_SRC_ZIP) ] ; \
-- at USE_ALT_VISUALVM_SRC_ZIP_FALSE@@WITH_VISUALVM_TRUE@	  then \
-- at USE_ALT_VISUALVM_SRC_ZIP_FALSE@@WITH_VISUALVM_TRUE@	    mv $(VISUALVM_SRC_ZIP) $(VISUALVM_SRC_ZIP).old ; \
-- at USE_ALT_VISUALVM_SRC_ZIP_FALSE@@WITH_VISUALVM_TRUE@	  fi ; \
-- at USE_ALT_VISUALVM_SRC_ZIP_FALSE@@WITH_VISUALVM_TRUE@	  $(WGET) $(VISUALVM_URL)$(VISUALVM_SRC_ZIP) -O $(VISUALVM_SRC_ZIP) ; \
-- at USE_ALT_VISUALVM_SRC_ZIP_FALSE@@WITH_VISUALVM_TRUE@	fi
- 	mkdir -p stamps
- 	touch stamps/download.stamp
- 
-@@ -1021,7 +1009,6 @@ stamps/extract.stamp: stamps/download.st
- 	  mkdir openjdk ; \
- 	  $(TAR) xf $(OPENJDK_SRC_ZIP) -C openjdk; \
- 	  chmod -R ug+w openjdk ; \
--	  sh $(abs_top_srcdir)/fsg.sh ; \
- 	fi
- @USE_SYSTEM_CACAO_FALSE@@WITH_CACAO_TRUE@	if ! test -d cacao ; \
- @USE_SYSTEM_CACAO_FALSE@@WITH_CACAO_TRUE@	then \
-@@ -1060,7 +1047,7 @@ stamps/extract.stamp: stamps/download.st
- clean-extract:
- 	rm -f stamps/extract.stamp
- 
--stamps/patch.stamp: stamps/patch-fsg.stamp
-+stamps/patch.stamp: stamps/extract.stamp
- 	mkdir -p stamps ; \
- 	rm -f stamps/patch.stamp.tmp ; \
- 	touch stamps/patch.stamp.tmp ; \
-@@ -1070,7 +1057,7 @@ stamps/patch.stamp: stamps/patch-fsg.sta
- 	  if test x$${all_patches_ok} = "xyes" \
- 	    && echo Checking $$p \
- 	    && $(PATCH) -l -p0 --dry-run -s -t -f \
--	      -F 0 < $(abs_top_srcdir)/$$p ; \
-+	      < $(abs_top_srcdir)/$$p ; \
- 	  then \
- 	    echo Applying $$p ; \
- 	    $(PATCH) -l -p0 < $(abs_top_srcdir)/$$p ; \
-@@ -1136,7 +1123,7 @@ stamps/patch-fsg.stamp: stamps/extract.s
- 	  if test x$${all_patches_ok} = "xyes" \
- 	    && echo Checking $$p \
- 	    && $(PATCH) -l -p0 --dry-run -s -t -f \
--	      -F 0 < $(abs_top_srcdir)/$$p ; \
-+	      < $(abs_top_srcdir)/$$p ; \
- 	  then \
- 	    echo Applying $$p ; \
- 	    $(PATCH) -l -p0 < $(abs_top_srcdir)/$$p ; \
-@@ -1226,7 +1213,7 @@ stamps/patch-ecj.stamp: stamps/extract-e
- 	  if test x$${all_patches_ok} = "xyes" \
- 	    && echo Checking $$p \
- 	    && $(PATCH) -l -p0 --dry-run -s -t -f \
--	      -F 0 < $(abs_top_srcdir)/$$p ; \
-+	      < $(abs_top_srcdir)/$$p ; \
- 	  then \
- 	    echo Applying $$p ; \
- 	    $(PATCH) -l -p0 < $(abs_top_srcdir)/$$p ; \
 diff -Nurp icedtea6-1.3.1/patches/icedtea-4486841.patch icedtea6-1.3.1.patched/patches/icedtea-4486841.patch
 --- icedtea6-1.3.1/patches/icedtea-4486841.patch	1970-01-01 01:00:00.000000000 +0100
 +++ icedtea6-1.3.1.patched/patches/icedtea-4486841.patch	2009-05-04 18:59:01.000000000 +0200
@@ -6401,3 +6209,128 @@ diff -Nurp icedtea6-1.3.1/patches/icedte
 +     if (blockh == 0 || raslineh == 0
 +         || prefixh == 0 || suffixh == 0
 +         || outCodeh == 0)
+diff -up icedtea6-1.3.1/Makefile.in.automake icedtea6-1.3.1/Makefile.in
+--- icedtea6-1.3.1/Makefile.in.automake	2009-05-05 07:11:46.880610608 +0200
++++ icedtea6-1.3.1/Makefile.in	2009-05-05 07:11:54.380602188 +0200
+@@ -102,6 +102,7 @@ ALT_JAR_CMD = @ALT_JAR_CMD@
+ ALT_NETBEANS_BASIC_CLUSTER_SRC_ZIP = @ALT_NETBEANS_BASIC_CLUSTER_SRC_ZIP@
+ ALT_NETBEANS_PROFILER_SRC_ZIP = @ALT_NETBEANS_PROFILER_SRC_ZIP@
+ ALT_OPENJDK_SRC_ZIP = @ALT_OPENJDK_SRC_ZIP@
++ALT_OPT_CFLAGS = @ALT_OPT_CFLAGS@
+ ALT_VISUALVM_SRC_ZIP = @ALT_VISUALVM_SRC_ZIP@
+ AMTAR = @AMTAR@
+ ANT = @ANT@
+@@ -283,6 +284,7 @@ sharedstatedir = @sharedstatedir@
+ srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
++top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ OPENJDK_DATE = 28_aug_2008
+@@ -536,8 +538,23 @@ ICEDTEA_PATCHES = $(ZERO_PATCHES_COND) \
+ 	patches/icedtea-jdk-use-ssize_t.patch \
+ 	patches/icedtea-hotspot-use-idx_t.patch \
+ 	patches/icedtea-hotspot-params-cast-size_t.patch \
+-	patches/icedtea-clean-crypto.patch $(SHARK_PATCH) $(GCC_PATCH) \
+-	patches/icedtea-arch.patch patches/icedtea-lc_ctype.patch \
++	patches/icedtea-clean-crypto.patch \
++	patches/icedtea-4486841.patch patches/icedtea-6484091.patch \
++	patches/icedtea-6497740.patch patches/icedtea-6536193.patch \
++	patches/icedtea-6588160.patch patches/icedtea-6592792.patch \
++	patches/icedtea-6610888.patch patches/icedtea-6610896.patch \
++	patches/icedtea-6630639.patch patches/icedtea-6632886.patch \
++	patches/icedtea-6636360.patch patches/icedtea-6652463.patch \
++	patches/icedtea-6656633.patch patches/icedtea-6658158.patch \
++	patches/icedtea-6691246.patch patches/icedtea-6717680.patch \
++	patches/icedtea-6721651.patch patches/icedtea-6721753.patch \
++	patches/icedtea-6726779.patch patches/icedtea-6733959.patch \
++	patches/icedtea-6734167.patch patches/icedtea-6737315.patch \
++	patches/icedtea-6755943.patch patches/icedtea-6766136.patch \
++	patches/icedtea-6792554.patch patches/icedtea-6804996.patch \
++	patches/icedtea-6804997.patch patches/icedtea-6804998.patch \
++	$(SHARK_PATCH) $(GCC_PATCH) patches/icedtea-arch.patch \
++	patches/icedtea-lc_ctype.patch \
+ 	patches/icedtea-messageutils.patch \
+ 	patches/icedtea-6open-6616825.patch \
+ 	patches/icedtea-6open-6651382.patch \
+@@ -953,35 +970,6 @@ stamps/download.stamp:
+ @USE_ALT_CACAO_SRC_ZIP_FALSE@@USE_SYSTEM_CACAO_FALSE@@WITH_CACAO_TRUE@	 fi ; \
+ @USE_ALT_CACAO_SRC_ZIP_FALSE@@USE_SYSTEM_CACAO_FALSE@@WITH_CACAO_TRUE@	 $(WGET) $(CACAO_URL)$(CACAO_SRC_ZIP) -O $(CACAO_SRC_ZIP); \
+ @USE_ALT_CACAO_SRC_ZIP_FALSE@@USE_SYSTEM_CACAO_FALSE@@WITH_CACAO_TRUE@	fi
+- at USE_ALT_NETBEANS_BASIC_CLUSTER_SRC_ZIP_FALSE@@WITH_VISUALVM_TRUE@	if ! echo "$(NETBEANS_BASIC_CLUSTER_MD5SUM) $(NETBEANS_BASIC_CLUSTER_SRC_ZIP)" \
+- at USE_ALT_NETBEANS_BASIC_CLUSTER_SRC_ZIP_FALSE@@WITH_VISUALVM_TRUE@	  | $(MD5SUM) --check ; \
+- at USE_ALT_NETBEANS_BASIC_CLUSTER_SRC_ZIP_FALSE@@WITH_VISUALVM_TRUE@	then \
+- at USE_ALT_NETBEANS_BASIC_CLUSTER_SRC_ZIP_FALSE@@WITH_VISUALVM_TRUE@	  if [ $(NETBEANS_BASIC_CLUSTER_SRC_ZIP) ] ; \
+- at USE_ALT_NETBEANS_BASIC_CLUSTER_SRC_ZIP_FALSE@@WITH_VISUALVM_TRUE@	  then \
+- at USE_ALT_NETBEANS_BASIC_CLUSTER_SRC_ZIP_FALSE@@WITH_VISUALVM_TRUE@	    mv $(NETBEANS_BASIC_CLUSTER_SRC_ZIP) $(NETBEANS_BASIC_CLUSTER_SRC_ZIP).old ; \
+- at USE_ALT_NETBEANS_BASIC_CLUSTER_SRC_ZIP_FALSE@@WITH_VISUALVM_TRUE@	  fi ; \
+- at USE_ALT_NETBEANS_BASIC_CLUSTER_SRC_ZIP_FALSE@@WITH_VISUALVM_TRUE@	$(WGET) $(NETBEANS_BASIC_CLUSTER_URL)$(NETBEANS_BASIC_CLUSTER_SRC_ZIP) \
+- at USE_ALT_NETBEANS_BASIC_CLUSTER_SRC_ZIP_FALSE@@WITH_VISUALVM_TRUE@	  -O $(NETBEANS_BASIC_CLUSTER_SRC_ZIP) ; \
+- at USE_ALT_NETBEANS_BASIC_CLUSTER_SRC_ZIP_FALSE@@WITH_VISUALVM_TRUE@	fi
+- at USE_ALT_NETBEANS_PROFILER_SRC_ZIP_FALSE@@WITH_VISUALVM_TRUE@	if ! echo "$(NETBEANS_PROFILER_MD5SUM) $(NETBEANS_PROFILER_SRC_ZIP)" \
+- at USE_ALT_NETBEANS_PROFILER_SRC_ZIP_FALSE@@WITH_VISUALVM_TRUE@	  | $(MD5SUM) --check ; \
+- at USE_ALT_NETBEANS_PROFILER_SRC_ZIP_FALSE@@WITH_VISUALVM_TRUE@	then \
+- at USE_ALT_NETBEANS_PROFILER_SRC_ZIP_FALSE@@WITH_VISUALVM_TRUE@	  if [ $(NETBEANS_PROFILER_SRC_ZIP) ] ; \
+- at USE_ALT_NETBEANS_PROFILER_SRC_ZIP_FALSE@@WITH_VISUALVM_TRUE@	  then \
+- at USE_ALT_NETBEANS_PROFILER_SRC_ZIP_FALSE@@WITH_VISUALVM_TRUE@	    mv $(NETBEANS_PROFILER_SRC_ZIP) $(NETBEANS_PROFILER_SRC_ZIP).old ; \
+- at USE_ALT_NETBEANS_PROFILER_SRC_ZIP_FALSE@@WITH_VISUALVM_TRUE@	  fi ; \
+- at USE_ALT_NETBEANS_PROFILER_SRC_ZIP_FALSE@@WITH_VISUALVM_TRUE@	  $(WGET) $(NETBEANS_PROFILER_URL)$(NETBEANS_PROFILER_SRC_ZIP) \
+- at USE_ALT_NETBEANS_PROFILER_SRC_ZIP_FALSE@@WITH_VISUALVM_TRUE@	    -O $(NETBEANS_PROFILER_SRC_ZIP) ; \
+- at USE_ALT_NETBEANS_PROFILER_SRC_ZIP_FALSE@@WITH_VISUALVM_TRUE@	fi
+- at USE_ALT_VISUALVM_SRC_ZIP_FALSE@@WITH_VISUALVM_TRUE@	if ! echo "$(VISUALVM_MD5SUM) $(VISUALVM_SRC_ZIP)" \
+- at USE_ALT_VISUALVM_SRC_ZIP_FALSE@@WITH_VISUALVM_TRUE@	  | $(MD5SUM) --check ; \
+- at USE_ALT_VISUALVM_SRC_ZIP_FALSE@@WITH_VISUALVM_TRUE@	then \
+- at USE_ALT_VISUALVM_SRC_ZIP_FALSE@@WITH_VISUALVM_TRUE@	  if [ $(VISUALVM_SRC_ZIP) ] ; \
+- at USE_ALT_VISUALVM_SRC_ZIP_FALSE@@WITH_VISUALVM_TRUE@	  then \
+- at USE_ALT_VISUALVM_SRC_ZIP_FALSE@@WITH_VISUALVM_TRUE@	    mv $(VISUALVM_SRC_ZIP) $(VISUALVM_SRC_ZIP).old ; \
+- at USE_ALT_VISUALVM_SRC_ZIP_FALSE@@WITH_VISUALVM_TRUE@	  fi ; \
+- at USE_ALT_VISUALVM_SRC_ZIP_FALSE@@WITH_VISUALVM_TRUE@	  $(WGET) $(VISUALVM_URL)$(VISUALVM_SRC_ZIP) -O $(VISUALVM_SRC_ZIP) ; \
+- at USE_ALT_VISUALVM_SRC_ZIP_FALSE@@WITH_VISUALVM_TRUE@	fi
+ 	mkdir -p stamps
+ 	touch stamps/download.stamp
+ 
+@@ -1021,7 +1009,6 @@ stamps/extract.stamp: stamps/download.st
+ 	  mkdir openjdk ; \
+ 	  $(TAR) xf $(OPENJDK_SRC_ZIP) -C openjdk; \
+ 	  chmod -R ug+w openjdk ; \
+-	  sh $(abs_top_srcdir)/fsg.sh ; \
+ 	fi
+ @USE_SYSTEM_CACAO_FALSE@@WITH_CACAO_TRUE@	if ! test -d cacao ; \
+ @USE_SYSTEM_CACAO_FALSE@@WITH_CACAO_TRUE@	then \
+@@ -1060,7 +1047,7 @@ stamps/extract.stamp: stamps/download.st
+ clean-extract:
+ 	rm -f stamps/extract.stamp
+ 
+-stamps/patch.stamp: stamps/patch-fsg.stamp
++stamps/patch.stamp: stamps/extract.stamp
+ 	mkdir -p stamps ; \
+ 	rm -f stamps/patch.stamp.tmp ; \
+ 	touch stamps/patch.stamp.tmp ; \
+@@ -1070,7 +1057,7 @@ stamps/patch.stamp: stamps/patch-fsg.sta
+ 	  if test x$${all_patches_ok} = "xyes" \
+ 	    && echo Checking $$p \
+ 	    && $(PATCH) -l -p0 --dry-run -s -t -f \
+-	      -F 0 < $(abs_top_srcdir)/$$p ; \
++	      < $(abs_top_srcdir)/$$p ; \
+ 	  then \
+ 	    echo Applying $$p ; \
+ 	    $(PATCH) -l -p0 < $(abs_top_srcdir)/$$p ; \
+@@ -1137,7 +1124,7 @@ stamps/patch-fsg.stamp: stamps/extract.s
+ 	  if test x$${all_patches_ok} = "xyes" \
+ 	    && echo Checking $$p \
+ 	    && $(PATCH) -l -p0 --dry-run -s -t -f \
+-	      -F 0 < $(abs_top_srcdir)/$$p ; \
++	      < $(abs_top_srcdir)/$$p ; \
+ 	  then \
+ 	    echo Applying $$p ; \
+ 	    $(PATCH) -l -p0 < $(abs_top_srcdir)/$$p ; \
+@@ -1227,7 +1214,7 @@ stamps/patch-ecj.stamp: stamps/extract-e
+ 	  if test x$${all_patches_ok} = "xyes" \
+ 	    && echo Checking $$p \
+ 	    && $(PATCH) -l -p0 --dry-run -s -t -f \
+-	      -F 0 < $(abs_top_srcdir)/$$p ; \
++	      < $(abs_top_srcdir)/$$p ; \
+ 	  then \
+ 	    echo Applying $$p ; \
+ 	    $(PATCH) -l -p0 < $(abs_top_srcdir)/$$p ; \

More information about the scm-commits mailing list