openSUSE Commits
Threads by month
- ----- 2024 -----
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2013 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2012 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2011 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2010 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2009 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2008 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2007 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2006 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
October 2024
- 1 participants
- 1410 discussions
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package java-11-openjdk for openSUSE:Factory checked in at 2024-10-28 15:17:46
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/java-11-openjdk (Old)
and /work/SRC/openSUSE:Factory/.java-11-openjdk.new.2020 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "java-11-openjdk"
Mon Oct 28 15:17:46 2024 rev:75 rq:1218723 version:11.0.25.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/java-11-openjdk/java-11-openjdk.changes 2024-07-19 15:26:07.176280384 +0200
+++ /work/SRC/openSUSE:Factory/.java-11-openjdk.new.2020/java-11-openjdk.changes 2024-10-28 15:17:54.105408191 +0100
@@ -1,0 +2,311 @@
+Mon Oct 28 07:22:16 UTC 2024 - Fridrich Strba <fstrba(a)suse.com>
+
+- Upgrade to upstream tag jdk-11.0.25+9 (October 2024 CPU)
+ * Security fixes
+ + JDK-8290367, JDK-8332643: Update default value and extend the
+ scope of com.sun.jndi.ldap.object.trustSerialData system
+ property
+ + JDK-8307383: Enhance DTLS connections
+ + JDK-8328286, CVE-2024-21208, bsc#1231702: Enhance HTTP client
+ + JDK-8328544, CVE-2024-21210, bsc#1231711: Improve handling of
+ vectorization
+ + JDK-8328726: Better Kerberos support
+ + JDK-8331446, CVE-2024-21217, bsc#1231716: Improve
+ deserialization support
+ + JDK-8332644, CVE-2024-21235, bsc#1231719: Improve graph
+ optimizations
+ + JDK-8335713: Enhance vectorization analysis
+ * Other changes
+ + JDK-7124313: [macosx] Swing Popups should overlap taskbar
+ + JDK-7156347: javax/swing/JList/6462008/bug6462008.java fails
+ + JDK-8078725: method adjustments can be done just once for all
+ classes involved into redefinition
+ + JDK-8205076: [17u] Inet6AddressImpl.c: 'lookupIfLocalHost'
+ accesses 'int InetAddress.preferIPv6Address' as a boolean
+ + JDK-8206440: Remove javac -source/-target 6 from jdk
+ regression tests
+ + JDK-8210338: Better output for GenerationTests.java
+ + JDK-8211920: Close server socket and cleanups in
+ test/jdk/javax/naming/module/RunBasic.java
+ + JDK-8222005: ClassRedefinition crashes with: guarantee(false)
+ failed: OLD and/or OBSOLETE method(s) found
+ + JDK-8222884: ConcurrentClassDescLookup.java times out
+ intermittently
+ + JDK-8224081: SOCKS v4 tests require IPv4
+ + JDK-8227122: [TESTBUG] Create Docker sidecar test cases
+ + JDK-8229822: ThrowingPushPromises tests sometimes fail due to
+ EOF
+ + JDK-8231427: Warning cleanup in tests of java.io.Serializable
+ + JDK-8236917: TestInstanceKlassSize.java fails with "The size
+ computed by SA for java.lang.Object does not match"
+ + JDK-8238169: BasicDirectoryModel getDirectories and
+ DoChangeContents.run can deadlock
+ + JDK-8240226: DeflateIn_InflateOut.java test incorrectly
+ assumes size of compressed file
+ + JDK-8242999: HTTP/2 client may not handle CONTINUATION frames
+ correctly
+ + JDK-8244966: Add .vscode to .hgignore and .gitignore
+ + JDK-8249097: test/lib/jdk/test/lib/util/JarBuilder.java has a
+ bad copyright
+ + JDK-8249772: (ch) Improve
+ sun/nio/ch/TestMaxCachedBufferSize.java
+ + JDK-8249826: 5 javax/net/ssl/SSLEngine tests use @ignore w/o
+ bug-id
+ + JDK-8251188: Update LDAP tests not to use wildcard addresses
+ + JDK-8253207: enable problemlists jcheck's check
+ + JDK-8255898: Test java/awt/FileDialog/FilenameFilterTest/
+ /FilenameFilterTest.java fails on Mac OS
+ + JDK-8255913: Decrease number of iterations in
+ TestMaxCachedBufferSize
+ + JDK-8255969: Improve java/io/BufferedInputStream/
+ /LargeCopyWithMark.java using jtreg tags
+ + JDK-8259274: Increase timeout duration in
+ sun/nio/ch/TestMaxCachedBufferSize.java
+ + JDK-8260633: [macos] java/awt/dnd/MouseEventAfterStartDragTest/
+ /MouseEventAfterStartDragTest.html test failed
+ + JDK-8261433: Better pkcs11 performance for
+ libpkcs11:C_EncryptInit/libpkcs11:C_DecryptInit
+ + JDK-8263031: HttpClient throws Exception if it receives a
+ Push Promise that is too large
+ + JDK-8266149: mark hotspot compiler/startup tests which ignore
+ VM flags
+ + JDK-8266150: mark hotspot compiler/arguments tests which
+ ignore VM flags
+ + JDK-8266153: mark hotspot compiler/onSpinWait tests which
+ ignore VM flags
+ + JDK-8266154: mark hotspot compiler/oracle tests which ignore
+ VM flags
+ + JDK-8268906: gc/g1/mixedgc/TestOldGenCollectionUsage.java
+ assumes that GCs take 1ms minimum
+ + JDK-8269428: java/util/concurrent/ConcurrentHashMap/
+ /ToArray.java timed out
+ + JDK-8269616: serviceability/dcmd/framework/VMVersionTest.java
+ fails with Address already in use error
+ + JDK-8273135: java/awt/color/ICC_ColorSpace/
+ /MTTransformReplacedProfile.java crashes in liblcms.dylib with
+ NULLSeek+0x7
+ + JDK-8275851: Deproblemlist open/test/jdk/javax/swing/
+ /JComponent/6683775/bug6683775.java
+ + JDK-8276036: The value of full_count in the message of
+ insufficient codecache is wrong
+ + JDK-8276306: jdk/jshell/CustomInputToolBuilder.java fails
+ intermittently on storage acquisition
+ + JDK-8276819: javax/print/PrintServiceLookup/
+ /FlushCustomClassLoader.java fails to free
+ + JDK-8279164: Disable TLS_ECDH_* cipher suites
+ + JDK-8279337: The MToolkit is still referenced in a few places
+ + JDK-8280392: java/awt/Focus/NonFocusableWindowTest/
+ /NonfocusableOwnerTest.java failed with "RuntimeException:
+ Test failed."
+ + JDK-8284585: PushPromiseContinuation test fails
+ intermittently in timeout
+ + JDK-8286601: Mac Aarch: Excessive warnings to be ignored for
+ build jdk
+ + JDK-8286781: Replace the deprecated/obsolete gethostbyname
+ and inet_addr calls
+ + JDK-8292044: HttpClient doesn't handle 102 or 103 properly
+ + JDK-8294148: Support JSplitPane for instructions and test UI
+ + JDK-8294310: compare.sh fails on macos after JDK-8293550
+ + JDK-8296410: HttpClient throws java.io.IOException: no
+ statuscode in response for HTTP2
+ + JDK-8298873: Update IllegalRecordVersion.java for changes to
+ TLS implementation
+ + JDK-8299058: AssertionError in sun.net.httpserver.ServerImpl
+ when connection is idle
+ + JDK-8299487: Test
+ java/net/httpclient/whitebox/SSLTubeTestDriver.java timed out
+ + JDK-8301189: validate-source fails after JDK-8298873
+ + JDK-8303216: Prefer ArrayList to LinkedList in
+ sun.net.httpserver.ServerImpl
+ + JDK-8303965: java.net.http.HttpClient should reset the stream
+ if response headers contain malformed header fields
+ + JDK-8305072: Win32ShellFolder2.compareTo is inconsistent
+ + JDK-8305079: Remove finalize() from compiler/c2/Test719030
+ + JDK-8305081: Remove finalize() from
+ test/hotspot/jtreg/compiler/runtime/Test8168712
+ + JDK-8305825: getBounds API returns wrong value resulting in
+ multiple Regression Test Failures on Ubuntu 23.04
+ + JDK-8305906: HttpClient may use incorrect key when finding
+ pooled HTTP/2 connection for IPv6 address
+ + JDK-8306060: Open source few AWT Insets related tests
+ + JDK-8306432: Open source several AWT Text Component related
+ tests
+ + JDK-8306466: Open source more AWT Drag & Drop related tests
+ + JDK-8306489: Open source AWT List related tests
+ + JDK-8306566: Open source several clipboard AWT tests
+ + JDK-8306850: Open source AWT Modal related tests
+ + JDK-8307091: A few client tests intermittently throw
+ ConcurrentModificationException
+ + JDK-8307779: Relax the java.awt.Robot specification
+ + JDK-8308184: Launching java with large number of jars in
+ classpath with java.protocol.handler.pkgs system property set
+ can lead to StackOverflowError
+ + JDK-8309934: Update GitHub Actions to use JDK 17 for building
+ jtreg
+ + JDK-8310201: Reduce verbose locale output in -XshowSettings
+ launcher option
+ + JDK-8311666: Disabled tests in test/jdk/sun/java2d/marlin
+ + JDK-8312140: jdk/jshell tests failed with JDI socket timeouts
+ + JDK-8314614: jdk/jshell/ImportTest.java failed with
+ "InternalError: Failed remote listen"
+ + JDK-8315422: getSoTimeout() would be in try block in
+ SSLSocketImpl
+ + JDK-8315437: Enable parallelism in
+ vmTestbase/nsk/monitoring/stress/classload tests
+ + JDK-8315442: Enable parallelism in
+ vmTestbase/nsk/monitoring/stress/thread tests
+ + JDK-8315804: Open source several Swing JTabbedPane JTextArea
+ JTextField tests
+ + JDK-8315898: Open source swing JMenu tests
+ + JDK-8315965: Open source various AWT applet tests
+ + JDK-8316104: Open source several Swing SplitPane and
+ RadioButton related tests
+ + JDK-8316211: Open source several manual applet tests
+ + JDK-8316240: Open source several add/remove MenuBar manual
+ tests
+ + JDK-8316285: Opensource JButton manual tests
+ + JDK-8316306: Open source and convert manual Swing test
+ + JDK-8316328: Test jdk/jfr/event/oldobject/
+ /TestSanityDefault.java times out for some heap sizes
+ + JDK-8316462: sun/jvmstat/monitor/MonitoredVm/
+ /MonitorVmStartTerminate.java ignores VM flags
+ + JDK-8316973: GC: Make TestDisableDefaultGC use createTestJvm
+ + JDK-8317039: Enable specifying the JDK used to run jtreg
+ + JDK-8317228: GC: Make TestXXXHeapSizeFlags use createTestJvm
+ + JDK-8317288: [macos] java/awt/Window/Grab/GrabTest.java:
+ Press on the outside area didn't cause ungrab
+ + JDK-8317316: G1: Make TestG1PercentageOptions use
+ createTestJvm
+ + JDK-8317343: GC: Make TestHeapFreeRatio use createTestJvm
+ + JDK-8317358: G1: Make TestMaxNewSize use createTestJvm
+ + JDK-8317807: JAVA_FLAGS removed from jtreg running in
+ JDK-8317039
+ + JDK-8318039: GHA: Bump macOS and Xcode versions
+ + JDK-8320079: The ArabicBox.java test has no control buttons
+ + JDK-8320570: NegativeArraySizeException decoding >1G UTF8
+ bytes with non-ascii characters
+ + JDK-8320602: Lock contention in SchemaDVFactory.getInstance()
+ + JDK-8320945: problemlist tests failing on latest Windows 11
+ update
+ + JDK-8322330: JavadocHelperTest.java OOMEs with Parallel GC
+ and ZGC
+ + JDK-8323670: A few client tests intermittently throw
+ ConcurrentModificationException
+ + JDK-8324755: Enable parallelism in
+ vmTestbase/gc/gctests/LargeObjects tests
+ + JDK-8325022: Incorrect error message on client authentication
+ + JDK-8325179: Race in BasicDirectoryModel.validateFileCache
+ + JDK-8325862: set -XX:+ErrorFileToStderr when executing java
+ in containers for some container related jtreg tests
+ + JDK-8325876: crashes in docker container tests on
+ Linuxppc64le Power8 machines
+ + JDK-8326140: src/jdk.accessibility/windows/native/
+ /libjavaaccessbridge/AccessBridgeJavaEntryPoints.cpp
+ ReleaseStringChars might be missing in early returns
+ + JDK-8327007: javax/swing/JSpinner/8008657/bug8008657.java
+ fails
+ + JDK-8327137: Add test for ConcurrentModificationException in
+ BasicDirectoryModel
+ + JDK-8327631: Update IANA Language Subtag Registry to Version
+ 2024-03-07
+ + JDK-8327787: Convert javax/swing/border/Test4129681.java
+ applet test to main
+ + JDK-8327840: Automate javax/swing/border/Test4129681.java
+ + JDK-8328011: Convert java/awt/Frame/GetBoundsResizeTest/
+ /GetBoundsResizeTest.java applet test to main
+ + JDK-8328110: Allow simultaneous use of PassFailJFrame with
+ split UI and additional windows
+ + JDK-8328115: Convert java/awt/font/TextLayout/
+ /TestJustification.html applet test to main
+ + JDK-8328158: Convert java/awt/Choice/NonFocusablePopupMenuTest
+ to automatic main test
+ + JDK-8328218: Delete test
+ java/awt/Window/FindOwner/FindOwner.html
+ + JDK-8328234: Remove unused nativeUtils files
+ + JDK-8328238: Convert few closed manual applet tests to main
+ + JDK-8328269: NonFocusablePopupMenuTest.java should be marked
+ as headful
+ + JDK-8328273: sun/management/jmxremote/bootstrap/
+ /RmiRegistrySslTest.java failed with
+ java.rmi.server.ExportException: Port already in use
+ + JDK-8328560: java/awt/event/MouseEvent/ClickDuringKeypress/
+ /ClickDuringKeypress.java imports Applet
+ + JDK-8328561: test java/awt/Robot/ManualInstructions/
+ /ManualInstructions.java isn't used
+ + JDK-8328953: JEditorPane.read throws ChangedCharSetException
+ + JDK-8328999: Update GIFlib to 5.2.2
+ + JDK-8329004: Update Libpng to 1.6.43
+ + JDK-8329013: StackOverflowError when starting Apache Tomcat
+ with signed jar
+ + JDK-8329103: assert(!thread->in_asgct()) failed during
+ multi-mode profiling
+ + JDK-8329510: Update ProblemList for
+ JFileChooser/8194044/FileSystemRootTest.java
+ + JDK-8329559: Test javax/swing/JFrame/bug4419914.java failed
+ because The End and Start buttons are not placed correctly and
+ Tab focus does not move as expected
+ + JDK-8329995: Restricted access to '/proc' can cause JFR
+ initialization to crash
+ + JDK-8330063: Upgrade jQuery to 3.7.1
+ + JDK-8330416: Update system property for Java SE specification
+ maintenance version
+ + JDK-8330523: Reduce runtime and improve efficiency of
+ KeepAliveTest
+ + JDK-8331063: Some HttpClient tests don't report leaks
+ + JDK-8331263: Bump update version for OpenJDK: jdk-11.0.25
+ + JDK-8331466: Problemlist serviceability/dcmd/gc/
+ /RunFinalizationTest.java on generic-all
+ + JDK-8331746: Create a test to verify that the cmm id is not
+ ignored
+ + JDK-8331798: Remove unused arg of checkErgonomics() in
+ TestMaxHeapSizeTools.java
+ + JDK-8332008: Enable issuestitle check
+ + JDK-8332113: Update nsk.share.Log to be always verbose
+ + JDK-8332424: Update IANA Language Subtag Registry to Version
+ 2024-05-16
+ + JDK-8332524: Instead of printing "TLSv1.3," it is showing
+ "TLS13"
+ + JDK-8332898: failure_handler: log directory of commands
+ + JDK-8332936: Test vmTestbase/metaspace/gc/watermark_70_80/
+ /TestDescription.java fails with no GC's recorded
+ + JDK-8333724: Problem list security/infra/java/security/cert/
+ /CertPathValidator/certification/CAInterop.java
+ #teliasonerarootcav1
+ + JDK-8333804: java/net/httpclient/ForbiddenHeadTest.java threw
+ an exception with 0 failures
+ + JDK-8333837: [11u] HexPrinterTest.java javac compile fails
+ illegal start of expression
+ + JDK-8333839: [11u] LingeredAppTest.java fails Can't find
+ source file: LingeredApp.java
+ + JDK-8334166: Enable binary check
+ + JDK-8334335: [TESTBUG] Backport of 8279164 to 11u & 17u
+ includes elements of JDK-8163327
+ + JDK-8334418: Update IANA Language Subtag Registry to Version
+ 2024-06-14
+ + JDK-8334653: ISO 4217 Amendment 177 Update
+ + JDK-8334711: [TEST_BUG] Compilation failed of
+ MimeFormatsTest/MimeFormatsTest.java
+ + JDK-8335803: SunJCE cipher throws NPE for un-extractable RSA
+ keys
+ + JDK-8336301: test/jdk/java/nio/channels/
+ /AsyncCloseAndInterrupt.java leaves around a FIFO file upon
+ test completion
+ + JDK-8336928: GHA: Bundle artifacts removal broken
+ + JDK-8337664: Distrust TLS server certificates issued after
+ Oct 2024 and anchored by Entrust Root CAs
+ + JDK-8338139: {ClassLoading,Memory}MXBean::isVerbose methods
+ are inconsistent with their setVerbose methods
++++ 14 more lines (skipped)
++++ between /work/SRC/openSUSE:Factory/java-11-openjdk/java-11-openjdk.changes
++++ and /work/SRC/openSUSE:Factory/.java-11-openjdk.new.2020/java-11-openjdk.changes
Old:
----
jdk-11.0.24+8.tar.gz
New:
----
jdk-11.0.25+9.tar.gz
reproducible-directory-mtime.patch
reproducible-search-index-files.patch
BETA DEBUG BEGIN:
New:- Added patches:
* reproducible-directory-mtime.patch
+ if present, use SOURCE_DATE_EPOCH as timestamp for newly
New: created directories
* reproducible-search-index-files.patch
+ if present, use SOURCE_DATE_EPOCH as timestamp for the search
BETA DEBUG END:
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ java-11-openjdk.spec ++++++
--- /var/tmp/diff_new_pack.kAseTs/_old 2024-10-28 15:18:43.571468046 +0100
+++ /var/tmp/diff_new_pack.kAseTs/_new 2024-10-28 15:18:43.583468546 +0100
@@ -38,8 +38,8 @@
# Standard JPackage naming and versioning defines.
%global featurever 11
%global interimver 0
-%global updatever 24
-%global buildver 8
+%global updatever 25
+%global buildver 9
%global openjdk_repo jdk11u
%global openjdk_tag jdk-%{featurever}.%{interimver}.%{updatever}%{?patchver:.%{patchver}}+%{buildver}
%global openjdk_dir %{openjdk_repo}-jdk-%{featurever}.%{interimver}.%{updatever}%{?patchver:.%{patchver}}-%{buildver}
@@ -222,6 +222,8 @@
#
Patch21: reproducible-javadoc-timestamp.patch
Patch22: reproducible-jlink.patch
+Patch23: reproducible-directory-mtime.patch
+Patch24: reproducible-search-index-files.patch
#
Patch30: JDK-8208602.patch
#
@@ -507,6 +509,8 @@
%patch -P 21 -p1
%patch -P 22 -p1
+%patch -P 23 -p1
+%patch -P 24 -p1
%patch -P 30 -p1
++++++ jdk-11.0.24+8.tar.gz -> jdk-11.0.25+9.tar.gz ++++++
/work/SRC/openSUSE:Factory/java-11-openjdk/jdk-11.0.24+8.tar.gz /work/SRC/openSUSE:Factory/.java-11-openjdk.new.2020/jdk-11.0.25+9.tar.gz differ: char 13, line 1
++++++ reproducible-directory-mtime.patch ++++++
diff --git a/src/java.base/share/classes/java/io/File.java b/src/java.base/share/classes/java/io/File.java
index cdf15e092b..5b5dc365fc 100644
--- a/src/java.base/share/classes/java/io/File.java
+++ b/src/java.base/share/classes/java/io/File.java
@@ -1364,7 +1364,11 @@ public class File
if (isInvalid()) {
return false;
}
- return fs.createDirectory(this);
+ boolean result = fs.createDirectory(this);
+ if ( result && System.getenv("SOURCE_DATE_EPOCH") != null ) {
+ fs.setLastModifiedTime(this, 1000 * Long.parseLong(System.getenv("SOURCE_DATE_EPOCH")));
+ }
+ return result;
}
/**
++++++ reproducible-search-index-files.patch ++++++
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AbstractIndexWriter.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AbstractIndexWriter.java
@@ -497,6 +497,10 @@ public class AbstractIndexWriter extends HtmlDocletWriter {
ZipOutputStream zos = new ZipOutputStream(fos)) {
try {
ZipEntry ze = new ZipEntry(searchIndexFile.getPath());
+ String sde = System.getenv("SOURCE_DATE_EPOCH");
+ if (sde != null) {
+ ze.setTime(1000 * Long.parseLong(sde));
+ }
zos.putNextEntry(ze);
zos.write(searchVar.toString().getBytes());
} finally {
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package mpg123 for openSUSE:Factory checked in at 2024-10-28 15:17:40
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/mpg123 (Old)
and /work/SRC/openSUSE:Factory/.mpg123.new.2020 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mpg123"
Mon Oct 28 15:17:40 2024 rev:41 rq:1218601 version:1.32.8
Changes:
--------
--- /work/SRC/openSUSE:Factory/mpg123/mpg123.changes 2024-08-08 10:57:36.293662912 +0200
+++ /work/SRC/openSUSE:Factory/.mpg123.new.2020/mpg123.changes 2024-10-28 15:17:43.528967967 +0100
@@ -1,0 +2,13 @@
+Sat Oct 26 15:53:29 UTC 2024 - Luigi Baldoni <aloisio(a)gmx.com>
+
+- Update to version 1.32.8
+ libmpg123:
+ * Add sections to assembly to support PAC/BTI code for aarch64
+ (-mbranch-protection variants)
+ * Prevent premature application of header info into decoding
+ structure, at worst having triggered out-of-bounds writes of
+ decoded PCM data
+ out123:
+ * Show --quiet in --longhelp.
+
+-------------------------------------------------------------------
Old:
----
mpg123-1.32.7.tar.bz2
mpg123-1.32.7.tar.bz2.sig
New:
----
mpg123-1.32.8.tar.bz2
mpg123-1.32.8.tar.bz2.sig
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ mpg123.spec ++++++
--- /var/tmp/diff_new_pack.QdK6mf/_old 2024-10-28 15:17:44.901025077 +0100
+++ /var/tmp/diff_new_pack.QdK6mf/_new 2024-10-28 15:17:44.905025243 +0100
@@ -18,7 +18,7 @@
%define sover 0
Name: mpg123
-Version: 1.32.7
+Version: 1.32.8
Release: 0
Summary: Console MPEG audio player and decoder library
License: LGPL-2.1-only
++++++ mpg123-1.32.7.tar.bz2 -> mpg123-1.32.8.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mpg123-1.32.7/AUTHORS new/mpg123-1.32.8/AUTHORS
--- old/mpg123-1.32.7/AUTHORS 2024-08-07 18:15:11.000000000 +0200
+++ new/mpg123-1.32.8/AUTHORS 2024-10-26 16:33:46.000000000 +0200
@@ -30,6 +30,7 @@
Contributions/ideas Thomas Orgis era (includes backports from mhipp trunk):
+Bill Roberts <bill.roberts(a)arm.com>: PAC/BTI for aarch64
Dave Yeo <dave.r.yeo(a)gmail.com>: continued OS/2 fixing
madebr and manx: github mirror and CI
Vitaly Kirsanov <krokoziabla(a)gmail.com>: ports/cmake (optional CMake build)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mpg123-1.32.7/Makefile.in new/mpg123-1.32.8/Makefile.in
--- old/mpg123-1.32.7/Makefile.in 2024-08-07 18:16:13.000000000 +0200
+++ new/mpg123-1.32.8/Makefile.in 2024-10-26 16:34:25.000000000 +0200
@@ -565,17 +565,17 @@
src/libmpg123/lfs_wrap.h src/libmpg123/costabs.h \
src/libmpg123/tabinit.c src/libmpg123/libmpg123.c \
src/libmpg123/gapless.h src/libmpg123/mpg123lib_intern.h \
- src/libmpg123/mangle.h src/libmpg123/getcpuflags.h \
- src/libmpg123/index.h src/libmpg123/index.c \
- src/libmpg123/layer1.c src/libmpg123/layer2.c \
- src/libmpg123/layer3.c src/libmpg123/equalizer.c \
- src/libmpg123/dither.c src/libmpg123/synth_8bit.c \
- src/libmpg123/synth.c src/libmpg123/synth_s32.c \
- src/libmpg123/synth_real.c src/libmpg123/lfs_wrap.c \
- src/libmpg123/icy.c src/libmpg123/icy2utf8.c \
- src/libmpg123/feature.c src/libmpg123/ntom.c \
- src/libmpg123/stringbuf.c src/libmpg123/getcpuflags.S \
- src/libmpg123/getcpuflags_x86_64.S \
+ src/libmpg123/mangle.h src/libmpg123/aarch64_defs.h \
+ src/libmpg123/getcpuflags.h src/libmpg123/index.h \
+ src/libmpg123/index.c src/libmpg123/layer1.c \
+ src/libmpg123/layer2.c src/libmpg123/layer3.c \
+ src/libmpg123/equalizer.c src/libmpg123/dither.c \
+ src/libmpg123/synth_8bit.c src/libmpg123/synth.c \
+ src/libmpg123/synth_s32.c src/libmpg123/synth_real.c \
+ src/libmpg123/lfs_wrap.c src/libmpg123/icy.c \
+ src/libmpg123/icy2utf8.c src/libmpg123/feature.c \
+ src/libmpg123/ntom.c src/libmpg123/stringbuf.c \
+ src/libmpg123/getcpuflags.S src/libmpg123/getcpuflags_x86_64.S \
src/libmpg123/getcpuflags_arm.c src/libmpg123/check_neon.S \
src/libmpg123/synth_altivec.c src/libmpg123/dct64_altivec.c \
src/libmpg123/dct64_i386.c src/libmpg123/synth_i486.c \
@@ -2961,6 +2961,7 @@
@NEED_LIB_TRUE@@NEED_MAINLIB_TRUE@ src/libmpg123/gapless.h \
@NEED_LIB_TRUE@@NEED_MAINLIB_TRUE@ src/libmpg123/mpg123lib_intern.h \
@NEED_LIB_TRUE@@NEED_MAINLIB_TRUE@ src/libmpg123/mangle.h \
+@NEED_LIB_TRUE@@NEED_MAINLIB_TRUE@ src/libmpg123/aarch64_defs.h \
@NEED_LIB_TRUE@@NEED_MAINLIB_TRUE@ src/libmpg123/getcpuflags.h \
@NEED_LIB_TRUE@@NEED_MAINLIB_TRUE@ src/libmpg123/index.h \
@NEED_LIB_TRUE@@NEED_MAINLIB_TRUE@ src/libmpg123/index.c \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mpg123-1.32.7/NEWS new/mpg123-1.32.8/NEWS
--- old/mpg123-1.32.7/NEWS 2024-08-07 18:15:11.000000000 +0200
+++ new/mpg123-1.32.8/NEWS 2024-10-26 16:33:46.000000000 +0200
@@ -1,3 +1,14 @@
+1.32.8
+------
+- libmpg123:
+-- Add sections to assembly to support PAC/BTI code
+ for aarch64 (-mbranch-protection variants), thanks to Bill Roberts
+ (github PR 15).
+-- Prevent premature application of header info into decoding structure,
+ at worst having triggered out-of-bounds writes of decoded PCM data
+ (bug 322, again).
+- out123: Show --quiet in --longhelp.
+
1.32.7
------
- ports/cmake: Work around bug in CMake that does not detect FPU on
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mpg123-1.32.7/configure new/mpg123-1.32.8/configure
--- old/mpg123-1.32.7/configure 2024-08-07 18:16:11.000000000 +0200
+++ new/mpg123-1.32.8/configure 2024-10-26 16:34:23.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.71 for mpg123 1.32.7.
+# Generated by GNU Autoconf 2.71 for mpg123 1.32.8.
#
# Report bugs to <maintainer(a)mpg123.org>.
#
@@ -621,8 +621,8 @@
# Identity of this package.
PACKAGE_NAME='mpg123'
PACKAGE_TARNAME='mpg123'
-PACKAGE_VERSION='1.32.7'
-PACKAGE_STRING='mpg123 1.32.7'
+PACKAGE_VERSION='1.32.8'
+PACKAGE_STRING='mpg123 1.32.8'
PACKAGE_BUGREPORT='maintainer(a)mpg123.org'
PACKAGE_URL=''
@@ -1727,7 +1727,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 mpg123 1.32.7 to adapt to many kinds of systems.
+\`configure' configures mpg123 1.32.8 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1798,7 +1798,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of mpg123 1.32.7:";;
+ short | recursive ) echo "Configuration of mpg123 1.32.8:";;
esac
cat <<\_ACEOF
@@ -2076,7 +2076,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-mpg123 configure 1.32.7
+mpg123 configure 1.32.8
generated by GNU Autoconf 2.71
Copyright (C) 2021 Free Software Foundation, Inc.
@@ -2621,7 +2621,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by mpg123 $as_me 1.32.7, which was
+It was created by mpg123 $as_me 1.32.8, which was
generated by GNU Autoconf 2.71. Invocation command line was
$ $0$ac_configure_args_raw
@@ -3991,7 +3991,7 @@
# Define the identity of the package.
PACKAGE='mpg123'
- VERSION='1.32.7'
+ VERSION='1.32.8'
printf "%s\n" "#define PACKAGE \"$PACKAGE\"" >>confdefs.h
@@ -22453,7 +22453,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by mpg123 $as_me 1.32.7, which was
+This file was extended by mpg123 $as_me 1.32.8, which was
generated by GNU Autoconf 2.71. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -22521,7 +22521,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config='$ac_cs_config_escaped'
ac_cs_version="\\
-mpg123 config.status 1.32.7
+mpg123 config.status 1.32.8
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/mpg123-1.32.7/mpg123.spec new/mpg123-1.32.8/mpg123.spec
--- old/mpg123-1.32.7/mpg123.spec 2024-08-07 18:22:23.000000000 +0200
+++ new/mpg123-1.32.8/mpg123.spec 2024-10-26 16:35:23.000000000 +0200
@@ -3,7 +3,7 @@
# - devel packages for alsa, sdl, etc... to build the respective output modules.
Summary: The fast console mpeg audio decoder/player.
Name: mpg123
-Version: 1.32.7
+Version: 1.32.8
Release: 1
URL: http://www.mpg123.org/
License: GPL
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mpg123-1.32.7/src/libmpg123/Makemodule.am new/mpg123-1.32.8/src/libmpg123/Makemodule.am
--- old/mpg123-1.32.7/src/libmpg123/Makemodule.am 2024-08-07 18:15:11.000000000 +0200
+++ new/mpg123-1.32.8/src/libmpg123/Makemodule.am 2024-10-26 16:33:46.000000000 +0200
@@ -67,6 +67,7 @@
src/libmpg123/gapless.h \
src/libmpg123/mpg123lib_intern.h \
src/libmpg123/mangle.h \
+ src/libmpg123/aarch64_defs.h \
src/libmpg123/getcpuflags.h \
src/libmpg123/index.h \
src/libmpg123/index.c
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mpg123-1.32.7/src/libmpg123/aarch64_defs.h new/mpg123-1.32.8/src/libmpg123/aarch64_defs.h
--- old/mpg123-1.32.7/src/libmpg123/aarch64_defs.h 1970-01-01 01:00:00.000000000 +0100
+++ new/mpg123-1.32.8/src/libmpg123/aarch64_defs.h 2024-10-26 16:33:46.000000000 +0200
@@ -0,0 +1,52 @@
+/* SPDX-License-Identifier: LGPL-2.1
+ *
+ * aarch64_defs.h: Support macros for the aarch64 architectural features
+ */
+
+#ifndef SRC_LIBMPG123_AARCH64_DEFS_H_
+#define SRC_LIBMPG123_AARCH64_DEFS_H_
+
+/*
+ * Guard this header so arm assembly files can just include it without the need
+ * to if-def each instance.
+ */
+#ifdef __aarch64__
+
+/*
+ * References:
+ * - https://developer.arm.com/documentation/101028/0012/5--Feature-test-macros
+ * - https://github.com/ARM-software/abi-aa/blob/main/aaelf64/aaelf64.rst
+ */
+
+#if defined(__ARM_FEATURE_BTI_DEFAULT) && __ARM_FEATURE_BTI_DEFAULT == 1
+ #define GNU_PROPERTY_AARCH64_BTI 1 /* bit 0 GNU Notes is for BTI support */
+#else
+ #define GNU_PROPERTY_AARCH64_BTI 0
+#endif
+
+#if defined(__ARM_FEATURE_PAC_DEFAULT)
+ #define GNU_PROPERTY_AARCH64_POINTER_AUTH 2 /* bit 1 GNU Notes is for PAC support */
+#else
+ #define GNU_PROPERTY_AARCH64_POINTER_AUTH 0
+#endif
+
+/* Add the BTI support to GNU Notes section */
+#if defined(__ASSEMBLER__) && defined(__ELF__)
+#if GNU_PROPERTY_AARCH64_BTI != 0 || GNU_PROPERTY_AARCH64_POINTER_AUTH != 0
+ .pushsection .note.gnu.property, "a"; /* Start a new allocatable section */
+ .balign 8; /* align it on a byte boundry */
+ .long 4; /* size of "GNU\0" */
+ .long 0x10; /* size of descriptor */
+ .long 0x5; /* NT_GNU_PROPERTY_TYPE_0 */
+ .asciz "GNU";
+ .long 0xc0000000; /* GNU_PROPERTY_AARCH64_FEATURE_1_AND */
+ .long 4; /* Four bytes of data */
+ .long (GNU_PROPERTY_AARCH64_BTI|GNU_PROPERTY_AARCH64_POINTER_AUTH); /* BTI or PAC is enabled */
+ .long 0; /* padding for 8 byte alignment */
+ .popsection; /* end the section */
+#endif /* GNU Notes additions */
+#endif /* if __ASSEMBLER__ and __ELF__ */
+
+#endif /* __arch64__ */
+
+#endif /* SRC_LIBMPG123_AARCH64_DEFS_H_ */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mpg123-1.32.7/src/libmpg123/check_neon.S new/mpg123-1.32.8/src/libmpg123/check_neon.S
--- old/mpg123-1.32.7/src/libmpg123/check_neon.S 2024-08-07 18:15:11.000000000 +0200
+++ new/mpg123-1.32.8/src/libmpg123/check_neon.S 2024-10-26 16:33:46.000000000 +0200
@@ -6,6 +6,7 @@
initially written by Taihei Momma
*/
+#include "aarch64_defs.h"
#include "mangle.h"
#ifndef __aarch64__
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mpg123-1.32.7/src/libmpg123/dct36_neon64.S new/mpg123-1.32.8/src/libmpg123/dct36_neon64.S
--- old/mpg123-1.32.7/src/libmpg123/dct36_neon64.S 2024-08-07 18:15:11.000000000 +0200
+++ new/mpg123-1.32.8/src/libmpg123/dct36_neon64.S 2024-10-26 16:33:46.000000000 +0200
@@ -6,6 +6,7 @@
initially written by Taihei Monma
*/
+#include "aarch64_defs.h"
#include "mangle.h"
#ifndef __APPLE__
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mpg123-1.32.7/src/libmpg123/dct64_neon64_float.S new/mpg123-1.32.8/src/libmpg123/dct64_neon64_float.S
--- old/mpg123-1.32.7/src/libmpg123/dct64_neon64_float.S 2024-08-07 18:15:11.000000000 +0200
+++ new/mpg123-1.32.8/src/libmpg123/dct64_neon64_float.S 2024-10-26 16:33:46.000000000 +0200
@@ -6,6 +6,7 @@
initially written by Taihei Monma
*/
+#include "aarch64_defs.h"
#include "mangle.h"
#ifndef __APPLE__
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mpg123-1.32.7/src/libmpg123/frame.c new/mpg123-1.32.8/src/libmpg123/frame.c
--- old/mpg123-1.32.7/src/libmpg123/frame.c 2024-08-07 18:15:11.000000000 +0200
+++ new/mpg123-1.32.8/src/libmpg123/frame.c 2024-10-26 16:33:46.000000000 +0200
@@ -511,6 +511,7 @@
{
frame_icy_reset(fr);
INT123_open_bad(fr);
+ memset(&(fr->hdr), 0, sizeof(fr->hdr));
fr->to_decode = FALSE;
fr->to_ignore = FALSE;
fr->metaflags = 0;
@@ -524,15 +525,12 @@
fr->clip = 0;
fr->oldhead = 0;
fr->firsthead = 0;
- fr->lay = 0;
fr->vbr = MPG123_CBR;
fr->abr_rate = 0;
fr->track_frames = 0;
fr->track_samples = -1;
- fr->framesize=0;
fr->mean_frames = 0;
fr->mean_framesize = 0;
- fr->freesize = 0;
fr->lastscale = -1;
fr->rva.level[0] = -1;
fr->rva.level[1] = -1;
@@ -567,8 +565,7 @@
fr->icy.next = 0;
#endif
fr->halfphase = 0; /* here or indeed only on first-time init? */
- fr->error_protection = 0;
- fr->freeformat_framesize = fr->p.freeformat_framesize;
+ fr->hdr.freeformat_framesize = fr->p.freeformat_framesize;
fr->enc_delay = -1;
fr->enc_padding = -1;
memset(fr->id3buf, 0, sizeof(fr->id3buf));
@@ -627,7 +624,7 @@
if(header != NULL) *header = mh->oldhead;
if(bodydata != NULL) *bodydata = mh->bsbuf;
- if(bodybytes != NULL) *bodybytes = mh->framesize;
+ if(bodybytes != NULL) *bodybytes = mh->hdr.framesize;
return MPG123_OK;
}
@@ -900,9 +897,9 @@
{
int64_t preshift = fr->p.preframes;
/* Layer 3 _really_ needs at least one frame before. */
- if(fr->lay==3 && preshift < 1) preshift = 1;
+ if(fr->hdr.lay==3 && preshift < 1) preshift = 1;
/* Layer 1 & 2 reall do not need more than 2. */
- if(fr->lay!=3 && preshift > 2) preshift = 2;
+ if(fr->hdr.lay!=3 && preshift > 2) preshift = 2;
return fr->firstframe - preshift;
}
@@ -949,7 +946,7 @@
void INT123_frame_skip(mpg123_handle *fr)
{
#ifndef NO_LAYER3
- if(fr->lay == 3) INT123_set_pointer(fr, 1, 512);
+ if(fr->hdr.lay == 3) INT123_set_pointer(fr, 1, 512);
#endif
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mpg123-1.32.7/src/libmpg123/frame.h new/mpg123-1.32.8/src/libmpg123/frame.h
--- old/mpg123-1.32.7/src/libmpg123/frame.h 2024-08-07 18:15:11.000000000 +0200
+++ new/mpg123-1.32.8/src/libmpg123/frame.h 2024-10-26 16:33:46.000000000 +0200
@@ -96,6 +96,33 @@
,FRAME_DECODER_LIVE = 0x8 /**< 1000 Decoder can be used. */
};
+// separate frame header structure for safe decoding of headers without
+// modifying the main frame struct before we are sure that we can read a
+// frame into it
+struct frame_header
+{
+ int lay;
+ // lots of flags that could share storage, should reform that
+ int lsf; /* 0: MPEG 1.0; 1: MPEG 2.0/2.5 -- both used as bool and array index! */
+ int mpeg25;
+ int error_protection;
+ int bitrate_index;
+ int sampling_frequency;
+ int padding;
+ int extension;
+ int mode;
+ int mode_ext;
+ int copyright;
+ int original;
+ int emphasis;
+ // Even 16 bit int is enough for MAXFRAMESIZE
+ int framesize; /* computed framesize */
+ int freeformat;
+ int freeformat_framesize;
+ // Derived from header and checked against the above.
+ int ssize;
+};
+
/* There is a lot to condense here... many ints can be merged as flags; though the main space is still consumed by buffers. */
struct mpg123_handle_struct
{
@@ -197,26 +224,12 @@
int single;
int II_sblimit;
int down_sample_sblimit;
- int lsf; /* 0: MPEG 1.0; 1: MPEG 2.0/2.5 -- both used as bool and array index! */
/* Many flags in disguise as integers... wasting bytes. */
- int mpeg25;
int down_sample;
int header_change;
- int lay;
+ struct frame_header hdr;
long spf; /* cached count of samples per frame */
int (*do_layer)(mpg123_handle *);
- int error_protection;
- int bitrate_index;
- int sampling_frequency;
- int padding;
- int extension;
- int mode;
- int mode_ext;
- int copyright;
- int original;
- int emphasis;
- int framesize; /* computed framesize */
- int freesize; /* free format frame size */
enum mpg123_vbr vbr; /* 1 if variable bitrate was detected */
int64_t num; /* frame offset ... */
int64_t input_offset; /* byte offset of this frame in input stream */
@@ -225,8 +238,6 @@
int state_flags;
char silent_resync; /* Do not complain for the next n resyncs. */
unsigned char* xing_toc; /* The seek TOC from Xing header. */
- int freeformat;
- long freeformat_framesize;
/* bitstream info; bsi */
int bitindex;
@@ -253,7 +264,6 @@
double mean_framesize;
int64_t mean_frames;
int fsizeold;
- int ssize;
unsigned int bitreservoir;
unsigned char bsspace[2][MAXFRAMESIZE+512+4]; /* MAXFRAMESIZE */
unsigned char *bsbuf;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mpg123-1.32.7/src/libmpg123/layer1.c new/mpg123-1.32.8/src/libmpg123/layer1.c
--- old/mpg123-1.32.7/src/libmpg123/layer1.c 2024-08-07 18:15:11.000000000 +0200
+++ new/mpg123-1.32.8/src/libmpg123/layer1.c 2024-10-26 16:33:46.000000000 +0200
@@ -217,7 +217,7 @@
real (*fraction)[SBLIMIT] = fr->layer1.fraction; /* fraction[2][SBLIMIT] */
int single = fr->single;
- fr->jsbound = (fr->mode == MPG_MD_JOINT_STEREO) ? (fr->mode_ext<<2)+4 : 32;
+ fr->jsbound = (fr->hdr.mode == MPG_MD_JOINT_STEREO) ? (fr->hdr.mode_ext<<2)+4 : 32;
if(stereo == 1 || single == SINGLE_MIX) /* I don't see mixing handled here */
single = SINGLE_LEFT;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mpg123-1.32.7/src/libmpg123/layer2.c new/mpg123-1.32.8/src/libmpg123/layer2.c
--- old/mpg123-1.32.7/src/libmpg123/layer2.c 2024-08-07 18:15:11.000000000 +0200
+++ new/mpg123-1.32.8/src/libmpg123/layer2.c 2024-10-26 16:33:46.000000000 +0200
@@ -313,10 +313,10 @@
const struct al_table *tables[5] = { alloc_0, alloc_1, alloc_2, alloc_3 , alloc_4 };
const int sblims[5] = { 27 , 30 , 8, 12 , 30 };
- if(fr->sampling_frequency >= 3) /* Or equivalent: (fr->lsf == 1) */
+ if(fr->hdr.sampling_frequency >= 3) /* Or equivalent: (fr->lsf == 1) */
table = 4;
else
- table = translate[fr->sampling_frequency][2-fr->stereo][fr->bitrate_index];
+ table = translate[fr->hdr.sampling_frequency][2-fr->stereo][fr->hdr.bitrate_index];
sblim = sblims[table];
fr->alloc = tables[table];
@@ -337,7 +337,7 @@
int single = fr->single;
II_select_table(fr);
- fr->jsbound = (fr->mode == MPG_MD_JOINT_STEREO) ? (fr->mode_ext<<2)+4 : fr->II_sblimit;
+ fr->jsbound = (fr->hdr.mode == MPG_MD_JOINT_STEREO) ? (fr->hdr.mode_ext<<2)+4 : fr->II_sblimit;
if(fr->jsbound > fr->II_sblimit)
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mpg123-1.32.7/src/libmpg123/layer3.c new/mpg123-1.32.8/src/libmpg123/layer3.c
--- old/mpg123-1.32.7/src/libmpg123/layer3.c 2024-08-07 18:15:11.000000000 +0200
+++ new/mpg123-1.32.8/src/libmpg123/layer3.c 2024-10-26 16:33:46.000000000 +0200
@@ -135,16 +135,16 @@
int powdiff = (single == SINGLE_MIX) ? 4 : 0;
const int tabs[2][5] = { { 2,9,5,3,4 } , { 1,8,1,2,9 } };
- const int *tab = tabs[fr->lsf];
+ const int *tab = tabs[fr->hdr.lsf];
{ /* First ensure we got enough bits available. */
unsigned int needbits = 0;
needbits += tab[1]; /* main_data_begin */
needbits += stereo == 1 ? tab[2] : tab[3]; /* private */
- if(!fr->lsf)
+ if(!fr->hdr.lsf)
needbits += stereo*4; /* scfsi */
/* For each granule for each channel ... */
- needbits += tab[0]*stereo*(29+tab[4]+1+22+(!fr->lsf?1:0)+2);
+ needbits += tab[0]*stereo*(29+tab[4]+1+22+(!fr->hdr.lsf?1:0)+2);
if(fr->bits_avail < needbits) \
{
if(NOQUIET)
@@ -162,7 +162,7 @@
/* overwrite main_data_begin for the really available bit reservoir */
backbits(fr, tab[1]);
- if(fr->lsf == 0)
+ if(fr->hdr.lsf == 0)
{
fr->wordpointer[0] = (unsigned char) (fr->bitreservoir >> 1);
fr->wordpointer[1] = (unsigned char) ((fr->bitreservoir & 1) << 7);
@@ -171,7 +171,7 @@
/* zero "side-info" data for a silence-frame
without touching audio data used as bit reservoir for following frame */
- memset(fr->wordpointer+2, 0, fr->ssize-2);
+ memset(fr->wordpointer+2, 0, fr->hdr.ssize-2);
/* reread the new bit reservoir offset */
si->main_data_begin = getbits(fr, tab[1]);
@@ -179,11 +179,11 @@
/* Keep track of the available data bytes for the bit reservoir.
CRC is included in ssize already. */
- fr->bitreservoir = fr->bitreservoir + fr->framesize - fr->ssize;
+ fr->bitreservoir = fr->bitreservoir + fr->hdr.framesize - fr->hdr.ssize;
/* Limit the reservoir to the max for MPEG 1.0 or 2.x . */
- if(fr->bitreservoir > (unsigned int) (fr->lsf == 0 ? 511 : 255))
- fr->bitreservoir = (fr->lsf == 0 ? 511 : 255);
+ if(fr->bitreservoir > (unsigned int) (fr->hdr.lsf == 0 ? 511 : 255))
+ fr->bitreservoir = (fr->hdr.lsf == 0 ? 511 : 255);
/* Now back into less commented territory. It's code. It works. */
@@ -192,7 +192,7 @@
else
si->private_bits = getbits(fr, tab[3]);
- if(!fr->lsf) for(ch=0; ch<stereo; ch++)
+ if(!fr->hdr.lsf) for(ch=0; ch<stereo; ch++)
{
si->ch[ch].gr[0].scfsi = -1;
si->ch[ch].gr[1].scfsi = getbits(fr, 4);
@@ -257,14 +257,14 @@
}
/* region_count/start parameters are implicit in this case. */
- if( (!fr->lsf || (gr_info->block_type == 2)) && !fr->mpeg25)
+ if( (!fr->hdr.lsf || (gr_info->block_type == 2)) && !fr->hdr.mpeg25)
{
gr_info->region1start = 36>>1;
gr_info->region2start = 576>>1;
}
else
{
- if(fr->mpeg25)
+ if(fr->hdr.mpeg25)
{
int r0c,r1c;
if((gr_info->block_type == 2) && (!gr_info->mixed_block_flag) ) r0c = 5;
@@ -299,7 +299,7 @@
gr_info->block_type = 0;
gr_info->mixed_block_flag = 0;
}
- if(!fr->lsf) gr_info->preflag = get1bit(fr);
+ if(!fr->hdr.lsf) gr_info->preflag = get1bit(fr);
gr_info->scalefac_scale = get1bit(fr);
gr_info->count1table_select = get1bit(fr);
@@ -1824,7 +1824,7 @@
int stereo = fr->stereo;
int single = fr->single;
int ms_stereo,i_stereo;
- int sfreq = fr->sampling_frequency;
+ int sfreq = fr->hdr.sampling_frequency;
int stereo1,granules;
if(stereo == 1)
@@ -1837,14 +1837,14 @@
else
stereo1 = 2;
- if(fr->mode == MPG_MD_JOINT_STEREO)
+ if(fr->hdr.mode == MPG_MD_JOINT_STEREO)
{
- ms_stereo = (fr->mode_ext & 0x2)>>1;
- i_stereo = fr->mode_ext & 0x1;
+ ms_stereo = (fr->hdr.mode_ext & 0x2)>>1;
+ i_stereo = fr->hdr.mode_ext & 0x1;
}
else ms_stereo = i_stereo = 0;
- granules = fr->lsf ? 1 : 2;
+ granules = fr->hdr.lsf ? 1 : 2;
/* quick hack to keep the music playing */
/* after having seen this nasty test file... */
@@ -1859,7 +1859,7 @@
if(fr->pinfo)
{
fr->pinfo->maindata = sideinfo.main_data_begin;
- fr->pinfo->padding = fr->padding;
+ fr->pinfo->padding = fr->hdr.padding;
}
#endif
for(gr=0;gr<granules;gr++)
@@ -1880,7 +1880,7 @@
, gr_info->part2_3_length, fr->bits_avail );
return clip;
}
- if(fr->lsf)
+ if(fr->hdr.lsf)
part2bits = III_get_scale_factors_2(fr, scalefacs[0],gr_info,0);
else
part2bits = III_get_scale_factors_1(fr, scalefacs[0],gr_info,0,gr);
@@ -1920,7 +1920,7 @@
{
struct gr_info_s *gr_info = &(sideinfo.ch[1].gr[gr]);
long part2bits;
- if(fr->lsf)
+ if(fr->hdr.lsf)
part2bits = III_get_scale_factors_2(fr, scalefacs[1],gr_info,i_stereo);
else
part2bits = III_get_scale_factors_1(fr, scalefacs[1],gr_info,1,gr);
@@ -1970,7 +1970,7 @@
}
}
- if(i_stereo) III_i_stereo(hybridIn,scalefacs[1],gr_info,sfreq,ms_stereo,fr->lsf);
+ if(i_stereo) III_i_stereo(hybridIn,scalefacs[1],gr_info,sfreq,ms_stereo,fr->hdr.lsf);
if(ms_stereo || i_stereo || (single == SINGLE_MIX) )
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mpg123-1.32.7/src/libmpg123/libmpg123.c new/mpg123-1.32.8/src/libmpg123/libmpg123.c
--- old/mpg123-1.32.7/src/libmpg123/libmpg123.c 2024-08-07 18:15:11.000000000 +0200
+++ new/mpg123-1.32.8/src/libmpg123/libmpg123.c 2024-10-26 16:33:46.000000000 +0200
@@ -457,7 +457,7 @@
theval = mh->enc_padding;
break;
case MPG123_DEC_DELAY:
- theval = mh->lay == 3 ? GAPLESS_DELAY : -1;
+ theval = mh->hdr.lay == 3 ? GAPLESS_DELAY : -1;
break;
default:
mh->err = MPG123_BAD_KEY;
@@ -1241,10 +1241,10 @@
b = init_track(mh); \
if(b < 0) return b; \
\
- mi->version = mh->mpeg25 ? MPG123_2_5 : (mh->lsf ? MPG123_2_0 : MPG123_1_0); \
- mi->layer = mh->lay; \
+ mi->version = mh->hdr.mpeg25 ? MPG123_2_5 : (mh->hdr.lsf ? MPG123_2_0 : MPG123_1_0); \
+ mi->layer = mh->hdr.lay; \
mi->rate = INT123_frame_freq(mh); \
- switch(mh->mode) \
+ switch(mh->hdr.mode) \
{ \
case 0: mi->mode = MPG123_M_STEREO; break; \
case 1: mi->mode = MPG123_M_JOINT; break; \
@@ -1252,14 +1252,14 @@
case 3: mi->mode = MPG123_M_MONO; break; \
default: mi->mode = 0; /* Nothing good to do here. */ \
} \
- mi->mode_ext = mh->mode_ext; \
- mi->framesize = mh->framesize+4; /* Include header. */ \
+ mi->mode_ext = mh->hdr.mode_ext; \
+ mi->framesize = mh->hdr.framesize+4; /* Include header. */ \
mi->flags = 0; \
- if(mh->error_protection) mi->flags |= MPG123_CRC; \
- if(mh->copyright) mi->flags |= MPG123_COPYRIGHT; \
- if(mh->extension) mi->flags |= MPG123_PRIVATE; \
- if(mh->original) mi->flags |= MPG123_ORIGINAL; \
- mi->emphasis = mh->emphasis; \
+ if(mh->hdr.error_protection) mi->flags |= MPG123_CRC; \
+ if(mh->hdr.copyright) mi->flags |= MPG123_COPYRIGHT; \
+ if(mh->hdr.extension) mi->flags |= MPG123_PRIVATE; \
+ if(mh->hdr.original) mi->flags |= MPG123_ORIGINAL; \
+ mi->emphasis = mh->hdr.emphasis; \
mi->bitrate = INT123_frame_bitrate(mh); \
mi->abr_rate = mh->abr_rate; \
mi->vbr = mh->vbr; \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mpg123-1.32.7/src/libmpg123/parse.c new/mpg123-1.32.8/src/libmpg123/parse.c
--- old/mpg123-1.32.7/src/libmpg123/parse.c 2024-08-07 18:15:11.000000000 +0200
+++ new/mpg123-1.32.8/src/libmpg123/parse.c 2024-10-26 16:33:46.000000000 +0200
@@ -63,9 +63,10 @@
static const long freqs[9] = { 44100, 48000, 32000, 22050, 24000, 16000 , 11025 , 12000 , 8000 };
-static int decode_header(mpg123_handle *fr,unsigned long newhead, int *freeformat_count);
-static int skip_junk(mpg123_handle *fr, unsigned long *newheadp, long *headcount);
-static int do_readahead(mpg123_handle *fr, unsigned long newhead);
+static int decode_header(mpg123_handle *fr, struct frame_header *hdr, unsigned long newhead, int *freeformat_count);
+static void apply_header(mpg123_handle *fr, struct frame_header *hdr);
+static int skip_junk(mpg123_handle *fr, unsigned long *newheadp, long *headcount, struct frame_header *nhdr);
+static int do_readahead(mpg123_handle *fr, struct frame_header *nhdr, unsigned long newhead);
static int wetwork(mpg123_handle *fr, unsigned long *newheadp);
/* These two are to be replaced by one function that gives all the frame parameters (for outsiders).*/
@@ -73,12 +74,12 @@
int INT123_frame_bitrate(mpg123_handle *fr)
{
- return tabsel_123[fr->lsf][fr->lay-1][fr->bitrate_index];
+ return tabsel_123[fr->hdr.lsf][fr->hdr.lay-1][fr->hdr.bitrate_index];
}
long INT123_frame_freq(mpg123_handle *fr)
{
- return freqs[fr->sampling_frequency];
+ return freqs[fr->hdr.sampling_frequency];
}
/* compiler is smart enought to inline this one or should I really do it as macro...? */
@@ -141,8 +142,8 @@
Mono 17 9
*/
int lame_offset = (fr->stereo == 2)
- ? (fr->lsf ? 17 : 32)
- : (fr->lsf ? 9 : 17);
+ ? (fr->hdr.lsf ? 17 : 32)
+ : (fr->hdr.lsf ? 9 : 17);
if(fr->p.flags & MPG123_IGNORE_INFOFRAME) goto check_lame_tag_no;
@@ -154,7 +155,7 @@
for the actual data, have to check if each byte of information is present.
But: 4 B Info/Xing + 4 B flags is bare minimum.
*/
- if(fr->framesize < lame_offset+8) goto check_lame_tag_no;
+ if(fr->hdr.framesize < lame_offset+8) goto check_lame_tag_no;
/* only search for tag when all zero before it (apart from checksum) */
for(i=2; i < lame_offset; ++i) if(fr->bsbuf[i] != 0) goto check_lame_tag_no;
@@ -190,7 +191,7 @@
/* From now on, I have to carefully check if the announced data is actually
there! I'm always returning 'yes', though. */
- #define check_bytes_left(n) if(fr->framesize < lame_offset+n) \
+ #define check_bytes_left(n) if(fr->hdr.framesize < lame_offset+n) \
goto check_lame_tag_yes
if(xing_flags & 1) /* total bitstream frames */
{
@@ -443,10 +444,10 @@
static void halfspeed_prepare(mpg123_handle *fr)
{
/* save for repetition */
- if(fr->p.halfspeed && fr->lay == 3)
+ if(fr->p.halfspeed && fr->hdr.lay == 3)
{
debug("halfspeed - reusing old bsbuf ");
- memcpy (fr->ssave, fr->bsbuf, fr->ssize);
+ memcpy (fr->ssave, fr->bsbuf, fr->hdr.ssize);
}
}
@@ -462,8 +463,8 @@
fr->to_decode = fr->to_ignore = TRUE;
--fr->halfphase;
INT123_set_pointer(fr, 0, 0);
- if(fr->lay == 3) memcpy (fr->bsbuf, fr->ssave, fr->ssize);
- if(fr->error_protection) fr->crc = getbits(fr, 16); /* skip crc */
+ if(fr->hdr.lay == 3) memcpy (fr->bsbuf, fr->ssave, fr->hdr.ssize);
+ if(fr->hdr.error_protection) fr->crc = getbits(fr, 16); /* skip crc */
return 1;
}
else
@@ -496,10 +497,11 @@
/* TODO: rework this thing */
int freeformat_count = 0;
unsigned long newhead;
+ // Start with current frame header state as copy for roll-back ability.
+ struct frame_header nhdr = fr->hdr;
int64_t framepos;
int ret;
/* stuff that needs resetting if complete frame reading fails */
- int oldsize = fr->framesize;
int oldphase = fr->halfphase;
/* The counter for the search-first-header loop.
@@ -507,11 +509,12 @@
when repeatedly headers are found that do not have valid followup headers. */
long headcount = 0;
- fr->fsizeold=fr->framesize; /* for Layer3 */
+ fr->fsizeold=fr->hdr.framesize; /* for Layer3 */
if(halfspeed_do(fr) == 1) return 1;
/* From now on, old frame data is tainted by parsing attempts. */
+ // Handling premature effects of decode_header now, more decoupling would be welcome.
fr->to_decode = fr->to_ignore = FALSE;
if( fr->p.flags & MPG123_NO_FRANKENSTEIN &&
@@ -540,13 +543,13 @@
#ifdef SKIP_JUNK
if(!fr->firsthead && !head_check(newhead))
{
- ret = skip_junk(fr, &newhead, &headcount);
+ ret = skip_junk(fr, &newhead, &headcount, &nhdr);
JUMP_CONCLUSION(ret);
}
#endif
ret = head_check(newhead);
- if(ret) ret = decode_header(fr, newhead, &freeformat_count);
+ if(ret) ret = decode_header(fr, &nhdr, newhead, &freeformat_count);
JUMP_CONCLUSION(ret); /* That only continues for ret == PARSE_BAD or PARSE_GOOD. */
if(ret == PARSE_BAD)
@@ -561,7 +564,7 @@
{
ret = fr->p.flags & MPG123_NO_READAHEAD
? PARSE_GOOD
- : do_readahead(fr, newhead);
+ : do_readahead(fr, &nhdr, newhead);
/* readahead can fail mit NEED_MORE, in which case we must also make the just read header available again for next go */
if(ret < 0) fr->rd->back_bytes(fr, 4);
JUMP_CONCLUSION(ret);
@@ -585,8 +588,8 @@
{
unsigned char *newbuf = fr->bsspace[fr->bsnum]+512;
/* read main data into memory */
- debug2("read frame body of %i at %"PRIi64, fr->framesize, framepos+4);
- if((ret=fr->rd->read_frame_body(fr,newbuf,fr->framesize))<0)
+ debug2("read frame body of %i at %"PRIi64, nhdr.framesize, framepos+4);
+ if((ret=fr->rd->read_frame_body(fr,newbuf,nhdr.framesize))<0)
{
/* if failed: flip back */
debug1("%s", ret == MPG123_NEED_MORE ? "need more" : "read error");
@@ -597,6 +600,10 @@
}
fr->bsnum = (fr->bsnum + 1) & 1;
+ // We read the frame body, time to apply the matching header.
+ // Even if erroring out later, the header state needs to match the body.
+ apply_header(fr, &nhdr);
+
if(!fr->firsthead)
{
fr->firsthead = newhead; /* _now_ it's time to store it... the first real header */
@@ -608,7 +615,7 @@
fr->audio_start = framepos;
/* Only check for LAME tag at beginning of whole stream
... when there indeed is one in between, it's the user's problem. */
- if(fr->lay == 3 && check_lame_tag(fr) == 1)
+ if(fr->hdr.lay == 3 && check_lame_tag(fr) == 1)
{ /* ...in practice, Xing/LAME tags are layer 3 only. */
if(fr->rd->forget != NULL) fr->rd->forget(fr);
@@ -624,6 +631,8 @@
INT123_set_pointer(fr, 0, 0);
+ // No use of nhdr from here on. It is fr->hdr now!
+
/* Question: How bad does the floating point value get with repeated recomputation?
Also, considering that we can play the file or parts of many times. */
if(++fr->mean_frames != 0)
@@ -631,7 +640,7 @@
fr->mean_framesize = ((fr->mean_frames-1)*fr->mean_framesize+INT123_compute_bpf(fr)) / fr->mean_frames ;
}
++fr->num; /* 0 for first frame! */
- debug4("Frame %"PRIi64" %08lx %i, next filepos=%"PRIi64, fr->num, newhead, fr->framesize, fr->rd->tell(fr));
+ debug4("Frame %"PRIi64" %08lx %i, next filepos=%"PRIi64, fr->num, newhead, fr->hdr.framesize, fr->rd->tell(fr));
if(!(fr->state_flags & FRAME_FRANKENSTEIN) && (
(fr->track_frames > 0 && fr->num >= fr->track_frames)
#ifdef GAPLESS
@@ -665,7 +674,7 @@
if(fr->rd->forget != NULL) fr->rd->forget(fr);
fr->to_decode = fr->to_ignore = TRUE;
- if(fr->error_protection) fr->crc = getbits(fr, 16); /* skip crc */
+ if(fr->hdr.error_protection) fr->crc = getbits(fr, 16); /* skip crc */
/*
Let's check for header change after deciding that the new one is good
@@ -712,7 +721,6 @@
fr->silent_resync = 0;
if(fr->err == MPG123_OK) fr->err = MPG123_ERR_READER;
- fr->framesize = oldsize;
fr->halfphase = oldphase;
/* That return code might be inherited from some feeder action, or reader error. */
return ret;
@@ -726,9 +734,9 @@
* <0: error codes, possibly from feeder buffer (NEED_MORE)
* PARSE_BAD: cannot get the framesize for some reason and shall silentry try the next possible header (if this is no free format stream after all...)
*/
-static int guess_freeformat_framesize(mpg123_handle *fr, unsigned long oldhead)
+static int guess_freeformat_framesize(mpg123_handle *fr, unsigned long oldhead, int *framesize)
{
- long i;
+ int i;
int ret;
unsigned long head;
if(!(fr->rdat.flags & (READER_SEEKABLE|READER_BUFFERED)))
@@ -749,7 +757,7 @@
if((head & HDR_SAMEMASK) == (oldhead & HDR_SAMEMASK))
{
fr->rd->back_bytes(fr,i+1);
- fr->framesize = i-3;
+ *framesize = i-3;
return PARSE_GOOD; /* Success! */
}
}
@@ -766,8 +774,13 @@
* 0: no valid header
* <0: some error
* You are required to do a head_check() before calling!
+ *
+ * This now only operates on a frame header struct, not the full frame structure.
+ * The scope is limited to parsing header information and determining the size of
+ * the frame body to read. Everything else belongs into a later stage of applying
+ * header information to the main decoder frame structure.
*/
-static int decode_header(mpg123_handle *fr,unsigned long newhead, int *freeformat_count)
+static int decode_header(mpg123_handle *fr, struct frame_header *fh, unsigned long newhead, int *freeformat_count)
{
#ifdef DEBUG /* Do not waste cycles checking the header twice all the time. */
if(!head_check(newhead))
@@ -778,43 +791,42 @@
/* For some reason, the layer and sampling freq settings used to be wrapped
in a weird conditional including MPG123_NO_RESYNC. What was I thinking?
This information has to be consistent. */
- fr->lay = 4 - HDR_LAYER_VAL(newhead);
+ fh->lay = 4 - HDR_LAYER_VAL(newhead);
if(HDR_VERSION_VAL(newhead) & 0x2)
{
- fr->lsf = (HDR_VERSION_VAL(newhead) & 0x1) ? 0 : 1;
- fr->mpeg25 = 0;
- fr->sampling_frequency = HDR_SAMPLERATE_VAL(newhead) + (fr->lsf*3);
+ fh->lsf = (HDR_VERSION_VAL(newhead) & 0x1) ? 0 : 1;
+ fh->mpeg25 = 0;
+ fh->sampling_frequency = HDR_SAMPLERATE_VAL(newhead) + (fh->lsf*3);
}
else
{
- fr->lsf = 1;
- fr->mpeg25 = 1;
- fr->sampling_frequency = 6 + HDR_SAMPLERATE_VAL(newhead);
+ fh->lsf = 1;
+ fh->mpeg25 = 1;
+ fh->sampling_frequency = 6 + HDR_SAMPLERATE_VAL(newhead);
}
#ifdef DEBUG
/* seen a file where this varies (old lame tag without crc, track with crc) */
- if((HDR_CRC_VAL(newhead)^0x1) != fr->error_protection) debug("changed crc bit!");
+ if((HDR_CRC_VAL(newhead)^0x1) != fh->error_protection) debug("changed crc bit!");
#endif
- fr->error_protection = HDR_CRC_VAL(newhead)^0x1;
- fr->bitrate_index = HDR_BITRATE_VAL(newhead);
- fr->padding = HDR_PADDING_VAL(newhead);
- fr->extension = HDR_PRIVATE_VAL(newhead);
- fr->mode = HDR_CHANNEL_VAL(newhead);
- fr->mode_ext = HDR_CHANEX_VAL(newhead);
- fr->copyright = HDR_COPYRIGHT_VAL(newhead);
- fr->original = HDR_ORIGINAL_VAL(newhead);
- fr->emphasis = HDR_EMPHASIS_VAL(newhead);
- fr->freeformat = !(newhead & HDR_BITRATE);
+ fh->error_protection = HDR_CRC_VAL(newhead)^0x1;
+ fh->bitrate_index = HDR_BITRATE_VAL(newhead);
+ fh->padding = HDR_PADDING_VAL(newhead);
+ fh->extension = HDR_PRIVATE_VAL(newhead);
+ fh->mode = HDR_CHANNEL_VAL(newhead);
+ fh->mode_ext = HDR_CHANEX_VAL(newhead);
+ fh->copyright = HDR_COPYRIGHT_VAL(newhead);
+ fh->original = HDR_ORIGINAL_VAL(newhead);
+ fh->emphasis = HDR_EMPHASIS_VAL(newhead);
+ fh->freeformat = !(newhead & HDR_BITRATE);
- fr->stereo = (fr->mode == MPG_MD_MONO) ? 1 : 2;
/* we can't use tabsel_123 for freeformat, so trying to guess framesize... */
- if(fr->freeformat)
+ if(fh->freeformat)
{
/* when we first encounter the frame with freeformat, guess framesize */
- if(fr->freeformat_framesize < 0)
+ if(fh->freeformat_framesize < 0)
{
int ret;
if(fr->p.flags & MPG123_NO_READAHEAD)
@@ -829,12 +841,12 @@
if(VERBOSE3) error("You fooled me too often. Refusing to guess free format frame size _again_.");
return PARSE_BAD;
}
- ret = guess_freeformat_framesize(fr, newhead);
+ ret = guess_freeformat_framesize(fr, newhead, &(fh->framesize));
if(ret == PARSE_GOOD)
{
- fr->freeformat_framesize = fr->framesize - fr->padding;
+ fh->freeformat_framesize = fh->framesize - fh->padding;
if(VERBOSE2)
- fprintf(stderr, "Note: free format frame size %li\n", fr->freeformat_framesize);
+ fprintf(stderr, "Note: free format frame size %i\n", fh->freeformat_framesize);
}
else
{
@@ -849,112 +861,140 @@
/* freeformat should be CBR, so the same framesize can be used at the 2nd reading or later */
else
{
- fr->framesize = fr->freeformat_framesize + fr->padding;
+ fh->framesize = fh->freeformat_framesize + fh->padding;
}
}
-
- switch(fr->lay)
+ switch(fh->lay)
{
#ifndef NO_LAYER1
case 1:
- fr->spf = 384;
- fr->do_layer = INT123_do_layer1;
- if(!fr->freeformat)
+ if(!fh->freeformat)
{
- long fs = (long) tabsel_123[fr->lsf][0][fr->bitrate_index] * 12000;
- fs /= freqs[fr->sampling_frequency];
- fs = ((fs+fr->padding)<<2)-4;
- fr->framesize = (int)fs;
+ long fs = (long) tabsel_123[fh->lsf][0][fh->bitrate_index] * 12000;
+ fs /= freqs[fh->sampling_frequency];
+ fs = ((fs+fh->padding)<<2)-4;
+ fh->framesize = (int)fs;
}
break;
#endif
#ifndef NO_LAYER2
case 2:
- fr->spf = 1152;
- fr->do_layer = INT123_do_layer2;
- if(!fr->freeformat)
+ if(!fh->freeformat)
{
- debug2("bitrate index: %i (%i)", fr->bitrate_index, tabsel_123[fr->lsf][1][fr->bitrate_index] );
- long fs = (long) tabsel_123[fr->lsf][1][fr->bitrate_index] * 144000;
- fs /= freqs[fr->sampling_frequency];
- fs += fr->padding - 4;
- fr->framesize = (int)fs;
+ debug2("bitrate index: %i (%i)", fh->bitrate_index, tabsel_123[fh->lsf][1][fh->bitrate_index] );
+ long fs = (long) tabsel_123[fh->lsf][1][fh->bitrate_index] * 144000;
+ fs /= freqs[fh->sampling_frequency];
+ fs += fh->padding - 4;
+ fh->framesize = (int)fs;
}
break;
#endif
#ifndef NO_LAYER3
case 3:
- fr->spf = fr->lsf ? 576 : 1152; /* MPEG 2.5 implies LSF.*/
- fr->do_layer = INT123_do_layer3;
- if(fr->lsf)
- fr->ssize = (fr->stereo == 1) ? 9 : 17;
+ if(fh->lsf)
+ fh->ssize = (fh->mode == MPG_MD_MONO) ? 9 : 17;
else
- fr->ssize = (fr->stereo == 1) ? 17 : 32;
+ fh->ssize = (fh->mode == MPG_MD_MONO) ? 17 : 32;
- if(fr->error_protection)
- fr->ssize += 2;
+ if(fh->error_protection)
+ fh->ssize += 2;
- if(!fr->freeformat)
+ if(!fh->freeformat)
{
- long fs = (long) tabsel_123[fr->lsf][2][fr->bitrate_index] * 144000;
- fs /= freqs[fr->sampling_frequency]<<(fr->lsf);
- fs += fr->padding - 4;
- fr->framesize = fs;
+ long fs = (long) tabsel_123[fh->lsf][2][fh->bitrate_index] * 144000;
+ fs /= freqs[fh->sampling_frequency]<<(fh->lsf);
+ fs += fh->padding - 4;
+ fh->framesize = fs;
}
- if(fr->framesize < fr->ssize)
+ if(fh->framesize < fh->ssize)
{
if(NOQUIET)
error2( "Frame smaller than mandatory side info (%i < %i)!"
- , fr->framesize, fr->ssize );
+ , fh->framesize, fh->ssize );
return PARSE_BAD;
}
break;
#endif
default:
- if(NOQUIET) error1("Layer type %i not supported in this build!", fr->lay);
+ if(NOQUIET) error1("Layer type %i not supported in this build!", fh->lay);
return PARSE_BAD;
}
- if (fr->framesize > MAXFRAMESIZE)
+ if (fh->framesize > MAXFRAMESIZE)
{
- if(NOQUIET) error1("Frame size too big: %d", fr->framesize+4-fr->padding);
+ if(NOQUIET) error1("Frame size too big: %d", fh->framesize+4-fh->padding);
return PARSE_BAD;
}
return PARSE_GOOD;
}
+// Apply decoded header structure to frame struct, including
+// main decoder function pointer.
+static void apply_header(mpg123_handle *fr, struct frame_header *hdr)
+{
+ // copy the whole struct, do some postprocessing
+ fr->hdr = *hdr;
+ fr->stereo = (fr->hdr.mode == MPG_MD_MONO) ? 1 : 2;
+ switch(fr->hdr.lay)
+ {
+#ifndef NO_LAYER1
+ case 1:
+ fr->spf = 384;
+ fr->do_layer = INT123_do_layer1;
+ break;
+#endif
+#ifndef NO_LAYER2
+ case 2:
+ fr->spf = 1152;
+ fr->do_layer = INT123_do_layer2;
+ break;
+#endif
+#ifndef NO_LAYER3
+ case 3:
+ fr->spf = fr->hdr.lsf ? 576 : 1152; /* MPEG 2.5 implies LSF.*/
+ fr->do_layer = INT123_do_layer3;
+#endif
+ break;
+ default:
+ // No error checking/message here, been done in decode_header().
+ fr->spf = 0;
+ fr->do_layer = NULL;
+ }
+}
+
+
/* Prepare for bit reading. Two stages:
0. Layers 1 and 2, side info for layer 3
1. Second call for possible bit reservoir for layer 3 part 2,3.
This overwrites side info needed for stage 0.
Continuing to read bits after layer 3 side info shall fail unless
- INT123_set_pointer() is called to refresh things.
+ INT123_set_pointer() is called to refresh things.
*/
void INT123_set_pointer(mpg123_handle *fr, int part2, long backstep)
{
fr->bitindex = 0;
- if(fr->lay == 3)
+ if(fr->hdr.lay == 3)
{
if(part2)
{
- fr->wordpointer = fr->bsbuf + fr->ssize - backstep;
+ fr->wordpointer = fr->bsbuf + fr->hdr.ssize - backstep;
if(backstep)
memcpy( fr->wordpointer, fr->bsbufold+fr->fsizeold-backstep
, backstep );
- fr->bits_avail = (long)(fr->framesize - fr->ssize + backstep)*8;
+ fr->bits_avail = (long)(fr->hdr.framesize - fr->hdr.ssize + backstep)*8;
}
else
{
fr->wordpointer = fr->bsbuf;
- fr->bits_avail = fr->ssize*8;
+ fr->bits_avail = fr->hdr.ssize*8;
}
}
else
{
fr->wordpointer = fr->bsbuf;
- fr->bits_avail = fr->framesize*8;
+ fr->bits_avail = fr->hdr.framesize*8;
}
}
@@ -962,7 +1002,7 @@
double INT123_compute_bpf(mpg123_handle *fr)
{
- return (fr->framesize > 0) ? fr->framesize + 4.0 : 1.0;
+ return (fr->hdr.framesize > 0) ? fr->hdr.framesize + 4.0 : 1.0;
}
int attribute_align_arg mpg123_spf(mpg123_handle *mh)
@@ -978,8 +1018,8 @@
double tpf;
if(fr == NULL || !fr->firsthead) return MPG123_ERR;
- tpf = (double) bs[fr->lay];
- tpf /= freqs[fr->sampling_frequency] << (fr->lsf);
+ tpf = (double) bs[fr->hdr.lay];
+ tpf /= freqs[fr->hdr.sampling_frequency] << (fr->hdr.lsf);
return tpf;
}
@@ -1046,7 +1086,7 @@
}
/* first attempt of read ahead check to find the real first header; cannot believe what junk is out there! */
-static int do_readahead(mpg123_handle *fr, unsigned long newhead)
+static int do_readahead(mpg123_handle *fr, struct frame_header *nhdr, unsigned long newhead)
{
unsigned long nexthead = 0;
int hd = 0;
@@ -1058,9 +1098,9 @@
start = fr->rd->tell(fr);
- debug2("doing ahead check with BPF %d at %"PRIi64, fr->framesize+4, start);
+ debug2("doing ahead check with BPF %d at %"PRIi64, nhdr->framesize+4, start);
/* step framesize bytes forward and read next possible header*/
- if((oret=fr->rd->skip_bytes(fr, fr->framesize))<0)
+ if((oret=fr->rd->skip_bytes(fr, nhdr->framesize))<0)
{
if(oret==READER_ERROR && NOQUIET) error("cannot seek!");
@@ -1195,7 +1235,7 @@
}
/* watch out for junk/tags on beginning of stream by invalid header */
-static int skip_junk(mpg123_handle *fr, unsigned long *newheadp, long *headcount)
+static int skip_junk(mpg123_handle *fr, unsigned long *newheadp, long *headcount, struct frame_header *nhdr)
{
int ret;
int freeformat_count = 0;
@@ -1251,7 +1291,7 @@
if(++forgetcount > FORGET_INTERVAL) forgetcount = 0;
if((ret=forget_head_shift(fr, &newhead, !forgetcount))<=0) return ret;
- if(head_check(newhead) && (ret=decode_header(fr, newhead, &freeformat_count))) break;
+ if(head_check(newhead) && (ret=decode_header(fr, nhdr, newhead, &freeformat_count))) break;
} while(1);
if(ret<0) return ret;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mpg123-1.32.7/src/libmpg123/synth_neon64_accurate.S new/mpg123-1.32.8/src/libmpg123/synth_neon64_accurate.S
--- old/mpg123-1.32.7/src/libmpg123/synth_neon64_accurate.S 2024-08-07 18:15:11.000000000 +0200
+++ new/mpg123-1.32.8/src/libmpg123/synth_neon64_accurate.S 2024-10-26 16:33:46.000000000 +0200
@@ -6,6 +6,7 @@
initially written by Taihei Monma
*/
+#include "aarch64_defs.h"
#include "mangle.h"
#ifndef __APPLE__
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mpg123-1.32.7/src/libmpg123/synth_neon64_float.S new/mpg123-1.32.8/src/libmpg123/synth_neon64_float.S
--- old/mpg123-1.32.7/src/libmpg123/synth_neon64_float.S 2024-08-07 18:15:11.000000000 +0200
+++ new/mpg123-1.32.8/src/libmpg123/synth_neon64_float.S 2024-10-26 16:33:46.000000000 +0200
@@ -6,6 +6,7 @@
initially written by Taihei Monma
*/
+#include "aarch64_defs.h"
#include "mangle.h"
#ifndef __APPLE__
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mpg123-1.32.7/src/libmpg123/synth_neon64_s32.S new/mpg123-1.32.8/src/libmpg123/synth_neon64_s32.S
--- old/mpg123-1.32.7/src/libmpg123/synth_neon64_s32.S 2024-08-07 18:15:11.000000000 +0200
+++ new/mpg123-1.32.8/src/libmpg123/synth_neon64_s32.S 2024-10-26 16:33:46.000000000 +0200
@@ -6,6 +6,7 @@
initially written by Taihei Monma
*/
+#include "aarch64_defs.h"
#include "mangle.h"
#ifndef __APPLE__
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mpg123-1.32.7/src/libmpg123/synth_stereo_neon64_accurate.S new/mpg123-1.32.8/src/libmpg123/synth_stereo_neon64_accurate.S
--- old/mpg123-1.32.7/src/libmpg123/synth_stereo_neon64_accurate.S 2024-08-07 18:15:11.000000000 +0200
+++ new/mpg123-1.32.8/src/libmpg123/synth_stereo_neon64_accurate.S 2024-10-26 16:33:46.000000000 +0200
@@ -6,6 +6,7 @@
initially written by Taihei Monma
*/
+#include "aarch64_defs.h"
#include "mangle.h"
#ifndef __APPLE__
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mpg123-1.32.7/src/libmpg123/synth_stereo_neon64_float.S new/mpg123-1.32.8/src/libmpg123/synth_stereo_neon64_float.S
--- old/mpg123-1.32.7/src/libmpg123/synth_stereo_neon64_float.S 2024-08-07 18:15:11.000000000 +0200
+++ new/mpg123-1.32.8/src/libmpg123/synth_stereo_neon64_float.S 2024-10-26 16:33:46.000000000 +0200
@@ -6,6 +6,7 @@
initially written by Taihei Monma
*/
+#include "aarch64_defs.h"
#include "mangle.h"
#ifndef __APPLE__
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mpg123-1.32.7/src/libmpg123/synth_stereo_neon64_s32.S new/mpg123-1.32.8/src/libmpg123/synth_stereo_neon64_s32.S
--- old/mpg123-1.32.7/src/libmpg123/synth_stereo_neon64_s32.S 2024-08-07 18:15:11.000000000 +0200
+++ new/mpg123-1.32.8/src/libmpg123/synth_stereo_neon64_s32.S 2024-10-26 16:33:46.000000000 +0200
@@ -6,6 +6,7 @@
initially written by Taihei Monma
*/
+#include "aarch64_defs.h"
#include "mangle.h"
#ifndef __APPLE__
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mpg123-1.32.7/src/out123.c new/mpg123-1.32.8/src/out123.c
--- old/mpg123-1.32.7/src/out123.c 2024-08-07 18:15:11.000000000 +0200
+++ new/mpg123-1.32.8/src/out123.c 2024-10-26 16:33:46.000000000 +0200
@@ -1910,6 +1910,7 @@
fprintf(o," <a> average events per second\n");
fprintf(o," -t --test no output, just read and discard data (-o test)\n");
fprintf(o," -v[*] --verbose increase verboselevel\n");
+ fprintf(o," -q --quiet quiet mode\n");
#ifdef HAVE_SETPRIORITY
fprintf(o," --aggressive tries to get higher priority (nice)\n");
#endif
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mpg123-1.32.7/src/version.h new/mpg123-1.32.8/src/version.h
--- old/mpg123-1.32.7/src/version.h 2024-08-07 18:15:21.000000000 +0200
+++ new/mpg123-1.32.8/src/version.h 2024-10-26 16:33:59.000000000 +0200
@@ -16,7 +16,7 @@
// only single spaces as separator to ease parsing by build scripts
#define MPG123_MAJOR 1
#define MPG123_MINOR 32
-#define MPG123_PATCH 7
+#define MPG123_PATCH 8
// Don't get too wild with that to avoid confusing m4. No brackets.
// Also, it should fit well into a sane file name for the tarball.
#define MPG123_SUFFIX ""
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package superlu for openSUSE:Factory checked in at 2024-10-28 15:17:38
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/superlu (Old)
and /work/SRC/openSUSE:Factory/.superlu.new.2020 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "superlu"
Mon Oct 28 15:17:38 2024 rev:32 rq:1218514 version:7.0.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/superlu/superlu.changes 2023-08-30 10:18:03.646960653 +0200
+++ /work/SRC/openSUSE:Factory/.superlu.new.2020/superlu.changes 2024-10-28 15:17:41.996904199 +0100
@@ -1,0 +2,14 @@
+Wed Oct 23 12:11:46 UTC 2024 - Atri Bhattacharya <badshah400(a)gmail.com>
+
+- Fix %check for gnu-hpc flavor by loading openblas module before
+ running ctest.
+
+-------------------------------------------------------------------
+Sat Oct 12 21:07:32 UTC 2024 - Christoph G <foss(a)grueninger.de>
+
+- Update to version 7.0.0
+ * To avoid name clashes, use type "singlecomplex" instead of
+ "complex".
+ * Rank Deficient Matrices
+
+-------------------------------------------------------------------
Old:
----
superlu-6.0.1.tar.gz
New:
----
superlu-7.0.0.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ superlu.spec ++++++
--- /var/tmp/diff_new_pack.mnGWcY/_old 2024-10-28 15:17:42.788937165 +0100
+++ /var/tmp/diff_new_pack.mnGWcY/_new 2024-10-28 15:17:42.788937165 +0100
@@ -1,7 +1,7 @@
#
# spec file
#
-# 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
@@ -20,7 +20,7 @@
# Base package name
%define pname superlu
-%define ver 6.0.1
+%define ver 7.0.0
%define _ver %(echo %{ver} | tr . _)
%if "%flavor" == ""
@@ -40,7 +40,7 @@
%if "%{flavor}" == "gnu7-hpc"
%bcond_without hpc
%global compiler_family gnu
-%undefine c_f_ver 7
+%define c_f_ver 7
%endif
%if "%{flavor}" == "gnu8-hpc"
@@ -72,7 +72,7 @@
%define p_prefix %_prefix
%define p_includedir %_includedir
%define p_libdir %_libdir
-%define _sover 6
+%define _sover 7
%define libname lib%{name}%{?_sover}
%else
%{hpc_init -c %compiler_family %{?c_f_ver:-v %{c_f_ver}} %{?ext:-e %{ext}}}
@@ -203,6 +203,13 @@
#fix permissions
chmod 644 MATLAB/* EXAMPLE/*
+%check
+%if %{with hpc}
+%{?hpc_setup}
+module load openblas
+%endif
+%ctest
+
# remove all build examples
cd EXAMPLE
make clean
@@ -215,9 +222,6 @@
cp FORTRAN/README README.fortran
%fdupes -s examples
-%check
-%ctest
-
%if %{with hpc}
%{hpc_write_pkgconfig}
++++++ superlu-6.0.1.tar.gz -> superlu-7.0.0.tar.gz ++++++
++++ 49439 lines of diff (skipped)
++++++ superlu-remove-mc64ad.patch ++++++
--- /var/tmp/diff_new_pack.mnGWcY/_old 2024-10-28 15:17:43.260956812 +0100
+++ /var/tmp/diff_new_pack.mnGWcY/_new 2024-10-28 15:17:43.264956979 +0100
@@ -1,5 +1,4 @@
diff --git a/SRC/CMakeLists.txt b/SRC/CMakeLists.txt
-index 34c4aa4..7996af0 100644
--- a/SRC/CMakeLists.txt
+++ b/SRC/CMakeLists.txt
@@ -23,7 +23,6 @@ set(sources
@@ -9,8 +8,8 @@
- mc64ad.c
qselect.c
input_error.c
- dmach.c
-@@ -68,9 +67,7 @@ if(enable_single)
+ )
+@@ -66,9 +65,7 @@ if(enable_single)
smemory.c
sutil.c
smyblas2.c
@@ -20,7 +19,7 @@
ilu_sdrop_row.c
ilu_ssnode_dfs.c
ilu_scolumn_dfs.c
-@@ -118,9 +115,7 @@ if(enable_double)
+@@ -116,9 +113,7 @@ if(enable_double)
dmemory.c
dutil.c
dmyblas2.c
@@ -30,7 +29,7 @@
ilu_ddrop_row.c
ilu_dsnode_dfs.c
ilu_dcolumn_dfs.c
-@@ -171,9 +166,7 @@ if(enable_complex)
+@@ -169,9 +164,7 @@ if(enable_complex)
cmemory.c
cutil.c
cmyblas2.c
@@ -40,7 +39,7 @@
ilu_cdrop_row.c
ilu_csnode_dfs.c
ilu_ccolumn_dfs.c
-@@ -222,9 +215,7 @@ if(enable_complex16)
+@@ -220,9 +213,7 @@ if(enable_complex16)
zmemory.c
zutil.c
zmyblas2.c
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package 000release-packages for openSUSE:Factory checked in at 2024-10-27 14:17:56
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/000release-packages (Old)
and /work/SRC/openSUSE:Factory/.000release-packages.new.2020 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "000release-packages"
Sun Oct 27 14:17:56 2024 rev:3183 rq: version:unknown
Changes:
--------
--- /work/SRC/openSUSE:Factory/000release-packages/Aeon-release.changes 2024-10-27 11:41:31.990856339 +0100
+++ /work/SRC/openSUSE:Factory/.000release-packages.new.2020/Aeon-release.changes 2024-10-27 14:17:58.200984128 +0100
@@ -2 +2 @@
-Sun Oct 27 10:41:29 UTC 2024 - openSUSE <packaging(a)lists.opensuse.org>
+Sun Oct 27 13:17:55 UTC 2024 - openSUSE <packaging(a)lists.opensuse.org>
Kalpa-release.changes: same change
MicroOS-release.changes: same change
openSUSE-Addon-NonOss-release.changes: same change
openSUSE-release.changes: same change
stub.changes: same change
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
Kalpa-release.spec: same change
MicroOS-release.spec: same change
openSUSE-Addon-NonOss-release.spec: same change
openSUSE-release.spec: same change
stub.spec: same change
++++++ weakremovers.inc ++++++
--- /var/tmp/diff_new_pack.HnStgM/_old 2024-10-27 14:18:00.053060960 +0100
+++ /var/tmp/diff_new_pack.HnStgM/_new 2024-10-27 14:18:00.065061458 +0100
@@ -1783,6 +1783,7 @@
Provides: weakremover(asm5)
Provides: weakremover(asm5-examples)
Provides: weakremover(asm5-javadoc)
+Provides: weakremover(asterisk-sounds-devel)
Provides: weakremover(atk-devel-32bit)
Provides: weakremover(atk-doc)
Provides: weakremover(atk-lang)
@@ -8462,6 +8463,7 @@
Provides: weakremover(jhbuild-recommended-deps)
Provides: weakremover(jline1)
Provides: weakremover(jline1-javadoc)
+Provides: weakremover(jmol)
Provides: weakremover(john-wordlists)
Provides: weakremover(jovie)
Provides: weakremover(jsch-agent-proxy-svnkit-trilead-ssh2)
@@ -10451,6 +10453,7 @@
Provides: weakremover(libags3)
Provides: weakremover(libags4)
Provides: weakremover(libags5)
+Provides: weakremover(libags6)
Provides: weakremover(libakode)
Provides: weakremover(libakode-devel)
Provides: weakremover(libakonadi4)
@@ -12736,6 +12739,7 @@
Provides: weakremover(libbotan-2-4-32bit)
Provides: weakremover(libbotan-2-7)
Provides: weakremover(libbotan-2-7-32bit)
+Provides: weakremover(libbotan-3-5)
Provides: weakremover(libbotan-devel-32bit)
Provides: weakremover(libbox2d-devel-32bit)
Provides: weakremover(libbox2d2-32bit)
@@ -17114,6 +17118,7 @@
Provides: weakremover(libpostproc56-32bit)
Provides: weakremover(libpostproc57-32bit)
Provides: weakremover(libpplite1)
+Provides: weakremover(libpplite4)
Provides: weakremover(libpqos0)
Provides: weakremover(libpqos0-devel)
Provides: weakremover(libpqos1)
@@ -21236,6 +21241,9 @@
Provides: weakremover(openblas_0_3_8-gnu-hpc-devel-static)
Provides: weakremover(openblas_0_3_9-gnu-hpc-devel-static)
Provides: weakremover(openbox-theme-plata)
+Provides: weakremover(openbsc)
+Provides: weakremover(openbsc-bs11-utils)
+Provides: weakremover(openbsc-bsc-sccplite)
Provides: weakremover(opencensus-cpp-devel)
Provides: weakremover(opencl-headers-1_2)
Provides: weakremover(openclonk)
@@ -45468,6 +45476,7 @@
Provides: weakremover(typelib-1_0-Libags-3_0)
Provides: weakremover(typelib-1_0-Libags-4_0)
Provides: weakremover(typelib-1_0-Libags-5_0)
+Provides: weakremover(typelib-1_0-Libags-6_0)
Provides: weakremover(typelib-1_0-MalcontentUi-0)
Provides: weakremover(typelib-1_0-Manette-0_2)
Provides: weakremover(typelib-1_0-Memphis-0_2)
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package hardinfo2 for openSUSE:Factory checked in at 2024-10-27 11:26:44
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/hardinfo2 (Old)
and /work/SRC/openSUSE:Factory/.hardinfo2.new.2020 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "hardinfo2"
Sun Oct 27 11:26:44 2024 rev:6 rq:1218652 version:2.2.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/hardinfo2/hardinfo2.changes 2024-10-20 10:05:17.438007962 +0200
+++ /work/SRC/openSUSE:Factory/.hardinfo2.new.2020/hardinfo2.changes 2024-10-27 11:27:10.779141509 +0100
@@ -1,0 +2,25 @@
+Thu Oct 24 15:17:55 UTC 2024 - Carsten Ziepke <kieltux(a)gmail.com>
+
+- Update to version 2.2.1:
+ * Security Fix for Multi User Systems #93 IMPORTANT
+ (boo#1231839)
+ * PACKAGING: Please remove 2.1.14 & 2.1.17 containing security
+ bug IMPORTANT
+ * PACKAGING: Changed services (systemV/D+runit) to use common
+ script hwinfo2_fetch_sysdata IMPORTANT
+ * PACKAGING: CPack changed to depends instead of recommends.
+ * Users must be added to hardinfo2 group to keep data safe.
+ * Improved UI - New SVG versions of ALL icons!
+ * Manual High DPI scaling support - GDK_DPI_SCALE=1.5 hardinfo2
+ * Improved HTML report - new theme, fixed html gen, images incl.
+ in print version.
+ * Improved SVG for distro logos, hardinfo2 logo - fixed for
+ old distro.
+ * Support for Alpine Linux, postmarketOS, OpenMandriva,
+ Parrot sec, MX Linux
+ * Minor fixes: PO comments, ru+da translations, html dialog
+ modal fix, flicker fix,
+ * Minor fixes: musl support, arm cpus, battery health info,
+ kernel boots, arm/risc meta cpu info added.
+
+-------------------------------------------------------------------
Old:
----
hardinfo2-release-2.1.17.tar.gz
New:
----
hardinfo2-release-2.2.1.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ hardinfo2.spec ++++++
--- /var/tmp/diff_new_pack.XVg02H/_old 2024-10-27 11:27:11.195158754 +0100
+++ /var/tmp/diff_new_pack.XVg02H/_new 2024-10-27 11:27:11.199158920 +0100
@@ -17,7 +17,7 @@
Name: hardinfo2
-Version: 2.1.17
+Version: 2.2.1
Release: 0
Summary: A System Information and Benchmark for Linux
License: GPL-2.0-or-later AND LGPL-2.1-or-later AND LGPL-2.0-or-later AND GPL-3.0-or-later AND LGPL-2.1-only
@@ -103,6 +103,7 @@
%doc README.md
%license LICENSE LICENSE.1 LICENSE.2
%{_bindir}/%{name}
+%{_bindir}/hwinfo2_fetch_sysdata
%{_libdir}/%{name}/
%{_datadir}/%{name}/
%{_datadir}/applications/%{name}.desktop
++++++ hardinfo2-release-2.1.17.tar.gz -> hardinfo2-release-2.2.1.tar.gz ++++++
/work/SRC/openSUSE:Factory/hardinfo2/hardinfo2-release-2.1.17.tar.gz /work/SRC/openSUSE:Factory/.hardinfo2.new.2020/hardinfo2-release-2.2.1.tar.gz differ: char 15, line 1
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package python3-pyside6 for openSUSE:Factory checked in at 2024-10-27 11:26:35
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python3-pyside6 (Old)
and /work/SRC/openSUSE:Factory/.python3-pyside6.new.2020 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python3-pyside6"
Sun Oct 27 11:26:35 2024 rev:36 rq:1218616 version:6.8.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/python3-pyside6/python3-pyside6.changes 2024-10-17 18:39:59.723917862 +0200
+++ /work/SRC/openSUSE:Factory/.python3-pyside6.new.2020/python3-pyside6.changes 2024-10-27 11:27:05.306914674 +0100
@@ -1,0 +2,7 @@
+Sat Oct 26 21:29:14 UTC 2024 - Christophe Marin <christophe(a)krop.fr>
+
+- Add patches to fix issue found by the KDE CI (PYSIDE-2893)
+ * 0001-PySide6-Documentation-Name-the-.rst-doc-files-accord.patch
+ * 0001-build-Install-module-doc-snippet-files.patch
+
+-------------------------------------------------------------------
New:
----
0001-PySide6-Documentation-Name-the-.rst-doc-files-accord.patch
0001-build-Install-module-doc-snippet-files.patch
BETA DEBUG BEGIN:
New:- Add patches to fix issue found by the KDE CI (PYSIDE-2893)
* 0001-PySide6-Documentation-Name-the-.rst-doc-files-accord.patch
* 0001-build-Install-module-doc-snippet-files.patch
New: * 0001-PySide6-Documentation-Name-the-.rst-doc-files-accord.patch
* 0001-build-Install-module-doc-snippet-files.patch
BETA DEBUG END:
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python3-pyside6.spec ++++++
--- /var/tmp/diff_new_pack.XLJ6Yw/_old 2024-10-27 11:27:06.246953641 +0100
+++ /var/tmp/diff_new_pack.XLJ6Yw/_new 2024-10-27 11:27:06.246953641 +0100
@@ -57,6 +57,9 @@
Patch2: 0001-Lazy-Init-Support-Lazy-Subtypes-amended.patch
# PATCH-FIX-UPSTREAM
Patch3: 0001-signature-Fix-pointers-to-signature-bytes-with-the-h.patch
+# PATCH-FIX-UPSTREAM
+Patch4: 0001-PySide6-Documentation-Name-the-.rst-doc-files-accord.patch
+Patch5: 0001-build-Install-module-doc-snippet-files.patch
# SECTION common_dependencies
BuildRequires: clang-devel
BuildRequires: %{mypython}-Sphinx
++++++ 0001-PySide6-Documentation-Name-the-.rst-doc-files-accord.patch ++++++
From 12aba6c4dfafe191a4640e3ab755a1c7e2ddfc44 Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint(a)qt.io>
Date: Tue, 15 Oct 2024 08:49:09 +0200
Subject: [PATCH] PySide6/Documentation: Name the .rst doc files according to
the module name
This makes installing them easier.
Amends b55e221464c18053fa44f18132071ebdaee8f432.
Task-number: PYSIDE-2893
Task-number: PYSIDE-1106
Change-Id: Ic93a1db34ca778ba1df8065c87e51e64e01c5900
Reviewed-by: Shyamnath Premnadh <Shyamnath.Premnadh(a)qt.io>
(cherry picked from commit 9214d569d1e0765435a0df6a81a3996b93b3d044)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot(a)qt-project.org>
---
sources/pyside6/PySide6/QtQml/typesystem_qml.xml | 16 ++++++++--------
.../doc/{qtqml_functions.rst => qtqml.rst} | 0
2 files changed, 8 insertions(+), 8 deletions(-)
rename sources/pyside6/PySide6/doc/{qtqml_functions.rst => qtqml.rst} (100%)
diff --git a/sources/pyside6/PySide6/QtQml/typesystem_qml.xml b/sources/pyside6/PySide6/QtQml/typesystem_qml.xml
index f2e9707c3..11eb27134 100644
--- a/sources/pyside6/PySide6/QtQml/typesystem_qml.xml
+++ b/sources/pyside6/PySide6/QtQml/typesystem_qml.xml
@@ -58,42 +58,42 @@
<add-function signature="qmlRegisterType(PyTypeObject@type_obj@,const char*@uri@,int@version_major@,int@version_minor@,const char*@qml_name@)" return-type="int">
<inject-code class="target" file="../glue/qtqml.cpp" snippet="qmlregistertype"/>
- <inject-documentation format="target" mode="append" file="../doc/qtqml_functions.rst"
+ <inject-documentation format="target" mode="append" file="../doc/qtqml.rst"
snippet="qmlregistertype"/>
<modify-argument index="2" pyi-type="str"/>
</add-function>
<add-function signature="qmlRegisterSingletonType(PyTypeObject@type_obj@,const char*@uri@,int@version_major@,int@version_minor@,const char*@qml_name@,PyObject*@callback@)" return-type="int">
<inject-code class="target" file="../glue/qtqml.cpp" snippet="qmlregistersingletontype_qobject_callback"/>
- <inject-documentation format="target" mode="append" file="../doc/qtqml_functions.rst"
+ <inject-documentation format="target" mode="append" file="../doc/qtqml.rst"
snippet="qmlregistersingletontype_qobject_callback"/>
<modify-argument index="2" pyi-type="str"/>
</add-function>
<add-function signature="qmlRegisterSingletonType(PyTypeObject@type_obj@,const char*@uri@,int@version_major@,int@version_minor@,const char*@qml_name@)" return-type="int">
<inject-code class="target" file="../glue/qtqml.cpp" snippet="qmlregistersingletontype_qobject_nocallback"/>
- <inject-documentation format="target" mode="append" file="../doc/qtqml_functions.rst"
+ <inject-documentation format="target" mode="append" file="../doc/qtqml.rst"
snippet="qmlregistersingletontype_qobject_nocallback"/>
<modify-argument index="2" pyi-type="str"/>
</add-function>
<add-function signature="qmlRegisterSingletonType(const char*@uri@,int@version_major@,int@version_minor@,const char*@qml_name@,PyObject*@callback@)" return-type="int">
<inject-code class="target" file="../glue/qtqml.cpp" snippet="qmlregistersingletontype_qjsvalue"/>
- <inject-documentation format="target" mode="append" file="../doc/qtqml_functions.rst"
+ <inject-documentation format="target" mode="append" file="../doc/qtqml.rst"
snippet="qmlregistersingletontype_qjsvalue"/>
<modify-argument index="1" pyi-type="str"/>
</add-function>
<add-function signature="qmlRegisterSingletonInstance(PyTypeObject@type_obj@,const char*@uri@,int@version_major@,int@version_minor@,const char*@qml_name@,PyObject*@callback@)" return-type="int">
<inject-code class="target" file="../glue/qtqml.cpp" snippet="qmlregistersingletoninstance"/>
- <inject-documentation format="target" mode="append" file="../doc/qtqml_functions.rst"
+ <inject-documentation format="target" mode="append" file="../doc/qtqml.rst"
snippet="qmlregistersingletoninstance"/>
<modify-argument index="2" pyi-type="str"/>
</add-function>
<add-function signature="qmlRegisterUncreatableType(PyTypeObject@type_obj@,const char*@uri@,int@version_major@,int@version_minor@,const char*@qml_name@,const char*@message@)" return-type="int">
<inject-code class="target" file="../glue/qtqml.cpp" snippet="qmlregisteruncreatabletype"/>
- <inject-documentation format="target" mode="append" file="../doc/qtqml_functions.rst"
+ <inject-documentation format="target" mode="append" file="../doc/qtqml.rst"
snippet="qmlregisteruncreatabletype"/>
<modify-argument index="2" pyi-type="str"/>
</add-function>
@@ -229,7 +229,7 @@
</modify-argument>
<inject-code class="target" file="../glue/qtqml.cpp"
snippet="qqmlengine-singletoninstance-qmltypeid"/>
- <inject-documentation format="target" mode="append" file="../doc/qtqml_functions.rst"
+ <inject-documentation format="target" mode="append" file="../doc/qtqml.rst"
snippet="qqmlengine-singletoninstance-qmltypeid"/>
</add-function>
<add-function signature="singletonInstance(QString@uri@,QString@typeName@)"
@@ -241,7 +241,7 @@
</modify-argument>
<inject-code class="target" file="../glue/qtqml.cpp"
snippet="qqmlengine-singletoninstance-typename"/>
- <inject-documentation format="target" mode="append" file="../doc/qtqml_functions.rst"
+ <inject-documentation format="target" mode="append" file="../doc/qtqml.rst"
snippet="qqmlengine-singletoninstance-typename"/>
</add-function>
</object-type>
diff --git a/sources/pyside6/PySide6/doc/qtqml_functions.rst b/sources/pyside6/PySide6/doc/qtqml.rst
similarity index 100%
rename from sources/pyside6/PySide6/doc/qtqml_functions.rst
rename to sources/pyside6/PySide6/doc/qtqml.rst
--
2.47.0
++++++ 0001-build-Install-module-doc-snippet-files.patch ++++++
From cacc9c5803a6dec820dd46211a836453183c8dab Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint(a)qt.io>
Date: Tue, 15 Oct 2024 08:11:46 +0200
Subject: [PATCH] build: Install module doc snippet files
Amends b55e221464c18053fa44f18132071ebdaee8f432.
Task-number: PYSIDE-1106
Fixes: PYSIDE-2893
Change-Id: I4a2688bfb5fcdddc5c6baea49d2fdc9c0f2381f1
Reviewed-by: Shyamnath Premnadh <Shyamnath.Premnadh(a)qt.io>
(cherry picked from commit ad155e67a208d4ac4c20d7033701d6ddb3d2593e)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot(a)qt-project.org>
---
build_scripts/platforms/unix.py | 8 ++++----
build_scripts/platforms/windows_desktop.py | 7 +++----
build_scripts/wheel_files.py | 3 +++
sources/pyside6/cmake/Macros/PySideModules.cmake | 9 +++++++++
4 files changed, 19 insertions(+), 8 deletions(-)
diff --git a/build_scripts/platforms/unix.py b/build_scripts/platforms/unix.py
index 2de089f32..4f57467cb 100644
--- a/build_scripts/platforms/unix.py
+++ b/build_scripts/platforms/unix.py
@@ -199,10 +199,10 @@ def prepare_packages_posix(pyside_build, _vars, cross_build=False):
# <install>/share/{st_package_name}/glue/* ->
# <setup>/{st_package_name}/glue
- copydir(
- "{install_dir}/share/{st_package_name}/glue",
- "{st_build_dir}/{st_package_name}/glue",
- _vars=_vars)
+ for glue in ['glue', 'doc']:
+ source = "{install_dir}/share/{st_package_name}/" + glue
+ target = "{st_build_dir}/{st_package_name}/" + glue
+ copydir(source, target, _vars=_vars)
if not is_android:
# <source>/pyside6/{st_package_name}/support/* ->
diff --git a/build_scripts/platforms/windows_desktop.py b/build_scripts/platforms/windows_desktop.py
index 2d2ff7db0..401930203 100644
--- a/build_scripts/platforms/windows_desktop.py
+++ b/build_scripts/platforms/windows_desktop.py
@@ -153,10 +153,9 @@ def prepare_packages_win32(pyside_build, _vars):
# <install>/share/{st_package_name}/glue/* ->
# <setup>/{st_package_name}/glue
- copydir(
- "{install_dir}/share/{st_package_name}/glue",
- destination_dir / "glue",
- _vars=_vars)
+ for glue in ['glue', 'doc']:
+ source = "{install_dir}/share/{st_package_name}/" + glue
+ copydir(source, destination_dir / glue, _vars=_vars)
# <source>/pyside6/{st_package_name}/support/* ->
# <setup>/{st_package_name}/support/*
diff --git a/build_scripts/wheel_files.py b/build_scripts/wheel_files.py
index 66e1f4182..9584949da 100644
--- a/build_scripts/wheel_files.py
+++ b/build_scripts/wheel_files.py
@@ -59,6 +59,7 @@ class ModuleData:
typesystems: list[str] = field(default_factory=list)
include: list[str] = field(default_factory=list)
glue: list[str] = field(default_factory=list)
+ doc_glue: list[str] = field(default_factory=list)
metatypes: list[str] = field(default_factory=list)
plugins: list[str] = field(default_factory=list)
@@ -87,6 +88,7 @@ class ModuleData:
self.typesystems.append(f"typesystem_{_lo}.xml")
self.include.append(f"Qt{self.name}/*.h")
self.glue.append(f"qt{_lo}.cpp")
+ self.doc_glue.append(f"qt{_lo}.rst")
if not len(self.metatypes):
self.metatypes.append(f"qt6{_lo}_relwithdebinfo_metatypes.json")
@@ -122,6 +124,7 @@ class ModuleData:
self.typesystems = [f"typesystems/{i}" for i in self.typesystems]
self.include = [f"include/{i}" for i in self.include]
self.glue = [f"glue/{i}" for i in self.glue]
+ self.doc_glue = [f"doc/{i}" for i in self.doc_glue]
def macos_pyside_wrappers_lib(self, s):
if s.startswith("Qt"):
diff --git a/sources/pyside6/cmake/Macros/PySideModules.cmake b/sources/pyside6/cmake/Macros/PySideModules.cmake
index 6e03323dd..57ff5582f 100644
--- a/sources/pyside6/cmake/Macros/PySideModules.cmake
+++ b/sources/pyside6/cmake/Macros/PySideModules.cmake
@@ -176,6 +176,14 @@ macro(create_pyside_module)
set(${module_NAME}_glue_dependency ${${module_NAME}_glue})
endif()
+ # Install module doc files.
+ set(${module_NAME}_doc "${CMAKE_CURRENT_SOURCE_DIR}/../doc/${lower_module_name}.rst")
+ set(${module_name}_doc_dependency "")
+ if(EXISTS ${${module_NAME}_doc})
+ install(FILES ${${module_NAME}_doc} DESTINATION share/PySide6${pyside6_SUFFIX}/doc)
+ set(${module_NAME}_doc_dependency ${${module_NAME}_doc})
+ endif()
+
# Install standalone glue files into typesystems subfolder, so that the resolved relative
# paths remain correct.
if (module_GLUE_SOURCES)
@@ -245,6 +253,7 @@ macro(create_pyside_module)
DEPENDS ${total_type_system_files}
${module_GLUE_SOURCES}
${${module_NAME}_glue_dependency}
+ ${${module_NAME}_doc_dependency}
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
COMMENT "Running generator for ${module_NAME}...")
--
2.47.0
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package tree-sitter-markdown for openSUSE:Factory checked in at 2024-10-27 11:26:37
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/tree-sitter-markdown (Old)
and /work/SRC/openSUSE:Factory/.tree-sitter-markdown.new.2020 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "tree-sitter-markdown"
Sun Oct 27 11:26:37 2024 rev:3 rq:1218626 version:0.3.2
Changes:
--------
--- /work/SRC/openSUSE:Factory/tree-sitter-markdown/tree-sitter-markdown.changes 2024-09-24 17:33:16.417072576 +0200
+++ /work/SRC/openSUSE:Factory/.tree-sitter-markdown.new.2020/tree-sitter-markdown.changes 2024-10-27 11:27:06.490963756 +0100
@@ -1,0 +2,6 @@
+Sun Oct 27 01:19:02 UTC 2024 - Richard Rahl <rrahl0(a)opensuse.org>
+
+- rename link markdown-inline.so to markdown_inline.so for neovim,
+ as neovim disallows dashes in names (fixes boo#1232021)
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ tree-sitter-markdown.spec ++++++
--- /var/tmp/diff_new_pack.tbCsGO/_old 2024-10-27 11:27:06.934982161 +0100
+++ /var/tmp/diff_new_pack.tbCsGO/_new 2024-10-27 11:27:06.934982161 +0100
@@ -57,7 +57,7 @@
#neovim stuff
install -d %{buildroot}%{_libdir}/tree_sitter
ln -s %{_libdir}/lib%{name}.so.0.14 %{buildroot}%{_libdir}/tree_sitter/%{_name}.so
-ln -s %{_libdir}/lib%{name}-inline.so.0.14 %{buildroot}%{_libdir}/tree_sitter/%{_name}-inline.so
+ln -s %{_libdir}/lib%{name}-inline.so.0.14 %{buildroot}%{_libdir}/tree_sitter/%{_name}_inline.so
%ldconfig_scriptlets
@@ -67,7 +67,7 @@
%{_libdir}/lib%{name}.so.*
%{_libdir}/lib%{name}-inline.so.*
%{_libdir}/tree_sitter/%{_name}.so
-%{_libdir}/tree_sitter/%{_name}-inline.so
+%{_libdir}/tree_sitter/%{_name}_inline.so
%if 0%{?suse_version} < 1600
%dir %{_libdir}/tree_sitter
%endif
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package PDAL for openSUSE:Factory checked in at 2024-10-27 11:26:28
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/PDAL (Old)
and /work/SRC/openSUSE:Factory/.PDAL.new.2020 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "PDAL"
Sun Oct 27 11:26:28 2024 rev:8 rq:1218607 version:2.8.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/PDAL/PDAL.changes 2024-10-23 21:11:31.073794633 +0200
+++ /work/SRC/openSUSE:Factory/.PDAL.new.2020/PDAL.changes 2024-10-27 11:27:00.978735264 +0100
@@ -1,0 +2,9 @@
+Fri Oct 25 21:51:44 UTC 2024 - Enno Tensing <tenno+suse(a)suij.in>
+
+- Update to 2.8.1
+ * See PDAL changelog at https://github.com/PDAL/PDAL/releases/tag/2.8.1
+ * For detailed changes between 2.8.0 and 2.8.1 see
+ https://github.com/PDAL/PDAL/compare/2.8.0...2.8.1
+ * Refresh PDAL_unbundle.patch
+
+-------------------------------------------------------------------
Old:
----
PDAL-2.8.0-src.tar.bz2
PDAL-2.8.0-src.tar.bz2.sha256sum
New:
----
PDAL-2.8.1-src.tar.bz2
PDAL-2.8.1-src.tar.bz2.sha256sum
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ PDAL.spec ++++++
--- /var/tmp/diff_new_pack.Ggrx5D/_old 2024-10-27 11:27:01.850771411 +0100
+++ /var/tmp/diff_new_pack.Ggrx5D/_new 2024-10-27 11:27:01.854771577 +0100
@@ -21,8 +21,8 @@
%define sovers 18.0.0
%define lname pdal
Name: PDAL
-Version: 2.8.0
-Release: 1
+Version: 2.8.1
+Release: 0
Summary: Point Data Abstraction Library (GDAL for point cloud data)
# The code is licensed BSD except for:
# - filters/private/csf/* and plugins/i3s/lepcc/* are Apache-2.0
@@ -36,6 +36,7 @@
Source1: https://github.com/PDAL/PDAL/releases/download/%{version}/%{name}-%{version…
# Unbundle some bundled libraries inspired by Fedora work at
# https://src.fedoraproject.org/rpms/PDAL/blob/rawhide/f/PDAL_unbundle.patch
+# Upstream is not interested in this patch/change, so we'll have to keep it around
Patch0: PDAL_unbundle.patch
BuildRequires: bash-completion
BuildRequires: cairo-devel
++++++ PDAL-2.8.0-src.tar.bz2 -> PDAL-2.8.1-src.tar.bz2 ++++++
/work/SRC/openSUSE:Factory/PDAL/PDAL-2.8.0-src.tar.bz2 /work/SRC/openSUSE:Factory/.PDAL.new.2020/PDAL-2.8.1-src.tar.bz2 differ: char 11, line 1
++++++ PDAL-2.8.0-src.tar.bz2.sha256sum -> PDAL-2.8.1-src.tar.bz2.sha256sum ++++++
--- /work/SRC/openSUSE:Factory/PDAL/PDAL-2.8.0-src.tar.bz2.sha256sum 2024-09-11 16:56:30.200814638 +0200
+++ /work/SRC/openSUSE:Factory/.PDAL.new.2020/PDAL-2.8.1-src.tar.bz2.sha256sum 2024-10-27 11:27:00.942733771 +0100
@@ -1 +1 @@
-8a6d7646912a4e7a382f06451b14a1f5f2e8aa4e0b391dc91c30701222198b77 PDAL-2.8.0-src.tar.bz2
+0e8d7deabe721f806b275dda6cf5630a8e43dc7210299b57c91f46fadcc34b31 PDAL-2.8.1-src.tar.bz2
++++++ PDAL_unbundle.patch ++++++
--- /var/tmp/diff_new_pack.Ggrx5D/_old 2024-10-27 11:27:01.930774728 +0100
+++ /var/tmp/diff_new_pack.Ggrx5D/_new 2024-10-27 11:27:01.930774728 +0100
@@ -1,18 +1,19 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
-index e18fab718..98ecbd76e 100644
+index 3152a35b3..29871d4c1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -118,6 +118,9 @@ include(${PDAL_CMAKE_DIR}/lazperf.cmake)
+@@ -118,6 +118,10 @@ include(${PDAL_CMAKE_DIR}/lazperf.cmake)
include(${PDAL_CMAKE_DIR}/gcs.cmake) # Optional
include(${PDAL_CMAKE_DIR}/utfcpp.cmake)
+find_package(PkgConfig REQUIRED)
+PKG_CHECK_MODULES(EIGEN REQUIRED eigen3)
++set(PDAL_VENDOR_EIGEN_DIR "${EIGEN_INCLUDE_DIRS}")
+
#------------------------------------------------------------------------------
# generate the pdal_features.hpp header
#------------------------------------------------------------------------------
-@@ -153,7 +156,6 @@ endif()
+@@ -153,7 +157,6 @@ endif()
add_subdirectory(plugins)
if (WITH_TESTS)
@@ -20,182 +21,14 @@
add_subdirectory(test)
endif()
add_subdirectory(dimbuilder)
-@@ -219,7 +221,7 @@ add_library(PDAL::PDAL ALIAS ${PDAL_LIB_NAME})
- #
- target_include_directories(${PDAL_LIB_NAME}
- SYSTEM BEFORE PRIVATE
-- ${PDAL_VENDOR_DIR}/eigen
-+ ${EIGEN_INCLUDE_DIRS}
- ${PDAL_VENDOR_DIR}/kazhdan
- ${PDAL_VENDOR_DIR}/h3/include
- )
-diff --git a/plugins/cpd/CMakeLists.txt b/plugins/cpd/CMakeLists.txt
-index ba85e27a7..dcf936502 100644
---- a/plugins/cpd/CMakeLists.txt
-+++ b/plugins/cpd/CMakeLists.txt
-@@ -13,7 +13,7 @@ find_package(Fgt REQUIRED CONFIG)
- option(BUILD_PLUGIN_CPD "Build Coherent Point Drift support" ${Cpd_FOUND})
+diff --git a/cmake/directories.cmake b/cmake/directories.cmake
+index 97e799bdb..f079ec725 100644
+--- a/cmake/directories.cmake
++++ b/cmake/directories.cmake
+@@ -11,5 +11,4 @@ set(PDAL_KERNELS_DIR ${ROOT_DIR}/kernels)
+ set(PDAL_FILTERS_DIR ${ROOT_DIR}/filters)
+ set(PDAL_IO_DIR ${ROOT_DIR}/io)
+ set(PDAL_VENDOR_DIR ${ROOT_DIR}/vendor)
+-set(PDAL_VENDOR_EIGEN_DIR "${PDAL_VENDOR_DIR}/eigen")
- set(files filters/CpdFilter.cpp)
--set(include_dirs "${CMAKE_CURRENT_LIST_DIR}" "${PDAL_VENDOR_DIR}/eigen")
-+set(include_dirs "${CMAKE_CURRENT_LIST_DIR}" "${EIGEN_INCLUDE_DIRS}")
-
- PDAL_ADD_PLUGIN(filter_libname filter cpd
- FILES
-@@ -22,7 +22,7 @@ PDAL_ADD_PLUGIN(filter_libname filter cpd
- Cpd::Library-C++
- ${PDAL_LIBRARIES}
- INCLUDES
-- ${PDAL_VENDOR_DIR}/eigen
-+ ${EIGEN_INCLUDE_DIRS}
- ${CMAKE_CURRENT_LIST_DIR}
- )
-
-diff --git a/plugins/rdb/CMakeLists.txt b/plugins/rdb/CMakeLists.txt
-index 0ddb9a24e..49a74a3e8 100644
---- a/plugins/rdb/CMakeLists.txt
-+++ b/plugins/rdb/CMakeLists.txt
-@@ -25,7 +25,6 @@ PDAL_ADD_PLUGIN(libname reader rdb
- ${RDB_INCLUDE_C_DIR}
- ${PDAL_INCLUDE_DIRS}
- )
--target_include_directories(${libname} PRIVATE "${PDAL_VENDOR_DIR}/eigen")
- target_include_directories(${libname} PUBLIC "${CMAKE_CURRENT_LIST_DIR}/../../vendor/nlohmann/")
- target_include_directories(${libname} PUBLIC "${CMAKE_CURRENT_LIST_DIR}/../../vendor/eigen/")
-
-@@ -54,7 +53,7 @@ if (BUILD_RDBLIB_TESTS)
- ${PROJECT_SOURCE_DIR}/plugins/rdb/io
- ${RDB_INCLUDE_CPP_DIR}
- ${RDB_INCLUDE_C_DIR}
-- ${PDAL_VENDOR_DIR}/eigen
-+ ${EIGEN_INCLUDE_DIRS}
-
- )
- endif()
-diff --git a/plugins/teaser/CMakeLists.txt b/plugins/teaser/CMakeLists.txt
-index cb1cb0e4e..c4017cab8 100644
---- a/plugins/teaser/CMakeLists.txt
-+++ b/plugins/teaser/CMakeLists.txt
-@@ -67,6 +67,6 @@ if (WITH_TESTS)
- LINK_WITH
- ${filter_libname}
- INCLUDES
-- "${PDAL_VENDOR_DIR}/eigen"
-+ ${EIGEN_INCLUDE_DIRS}
- )
- endif()
-diff --git a/plugins/trajectory/CMakeLists.txt b/plugins/trajectory/CMakeLists.txt
-index 31fc9942f..6ec207d95 100644
---- a/plugins/trajectory/CMakeLists.txt
-+++ b/plugins/trajectory/CMakeLists.txt
-@@ -18,7 +18,7 @@ PDAL_ADD_PLUGIN(libname filter trajectory
- ${CERES_LIBRARIES}
- ${PDAL_LIBRARIES}
- INCLUDES
-- ${PDAL_VENDOR_DIR}/eigen
-+ ${EIGEN_INCLUDE_DIRS}
- )
-
- if (WITH_TRAJECTORY_TEST)
-diff --git a/test/unit/CMakeLists.txt b/test/unit/CMakeLists.txt
-index 7ac5a1ede..a7e3bedd2 100644
---- a/test/unit/CMakeLists.txt
-+++ b/test/unit/CMakeLists.txt
-@@ -34,7 +34,7 @@ PDAL_ADD_TEST(pdal_eigen_test
- ${PDAL_SRC_DIR}/private/MathUtils.cpp
-
- INCLUDES
-- ${PDAL_VENDOR_DIR}/eigen
-+ ${EIGEN_INCLUDE_DIRS}
- )
- PDAL_ADD_TEST(pdal_file_utils_test FILES FileUtilsTest.cpp)
- PDAL_ADD_TEST(pdal_georeference_test FILES GeoreferenceTest.cpp)
-@@ -43,7 +43,7 @@ PDAL_ADD_TEST(pdal_kdindex_test
- KDIndexTest.cpp
- INCLUDES
- ${PDAL_VENDOR_DIR}
-- ${PDAL_VENDOR_DIR}/eigen
-+ ${EIGEN_INCLUDE_DIRS}
- )
- PDAL_ADD_TEST(pdal_kernel_test FILES KernelTest.cpp)
- PDAL_ADD_TEST(pdal_log_test FILES LogTest.cpp)
-@@ -52,7 +52,7 @@ PDAL_ADD_TEST(pdal_math_utils_test
- MathUtilsTest.cpp
- ${PDAL_SRC_DIR}/private/MathUtils.cpp
- INCLUDES
-- ${PDAL_VENDOR_DIR}/eigen
-+ ${EIGEN_INCLUDE_DIRS}
- )
- PDAL_ADD_TEST(pdal_metadata_test FILES MetadataTest.cpp)
- PDAL_ADD_TEST(pdal_oldpclblock_test FILES OldPCLBlockTest.cpp)
-@@ -84,7 +84,7 @@ PDAL_ADD_TEST(pdal_point_view_test
- FILES
- PointViewTest.cpp
- INCLUDES
-- ${PDAL_VENDOR_DIR}/eigen
-+ ${EIGEN_INCLUDE_DIRS}
- )
- PDAL_ADD_TEST(pdal_point_table_test FILES PointTableTest.cpp)
-
-@@ -227,13 +227,13 @@ PDAL_ADD_TEST(pdal_io_pcd_reader_test
- FILES
- io/PcdReaderTest.cpp
- INCLUDES
-- ${PDAL_VENDOR_DIR}/eigen
-+ ${EIGEN_INCLUDE_DIRS}
- )
- PDAL_ADD_TEST(pdal_io_pcd_writer_test
- FILES
- io/PcdWriterTest.cpp
- INCLUDES
-- ${PDAL_VENDOR_DIR}/eigen
-+ ${EIGEN_INCLUDE_DIRS}
- )
- PDAL_ADD_TEST(pdal_io_ply_reader_test
- FILES
-@@ -279,7 +279,7 @@ PDAL_ADD_TEST(pdal_i3s_obb_test
- INCLUDES
- ${NLOHMANN_INCLUDE_DIR}
- ${PDAL_INCLUDE_DIR}
-- ${PDAL_VENDOR_DIR}/eigen
-+ ${EIGEN_INCLUDE_DIRS}
- )
-
- if (BUILD_I3S_TESTS)
-@@ -300,7 +300,7 @@ PDAL_ADD_TEST(pdal_filters_chipper_test
- filters/ChipperTest.cpp
- INCLUDES
- ${NLOHMANN_INCLUDE_DIR}
-- ${PDAL_VENDOR_DIR}/eigen
-+ ${EIGEN_INCLUDE_DIRS}
- )
- PDAL_ADD_TEST(pdal_filters_nndistance_test
- FILES
-@@ -359,7 +359,7 @@ PDAL_ADD_TEST(pdal_filters_icp_test
- FILES
- filters/IcpFilterTest.cpp
- INCLUDES
-- ${PDAL_VENDOR_DIR}/eigen
-+ ${EIGEN_INCLUDE_DIRS}
- )
- PDAL_ADD_TEST(pdal_filters_info_test FILES filters/InfoFilterTest.cpp)
- PDAL_ADD_TEST(pdal_filters_lloydkmeans_test FILES filters/LloydKMeansFilterTest.cpp)
-@@ -380,7 +380,7 @@ PDAL_ADD_TEST(pdal_filters_planefit_test
- FILES
- filters/PlaneFitFilterTest.cpp
- INCLUDES
-- ${PDAL_VENDOR_DIR}/eigen)
-+ ${EIGEN_INCLUDE_DIRS})
- PDAL_ADD_TEST(pdal_filters_pmf_test FILES filters/PMFFilterTest.cpp)
- PDAL_ADD_TEST(pdal_filters_reprojection_test FILES
- filters/ReprojectionFilterTest.cpp)
-@@ -408,7 +408,7 @@ PDAL_ADD_TEST(pdal_filters_splitter_test
- FILES
- filters/SplitterTest.cpp
- INCLUDES
-- ${PDAL_VENDOR_DIR}/eigen)
-+ ${EIGEN_INCLUDE_DIRS})
- PDAL_ADD_TEST(pdal_filters_stats_test FILES filters/StatsFilterTest.cpp)
- PDAL_ADD_TEST(pdal_filters_transformation_test FILES
- filters/TransformationFilterTest.cpp)
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package go-sendxmpp for openSUSE:Factory checked in at 2024-10-27 11:26:27
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/go-sendxmpp (Old)
and /work/SRC/openSUSE:Factory/.go-sendxmpp.new.2020 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "go-sendxmpp"
Sun Oct 27 11:26:27 2024 rev:19 rq:1218605 version:0.11.4
Changes:
--------
--- /work/SRC/openSUSE:Factory/go-sendxmpp/go-sendxmpp.changes 2024-09-18 15:28:03.571782362 +0200
+++ /work/SRC/openSUSE:Factory/.go-sendxmpp.new.2020/go-sendxmpp.changes 2024-10-27 11:26:57.386586362 +0100
@@ -1,0 +2,14 @@
+Sat Oct 26 17:42:16 UTC 2024 - Michael Vetter <mvetter(a)suse.com>
+
+- Update to 0.11.4:
+ * Fix bug in SCRAM-SHA-256-PLUS (via go-xmpp >= 0.2.4).
+
+-------------------------------------------------------------------
+Sat Oct 26 17:41:55 UTC 2024 - Michael Vetter <mvetter(a)suse.com>
+
+- Update to 0.11.3:
+ * Add go-xmpp library version to --version output (requires go-xmpp >= 0.2.2).
+ * Fix XEP-0474: SASL SCRAM Downgrade Protection hash calculation bug (via go-xmpp >= v0.2.3).
+ * [gocritic]: Improve code quality.
+
+-------------------------------------------------------------------
Old:
----
go-sendxmpp-0.11.2.tar.gz
New:
----
go-sendxmpp-0.11.4.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ go-sendxmpp.spec ++++++
--- /var/tmp/diff_new_pack.dL6yPp/_old 2024-10-27 11:26:59.154659652 +0100
+++ /var/tmp/diff_new_pack.dL6yPp/_new 2024-10-27 11:26:59.170660315 +0100
@@ -17,7 +17,7 @@
Name: go-sendxmpp
-Version: 0.11.2
+Version: 0.11.4
Release: 0
Summary: A little tool to send messages to an XMPP contact or MUC
License: BSD-2-Clause
++++++ _service ++++++
--- /var/tmp/diff_new_pack.dL6yPp/_old 2024-10-27 11:26:59.438671425 +0100
+++ /var/tmp/diff_new_pack.dL6yPp/_new 2024-10-27 11:26:59.466672585 +0100
@@ -3,7 +3,7 @@
<param name="url">https://salsa.debian.org/mdosch/go-sendxmpp.git</param>
<param name="scm">git</param>
<param name="exclude">.git</param>
- <param name="revision">v0.11.2</param>
+ <param name="revision">v0.11.4</param>
<param name="versionformat">@PARENT_TAG@</param>
<param name="changesgenerate">disable</param>
<param name="versionrewrite-pattern">v(.*)</param>
++++++ go-sendxmpp-0.11.2.tar.gz -> go-sendxmpp-0.11.4.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/go-sendxmpp-0.11.2/CHANGELOG.md new/go-sendxmpp-0.11.4/CHANGELOG.md
--- old/go-sendxmpp-0.11.2/CHANGELOG.md 2024-09-17 20:52:24.000000000 +0200
+++ new/go-sendxmpp-0.11.4/CHANGELOG.md 2024-10-26 00:54:13.000000000 +0200
@@ -1,5 +1,17 @@
# Changelog
+## [v0.11.4] 2024-10-26
+### Changed
+- Fix bug in SCRAM-SHA-256-PLUS (via go-xmpp >= 0.2.4).
+
+## [v0.11.3] 2024-10-25
+### Added
+- Add go-xmpp library version to `--version` output (requires go-xmpp >= 0.2.2).
+
+### Changed
+- Fix XEP-0474: SASL SCRAM Downgrade Protection hash calculation bug (via go-xmpp >= 0.2.3).
+- [gocritic]: Improve code quality.
+
## [v0.11.2] 2024-09-17
### Changed
- Add Gopenpgp and Xmppsrv version to `--version` output (requires xmppsrv >= 0.3.2).
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/go-sendxmpp-0.11.2/README.md new/go-sendxmpp-0.11.4/README.md
--- old/go-sendxmpp-0.11.2/README.md 2024-09-17 20:52:24.000000000 +0200
+++ new/go-sendxmpp-0.11.4/README.md 2024-10-26 00:54:13.000000000 +0200
@@ -136,25 +136,25 @@
Send a message to two recipients using a configuration file.
```bash
-cat message.txt | ./go-sendxmpp -f ./sendxmpp recipient1(a)example.com recipient2(a)example.com
+cat message.txt|go-sendxmpp -f ./sendxmpp recipient1(a)example.com recipient2(a)example.com
```
Send a message to two recipients directly defining account credentials.
```bash
-cat message.txt | ./go-sendxmpp -u bob(a)example.com -p swordfish recipient1(a)example.com recipient2(a)example.com
+cat message.txt|go-sendxmpp -u bob(a)example.com -p swordfish recipient1(a)example.com recipient2(a)example.com
```
Send a message to two groupchats (`-c`) using a configuration file.
```bash
-cat message.txt | ./go-sendxmpp -cf ./sendxmpp chat1(a)conference.example.com chat2(a)conference.example.com
+cat message.txt|go-sendxmpp -cf ./sendxmpp chat1(a)conference.example.com chat2(a)conference.example.com
```
Send file changes to two groupchats (`-c`) using a configuration file.
```bash
-tail -f example.log | ./go-sendxmpp -cif ./sendxmpp chat1(a)conference.example.com chat2(a)conference.example.com
+tail -f example.log|go-sendxmpp -cif ./sendxmpp chat1(a)conference.example.com chat2(a)conference.example.com
```
Send a notification if a long running process finishes.
@@ -164,12 +164,21 @@
### shell completion
-#### zsh
+There are no shell completions yet (contributions welcome) but for zsh it is possible to automatically create completions from `--help` and for fish it is possible to create completions from the man page.
+Those might work *good enough*.
-There are no shell completions yet (contributions welcome) but for zsh it is possible to automatically create completions from `--help` which might work *good enough*.
+#### zsh
Just place the following in your `~/.zshrc` or `~/.zshrc.local`:
``` bash
compdef _gnu_generic go-sendxmpp
```
+
+#### fish
+
+Fish can generate them from the man page with following command:
+
+``` bash
+fish_update_completions
+```
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/go-sendxmpp-0.11.2/const.go new/go-sendxmpp-0.11.4/const.go
--- old/go-sendxmpp-0.11.2/const.go 2024-09-17 20:52:24.000000000 +0200
+++ new/go-sendxmpp-0.11.4/const.go 2024-10-26 00:54:13.000000000 +0200
@@ -5,7 +5,7 @@
package main
const (
- version = "0.11.2"
+ version = "0.11.4"
// defaults
defaultBufferSize = 100
defaultConfigColumnSep = 2
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/go-sendxmpp-0.11.2/go.mod new/go-sendxmpp-0.11.4/go.mod
--- old/go-sendxmpp-0.11.2/go.mod 2024-09-17 20:52:24.000000000 +0200
+++ new/go-sendxmpp-0.11.4/go.mod 2024-10-26 00:54:13.000000000 +0200
@@ -1,24 +1,26 @@
module salsa.debian.org/mdosch/go-sendxmpp
-go 1.21.5
+go 1.22.0
+
+toolchain go1.22.7
require (
- github.com/ProtonMail/gopenpgp/v2 v2.7.5
+ github.com/ProtonMail/gopenpgp/v2 v2.8.0-beta.0
github.com/beevik/etree v1.4.1
- github.com/gabriel-vasile/mimetype v1.4.5
+ github.com/gabriel-vasile/mimetype v1.4.6
github.com/google/uuid v1.6.0
github.com/pborman/getopt/v2 v2.1.0
- github.com/xmppo/go-xmpp v0.2.2-0.20240910180004-06b143aee341
- golang.org/x/crypto v0.27.0
+ github.com/xmppo/go-xmpp v0.2.4
+ golang.org/x/crypto v0.28.0
salsa.debian.org/mdosch/xmppsrv v0.3.2
)
require (
- github.com/ProtonMail/go-crypto v1.0.0 // indirect
+ github.com/ProtonMail/go-crypto v1.1.0-beta.0 // indirect
github.com/ProtonMail/go-mime v0.0.0-20230322103455-7d82a3887f2f // indirect
- github.com/cloudflare/circl v1.4.0 // indirect
+ github.com/cloudflare/circl v1.5.0 // indirect
github.com/pkg/errors v0.9.1 // indirect
- golang.org/x/net v0.29.0 // indirect
- golang.org/x/sys v0.25.0 // indirect
- golang.org/x/text v0.18.0 // indirect
+ golang.org/x/net v0.30.0 // indirect
+ golang.org/x/sys v0.26.0 // indirect
+ golang.org/x/text v0.19.0 // indirect
)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/go-sendxmpp-0.11.2/go.sum new/go-sendxmpp-0.11.4/go.sum
--- old/go-sendxmpp-0.11.2/go.sum 2024-09-17 20:52:24.000000000 +0200
+++ new/go-sendxmpp-0.11.4/go.sum 2024-10-26 00:54:13.000000000 +0200
@@ -1,21 +1,17 @@
-github.com/ProtonMail/go-crypto v0.0.0-20230717121422-5aa5874ade95/go.mod h1:EjAoLdwvbIOoOQr3ihjnSoLZRtE8azugULFRteWMNc0=
-github.com/ProtonMail/go-crypto v1.0.0 h1:LRuvITjQWX+WIfr930YHG2HNfjR1uOfyf5vE0kC2U78=
-github.com/ProtonMail/go-crypto v1.0.0/go.mod h1:EjAoLdwvbIOoOQr3ihjnSoLZRtE8azugULFRteWMNc0=
+github.com/ProtonMail/go-crypto v1.1.0-beta.0 h1:9ZLo7gzqEbrSakeRM4L0jaHMuZSLrjoYBIdIwcBr4C4=
+github.com/ProtonMail/go-crypto v1.1.0-beta.0/go.mod h1:rA3QumHc/FZ8pAHreoekgiAbzpNsfQAosU5td4SnOrE=
github.com/ProtonMail/go-mime v0.0.0-20230322103455-7d82a3887f2f h1:tCbYj7/299ekTTXpdwKYF8eBlsYsDVoggDAuAjoK66k=
github.com/ProtonMail/go-mime v0.0.0-20230322103455-7d82a3887f2f/go.mod h1:gcr0kNtGBqin9zDW9GOHcVntrwnjrK+qdJ06mWYBybw=
-github.com/ProtonMail/gopenpgp/v2 v2.7.5 h1:STOY3vgES59gNgoOt2w0nyHBjKViB/qSg7NjbQWPJkA=
-github.com/ProtonMail/gopenpgp/v2 v2.7.5/go.mod h1:IhkNEDaxec6NyzSI0PlxapinnwPVIESk8/76da3Ct3g=
+github.com/ProtonMail/gopenpgp/v2 v2.8.0-beta.0 h1:tTiGHVwjTCVhgA2hod0OyVncfCK3l2j3tApi7tKW07s=
+github.com/ProtonMail/gopenpgp/v2 v2.8.0-beta.0/go.mod h1:M2xITH7IEPDrcxzmYtFmpypFMISvUV+DXuG8nBqfqf8=
github.com/beevik/etree v1.4.1 h1:PmQJDDYahBGNKDcpdX8uPy1xRCwoCGVUiW669MEirVI=
github.com/beevik/etree v1.4.1/go.mod h1:gPNJNaBGVZ9AwsidazFZyygnd+0pAU38N4D+WemwKNs=
-github.com/bwesterb/go-ristretto v1.2.3/go.mod h1:fUIoIZaG73pV5biE2Blr2xEzDoMj7NFEuV9ekS419A0=
-github.com/cloudflare/circl v1.3.3/go.mod h1:5XYMA4rFBvNIrhs50XuiBJ15vF2pZn4nnUKZrLbUZFA=
-github.com/cloudflare/circl v1.4.0 h1:BV7h5MgrktNzytKmWjpOtdYrf0lkkbF8YMlBGPhJQrY=
-github.com/cloudflare/circl v1.4.0/go.mod h1:PDRU+oXvdD7KCtgKxW95M5Z8BpSCJXQORiZFnBQS5QU=
+github.com/cloudflare/circl v1.5.0 h1:hxIWksrX6XN5a1L2TI/h53AGPhNHoUBo+TD1ms9+pys=
+github.com/cloudflare/circl v1.5.0/go.mod h1:uddAzsPgqdMAYatqJ0lsjX1oECcQLIlRpzZh3pJrofs=
+github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
-github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/gabriel-vasile/mimetype v1.4.5 h1:J7wGKdGu33ocBOhGy0z653k/lFKLFDPJMG8Gql0kxn4=
-github.com/gabriel-vasile/mimetype v1.4.5/go.mod h1:ibHel+/kbxn9x2407k1izTA1S81ku1z/DlgOW2QE0M4=
+github.com/gabriel-vasile/mimetype v1.4.6 h1:3+PzJTKLkvgjeTbts6msPJt4DixhT4YtFNf1gtGe3zc=
+github.com/gabriel-vasile/mimetype v1.4.6/go.mod h1:JX1qVKqZd40hUPpAfiNTe0Sne7hdfKSbOqqmkq8GCXc=
github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
github.com/pborman/getopt/v2 v2.1.0 h1:eNfR+r+dWLdWmV8g5OlpyrTYHkhVNxHBdN2cCrJmOEA=
@@ -24,28 +20,23 @@
github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/xmppo/go-xmpp v0.2.2-0.20240910180004-06b143aee341 h1:Nn7xp8WOd+hPDasApuRBRrmt0UbhEj2FM2cSovdTMdc=
-github.com/xmppo/go-xmpp v0.2.2-0.20240910180004-06b143aee341/go.mod h1:0ZxTwt7zQQbRkVg9PpBISmGAjmxf+oik0JyAahsewM8=
+github.com/xmppo/go-xmpp v0.2.4 h1:2ed1qnYUAKsooL3kphniIWmqBjz8IB8cmzyGB/WdAXo=
+github.com/xmppo/go-xmpp v0.2.4/go.mod h1:b24GAaIpOqpxK7vYpZsMo11ReZ1qMBu3DPjkZXcqSpw=
github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
-golang.org/x/crypto v0.3.1-0.20221117191849-2c476679df9a/go.mod h1:hebNnKkNXi2UzZN1eVRvBB7co0a+JxK6XbPiWVs/3J4=
-golang.org/x/crypto v0.7.0/go.mod h1:pYwdfH91IfpZVANVyUOhSIPZaFoJGxTFbZhFTx+dXZU=
-golang.org/x/crypto v0.27.0 h1:GXm2NjJrPaiv/h1tb2UH8QfgC/hOf/+z0p6PT8o1w7A=
-golang.org/x/crypto v0.27.0/go.mod h1:1Xngt8kV6Dvbssa53Ziq6Eqn0HqbZi5Z6R0ZpwQzt70=
+golang.org/x/crypto v0.28.0 h1:GBDwsMXVQi34v5CCYUm2jkJvu4cbtru2U4TN2PSyQnw=
+golang.org/x/crypto v0.28.0/go.mod h1:rmgy+3RHxRZMyY0jjAJShp2zgEdOqj2AO7U0pYmeQ7U=
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
-golang.org/x/net v0.2.0/go.mod h1:KqCZLdyyvdV855qA2rE3GC2aiw5xGR5TEjj8smXukLY=
golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
-golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc=
-golang.org/x/net v0.29.0 h1:5ORfpBpCs4HzDYoodCDBbwHzdR5UrLBZ3sOnUJmFoHo=
-golang.org/x/net v0.29.0/go.mod h1:gLkgy8jTGERgjzMic6DS9+SP0ajcu6Xu3Orq/SpETg0=
+golang.org/x/net v0.30.0 h1:AcW1SDZMkb8IpzCdQUaIq2sP4sZ4zw+55h6ynffypl4=
+golang.org/x/net v0.30.0/go.mod h1:2wGyMJ5iFasEhkwi13ChkO/t1ECNC4X4eBKkVFyYFlU=
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -54,31 +45,24 @@
golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.3.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.25.0 h1:r+8e+loiHxRqhXVl6ML1nO3l1+oFoWbnlu2Ehimmi34=
-golang.org/x/sys v0.25.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.26.0 h1:KHjCJyddX0LoSTb3J+vWpupP9p0oznkqVk/IfjymZbo=
+golang.org/x/sys v0.26.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
-golang.org/x/term v0.2.0/go.mod h1:TVmDHMZPmdnySmBfhjOoOdhjzdE1h4u1VwSiw2l1Nuc=
golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
-golang.org/x/term v0.6.0/go.mod h1:m6U89DPEgQRMq3DNkDClhWw02AUbt2daBVO4cn4Hv9U=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
-golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
golang.org/x/text v0.8.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
-golang.org/x/text v0.18.0 h1:XvMDiNzPAl0jr17s6W9lcaIhGUfUORdGCNsuLmPG224=
-golang.org/x/text v0.18.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY=
+golang.org/x/text v0.19.0 h1:kTxAhCbGbxhK0IwgSKiMO5awPoDQ0RpfiVYBfK860YM=
+golang.org/x/text v0.19.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY=
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
salsa.debian.org/mdosch/xmppsrv v0.3.2 h1:c83iqkp/GnsPYqQ12dTw8MQBzI+Dtw9mQOFSuL3GjaQ=
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/go-sendxmpp-0.11.2/helpers.go new/go-sendxmpp-0.11.4/helpers.go
--- old/go-sendxmpp-0.11.2/helpers.go 2024-09-17 20:52:24.000000000 +0200
+++ new/go-sendxmpp-0.11.4/helpers.go 2024-10-26 00:54:13.000000000 +0200
@@ -57,7 +57,7 @@
}
func getFastData(jid string, password string) (xmpp.Fast, error) {
- folder := strings.Replace(strings.Replace(jid, "@", "_at_", -1), ".", "_", -1)
+ folder := fsFriendlyJid(jid)
var fast xmpp.Fast
fastPath, err := getDataPath(folder)
if err != nil {
@@ -100,7 +100,7 @@
func writeFastData(jid string, password string, fast xmpp.Fast) error {
var encBuf bytes.Buffer
- folder := strings.Replace(strings.Replace(jid, "@", "_at_", -1), ".", "_", -1)
+ folder := fsFriendlyJid(jid)
fastPath, err := getDataPath(folder)
if err != nil {
return fmt.Errorf("writeFastData: failed to write fast cache file: %w", err)
@@ -150,7 +150,7 @@
func getClientID(jid string) (string, error) {
var clientID string
- folder := strings.Replace(strings.Replace(jid, "@", "_at_", -1), ".", "_", -1)
+ folder := fsFriendlyJid(jid)
clientIDLoc, err := getClientIDLoc(folder)
if err != nil {
return strError, err
@@ -244,3 +244,9 @@
func getShortID() string {
return uuid.NewString()[:6]
}
+
+// Remove @ and dots
+func fsFriendlyJid(jid string) string {
+ jid = strings.ReplaceAll(jid, "@", "_at_")
+ return strings.ReplaceAll(jid, ".", "_")
+}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/go-sendxmpp-0.11.2/main.go new/go-sendxmpp-0.11.4/main.go
--- old/go-sendxmpp-0.11.2/main.go 2024-09-17 20:52:24.000000000 +0200
+++ new/go-sendxmpp-0.11.4/main.go 2024-10-26 00:54:13.000000000 +0200
@@ -151,6 +151,7 @@
case *flagVersion:
// If requested, show version and quit.
fmt.Println("Go-sendxmpp", version)
+ fmt.Println("Go-xmpp library version:", xmpp.Version)
fmt.Println("Xmppsrv library version:", xmppsrv.Version)
fmt.Println("Gopenpgp library version:", gopenpgpConst.Version)
system := runtime.GOOS + "/" + runtime.GOARCH
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/go-sendxmpp-0.11.2/ox.go new/go-sendxmpp-0.11.4/ox.go
--- old/go-sendxmpp-0.11.2/ox.go 2024-09-17 20:52:24.000000000 +0200
+++ new/go-sendxmpp-0.11.4/ox.go 2024-10-26 00:54:13.000000000 +0200
@@ -315,7 +315,7 @@
}
func oxGetPrivKeyLoc(jid string) (string, error) {
- dataDir, err := getDataPath(strings.Replace(strings.Replace(jid, "@", "_at_", -1), ".", "_", -1))
+ dataDir, err := getDataPath(fsFriendlyJid(jid))
if err != nil {
return strError, fmt.Errorf("oxGetPrivKeyLoc: %w", err)
}
@@ -326,8 +326,8 @@
// TODO: Remove handling of oldDataFile in a later version when it's very likely that there are no
// more versions in use using the oldDataFile (<0.8.3).
oldDataFile := oldDataDir + base64.StdEncoding.EncodeToString([]byte(jid))
- oldDataFile2 := oldDataDir + strings.Replace(jid, "@", "_at_", -1)
- oldDataFile3 := oldDataDir + strings.Replace(strings.Replace(jid, "@", "_at_", -1), ".", "_", -1)
+ oldDataFile2 := oldDataDir + strings.ReplaceAll(jid, "@", "_at_")
+ oldDataFile3 := oldDataDir + fsFriendlyJid(jid)
dataFile := dataDir + "oxprivkey"
if _, err := os.Stat(oldDataFile); err == nil {
err := os.Rename(oldDataFile, dataFile)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/go-sendxmpp-0.11.2/parseconfig.go new/go-sendxmpp-0.11.4/parseconfig.go
--- old/go-sendxmpp-0.11.2/parseconfig.go 2024-09-17 20:52:24.000000000 +0200
+++ new/go-sendxmpp-0.11.4/parseconfig.go 2024-10-26 00:54:13.000000000 +0200
@@ -85,7 +85,6 @@
if err != nil {
return output, fmt.Errorf("parseConfig: failed to open config file: %w", err)
}
- defer file.Close()
scanner := bufio.NewScanner(file)
scanner.Split(bufio.ScanLines)
@@ -111,6 +110,7 @@
}
out, err := exec.Command(shell, "-c", column[1]).Output()
if err != nil {
+ file.Close()
log.Fatal(err)
}
output.password = string(out)
@@ -156,5 +156,6 @@
}
}
+ file.Close()
return output, err
}
++++++ vendor.tar.gz ++++++
++++ 8693 lines of diff (skipped)
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package pplite for openSUSE:Factory checked in at 2024-10-27 11:26:26
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/pplite (Old)
and /work/SRC/openSUSE:Factory/.pplite.new.2020 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "pplite"
Sun Oct 27 11:26:26 2024 rev:3 rq:1218604 version:0.12
Changes:
--------
--- /work/SRC/openSUSE:Factory/pplite/pplite.changes 2023-11-15 21:09:36.294505019 +0100
+++ /work/SRC/openSUSE:Factory/.pplite.new.2020/pplite.changes 2024-10-27 11:26:53.842439449 +0100
@@ -1,0 +2,10 @@
+Sat Oct 26 15:26:42 UTC 2024 - Jan Engelhardt <jengelh(a)inai.de>
+
+- Update to release 0.12
+ * The library no longer depends on the C++ interface of GMP
+ (this change mainly affects classes ``pplite::Integer`` and
+ ``pplite::Rational``).
+ * The support for conditional thread safety is now enabled by
+ default.
+
+-------------------------------------------------------------------
Old:
----
pplite-0.11.tar.gz
New:
----
_scmsync.obsinfo
build.specials.obscpio
pplite-0.12.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ pplite.spec ++++++
--- /var/tmp/diff_new_pack.lxGKma/_old 2024-10-27 11:26:55.350501962 +0100
+++ /var/tmp/diff_new_pack.lxGKma/_new 2024-10-27 11:26:55.358502293 +0100
@@ -1,7 +1,7 @@
#
# spec file for package pplite
#
-# 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,10 +16,10 @@
#
-%define lname libpplite4
+%define lname libpplite5
%define _lto_cflags %nil
Name: pplite
-Version: 0.11
+Version: 0.12
Release: 0
Summary: Computations with polyhedra
License: GPL-3.0-or-later
@@ -74,8 +74,7 @@
:
fi
-%post -n %lname -p /sbin/ldconfig
-%postun -n %lname -p /sbin/ldconfig
+%ldconfig_scriptlets -n %lname
%files -n %lname
%license COPYING
++++++ _scmsync.obsinfo ++++++
mtime: 1729956543
commit: 439b22db519208e246e6c7813d88853fe16e5bccc84eaacd2a56754d44b35f21
url: https://src.opensuse.org/jengelh/pplite
revision: master
++++++ pplite-0.11.tar.gz -> pplite-0.12.tar.gz ++++++
++++ 12389 lines of diff (skipped)
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package gap-hap for openSUSE:Factory checked in at 2024-10-27 11:26:25
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/gap-hap (Old)
and /work/SRC/openSUSE:Factory/.gap-hap.new.2020 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gap-hap"
Sun Oct 27 11:26:25 2024 rev:5 rq:1218603 version:1.66
Changes:
--------
--- /work/SRC/openSUSE:Factory/gap-hap/gap-hap.changes 2024-07-31 13:31:07.816328461 +0200
+++ /work/SRC/openSUSE:Factory/.gap-hap.new.2020/gap-hap.changes 2024-10-27 11:26:50.310293035 +0100
@@ -1,0 +2,6 @@
+Sat Oct 26 16:14:35 UTC 2024 - Jan Engelhardt <jengelh(a)inai.de>
+
+- Update to release 1.66
+ * Don't read files that are not shipped any longer
+
+-------------------------------------------------------------------
Old:
----
v1.65.tar.gz
New:
----
v1.66.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ gap-hap.spec ++++++
--- /var/tmp/diff_new_pack.9dm2dx/_old 2024-10-27 11:26:52.318376274 +0100
+++ /var/tmp/diff_new_pack.9dm2dx/_new 2024-10-27 11:26:52.322376441 +0100
@@ -17,7 +17,7 @@
Name: gap-hap
-Version: 1.65
+Version: 1.66
Release: 0
Summary: GAP: Homological Algebra Programming
License: GPL-2.0-or-later
++++++ _scmsync.obsinfo ++++++
--- /var/tmp/diff_new_pack.9dm2dx/_old 2024-10-27 11:26:52.434381083 +0100
+++ /var/tmp/diff_new_pack.9dm2dx/_new 2024-10-27 11:26:52.474382741 +0100
@@ -1,5 +1,5 @@
-mtime: 1722400097
-commit: 8f7e4b201c76ec76fad979048a6ad40e2435af4b028f75d26c57367e9c14a326
+mtime: 1729959319
+commit: 99c5afc7482d7ebe943d322d4c3cbb700d7c37c7370885fe9f512f3fb999e975
url: https://src.opensuse.org/jengelh/gap-hap
revision: master
++++++ build.specials.obscpio ++++++
diff: old/*: No such file or directory
diff: new/*: No such file or directory
++++++ v1.65.tar.gz -> v1.66.tar.gz ++++++
/work/SRC/openSUSE:Factory/gap-hap/v1.65.tar.gz /work/SRC/openSUSE:Factory/.gap-hap.new.2020/v1.66.tar.gz differ: char 36, line 1
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package dsda-doom for openSUSE:Factory checked in at 2024-10-27 11:26:24
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/dsda-doom (Old)
and /work/SRC/openSUSE:Factory/.dsda-doom.new.2020 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "dsda-doom"
Sun Oct 27 11:26:24 2024 rev:6 rq:1218597 version:0.28.2
Changes:
--------
--- /work/SRC/openSUSE:Factory/dsda-doom/dsda-doom.changes 2024-08-19 23:44:57.404763401 +0200
+++ /work/SRC/openSUSE:Factory/.dsda-doom.new.2020/dsda-doom.changes 2024-10-27 11:26:48.930235829 +0100
@@ -1,0 +2,8 @@
+Sat Oct 26 15:29:34 UTC 2024 - Jan Engelhardt <jengelh(a)inai.de>
+
+- Update to release 0.28.2
+ * Added ANIMATED support to Heretic
+ * Fixed mbf21 add / remove NOBLOCKMAP or NOSECTOR dehacked
+ crashes
+
+-------------------------------------------------------------------
@@ -15,0 +24 @@
+- Delete cmake-path-suffix.diff
Old:
----
v0.28.1.tar.gz
New:
----
v0.28.2.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ dsda-doom.spec ++++++
--- /var/tmp/diff_new_pack.3X4sBo/_old 2024-10-27 11:26:49.970278941 +0100
+++ /var/tmp/diff_new_pack.3X4sBo/_new 2024-10-27 11:26:49.974279107 +0100
@@ -17,7 +17,7 @@
Name: dsda-doom
-Version: 0.28.1
+Version: 0.28.2
Release: 0
Summary: DOOM source port with Hexen support and demo compatibility
License: GPL-2.0-or-later
@@ -72,9 +72,7 @@
%install
pushd prboom2/
%cmake_install
-b="%buildroot"
-install -Dm0644 ICONS/dsda-doom.png "$b/%_datadir/icons/hicolor/apps/dsda-doom.png"
-install -Dm0644 ICONS/dsda-doom.desktop "$b/%_datadir/applications/dsda-doom.desktop"
+rm -f "%buildroot/usr/share/doc/dsda-doom/COPYING" # via %%license instead
popd
%if 0%{?suse_version} && 0%{?suse_version} < 1550
@@ -91,6 +89,7 @@
%_bindir/*
%_datadir/doom/
%_datadir/applications/*.desktop
-%_datadir/icons/hicolor/apps/
+%_datadir/icons/hicolor/
%doc docs/*.md
+%license prboom2/COPYING
++++++ _scmsync.obsinfo ++++++
--- /var/tmp/diff_new_pack.3X4sBo/_old 2024-10-27 11:26:50.006280434 +0100
+++ /var/tmp/diff_new_pack.3X4sBo/_new 2024-10-27 11:26:50.006280434 +0100
@@ -1,5 +1,5 @@
-mtime: 1724019203
-commit: e08518f3ba8e874aa6660d512dd1bba66ebd92ca7a17bc1d659b45dc7c38afce
+mtime: 1729957158
+commit: e7b494622a310e4c9ad8021e7e2e05b075f54631900e147c3c11feca2f2b9856
url: https://src.opensuse.org/jengelh/dsda-doom
revision: master
++++++ build.specials.obscpio ++++++
diff: old/*: No such file or directory
diff: new/*: No such file or directory
++++++ v0.28.1.tar.gz -> v0.28.2.tar.gz ++++++
/work/SRC/openSUSE:Factory/dsda-doom/v0.28.1.tar.gz /work/SRC/openSUSE:Factory/.dsda-doom.new.2020/v0.28.2.tar.gz differ: char 14, line 1
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package python-uv for openSUSE:Factory checked in at 2024-10-27 11:26:21
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-uv (Old)
and /work/SRC/openSUSE:Factory/.python-uv.new.2020 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-uv"
Sun Oct 27 11:26:21 2024 rev:5 rq:1218527 version:0.4.27
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-uv/python-uv.changes 2024-10-23 21:12:10.943459067 +0200
+++ /work/SRC/openSUSE:Factory/.python-uv.new.2020/python-uv.changes 2024-10-27 11:26:46.426132029 +0100
@@ -1,0 +2,90 @@
+Sat Oct 26 12:59:45 UTC 2024 - Soc Virnyl Estela <uncomfyhalomacro(a)opensuse.org>
+
+- Update to version 0.4.27:
+ * Support for PEP 735
+ * Add support for --dry-run mode in uv lock
+ * Don't allow non-string email in authors
+ * Enforce lockfile schema versions
+ * Always attach URL to network errors
+ * Fix dangling non-platform dependencies in uv tree
+ * Prefer lto over debug free-threaded managed Python builds
+ * Add tool.uv.sources to the "Settings" reference
+ * Add reference to uv build and uv publish in the landing pages
+ * Avoid duplicate [tool.uv] header in TOML examples
+ * Document .netrc environment variable and path
+ * Fix .netrc typo in authentication docs
+ * Fix heading level of "Script support" on docs landing page
+ * Move the installation configuration docs to a separate page
+ * Update docs for --publish-url to avoid duplication.
+- Changes since 0.4.23 to 0.4.26:
+ * Allow static dependency metadata entries for direct URL requirements
+ * Use reinstall report formatting for uv python install --reinstall
+ * Add support for system-level uv.toml configuration
+ * Apply requires-python narrowing with upper bounds
+ * Avoid rewriting [[tool.uv.index]] entries when credentials are provided
+ * Fix uv add comment handling for empty arrays
+ * Replace dashes with underscores in index credential variables
+ * Respect --allow-insecure-host in uv publish
+ * Allow arbitrary --package includes in uv tree
+ * Remove existing Python install after successful download in uv python install
+ * Add docs example for URLs with [tool.uv.dependency-metadata]
+ * Add help page for build failures
+ * Fix cache-keys typo in tags = true
+ * Add documentation examples for manual branch, rev, and tag Git dependencies
+ * Improve error message for cache info serialization
+ * Suggest --from command when executable is available for uvx
+ * Support --with-editable in uv tool install
+ * Add support for uv pip show --files
+ * Don't prefetch unreachable packages
+ * Remove tool.uv.sources table if it is empty
+ * Modify cache versioning to support backwards compatibility
+ * Add support for UV_FROZEN and UV_LOCKED
+ * Allow dashes and underscores in custom index names
+ * Avoid panic when Git dependencies are included in fork markers
+ * Check existing source by normalized name before uv add and uv remove
+ * Fix bug where username from authentication cache could be ignored
+ * Fix to respect comments positioning in pyproject.toml on change
+ * Redact index sources in uv.lock
+ * Use correct indentation when project table contains open bracket comment
+ * Only remove a source from [tool.uv.sources] if it is no long being referenced
+ * Modify uv pip list and uv tree to print to stdout regardless of --quiet flag
+ * Improve help message for missing self update invocations
+ * Log .netrc parsing errors
+ * Remove trailing newlines in error messages
+ * Use a dedicated message for incompatible Python versions in wheel ABI tags
+ * Remove commands available in the top-level from the suggested subcommand error
+ * Fix Python executable name in Windows free-threaded Python distributions
+ * Redact index credentials from lockfile sources
+ * Respect UV_INDEX_ rather than UV_HTTP_BASIC_ as documented
+ * Improve sources deserialization errors
+ * Correct pytorch-to-torch reference in docs
+ * Add index URLs when provided via uv add --index or --default-index
+ * Add support for named and explicit indexes
+ * Add templates for popular build backends
+ * Allow multiple pinned indexes in tool.uv.sources
+ * Allow users to incorporate Git tags into dynamic cache keys
+ * Pin named indexes in uv add
+ * Respect named --index and --default-index values in tool.uv.sources
+ * Update to latest PubGrub version
+ * Enable environment variable authentication for named indexes
+ * Avoid showing lower-bound warning outside of explicit lock and sync
+ * Improve logging during lock errors
+ * Improve styling of requires-python warnings
+ * Show hint in resolution failure on Forbidden (403) or Unauthorized (401)
+ * Update to latest cargo-dist version (includes new installer features)
+ * Warn when patch version in requires-python is implicitly 0
+ * Add more context on client errors during range requests
+ * Avoid writing duplicate index URLs with --emit-index-url
+ * Fix error leading to out-of-bound panic in uv-pep508
+ * Fix managed distributions of free-threaded Python on Windows
+ * Fix selection of free-threaded interpreters during default Python discovery
+ * Ignore sources in build requirements for non-source trees
+ * Invalid cache when adding lower bound to lockfile
+ * Respect index priority when storing credentials
+ * Respect relative paths in uv build sources
+ * Narrow what the pip3. logic drops from entry points.
+ * Add some additional notes to --index-url docs
+ * Add upgrade note to README
+ * Remove note that "only a single source may be defined for each dependency"
+
+-------------------------------------------------------------------
Old:
----
python-uv-0.4.22.tar.gz
New:
----
python-uv-0.4.27.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-uv.spec ++++++
--- /var/tmp/diff_new_pack.XrrC2K/_old 2024-10-27 11:26:47.918193878 +0100
+++ /var/tmp/diff_new_pack.XrrC2K/_new 2024-10-27 11:26:47.922194044 +0100
@@ -33,7 +33,7 @@
%bcond_without libalternatives
%{?sle15_python_module_pythons}
Name: python-uv
-Version: 0.4.22
+Version: 0.4.27
Release: 0
Summary: A Python package installer and resolver, written in Rust
License: Apache-2.0 OR MIT
++++++ python-uv-0.4.22.tar.gz -> python-uv-0.4.27.tar.gz ++++++
++++ 40534 lines of diff (skipped)
++++++ vendor.tar.zst ++++++
/work/SRC/openSUSE:Factory/python-uv/vendor.tar.zst /work/SRC/openSUSE:Factory/.python-uv.new.2020/vendor.tar.zst differ: char 7, line 1
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package rye for openSUSE:Factory checked in at 2024-10-27 11:26:19
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/rye (Old)
and /work/SRC/openSUSE:Factory/.rye.new.2020 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "rye"
Sun Oct 27 11:26:19 2024 rev:2 rq:1218526 version:0.42.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/rye/rye.changes 2024-09-24 17:35:07.053704136 +0200
+++ /work/SRC/openSUSE:Factory/.rye.new.2020/rye.changes 2024-10-27 11:26:44.106035857 +0100
@@ -1,0 +2,22 @@
+Sat Oct 26 13:10:22 UTC 2024 - Soc Virnyl Estela <uncomfyhalomacro(a)opensuse.org>
+
+- Update to version 0.42.0:
+ * Bump bundled Ruff version to v0.7.0
+ * Bump bundled uv version to v0.4.25
+ * Add a uv banner to the Rye README
+- Update vendored dependencies.
+
+-------------------------------------------------------------------
+Sun Oct 13 02:17:29 UTC 2024 - Soc Virnyl Estela <obs(a)uncomfyhalomacro.pl>
+
+- Update vendored dependencies.
+- Update license data to version 3.25.0
+ * ./licenses.tar.gz
+
+-------------------------------------------------------------------
+Mon Oct 7 23:37:36 UTC 2024 - Soc Virnyl Estela <obs(a)uncomfyhalomacro.pl>
+
+- Update to version 0.41.0:
+ * Restore hash annotations in lockfile
+
+-------------------------------------------------------------------
Old:
----
rye-0.40.0.tar.gz
New:
----
rye-0.42.0.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ rye.spec ++++++
--- /var/tmp/diff_new_pack.JwoxGJ/_old 2024-10-27 11:26:45.214081787 +0100
+++ /var/tmp/diff_new_pack.JwoxGJ/_new 2024-10-27 11:26:45.214081787 +0100
@@ -17,14 +17,14 @@
Name: rye
-Version: 0.40.0
+Version: 0.42.0
Release: 0
Summary: Hassle-free Python project manager in Rust
License: MIT
URL: https://github.com/astral-sh/rye
Source0: https://github.com/astral-sh/rye/archive/refs/tags/%{version}.tar.gz#/%{nam…
Source1: vendor.tar.zst
-Source2: https://github.com/spdx/license-list-data/archive/refs/tags/v3.24.0.tar.gz#…
+Source2: https://github.com/spdx/license-list-data/archive/refs/tags/v3.25.0.tar.gz#…
BuildRequires: cargo >= 1.77
BuildRequires: cargo-packaging
BuildRequires: cmake
@@ -76,7 +76,7 @@
%prep
%autosetup -p1 -a1
# license crate feature 'offline' is bogus and not implemented
-pushd vendor/license
+pushd vendor/license-3.5.1+3.25.0
mkdir -p license-list-data
tar xf %{SOURCE2} -C license-list-data --strip-components=1
popd
++++++ licenses.tar.gz ++++++
/work/SRC/openSUSE:Factory/rye/licenses.tar.gz /work/SRC/openSUSE:Factory/.rye.new.2020/licenses.tar.gz differ: char 29, line 1
++++++ rye-0.40.0.tar.gz -> rye-0.42.0.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rye-0.40.0/CHANGELOG.md new/rye-0.42.0/CHANGELOG.md
--- old/rye-0.40.0/CHANGELOG.md 2024-09-22 20:15:43.000000000 +0200
+++ new/rye-0.42.0/CHANGELOG.md 2024-10-21 23:20:53.000000000 +0200
@@ -5,6 +5,21 @@
<!-- released start -->
+## 0.42.0
+
+Released on 2024-10-21.
+
+* Sync Python Releases by @github-actions in https://github.com/astral-sh/rye/pull/1406
+* Bump bundled Ruff version to v0.7.0 by @charliermarsh in https://github.com/astral-sh/rye/pull/1419
+* Bump bundled uv version to v0.4.25 by @github-actions in https://github.com/astral-sh/rye/pull/1405
+
+## 0.41.0
+
+Released on 2024-09-29.
+
+* Restore hash annotations in lockfile by @charliermarsh in https://github.com/astral-sh/rye/pull/1403
+* Upgrade bundled uv version to v0.4.17 by @github-actions in https://github.com/astral-sh/rye/pull/1393
+
## 0.40.0
Released on 2024-09-22.
@@ -12,12 +27,12 @@
* Remove pip-tools support; use uv for all operations by @nazq in https://github.com/astral-sh/rye/pull/1226
* Respect exclusions when generating hashes by @charliermarsh in https://github.com/astral-sh/rye/pull/1357
* List all existing tool references on `rye toolchain remove` by @soof-golan in https://github.com/astral-sh/rye/pull/1346
-* Update bundled Ruff version to v0.6.3 by @charliermarsh in https://github.com/astral-sh/rye/pull/1367
* Fix a few regex inefficiencies by @InSyncWithFoo in https://github.com/astral-sh/rye/pull/1326
* Never modify or delete the virtualenv in `rye list` by @bluss in https://github.com/astral-sh/rye/pull/1351
* Use `inspect_err` over `map_err` by @charliermarsh in https://github.com/astral-sh/rye/pull/1385
* Upgrade bundled Python releases by @github-actions in https://github.com/astral-sh/rye/pull/1379
* Upgrade bundled uv version to v0.4.15 by @github-actions in https://github.com/astral-sh/rye/pull/1388
+* Update bundled Ruff version to v0.6.7 by @charliermarsh in https://github.com/astral-sh/rye/pull/1389
## 0.39.0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rye-0.40.0/Cargo.lock new/rye-0.42.0/Cargo.lock
--- old/rye-0.40.0/Cargo.lock 2024-09-22 20:15:43.000000000 +0200
+++ new/rye-0.42.0/Cargo.lock 2024-10-21 23:20:53.000000000 +0200
@@ -1819,7 +1819,7 @@
[[package]]
name = "rye"
-version = "0.40.0"
+version = "0.42.0"
dependencies = [
"age",
"anyhow",
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rye-0.40.0/README.md new/rye-0.42.0/README.md
--- old/rye-0.40.0/README.md 2024-09-22 20:15:43.000000000 +0200
+++ new/rye-0.42.0/README.md 2024-10-21 23:20:53.000000000 +0200
@@ -11,6 +11,16 @@
</div>
+> [!NOTE]
+>
+> If you're getting started with Rye, consider [uv](https://github.com/astral-sh/uv), the
+> [successor project](https://lucumr.pocoo.org/2024/2/15/rye-grows-with-uv/) from the same maintainers.
+>
+> While Rye is actively maintained, uv offers a more stable and feature-complete experience, and is the recommended
+> choice for new projects.
+>
+> Having trouble migrating? [Let us know what's missing.](https://github.com/astral-sh/rye/discussions/1342)
+
Rye is a comprehensive project and package management solution for Python.
Born from [its creator's](https://github.com/mitsuhiko) desire to establish a
one-stop-shop for all Python users, Rye provides a unified experience to install and manage Python
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rye-0.40.0/docs/guide/workspaces.md new/rye-0.42.0/docs/guide/workspaces.md
--- old/rye-0.40.0/docs/guide/workspaces.md 2024-09-22 20:15:43.000000000 +0200
+++ new/rye-0.42.0/docs/guide/workspaces.md 2024-10-21 23:20:53.000000000 +0200
@@ -1,15 +1,15 @@
# Workspaces
Workspaces are a feature that allows you to work with multiple packages that
-have dependencies to each other. A workspace is declared by setting the
-`tool.rye.workspace` key a `pyproject.toml`. Afterwards all projects within
+have dependencies on each other. A workspace is declared by setting the
+`tool.rye.workspace` key in `pyproject.toml`. Afterwards, all projects within
that workspace share a singular virtualenv.
## Declaring Workspaces
-A workspace is declared by the "toplevel" `pyproject.toml`. At the very least
-the key `tool.rye.workspace` needs to be added. It's recommended that a glob
-pattern is also set in the `members` key to prevent accidentally including
+A workspace is declared in the "toplevel" `pyproject.toml`. At the very least
+the key `tool.rye.workspace` needs to be added. It's also recommended to
+set a glob pattern in the `members` key to prevent accidentally including
unintended folders as projects.
```toml
@@ -18,7 +18,7 @@
```
This declares a workspace where all folders starting with the name `myname-`
-are considered. If the toplevel workspace in itself should not be a project,
+are considered. If the toplevel workspace itself should not be a project,
then it should be declared as a virtual package:
```toml
@@ -29,12 +29,12 @@
members = ["myname-*"]
```
-For more information on that see [Virtual Packages](../virtual/).
+For more information on that, see [Virtual Packages](../virtual/).
## Syncing
-In a workspace it does not matter which project you are working with, the entire
-workspace is synchronized at all times. This has some untypical consequences but
+In a workspace, it does not matter which project you are working with, the entire
+workspace is synchronized at all times. This has some atypical consequences but
simplifies the general development workflow.
When a package depends on another package it's first located in the workspace locally
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rye-0.40.0/docs/index.md new/rye-0.42.0/docs/index.md
--- old/rye-0.40.0/docs/index.md 2024-09-22 20:15:43.000000000 +0200
+++ new/rye-0.42.0/docs/index.md 2024-10-21 23:20:53.000000000 +0200
@@ -8,6 +8,16 @@
<h1><strong>Rye:</strong> a Hassle-Free Python Experience</h1>
</div>
+!!! note
+
+ If you're getting started with Rye, consider [uv](https://github.com/astral-sh/uv), the
+ [successor project](https://lucumr.pocoo.org/2024/2/15/rye-grows-with-uv/) from the same maintainers.
+
+ While Rye is actively maintained, uv offers a more stable and feature-complete experience, and is the recommended
+ choice for new projects.
+
+ Having trouble migrating? [Let us know what's missing.](https://github.com/astral-sh/rye/discussions/1342)
+
Rye is a comprehensive project and package management solution for Python.
Born from [its creator's](https://github.com/mitsuhiko) desire to establish a
one-stop-shop for all Python users, Rye provides a unified experience to install and manages Python
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rye-0.40.0/rye/Cargo.toml new/rye-0.42.0/rye/Cargo.toml
--- old/rye-0.40.0/rye/Cargo.toml 2024-09-22 20:15:43.000000000 +0200
+++ new/rye-0.42.0/rye/Cargo.toml 2024-10-21 23:20:53.000000000 +0200
@@ -1,6 +1,6 @@
[package]
name = "rye"
-version = "0.40.0"
+version = "0.42.0"
edition = "2021"
license = "MIT"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rye-0.40.0/rye/src/bootstrap.rs new/rye-0.42.0/rye/src/bootstrap.rs
--- old/rye-0.40.0/rye/src/bootstrap.rs 2024-09-22 20:15:43.000000000 +0200
+++ new/rye-0.42.0/rye/src/bootstrap.rs 2024-10-21 23:20:53.000000000 +0200
@@ -32,7 +32,7 @@
suffix: None,
};
-const SELF_VERSION: u64 = 24;
+const SELF_VERSION: u64 = 25;
pub const SELF_REQUIREMENTS: &str = r#"
build==1.2.1
@@ -51,7 +51,7 @@
unearth==0.14.0
urllib3==2.0.7
virtualenv==20.25.0
-ruff==0.6.7
+ruff==0.7.0
"#;
static FORCED_TO_UPDATE: AtomicBool = AtomicBool::new(false);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rye-0.40.0/rye/src/lock.rs new/rye-0.42.0/rye/src/lock.rs
--- old/rye-0.40.0/rye/src/lock.rs 2024-09-22 20:15:43.000000000 +0200
+++ new/rye-0.42.0/rye/src/lock.rs 2024-10-21 23:20:53.000000000 +0200
@@ -474,23 +474,32 @@
writeln!(rv)?;
}
+ let mut exclude = false;
for line in fs::read_to_string(generated)
.path_context(generated, "unable to parse resolver output")?
.lines()
{
- // we deal with this explicitly.
- let line = line.trim();
- if line.is_empty()
+ let trimmed = line.trim();
+
+ // if we're in an exclusion, continue to skip lines
+ if exclude {
+ exclude = trimmed.ends_with('\\');
+ continue;
+ }
+
+ // we deal with these settings explicitly.
+ if trimmed.is_empty()
|| line.starts_with("--index-url ")
|| line.starts_with("--extra-index-url ")
|| line.starts_with("--find-links ")
- || line.starts_with("--hash=")
{
continue;
}
// Strip trailing backslashes.
- let line = line.strip_suffix('\\').unwrap_or(line);
+ let stripped = trimmed
+ .strip_suffix('\\')
+ .map_or(trimmed, |rest| rest.trim());
if let Some(m) = FILE_EDITABLE_RE.captures(line) {
let url = Url::parse(&m[1]).context("invalid editable URL generated")?;
@@ -499,14 +508,20 @@
writeln!(rv, "-e {rel_url}")?;
continue;
}
- } else if let Ok(ref req) = line.parse::<Requirement>() {
+ } else if let Ok(ref req) = stripped.parse::<Requirement>() {
// TODO: this does not evaluate markers
if exclusions.iter().any(|x| {
normalize_package_name(&x.name) == normalize_package_name(&req.name)
&& (x.version_or_url.is_none() || x.version_or_url == req.version_or_url)
}) {
- // skip exclusions
- writeln!(rv, "# {line} (excluded)")?;
+ // skip exclusions.
+ writeln!(rv, "# {stripped} (excluded)")?;
+
+ // if the exclusion is followed by hashes, we need to comment out the hashes too.
+ if trimmed.ends_with('\\') {
+ exclude = true;
+ }
+
continue;
}
} else if let Some(m) = DEP_COMMENT_RE.captures(line) {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rye-0.40.0/rye/src/sources/generated/python_downloads.inc new/rye-0.42.0/rye/src/sources/generated/python_downloads.inc
--- old/rye-0.40.0/rye/src/sources/generated/python_downloads.inc 2024-09-22 20:15:43.000000000 +0200
+++ new/rye-0.42.0/rye/src/sources/generated/python_downloads.inc 2024-10-21 23:20:53.000000000 +0200
@@ -101,6 +101,18 @@
(PythonVersion { name: Cow::Borrowed("pypy"), arch: Cow::Borrowed("x86"), os: Cow::Borrowed("linux"), major: 3, minor: 7, patch: 9, suffix: None }, "https://downloads.python.org/pypy/pypy3.7-v7.3.3-linux32.tar.bz2", Some("7d81b8e9fcd07c067cfe2f519ab770ec62928ee8787f952cadf2d2786246efc8")),
(PythonVersion { name: Cow::Borrowed("pypy"), arch: Cow::Borrowed("x86_64"), os: Cow::Borrowed("linux"), major: 3, minor: 7, patch: 9, suffix: None }, "https://downloads.python.org/pypy/pypy3.7-v7.3.3-linux64.tar.bz2", Some("37e2804c4661c86c857d709d28c7de716b000d31e89766599fdf5a98928b7096")),
(PythonVersion { name: Cow::Borrowed("pypy"), arch: Cow::Borrowed("x86_64"), os: Cow::Borrowed("macos"), major: 3, minor: 7, patch: 9, suffix: None }, "https://downloads.python.org/pypy/pypy3.7-v7.3.3-osx64.tar.bz2", Some("d72b27d5bb60813273f14f07378a08822186a66e216c5d1a768ad295b582438d")),
+ (PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("aarch64"), os: Cow::Borrowed("linux"), major: 3, minor: 13, patch: 0, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20241…", Some("59b50df9826475d24bb7eff781fa3949112b5e9c92adb29e96a09cdf1216d5bd")),
+ (PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("aarch64"), os: Cow::Borrowed("macos"), major: 3, minor: 13, patch: 0, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20241…", Some("efc2e71c0e05bc5bedb7a846e05f28dd26491b1744ded35ed82f8b49ccfa684b")),
+ (PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("x86"), os: Cow::Borrowed("windows"), major: 3, minor: 13, patch: 0, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20241…", Some("0ef249cb7ba1e2c451e0a551df063f9caf2e2dc37e09d89f780f98991cd433db")),
+ (PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("x86_64"), os: Cow::Borrowed("linux"), major: 3, minor: 13, patch: 0, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20241…", Some("a73adeda301ad843cce05f31a2d3e76222b656984535a7b87696a24a098b216c")),
+ (PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("x86_64"), os: Cow::Borrowed("macos"), major: 3, minor: 13, patch: 0, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20241…", Some("2e07dfea62fe2215738551a179c87dbed1cc79d1b3654f4d7559889a6d5ce4eb")),
+ (PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("x86_64"), os: Cow::Borrowed("windows"), major: 3, minor: 13, patch: 0, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20241…", Some("4b4940208e6c0475105fd2c8bfc2e29a4ccdb61350b26ef13172303930a23b4e")),
+ (PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("aarch64"), os: Cow::Borrowed("linux"), major: 3, minor: 12, patch: 7, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20241…", Some("bd7688441ddf8d5dc2ccb288bb31fb862330999a4a3f1544aa4f999c93b85a6a")),
+ (PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("aarch64"), os: Cow::Borrowed("macos"), major: 3, minor: 12, patch: 7, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20241…", Some("3f8bf335c97424d0be262687906b0f50511f22fede8b9be77363faa57c4b8e7f")),
+ (PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("x86"), os: Cow::Borrowed("windows"), major: 3, minor: 12, patch: 7, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20241…", Some("199826ee08e52c9476a2376b43bb712da6b6464b26d56b0a1c165fddb3733770")),
+ (PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("x86_64"), os: Cow::Borrowed("linux"), major: 3, minor: 12, patch: 7, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20241…", Some("a3709fb5350bff838bd7bb5dc18e67300c76dc3e5cd11f9c84e54c8aeac60784")),
+ (PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("x86_64"), os: Cow::Borrowed("macos"), major: 3, minor: 12, patch: 7, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20241…", Some("4ae54498bd8d17fc8689fc57c7dadd59c625834af1b5f81fa21f943ff0e37643")),
+ (PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("x86_64"), os: Cow::Borrowed("windows"), major: 3, minor: 12, patch: 7, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20241…", Some("bb0029bbe40c7c0851734765db1747589ff2ea85d87297c4e2d968e397c601e2")),
(PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("aarch64"), os: Cow::Borrowed("linux"), major: 3, minor: 12, patch: 6, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20240…", Some("93a238ba9707c357c054d665a940e2ef33c7c2e2d4e454c248941e625c3050d9")),
(PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("aarch64"), os: Cow::Borrowed("macos"), major: 3, minor: 12, patch: 6, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20240…", Some("b9b115e897e534bd6c1a4f4949fa3c75d662218c3c94bb47f87e61f8c6df430a")),
(PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("x86"), os: Cow::Borrowed("windows"), major: 3, minor: 12, patch: 6, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20240…", Some("8e83f98c4b0f83a9ef4c8f90877513feb0bb7f0c2f2c6bc63077511d67e7b3ab")),
@@ -143,12 +155,12 @@
(PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("x86_64"), os: Cow::Borrowed("linux"), major: 3, minor: 12, patch: 0, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20231…", Some("5ce861907a2751a3a7395b1aaada830c2b072acc03f3dd0bcbaaa2b7a9166fc0")),
(PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("x86_64"), os: Cow::Borrowed("macos"), major: 3, minor: 12, patch: 0, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20231…", Some("3b4781e7fd4efabe574ba0954e54c35c7d5ac4dc5b2990b40796c1c6aec67d79")),
(PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("x86_64"), os: Cow::Borrowed("windows"), major: 3, minor: 12, patch: 0, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20231…", Some("5bdff7ed56550d96f9b26a27a8c25f0cc58a03bff19e5f52bba84366183cab8b")),
- (PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("aarch64"), os: Cow::Borrowed("linux"), major: 3, minor: 11, patch: 10, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20240…", Some("a211d62c57f8920432ad49ef866d91665172c85d9244be4375d172fad6a62c9f")),
- (PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("aarch64"), os: Cow::Borrowed("macos"), major: 3, minor: 11, patch: 10, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20240…", Some("d06300d9037a1db98dfd1b4d29d1e465f2436fa988771635855d875878adcd01")),
- (PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("x86"), os: Cow::Borrowed("windows"), major: 3, minor: 11, patch: 10, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20240…", Some("cceefc4eef9a5e7f55eb82520676dab2f8efba70a8b1597237cb9d93de5a07fe")),
- (PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("x86_64"), os: Cow::Borrowed("linux"), major: 3, minor: 11, patch: 10, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20240…", Some("d606fae7b31a5cb89e40a416a80a2094370d719496d509e194b98e32f57bfeea")),
- (PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("x86_64"), os: Cow::Borrowed("macos"), major: 3, minor: 11, patch: 10, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20240…", Some("b4833aaf11cddb091bf1d909d57bb6ec017c8dcdf93f1bd3f5bd3522ed9095e6")),
- (PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("x86_64"), os: Cow::Borrowed("windows"), major: 3, minor: 11, patch: 10, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20240…", Some("40a58c944ff67f754d70e5ea67ee87ff46308887751919c059b10c9fd59e42ab")),
+ (PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("aarch64"), os: Cow::Borrowed("linux"), major: 3, minor: 11, patch: 10, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20241…", Some("4aa77466ca61b0a3263e3bf55be911cc72f30fd33c81d545f13782b1a35daeec")),
+ (PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("aarch64"), os: Cow::Borrowed("macos"), major: 3, minor: 11, patch: 10, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20241…", Some("afac902c6498cda4095674344b6defbff4500a3687aea597b3710cd070b62756")),
+ (PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("x86"), os: Cow::Borrowed("windows"), major: 3, minor: 11, patch: 10, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20241…", Some("b802510e566aa7c58f6368ffde2b14fa7bd5147fc221e253c90253c2e88c6119")),
+ (PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("x86_64"), os: Cow::Borrowed("linux"), major: 3, minor: 11, patch: 10, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20241…", Some("36498e63788f5a03c0d6249a5df77fbca542bf066eaa6dbb8bbf516194f96e9b")),
+ (PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("x86_64"), os: Cow::Borrowed("macos"), major: 3, minor: 11, patch: 10, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20241…", Some("672a3d428359c3edd2155bf9d9939e0f51803fe3c81f1643e021d9970f01fbdd")),
+ (PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("x86_64"), os: Cow::Borrowed("windows"), major: 3, minor: 11, patch: 10, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20241…", Some("11daa1c645cb8e76f513adc5998ab462daa6f1d939ef39710d5ca34f69648812")),
(PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("aarch64"), os: Cow::Borrowed("linux"), major: 3, minor: 11, patch: 9, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20240…", Some("63cd27b797589b66689c5be6495c707311d8272b284ad20faff1814b00134ac7")),
(PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("aarch64"), os: Cow::Borrowed("macos"), major: 3, minor: 11, patch: 9, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20240…", Some("6436b83fed284af320743f6f5148ab3decbdc054531b40848977a5fa2347ca44")),
(PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("x86"), os: Cow::Borrowed("windows"), major: 3, minor: 11, patch: 9, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20240…", Some("88e3238b59aad1b624f0c45c058059e5c582e686563e3993b1b1dadddfa3fe1d")),
@@ -201,12 +213,12 @@
(PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("x86_64"), os: Cow::Borrowed("linux"), major: 3, minor: 11, patch: 1, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20230…", Some("02332441cb610b1e1aa2d2972e261e2910cc6a950b7973cac22c0759a93c5fcd")),
(PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("x86_64"), os: Cow::Borrowed("macos"), major: 3, minor: 11, patch: 1, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20230…", Some("0eb61be53ee13cf75a30b8a164ef513a2c7995b25b118a3a503245d46231b13a")),
(PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("x86_64"), os: Cow::Borrowed("windows"), major: 3, minor: 11, patch: 1, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20230…", Some("f5c46fffda7d7894b975af728f739b02d1cec50fd4a3ea49f69de9ceaae74b17")),
- (PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("aarch64"), os: Cow::Borrowed("linux"), major: 3, minor: 10, patch: 15, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20240…", Some("567e1de3f44dd13cb99f61595232f1c0d12e9021d517a6caf10c81739a208e7e")),
- (PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("aarch64"), os: Cow::Borrowed("macos"), major: 3, minor: 10, patch: 15, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20240…", Some("2934d9bcfecd74d8cbb12baa8ae8855d2632b8aea98710b89827d570ad489e10")),
- (PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("x86"), os: Cow::Borrowed("windows"), major: 3, minor: 10, patch: 15, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20240…", Some("dc94f75ab3487bc63b905162c63e9f7a21b9586d0730acbc092f5e34d3511a2f")),
- (PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("x86_64"), os: Cow::Borrowed("linux"), major: 3, minor: 10, patch: 15, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20240…", Some("bb0e512e644bf744960476795ac6ee51d930c4ae351c3ef5a140a802773e0f08")),
- (PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("x86_64"), os: Cow::Borrowed("macos"), major: 3, minor: 10, patch: 15, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20240…", Some("a1b0614c2031be8fa47e33d4cf5041b016bd4a9256a76ad0dee3a644f5435cfd")),
- (PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("x86_64"), os: Cow::Borrowed("windows"), major: 3, minor: 10, patch: 15, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20240…", Some("a97c9fd825999c99381fadb0216eb214e2a0b2ba784955082f4a908565add860")),
+ (PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("aarch64"), os: Cow::Borrowed("linux"), major: 3, minor: 10, patch: 15, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20241…", Some("1ee866fe8c3a2fdf310defd9492aaa9d4d26b93b8ee9573525a860cdeacfc8fe")),
+ (PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("aarch64"), os: Cow::Borrowed("macos"), major: 3, minor: 10, patch: 15, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20241…", Some("41c84c6a96f45e6eaa5ff012806ae180a5a758e0c8027b88295b7c2a28a1c82a")),
+ (PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("x86"), os: Cow::Borrowed("windows"), major: 3, minor: 10, patch: 15, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20241…", Some("50301fa93816feeadddcbf0bc035870da1ef3006814c59b874ddf11252f19be3")),
+ (PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("x86_64"), os: Cow::Borrowed("linux"), major: 3, minor: 10, patch: 15, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20241…", Some("8438e1c8df6180dbd4daa8363ac4b156de5cd9cbcdfd37e4a7052903457ae6b4")),
+ (PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("x86_64"), os: Cow::Borrowed("macos"), major: 3, minor: 10, patch: 15, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20241…", Some("adaa44bb698b4b0a38335114bc9c2e53505f3562cb39aac35c87b7978175a9d1")),
+ (PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("x86_64"), os: Cow::Borrowed("windows"), major: 3, minor: 10, patch: 15, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20241…", Some("ade7ce8507635e64b6d167da0dced735816a4e1c121433277a0ed86e42887d46")),
(PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("aarch64"), os: Cow::Borrowed("linux"), major: 3, minor: 10, patch: 14, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20240…", Some("56183ed135dbdaaa6b189a6b0e6b6bcf3f26074297721bdbe9648cdc5247937c")),
(PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("aarch64"), os: Cow::Borrowed("macos"), major: 3, minor: 10, patch: 14, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20240…", Some("ca1bf0cf71ef42a302bc9df6096ac6ae399b971b426e7b620481d86b00fffa8c")),
(PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("x86"), os: Cow::Borrowed("windows"), major: 3, minor: 10, patch: 14, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20240…", Some("49ba7ea8de4ca7369be9c3415712d789db3caaa4c6c0530ce94d2db5b4e145cd")),
@@ -297,12 +309,12 @@
(PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("x86_64"), os: Cow::Borrowed("linux"), major: 3, minor: 10, patch: 0, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20211…", None),
(PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("x86_64"), os: Cow::Borrowed("macos"), major: 3, minor: 10, patch: 0, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20211…", None),
(PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("x86_64"), os: Cow::Borrowed("windows"), major: 3, minor: 10, patch: 0, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20211…", None),
- (PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("aarch64"), os: Cow::Borrowed("linux"), major: 3, minor: 9, patch: 20, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20240…", Some("97c43e0c97a4b284447a2976879a9580e42cfe57d444162615d3b7c178feda66")),
- (PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("aarch64"), os: Cow::Borrowed("macos"), major: 3, minor: 9, patch: 20, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20240…", Some("68220c77530d5309cd6637b76dc3bf44e883d20613a5797b37b708991d8af32c")),
- (PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("x86"), os: Cow::Borrowed("windows"), major: 3, minor: 9, patch: 20, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20240…", Some("bba270fdcb599f16764779f1fd804d2a934f33592f2de2ecc6a051a1c38da6a1")),
- (PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("x86_64"), os: Cow::Borrowed("linux"), major: 3, minor: 9, patch: 20, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20240…", Some("09c69f4bca455da9a8528ac4bbf1b72172c3ed6f1304117d5d9e3fd4dcb66b1b")),
- (PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("x86_64"), os: Cow::Borrowed("macos"), major: 3, minor: 9, patch: 20, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20240…", Some("f6affabaf8cd937ed25e519e353462aaa3328b7c161f7a1c0c739be7e95b7f78")),
- (PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("x86_64"), os: Cow::Borrowed("windows"), major: 3, minor: 9, patch: 20, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20240…", Some("519e605766250fd2ff65f24f31b7a2a913a024de4f19cb1139bb9d970722ec8f")),
+ (PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("aarch64"), os: Cow::Borrowed("linux"), major: 3, minor: 9, patch: 20, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20241…", Some("7f832256d0f2f1d0dc89f71c3baf2f84bbd32538891d5017163bebae60837d89")),
+ (PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("aarch64"), os: Cow::Borrowed("macos"), major: 3, minor: 9, patch: 20, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20241…", Some("61ad2810005b6b66465da0f3055163812b0c089979a96b67ef54c34906c6f560")),
+ (PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("x86"), os: Cow::Borrowed("windows"), major: 3, minor: 9, patch: 20, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20241…", Some("9c56fa3257cfe2147a5c17f8bd55870a305ffa1ef405e3f189e22989df15c573")),
+ (PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("x86_64"), os: Cow::Borrowed("linux"), major: 3, minor: 9, patch: 20, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20241…", Some("9873d6d3aa04918add2a7b428ab3d8b3baded2b0754c8fb97d6ed6b4201b0343")),
+ (PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("x86_64"), os: Cow::Borrowed("macos"), major: 3, minor: 9, patch: 20, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20241…", Some("a8bb2129da3bf93ae074775efc720d8857ac76475344ce0c73f0076884847ea1")),
+ (PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("x86_64"), os: Cow::Borrowed("windows"), major: 3, minor: 9, patch: 20, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20241…", Some("7b7ba312e704bd60202af8a45d1019a4402569e6bbc9fa4feee24c86919c33bf")),
(PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("aarch64"), os: Cow::Borrowed("linux"), major: 3, minor: 9, patch: 19, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20240…", Some("0d5edd43f3219744be8476f3ff2ab93af852647ff13e344622e83ca26634688d")),
(PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("aarch64"), os: Cow::Borrowed("macos"), major: 3, minor: 9, patch: 19, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20240…", Some("f3a918ec61e0c1676c56cb2e3a29fce733cf0a082bb2577ce12a27f7303c1098")),
(PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("x86"), os: Cow::Borrowed("windows"), major: 3, minor: 9, patch: 19, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20240…", Some("077c61230bc95673e95edd1e9cf43a8b2953470f8c83c50cd89bad08e530aa2b")),
@@ -417,12 +429,12 @@
(PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("x86_64"), os: Cow::Borrowed("linux"), major: 3, minor: 9, patch: 0, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20201…", None),
(PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("x86_64"), os: Cow::Borrowed("macos"), major: 3, minor: 9, patch: 0, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20201…", None),
(PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("x86_64"), os: Cow::Borrowed("windows"), major: 3, minor: 9, patch: 0, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20201…", None),
- (PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("aarch64"), os: Cow::Borrowed("linux"), major: 3, minor: 8, patch: 20, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20240…", Some("09c6c5e1e27d7723dc3e32e0b35fe2d31501110fe16347fb0d25b587ef570600")),
- (PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("aarch64"), os: Cow::Borrowed("macos"), major: 3, minor: 8, patch: 20, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20240…", Some("02449f774a12eaaff75844c0f768bb0c62425b7fe216d98ce98b7b8104979841")),
- (PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("x86"), os: Cow::Borrowed("windows"), major: 3, minor: 8, patch: 20, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20240…", Some("6469fa6cd6f19d8021cef539b4a43f636b6a70b72b0c7de3c0fb175750521899")),
- (PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("x86_64"), os: Cow::Borrowed("linux"), major: 3, minor: 8, patch: 20, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20240…", Some("ddf09080b29cf42752457ad5058a0fe048b947c07bbb244e4005336f5fcba845")),
- (PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("x86_64"), os: Cow::Borrowed("macos"), major: 3, minor: 8, patch: 20, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20240…", Some("96122cfc7c8ad4d5f80b33c1d6821c885fdc5f61594e3f4bcabb7dac97e6ec04")),
- (PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("x86_64"), os: Cow::Borrowed("windows"), major: 3, minor: 8, patch: 20, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20240…", Some("d80a6784943679ca8aefeee979fce0446f2fa3ba7c52e460874a0e3b3bf86b0e")),
+ (PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("aarch64"), os: Cow::Borrowed("linux"), major: 3, minor: 8, patch: 20, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20241…", Some("05ed8e6403ed0692394ad0804e79bbc847d5d68cb3ad57b46b29065b7ad4a53b")),
+ (PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("aarch64"), os: Cow::Borrowed("macos"), major: 3, minor: 8, patch: 20, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20241…", Some("68f99a2a8aa8d4c319f095a4d8ac1ffffd24ef31827ab81d290f2f0ae3f3a424")),
+ (PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("x86"), os: Cow::Borrowed("windows"), major: 3, minor: 8, patch: 20, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20241…", Some("c19216a5e3040abd2d315e71dac607c991897f82d6b8c22860c9f2329c8bd6a3")),
+ (PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("x86_64"), os: Cow::Borrowed("linux"), major: 3, minor: 8, patch: 20, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20241…", Some("25b45589eb04dfb6874e597f017b2ff180120330ca255317751238f682f34091")),
+ (PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("x86_64"), os: Cow::Borrowed("macos"), major: 3, minor: 8, patch: 20, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20241…", Some("0b619b6d156244f1cbd1b91f2bf838cbcd69eeed4fb7edfcf4da4c6c526adc49")),
+ (PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("x86_64"), os: Cow::Borrowed("windows"), major: 3, minor: 8, patch: 20, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20241…", Some("b84dd2228d36fc2381573af1002d0a9cb244a2a52c7c470c2fafec1f855459c3")),
(PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("aarch64"), os: Cow::Borrowed("linux"), major: 3, minor: 8, patch: 19, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20240…", Some("d57b944f770579a2c24b34880843318135ddc816ccb67d9a7022b2c00b2c897e")),
(PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("aarch64"), os: Cow::Borrowed("macos"), major: 3, minor: 8, patch: 19, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20240…", Some("43f3b6d7816448b44f86d2186dba1b7418533a3f4a37d07e5075bb934bcfba76")),
(PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("x86"), os: Cow::Borrowed("windows"), major: 3, minor: 8, patch: 19, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20240…", Some("8f69364b8421a51a71da5e897d4f59d0659f18b354896d28c79756de6011c21c")),
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rye-0.40.0/rye/src/sources/generated/uv_downloads.inc new/rye-0.42.0/rye/src/sources/generated/uv_downloads.inc
--- old/rye-0.40.0/rye/src/sources/generated/uv_downloads.inc 2024-09-22 20:15:43.000000000 +0200
+++ new/rye-0.42.0/rye/src/sources/generated/uv_downloads.inc 2024-10-21 23:20:53.000000000 +0200
@@ -2,11 +2,11 @@
// To regenerate, run `rye run uv-downloads > rye/src/sources/generated/uv_downloads.inc` from the root of the repository.
use std::borrow::Cow;
pub const UV_DOWNLOADS: &[UvDownload] = &[
- UvDownload {arch: Cow::Borrowed("aarch64"), os: Cow::Borrowed("macos"), major: 0, minor: 4, patch: 15, suffix: None, url: Cow::Borrowed("https://github.com/astral-sh/uv/releases/download/0.4.15/uv-aarch64-apple-d…"), sha256: Cow::Borrowed("32f6ad64b9dcf164fa75efef73e0e9a9b769073e6bfe844560329a3176b39b9b") },
- UvDownload {arch: Cow::Borrowed("aarch64"), os: Cow::Borrowed("linux"), major: 0, minor: 4, patch: 15, suffix: None, url: Cow::Borrowed("https://github.com/astral-sh/uv/releases/download/0.4.15/uv-aarch64-unknown…"), sha256: Cow::Borrowed("fbc0433275134fc50d25ce3c291b3e7a53ffb70b447741398c31d6c4deeba4b8") },
- UvDownload {arch: Cow::Borrowed("i686"), os: Cow::Borrowed("windows"), major: 0, minor: 4, patch: 15, suffix: None, url: Cow::Borrowed("https://github.com/astral-sh/uv/releases/download/0.4.15/uv-i686-pc-windows…"), sha256: Cow::Borrowed("3ad9d42a4308adc69dd7061b0ba9451b26d118032d3937dd92e3acef4aa62a40") },
- UvDownload {arch: Cow::Borrowed("i686"), os: Cow::Borrowed("linux"), major: 0, minor: 4, patch: 15, suffix: None, url: Cow::Borrowed("https://github.com/astral-sh/uv/releases/download/0.4.15/uv-i686-unknown-li…"), sha256: Cow::Borrowed("2e90ee238cba49c5f096c8b0648c7fc531a75dcf0c26eb0cde4d9ce5447d8d82") },
- UvDownload {arch: Cow::Borrowed("x86_64"), os: Cow::Borrowed("macos"), major: 0, minor: 4, patch: 15, suffix: None, url: Cow::Borrowed("https://github.com/astral-sh/uv/releases/download/0.4.15/uv-x86_64-apple-da…"), sha256: Cow::Borrowed("ab91ee8c6461e9ac385a2f96d23d77e027b4e4274e983d0aedf1d64abfb6353b") },
- UvDownload {arch: Cow::Borrowed("x86_64"), os: Cow::Borrowed("windows"), major: 0, minor: 4, patch: 15, suffix: None, url: Cow::Borrowed("https://github.com/astral-sh/uv/releases/download/0.4.15/uv-x86_64-pc-windo…"), sha256: Cow::Borrowed("17e7ecb448c8b507bb08347df6aa974f58a7536b6fbe21f0ce57372509e409a0") },
- UvDownload {arch: Cow::Borrowed("x86_64"), os: Cow::Borrowed("linux"), major: 0, minor: 4, patch: 15, suffix: None, url: Cow::Borrowed("https://github.com/astral-sh/uv/releases/download/0.4.15/uv-x86_64-unknown-…"), sha256: Cow::Borrowed("f590376432bcb26c2aff86b6ec495d55ba2384d068c62dca477f498902721674") },
+ UvDownload {arch: Cow::Borrowed("aarch64"), os: Cow::Borrowed("macos"), major: 0, minor: 4, patch: 25, suffix: None, url: Cow::Borrowed("https://github.com/astral-sh/uv/releases/download/0.4.25/uv-aarch64-apple-d…"), sha256: Cow::Borrowed("bb2ff4348114ef220ca52e44d5086640c4a1a18f797a5f1ab6f8559fc37b1230") },
+ UvDownload {arch: Cow::Borrowed("aarch64"), os: Cow::Borrowed("linux"), major: 0, minor: 4, patch: 25, suffix: None, url: Cow::Borrowed("https://github.com/astral-sh/uv/releases/download/0.4.25/uv-aarch64-unknown…"), sha256: Cow::Borrowed("d08a7a8adfa7f1e7e6d427b9ab38b071a50dcf63a11b3cbfaaad9b8e68e69df6") },
+ UvDownload {arch: Cow::Borrowed("i686"), os: Cow::Borrowed("windows"), major: 0, minor: 4, patch: 25, suffix: None, url: Cow::Borrowed("https://github.com/astral-sh/uv/releases/download/0.4.25/uv-i686-pc-windows…"), sha256: Cow::Borrowed("328e36c4a3e262e27f714d580d7f9e8eb9bfe66ed8c65cf9aaf63a6d44d3fa16") },
+ UvDownload {arch: Cow::Borrowed("i686"), os: Cow::Borrowed("linux"), major: 0, minor: 4, patch: 25, suffix: None, url: Cow::Borrowed("https://github.com/astral-sh/uv/releases/download/0.4.25/uv-i686-unknown-li…"), sha256: Cow::Borrowed("496bc5ba76a1d7fcb6fee2f3520333acb7fab6153f54059426e69d0f98db6bae") },
+ UvDownload {arch: Cow::Borrowed("x86_64"), os: Cow::Borrowed("macos"), major: 0, minor: 4, patch: 25, suffix: None, url: Cow::Borrowed("https://github.com/astral-sh/uv/releases/download/0.4.25/uv-x86_64-apple-da…"), sha256: Cow::Borrowed("f0ec1f79f4791294382bff242691c6502e95853acef080ae3f7c367a8e1beb6f") },
+ UvDownload {arch: Cow::Borrowed("x86_64"), os: Cow::Borrowed("windows"), major: 0, minor: 4, patch: 25, suffix: None, url: Cow::Borrowed("https://github.com/astral-sh/uv/releases/download/0.4.25/uv-x86_64-pc-windo…"), sha256: Cow::Borrowed("c5c7fa084ae4e8ac9e3b0b6c4c7b61e9355eb0c86801c4c7728c0cb142701f38") },
+ UvDownload {arch: Cow::Borrowed("x86_64"), os: Cow::Borrowed("linux"), major: 0, minor: 4, patch: 25, suffix: None, url: Cow::Borrowed("https://github.com/astral-sh/uv/releases/download/0.4.25/uv-x86_64-unknown-…"), sha256: Cow::Borrowed("6cb6eaf711cd7ce5fb1efaa539c5906374c762af547707a2041c9f6fd207769a") },
];
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rye-0.40.0/rye/tests/common/mod.rs new/rye-0.42.0/rye/tests/common/mod.rs
--- old/rye-0.40.0/rye/tests/common/mod.rs 2024-09-22 20:15:43.000000000 +0200
+++ new/rye-0.42.0/rye/tests/common/mod.rs 2024-10-21 23:20:53.000000000 +0200
@@ -11,6 +11,8 @@
#[allow(unused)]
pub const INSTA_FILTERS: &[(&str, &str)] = &[
+ // TODO(charlie): This should be `debug` logging in uv, but it's going to `stdout` on Windows.
+ (r"Using Python \d+\.\d+\.\d+ environment at \.venv\n", ""),
// general temp folders
(
r"(\b[A-Z]:)?[\\/].*?[\\/]\.rye-tests---[^\\/]+[\\/]",
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rye-0.40.0/rye/tests/test_sync.rs new/rye-0.42.0/rye/tests/test_sync.rs
--- old/rye-0.40.0/rye/tests/test_sync.rs 2024-09-22 20:15:43.000000000 +0200
+++ new/rye-0.42.0/rye/tests/test_sync.rs 2024-10-21 23:20:53.000000000 +0200
@@ -33,7 +33,7 @@
{
let script = space.venv_path().join("bin/activate");
let contents = fs::read_to_string(script).unwrap();
- assert!(contents.contains("VIRTUAL_ENV_PROMPT=\"my-project\""));
+ assert!(contents.contains("VIRTUAL_ENV_PROMPT=\"(my-project) \""));
}
#[cfg(windows)]
{
@@ -276,7 +276,7 @@
[project]
name = "exclude-rye-test"
version = "0.1.0"
- dependencies = ["jinja2"]
+ dependencies = ["anyio==4.0.0"]
readme = "README.md"
requires-python = ">= 3.8"
@@ -286,7 +286,7 @@
[tool.rye]
generate-hashes = true
- excluded-dependencies = ["markupsafe"]
+ excluded-dependencies = ["idna"]
[tool.hatch.metadata]
allow-direct-references = true
@@ -309,10 +309,166 @@
Done!
----- stderr -----
- Resolved 2 packages in [EXECUTION_TIME]
- Prepared 2 packages in [EXECUTION_TIME]
- Installed 2 packages in [EXECUTION_TIME]
+ Resolved 3 packages in [EXECUTION_TIME]
+ Prepared 3 packages in [EXECUTION_TIME]
+ Installed 3 packages in [EXECUTION_TIME]
+ + anyio==4.0.0
+ exclude-rye-test==0.1.0 (from file:[TEMP_PATH]/project)
- + jinja2==3.1.2
+ + sniffio==1.3.0
+ "###);
+
+ assert_snapshot!(space.read_string(space.project_path().join("requirements.lock")), @r###"
+ # generated by rye
+ # use `rye lock` or `rye sync` to update this lockfile
+ #
+ # last locked with the following flags:
+ # pre: false
+ # features: []
+ # all-features: false
+ # with-sources: false
+ # generate-hashes: true
+ # universal: false
+
+ -e file:.
+ anyio==4.0.0 \
+ --hash=sha256:cfdb2b588b9fc25ede96d8db56ed50848b0b649dca3dd1df0b11f683bb9e0b5f \
+ --hash=sha256:f7ed51751b2c2add651e5747c891b47e26d2a21be5d32d9311dfe9692f3e5d7a
+ # via exclude-rye-test
+ # idna==3.4 (excluded)
+ # via anyio
+ sniffio==1.3.0 \
+ --hash=sha256:e60305c5e5d314f5389259b7f22aaa33d8f7dee49763119234af3755c55b9101 \
+ --hash=sha256:eecefdce1e5bbfb7ad2eeaabf7c1eeb404d7757c379bd1f7e5cce9d8bf425384
+ # via anyio
+ "###);
+}
+
+#[test]
+fn test_lockfile() {
+ let space = Space::new();
+ space.init("my-project");
+
+ rye_cmd_snapshot!(space.rye_cmd().arg("add").arg("anyio==4.0.0"), @r###"
+ success: true
+ exit_code: 0
+ ----- stdout -----
+ Initializing new virtualenv in [TEMP_PATH]/project/.venv
+ Python version: cpython(a)3.12.6
+ Added anyio==4.0.0 as regular dependency
+ Reusing already existing virtualenv
+ Generating production lockfile: [TEMP_PATH]/project/requirements.lock
+ Generating dev lockfile: [TEMP_PATH]/project/requirements-dev.lock
+ Installing dependencies
+ Done!
+
+ ----- stderr -----
+ Resolved 4 packages in [EXECUTION_TIME]
+ Prepared 4 packages in [EXECUTION_TIME]
+ Installed 4 packages in [EXECUTION_TIME]
+ + anyio==4.0.0
+ + idna==3.4
+ + my-project==0.1.0 (from file:[TEMP_PATH]/project)
+ + sniffio==1.3.0
+ "###);
+
+ assert_snapshot!(space.read_string(space.project_path().join("requirements.lock")), @r###"
+ # generated by rye
+ # use `rye lock` or `rye sync` to update this lockfile
+ #
+ # last locked with the following flags:
+ # pre: false
+ # features: []
+ # all-features: false
+ # with-sources: false
+ # generate-hashes: false
+ # universal: false
+
+ -e file:.
+ anyio==4.0.0
+ # via my-project
+ idna==3.4
+ # via anyio
+ sniffio==1.3.0
+ # via anyio
+ "###);
+}
+
+#[test]
+fn test_generate_hashes() {
+ let space = Space::new();
+ space.init("my-project");
+
+ fs::write(
+ space.project_path().join("pyproject.toml"),
+ r###"
+ [project]
+ name = "exclude-rye-test"
+ version = "0.1.0"
+ dependencies = ["anyio==4.0.0"]
+ readme = "README.md"
+ requires-python = ">= 3.8"
+
+ [build-system]
+ requires = ["hatchling"]
+ build-backend = "hatchling.build"
+
+ [tool.rye]
+ generate-hashes = true
+
+ [tool.hatch.metadata]
+ allow-direct-references = true
+
+ [tool.hatch.build.targets.wheel]
+ packages = ["src/exclude_rye_test"]
+ "###,
+ )
+ .unwrap();
+
+ rye_cmd_snapshot!(space.rye_cmd().arg("sync"), @r###"
+ success: true
+ exit_code: 0
+ ----- stdout -----
+ Initializing new virtualenv in [TEMP_PATH]/project/.venv
+ Python version: cpython(a)3.12.6
+ Generating production lockfile: [TEMP_PATH]/project/requirements.lock
+ Generating dev lockfile: [TEMP_PATH]/project/requirements-dev.lock
+ Installing dependencies
+ Done!
+
+ ----- stderr -----
+ Resolved 4 packages in [EXECUTION_TIME]
+ Prepared 4 packages in [EXECUTION_TIME]
+ Installed 4 packages in [EXECUTION_TIME]
+ + anyio==4.0.0
+ + exclude-rye-test==0.1.0 (from file:[TEMP_PATH]/project)
+ + idna==3.4
+ + sniffio==1.3.0
+ "###);
+
+ assert_snapshot!(space.read_string(space.project_path().join("requirements.lock")), @r###"
+ # generated by rye
+ # use `rye lock` or `rye sync` to update this lockfile
+ #
+ # last locked with the following flags:
+ # pre: false
+ # features: []
+ # all-features: false
+ # with-sources: false
+ # generate-hashes: true
+ # universal: false
+
+ -e file:.
+ anyio==4.0.0 \
+ --hash=sha256:cfdb2b588b9fc25ede96d8db56ed50848b0b649dca3dd1df0b11f683bb9e0b5f \
+ --hash=sha256:f7ed51751b2c2add651e5747c891b47e26d2a21be5d32d9311dfe9692f3e5d7a
+ # via exclude-rye-test
+ idna==3.4 \
+ --hash=sha256:814f528e8dead7d329833b91c5faa87d60bf71824cd12a7530b5526063d02cb4 \
+ --hash=sha256:90b77e79eaa3eba6de819a0c442c0b4ceefc341a7a2ab77d7562bf49f425c5c2
+ # via anyio
+ sniffio==1.3.0 \
+ --hash=sha256:e60305c5e5d314f5389259b7f22aaa33d8f7dee49763119234af3755c55b9101 \
+ --hash=sha256:eecefdce1e5bbfb7ad2eeaabf7c1eeb404d7757c379bd1f7e5cce9d8bf425384
+ # via anyio
"###);
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rye-0.40.0/rye/tests/test_tools.rs new/rye-0.42.0/rye/tests/test_tools.rs
--- old/rye-0.40.0/rye/tests/test_tools.rs 2024-09-22 20:15:43.000000000 +0200
+++ new/rye-0.42.0/rye/tests/test_tools.rs 2024-10-21 23:20:53.000000000 +0200
@@ -40,6 +40,7 @@
- pycowsay
----- stderr -----
+ Using Python 3.11.10 environment at [RYE_HOME]/tools/pycowsay
Resolved 1 package in [EXECUTION_TIME]
Prepared 1 package in [EXECUTION_TIME]
Installed 1 package in [EXECUTION_TIME]
++++++ vendor.tar.zst ++++++
/work/SRC/openSUSE:Factory/rye/vendor.tar.zst /work/SRC/openSUSE:Factory/.rye.new.2020/vendor.tar.zst differ: char 7, line 1
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package kargo-cli for openSUSE:Factory checked in at 2024-10-27 11:26:13
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kargo-cli (Old)
and /work/SRC/openSUSE:Factory/.kargo-cli.new.2020 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kargo-cli"
Sun Oct 27 11:26:13 2024 rev:6 rq:1218517 version:1.0.3
Changes:
--------
--- /work/SRC/openSUSE:Factory/kargo-cli/kargo-cli.changes 2024-10-22 14:54:14.415209086 +0200
+++ /work/SRC/openSUSE:Factory/.kargo-cli.new.2020/kargo-cli.changes 2024-10-27 11:26:42.145954607 +0100
@@ -1,0 +2,12 @@
+Wed Oct 23 08:52:53 UTC 2024 - opensuse_buildservice(a)ojkastl.de
+
+- Update to version 1.0.3:
+ * no CLI-related changes
+
+-------------------------------------------------------------------
+Wed Oct 23 08:42:33 UTC 2024 - opensuse_buildservice(a)ojkastl.de
+
+- Update to version 1.0.2:
+ * no CLI-related changes
+
+-------------------------------------------------------------------
Old:
----
kargo-cli-1.0.1.obscpio
New:
----
kargo-cli-1.0.3.obscpio
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kargo-cli.spec ++++++
--- /var/tmp/diff_new_pack.xAZRPl/_old 2024-10-27 11:26:43.137995729 +0100
+++ /var/tmp/diff_new_pack.xAZRPl/_new 2024-10-27 11:26:43.137995729 +0100
@@ -16,12 +16,10 @@
#
-%define __arch_install_post export NO_BRP_STRIP_DEBUG=true
-
%define executable_name kargo
Name: kargo-cli
-Version: 1.0.1
+Version: 1.0.3
Release: 0
Summary: CLI for the Kubernetes Application lifecycle orchestration
License: Apache-2.0
++++++ _service ++++++
--- /var/tmp/diff_new_pack.xAZRPl/_old 2024-10-27 11:26:43.169997056 +0100
+++ /var/tmp/diff_new_pack.xAZRPl/_new 2024-10-27 11:26:43.173997221 +0100
@@ -3,7 +3,7 @@
<param name="url">https://github.com/akuity/kargo</param>
<param name="scm">git</param>
<param name="exclude">.git</param>
- <param name="revision">v1.0.1</param>
+ <param name="revision">v1.0.3</param>
<param name="versionformat">@PARENT_TAG@</param>
<param name="changesgenerate">enable</param>
<param name="versionrewrite-pattern">v(.*)</param>
++++++ _servicedata ++++++
--- /var/tmp/diff_new_pack.xAZRPl/_old 2024-10-27 11:26:43.189997884 +0100
+++ /var/tmp/diff_new_pack.xAZRPl/_new 2024-10-27 11:26:43.193998050 +0100
@@ -1,6 +1,6 @@
<servicedata>
<service name="tar_scm">
<param name="url">https://github.com/akuity/kargo</param>
- <param name="changesrevision">9fc3e3b417de09d4fd561ceeb1d87cece989bd4a</param></service></servicedata>
+ <param name="changesrevision">bb7afaad9750dfff61f47dd6c5288acbcdb6bce2</param></service></servicedata>
(No newline at EOF)
++++++ kargo-cli-1.0.1.obscpio -> kargo-cli-1.0.3.obscpio ++++++
/work/SRC/openSUSE:Factory/kargo-cli/kargo-cli-1.0.1.obscpio /work/SRC/openSUSE:Factory/.kargo-cli.new.2020/kargo-cli-1.0.3.obscpio differ: char 50, line 1
++++++ kargo-cli.obsinfo ++++++
--- /var/tmp/diff_new_pack.xAZRPl/_old 2024-10-27 11:26:43.233999708 +0100
+++ /var/tmp/diff_new_pack.xAZRPl/_new 2024-10-27 11:26:43.237999874 +0100
@@ -1,5 +1,5 @@
name: kargo-cli
-version: 1.0.1
-mtime: 1729556127
-commit: 9fc3e3b417de09d4fd561ceeb1d87cece989bd4a
+version: 1.0.3
+mtime: 1729668518
+commit: bb7afaad9750dfff61f47dd6c5288acbcdb6bce2
++++++ vendor.tar.gz ++++++
/work/SRC/openSUSE:Factory/kargo-cli/vendor.tar.gz /work/SRC/openSUSE:Factory/.kargo-cli.new.2020/vendor.tar.gz differ: char 5, line 1
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package waysip for openSUSE:Factory checked in at 2024-10-27 11:26:11
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/waysip (Old)
and /work/SRC/openSUSE:Factory/.waysip.new.2020 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "waysip"
Sun Oct 27 11:26:11 2024 rev:2 rq:1218518 version:0.2.3
Changes:
--------
--- /work/SRC/openSUSE:Factory/waysip/waysip.changes 2024-07-16 22:05:36.408837344 +0200
+++ /work/SRC/openSUSE:Factory/.waysip.new.2020/waysip.changes 2024-10-27 11:26:37.557764417 +0100
@@ -1,0 +2,5 @@
+Sat Oct 26 13:11:28 UTC 2024 - Soc Virnyl Estela <uncomfyhalomacro(a)opensuse.org>
+
+- Update vendored dependencies.
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ waysip.spec ++++++
--- /var/tmp/diff_new_pack.2rJBAz/_old 2024-10-27 11:26:38.381798575 +0100
+++ /var/tmp/diff_new_pack.2rJBAz/_new 2024-10-27 11:26:38.385798741 +0100
@@ -1,7 +1,7 @@
#
# spec file for package waysip
#
-# 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
++++++ vendor.tar.zst ++++++
/work/SRC/openSUSE:Factory/waysip/vendor.tar.zst /work/SRC/openSUSE:Factory/.waysip.new.2020/vendor.tar.zst differ: char 7, line 1
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package ardour for openSUSE:Factory checked in at 2024-10-27 11:26:06
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/ardour (Old)
and /work/SRC/openSUSE:Factory/.ardour.new.2020 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ardour"
Sun Oct 27 11:26:06 2024 rev:15 rq:1218503 version:8.10.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/ardour/ardour.changes 2024-10-15 14:59:29.659399465 +0200
+++ /work/SRC/openSUSE:Factory/.ardour.new.2020/ardour.changes 2024-10-27 11:26:35.897695604 +0100
@@ -1,0 +2,13 @@
+Fri Oct 25 12:02:12 UTC 2024 - Christophe Marin <christophe(a)krop.fr>
+
+- Update to 8.10. Check https://ardour.org/whatsnew.html for the
+ full list of changes
+ * Fix performance issues caused by scheduling of disk I/O
+ threads
+ * Importing SMF (MIDI) via drag-n-drop now uses the file name
+ once again
+ * Small updates to the non-default color themes
+ * New MIDI binding map for the M-Audio Axiom 49 MkII
+ * New Lua script to duplicate regions on the grid
+
+-------------------------------------------------------------------
Old:
----
Ardour-8.9.0.tar.bz2
New:
----
Ardour-8.10.0.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ardour.spec ++++++
--- /var/tmp/diff_new_pack.gXPiYy/_old 2024-10-27 11:26:36.385715833 +0100
+++ /var/tmp/diff_new_pack.gXPiYy/_new 2024-10-27 11:26:36.385715833 +0100
@@ -18,14 +18,14 @@
%define dirbase ardour8
Name: ardour
-Version: 8.9.0
+Version: 8.10.0
Release: 0
Summary: Multichannel Digital Audio Workstation
# Legal: Ardour is a mix of GPL-2.0-or-later, [L]GPL-3.0-or-later and a couple copyleft
# licensed files (BSD, WTFPL). Use GPL-3.0-only for the compiled package.
License: GPL-3.0-only
URL: https://ardour.org/
-Source0: https://community.ardour.org/download/release/592#/Ardour-%{version}.tar.bz2
+Source0: https://community.ardour.org/download/release/598#/Ardour-%{version}.tar.bz2
Source99: ardour-rpmlintrc
BuildRequires: autoconf
BuildRequires: automake
++++++ Ardour-8.9.0.tar.bz2 -> Ardour-8.10.0.tar.bz2 ++++++
/work/SRC/openSUSE:Factory/ardour/Ardour-8.9.0.tar.bz2 /work/SRC/openSUSE:Factory/.ardour.new.2020/Ardour-8.10.0.tar.bz2 differ: char 11, line 1
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package arkade for openSUSE:Factory checked in at 2024-10-27 11:26:04
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/arkade (Old)
and /work/SRC/openSUSE:Factory/.arkade.new.2020 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "arkade"
Sun Oct 27 11:26:04 2024 rev:43 rq:1218500 version:0.11.29
Changes:
--------
--- /work/SRC/openSUSE:Factory/arkade/arkade.changes 2024-10-24 15:45:24.726698954 +0200
+++ /work/SRC/openSUSE:Factory/.arkade.new.2020/arkade.changes 2024-10-27 11:26:33.285587328 +0100
@@ -1,0 +2,10 @@
+Sat Oct 26 08:22:51 UTC 2024 - opensuse_buildservice(a)ojkastl.de
+
+- fix version output and zsh completion subpackage
+- Update to version 0.11.29:
+ * feat: add crossplane CLI (crank) to tools
+ * Bump golang.org/x/crypto from 0.27.0 to 0.28.0
+ * feat: add duplik8s to tools
+ * refactor: consolidate version finding across version strategies
+
+-------------------------------------------------------------------
Old:
----
arkade-0.11.28.obscpio
New:
----
arkade-0.11.29.obscpio
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ arkade.spec ++++++
--- /var/tmp/diff_new_pack.ZjC6AJ/_old 2024-10-27 11:26:33.921613691 +0100
+++ /var/tmp/diff_new_pack.ZjC6AJ/_new 2024-10-27 11:26:33.921613691 +0100
@@ -16,37 +16,80 @@
#
-%define __arch_install_post export NO_BRP_STRIP_DEBUG=true
-
Name: arkade
-Version: 0.11.28
+Version: 0.11.29
Release: 0
Summary: Open Source Kubernetes Marketplace
License: Apache-2.0
URL: https://github.com/alexellis/arkade
Source: arkade-%{version}.tar.gz
Source1: vendor.tar.gz
+BuildRequires: bash-completion
BuildRequires: go >= 1.22
+BuildRequires: zsh
%description
-arkade provides a portable marketplace for downloading your favourite devops CLIs and installing helm charts, with a single command.
-You can also download CLIs like kubectl, kind, kubectx and helm faster than you can type "apt-get/brew update".
+arkade provides a portable marketplace for downloading your favourite devops
+CLIs and installing helm charts, with a single command. You can also download
+CLIs like kubectl, kind, kubectx and helm faster than you can type
+"apt-get/brew update".
+
+%package -n %{name}-bash-completion
+Summary: Bash Completion for %{name}
+Group: System/Shells
+Requires: %{name} = %{version}
+Requires: bash-completion
+Supplements: (%{name} and bash-completion)
+BuildArch: noarch
+
+%description -n %{name}-bash-completion
+Bash command line completion support for %{name}.
+
+%package -n %{name}-zsh-completion
+Summary: Zsh Completion for %{name}
+Group: System/Shells
+Requires: %{name} = %{version}
+Supplements: (%{name} and zsh)
+BuildArch: noarch
+
+%description -n %{name}-zsh-completion
+zsh command line completion support for %{name}.
%prep
-%autosetup -p1 -a 1
+%autosetup -p 1 -a 1
%build
+# hash will be shortened by COMMIT_HASH:0:8 later
+COMMIT_HASH="$(sed -n 's/commit: \(.*\)/\1/p' %_sourcedir/%{name}.obsinfo)"
+
go build \
-mod=vendor \
- -ldflags="-X main.Version=%{version}"
+ -buildmode=pie \
+ -ldflags=" \
+ -X github.com/alexellis/arkade/pkg.Version=v%{version} \
+ -X github.com/alexellis/arkade/pkg.GitCommit=${COMMIT_HASH:0:8}" \
+ -o bin/%{name}
%install
# Install the binary.
-install -D -m 0755 %{name} "%{buildroot}/%{_bindir}/%{name}"
+install -D -m 0755 bin/%{name} %{buildroot}/%{_bindir}/%{name}
+
+# create the bash completion file
+mkdir -p %{buildroot}%{_datarootdir}/bash-completion/completions/
+%{buildroot}/%{_bindir}/%{name} completion bash > %{buildroot}%{_datarootdir}/bash-completion/completions/%{name}
+
+# create the zsh completion file
+mkdir -p %{buildroot}%{_datarootdir}/zsh/site-functions/
+%{buildroot}/%{_bindir}/%{name} completion zsh > %{buildroot}%{_datarootdir}/zsh/site-functions/_%{name}
%files
-%defattr(-,root,root)
%doc README.md
%license LICENSE
%{_bindir}/%{name}
+%files -n %{name}-bash-completion
+%{_datarootdir}/bash-completion/completions/%{name}
+
+%files -n %{name}-zsh-completion
+%{_datarootdir}/zsh/site-functions/_%{name}
+
++++++ _service ++++++
--- /var/tmp/diff_new_pack.ZjC6AJ/_old 2024-10-27 11:26:33.957615184 +0100
+++ /var/tmp/diff_new_pack.ZjC6AJ/_new 2024-10-27 11:26:33.961615349 +0100
@@ -3,7 +3,7 @@
<param name="url">https://github.com/alexellis/arkade</param>
<param name="scm">git</param>
<param name="exclude">.git</param>
- <param name="revision">0.11.28</param>
+ <param name="revision">0.11.29</param>
<param name="versionformat">@PARENT_TAG@</param>
<param name="changesgenerate">enable</param>
<param name="versionrewrite-pattern">v(.*)</param>
++++++ _servicedata ++++++
--- /var/tmp/diff_new_pack.ZjC6AJ/_old 2024-10-27 11:26:33.985616345 +0100
+++ /var/tmp/diff_new_pack.ZjC6AJ/_new 2024-10-27 11:26:33.989616511 +0100
@@ -1,6 +1,6 @@
<servicedata>
<service name="tar_scm">
<param name="url">https://github.com/alexellis/arkade</param>
- <param name="changesrevision">b1f190bdc5464de58d450bb06df0699e5c542345</param></service></servicedata>
+ <param name="changesrevision">b8766b45b249f328046d80fd2464d51dac03e57f</param></service></servicedata>
(No newline at EOF)
++++++ arkade-0.11.28.obscpio -> arkade-0.11.29.obscpio ++++++
/work/SRC/openSUSE:Factory/arkade/arkade-0.11.28.obscpio /work/SRC/openSUSE:Factory/.arkade.new.2020/arkade-0.11.29.obscpio differ: char 50, line 1
++++++ arkade.obsinfo ++++++
--- /var/tmp/diff_new_pack.ZjC6AJ/_old 2024-10-27 11:26:34.029618168 +0100
+++ /var/tmp/diff_new_pack.ZjC6AJ/_new 2024-10-27 11:26:34.033618334 +0100
@@ -1,5 +1,5 @@
name: arkade
-version: 0.11.28
-mtime: 1729689292
-commit: b1f190bdc5464de58d450bb06df0699e5c542345
+version: 0.11.29
+mtime: 1729929207
+commit: b8766b45b249f328046d80fd2464d51dac03e57f
++++++ vendor.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vendor/golang.org/x/sys/unix/README.md new/vendor/golang.org/x/sys/unix/README.md
--- old/vendor/golang.org/x/sys/unix/README.md 2024-10-24 10:15:49.000000000 +0200
+++ new/vendor/golang.org/x/sys/unix/README.md 2024-10-26 10:22:52.000000000 +0200
@@ -156,7 +156,7 @@
into a common file for each OS.
The merge is performed in the following steps:
-1. Construct the set of common code that is idential in all architecture-specific files.
+1. Construct the set of common code that is identical in all architecture-specific files.
2. Write this common code to the merged file.
3. Remove the common code from all architecture-specific files.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vendor/golang.org/x/sys/unix/mkerrors.sh new/vendor/golang.org/x/sys/unix/mkerrors.sh
--- old/vendor/golang.org/x/sys/unix/mkerrors.sh 2024-10-24 10:15:49.000000000 +0200
+++ new/vendor/golang.org/x/sys/unix/mkerrors.sh 2024-10-26 10:22:52.000000000 +0200
@@ -656,7 +656,7 @@
signals=$(
echo '#include <signal.h>' | $CC -x c - -E -dM $ccflags |
awk '$1=="#define" && $2 ~ /^SIG[A-Z0-9]+$/ { print $2 }' |
- grep -v 'SIGSTKSIZE\|SIGSTKSZ\|SIGRT\|SIGMAX64' |
+ grep -E -v '(SIGSTKSIZE|SIGSTKSZ|SIGRT|SIGMAX64)' |
sort
)
@@ -666,7 +666,7 @@
sort >_error.grep
echo '#include <signal.h>' | $CC -x c - -E -dM $ccflags |
awk '$1=="#define" && $2 ~ /^SIG[A-Z0-9]+$/ { print "^\t" $2 "[ \t]*=" }' |
- grep -v 'SIGSTKSIZE\|SIGSTKSZ\|SIGRT\|SIGMAX64' |
+ grep -E -v '(SIGSTKSIZE|SIGSTKSZ|SIGRT|SIGMAX64)' |
sort >_signal.grep
echo '// mkerrors.sh' "$@"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vendor/golang.org/x/sys/unix/syscall_aix.go new/vendor/golang.org/x/sys/unix/syscall_aix.go
--- old/vendor/golang.org/x/sys/unix/syscall_aix.go 2024-10-24 10:15:49.000000000 +0200
+++ new/vendor/golang.org/x/sys/unix/syscall_aix.go 2024-10-26 10:22:52.000000000 +0200
@@ -360,7 +360,7 @@
var status _C_int
var r Pid_t
err = ERESTART
- // AIX wait4 may return with ERESTART errno, while the processus is still
+ // AIX wait4 may return with ERESTART errno, while the process is still
// active.
for err == ERESTART {
r, err = wait4(Pid_t(pid), &status, options, rusage)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vendor/golang.org/x/sys/unix/syscall_linux.go new/vendor/golang.org/x/sys/unix/syscall_linux.go
--- old/vendor/golang.org/x/sys/unix/syscall_linux.go 2024-10-24 10:15:49.000000000 +0200
+++ new/vendor/golang.org/x/sys/unix/syscall_linux.go 2024-10-26 10:22:52.000000000 +0200
@@ -1295,6 +1295,48 @@
return &value, err
}
+// GetsockoptTCPCCVegasInfo returns algorithm specific congestion control information for a socket using the "vegas"
+// algorithm.
+//
+// The socket's congestion control algorighm can be retrieved via [GetsockoptString] with the [TCP_CONGESTION] option:
+//
+// algo, err := unix.GetsockoptString(fd, unix.IPPROTO_TCP, unix.TCP_CONGESTION)
+func GetsockoptTCPCCVegasInfo(fd, level, opt int) (*TCPVegasInfo, error) {
+ var value [SizeofTCPCCInfo / 4]uint32 // ensure proper alignment
+ vallen := _Socklen(SizeofTCPCCInfo)
+ err := getsockopt(fd, level, opt, unsafe.Pointer(&value[0]), &vallen)
+ out := (*TCPVegasInfo)(unsafe.Pointer(&value[0]))
+ return out, err
+}
+
+// GetsockoptTCPCCDCTCPInfo returns algorithm specific congestion control information for a socket using the "dctp"
+// algorithm.
+//
+// The socket's congestion control algorighm can be retrieved via [GetsockoptString] with the [TCP_CONGESTION] option:
+//
+// algo, err := unix.GetsockoptString(fd, unix.IPPROTO_TCP, unix.TCP_CONGESTION)
+func GetsockoptTCPCCDCTCPInfo(fd, level, opt int) (*TCPDCTCPInfo, error) {
+ var value [SizeofTCPCCInfo / 4]uint32 // ensure proper alignment
+ vallen := _Socklen(SizeofTCPCCInfo)
+ err := getsockopt(fd, level, opt, unsafe.Pointer(&value[0]), &vallen)
+ out := (*TCPDCTCPInfo)(unsafe.Pointer(&value[0]))
+ return out, err
+}
+
+// GetsockoptTCPCCBBRInfo returns algorithm specific congestion control information for a socket using the "bbr"
+// algorithm.
+//
+// The socket's congestion control algorighm can be retrieved via [GetsockoptString] with the [TCP_CONGESTION] option:
+//
+// algo, err := unix.GetsockoptString(fd, unix.IPPROTO_TCP, unix.TCP_CONGESTION)
+func GetsockoptTCPCCBBRInfo(fd, level, opt int) (*TCPBBRInfo, error) {
+ var value [SizeofTCPCCInfo / 4]uint32 // ensure proper alignment
+ vallen := _Socklen(SizeofTCPCCInfo)
+ err := getsockopt(fd, level, opt, unsafe.Pointer(&value[0]), &vallen)
+ out := (*TCPBBRInfo)(unsafe.Pointer(&value[0]))
+ return out, err
+}
+
// GetsockoptString returns the string value of the socket option opt for the
// socket associated with fd at the given socket level.
func GetsockoptString(fd, level, opt int) (string, error) {
@@ -1959,7 +2001,26 @@
//sysnb Getpid() (pid int)
//sysnb Getppid() (ppid int)
//sys Getpriority(which int, who int) (prio int, err error)
-//sys Getrandom(buf []byte, flags int) (n int, err error)
+
+func Getrandom(buf []byte, flags int) (n int, err error) {
+ vdsoRet, supported := vgetrandom(buf, uint32(flags))
+ if supported {
+ if vdsoRet < 0 {
+ return 0, errnoErr(syscall.Errno(-vdsoRet))
+ }
+ return vdsoRet, nil
+ }
+ var p *byte
+ if len(buf) > 0 {
+ p = &buf[0]
+ }
+ r, _, e := Syscall(SYS_GETRANDOM, uintptr(unsafe.Pointer(p)), uintptr(len(buf)), uintptr(flags))
+ if e != 0 {
+ return 0, errnoErr(e)
+ }
+ return int(r), nil
+}
+
//sysnb Getrusage(who int, rusage *Rusage) (err error)
//sysnb Getsid(pid int) (sid int, err error)
//sysnb Gettid() (tid int)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vendor/golang.org/x/sys/unix/syscall_linux_arm64.go new/vendor/golang.org/x/sys/unix/syscall_linux_arm64.go
--- old/vendor/golang.org/x/sys/unix/syscall_linux_arm64.go 2024-10-24 10:15:49.000000000 +0200
+++ new/vendor/golang.org/x/sys/unix/syscall_linux_arm64.go 2024-10-26 10:22:52.000000000 +0200
@@ -182,3 +182,5 @@
}
return kexecFileLoad(kernelFd, initrdFd, cmdlineLen, cmdline, flags)
}
+
+const SYS_FSTATAT = SYS_NEWFSTATAT
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vendor/golang.org/x/sys/unix/syscall_linux_loong64.go new/vendor/golang.org/x/sys/unix/syscall_linux_loong64.go
--- old/vendor/golang.org/x/sys/unix/syscall_linux_loong64.go 2024-10-24 10:15:49.000000000 +0200
+++ new/vendor/golang.org/x/sys/unix/syscall_linux_loong64.go 2024-10-26 10:22:52.000000000 +0200
@@ -214,3 +214,5 @@
}
return kexecFileLoad(kernelFd, initrdFd, cmdlineLen, cmdline, flags)
}
+
+const SYS_FSTATAT = SYS_NEWFSTATAT
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vendor/golang.org/x/sys/unix/syscall_linux_riscv64.go new/vendor/golang.org/x/sys/unix/syscall_linux_riscv64.go
--- old/vendor/golang.org/x/sys/unix/syscall_linux_riscv64.go 2024-10-24 10:15:49.000000000 +0200
+++ new/vendor/golang.org/x/sys/unix/syscall_linux_riscv64.go 2024-10-26 10:22:52.000000000 +0200
@@ -187,3 +187,5 @@
}
return riscvHWProbe(pairs, setSize, set, flags)
}
+
+const SYS_FSTATAT = SYS_NEWFSTATAT
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vendor/golang.org/x/sys/unix/vgetrandom_linux.go new/vendor/golang.org/x/sys/unix/vgetrandom_linux.go
--- old/vendor/golang.org/x/sys/unix/vgetrandom_linux.go 1970-01-01 01:00:00.000000000 +0100
+++ new/vendor/golang.org/x/sys/unix/vgetrandom_linux.go 2024-10-26 10:22:52.000000000 +0200
@@ -0,0 +1,13 @@
+// Copyright 2024 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+//go:build linux && go1.24
+
+package unix
+
+import _ "unsafe"
+
+//go:linkname vgetrandom runtime.vgetrandom
+//go:noescape
+func vgetrandom(p []byte, flags uint32) (ret int, supported bool)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vendor/golang.org/x/sys/unix/vgetrandom_unsupported.go new/vendor/golang.org/x/sys/unix/vgetrandom_unsupported.go
--- old/vendor/golang.org/x/sys/unix/vgetrandom_unsupported.go 1970-01-01 01:00:00.000000000 +0100
+++ new/vendor/golang.org/x/sys/unix/vgetrandom_unsupported.go 2024-10-26 10:22:52.000000000 +0200
@@ -0,0 +1,11 @@
+// Copyright 2024 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+//go:build !linux || !go1.24
+
+package unix
+
+func vgetrandom(p []byte, flags uint32) (ret int, supported bool) {
+ return -1, false
+}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vendor/golang.org/x/sys/unix/zerrors_linux.go new/vendor/golang.org/x/sys/unix/zerrors_linux.go
--- old/vendor/golang.org/x/sys/unix/zerrors_linux.go 2024-10-24 10:15:49.000000000 +0200
+++ new/vendor/golang.org/x/sys/unix/zerrors_linux.go 2024-10-26 10:22:52.000000000 +0200
@@ -495,6 +495,7 @@
BPF_F_TEST_REG_INVARIANTS = 0x80
BPF_F_TEST_RND_HI32 = 0x4
BPF_F_TEST_RUN_ON_CPU = 0x1
+ BPF_F_TEST_SKB_CHECKSUM_COMPLETE = 0x4
BPF_F_TEST_STATE_FREQ = 0x8
BPF_F_TEST_XDP_LIVE_FRAMES = 0x2
BPF_F_XDP_DEV_BOUND_ONLY = 0x40
@@ -1922,6 +1923,7 @@
MNT_EXPIRE = 0x4
MNT_FORCE = 0x1
MNT_ID_REQ_SIZE_VER0 = 0x18
+ MNT_ID_REQ_SIZE_VER1 = 0x20
MODULE_INIT_COMPRESSED_FILE = 0x4
MODULE_INIT_IGNORE_MODVERSIONS = 0x1
MODULE_INIT_IGNORE_VERMAGIC = 0x2
@@ -2187,7 +2189,7 @@
NFT_REG_SIZE = 0x10
NFT_REJECT_ICMPX_MAX = 0x3
NFT_RT_MAX = 0x4
- NFT_SECMARK_CTX_MAXLEN = 0x100
+ NFT_SECMARK_CTX_MAXLEN = 0x1000
NFT_SET_MAXNAMELEN = 0x100
NFT_SOCKET_MAX = 0x3
NFT_TABLE_F_MASK = 0x7
@@ -2356,9 +2358,11 @@
PERF_MEM_LVLNUM_IO = 0xa
PERF_MEM_LVLNUM_L1 = 0x1
PERF_MEM_LVLNUM_L2 = 0x2
+ PERF_MEM_LVLNUM_L2_MHB = 0x5
PERF_MEM_LVLNUM_L3 = 0x3
PERF_MEM_LVLNUM_L4 = 0x4
PERF_MEM_LVLNUM_LFB = 0xc
+ PERF_MEM_LVLNUM_MSC = 0x6
PERF_MEM_LVLNUM_NA = 0xf
PERF_MEM_LVLNUM_PMEM = 0xe
PERF_MEM_LVLNUM_RAM = 0xd
@@ -2431,6 +2435,7 @@
PRIO_PGRP = 0x1
PRIO_PROCESS = 0x0
PRIO_USER = 0x2
+ PROCFS_IOCTL_MAGIC = 'f'
PROC_SUPER_MAGIC = 0x9fa0
PROT_EXEC = 0x4
PROT_GROWSDOWN = 0x1000000
@@ -2933,11 +2938,12 @@
RUSAGE_SELF = 0x0
RUSAGE_THREAD = 0x1
RWF_APPEND = 0x10
+ RWF_ATOMIC = 0x40
RWF_DSYNC = 0x2
RWF_HIPRI = 0x1
RWF_NOAPPEND = 0x20
RWF_NOWAIT = 0x8
- RWF_SUPPORTED = 0x3f
+ RWF_SUPPORTED = 0x7f
RWF_SYNC = 0x4
RWF_WRITE_LIFE_NOT_SET = 0x0
SCHED_BATCH = 0x3
@@ -3210,6 +3216,7 @@
STATX_ATTR_MOUNT_ROOT = 0x2000
STATX_ATTR_NODUMP = 0x40
STATX_ATTR_VERITY = 0x100000
+ STATX_ATTR_WRITE_ATOMIC = 0x400000
STATX_BASIC_STATS = 0x7ff
STATX_BLOCKS = 0x400
STATX_BTIME = 0x800
@@ -3226,6 +3233,7 @@
STATX_SUBVOL = 0x8000
STATX_TYPE = 0x1
STATX_UID = 0x8
+ STATX_WRITE_ATOMIC = 0x10000
STATX__RESERVED = 0x80000000
SYNC_FILE_RANGE_WAIT_AFTER = 0x4
SYNC_FILE_RANGE_WAIT_BEFORE = 0x1
@@ -3624,6 +3632,7 @@
XDP_UMEM_PGOFF_COMPLETION_RING = 0x180000000
XDP_UMEM_PGOFF_FILL_RING = 0x100000000
XDP_UMEM_REG = 0x4
+ XDP_UMEM_TX_METADATA_LEN = 0x4
XDP_UMEM_TX_SW_CSUM = 0x2
XDP_UMEM_UNALIGNED_CHUNK_FLAG = 0x1
XDP_USE_NEED_WAKEUP = 0x8
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vendor/golang.org/x/sys/unix/zerrors_linux_386.go new/vendor/golang.org/x/sys/unix/zerrors_linux_386.go
--- old/vendor/golang.org/x/sys/unix/zerrors_linux_386.go 2024-10-24 10:15:49.000000000 +0200
+++ new/vendor/golang.org/x/sys/unix/zerrors_linux_386.go 2024-10-26 10:22:52.000000000 +0200
@@ -153,9 +153,14 @@
NFDBITS = 0x20
NLDLY = 0x100
NOFLSH = 0x80
+ NS_GET_MNTNS_ID = 0x8008b705
NS_GET_NSTYPE = 0xb703
NS_GET_OWNER_UID = 0xb704
NS_GET_PARENT = 0xb702
+ NS_GET_PID_FROM_PIDNS = 0x8004b706
+ NS_GET_PID_IN_PIDNS = 0x8004b708
+ NS_GET_TGID_FROM_PIDNS = 0x8004b707
+ NS_GET_TGID_IN_PIDNS = 0x8004b709
NS_GET_USERNS = 0xb701
OLCUC = 0x2
ONLCR = 0x4
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vendor/golang.org/x/sys/unix/zerrors_linux_amd64.go new/vendor/golang.org/x/sys/unix/zerrors_linux_amd64.go
--- old/vendor/golang.org/x/sys/unix/zerrors_linux_amd64.go 2024-10-24 10:15:49.000000000 +0200
+++ new/vendor/golang.org/x/sys/unix/zerrors_linux_amd64.go 2024-10-26 10:22:52.000000000 +0200
@@ -153,9 +153,14 @@
NFDBITS = 0x40
NLDLY = 0x100
NOFLSH = 0x80
+ NS_GET_MNTNS_ID = 0x8008b705
NS_GET_NSTYPE = 0xb703
NS_GET_OWNER_UID = 0xb704
NS_GET_PARENT = 0xb702
+ NS_GET_PID_FROM_PIDNS = 0x8004b706
+ NS_GET_PID_IN_PIDNS = 0x8004b708
+ NS_GET_TGID_FROM_PIDNS = 0x8004b707
+ NS_GET_TGID_IN_PIDNS = 0x8004b709
NS_GET_USERNS = 0xb701
OLCUC = 0x2
ONLCR = 0x4
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vendor/golang.org/x/sys/unix/zerrors_linux_arm.go new/vendor/golang.org/x/sys/unix/zerrors_linux_arm.go
--- old/vendor/golang.org/x/sys/unix/zerrors_linux_arm.go 2024-10-24 10:15:49.000000000 +0200
+++ new/vendor/golang.org/x/sys/unix/zerrors_linux_arm.go 2024-10-26 10:22:52.000000000 +0200
@@ -150,9 +150,14 @@
NFDBITS = 0x20
NLDLY = 0x100
NOFLSH = 0x80
+ NS_GET_MNTNS_ID = 0x8008b705
NS_GET_NSTYPE = 0xb703
NS_GET_OWNER_UID = 0xb704
NS_GET_PARENT = 0xb702
+ NS_GET_PID_FROM_PIDNS = 0x8004b706
+ NS_GET_PID_IN_PIDNS = 0x8004b708
+ NS_GET_TGID_FROM_PIDNS = 0x8004b707
+ NS_GET_TGID_IN_PIDNS = 0x8004b709
NS_GET_USERNS = 0xb701
OLCUC = 0x2
ONLCR = 0x4
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vendor/golang.org/x/sys/unix/zerrors_linux_arm64.go new/vendor/golang.org/x/sys/unix/zerrors_linux_arm64.go
--- old/vendor/golang.org/x/sys/unix/zerrors_linux_arm64.go 2024-10-24 10:15:49.000000000 +0200
+++ new/vendor/golang.org/x/sys/unix/zerrors_linux_arm64.go 2024-10-26 10:22:52.000000000 +0200
@@ -154,9 +154,14 @@
NFDBITS = 0x40
NLDLY = 0x100
NOFLSH = 0x80
+ NS_GET_MNTNS_ID = 0x8008b705
NS_GET_NSTYPE = 0xb703
NS_GET_OWNER_UID = 0xb704
NS_GET_PARENT = 0xb702
+ NS_GET_PID_FROM_PIDNS = 0x8004b706
+ NS_GET_PID_IN_PIDNS = 0x8004b708
+ NS_GET_TGID_FROM_PIDNS = 0x8004b707
+ NS_GET_TGID_IN_PIDNS = 0x8004b709
NS_GET_USERNS = 0xb701
OLCUC = 0x2
ONLCR = 0x4
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vendor/golang.org/x/sys/unix/zerrors_linux_loong64.go new/vendor/golang.org/x/sys/unix/zerrors_linux_loong64.go
--- old/vendor/golang.org/x/sys/unix/zerrors_linux_loong64.go 2024-10-24 10:15:49.000000000 +0200
+++ new/vendor/golang.org/x/sys/unix/zerrors_linux_loong64.go 2024-10-26 10:22:52.000000000 +0200
@@ -154,9 +154,14 @@
NFDBITS = 0x40
NLDLY = 0x100
NOFLSH = 0x80
+ NS_GET_MNTNS_ID = 0x8008b705
NS_GET_NSTYPE = 0xb703
NS_GET_OWNER_UID = 0xb704
NS_GET_PARENT = 0xb702
+ NS_GET_PID_FROM_PIDNS = 0x8004b706
+ NS_GET_PID_IN_PIDNS = 0x8004b708
+ NS_GET_TGID_FROM_PIDNS = 0x8004b707
+ NS_GET_TGID_IN_PIDNS = 0x8004b709
NS_GET_USERNS = 0xb701
OLCUC = 0x2
ONLCR = 0x4
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vendor/golang.org/x/sys/unix/zerrors_linux_mips.go new/vendor/golang.org/x/sys/unix/zerrors_linux_mips.go
--- old/vendor/golang.org/x/sys/unix/zerrors_linux_mips.go 2024-10-24 10:15:49.000000000 +0200
+++ new/vendor/golang.org/x/sys/unix/zerrors_linux_mips.go 2024-10-26 10:22:52.000000000 +0200
@@ -150,9 +150,14 @@
NFDBITS = 0x20
NLDLY = 0x100
NOFLSH = 0x80
+ NS_GET_MNTNS_ID = 0x4008b705
NS_GET_NSTYPE = 0x2000b703
NS_GET_OWNER_UID = 0x2000b704
NS_GET_PARENT = 0x2000b702
+ NS_GET_PID_FROM_PIDNS = 0x4004b706
+ NS_GET_PID_IN_PIDNS = 0x4004b708
+ NS_GET_TGID_FROM_PIDNS = 0x4004b707
+ NS_GET_TGID_IN_PIDNS = 0x4004b709
NS_GET_USERNS = 0x2000b701
OLCUC = 0x2
ONLCR = 0x4
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vendor/golang.org/x/sys/unix/zerrors_linux_mips64.go new/vendor/golang.org/x/sys/unix/zerrors_linux_mips64.go
--- old/vendor/golang.org/x/sys/unix/zerrors_linux_mips64.go 2024-10-24 10:15:49.000000000 +0200
+++ new/vendor/golang.org/x/sys/unix/zerrors_linux_mips64.go 2024-10-26 10:22:52.000000000 +0200
@@ -150,9 +150,14 @@
NFDBITS = 0x40
NLDLY = 0x100
NOFLSH = 0x80
+ NS_GET_MNTNS_ID = 0x4008b705
NS_GET_NSTYPE = 0x2000b703
NS_GET_OWNER_UID = 0x2000b704
NS_GET_PARENT = 0x2000b702
+ NS_GET_PID_FROM_PIDNS = 0x4004b706
+ NS_GET_PID_IN_PIDNS = 0x4004b708
+ NS_GET_TGID_FROM_PIDNS = 0x4004b707
+ NS_GET_TGID_IN_PIDNS = 0x4004b709
NS_GET_USERNS = 0x2000b701
OLCUC = 0x2
ONLCR = 0x4
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vendor/golang.org/x/sys/unix/zerrors_linux_mips64le.go new/vendor/golang.org/x/sys/unix/zerrors_linux_mips64le.go
--- old/vendor/golang.org/x/sys/unix/zerrors_linux_mips64le.go 2024-10-24 10:15:49.000000000 +0200
+++ new/vendor/golang.org/x/sys/unix/zerrors_linux_mips64le.go 2024-10-26 10:22:52.000000000 +0200
@@ -150,9 +150,14 @@
NFDBITS = 0x40
NLDLY = 0x100
NOFLSH = 0x80
+ NS_GET_MNTNS_ID = 0x4008b705
NS_GET_NSTYPE = 0x2000b703
NS_GET_OWNER_UID = 0x2000b704
NS_GET_PARENT = 0x2000b702
+ NS_GET_PID_FROM_PIDNS = 0x4004b706
+ NS_GET_PID_IN_PIDNS = 0x4004b708
+ NS_GET_TGID_FROM_PIDNS = 0x4004b707
+ NS_GET_TGID_IN_PIDNS = 0x4004b709
NS_GET_USERNS = 0x2000b701
OLCUC = 0x2
ONLCR = 0x4
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vendor/golang.org/x/sys/unix/zerrors_linux_mipsle.go new/vendor/golang.org/x/sys/unix/zerrors_linux_mipsle.go
--- old/vendor/golang.org/x/sys/unix/zerrors_linux_mipsle.go 2024-10-24 10:15:49.000000000 +0200
+++ new/vendor/golang.org/x/sys/unix/zerrors_linux_mipsle.go 2024-10-26 10:22:52.000000000 +0200
@@ -150,9 +150,14 @@
NFDBITS = 0x20
NLDLY = 0x100
NOFLSH = 0x80
+ NS_GET_MNTNS_ID = 0x4008b705
NS_GET_NSTYPE = 0x2000b703
NS_GET_OWNER_UID = 0x2000b704
NS_GET_PARENT = 0x2000b702
+ NS_GET_PID_FROM_PIDNS = 0x4004b706
+ NS_GET_PID_IN_PIDNS = 0x4004b708
+ NS_GET_TGID_FROM_PIDNS = 0x4004b707
+ NS_GET_TGID_IN_PIDNS = 0x4004b709
NS_GET_USERNS = 0x2000b701
OLCUC = 0x2
ONLCR = 0x4
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vendor/golang.org/x/sys/unix/zerrors_linux_ppc.go new/vendor/golang.org/x/sys/unix/zerrors_linux_ppc.go
--- old/vendor/golang.org/x/sys/unix/zerrors_linux_ppc.go 2024-10-24 10:15:49.000000000 +0200
+++ new/vendor/golang.org/x/sys/unix/zerrors_linux_ppc.go 2024-10-26 10:22:52.000000000 +0200
@@ -152,9 +152,14 @@
NL3 = 0x300
NLDLY = 0x300
NOFLSH = 0x80000000
+ NS_GET_MNTNS_ID = 0x4008b705
NS_GET_NSTYPE = 0x2000b703
NS_GET_OWNER_UID = 0x2000b704
NS_GET_PARENT = 0x2000b702
+ NS_GET_PID_FROM_PIDNS = 0x4004b706
+ NS_GET_PID_IN_PIDNS = 0x4004b708
+ NS_GET_TGID_FROM_PIDNS = 0x4004b707
+ NS_GET_TGID_IN_PIDNS = 0x4004b709
NS_GET_USERNS = 0x2000b701
OLCUC = 0x4
ONLCR = 0x2
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vendor/golang.org/x/sys/unix/zerrors_linux_ppc64.go new/vendor/golang.org/x/sys/unix/zerrors_linux_ppc64.go
--- old/vendor/golang.org/x/sys/unix/zerrors_linux_ppc64.go 2024-10-24 10:15:49.000000000 +0200
+++ new/vendor/golang.org/x/sys/unix/zerrors_linux_ppc64.go 2024-10-26 10:22:52.000000000 +0200
@@ -152,9 +152,14 @@
NL3 = 0x300
NLDLY = 0x300
NOFLSH = 0x80000000
+ NS_GET_MNTNS_ID = 0x4008b705
NS_GET_NSTYPE = 0x2000b703
NS_GET_OWNER_UID = 0x2000b704
NS_GET_PARENT = 0x2000b702
+ NS_GET_PID_FROM_PIDNS = 0x4004b706
+ NS_GET_PID_IN_PIDNS = 0x4004b708
+ NS_GET_TGID_FROM_PIDNS = 0x4004b707
+ NS_GET_TGID_IN_PIDNS = 0x4004b709
NS_GET_USERNS = 0x2000b701
OLCUC = 0x4
ONLCR = 0x2
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vendor/golang.org/x/sys/unix/zerrors_linux_ppc64le.go new/vendor/golang.org/x/sys/unix/zerrors_linux_ppc64le.go
--- old/vendor/golang.org/x/sys/unix/zerrors_linux_ppc64le.go 2024-10-24 10:15:49.000000000 +0200
+++ new/vendor/golang.org/x/sys/unix/zerrors_linux_ppc64le.go 2024-10-26 10:22:52.000000000 +0200
@@ -152,9 +152,14 @@
NL3 = 0x300
NLDLY = 0x300
NOFLSH = 0x80000000
+ NS_GET_MNTNS_ID = 0x4008b705
NS_GET_NSTYPE = 0x2000b703
NS_GET_OWNER_UID = 0x2000b704
NS_GET_PARENT = 0x2000b702
+ NS_GET_PID_FROM_PIDNS = 0x4004b706
+ NS_GET_PID_IN_PIDNS = 0x4004b708
+ NS_GET_TGID_FROM_PIDNS = 0x4004b707
+ NS_GET_TGID_IN_PIDNS = 0x4004b709
NS_GET_USERNS = 0x2000b701
OLCUC = 0x4
ONLCR = 0x2
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vendor/golang.org/x/sys/unix/zerrors_linux_riscv64.go new/vendor/golang.org/x/sys/unix/zerrors_linux_riscv64.go
--- old/vendor/golang.org/x/sys/unix/zerrors_linux_riscv64.go 2024-10-24 10:15:49.000000000 +0200
+++ new/vendor/golang.org/x/sys/unix/zerrors_linux_riscv64.go 2024-10-26 10:22:52.000000000 +0200
@@ -150,9 +150,14 @@
NFDBITS = 0x40
NLDLY = 0x100
NOFLSH = 0x80
+ NS_GET_MNTNS_ID = 0x8008b705
NS_GET_NSTYPE = 0xb703
NS_GET_OWNER_UID = 0xb704
NS_GET_PARENT = 0xb702
+ NS_GET_PID_FROM_PIDNS = 0x8004b706
+ NS_GET_PID_IN_PIDNS = 0x8004b708
+ NS_GET_TGID_FROM_PIDNS = 0x8004b707
+ NS_GET_TGID_IN_PIDNS = 0x8004b709
NS_GET_USERNS = 0xb701
OLCUC = 0x2
ONLCR = 0x4
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vendor/golang.org/x/sys/unix/zerrors_linux_s390x.go new/vendor/golang.org/x/sys/unix/zerrors_linux_s390x.go
--- old/vendor/golang.org/x/sys/unix/zerrors_linux_s390x.go 2024-10-24 10:15:49.000000000 +0200
+++ new/vendor/golang.org/x/sys/unix/zerrors_linux_s390x.go 2024-10-26 10:22:52.000000000 +0200
@@ -150,9 +150,14 @@
NFDBITS = 0x40
NLDLY = 0x100
NOFLSH = 0x80
+ NS_GET_MNTNS_ID = 0x8008b705
NS_GET_NSTYPE = 0xb703
NS_GET_OWNER_UID = 0xb704
NS_GET_PARENT = 0xb702
+ NS_GET_PID_FROM_PIDNS = 0x8004b706
+ NS_GET_PID_IN_PIDNS = 0x8004b708
+ NS_GET_TGID_FROM_PIDNS = 0x8004b707
+ NS_GET_TGID_IN_PIDNS = 0x8004b709
NS_GET_USERNS = 0xb701
OLCUC = 0x2
ONLCR = 0x4
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vendor/golang.org/x/sys/unix/zerrors_linux_sparc64.go new/vendor/golang.org/x/sys/unix/zerrors_linux_sparc64.go
--- old/vendor/golang.org/x/sys/unix/zerrors_linux_sparc64.go 2024-10-24 10:15:49.000000000 +0200
+++ new/vendor/golang.org/x/sys/unix/zerrors_linux_sparc64.go 2024-10-26 10:22:52.000000000 +0200
@@ -155,9 +155,14 @@
NFDBITS = 0x40
NLDLY = 0x100
NOFLSH = 0x80
+ NS_GET_MNTNS_ID = 0x4008b705
NS_GET_NSTYPE = 0x2000b703
NS_GET_OWNER_UID = 0x2000b704
NS_GET_PARENT = 0x2000b702
+ NS_GET_PID_FROM_PIDNS = 0x4004b706
+ NS_GET_PID_IN_PIDNS = 0x4004b708
+ NS_GET_TGID_FROM_PIDNS = 0x4004b707
+ NS_GET_TGID_IN_PIDNS = 0x4004b709
NS_GET_USERNS = 0x2000b701
OLCUC = 0x2
ONLCR = 0x4
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vendor/golang.org/x/sys/unix/zsyscall_linux.go new/vendor/golang.org/x/sys/unix/zsyscall_linux.go
--- old/vendor/golang.org/x/sys/unix/zsyscall_linux.go 2024-10-24 10:15:49.000000000 +0200
+++ new/vendor/golang.org/x/sys/unix/zsyscall_linux.go 2024-10-26 10:22:52.000000000 +0200
@@ -971,23 +971,6 @@
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-func Getrandom(buf []byte, flags int) (n int, err error) {
- var _p0 unsafe.Pointer
- if len(buf) > 0 {
- _p0 = unsafe.Pointer(&buf[0])
- } else {
- _p0 = unsafe.Pointer(&_zero)
- }
- r0, _, e1 := Syscall(SYS_GETRANDOM, uintptr(_p0), uintptr(len(buf)), uintptr(flags))
- n = int(r0)
- if e1 != 0 {
- err = errnoErr(e1)
- }
- return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
func Getrusage(who int, rusage *Rusage) (err error) {
_, _, e1 := RawSyscall(SYS_GETRUSAGE, uintptr(who), uintptr(unsafe.Pointer(rusage)), 0)
if e1 != 0 {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vendor/golang.org/x/sys/unix/zsysnum_linux_amd64.go new/vendor/golang.org/x/sys/unix/zsysnum_linux_amd64.go
--- old/vendor/golang.org/x/sys/unix/zsysnum_linux_amd64.go 2024-10-24 10:15:49.000000000 +0200
+++ new/vendor/golang.org/x/sys/unix/zsysnum_linux_amd64.go 2024-10-26 10:22:52.000000000 +0200
@@ -341,6 +341,7 @@
SYS_STATX = 332
SYS_IO_PGETEVENTS = 333
SYS_RSEQ = 334
+ SYS_URETPROBE = 335
SYS_PIDFD_SEND_SIGNAL = 424
SYS_IO_URING_SETUP = 425
SYS_IO_URING_ENTER = 426
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vendor/golang.org/x/sys/unix/zsysnum_linux_arm64.go new/vendor/golang.org/x/sys/unix/zsysnum_linux_arm64.go
--- old/vendor/golang.org/x/sys/unix/zsysnum_linux_arm64.go 2024-10-24 10:15:49.000000000 +0200
+++ new/vendor/golang.org/x/sys/unix/zsysnum_linux_arm64.go 2024-10-26 10:22:52.000000000 +0200
@@ -85,7 +85,7 @@
SYS_SPLICE = 76
SYS_TEE = 77
SYS_READLINKAT = 78
- SYS_FSTATAT = 79
+ SYS_NEWFSTATAT = 79
SYS_FSTAT = 80
SYS_SYNC = 81
SYS_FSYNC = 82
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vendor/golang.org/x/sys/unix/zsysnum_linux_loong64.go new/vendor/golang.org/x/sys/unix/zsysnum_linux_loong64.go
--- old/vendor/golang.org/x/sys/unix/zsysnum_linux_loong64.go 2024-10-24 10:15:49.000000000 +0200
+++ new/vendor/golang.org/x/sys/unix/zsysnum_linux_loong64.go 2024-10-26 10:22:52.000000000 +0200
@@ -84,6 +84,8 @@
SYS_SPLICE = 76
SYS_TEE = 77
SYS_READLINKAT = 78
+ SYS_NEWFSTATAT = 79
+ SYS_FSTAT = 80
SYS_SYNC = 81
SYS_FSYNC = 82
SYS_FDATASYNC = 83
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vendor/golang.org/x/sys/unix/zsysnum_linux_riscv64.go new/vendor/golang.org/x/sys/unix/zsysnum_linux_riscv64.go
--- old/vendor/golang.org/x/sys/unix/zsysnum_linux_riscv64.go 2024-10-24 10:15:49.000000000 +0200
+++ new/vendor/golang.org/x/sys/unix/zsysnum_linux_riscv64.go 2024-10-26 10:22:52.000000000 +0200
@@ -84,7 +84,7 @@
SYS_SPLICE = 76
SYS_TEE = 77
SYS_READLINKAT = 78
- SYS_FSTATAT = 79
+ SYS_NEWFSTATAT = 79
SYS_FSTAT = 80
SYS_SYNC = 81
SYS_FSYNC = 82
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vendor/golang.org/x/sys/unix/ztypes_linux.go new/vendor/golang.org/x/sys/unix/ztypes_linux.go
--- old/vendor/golang.org/x/sys/unix/ztypes_linux.go 2024-10-24 10:15:49.000000000 +0200
+++ new/vendor/golang.org/x/sys/unix/ztypes_linux.go 2024-10-26 10:22:52.000000000 +0200
@@ -87,31 +87,35 @@
}
type Statx_t struct {
- Mask uint32
- Blksize uint32
- Attributes uint64
- Nlink uint32
- Uid uint32
- Gid uint32
- Mode uint16
- _ [1]uint16
- Ino uint64
- Size uint64
- Blocks uint64
- Attributes_mask uint64
- Atime StatxTimestamp
- Btime StatxTimestamp
- Ctime StatxTimestamp
- Mtime StatxTimestamp
- Rdev_major uint32
- Rdev_minor uint32
- Dev_major uint32
- Dev_minor uint32
- Mnt_id uint64
- Dio_mem_align uint32
- Dio_offset_align uint32
- Subvol uint64
- _ [11]uint64
+ Mask uint32
+ Blksize uint32
+ Attributes uint64
+ Nlink uint32
+ Uid uint32
+ Gid uint32
+ Mode uint16
+ _ [1]uint16
+ Ino uint64
+ Size uint64
+ Blocks uint64
+ Attributes_mask uint64
+ Atime StatxTimestamp
+ Btime StatxTimestamp
+ Ctime StatxTimestamp
+ Mtime StatxTimestamp
+ Rdev_major uint32
+ Rdev_minor uint32
+ Dev_major uint32
+ Dev_minor uint32
+ Mnt_id uint64
+ Dio_mem_align uint32
+ Dio_offset_align uint32
+ Subvol uint64
+ Atomic_write_unit_min uint32
+ Atomic_write_unit_max uint32
+ Atomic_write_segments_max uint32
+ _ [1]uint32
+ _ [9]uint64
}
type Fsid struct {
@@ -516,6 +520,29 @@
Total_rto_time uint32
}
+type TCPVegasInfo struct {
+ Enabled uint32
+ Rttcnt uint32
+ Rtt uint32
+ Minrtt uint32
+}
+
+type TCPDCTCPInfo struct {
+ Enabled uint16
+ Ce_state uint16
+ Alpha uint32
+ Ab_ecn uint32
+ Ab_tot uint32
+}
+
+type TCPBBRInfo struct {
+ Bw_lo uint32
+ Bw_hi uint32
+ Min_rtt uint32
+ Pacing_gain uint32
+ Cwnd_gain uint32
+}
+
type CanFilter struct {
Id uint32
Mask uint32
@@ -557,6 +584,7 @@
SizeofICMPv6Filter = 0x20
SizeofUcred = 0xc
SizeofTCPInfo = 0xf8
+ SizeofTCPCCInfo = 0x14
SizeofCanFilter = 0x8
SizeofTCPRepairOpt = 0x8
)
@@ -3766,7 +3794,7 @@
ETHTOOL_MSG_PSE_GET = 0x24
ETHTOOL_MSG_PSE_SET = 0x25
ETHTOOL_MSG_RSS_GET = 0x26
- ETHTOOL_MSG_USER_MAX = 0x2b
+ ETHTOOL_MSG_USER_MAX = 0x2c
ETHTOOL_MSG_KERNEL_NONE = 0x0
ETHTOOL_MSG_STRSET_GET_REPLY = 0x1
ETHTOOL_MSG_LINKINFO_GET_REPLY = 0x2
@@ -3806,7 +3834,7 @@
ETHTOOL_MSG_MODULE_NTF = 0x24
ETHTOOL_MSG_PSE_GET_REPLY = 0x25
ETHTOOL_MSG_RSS_GET_REPLY = 0x26
- ETHTOOL_MSG_KERNEL_MAX = 0x2b
+ ETHTOOL_MSG_KERNEL_MAX = 0x2c
ETHTOOL_FLAG_COMPACT_BITSETS = 0x1
ETHTOOL_FLAG_OMIT_REPLY = 0x2
ETHTOOL_FLAG_STATS = 0x4
@@ -3951,7 +3979,7 @@
ETHTOOL_A_COALESCE_RATE_SAMPLE_INTERVAL = 0x17
ETHTOOL_A_COALESCE_USE_CQE_MODE_TX = 0x18
ETHTOOL_A_COALESCE_USE_CQE_MODE_RX = 0x19
- ETHTOOL_A_COALESCE_MAX = 0x1c
+ ETHTOOL_A_COALESCE_MAX = 0x1e
ETHTOOL_A_PAUSE_UNSPEC = 0x0
ETHTOOL_A_PAUSE_HEADER = 0x1
ETHTOOL_A_PAUSE_AUTONEG = 0x2
@@ -4609,7 +4637,7 @@
NL80211_ATTR_MAC_HINT = 0xc8
NL80211_ATTR_MAC_MASK = 0xd7
NL80211_ATTR_MAX_AP_ASSOC_STA = 0xca
- NL80211_ATTR_MAX = 0x14a
+ NL80211_ATTR_MAX = 0x14c
NL80211_ATTR_MAX_CRIT_PROT_DURATION = 0xb4
NL80211_ATTR_MAX_CSA_COUNTERS = 0xce
NL80211_ATTR_MAX_MATCH_SETS = 0x85
@@ -5213,7 +5241,7 @@
NL80211_FREQUENCY_ATTR_GO_CONCURRENT = 0xf
NL80211_FREQUENCY_ATTR_INDOOR_ONLY = 0xe
NL80211_FREQUENCY_ATTR_IR_CONCURRENT = 0xf
- NL80211_FREQUENCY_ATTR_MAX = 0x20
+ NL80211_FREQUENCY_ATTR_MAX = 0x21
NL80211_FREQUENCY_ATTR_MAX_TX_POWER = 0x6
NL80211_FREQUENCY_ATTR_NO_10MHZ = 0x11
NL80211_FREQUENCY_ATTR_NO_160MHZ = 0xc
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vendor/golang.org/x/sys/windows/dll_windows.go new/vendor/golang.org/x/sys/windows/dll_windows.go
--- old/vendor/golang.org/x/sys/windows/dll_windows.go 2024-10-24 10:15:49.000000000 +0200
+++ new/vendor/golang.org/x/sys/windows/dll_windows.go 2024-10-26 10:22:52.000000000 +0200
@@ -65,7 +65,7 @@
return d, nil
}
-// MustLoadDLL is like LoadDLL but panics if load operation failes.
+// MustLoadDLL is like LoadDLL but panics if load operation fails.
func MustLoadDLL(name string) *DLL {
d, e := LoadDLL(name)
if e != nil {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vendor/modules.txt new/vendor/modules.txt
--- old/vendor/modules.txt 2024-10-24 10:15:49.000000000 +0200
+++ new/vendor/modules.txt 2024-10-26 10:22:52.000000000 +0200
@@ -129,7 +129,7 @@
# github.com/vbatts/tar-split v0.11.5
## explicit; go 1.17
github.com/vbatts/tar-split/archive/tar
-# golang.org/x/crypto v0.27.0
+# golang.org/x/crypto v0.28.0
## explicit; go 1.20
golang.org/x/crypto/bcrypt
golang.org/x/crypto/blowfish
@@ -140,7 +140,7 @@
## explicit; go 1.18
golang.org/x/sync/errgroup
golang.org/x/sync/semaphore
-# golang.org/x/sys v0.25.0
+# golang.org/x/sys v0.26.0
## explicit; go 1.18
golang.org/x/sys/unix
golang.org/x/sys/windows
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package python-nltk for openSUSE:Factory checked in at 2024-10-27 11:25:56
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-nltk (Old)
and /work/SRC/openSUSE:Factory/.python-nltk.new.2020 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-nltk"
Sun Oct 27 11:25:56 2024 rev:18 rq:1218494 version:3.9.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-nltk/python-nltk.changes 2024-07-26 16:16:30.880155750 +0200
+++ /work/SRC/openSUSE:Factory/.python-nltk.new.2020/python-nltk.changes 2024-10-27 11:26:26.233294995 +0100
@@ -1,0 +2,19 @@
+Mon Sep 30 21:17:21 UTC 2024 - Thiago Bertoldi <thiago.bertoldi(a)suse.com>
+
+- Update to to 3.9.1 (changes since 3.8.1):
+ * Fixed bug that prevented wordnet from loading
+ * Fix security vulnerability CVE-2024-39705 (breaking change)
+ * Replace pickled models (punkt, chunker, taggers) by new
+ pickle-free "_tab" packages
+ * No longer sort Wordnet synsets and relations (sort in calling
+ function when required)
+ * Only strip the last suffix in Wordnet Morphy, thus
+ restricting synsets() results
+ * Add Python 3.12 support
+ * Many other minor fixes
+- Refresh nltk_data
+- Remome upstreamed patches:
+ - CVE-2024-39705.patch
+ - nltk-pr3207-py312.patch
+
+-------------------------------------------------------------------
@@ -40 +58,0 @@
-
Old:
----
CVE-2024-39705.patch
nltk-3.8.1.tar.gz
nltk-pr3207-py312.patch
New:
----
nltk-3.9.1.tar.gz
BETA DEBUG BEGIN:
Old:- Remome upstreamed patches:
- CVE-2024-39705.patch
- nltk-pr3207-py312.patch
Old: - CVE-2024-39705.patch
- nltk-pr3207-py312.patch
BETA DEBUG END:
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-nltk.spec ++++++
--- /var/tmp/diff_new_pack.j6xt2O/_old 2024-10-27 11:26:30.593475733 +0100
+++ /var/tmp/diff_new_pack.j6xt2O/_new 2024-10-27 11:26:30.609476396 +0100
@@ -17,8 +17,9 @@
%define modname nltk
+%{?sle15_python_module_pythons}
Name: python-nltk
-Version: 3.8.1
+Version: 3.9.1
Release: 0
Summary: Natural Language Toolkit
License: Apache-2.0
@@ -61,10 +62,6 @@
# PATCH-FIX-UPSTREAM skip-networked-test.patch gh#nltk/nltk#2969 mcepl(a)suse.com
# skip tests requiring network connection
Patch0: skip-networked-test.patch
-# PATCH-FIX-UPSTREAM nltk-pr3207-py312.patch gh#nltk/nltk#3207
-Patch1: nltk-pr3207-py312.patch
-# PATCH-FIX-UPSTREAM CVE-2024-39705.patch bsc#1227174 gh#nltk/nltk#3290
-Patch2: CVE-2024-39705.patch
BuildRequires: %{python_module base >= 3.7}
BuildRequires: %{python_module pip}
BuildRequires: %{python_module setuptools}
@@ -150,7 +147,6 @@
sed -E -i "s|#![[:space:]]*%{_bindir}/env python|#!%{_bindir}/python3|" \
setup.py \
tools/global_replace.py \
- nltk_data/corpora/pl196x/splitter.py \
tools/find_deprecated.py
%autopatch -p1
++++++ nltk-3.8.1.tar.gz -> nltk-3.9.1.tar.gz ++++++
++++ 10126 lines of diff (skipped)
++++++ nltk_data.tar.xz ++++++
/work/SRC/openSUSE:Factory/python-nltk/nltk_data.tar.xz /work/SRC/openSUSE:Factory/.python-nltk.new.2020/nltk_data.tar.xz differ: char 15, line 1
++++++ skip-networked-test.patch ++++++
--- /var/tmp/diff_new_pack.j6xt2O/_old 2024-10-27 11:26:31.921530784 +0100
+++ /var/tmp/diff_new_pack.j6xt2O/_new 2024-10-27 11:26:31.953532110 +0100
@@ -34,3 +34,4 @@
license_files =
LICENSE.txt
+
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package primesieve for openSUSE:Factory checked in at 2024-10-27 11:25:55
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/primesieve (Old)
and /work/SRC/openSUSE:Factory/.primesieve.new.2020 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "primesieve"
Sun Oct 27 11:25:55 2024 rev:15 rq:1218487 version:12.5
Changes:
--------
--- /work/SRC/openSUSE:Factory/primesieve/primesieve.changes 2024-08-02 17:28:09.503336149 +0200
+++ /work/SRC/openSUSE:Factory/.primesieve.new.2020/primesieve.changes 2024-10-27 11:26:21.257088721 +0100
@@ -1,0 +2,6 @@
+Sat Oct 26 07:15:00 UTC 2024 - Kim Walisch <kim.walisch(a)gmail.com>
+
+- Update to primesieve-12.5
+- Improve thread load balancing for large number of CPU cores
+
+-------------------------------------------------------------------
Old:
----
primesieve-12.4.tar.gz
New:
----
primesieve-12.5.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ primesieve.spec ++++++
--- /var/tmp/diff_new_pack.xdWIr8/_old 2024-10-27 11:26:21.893115086 +0100
+++ /var/tmp/diff_new_pack.xdWIr8/_new 2024-10-27 11:26:21.893115086 +0100
@@ -17,7 +17,7 @@
Name: primesieve
-Version: 12.4
+Version: 12.5
Release: 0
Summary: A prime number generator
License: BSD-2-Clause
++++++ primesieve-12.4.tar.gz -> primesieve-12.5.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/primesieve-12.4/CMakeLists.txt new/primesieve-12.5/CMakeLists.txt
--- old/primesieve-12.4/CMakeLists.txt 2024-07-29 17:21:07.000000000 +0200
+++ new/primesieve-12.5/CMakeLists.txt 2024-10-22 11:25:56.000000000 +0200
@@ -1,7 +1,7 @@
cmake_minimum_required(VERSION 3.4...3.27)
project(primesieve CXX)
-set(PRIMESIEVE_VERSION "12.4")
-set(PRIMESIEVE_SOVERSION "12.4.0")
+set(PRIMESIEVE_VERSION "12.5")
+set(PRIMESIEVE_SOVERSION "12.5.0")
# Build options ######################################################
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/primesieve-12.4/ChangeLog new/primesieve-12.5/ChangeLog
--- old/primesieve-12.4/ChangeLog 2024-07-29 17:21:07.000000000 +0200
+++ new/primesieve-12.5/ChangeLog 2024-10-22 11:25:56.000000000 +0200
@@ -1,3 +1,8 @@
+Changes in version 12.5, 22/10/2024
+===================================
+
+* Improve thread load balancing for large number of CPU cores.
+
Changes in version 12.4, 22/06/2024
===================================
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/primesieve-12.4/include/primesieve.h new/primesieve-12.5/include/primesieve.h
--- old/primesieve-12.4/include/primesieve.h 2024-07-29 17:21:07.000000000 +0200
+++ new/primesieve-12.5/include/primesieve.h 2024-10-22 11:25:56.000000000 +0200
@@ -15,9 +15,9 @@
#ifndef PRIMESIEVE_H
#define PRIMESIEVE_H
-#define PRIMESIEVE_VERSION "12.4"
+#define PRIMESIEVE_VERSION "12.5"
#define PRIMESIEVE_VERSION_MAJOR 12
-#define PRIMESIEVE_VERSION_MINOR 4
+#define PRIMESIEVE_VERSION_MINOR 5
#include <primesieve/iterator.h>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/primesieve-12.4/include/primesieve.hpp new/primesieve-12.5/include/primesieve.hpp
--- old/primesieve-12.4/include/primesieve.hpp 2024-07-29 17:21:07.000000000 +0200
+++ new/primesieve-12.5/include/primesieve.hpp 2024-10-22 11:25:56.000000000 +0200
@@ -13,9 +13,9 @@
#ifndef PRIMESIEVE_HPP
#define PRIMESIEVE_HPP
-#define PRIMESIEVE_VERSION "12.4"
+#define PRIMESIEVE_VERSION "12.5"
#define PRIMESIEVE_VERSION_MAJOR 12
-#define PRIMESIEVE_VERSION_MINOR 4
+#define PRIMESIEVE_VERSION_MINOR 5
#include <primesieve/iterator.hpp>
#include <primesieve/primesieve_error.hpp>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/primesieve-12.4/src/ParallelSieve.cpp new/primesieve-12.5/src/ParallelSieve.cpp
--- old/primesieve-12.4/src/ParallelSieve.cpp 2024-07-29 17:21:07.000000000 +0200
+++ new/primesieve-12.5/src/ParallelSieve.cpp 2024-10-22 11:25:56.000000000 +0200
@@ -2,7 +2,7 @@
/// @file ParallelSieve.cpp
/// @brief Multi-threaded prime sieve using std::async.
///
-/// Copyright (C) 2023 Kim Walisch, <kim.walisch(a)gmail.com>
+/// Copyright (C) 2024 Kim Walisch, <kim.walisch(a)gmail.com>
///
/// This file is distributed under the BSD License. See the COPYING
/// file in the top level directory.
@@ -83,7 +83,7 @@
ASSERT(getDistance() > 0);
uint64_t dist = getDistance();
- uint64_t balanced = isqrt(stop_) * 1000;
+ uint64_t balanced = isqrt(stop_) * 200;
uint64_t unbalanced = dist / threads;
uint64_t fastest = std::min(balanced, unbalanced);
uint64_t iters = dist / fastest;
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package python-et_xmlfile for openSUSE:Factory checked in at 2024-10-27 11:25:54
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-et_xmlfile (Old)
and /work/SRC/openSUSE:Factory/.python-et_xmlfile.new.2020 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-et_xmlfile"
Sun Oct 27 11:25:54 2024 rev:5 rq:1218491 version:1.0.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-et_xmlfile/python-et_xmlfile.changes 2023-05-26 20:14:17.639840843 +0200
+++ /work/SRC/openSUSE:Factory/.python-et_xmlfile.new.2020/python-et_xmlfile.changes 2024-10-27 11:26:20.449055227 +0100
@@ -1,0 +2,5 @@
+Thu Sep 26 18:03:11 UTC 2024 - Guang Yee <gyee(a)suse.com>
+
+- Enable sle15_python_module_pythons.
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-et_xmlfile.spec ++++++
--- /var/tmp/diff_new_pack.jKlhVI/_old 2024-10-27 11:26:21.005078275 +0100
+++ /var/tmp/diff_new_pack.jKlhVI/_new 2024-10-27 11:26:21.009078441 +0100
@@ -16,6 +16,7 @@
#
+%{?sle15_python_module_pythons}
Name: python-et_xmlfile
Version: 1.0.1
Release: 0
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package python-ncclient for openSUSE:Factory checked in at 2024-10-27 11:25:53
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-ncclient (Old)
and /work/SRC/openSUSE:Factory/.python-ncclient.new.2020 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-ncclient"
Sun Oct 27 11:25:53 2024 rev:22 rq:1218489 version:0.6.15
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-ncclient/python-ncclient.changes 2024-02-28 19:47:20.746303045 +0100
+++ /work/SRC/openSUSE:Factory/.python-ncclient.new.2020/python-ncclient.changes 2024-10-27 11:26:19.465014436 +0100
@@ -1,0 +2,6 @@
+Fri Oct 25 22:17:02 UTC 2024 - Matej Cepl <mcepl(a)cepl.eu>
+
+- Add intersphinx-mapping.patch to allow working with Sphinx >=
+ 8.* (gh#ncclient/ncclient#604).
+
+-------------------------------------------------------------------
New:
----
intersphinx-mapping.patch
BETA DEBUG BEGIN:
New:
- Add intersphinx-mapping.patch to allow working with Sphinx >=
8.* (gh#ncclient/ncclient#604).
BETA DEBUG END:
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-ncclient.spec ++++++
--- /var/tmp/diff_new_pack.8G9T3N/_old 2024-10-27 11:26:19.897032344 +0100
+++ /var/tmp/diff_new_pack.8G9T3N/_new 2024-10-27 11:26:19.901032510 +0100
@@ -26,6 +26,9 @@
# PATCH-FIX-OPENSUSE allow_old_sphinx.patch mcepl(a)suse.com
# Allow build with old Sphinx (< 2.0) on Leap
Patch0: allow_old_sphinx.patch
+# PATCH-FIX-UPSTREAM intersphinx-mapping.patch gh#ncclient/ncclient#604 mcepl(a)suse.com
+# use conditionally new form of intersphinx_mapping
+Patch1: intersphinx-mapping.patch
BuildRequires: %{python_module setuptools}
BuildRequires: fdupes
BuildRequires: python-rpm-macros
@@ -58,8 +61,9 @@
%prep
%setup -q -n ncclient-%{version}
%if 0%{?suse_version} < 1550
-%patch -P 0 -p 1
+%patch -p 1 -P 0
%endif
+%patch -p 1 -P 1
find examples/ -name "*.py" -exec sed -i 's|#!/usr/bin/env python$|#!/usr/bin/python|g' {} \;
# drop shebang
++++++ intersphinx-mapping.patch ++++++
---
docs/source/conf.py | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
--- a/docs/source/conf.py
+++ b/docs/source/conf.py
@@ -12,6 +12,7 @@
# serve to show the default.
import sys, os
+import sphinx
# If extensions (or modules to document with autodoc) are in another directory,
# add these directories to sys.path here. If the directory is relative to the
@@ -196,6 +197,9 @@ latex_logo = "_static/logo.png"
# Example configuration for intersphinx: refer to the Python standard library.
-intersphinx_mapping = {'http://docs.python.org/': None}
+if sphinx.version_info[0] < 8:
+ intersphinx_mapping = {"http://docs.python.org/": None}
+else:
+ intersphinx_mapping = {'python': ('https://docs.python.org/', None)}
autoclass_content = 'both'
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package apache-arrow for openSUSE:Factory checked in at 2024-10-27 11:25:51
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/apache-arrow (Old)
and /work/SRC/openSUSE:Factory/.apache-arrow.new.2020 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "apache-arrow"
Sun Oct 27 11:25:51 2024 rev:15 rq:1218457 version:17.0.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/apache-arrow/apache-arrow.changes 2024-09-22 11:06:08.740913237 +0200
+++ /work/SRC/openSUSE:Factory/.apache-arrow.new.2020/apache-arrow.changes 2024-10-27 11:26:18.440971987 +0100
@@ -1,0 +2,6 @@
+Fri Sep 27 05:31:41 UTC 2024 - Guang Yee <gyee(a)suse.com>
+
+- Set the appropriate C++ complier for the given platform so
+ it will compile on Leap 15.x.
+
+-------------------------------------------------------------------
--- /work/SRC/openSUSE:Factory/apache-arrow/python-pyarrow.changes 2024-08-16 12:24:16.908607615 +0200
+++ /work/SRC/openSUSE:Factory/.apache-arrow.new.2020/python-pyarrow.changes 2024-10-27 11:26:18.540976133 +0100
@@ -1,0 +2,5 @@
+Thu Sep 26 23:24:22 UTC 2024 - Guang Yee <gyee(a)suse.com>
+
+- Enable sle15_python_module_pythons.
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ apache-arrow.spec ++++++
--- /var/tmp/diff_new_pack.9xa6bQ/_old 2024-10-27 11:26:19.225004487 +0100
+++ /var/tmp/diff_new_pack.9xa6bQ/_new 2024-10-27 11:26:19.225004487 +0100
@@ -22,6 +22,11 @@
# Required for runtime dispatch, not yet packaged
%bcond_with xsimd
+%if %{suse_version} <= 1500
+# requires __has_builtin with keywords
+%define gccver 13
+%endif
+
%define sonum 1700
# See git submodule /testing pointing to the correct revision
%define arrow_testing_commit 735ae7128d571398dd798d7ff004adebeb342883
@@ -44,7 +49,7 @@
BuildRequires: cmake >= 3.16
BuildRequires: fdupes
BuildRequires: flex
-BuildRequires: gcc-c++
+BuildRequires: gcc%{?gccver}-c++
BuildRequires: libboost_filesystem-devel
BuildRequires: libboost_process-devel
BuildRequires: libboost_system-devel >= 1.64.0
@@ -332,6 +337,8 @@
sed -i 's/find_package(Protobuf/find_package(Protobuf CONFIG/' cpp/cmake_modules/FindProtobufAlt.cmake
%build
+%{?gccver:export CXX=g++-%{gccver}}
+%{?gccver:export CC=gcc-%{gccver}}
export CFLAGS="%{optflags} -ffat-lto-objects"
export CXXFLAGS="%{optflags} -ffat-lto-objects"
++++++ python-pyarrow.spec ++++++
--- /var/tmp/diff_new_pack.9xa6bQ/_old 2024-10-27 11:26:19.257005814 +0100
+++ /var/tmp/diff_new_pack.9xa6bQ/_new 2024-10-27 11:26:19.261005980 +0100
@@ -16,10 +16,15 @@
#
+%{?sle15_python_module_pythons}
%bcond_with xsimd
%define plainpython python
# See git submodule /testing pointing to the correct revision
%define arrow_testing_commit 735ae7128d571398dd798d7ff004adebeb342883
+%if %{suse_version} <= 1500
+# requires __has_builtin with keywords
+%define gccver 13
+%endif
Name: python-pyarrow
Version: 17.0.0
Release: 0
@@ -41,7 +46,7 @@
BuildRequires: %{python_module wheel}
BuildRequires: cmake
BuildRequires: fdupes
-BuildRequires: gcc-c++
+BuildRequires: gcc%{?gccver}-c++
BuildRequires: openssl-devel
BuildRequires: pkgconfig
BuildRequires: python-rpm-macros
@@ -98,6 +103,8 @@
%build
pushd python
+%{?gccver:export CXX=g++-%{gccver}}
+%{?gccver:export CC=gcc-%{gccver}}
export CFLAGS="%{optflags}"
export PYARROW_BUILD_TYPE=relwithdebinfo
export PYARROW_BUILD_VERBOSE=1
@@ -126,6 +133,8 @@
popd
%check
+%{?gccver:export CXX=g++-%{gccver}}
+%{?gccver:export CC=gcc-%{gccver}}
export ARROW_TEST_DATA="${PWD}/arrow-testing-%{arrow_testing_commit}/data"
# flaky tests
donttest="test_total_bytes_allocated"
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package python-XlsxWriter for openSUSE:Factory checked in at 2024-10-27 11:25:45
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-XlsxWriter (Old)
and /work/SRC/openSUSE:Factory/.python-XlsxWriter.new.2020 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-XlsxWriter"
Sun Oct 27 11:25:45 2024 rev:18 rq:1218456 version:3.2.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-XlsxWriter/python-XlsxWriter.changes 2024-03-17 22:16:29.905475703 +0100
+++ /work/SRC/openSUSE:Factory/.python-XlsxWriter.new.2020/python-XlsxWriter.changes 2024-10-27 11:26:15.188837180 +0100
@@ -1,0 +2,5 @@
+Thu Sep 26 21:59:20 UTC 2024 - Yogalakshmi Arunachalam <yarunachalam(a)suse.com>
+
+- Fixed %{?sle15_python_module_pythons}
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-XlsxWriter.spec ++++++
--- /var/tmp/diff_new_pack.gD5LXh/_old 2024-10-27 11:26:15.712858902 +0100
+++ /var/tmp/diff_new_pack.gD5LXh/_new 2024-10-27 11:26:15.716859068 +0100
@@ -16,7 +16,7 @@
#
-%{?!python_module:%define python_module() python-%{**} python3-%{**}}
+%{?sle15_python_module_pythons}
%define oldpython python
Name: python-XlsxWriter
Version: 3.2.0
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package python-pypandoc for openSUSE:Factory checked in at 2024-10-27 11:25:43
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-pypandoc (Old)
and /work/SRC/openSUSE:Factory/.python-pypandoc.new.2020 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-pypandoc"
Sun Oct 27 11:25:43 2024 rev:11 rq:1218454 version:1.14
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-pypandoc/python-pypandoc.changes 2024-10-18 15:59:18.788456972 +0200
+++ /work/SRC/openSUSE:Factory/.python-pypandoc.new.2020/python-pypandoc.changes 2024-10-27 11:26:14.488808162 +0100
@@ -1,0 +2,5 @@
+Fri Oct 25 20:02:10 UTC 2024 - Earl Sampson <esampson(a)suse.com>
+
+- enable sle15_python_module_pythons
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-pypandoc.spec ++++++
--- /var/tmp/diff_new_pack.YOSalq/_old 2024-10-27 11:26:14.952827397 +0100
+++ /var/tmp/diff_new_pack.YOSalq/_new 2024-10-27 11:26:14.956827563 +0100
@@ -17,6 +17,7 @@
%define base_name pypandoc
+%{?sle15_python_module_pythons}
Name: python-pypandoc
Version: 1.14
Release: 0
1
0