Accepting request 1204564 from Java:packages

Fix build after removal of the default %%{java_home} define

OBS-URL: https://build.opensuse.org/request/show/1204564
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libtcnative-1-0?expand=0&rev=42

libtcnative-1-0.changes

@@ -1,43 +1,93 @@
+-------------------------------------------------------------------
+Sun Sep 29 19:47:27 UTC 2024 - Fridrich Strba <fstrba@suse.com>
+
+- Fix build after removal of the default %%{java_home} define
+
+-------------------------------------------------------------------
+Tue Feb 13 09:05:45 UTC 2024 - Pedro Monreal <pmonreal@suse.com>
+
+- Update to 1.2.39:
+  * Fix: 67061: If the insecure optionalNoCA certificate verification
+    mode is used, disable OCSP if enabled else client certificates
+    from unknown certificate authorities will be rejected.
+  * Update: Update the recommended minimum version of OpenSSL to
+    3.0.11.
+  * Change the hardcoded libopenssl-1_1-devel to libopenssl-devel
+    for distributions that have the right version
+
 -------------------------------------------------------------------
 Tue Nov 14 08:56:49 UTC 2023 - Michele Bussolotto <michele.bussolotto@suse.com>
 
 - Version update to version 1.2.38:
-  * Update:  Align default pass phrase prompt with HTTPd. (michaelo)
-  * Fix:  66669: Fix memory leak in SNI processing. (markt)
-  * Update:  Update the recommended minimum version of OpenSSL to 1.1.1v. (markt)
-  * Update:  Update the recommended minimum version of APR to 1.7.4. (markt)
-  * Docs:  Document the TLS rengotiation behaviour. (markt)
-  * Docs:  Add HOWTO-RELEASE.txt that describes the release process. (markt)
-  * Code:  Refactor library initialization so it is compatible with Tomcat 10.1.x onwards where a number of Java classes have been removed. (markt)
-  * Add:  Map the OpenSSL 3.x FIPS behaviour to the OpenSSL 1.x API to allow clients to determine if the FIPS provider is being used when Tomcat Native is compiled against OpenSSL 3.x. (markt)
-  * Fix:  66035: Fix crash when attempting to read TLS session ID after a handshake failure. (schultz/markt)
-  * Fix:  Enable download_deps.sh to be called from any directory. Pull request #12 provided by Dimitrios Soumis. (markt)
-  * Fix:  Fix release script so it works with the current git layout. (markt)
-  * Fix:  65441: Correct previous fix that enabled building to continue with OpenSSL 3.x. Patch provided by lzsiga. (markt)
-  * Fix:  65659: Remove remaining reference to pkg-config which is no longer included in the Tomcat Native distribution. (markt)
-  * Add:  65181: Additional changes required to provided support for using OpenSSL Engines that use proprietary key formats. Based on a patch provided by Edin Hodzic. (markt)
-  * Fix:  65329: Correct handling of WINVER in make file to use correct constant for Windows 7. Add constants for Windows 8, Windows 8.1 and Windows 10. Rename WINNT to WIN2k as it is used for Windows 2000 upwards, not Windows NT upwards. (markt)
-  * Fix:  Add a patch for APR that fixes an issue where some Windows systems in some configurations would only listen on IPv6 addresses on dual stack systems even though configured to listen on both IPv6 and IPv4 addresses. (michaelo)
-  * Fix:  Correct a regression in the fix for 65181 that prevented an error message from being displayed if an invalid key file was provided and no OpenSSL Engine was configured. (markt)
-  * Add:  65181: Improve support for using OpenSSL Engines that use proprietary key formats. Patch provided by Edin Hodzic. (markt)
-  * Fix:  Enable building to continue against OpenSSL 3.x and 1.1.1. (markt)
-  * Fix:  Incomplete name mangling fix for C++ compilers in tcn_api.h. (michaelo)
-  * Update:  Improve OS-specific header include for native thread id. (michaelo)
-  * Fix:  Disable keylog callback support for LibreSSL. (michaelo)
-  * Add:  Add support for SSLContext.addChainCertificateRaw() with LibreSSL 2.9.1 and up. (michaelo)
-  * Add:  Add support for HP-UX's _lwp_self() in our ssl_thread_id(void). (michaelo)
-  * Remove default option passed for rpath to linker on HP-UX. (michaelo)
-  * Add:  Add an option to allow the OCSP responder check to be bypassed. Note that if OCSP is enabled, a missing responder is now treated as an error. (jfclere)
-  * Fix:  64429: Fix compilation with LibreSSL. (markt)
-  * Fix:  63671: libtcnative does not compile with OpenSSL < 1.1.0 and APR w/o threading support. (michaelo)
-  * Fix:  Correct configure message for OpenSSL libdir. (michaelo)
-  * Update:  64260: Clean up install target. (michaelo)
-  * Fix:  64315: configure output for OpenSSL wrong/incomplete sometimes. (michaelo)
-  * Update:  Drop obsolete build time workarounds for HP-UX. (michaelo)
-  * Add:  Add support for FreeBSD's pthread_getthreadid_np() in our ssl_thread_id(void). (michaelo)
-  * Add:  64316: Introduce tcn_get_thread_id(void) to reduce code duplication. (michaelo)
-  * Fix:  Fix linking against OpenSSL in non-standard locations on FreeBSD. (michaelo)
-  * 
+  * Align default pass phrase prompt with HTTPd.
+  * #66669: Fix memory leak in SNI processing.
+  * Update the recommended minimum version of OpenSSL to 1.1.1v.
+  * Update the recommended minimum version of APR to 1.7.4.
+  * Document the TLS rengotiation behaviour.
+  * Add HOWTO-RELEASE.txt that describes the release process.
+  * Refactor library initialization so it is compatible with Tomcat
+    10.1.x onwards where a number of Java classes have been removed.
+  * Map the OpenSSL 3.x FIPS behaviour to the OpenSSL 1.x API to
+    allow clients to determine if the FIPS provider is being used
+    when Tomcat Native is compiled against OpenSSL 3.x.
+  * #66035: Fix crash when attempting to read TLS session ID after
+    a handshake failure.
+  * Enable download_deps.sh to be called from any directory.
+  * Fix release script so it works with the current git layout.
+  * #65441: Correct previous fix that enabled building to continue
+    with OpenSSL 3.x.
+  * #65659: Remove remaining reference to pkg-config which is no
+    longer included in the Tomcat Native distribution.
+  * #65181: Additional changes required to provided support for
+    using OpenSSL Engines that use proprietary key formats.
+  * #65329: Correct handling of WINVER in make file to use correct
+    constant for Windows 7. Add constants for Windows 8, Windows 8.1
+    and Windows 10. Rename WINNT to WIN2k as it is used for Windows
+    2000 upwards, not Windows NT upwards.
+  * Add a patch for APR that fixes an issue where some Windows
+    systems in some configurations would only listen on IPv6
+    addresses on dual stack systems even though configured to listen
+    on both IPv6 and IPv4 addresses.
+  * Correct a regression in the fix for 65181 that prevented an
+    error message from being displayed if an invalid key file was
+    provided and no OpenSSL Engine was configured.
+  * #65181: Improve support for using OpenSSL Engines that use
+    proprietary key formats.
+  * Enable building to continue against OpenSSL 3.x and 1.1.1.
+  * Incomplete name mangling fix for C++ compilers in tcn_api.h.
+  * Improve OS-specific header include for native thread id.
+  * Disable keylog callback support for LibreSSL.
+  * Add support for SSLContext.addChainCertificateRaw() with
+    LibreSSL 2.9.1 and up.
+  * Add support for HP-UX's _lwp_self() in our ssl_thread_id(void).
+  * Remove default option passed for rpath to linker on HP-UX.
+  * Add an option to allow the OCSP responder check to be bypassed.
+    Note that if OCSP is enabled, a missing responder is now treated
+    as an error.
+  * #64429: Fix compilation with LibreSSL.
+  * #63671: libtcnative does not compile with OpenSSL < 1.1.0 and
+    APR w/o threading support.
+  * Correct configure message for OpenSSL libdir.
+  * #64260: Clean up install target.
+  * #64315: configure output for OpenSSL wrong/incomplete sometimes.
+  * Drop obsolete build time workarounds for HP-UX.
+  * Add support for FreeBSD's pthread_getthreadid_np() in our
+    ssl_thread_id(void).
+  * #64316: Introduce tcn_get_thread_id(void) to reduce code
+    duplication.
+  * Fix linking against OpenSSL in non-standard locations on FreeBSD.
+- Removed patch:
+  * libtcnative-1-0-bsc1199170.patch
+    + fix integrated
+
+-------------------------------------------------------------------
+Fri Jul 29 09:12:29 UTC 2022 - pgajdos@suse.com
+
+- Fix for SG#63251, bsc#1199170 (thanks to ohollmann@suse.com)
+- added patches
+  fix https://github.com/apache/tomcat-native/commit/5ac1175a0cf24aae2a285b3f3fb877ff83aef0c0
+  + libtcnative-1-0-bsc1199170.patch
+
 -------------------------------------------------------------------
 Thu Nov  7 11:04:12 UTC 2019 - Matei Albu <malbu@suse.com>
 

