Accepting request 1203395 from Java:packages

Use SOURCE_DATE_EPOCH for reproducible jar mtime

OBS-URL: https://build.opensuse.org/request/show/1203395
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/matthewlib-java?expand=0&rev=20

install_doc.patch

@@ -1,7 +1,5 @@
-Index: libmatthew-java-0.8/Makefile
-===================================================================
---- libmatthew-java-0.8.orig/Makefile	2011-01-23 18:09:41.000000000 +0100
-+++ libmatthew-java-0.8/Makefile	2012-05-15 10:18:51.501203006 +0200
+--- libmatthew-java-0.8.1/Makefile	2011-01-23 18:09:41.000000000 +0100
++++ libmatthew-java-0.8.1/Makefile	2012-05-15 10:18:51.501203006 +0200
 @@ -44,7 +44,7 @@
  .NO_PARALLEL:
  .NOTPARALLEL:
@@ -9,8 +7,8 @@ Index: libmatthew-java-0.8/Makefile
 -all: unix-$(UNIXVER).jar cgi-$(CGIVER).jar debug-enable-$(DEBUGVER).jar debug-disable-$(DEBUGVER).jar io-$(IOVER).jar hexdump-$(HEXVER).jar libcgi-java.so libunix-java.so
 +all: unix-$(UNIXVER).jar cgi-$(CGIVER).jar debug-enable-$(DEBUGVER).jar debug-disable-$(DEBUGVER).jar io-$(IOVER).jar hexdump-$(HEXVER).jar libcgi-java.so libunix-java.so doc
  
- classes: .classes 
- .classes: $(SRC) 
+ dist: libmatthew-java-$(MATTVER).tar.gz
+ 
 @@ -139,4 +139,4 @@
  	ln -sf cgi-$(CGIVER).jar $(DESTDIR)$(JARDIR)/cgi.jar
  	ln -sf hexdump-$(HEXVER).jar $(DESTDIR)$(JARDIR)/hexdump.jar

libmatthew-java-0.8.1-jdk10.patch

@@ -1,5 +1,5 @@
---- libmatthew-java-0.8/cgi-java.c	2011-06-28 10:27:11.000000000 +0200
-+++ libmatthew-java-0.8/cgi-java.c	2017-12-22 13:10:21.755868074 +0100
+--- libmatthew-java-0.8.1/cgi-java.c	2024-09-25 09:53:00.423917614 +0200
++++ libmatthew-java-0.8.1/cgi-java.c	2024-09-25 09:54:41.074573838 +0200
 @@ -26,7 +26,10 @@
   */
  
@@ -12,8 +12,8 @@
  #include <stdio.h>
  #include <stdlib.h>
  #include <unistd.h>
---- libmatthew-java-0.8/Makefile	2011-01-23 18:09:41.000000000 +0100
-+++ libmatthew-java-0.8/Makefile	2017-12-22 13:10:57.603868209 +0100
+--- libmatthew-java-0.8.1/Makefile	2024-09-25 09:53:00.423917614 +0200
++++ libmatthew-java-0.8.1/Makefile	2024-09-25 09:55:21.598171368 +0200
 @@ -1,7 +1,6 @@
  JAVAC?=javac
  JAVADOC?=javadoc
@@ -31,7 +31,7 @@
  
  LDVER?=$(shell ld -v | cut -d' ' -f1)
  UNAME?=$(shell uname -s)
-@@ -50,7 +49,7 @@
+@@ -52,7 +51,7 @@
  .classes: $(SRC) 
  	mkdir -p classes
  	$(MAKE) .$(DEBUG)debug
@@ -40,21 +40,17 @@
  	touch .classes
  clean:
  	rm -rf classes doc
-@@ -76,10 +75,10 @@
- 	$(CC) $(CFLAGS) $(CSTD) $(CSHAREFLAG) $(INCLUDES) -c -o $@ $<
+@@ -80,8 +79,6 @@
  lib%.so: %.o
  	$(CC) $(LDFLAGS) $(LDSHAREFLAGS) -o $@ $<
-+
- unix-java.h: .classes
+ headers: .classes
 -	$(JAVAH) -classpath classes -o $@ cx.ath.matthew.unix.UnixServerSocket cx.ath.matthew.unix.UnixSocket cx.ath.matthew.unix.USInputStream cx.ath.matthew.unix.USOutputStream
