# HG changeset patch
# User Andrew John Hughes <gnu.andrew@redhat.com>
# Date 1482979839 0
# Node ID 88679d3222162ae7758652193165548b842a9acc
# Parent  92d9535dcc2bb505d88a6bdf029e42d7bd9237ea
PR3175: invalid zip timestamp handling leads to error updating JAR files

2016-08-19  Andrew John Hughes  <gnu.andrew@member.fsf.org>

	PR3175: invalid zip timestamp handling leads to
	error updating JAR files
	* AUTHORS: Add Ricardo Ribalda.
	* NEWS: Updated.

2016-08-19  Ricardo Ribalda  <ricardo.ribalda@gmail.com>

	PR3175: invalid zip timestamp handling leads to
	error updating JAR files
	* Makefile.am:
	(add-pulseaudio): Don't use -u so files are always
	overwritten, regardless of timestamps.
	(add-pulseaudio-debug): Likewise.
	(add-pulseaudio-ecj): Likewise.

diff -r 92d9535dcc2b -r 88679d322216 AUTHORS
--- a/AUTHORS	Fri Mar 16 13:15:15 2012 +0100
+++ b/AUTHORS	Thu Dec 29 02:50:39 2016 +0000
@@ -36,6 +36,7 @@
 Parag Nemade <pnemade@redhat.com>
 Xerxes Rånby <xerxes@zafena.se>
 Mark Reinhold <mr@sun.com>
+Ricardo Ribalda <ricardo.ribalda@gmail.com>
 Bernhard Rosenkränzer <bero@arklinux.org>
 Marc Schoenefeld <mschoene@redhat.com>
 Andreas Schwab <schwab@suse.cz>
diff -r 92d9535dcc2b -r 88679d322216 ChangeLog
--- a/ChangeLog	Fri Mar 16 13:15:15 2012 +0100
+++ b/ChangeLog	Thu Dec 29 02:50:39 2016 +0000
@@ -1,3 +1,20 @@
+2016-08-19  Andrew John Hughes  <gnu.andrew@member.fsf.org>
+
+	PR3175: invalid zip timestamp handling leads to
+	error updating JAR files
+	* AUTHORS: Add Ricardo Ribalda.
+	* NEWS: Updated.
+
+2016-08-19  Ricardo Ribalda  <ricardo.ribalda@gmail.com>
+
+	PR3175: invalid zip timestamp handling leads to
+	error updating JAR files
+	* Makefile.am:
+	(add-pulseaudio): Don't use -u so files are always
+	overwritten, regardless of timestamps.
+	(add-pulseaudio-debug): Likewise.
+	(add-pulseaudio-ecj): Likewise.
+
 2016-12-28  Andrew John Hughes  <gnu.andrew@member.fsf.org>
 
 	PR3174: systemtap: type definition 'symbolOopDesc' not found
diff -r 92d9535dcc2b -r 88679d322216 Makefile.am
--- a/Makefile.am	Fri Mar 16 13:15:15 2012 +0100
+++ b/Makefile.am	Thu Dec 29 02:50:39 2016 +0000
@@ -1882,7 +1882,7 @@
 	cp -pPRf $(PULSE_JAVA_BUILDDIR)/pulse-java.jar \
 	  $(BUILD_OUTPUT_DIR)/j2re-image/lib/ext
 	(cd $(PULSE_JAVA_JAVA_SRCDIR) && \
-	   $(ZIP) -qur $(BUILD_OUTPUT_DIR)/j2sdk-image/src.zip org )
+	   $(ZIP) -qr $(BUILD_OUTPUT_DIR)/j2sdk-image/src.zip org )
 endif
 	touch $@
 
@@ -1905,7 +1905,7 @@
 	cp -pPRf $(PULSE_JAVA_BUILDDIR)/pulse-java.jar \
 	  $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/ext
 	(cd $(PULSE_JAVA_JAVA_SRCDIR) && \
-	   $(ZIP) -qur $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/src.zip org )
+	   $(ZIP) -qr $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/src.zip org )
 endif
 	touch $@
 
@@ -2230,7 +2230,7 @@
 	cp -pPRf $(PULSE_JAVA_BUILDDIR)/pulse-java.jar \
 	  $(ECJ_BUILD_OUTPUT_DIR)/j2re-image/lib/ext
 	(cd $(PULSE_JAVA_JAVA_SRCDIR) && \
-	   $(ZIP) -qur $(ECJ_BUILD_OUTPUT_DIR)/j2sdk-image/src.zip org )
+	   $(ZIP) -qr $(ECJ_BUILD_OUTPUT_DIR)/j2sdk-image/src.zip org )
 endif
 	touch $@
 
diff -r 92d9535dcc2b -r 88679d322216 NEWS
--- a/NEWS	Fri Mar 16 13:15:15 2012 +0100
+++ b/NEWS	Thu Dec 29 02:50:39 2016 +0000
@@ -36,6 +36,7 @@
   - PR3143: Fix typo in --with-openjdk-src-dir introduced by PR3139
   - PR3152: Zero build fails with pch disabled
   - PR3174: systemtap: type definition 'symbolOopDesc' not found
+  - PR3175: invalid zip timestamp handling leads to error updating JAR files
   - PR3205: Builds fails with pch disabled
 
 New in release 1.13.12 (2016-08-24):