libtcnative-1-0.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package libtcnative-1-0
 #
-# Copyright (c) 2023 SUSE LLC
+# Copyright (c) 2024 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -16,8 +16,9 @@
 #
 
 
+%{!?make_build:%global make_build make %{?_smp_mflags}}
 Name:           libtcnative-1-0
-Version:        1.2.38
+Version:        1.2.39
 Release:        0
 Summary:        Tomcat resources for performance, compatibility, etc
 License:        Apache-2.0
@@ -31,12 +32,16 @@ BuildRequires:  fdupes
 BuildRequires:  java-devel
 BuildRequires:  javapackages-tools
 BuildRequires:  libapr1-devel >= 1.4.3
-BuildRequires:  libopenssl-1_1-devel
 BuildRequires:  pkgconfig
 # Upstream compatibility:
 Provides:       tcnative = %{version}
 #Fedora compatibility
 Provides:       tomcat-native = %{version}
+%if 0%{?suse_version} >= 1550
+BuildRequires:  libopenssl-devel >= 3.0.11
+%else
+BuildRequires:  libopenssl-1_1-devel
+%endif
 
 %description
 The Apache Tomcat Native Library is an optional component for use
@@ -93,9 +98,8 @@ Features of the APR connector:
 cd native
 %configure \
     --with-apr=%{_bindir}/apr-1-config \