-+
- cgi-java.h: .classes
 -	$(JAVAH) -classpath classes -o $@ cx.ath.matthew.cgi.CGI
  
  test.cgi: cgi-$(CGIVER).jar libcgi-java.so
  	$(GCJ) $(GCJFLAGS) $(GCJJNIFLAG) -L. -lcgi-java -o test.cgi --main=cx.ath.matthew.cgi.testcgi cgi-$(CGIVER).jar
---- libmatthew-java-0.8/unix-java.c	2011-06-28 10:27:20.000000000 +0200
-+++ libmatthew-java-0.8/unix-java.c	2017-12-22 13:10:16.323868053 +0100
+--- libmatthew-java-0.8.1/unix-java.c	2024-09-25 09:53:00.423917614 +0200
++++ libmatthew-java-0.8.1/unix-java.c	2024-09-25 09:54:41.074573838 +0200
 @@ -29,7 +29,7 @@
  /* _GNU_SOURCE is required to use struct ucred in glibc 2.8 */
  #define _GNU_SOURCE

libmatthew-java-0.8.1.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:46782b940c71d8db07470633efcf65c2aeda94de9a846fe178a5918fb2ad026f
+size 29064

libmatthew-java-0.8.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:05d1d3d9b5e33bd3642102aae10bba904e296c5c01a10854200ad4df349c8dfa
-size 30749

matthewlib-java.changes

@@ -1,3 +1,18 @@
+-------------------------------------------------------------------
+Wed Sep 25 08:18:18 UTC 2024 - Fridrich Strba <fstrba@suse.com>
+
+- Upgrade to version 0.8.1
+  * Commit versions of jni headers rather than relying on javah to
+    be in new versions of openjdk
+- Modified patches:
+  * libmatthew-java-0.8-jdk10.patch ->
+        libmatthew-java-0.8.1-jdk10.patch
+  * install_doc.patch
+    + rediff to changed context
+- Added patch:
+  * reproducible-jar-mtime.patch
+    + use SOURCE_DATE_EPOCH for reproducible jar mtime
+
 -------------------------------------------------------------------
 Wed Feb 21 14:45:59 UTC 2024 - Fridrich Strba <fstrba@suse.com>
 

matthewlib-java.spec

@@ -19,27 +19,20 @@
 %global make make
 %define orig_name libmatthew-java
 Name:           matthewlib-java
-Version:        0.8
+Version:        0.8.1
 Release:        0
 Summary:        A few useful Java libraries
-# actual upstream:
-#URL: http://matthew.ath.cx/projects/java/
-#Source0: http://matthew.ath.cx/projects/java/%{name}-%{version}.tar.gz
-# upstream author is also the debian maintainer for this package.
-# he gets newer releases into debian before he puts them up on
-# the upstream website. so we use the "original" source from debian
-# (ie, the source before debian patches are applied to it)
 License:        MIT
 Group:          Development/Libraries/Java
-Source0:        libmatthew-java-0.8.tar.gz
+URL:            http://matthew.ath.cx/projects/java/
+Source0:        http://matthew.ath.cx/projects/java/%{orig_name}-%{version}.tar.gz
 Patch0:         install_doc.patch
 Patch1:         classpath_fix.patch
-Patch2:         libmatthew-java-0.8-jdk10.patch
+Patch2:         libmatthew-java-0.8.1-jdk10.patch
+Patch3:         reproducible-jar-mtime.patch
 BuildRequires:  fdupes
 BuildRequires:  java-devel >= 1.8
 BuildRequires:  javapackages-tools
-Requires:       java >= 1.8
-Requires:       javapackages-tools
 Provides:       %{orig_name}
 
 %description
@@ -83,13 +76,17 @@ A collection of Java libraries: - Unix Sockets Library This is a
 %patch -P 0 -p1
 %patch -P 1 -p1
 %patch -P 2 -p1
+%if %{?pkg_vcmp:%pkg_vcmp java-devel >= 17}%{!?pkg_vcmp:0}
+%patch -P 3 -p1
+%endif
 
 %build
-%make \
+%{make} \
     CFLAGS='%{optflags} -fpic -std=c99' \
     LIBDIR='%{_libdir}' \
     LD='gcc' \
