Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package libreoffice for openSUSE:Factory checked in at 2024-08-23 22:26:12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libreoffice (Old) and /work/SRC/openSUSE:Factory/.libreoffice.new.2698 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libreoffice" Fri Aug 23 22:26:12 2024 rev:297 rq:1195632 version:24.8.0.3 Changes: -------- --- /work/SRC/openSUSE:Factory/libreoffice/libreoffice.changes 2024-08-06 09:07:37.647970436 +0200 +++ /work/SRC/openSUSE:Factory/.libreoffice.new.2698/libreoffice.changes 2024-08-23 22:27:28.570916747 +0200 @@ -0,0 +1,19 @@ +Thu Aug 22 15:14:06 UTC 2024 - Fridrich Strba <[email protected]> + +- Make the libassuan requirement more generic (bsc#1229103) + +------------------------------------------------------------------- +Thu Aug 22 10:23:08 UTC 2024 - Fridrich Strba <[email protected]> + +- Update to 24.8.0.3 (24.8.0 final) + https://wiki.documentfoundation.org/Releases/24.8.0/Beta1, + https://wiki.documentfoundation.org/Releases/24.8.0/RC1, + https://wiki.documentfoundation.org/Releases/24.8.0/RC2 and + https://wiki.documentfoundation.org/Releases/24.8.0/RC3 +- Removed patches: + * cve-2024-5261.patch + * icu-74-compatibility.patch + * pdfium-optional.patch + * use-fixmath-shared-library.patch + + not needed with this version + Old: ---- 185d60944ea767075d27247c3162b3bc-unowinreg.dll 1f467e5bb703f12cbbb09d5cf67ecf4a-converttexttonumber-1-5-0.oxt 35c94d2df8893241173de1d16b6034c0-swingExSrc.zip 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip 90401bca927835b6fbae4a707ed187c8-nlpsolver-0.9.tar.bz2 Java-WebSocket-1.5.4.tar.gz boost_1_82_0.tar.xz curl-8.7.1.tar.xz cve-2024-5261.patch fontconfig-2.14.2.tar.xz freetype-2.13.0.tar.xz harfbuzz-8.2.2.tar.xz icu-74-compatibility.patch icu4c-73_2-data.zip icu4c-73_2-src.tgz libassuan-2.5.7.tar.bz2 libcmis-0.6.1.tar.xz libgpg-error-1.48.tar.bz2 libreoffice-24.2.5.2.tar.xz libreoffice-24.2.5.2.tar.xz.asc libreoffice-help-24.2.5.2.tar.xz libreoffice-help-24.2.5.2.tar.xz.asc libreoffice-translations-24.2.5.2.tar.xz libreoffice-translations-24.2.5.2.tar.xz.asc pdfium-6179.tar.bz2 pdfium-optional.patch poppler-23.09.0.tar.xz tiff-4.6.0.tar.xz use-fixmath-shared-library.patch New: ---- Java-WebSocket-1.5.6.tar.gz boost_1_85_0.tar.xz curl-8.9.0.tar.xz fontconfig-2.15.0.tar.xz freetype-2.13.2.tar.xz harfbuzz-8.5.0.tar.xz icu4c-74_2-data.zip icu4c-74_2-src.tgz libassuan-3.0.1.tar.bz2 libcmis-0.6.2.tar.xz libgpg-error-1.50.tar.bz2 libreoffice-24.8.0.3.tar.xz libreoffice-24.8.0.3.tar.xz.asc libreoffice-help-24.8.0.3.tar.xz libreoffice-help-24.8.0.3.tar.xz.asc libreoffice-translations-24.8.0.3.tar.xz libreoffice-translations-24.8.0.3.tar.xz.asc pdfium-6425.tar.bz2 poppler-24.06.0.tar.xz tiff-4.6.0t.tar.xz BETA DEBUG BEGIN: Old:- Removed patches: * cve-2024-5261.patch * icu-74-compatibility.patch Old: * cve-2024-5261.patch * icu-74-compatibility.patch * pdfium-optional.patch Old: * icu-74-compatibility.patch * pdfium-optional.patch * use-fixmath-shared-library.patch Old: * pdfium-optional.patch * use-fixmath-shared-library.patch + not needed with this version BETA DEBUG END: ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libreoffice.spec ++++++ --- /var/tmp/diff_new_pack.0xeBuJ/_old 2024-08-23 22:27:37.615292909 +0200 +++ /var/tmp/diff_new_pack.0xeBuJ/_new 2024-08-23 22:27:37.619293075 +0200 @@ -78,7 +78,7 @@ %global with_gcc 12 %endif Name: libreoffice -Version: 24.2.5.2 +Version: 24.8.0.3 Release: 0 Summary: A Free Office Suite (Framework) License: LGPL-3.0-or-later AND MPL-2.0+ @@ -98,32 +98,22 @@ Source100: %{name}.changes # prebuilt extensions Source402: %{external_url}/b7cae45ad2c23551fd6ccb8ae2c1f59e-numbertext_0.9.5.oxt -# used extensions sources -Source450: %{external_url}/1f467e5bb703f12cbbb09d5cf67ecf4a-converttexttonumber-1-5-0.oxt -Source452: %{external_url}/90401bca927835b6fbae4a707ed187c8-nlpsolver-0.9.tar.bz2 -# Internal bundled stuff we can't remove -# To build this we would pull cygwin; not worth it -Source2001: https://dev-www.libreoffice.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll # hsqldb simply does not work with new system version, but luckily we migrate to firebird Source2002: %{external_url}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip Provides: bundled(hsqldb) = 1.8.0 -# Heavily patched and not possible to use system one -Source2003: %{external_url}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip -Source2004: %{external_url}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip -Provides: bundled(rhino) = 1.5R5 # Needed for wiki-published and always taken as bundled Source2005: %{external_url}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip # Needed for integration tests Source2006: https://dev-www.libreoffice.org/extern/8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar Source2007: https://dev-www.libreoffice.org/extern/odfvalidator-0.9.0-RC2-SNAPSHOT-jar-with-dependencies-2726ab578664434a545f8379a01a9faffac0ae73.jar # PDFium is bundled everywhere -Source2008: %{external_url}/pdfium-6179.tar.bz2 +Source2008: %{external_url}/pdfium-6425.tar.bz2 # Single C file with patches from LO Source2009: %{external_url}/dtoa-20180411.tgz # Skia is part of chromium and bundled everywhere as by google only way is monorepo way Source2010: %{external_url}/skia-m116-2ddcf183eb260f63698aa74d1bb380f247ad7ccd.tar.xz -Source2012: %{external_url}/libcmis-0.6.1.tar.xz -Provides: bundled(libcmis) = 0.6.1 +Source2012: %{external_url}/libcmis-0.6.2.tar.xz +Provides: bundled(libcmis) = 0.6.2 # change user config dir name from ~/.libreoffice/3 to ~/.libreoffice/3-suse # to avoid BerkleyDB incompatibility with the plain build Patch1: scp2-user-config-suse.diff @@ -131,14 +121,11 @@ # FIXME: the right fix is to compile the help and produce the .db_, .ht_, and other files Patch2: nlpsolver-no-broken-help.diff Patch3: mediawiki-no-broken-help.diff -Patch4: pdfium-optional.patch # PATCH-FIX-OPENSUSE boo#1186110 fix GCC 11 error Patch6: gcc11-fix-error.patch Patch9: fix_math_desktop_file.patch Patch10: fix_gtk_popover_on_3.20.patch Patch11: fix_webp_on_sle12_sp5.patch -# PATCH-FIX-SUSE use fixmath shared library -Patch14: use-fixmath-shared-library.patch # PATCH-FIX-SUSE Fix make distro-pack-install Patch15: fix-sdk-idl.patch # try to save space by using hardlinks @@ -147,10 +134,6 @@ Patch991: libreoffice-no-destdircheck.patch # Fix build on sle12 Patch992: python34-no-f-strings.patch -# Fix build with icu 74 (bsc#1224309) -Patch993: icu-74-compatibility.patch -# PATCH-FIX-UPSTREAM CVE-2024-5261 (bsc#1226975) -Patch994: cve-2024-5261.patch # PATCH-FIX-OPENSUSE override date in clucene files (boo#1047218) Patch995: reproducible-clucene.patch BuildRequires: %{name}-share-linker @@ -171,8 +154,8 @@ %if %{with system_curl} BuildRequires: curl-devel >= 7.68.0 %else -Source2013: %{external_url}/curl-8.7.1.tar.xz -Provides: bundled(curl) = 8.7.1 +Source2013: %{external_url}/curl-8.9.0.tar.xz +Provides: bundled(curl) = 8.9.0 %endif # Needed for tests BuildRequires: dejavu-fonts @@ -191,7 +174,6 @@ BuildRequires: graphviz BuildRequires: hyphen-devel BuildRequires: junit4 -BuildRequires: libassuan0 BuildRequires: libbase BuildRequires: libcppunit-devel >= 1.14.0 BuildRequires: liberation-fonts @@ -212,6 +194,7 @@ BuildRequires: pkgconfig BuildRequires: python3-lxml BuildRequires: python3-xml +BuildRequires: rhino BuildRequires: sac BuildRequires: ucpp BuildRequires: unixODBC-devel @@ -241,13 +224,13 @@ BuildRequires: pkgconfig(harfbuzz) >= 2.6.8 BuildRequires: pkgconfig(harfbuzz-icu) >= 2.6.8 %else -Source2025: %{external_url}/harfbuzz-8.2.2.tar.xz +Source2025: %{external_url}/harfbuzz-8.5.0.tar.xz Source2026: %{external_url}/graphite2-minimal-1.3.14.tgz Provides: bundled(graphite2) = 1.3.14 -Provides: bundled(harfbuzz) = 8.2.2 +Provides: bundled(harfbuzz) = 8.5.0 %endif # Java-WebSocket -Source3000: %{external_url}/Java-WebSocket-1.5.4.tar.gz +Source3000: %{external_url}/Java-WebSocket-1.5.6.tar.gz BuildRequires: pkgconfig(hunspell) BuildRequires: pkgconfig(krb5) BuildRequires: pkgconfig(lcms2) @@ -319,12 +302,12 @@ Obsoletes: %{name}-icon-theme-oxygen < %{version} %if 0%{?suse_version} < 1550 # Too old boost on the system -Source2020: %{external_url}/boost_1_82_0.tar.xz -Source2023: %{external_url}/poppler-23.09.0.tar.xz +Source2020: %{external_url}/boost_1_85_0.tar.xz +Source2023: %{external_url}/poppler-24.06.0.tar.xz Source2024: %{external_url}/poppler-data-0.4.12.tar.gz -Source2030: %{external_url}/tiff-4.6.0.tar.xz -Provides: bundled(boost) = 1.82.0 -Provides: bundled(poppler) = 23.06.0 +Source2030: %{external_url}/tiff-4.6.0t.tar.xz +Provides: bundled(boost) = 1.85.0 +Provides: bundled(poppler) = 24.06.0 Provides: bundled(poppler-data) = 0.4.12 %else BuildRequires: libboost_date_time-devel @@ -338,12 +321,12 @@ %endif %if 0%{?suse_version} < 1500 # Too old icu on the system -Source2021: %{external_url}/icu4c-73_2-src.tgz -Source2022: %{external_url}/icu4c-73_2-data.zip +Source2021: %{external_url}/icu4c-74_2-src.tgz +Source2022: %{external_url}/icu4c-74_2-data.zip Source2027: %{external_url}/phc-winner-argon2-20190702.tar.gz -Source2028: %{external_url}/fontconfig-2.14.2.tar.xz -Source2029: %{external_url}/freetype-2.13.0.tar.xz -Provides: bundled(icu) = 73.2 +Source2028: %{external_url}/fontconfig-2.15.0.tar.xz +Source2029: %{external_url}/freetype-2.13.2.tar.xz +Provides: bundled(icu) = 74.2 BuildRequires: libBox2D-devel BuildRequires: libmysqlclient-devel Requires(post): update-desktop-files @@ -368,11 +351,11 @@ BuildRequires: libgpgmepp-devel >= 1.14 %else Source1000: %{external_url}/gpgme-1.23.2.tar.bz2 -Source1001: %{external_url}/libgpg-error-1.48.tar.bz2 -Source1002: %{external_url}/libassuan-2.5.7.tar.bz2 +Source1001: %{external_url}/libgpg-error-1.50.tar.bz2 +Source1002: %{external_url}/libassuan-3.0.1.tar.bz2 Provides: bundled(gpgme) = 1.23.2 -Provides: bundled(libassuan) = 2.5.6 -Provides: bundled(libgpg-error) = 1.47 +Provides: bundled(libassuan) = 3.0.1 +Provides: bundled(libgpg-error) = 1.50 %endif %if %{with firebird} BuildRequires: pkgconfig(fbclient) @@ -406,6 +389,8 @@ BuildRequires: cmake(KF6WindowSystem) BuildRequires: pkgconfig(Qt6Core) BuildRequires: pkgconfig(Qt6Gui) +BuildRequires: pkgconfig(Qt6Multimedia) +BuildRequires: pkgconfig(Qt6MultimediaWidgets) BuildRequires: pkgconfig(Qt6Network) BuildRequires: pkgconfig(Qt6Widgets) BuildRequires: pkgconfig(xcb-icccm) @@ -1094,22 +1079,18 @@ %endif # Leap 42/SLE-12 %patch -P 2 %patch -P 3 -%patch -P 4 %patch -P 6 -p1 %patch -P 9 -p1 %if 0%{?suse_version} < 1500 %patch -P 10 -p1 %patch -P 11 -p1 %endif -%patch -P 14 -p1 %patch -P 15 -p1 %patch -P 990 -p1 %patch -P 991 -p1 %if 0%{?suse_version} < 1550 %patch -P 992 -p1 %endif -%patch -P 993 -p1 -%patch -P 994 -p1 # Disable some of the failing tests (some are random) %if 0%{?suse_version} < 1330 @@ -1139,8 +1120,6 @@ if grep -q setSegmentInfoStartVersion /usr/include/CLucene/index/IndexWriter.h ; then %patch -P 995 -p1 fi -# fix build with icu 75.1, remove breaking test breaking rule (bsc#1224309) -sed -i "109d" i18npool/source/breakiterator/data/sent.txt # Do not generate doxygen timestamp echo "HTML_TIMESTAMP = NO" >> odk/docs/cpp/Doxyfile ++++++ Java-WebSocket-1.5.4.tar.gz -> Java-WebSocket-1.5.6.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Java-WebSocket-1.5.4/CHANGELOG.md new/Java-WebSocket-1.5.6/CHANGELOG.md --- old/Java-WebSocket-1.5.4/CHANGELOG.md 2023-07-20 22:24:05.000000000 +0200 +++ new/Java-WebSocket-1.5.6/CHANGELOG.md 2024-02-06 22:34:32.000000000 +0100 @@ -1,6 +1,33 @@ # Change log ############################################################################### +## Version Release 1.5.6 (2024/02/06) + +#### Bugs Fixed + +* [Issue 1382](https://github.com/TooTallNate/Java-WebSocket/issues/1382) - WebSocketClient.upgradeSocketToSSL is enforcing TLS 1.2 ([PR 1387](https://github.com/TooTallNate/Java-WebSocket/pull/1387)) +* [PR 1387](https://github.com/TooTallNate/Java-WebSocket/pull/1387) - Retrieve default SSL socket factory + +#### New Features + +* [Issue 1390](https://github.com/TooTallNate/Java-WebSocket/issues/1390) - Thread created by NamedThreadFactory should be a daemon ([PR 1391](https://github.com/TooTallNate/Java-WebSocket/pull/1391)) +* [PR 1391](https://github.com/TooTallNate/Java-WebSocket/pull/1391) - Provide way to start the client/server as daemons + +In this release 2 issues and 2 pull requests were closed. + +############################################################################### + +## Version Release 1.5.5 (2023/12/18) + +#### Bugs Fixed + +* [Issue 1365](https://github.com/TooTallNate/Java-WebSocket/issues/1365) - Hang on reconnectBlocking +* [Issue 1364](https://github.com/TooTallNate/Java-WebSocket/issues/1364) - NPE during reconnect ([PR 1367](https://github.com/TooTallNate/Java-WebSocket/pull/1367)) +* [PR 1367](https://github.com/TooTallNate/Java-WebSocket/pull/1367) - Fix multiple issues related to reconnect + +In this release 2 issues and 1 pull request were closed. + +############################################################################### ## Version Release 1.5.4 (2023/07/20) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Java-WebSocket-1.5.4/README.markdown new/Java-WebSocket-1.5.6/README.markdown --- old/Java-WebSocket-1.5.4/README.markdown 2023-07-20 22:24:05.000000000 +0200 +++ new/Java-WebSocket-1.5.6/README.markdown 2024-02-06 22:34:32.000000000 +0100 @@ -30,7 +30,7 @@ <dependency> <groupId>org.java-websocket</groupId> <artifactId>Java-WebSocket</artifactId> - <version>1.5.3</version> + <version>1.5.6</version> </dependency> ``` @@ -41,11 +41,11 @@ ``` Then you can just add the latest version to your build. ```xml -compile "org.java-websocket:Java-WebSocket:1.5.3" +compile "org.java-websocket:Java-WebSocket:1.5.6" ``` Or this option if you use gradle 7.0 and above. ```xml -implementation 'org.java-websocket:Java-WebSocket:1.5.3' +implementation 'org.java-websocket:Java-WebSocket:1.5.6' ``` #### Logging diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Java-WebSocket-1.5.4/build.gradle new/Java-WebSocket-1.5.6/build.gradle --- old/Java-WebSocket-1.5.4/build.gradle 2023-07-20 22:24:05.000000000 +0200 +++ new/Java-WebSocket-1.5.6/build.gradle 2024-02-06 22:34:32.000000000 +0100 @@ -10,7 +10,7 @@ } group = 'org.java-websocket' -version = '1.5.4-SNAPSHOT' +version = '1.5.6' sourceCompatibility = 1.7 targetCompatibility = 1.7 @@ -35,8 +35,8 @@ } dependencies { - implementation group: 'org.slf4j', name: 'slf4j-api', version: '1.7.25' - testImplementation group: 'org.slf4j', name: 'slf4j-simple', version: '1.7.25' + implementation group: 'org.slf4j', name: 'slf4j-api', version: '2.0.6' + testImplementation group: 'org.slf4j', name: 'slf4j-simple', version: '2.0.6' testImplementation group: 'junit', name: 'junit', version: '4.12' testImplementation group: 'org.json', name: 'json', version: '20180813' } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Java-WebSocket-1.5.4/pom.xml new/Java-WebSocket-1.5.6/pom.xml --- old/Java-WebSocket-1.5.4/pom.xml 2023-07-20 22:24:05.000000000 +0200 +++ new/Java-WebSocket-1.5.6/pom.xml 2024-02-06 22:34:32.000000000 +0100 @@ -5,7 +5,7 @@ <groupId>org.java-websocket</groupId> <artifactId>Java-WebSocket</artifactId> <packaging>jar</packaging> - <version>1.5.4-SNAPSHOT</version> + <version>1.5.6</version> <name>Java-WebSocket</name> <description>A barebones WebSocket client and server implementation written 100% in Java</description> <url>https://github.com/TooTallNate/Java-WebSocket</url> @@ -26,7 +26,7 @@ <maven.javadoc.plugin.version>3.5.0</maven.javadoc.plugin.version> <maven.shade.plugin.version>3.4.1</maven.shade.plugin.version> <maven.source.plugin.version>3.2.1</maven.source.plugin.version> - <nexus.staging.maven.plugin.version>1.6.8</nexus.staging.maven.plugin.version> + <nexus.staging.maven.plugin.version>1.6.13</nexus.staging.maven.plugin.version> <sonar.projectKey>org.java-websocket:Java-WebSocket</sonar.projectKey> <sonar.organization>marci4-github</sonar.organization> <sonar.host.url>https://sonarcloud.io</sonar.host.url> @@ -156,6 +156,10 @@ <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-javadoc-plugin</artifactId> <version>${maven.javadoc.plugin.version}</version> + <configuration> + <sourcepath>src/main/java</sourcepath> + <additionalOptions>-Xdoclint:none</additionalOptions> + </configuration> <executions> <execution> <id>attach-javadocs</id> @@ -182,6 +186,7 @@ </goals> </execution> </executions> + </plugin> <plugin> <groupId>org.sonatype.plugins</groupId> @@ -250,7 +255,7 @@ <extensions>true</extensions> <configuration> <serverId>ossrh</serverId> - <autoReleaseAfterClose>true</autoReleaseAfterClose> + <autoReleaseAfterClose>false</autoReleaseAfterClose> <nexusUrl>https://oss.sonatype.org/</nexusUrl> </configuration> </plugin> @@ -261,72 +266,9 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-javadoc-plugin</artifactId> - </plugin> - </plugins> - </build> - </profile> - <profile> - <id>full</id> - <activation> - <activeByDefault>false</activeByDefault> - </activation> - <dependencies> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-simple</artifactId> - </dependency> - </dependencies> - <build> - <plugins> - <plugin> - <groupId>biz.aQute.bnd</groupId> - <artifactId>bnd-maven-plugin</artifactId> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-shade-plugin</artifactId> - <executions> - <execution> - <phase>package</phase> - <goals> - <goal>shade</goal> - </goals> - <configuration> - <shadedArtifactAttached>true</shadedArtifactAttached> - <shadedClassifierName>with-dependencies</shadedClassifierName> - <transformers> - <transformer - implementation="org.apache.maven.plugins.shade.resource.IncludeResourceTransformer"> - <resource>simplelogger.properties</resource> - <file>src\main\example\simplelogger.properties</file> - </transformer> - </transformers> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-source-plugin</artifactId> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jar-plugin</artifactId> - <executions> - <execution> - <goals> - <goal>test-jar</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-javadoc-plugin</artifactId> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-gpg-plugin</artifactId> + <configuration> + <additionalOptions>-Xdoclint:none</additionalOptions> + </configuration> </plugin> </plugins> </build> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Java-WebSocket-1.5.4/src/main/java/org/java_websocket/AbstractWebSocket.java new/Java-WebSocket-1.5.6/src/main/java/org/java_websocket/AbstractWebSocket.java --- old/Java-WebSocket-1.5.4/src/main/java/org/java_websocket/AbstractWebSocket.java 2023-07-20 22:24:05.000000000 +0200 +++ new/Java-WebSocket-1.5.6/src/main/java/org/java_websocket/AbstractWebSocket.java 2024-02-06 22:34:32.000000000 +0100 @@ -91,6 +91,13 @@ private boolean websocketRunning = false; /** + * Attribute to start internal threads as daemon + * + * @since 1.5.6 + */ + private boolean daemon = false; + + /** * Attribute to sync on */ private final Object syncConnectionLost = new Object(); @@ -182,7 +189,7 @@ private void restartConnectionLostTimer() { cancelConnectionLostTimer(); connectionLostCheckerService = Executors - .newSingleThreadScheduledExecutor(new NamedThreadFactory("connectionLostChecker")); + .newSingleThreadScheduledExecutor(new NamedThreadFactory("connectionLostChecker", daemon)); Runnable connectionLostChecker = new Runnable() { /** @@ -308,4 +315,25 @@ this.reuseAddr = reuseAddr; } + + /** + * Getter for daemon + * + * @return whether internal threads are spawned in daemon mode + * @since 1.5.6 + */ + public boolean isDaemon() { + return daemon; + } + + /** + * Setter for daemon + * <p> + * Controls whether or not internal threads are spawned in daemon mode + * + * @since 1.5.6 + */ + public void setDaemon(boolean daemon) { + this.daemon = daemon; + } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Java-WebSocket-1.5.4/src/main/java/org/java_websocket/WebSocketAdapter.java new/Java-WebSocket-1.5.6/src/main/java/org/java_websocket/WebSocketAdapter.java --- old/Java-WebSocket-1.5.4/src/main/java/org/java_websocket/WebSocketAdapter.java 2023-07-20 22:24:05.000000000 +0200 +++ new/Java-WebSocket-1.5.6/src/main/java/org/java_websocket/WebSocketAdapter.java 2024-02-06 22:34:32.000000000 +0100 @@ -99,7 +99,7 @@ * Default implementation for onPreparePing, returns a (cached) PingFrame that has no application * data. * - * @param conn The <tt>WebSocket</tt> connection from which the ping frame will be sent. + * @param conn The <code>WebSocket</code> connection from which the ping frame will be sent. * @return PingFrame to be sent. * @see org.java_websocket.WebSocketListener#onPreparePing(WebSocket) */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Java-WebSocket-1.5.4/src/main/java/org/java_websocket/WebSocketListener.java new/Java-WebSocket-1.5.6/src/main/java/org/java_websocket/WebSocketListener.java --- old/Java-WebSocket-1.5.4/src/main/java/org/java_websocket/WebSocketListener.java 2023-07-20 22:24:05.000000000 +0200 +++ new/Java-WebSocket-1.5.6/src/main/java/org/java_websocket/WebSocketListener.java 2024-02-06 22:34:32.000000000 +0100 @@ -38,8 +38,8 @@ import org.java_websocket.handshake.ServerHandshakeBuilder; /** - * Implemented by <tt>WebSocketClient</tt> and <tt>WebSocketServer</tt>. The methods within are - * called by <tt>WebSocket</tt>. Almost every method takes a first parameter conn which represents + * Implemented by <code>WebSocketClient</code> and <code>WebSocketServer</code>. The methods within are + * called by <code>WebSocket</code>. Almost every method takes a first parameter conn which represents * the source of the respective event. */ public interface WebSocketListener { @@ -86,7 +86,7 @@ /** * Called when an entire text frame has been received. Do whatever you want here... * - * @param conn The <tt>WebSocket</tt> instance this event is occurring on. + * @param conn The <code>WebSocket</code> instance this event is occurring on. * @param message The UTF-8 decoded message that was received. */ void onWebsocketMessage(WebSocket conn, String message); @@ -94,7 +94,7 @@ /** * Called when an entire binary frame has been received. Do whatever you want here... * - * @param conn The <tt>WebSocket</tt> instance this event is occurring on. + * @param conn The <code>WebSocket</code> instance this event is occurring on. * @param blob The binary message that was received. */ void onWebsocketMessage(WebSocket conn, ByteBuffer blob); @@ -103,16 +103,16 @@ * Called after <var>onHandshakeReceived</var> returns <var>true</var>. Indicates that a complete * WebSocket connection has been established, and we are ready to send/receive data. * - * @param conn The <tt>WebSocket</tt> instance this event is occurring on. + * @param conn The <code>WebSocket</code> instance this event is occurring on. * @param d The handshake of the websocket instance */ void onWebsocketOpen(WebSocket conn, Handshakedata d); /** - * Called after <tt>WebSocket#close</tt> is explicity called, or when the other end of the + * Called after <code>WebSocket#close</code> is explicity called, or when the other end of the * WebSocket connection is closed. * - * @param ws The <tt>WebSocket</tt> instance this event is occurring on. + * @param ws The <code>WebSocket</code> instance this event is occurring on. * @param code The codes can be looked up here: {@link CloseFrame} * @param reason Additional information string * @param remote Returns whether or not the closing of the connection was initiated by the remote @@ -123,7 +123,7 @@ /** * Called as soon as no further frames are accepted * - * @param ws The <tt>WebSocket</tt> instance this event is occurring on. + * @param ws The <code>WebSocket</code> instance this event is occurring on. * @param code The codes can be looked up here: {@link CloseFrame} * @param reason Additional information string * @param remote Returns whether or not the closing of the connection was initiated by the remote @@ -134,7 +134,7 @@ /** * send when this peer sends a close handshake * - * @param ws The <tt>WebSocket</tt> instance this event is occurring on. + * @param ws The <code>WebSocket</code> instance this event is occurring on. * @param code The codes can be looked up here: {@link CloseFrame} * @param reason Additional information string */ @@ -144,7 +144,7 @@ * Called if an exception worth noting occurred. If an error causes the connection to fail onClose * will be called additionally afterwards. * - * @param conn The <tt>WebSocket</tt> instance this event is occurring on. + * @param conn The <code>WebSocket</code> instance this event is occurring on. * @param ex The exception that occurred. <br> Might be null if the exception is not related to * any specific connection. For example if the server port could not be bound. */ @@ -153,7 +153,7 @@ /** * Called a ping frame has been received. This method must send a corresponding pong by itself. * - * @param conn The <tt>WebSocket</tt> instance this event is occurring on. + * @param conn The <code>WebSocket</code> instance this event is occurring on. * @param f The ping frame. Control frames may contain payload. */ void onWebsocketPing(WebSocket conn, Framedata f); @@ -162,7 +162,7 @@ * Called just before a ping frame is sent, in order to allow users to customize their ping frame * data. * - * @param conn The <tt>WebSocket</tt> connection from which the ping frame will be sent. + * @param conn The <code>WebSocket</code> connection from which the ping frame will be sent. * @return PingFrame to be sent. */ PingFrame onPreparePing(WebSocket conn); @@ -170,7 +170,7 @@ /** * Called when a pong frame is received. * - * @param conn The <tt>WebSocket</tt> instance this event is occurring on. + * @param conn The <code>WebSocket</code> instance this event is occurring on. * @param f The pong frame. Control frames may contain payload. **/ void onWebsocketPong(WebSocket conn, Framedata f); @@ -179,19 +179,19 @@ * This method is used to inform the selector thread that there is data queued to be written to * the socket. * - * @param conn The <tt>WebSocket</tt> instance this event is occurring on. + * @param conn The <code>WebSocket</code> instance this event is occurring on. */ void onWriteDemand(WebSocket conn); /** - * @param conn The <tt>WebSocket</tt> instance this event is occurring on. + * @param conn The <code>WebSocket</code> instance this event is occurring on. * @return Returns the address of the endpoint this socket is bound to. * @see WebSocket#getLocalSocketAddress() */ InetSocketAddress getLocalSocketAddress(WebSocket conn); /** - * @param conn The <tt>WebSocket</tt> instance this event is occurring on. + * @param conn The <code>WebSocket</code> instance this event is occurring on. * @return Returns the address of the endpoint this socket is connected to, or{@code null} if it * is unconnected. * @see WebSocket#getRemoteSocketAddress() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Java-WebSocket-1.5.4/src/main/java/org/java_websocket/client/WebSocketClient.java new/Java-WebSocket-1.5.6/src/main/java/org/java_websocket/client/WebSocketClient.java --- old/Java-WebSocket-1.5.4/src/main/java/org/java_websocket/client/WebSocketClient.java 2023-07-20 22:24:05.000000000 +0200 +++ new/Java-WebSocket-1.5.6/src/main/java/org/java_websocket/client/WebSocketClient.java 2024-02-06 22:34:32.000000000 +0100 @@ -45,7 +45,6 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; import javax.net.SocketFactory; -import javax.net.ssl.SSLContext; import javax.net.ssl.SSLException; import javax.net.ssl.SSLParameters; import javax.net.ssl.SSLSession; @@ -343,10 +342,12 @@ closeBlocking(); if (writeThread != null) { this.writeThread.interrupt(); + this.writeThread.join(); this.writeThread = null; } if (connectReadThread != null) { this.connectReadThread.interrupt(); + this.connectReadThread.join(); this.connectReadThread = null; } this.draft.reset(); @@ -372,6 +373,7 @@ throw new IllegalStateException("WebSocketClient objects are not reuseable"); } connectReadThread = new Thread(this); + connectReadThread.setDaemon(isDaemon()); connectReadThread.setName("WebSocketConnectReadThread-" + connectReadThread.getId()); connectReadThread.start(); } @@ -505,7 +507,16 @@ throw e; } + if (writeThread != null) { + writeThread.interrupt(); + try { + writeThread.join(); + } catch (InterruptedException e) { + /* ignore */ + } + } writeThread = new Thread(new WebsocketWriteThread(this)); + writeThread.setDaemon(isDaemon()); writeThread.start(); byte[] rawbuffer = new byte[WebSocketImpl.RCVBUF]; @@ -523,7 +534,6 @@ onError(e); engine.closeConnection(CloseFrame.ABNORMAL_CLOSE, e.getMessage()); } - connectReadThread = null; } private void upgradeSocketToSSL() @@ -534,9 +544,7 @@ if (socketFactory instanceof SSLSocketFactory) { factory = (SSLSocketFactory) socketFactory; } else { - SSLContext sslContext = SSLContext.getInstance("TLSv1.2"); - sslContext.init(null, null, null); - factory = sslContext.getSocketFactory(); + factory = (SSLSocketFactory) SSLSocketFactory.getDefault(); } socket = factory.createSocket(socket, uri.getHost(), getPort(), true); } @@ -801,7 +809,6 @@ handleIOException(e); } finally { closeSocket(); - writeThread = null; } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Java-WebSocket-1.5.4/src/main/java/org/java_websocket/server/WebSocketServer.java new/Java-WebSocket-1.5.6/src/main/java/org/java_websocket/server/WebSocketServer.java --- old/Java-WebSocket-1.5.4/src/main/java/org/java_websocket/server/WebSocketServer.java 2023-07-20 22:24:05.000000000 +0200 +++ new/Java-WebSocket-1.5.6/src/main/java/org/java_websocket/server/WebSocketServer.java 2024-02-06 22:34:32.000000000 +0100 @@ -71,7 +71,7 @@ import org.slf4j.LoggerFactory; /** - * <tt>WebSocketServer</tt> is an abstract class that only takes care of the + * <code>WebSocketServer</code> is an abstract class that only takes care of the * HTTP handshake portion of WebSockets. It's up to a subclass to add functionality/purpose to the * server. */ @@ -183,7 +183,7 @@ /** * Creates a WebSocketServer that will attempt to bind/listen on the given <var>address</var>, and - * comply with <tt>Draft</tt> version <var>draft</var>. + * comply with <code>Draft</code> version <var>draft</var>. * * @param address The address (host:port) this server should listen on. * @param decodercount The number of {@link WebSocketWorker}s that will be used to process @@ -245,7 +245,9 @@ if (selectorthread != null) { throw new IllegalStateException(getClass().getName() + " can only be started once."); } - new Thread(this).start(); + Thread t = new Thread(this); + t.setDaemon(isDaemon()); + t.start(); } public void stop(int timeout) throws InterruptedException { @@ -326,6 +328,20 @@ return port; } + @Override + public void setDaemon(boolean daemon) { + // pass it to the AbstractWebSocket too, to use it on the connectionLostChecker thread factory + super.setDaemon(daemon); + // we need to apply this to the decoders as well since they were created during the constructor + for (WebSocketWorker w : decoders) { + if (w.isAlive()) { + throw new IllegalStateException("Cannot call setDaemon after server is already started!"); + } else { + w.setDaemon(daemon); + } + } + } + /** * Get the list of active drafts * @@ -872,7 +888,7 @@ * Called after an opening handshake has been performed and the given websocket is ready to be * written on. * - * @param conn The <tt>WebSocket</tt> instance this event is occurring on. + * @param conn The <code>WebSocket</code> instance this event is occurring on. * @param handshake The handshake of the websocket instance */ public abstract void onOpen(WebSocket conn, ClientHandshake handshake); @@ -880,7 +896,7 @@ /** * Called after the websocket connection has been closed. * - * @param conn The <tt>WebSocket</tt> instance this event is occurring on. + * @param conn The <code>WebSocket</code> instance this event is occurring on. * @param code The codes can be looked up here: {@link CloseFrame} * @param reason Additional information string * @param remote Returns whether or not the closing of the connection was initiated by the remote @@ -891,7 +907,7 @@ /** * Callback for string messages received from the remote host * - * @param conn The <tt>WebSocket</tt> instance this event is occurring on. + * @param conn The <code>WebSocket</code> instance this event is occurring on. * @param message The UTF-8 decoded message that was received. * @see #onMessage(WebSocket, ByteBuffer) **/ @@ -919,7 +935,7 @@ /** * Callback for binary messages received from the remote host * - * @param conn The <tt>WebSocket</tt> instance this event is occurring on. + * @param conn The <code>WebSocket</code> instance this event is occurring on. * @param message The binary message that was received. * @see #onMessage(WebSocket, ByteBuffer) **/ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Java-WebSocket-1.5.4/src/main/java/org/java_websocket/util/Base64.java new/Java-WebSocket-1.5.6/src/main/java/org/java_websocket/util/Base64.java --- old/Java-WebSocket-1.5.4/src/main/java/org/java_websocket/util/Base64.java 2023-07-20 22:24:05.000000000 +0200 +++ new/Java-WebSocket-1.5.6/src/main/java/org/java_websocket/util/Base64.java 2024-02-06 22:34:32.000000000 +0100 @@ -35,7 +35,7 @@ * <br> * <code>byte[] myByteArray = Base64.decode( encoded );</code> * - * <p>The <tt>options</tt> parameter, which appears in a few places, is used to pass + * <p>The <code>options</code> parameter, which appears in a few places, is used to pass * several pieces of information to the encoder. In the "higher level" methods such as encodeBytes( * bytes, options ) the options parameter can be used to indicate such things as first gzipping the * bytes before encoding them, not inserting linefeeds, and encoding using the URL-safe and Ordered @@ -140,9 +140,9 @@ * when data that's being decoded is gzip-compressed and will decompress it * automatically. Generally things are cleaner. You'll probably have to * change some method calls that you were making to support the new - * options format (<tt>int</tt>s that you "OR" together).</li> + * options format (<code>int</code>s that you "OR" together).</li> * <li>v1.5.1 - Fixed bug when decompressing and decoding to a - * byte[] using <tt>decode( String s, boolean gzipCompressed )</tt>. + * byte[] using <code>decode( String s, boolean gzipCompressed )</code>. * Added the ability to "suspend" encoding in the Output Stream so * you can turn on and off the encoding if you need to embed base64 * data in an otherwise "normal" stream (like an XML file).</li> @@ -873,7 +873,7 @@ /** * A {@link Base64.OutputStream} will write data to another - * <tt>java.io.OutputStream</tt>, given in the constructor, + * <code>java.io.OutputStream</code>, given in the constructor, * and encode/decode to/from Base64 notation on the fly. * * @see Base64 @@ -895,7 +895,7 @@ /** * Constructs a {@link Base64.OutputStream} in ENCODE mode. * - * @param out the <tt>java.io.OutputStream</tt> to which data will be written. + * @param out the <code>java.io.OutputStream</code> to which data will be written. * @since 1.3 */ public OutputStream(java.io.OutputStream out) { @@ -914,7 +914,7 @@ * <p> * Example: <code>new Base64.OutputStream( out, Base64.ENCODE )</code> * - * @param out the <tt>java.io.OutputStream</tt> to which data will be written. + * @param out the <code>java.io.OutputStream</code> to which data will be written. * @param options Specified options. * @see Base64#ENCODE * @see Base64#DO_BREAK_LINES diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Java-WebSocket-1.5.4/src/main/java/org/java_websocket/util/NamedThreadFactory.java new/Java-WebSocket-1.5.6/src/main/java/org/java_websocket/util/NamedThreadFactory.java --- old/Java-WebSocket-1.5.4/src/main/java/org/java_websocket/util/NamedThreadFactory.java 2023-07-20 22:24:05.000000000 +0200 +++ new/Java-WebSocket-1.5.6/src/main/java/org/java_websocket/util/NamedThreadFactory.java 2024-02-06 22:34:32.000000000 +0100 @@ -34,14 +34,22 @@ private final ThreadFactory defaultThreadFactory = Executors.defaultThreadFactory(); private final AtomicInteger threadNumber = new AtomicInteger(1); private final String threadPrefix; + private final boolean daemon; public NamedThreadFactory(String threadPrefix) { this.threadPrefix = threadPrefix; + this.daemon = false; + } + + public NamedThreadFactory(String threadPrefix, boolean daemon) { + this.threadPrefix = threadPrefix; + this.daemon = daemon; } @Override public Thread newThread(Runnable runnable) { Thread thread = defaultThreadFactory.newThread(runnable); + thread.setDaemon(daemon); thread.setName(threadPrefix + "-" + threadNumber); return thread; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Java-WebSocket-1.5.4/src/test/java/org/java_websocket/server/DaemonThreadTest.java new/Java-WebSocket-1.5.6/src/test/java/org/java_websocket/server/DaemonThreadTest.java --- old/Java-WebSocket-1.5.4/src/test/java/org/java_websocket/server/DaemonThreadTest.java 1970-01-01 01:00:00.000000000 +0100 +++ new/Java-WebSocket-1.5.6/src/test/java/org/java_websocket/server/DaemonThreadTest.java 2024-02-06 22:34:32.000000000 +0100 @@ -0,0 +1,75 @@ +package org.java_websocket.server; + +import java.io.IOException; +import java.net.*; +import java.util.Set; +import java.util.concurrent.CountDownLatch; +import org.java_websocket.WebSocket; +import org.java_websocket.handshake.*; +import org.java_websocket.client.*; +import org.java_websocket.server.WebSocketServer; +import org.java_websocket.util.SocketUtil; +import org.junit.Test; +import static org.junit.Assert.assertTrue; + +public class DaemonThreadTest { + + @Test(timeout = 1000) + public void test_AllCreatedThreadsAreDaemon() throws Throwable { + + Set<Thread> threadSet1 = Thread.getAllStackTraces().keySet(); + final CountDownLatch ready = new CountDownLatch(1); + + WebSocketServer server = new WebSocketServer(new InetSocketAddress(SocketUtil.getAvailablePort())) { + @Override + public void onOpen(WebSocket conn, ClientHandshake handshake) {} + @Override + public void onClose(WebSocket conn, int code, String reason, boolean remote) {} + @Override + public void onMessage(WebSocket conn, String message) {} + @Override + public void onError(WebSocket conn, Exception ex) {} + @Override + public void onStart() {} + }; + server.setDaemon(true); + server.setDaemon(false); + server.setDaemon(true); + server.start(); + + WebSocketClient client = new WebSocketClient(URI.create("ws://localhost:" + server.getPort())) { + @Override + public void onOpen(ServerHandshake handshake) { + ready.countDown(); + } + @Override + public void onClose(int code, String reason, boolean remote) {} + @Override + public void onMessage(String message) {} + @Override + public void onError(Exception ex) {} + }; + client.setDaemon(false); + client.setDaemon(true); + client.connect(); + + ready.await(); + Set<Thread> threadSet2 = Thread.getAllStackTraces().keySet(); + threadSet2.removeAll(threadSet1); + + assertTrue("new threads created (no new threads indicates issue in test)", !threadSet2.isEmpty()); + + for (Thread t : threadSet2) + assertTrue(t.getName(), t.isDaemon()); + + boolean exception = false; + try { + server.setDaemon(false); + } catch(IllegalStateException e) { + exception = true; + } + assertTrue("exception was thrown when calling setDaemon on a running server", exception); + + server.stop(); + } +} ++++++ boost_1_82_0.tar.xz -> boost_1_85_0.tar.xz ++++++ /work/SRC/openSUSE:Factory/libreoffice/boost_1_82_0.tar.xz /work/SRC/openSUSE:Factory/.libreoffice.new.2698/boost_1_85_0.tar.xz differ: char 26, line 1 ++++++ curl-8.7.1.tar.xz -> curl-8.9.0.tar.xz ++++++ ++++ 183411 lines of diff (skipped) ++++++ fontconfig-2.14.2.tar.xz -> fontconfig-2.15.0.tar.xz ++++++ ++++ 25490 lines of diff (skipped) ++++++ freetype-2.13.0.tar.xz -> freetype-2.13.2.tar.xz ++++++ ++++ 66757 lines of diff (skipped) ++++++ harfbuzz-8.2.2.tar.xz -> harfbuzz-8.5.0.tar.xz ++++++ /work/SRC/openSUSE:Factory/libreoffice/harfbuzz-8.2.2.tar.xz /work/SRC/openSUSE:Factory/.libreoffice.new.2698/harfbuzz-8.5.0.tar.xz differ: char 26, line 1 ++++++ icu4c-73_2-data.zip -> icu4c-74_2-data.zip ++++++ /work/SRC/openSUSE:Factory/libreoffice/icu4c-73_2-data.zip /work/SRC/openSUSE:Factory/.libreoffice.new.2698/icu4c-74_2-data.zip differ: char 11, line 2 ++++++ icu4c-73_2-src.tgz -> icu4c-74_2-src.tgz ++++++ /work/SRC/openSUSE:Factory/libreoffice/icu4c-73_2-src.tgz /work/SRC/openSUSE:Factory/.libreoffice.new.2698/icu4c-74_2-src.tgz differ: char 5, line 1 ++++++ libassuan-2.5.7.tar.bz2 -> libassuan-3.0.1.tar.bz2 ++++++ ++++ 10867 lines of diff (skipped) ++++++ libcmis-0.6.1.tar.xz -> libcmis-0.6.2.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libcmis-0.6.1/ChangeLog new/libcmis-0.6.2/ChangeLog --- old/libcmis-0.6.1/ChangeLog 2023-11-13 11:09:40.000000000 +0100 +++ new/libcmis-0.6.2/ChangeLog 2023-11-13 21:07:17.000000000 +0100 @@ -1,5 +1,35 @@ # Generated by Makefile. Do not edit. +commit bda92cc01837ef933d7b6d5f94dceba6f47ec7e1 +Merge: 8b2e5ea 2cc7af1 +Author: Caolán McNamara <[email protected]> +Date: Mon Nov 13 20:06:58 2023 +0000 + + Merge pull request #50 from caolanm/bump_release + + bump release + +commit 2cc7af1fac2edc8ae13a1ac099b27f0ccadeece7 +Author: Caolán McNamara <[email protected]> +Date: Mon Nov 13 20:03:18 2023 +0000 + + bump release + +commit 8b2e5ead8d4dcf0a085e63bd79a9b51fe78aac33 +Merge: 30cef00 67ffe9c +Author: Caolán McNamara <[email protected]> +Date: Mon Nov 13 19:59:25 2023 +0000 + + Merge pull request #49 from caolanm/fix_version_info + + fix up version.info + +commit 67ffe9ceabe4ece4fe3a2db82db24021cef702f3 +Author: Caolán McNamara <[email protected]> +Date: Mon Nov 13 19:40:50 2023 +0000 + + fix up version.info + commit 30cef00bb7ea162244963cde86757b016111cc6a Merge: 5c077bd 637bc73 Author: Caolán McNamara <[email protected]> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libcmis-0.6.1/NEWS new/libcmis-0.6.2/NEWS --- old/libcmis-0.6.1/NEWS 2023-11-13 11:08:38.000000000 +0100 +++ new/libcmis-0.6.2/NEWS 2023-11-13 21:01:33.000000000 +0100 @@ -102,3 +102,7 @@ 0.6.1 * add a callback that can be used to configure libcurl + +0.6.2 + + * fix up version-info diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libcmis-0.6.1/aclocal.m4 new/libcmis-0.6.2/aclocal.m4 --- old/libcmis-0.6.1/aclocal.m4 2023-11-13 11:08:54.000000000 +0100 +++ new/libcmis-0.6.2/aclocal.m4 2023-11-13 21:07:07.000000000 +0100 @@ -20,44 +20,6 @@ If you have problems, you may need to regenerate the build system entirely. To do so, use the procedure documented by the package, typically 'autoreconf'.])]) -# =========================================================================== -# https://www.gnu.org/software/autoconf-archive/ax_require_defined.html -# =========================================================================== -# -# SYNOPSIS -# -# AX_REQUIRE_DEFINED(MACRO) -# -# DESCRIPTION -# -# AX_REQUIRE_DEFINED is a simple helper for making sure other macros have -# been defined and thus are available for use. This avoids random issues -# where a macro isn't expanded. Instead the configure script emits a -# non-fatal: -# -# ./configure: line 1673: AX_CFLAGS_WARN_ALL: command not found -# -# It's like AC_REQUIRE except it doesn't expand the required macro. -# -# Here's an example: -# -# AX_REQUIRE_DEFINED([AX_CHECK_LINK_FLAG]) -# -# LICENSE -# -# Copyright (c) 2014 Mike Frysinger <[email protected]> -# -# Copying and distribution of this file, with or without modification, are -# permitted in any medium without royalty provided the copyright notice -# and this notice are preserved. This file is offered as-is, without any -# warranty. - -#serial 2 - -AC_DEFUN([AX_REQUIRE_DEFINED], [dnl - m4_ifndef([$1], [m4_fatal([macro ]$1[ is not defined; is a m4 file missing?])]) -])dnl AX_REQUIRE_DEFINED - # pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- # serial 11 (pkg-config-0.29.1) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libcmis-0.6.1/configure new/libcmis-0.6.2/configure --- old/libcmis-0.6.1/configure 2023-11-13 11:08:57.000000000 +0100 +++ new/libcmis-0.6.2/configure 2023-11-13 21:07:07.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.71 for libcmis 0.6.1. +# Generated by GNU Autoconf 2.71 for libcmis 0.6.2. # # # Copyright (C) 1992-1996, 1998-2017, 2020-2021 Free Software Foundation, @@ -618,8 +618,8 @@ # Identity of this package. PACKAGE_NAME='libcmis' PACKAGE_TARNAME='libcmis' -PACKAGE_VERSION='0.6.1' -PACKAGE_STRING='libcmis 0.6.1' +PACKAGE_VERSION='0.6.2' +PACKAGE_STRING='libcmis 0.6.2' PACKAGE_BUGREPORT='' PACKAGE_URL='' @@ -1417,7 +1417,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures libcmis 0.6.1 to adapt to many kinds of systems. +\`configure' configures libcmis 0.6.2 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1488,7 +1488,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of libcmis 0.6.1:";; + short | recursive ) echo "Configuration of libcmis 0.6.2:";; esac cat <<\_ACEOF @@ -1625,7 +1625,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -libcmis configure 0.6.1 +libcmis configure 0.6.2 generated by GNU Autoconf 2.71 Copyright (C) 2021 Free Software Foundation, Inc. @@ -2095,7 +2095,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by libcmis $as_me 0.6.1, which was +It was created by libcmis $as_me 0.6.2, which was generated by GNU Autoconf 2.71. Invocation command line was $ $0$ac_configure_args_raw @@ -3580,7 +3580,7 @@ # Define the identity of the package. PACKAGE='libcmis' - VERSION='0.6.1' + VERSION='0.6.2' printf "%s\n" "#define PACKAGE \"$PACKAGE\"" >>confdefs.h @@ -21012,7 +21012,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by libcmis $as_me 0.6.1, which was +This file was extended by libcmis $as_me 0.6.2, which was generated by GNU Autoconf 2.71. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -21071,7 +21071,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config='$ac_cs_config_escaped' ac_cs_version="\\ -libcmis config.status 0.6.1 +libcmis config.status 0.6.2 configured by $0, generated by GNU Autoconf 2.71, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libcmis-0.6.1/configure.ac new/libcmis-0.6.2/configure.ac --- old/libcmis-0.6.1/configure.ac 2023-11-13 11:08:38.000000000 +0100 +++ new/libcmis-0.6.2/configure.ac 2023-11-13 21:07:05.000000000 +0100 @@ -3,7 +3,7 @@ m4_define([libcmis_major_version], [0]) m4_define([libcmis_minor_version], [6]) -m4_define([libcmis_micro_version], [1]) +m4_define([libcmis_micro_version], [2]) m4_define([libcmis_api_version], [libcmis_major_version.libcmis_minor_version]) m4_define([libcmis_version],[libcmis_api_version.libcmis_micro_version]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libcmis-0.6.1/src/libcmis/Makefile.am new/libcmis-0.6.2/src/libcmis/Makefile.am --- old/libcmis-0.6.1/src/libcmis/Makefile.am 2023-11-13 11:08:38.000000000 +0100 +++ new/libcmis-0.6.2/src/libcmis/Makefile.am 2023-11-13 21:01:33.000000000 +0100 @@ -132,7 +132,11 @@ ws-versioningservice.hxx \ xml-utils.cxx -libcmis_@LIBCMIS_API_VERSION@_la_LDFLAGS = -export-dynamic -no-undefined -version-info 6:0:1 +# -version-info current:revision:age see https://autotools.info/libtool/version.html +# Always increase the revision value. +# Increase the current value whenever an interface has been added, removed or changed. +# Increase the age value only if the changes made to the ABI are backward compatible. +libcmis_@LIBCMIS_API_VERSION@_la_LDFLAGS = -export-dynamic -no-undefined -version-info 7:1:1 libcmis_@LIBCMIS_API_VERSION@_la_LIBADD = \ libcmis.la \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libcmis-0.6.1/src/libcmis/Makefile.in new/libcmis-0.6.2/src/libcmis/Makefile.in --- old/libcmis-0.6.1/src/libcmis/Makefile.in 2023-11-13 11:08:56.000000000 +0100 +++ new/libcmis-0.6.2/src/libcmis/Makefile.in 2023-11-13 21:07:07.000000000 +0100 @@ -600,7 +600,12 @@ ws-versioningservice.hxx \ xml-utils.cxx -libcmis_@LIBCMIS_API_VERSION@_la_LDFLAGS = -export-dynamic -no-undefined -version-info 6:0:1 + +# -version-info current:revision:age see https://autotools.info/libtool/version.html +# Always increase the revision value. +# Increase the current value whenever an interface has been added, removed or changed. +# Increase the age value only if the changes made to the ABI are backward compatible. +libcmis_@LIBCMIS_API_VERSION@_la_LDFLAGS = -export-dynamic -no-undefined -version-info 7:1:1 libcmis_@LIBCMIS_API_VERSION@_la_LIBADD = \ libcmis.la \ $(XML2_LIBS) \ ++++++ libgpg-error-1.48.tar.bz2 -> libgpg-error-1.50.tar.bz2 ++++++ ++++ 8072 lines of diff (skipped) ++++++ libreoffice-24.2.5.2.tar.xz -> libreoffice-24.8.0.3.tar.xz ++++++ /work/SRC/openSUSE:Factory/libreoffice/libreoffice-24.2.5.2.tar.xz /work/SRC/openSUSE:Factory/.libreoffice.new.2698/libreoffice-24.8.0.3.tar.xz differ: char 15, line 1 ++++++ libreoffice-help-24.2.5.2.tar.xz -> libreoffice-help-24.8.0.3.tar.xz ++++++ /work/SRC/openSUSE:Factory/libreoffice/libreoffice-help-24.2.5.2.tar.xz /work/SRC/openSUSE:Factory/.libreoffice.new.2698/libreoffice-help-24.8.0.3.tar.xz differ: char 15, line 1 ++++++ libreoffice-translations-24.2.5.2.tar.xz -> libreoffice-translations-24.8.0.3.tar.xz ++++++ /work/SRC/openSUSE:Factory/libreoffice/libreoffice-translations-24.2.5.2.tar.xz /work/SRC/openSUSE:Factory/.libreoffice.new.2698/libreoffice-translations-24.8.0.3.tar.xz differ: char 15, line 1 ++++++ pdfium-6179.tar.bz2 -> pdfium-6425.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/libreoffice/pdfium-6179.tar.bz2 /work/SRC/openSUSE:Factory/.libreoffice.new.2698/pdfium-6425.tar.bz2 differ: char 11, line 1 ++++++ poppler-23.09.0.tar.xz -> poppler-24.06.0.tar.xz ++++++ ++++ 23909 lines of diff (skipped)