-    --with-java-home=%{java_home} \
     --with-java-platform=2
-make %{?_smp_mflags}
+%make_build
 
 %install
 make -C native install DESTDIR=%{buildroot}

tomcat-native-1.2.38-src.tar.gz

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

tomcat-native-1.2.38-src.tar.gz.asc

@@ -1,17 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Comment: GPGTools - http://gpgtools.org
-
-iQIzBAABCgAdFiEEqcXfTSLpmZjZh1pREMAcWi9gWecFAmTKJLMACgkQEMAcWi9g
-WednzQ//cw5Xbs/JH8p/LwAyTcH6k4f+0RwtGRALq4SKe6yHkvsIP1KMl+hlrTHb
-AgmpeMLpkUkyciSlT6UMuxtO4gDhLhhuEE6qdeyJwzuSA24FqlU2YNMmBwvzvaQB
-itRAIa4NiXY17vsfzr7qBUJX7r8RlqNcH3YYPAYJ5JPNVBJXfT8FQXTA01GN+ASw
-UIwymsusK/abilxnvdPzUYiyyejS9s8bNpIDE+++KnlORcdNHWiRzmBQ+FE7B6AC
-CrNPisvhFajKZCMTeGrNvWXdria1tCctkOxxN4nF2fbo7QVna24NSidCIT7CM7ZD
-zXeEhjZoxuqZKpgZ4JwYza3DYjIhyT7qZTI95tbbyWYNaN87k14Acp3k9yspWXTe
-DaLShhk7GkwPbv4VbAd8e29jNaTSPB6Ue4njhvH6xglAq3IHUjKBf7ZNc3ChDPxt
-9UsFFb+rBwvNygLs2QTIzEae8rLCDP/ZdtOFQgssjn1N8t0buNlrTBUOTqIu226X
-88KSPbMPcF3P0KN4EpxUk94I8+gfFh19IowW3IhmgwaQKYKvTLv/6N94RppI0wAc
-pMsygpogcRxyDIgyJBh/8ZCoAT4vDUy9hzpy6Xyyf48EmX9sEf0c7kd47gqtKCEG
-AdvoQvYtOEtMX7O6ppk0yveJ514M2zwBjPZCNbcafaL72bc0GOg=
-=8pT6
------END PGP SIGNATURE-----

tomcat-native-1.2.39-src.tar.gz.asc

@@ -0,0 +1,17 @@
+-----BEGIN PGP SIGNATURE-----
+Comment: GPGTools - http://gpgtools.org
+
+iQIzBAABCgAdFiEEqcXfTSLpmZjZh1pREMAcWi9gWecFAmUVhLsACgkQEMAcWi9g
+WecKeA/9Eb3ZkGAs0l3BRxLKxatVGdQj4dKgxMLJxp5zOhuVX7msHmNo80IPQdqh
+ZK0OHVbs1sCUCGfET3f6bhPGFLPx5zKN2PVib4PHZRshhbpGyuXwhr9DszMzfF7n
+vFdldYA68S61RtgpJyihcBA0bAhR8pq4Eg1WoIjJ/E8mlB1rY9B5Q81uXwHaOlcc
+103ppJF5lTRhDno8Rnfvw38e1Dq2FpWa4HQrIEMhbcKmAhHkXHQA2/6oz6DI0Y9f
+oRZV2bWS7tWbPGCBL639nKuaLXqUSwv01aLEeLqZD00ELElCrBImb8Hlb7ZwNS5n
+cnusV5tgnD4snZFLhpJC9CTYMV/tRNY+bOXDJSQ511XVdsIu0gOaiEplTaATDe4z
+JrfWpmu9IsJwQnPLqiqg9dnF5IYpMYwiwNu3bpFD7RX1ae4D8z8nC2Rv9hvgfURN
+BkDrt/1utEelsRqH6N6lxoGeSiv/RYyT+OU9idRZRmK8paOIH04kAn/IKptlqSYt
+Ue7aHrUxysQGMj7XklU6g4jHIB+6n7R2vtRlu+S237j9zF97Wct8cbLth/5UOwyb
+nfLMcLqVIn/geDOWn+hKqMfjltrinH2L7kYNOR6ao7OWGjPLEn4wD43SAVLm7vXH
+1MRAQG32O1oh6mVQROwLU2KD5UM1e4LQew4R39zb+TBYAMsAzxQ=
+=VA+0
+-----END PGP SIGNATURE-----