-    JCFLAGS='-target 1.8 -source 1.8'
+    JCFLAGS='-target 1.8 -source 1.8' \
+    JAVADOCFLAGS='-quiet -author -notimestamp'
 
 %install
 make install \

reproducible-jar-mtime.patch

@@ -0,0 +1,42 @@
+--- libmatthew-java-0.8.1/Makefile	2024-09-25 09:59:53.643278466 +0200
++++ libmatthew-java-0.8.1/Makefile	2024-09-25 10:14:37.565768216 +0200
+@@ -59,9 +59,9 @@
+ 	rm -rf libmatthew-java-$(MATTVER)
+ 
+ cgi-$(CGIVER).jar: .classes
+-	(cd classes; $(JAR) cf ../$@ cx/ath/matthew/cgi/*class)
++	(cd classes; $(JAR) --date="$$(date -u -d @$${SOURCE_DATE_EPOCH:-$$(date +%s)} +%Y-%m-%dT%H:%M:%SZ)" --create --file=../$@ cx/ath/matthew/cgi/*class)
+ io-$(IOVER).jar: .classes
+-	(cd classes; $(JAR) cf ../$@ cx/ath/matthew/io/*class)
++	(cd classes; $(JAR) --date="$$(date -u -d @$${SOURCE_DATE_EPOCH:-$$(date +%s)} +%Y-%m-%dT%H:%M:%SZ)" --create --file=../$@ cx/ath/matthew/io/*class)
+ unix-$(UNIXVER).jar: .classes
+ #ifeq ($(DEBUG),enable)
+ #	echo "Class-Path: $(JARDIR)/debug-$(DEBUG).jar" > Manifest
+@@ -69,10 +69,10 @@
+ #	echo "Class-Path: " > Manifest
+ #endif
+ 	echo > Manifest
+-	(cd classes; $(JAR) cfm ../$@ ../Manifest cx/ath/matthew/unix/*class)
++	(cd classes; $(JAR) --date="$$(date -u -d @$${SOURCE_DATE_EPOCH:-$$(date +%s)} +%Y-%m-%dT%H:%M:%SZ)" --create --file=../$@ --manifest=../Manifest cx/ath/matthew/unix/*class)
+ 
+ hexdump-$(HEXVER).jar: .classes
+-	(cd classes; $(JAR) cf ../$@ cx/ath/matthew/utils/Hexdump.class)
++	(cd classes; $(JAR) --date="$$(date -u -d @$${SOURCE_DATE_EPOCH:-$$(date +%s)} +%Y-%m-%dT%H:%M:%SZ)" --create --file=../$@ cx/ath/matthew/utils/Hexdump.class)
+ 
+ %.o: %.c %.h
+ 	$(CC) $(CFLAGS) $(CSTD) $(CSHAREFLAG) $(INCLUDES) -c -o $@ $<
+@@ -92,12 +92,12 @@
+ 	make .enabledebug
+ 	#echo "Class-Path: $(JARDIR)/hexdump.jar" > Manifest
+ 	echo > Manifest
+-	(cd classes;jar cfm ../$@ ../Manifest cx/ath/matthew/debug/*.class)
++	(cd classes; $(JAR) --date="$$(date -u -d @$${SOURCE_DATE_EPOCH:-$$(date +%s)} +%Y-%m-%dT%H:%M:%SZ)" --create --file=../$@ --manifest=../Manifest cx/ath/matthew/debug/*.class)
+ debug-disable-$(DEBUGVER).jar: cx/ath/matthew/debug/Debug.jpp
+ 	make .disabledebug
+ 	#echo "Class-Path: $(JARDIR)/hexdump.jar" > Manifest
+ 	echo > Manifest
+-	(cd classes;jar cfm ../$@ ../Manifest cx/ath/matthew/debug/*.class)
++	(cd classes; $(JAR) --date="$$(date -u -d @$${SOURCE_DATE_EPOCH:-$$(date +%s)} +%Y-%m-%dT%H:%M:%SZ)" --create --file=../$@ --manifest=../Manifest cx/ath/matthew/debug/*.class)
+ .enabledebug: cx/ath/matthew/debug/Debug.jpp 
+ 	mkdir -p classes
+ 	cpp $(PPFLAGS) $(JPPFLAGS) -DDEBUGSETTING=true < cx/ath/matthew/debug/Debug.jpp > cx/ath/matthew/debug/Debug.java