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
July 2024
- 1 participants
- 1521 discussions
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package tik-osimage-Aeon for openSUSE:Factory checked in at 2024-07-25 15:39:13
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/tik-osimage-Aeon (Old)
and /work/SRC/openSUSE:Factory/.tik-osimage-Aeon.new.1882 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "tik-osimage-Aeon"
Thu Jul 25 15:39:13 2024 rev:4 rq:1189389 version:0.1.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/tik-osimage-Aeon/tik-osimage-Aeon.changes 2024-05-22 21:32:47.258660848 +0200
+++ /work/SRC/openSUSE:Factory/.tik-osimage-Aeon.new.1882/tik-osimage-Aeon.changes 2024-07-25 16:03:18.941360291 +0200
@@ -1,0 +2,7 @@
+Wed Jul 24 12:42:51 UTC 2024 - Richard Brown <rbrown(a)suse.com>
+
+- Stop populating ESP on image build, done by installer
+- Use "openSUSE-less" branding
+- Make minimal ESP size as resizing done by installer
+
+-------------------------------------------------------------------
Old:
----
disk.sh
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ tik-osimage-Aeon.kiwi ++++++
--- /var/tmp/diff_new_pack.ycXwtq/_old 2024-07-25 16:03:19.409379201 +0200
+++ /var/tmp/diff_new_pack.ycXwtq/_new 2024-07-25 16:03:19.413379363 +0200
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
-<image schemaversion="7.6" name="tik-osimage-openSUSE-Aeon" displayname="openSUSE Aeon">
+<image schemaversion="7.6" name="tik-osimage-Aeon" displayname="Aeon">
<description type="system">
<author>Richard Brown</author>
<contact>rbrownsuse(a)opensuse.org</contact>
- <specification>openSUSE Aeon</specification>
+ <specification>Aeon</specification>
</description>
<preferences>
<version>0.1.0</version>
@@ -17,7 +17,7 @@
firmware="uefi"
bootpartition="false"
initrd_system="none"
- efipartsize="4000"
+ efipartsize="0"
bootkernel="custom"
devicepersistency="by-uuid"
btrfs_root_is_subvolume="true"
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package testssl.sh for openSUSE:Factory checked in at 2024-07-25 15:40:12
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/testssl.sh (Old)
and /work/SRC/openSUSE:Factory/.testssl.sh.new.1882 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "testssl.sh"
Thu Jul 25 15:40:12 2024 rev:11 rq:1189604 version:3.0.9
Changes:
--------
--- /work/SRC/openSUSE:Factory/testssl.sh/testssl.sh.changes 2024-02-27 22:47:41.973121903 +0100
+++ /work/SRC/openSUSE:Factory/.testssl.sh.new.1882/testssl.sh.changes 2024-07-25 16:03:04.544779489 +0200
@@ -1,0 +2,18 @@
+Wed Jul 24 06:52:48 UTC 2024 - Martin Hauke <mardnh(a)gmx.de>
+
+- Update to version 3.0.9
+ * Fix bash 5 issue when encountering a short server key extension
+ * Fix HTML issue when using bash 5
+ * CAA DNS records are now not being queried when nodns is set
+ * MongoDB identification fix
+ * Sanity check when user has broken umask to avoid runtime errors
+ * Fix for newer grep versions
+ * Address weird globbing in bash 3.0
+ * Fix regexp in STARTTLS detection
+ * Secure renegotiation fix: SNI
+ * Ensure control chars from HTTP header don't end up in html,csv
+ or json
+ * Add sha1WithRSA to sha1WithRSAEncryption for certificates
+ * Fix potential infinite loop in run_pfs()
+
+-------------------------------------------------------------------
Old:
----
testssl.sh-3.0.8.tar.gz
New:
----
testssl.sh-3.0.9.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ testssl.sh.spec ++++++
--- /var/tmp/diff_new_pack.9rZeh2/_old 2024-07-25 16:03:08.916955579 +0200
+++ /var/tmp/diff_new_pack.9rZeh2/_new 2024-07-25 16:03:08.920955741 +0200
@@ -1,7 +1,7 @@
#
# spec file for package testssl.sh
#
-# Copyright (c) 2022 SUSE LLC
+# Copyright (c) 2024 SUSE LLC
# Copyright (c) 2018 Matthias Fehring <buschmann23(a)opensuse.org>
#
# All modifications and additions to the file contributed by third parties
@@ -20,7 +20,7 @@
%define _data_dir_name testssl-sh
Name: testssl.sh
-Version: 3.0.8
+Version: 3.0.9
Release: 0
Summary: Testing TLS/SSL Encryption Anywhere On Any Port
License: GPL-2.0-or-later
++++++ testssl.sh-3.0.8.tar.gz -> testssl.sh-3.0.9.tar.gz ++++++
/work/SRC/openSUSE:Factory/testssl.sh/testssl.sh-3.0.8.tar.gz /work/SRC/openSUSE:Factory/.testssl.sh.new.1882/testssl.sh-3.0.9.tar.gz differ: char 13, line 1
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package terragrunt for openSUSE:Factory checked in at 2024-07-25 15:39:27
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/terragrunt (Old)
and /work/SRC/openSUSE:Factory/.terragrunt.new.1882 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "terragrunt"
Thu Jul 25 15:39:27 2024 rev:142 rq:1189501 version:0.63.6
Changes:
--------
--- /work/SRC/openSUSE:Factory/terragrunt/terragrunt.changes 2024-07-25 12:11:34.224480730 +0200
+++ /work/SRC/openSUSE:Factory/.terragrunt.new.1882/terragrunt.changes 2024-07-25 16:02:58.568538795 +0200
@@ -1,0 +2,21 @@
+Thu Jul 25 05:22:22 UTC 2024 - opensuse_buildservice(a)ojkastl.de
+
+- Update to version 0.63.6:
+ * Fixing generation of `provider_installation` block used for
+ provider caching (#3290)
+
+-------------------------------------------------------------------
+Wed Jul 24 17:46:40 UTC 2024 - opensuse_buildservice(a)ojkastl.de
+
+- Update to version 0.63.5:
+ * Add support for engine downloading (#3281)
+
+-------------------------------------------------------------------
+Wed Jul 24 17:42:19 UTC 2024 - opensuse_buildservice(a)ojkastl.de
+
+- Update to version 0.63.4:
+ * 3274 - fix: Include nothing when value for
+ `terragrunt-include-dir` doesn't exist on the filesystem
+ (#3286)
+
+-------------------------------------------------------------------
Old:
----
terragrunt-0.63.3.obscpio
New:
----
terragrunt-0.63.6.obscpio
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ terragrunt.spec ++++++
--- /var/tmp/diff_new_pack.By4x21/_old 2024-07-25 16:03:01.856671225 +0200
+++ /var/tmp/diff_new_pack.By4x21/_new 2024-07-25 16:03:01.860671386 +0200
@@ -19,7 +19,7 @@
%define __arch_install_post export NO_BRP_STRIP_DEBUG=true
Name: terragrunt
-Version: 0.63.3
+Version: 0.63.6
Release: 0
Summary: Thin wrapper for Terraform for working with multiple Terraform modules
License: MIT
++++++ _service ++++++
--- /var/tmp/diff_new_pack.By4x21/_old 2024-07-25 16:03:01.920673803 +0200
+++ /var/tmp/diff_new_pack.By4x21/_new 2024-07-25 16:03:01.924673964 +0200
@@ -3,7 +3,7 @@
<param name="url">https://github.com/gruntwork-io/terragrunt</param>
<param name="scm">git</param>
<param name="exclude">.git</param>
- <param name="revision">v0.63.3</param>
+ <param name="revision">v0.63.6</param>
<param name="versionformat">@PARENT_TAG@</param>
<param name="changesgenerate">enable</param>
<param name="versionrewrite-pattern">v(.*)</param>
++++++ _servicedata ++++++
--- /var/tmp/diff_new_pack.By4x21/_old 2024-07-25 16:03:01.948674931 +0200
+++ /var/tmp/diff_new_pack.By4x21/_new 2024-07-25 16:03:01.952675092 +0200
@@ -1,6 +1,6 @@
<servicedata>
<service name="tar_scm">
<param name="url">https://github.com/gruntwork-io/terragrunt</param>
- <param name="changesrevision">358ec76177f1e7f22aac400fd7c5f57901562d1c</param></service></servicedata>
+ <param name="changesrevision">98b60321ea5d65acb2ae28b492ca71a17171227d</param></service></servicedata>
(No newline at EOF)
++++++ terragrunt-0.63.3.obscpio -> terragrunt-0.63.6.obscpio ++++++
/work/SRC/openSUSE:Factory/terragrunt/terragrunt-0.63.3.obscpio /work/SRC/openSUSE:Factory/.terragrunt.new.1882/terragrunt-0.63.6.obscpio differ: char 49, line 1
++++++ terragrunt.obsinfo ++++++
--- /var/tmp/diff_new_pack.By4x21/_old 2024-07-25 16:03:01.992676703 +0200
+++ /var/tmp/diff_new_pack.By4x21/_new 2024-07-25 16:03:01.996676864 +0200
@@ -1,5 +1,5 @@
name: terragrunt
-version: 0.63.3
-mtime: 1721681479
-commit: 358ec76177f1e7f22aac400fd7c5f57901562d1c
+version: 0.63.6
+mtime: 1721842187
+commit: 98b60321ea5d65acb2ae28b492ca71a17171227d
++++++ vendor.tar.gz ++++++
/work/SRC/openSUSE:Factory/terragrunt/vendor.tar.gz /work/SRC/openSUSE:Factory/.terragrunt.new.1882/vendor.tar.gz differ: char 33, line 1
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package swayimg for openSUSE:Factory checked in at 2024-07-25 15:39:05
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/swayimg (Old)
and /work/SRC/openSUSE:Factory/.swayimg.new.1882 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "swayimg"
Thu Jul 25 15:39:05 2024 rev:7 rq:1189366 version:2.5
Changes:
--------
--- /work/SRC/openSUSE:Factory/swayimg/swayimg.changes 2024-07-16 22:02:56.683009575 +0200
+++ /work/SRC/openSUSE:Factory/.swayimg.new.1882/swayimg.changes 2024-07-25 16:02:30.983427800 +0200
@@ -1,0 +2,10 @@
+Wed Jul 24 11:07:01 UTC 2024 - Muhammad Akbar Yanuar Mantari <mantarimay(a)pm.me>
+
+- Update to version 2.5
+ * Added gallery mode;
+ * Added animation support for JXL format;
+ * Improved mouse drag usability;
+ * Some bugs fixed, some added.
+- add additional tests, for now only failed on heif and avif files
+
+-------------------------------------------------------------------
Old:
----
swayimg-2.4.tar.gz
New:
----
swayimg-2.5.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ swayimg.spec ++++++
--- /var/tmp/diff_new_pack.FSTdWH/_old 2024-07-25 16:02:31.867463405 +0200
+++ /var/tmp/diff_new_pack.FSTdWH/_new 2024-07-25 16:02:31.867463405 +0200
@@ -16,8 +16,9 @@
#
+%bcond_with test
Name: swayimg
-Version: 2.4
+Version: 2.5
Release: 0
Summary: Image viewer for Sway/Wayland
License: MIT
@@ -64,12 +65,20 @@
-Dexr=disabled \
-Djxl=disabled \
%endif
+%if %{with test}
+ -Dtests=enabled \
+%endif
-Dversion=%{version}
%meson_build
%install
%meson_install
+%if %{with test}
+%check
+%meson_test
+%endif
+
%files
%license LICENSE
%doc README.md
++++++ swayimg-2.4.tar.gz -> swayimg-2.5.tar.gz ++++++
++++ 5382 lines of diff (skipped)
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package sslscan for openSUSE:Factory checked in at 2024-07-25 15:40:14
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/sslscan (Old)
and /work/SRC/openSUSE:Factory/.sslscan.new.1882 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "sslscan"
Thu Jul 25 15:40:14 2024 rev:19 rq:1189590 version:2.1.4
Changes:
--------
--- /work/SRC/openSUSE:Factory/sslscan/sslscan.changes 2024-02-26 19:50:57.325978730 +0100
+++ /work/SRC/openSUSE:Factory/.sslscan.new.1882/sslscan.changes 2024-07-25 16:02:19.558967679 +0200
@@ -1,0 +2,6 @@
+Thu Jul 25 09:38:59 UTC 2024 - Dirk Müller <dmueller(a)suse.com>
+
+- update to 2.1.4:
+ * Display the full cert chain --show-certificates
+
+-------------------------------------------------------------------
Old:
----
sslscan-2.1.3.tar.gz
New:
----
sslscan-2.1.4.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ sslscan.spec ++++++
--- /var/tmp/diff_new_pack.eq0ND9/_old 2024-07-25 16:02:20.042987173 +0200
+++ /var/tmp/diff_new_pack.eq0ND9/_new 2024-07-25 16:02:20.046987334 +0200
@@ -17,7 +17,7 @@
Name: sslscan
-Version: 2.1.3
+Version: 2.1.4
Release: 0
Summary: SSL cipher scanning tool
License: SUSE-GPL-3.0+-with-openssl-exception
++++++ sslscan-2.1.3.tar.gz -> sslscan-2.1.4.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sslscan-2.1.3/Changelog new/sslscan-2.1.4/Changelog
--- old/sslscan-2.1.3/Changelog 2024-01-21 14:41:31.000000000 +0100
+++ new/sslscan-2.1.4/Changelog 2024-06-16 19:49:50.000000000 +0200
@@ -1,5 +1,11 @@
Changelog
=========
+Version: 2.1.4
+Date : 16/06/2024
+Author : rbsec <robin(a)rbsec.net>
+Changes: The following are a list of changes
+ > Display the full cert chain --show-certificates (credit fhtino)
+
Version: 2.1.3
Date : 21/01/2024
Author : rbsec <robin(a)rbsec.net>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sslscan-2.1.3/Makefile new/sslscan-2.1.4/Makefile
--- old/sslscan-2.1.3/Makefile 2024-01-21 14:41:31.000000000 +0100
+++ new/sslscan-2.1.4/Makefile 2024-06-16 19:49:50.000000000 +0200
@@ -35,7 +35,11 @@
# for dynamic linking
LIBS = -lssl -lcrypto
ifneq ($(OS), FreeBSD)
+ifneq ($(findstring MINGW64,$(OS)),MINGW64)
LIBS += -ldl
+else
+ LIBS += -lwsock32 -lWs2_32
+endif
endif
ifeq ($(OS), SunOS)
CFLAGS += -m64
@@ -50,7 +54,13 @@
# Don't enable some hardening flags on OS X because it uses an old version of Clang
ifneq ($(OS), Darwin)
ifneq ($(OS), SunOS)
+ifneq ($(findstring CYGWIN,$(OS)),CYGWIN)
+ifneq ($(findstring MINGW64,$(OS)),MINGW64)
LDFLAGS += -pie -z relro -z now
+else
+ LDFLAGS += -pie
+endif
+endif
endif
endif
@@ -68,8 +78,10 @@
LIBS = -lssl -lcrypto -lz -lpthread
endif
ifneq ($(OS), FreeBSD)
+ifneq ($(findstring CYGWIN,$(OS)),CYGWIN)
LIBS += -ldl
endif
+endif
ifeq ($(OS), SunOS)
LIBS += -lsocket -lnsl
endif
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sslscan-2.1.3/README.md new/sslscan-2.1.4/README.md
--- old/sslscan-2.1.3/README.md 2024-01-21 14:41:31.000000000 +0100
+++ new/sslscan-2.1.4/README.md 2024-06-16 19:49:50.000000000 +0200
@@ -30,7 +30,8 @@
[![ci](https://github.com/rbsec/sslscan/actions/workflows/ci.yml/badge.svg)](https://github.com/rbsec/sslscan/actions/workflows/ci.yml)
-This is a fork of ioerror's version of sslscan (the original readme of which is included below).
+This is a fork of ioerror's version of sslscan (the original readme of which is included below) by rbsec (robin(a)rbsec.net)
+
Key changes are as follows:
* Highlight SSLv2 and SSLv3 ciphers in output.
@@ -71,6 +72,7 @@
* Check for supported key exchange groups.
* Check for supported server signature algorithms.
* Display IANA/RFC cipher names `--iana-names`
+* Display the full certifiate chain `--show-certificates`
### Building on Linux
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sslscan-2.1.3/sslscan.1 new/sslscan-2.1.4/sslscan.1
--- old/sslscan-2.1.3/sslscan.1 2024-01-21 14:41:31.000000000 +0100
+++ new/sslscan-2.1.4/sslscan.1 2024-06-16 19:49:50.000000000 +0200
@@ -48,6 +48,10 @@
.B \-\-show\-certificate
Display certificate information.
.TP
+.B \-\-show\-certificates
+Display the full certificate chain.
+.TP
+.B \-\-no\-check\-certificate
.B \-\-no\-check\-certificate
Don't flag certificates signed with weak algorithms (MD5 and SHA-1) or short (<2048 bit) RSA keys
.TP
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sslscan-2.1.3/sslscan.c new/sslscan-2.1.4/sslscan.c
--- old/sslscan-2.1.3/sslscan.c 2024-01-21 14:41:31.000000000 +0100
+++ new/sslscan-2.1.4/sslscan.c 2024-06-16 19:49:50.000000000 +0200
@@ -2814,186 +2814,204 @@
BIO_set_fp(fileBIO, options->xmlOutput, BIO_NOCLOSE);
}
- // Get Certificate...
- printf("\n %sSSL Certificate:%s\n", COL_BLUE, RESET);
- printf_xml(" <certificate type=\"full\">\n");
- x509Cert = SSL_get_peer_certificate(ssl);
- if (x509Cert != NULL)
- {
+ // Get certificate(s) chain
+ STACK_OF(X509) *certificatesChain;
- // Print a base64 blob version of the cert
- printf(" Certificate blob:\n");
- PEM_write_bio_X509(stdoutBIO,x509Cert);
- if (options->xmlOutput)
- {
- printf_xml(" <certificate-blob>\n");
- PEM_write_bio_X509(fileBIO,x509Cert);
- printf_xml(" </certificate-blob>\n");
- }
+ if (options->showCertificates == true)
+ {
+ certificatesChain = SSL_get_peer_cert_chain(ssl);
+ }
+ else
+ {
+ X509 *peerCertificate = SSL_get_peer_certificate(ssl);
+ certificatesChain = sk_X509_new_null();
+ sk_X509_push(certificatesChain, peerCertificate);
+ }
- //SSL_set_verify(ssl, SSL_VERIFY_NONE|SSL_VERIFY_CLIENT_ONCE, NULL);
+ for (int cert_index = 0; cert_index < sk_X509_num(certificatesChain); cert_index++)
+ {
+ // Get Certificate...
+ printf("\n %sSSL Certificate: %s\n", COL_BLUE, RESET);
+ printf_xml(" <certificate type=\"full\">\n");
- //X509_print_ex(bp, x509Cert, 0, 0);
+ x509Cert = sk_X509_value(certificatesChain, cert_index);
- // Cert Version
- if (!(X509_FLAG_COMPAT & X509_FLAG_NO_VERSION))
+ if (x509Cert != NULL)
{
- tempLong = X509_get_version(x509Cert);
- printf(" Version: %lu\n", tempLong);
- printf_xml(" <version>%lu</version>\n", tempLong);
- }
- // Cert Serial No. - Code adapted from OpenSSL's crypto/asn1/t_x509.c
- if (!(X509_FLAG_COMPAT & X509_FLAG_NO_SERIAL))
- {
- ASN1_INTEGER *bs;
- BIO *bp;
- BIO *xml_bp;
- bp = BIO_new_fp(stdout, BIO_NOCLOSE);
+ // Print a base64 blob version of the cert
+ printf(" Certificate blob:\n");
+ PEM_write_bio_X509(stdoutBIO,x509Cert);
if (options->xmlOutput)
- xml_bp = BIO_new_fp(options->xmlOutput, BIO_NOCLOSE);
- long l;
- int i;
- const char *neg;
- bs=X509_get_serialNumber(x509Cert);
+ {
+ printf_xml(" <certificate-blob>\n");
+ PEM_write_bio_X509(fileBIO,x509Cert);
+ printf_xml(" </certificate-blob>\n");
+ }
- if (BIO_write(bp," Serial Number:",18) <= 0)
- return(1);
+ // SSL_set_verify(ssl, SSL_VERIFY_NONE|SSL_VERIFY_CLIENT_ONCE, NULL);
- if (bs->length <= 4)
+ // X509_print_ex(bp, x509Cert, 0, 0);
+
+ // Cert Version
+ if (!(X509_FLAG_COMPAT & X509_FLAG_NO_VERSION))
{
- l=ASN1_INTEGER_get(bs);
- if (l < 0)
- {
- l= -l;
- neg="-";
- }
- else
- neg="";
- if (BIO_printf(bp," %s%lu (%s0x%lx)\n",neg,l,neg,l) <= 0)
- return(1);
- if (options->xmlOutput)
- if (BIO_printf(xml_bp," <serial>%s%lu (%s0x%lx)</serial>\n",neg,l,neg,l) <= 0)
- return(1);
+ tempLong = X509_get_version(x509Cert);
+ printf(" Version: %lu\n", tempLong);
+ printf_xml(" <version>%lu</version>\n", tempLong);
}
- else
+
+ // Cert Serial No. - Code adapted from OpenSSL's crypto/asn1/t_x509.c
+ if (!(X509_FLAG_COMPAT & X509_FLAG_NO_SERIAL))
{
- neg=(bs->type == V_ASN1_NEG_INTEGER)?" (Negative)":"";
- if (BIO_printf(bp,"%1s%s","",neg) <= 0)
+ ASN1_INTEGER *bs;
+ BIO *bp;
+ BIO *xml_bp;
+ bp = BIO_new_fp(stdout, BIO_NOCLOSE);
+ if (options->xmlOutput)
+ xml_bp = BIO_new_fp(options->xmlOutput, BIO_NOCLOSE);
+ long l;
+ int i;
+ const char *neg;
+ bs=X509_get_serialNumber(x509Cert);
+
+ if (BIO_write(bp," Serial Number:",18) <= 0)
return(1);
- if (options->xmlOutput)
- if (BIO_printf(xml_bp," <serial>") <= 0)
+ if (bs->length <= 4)
+ {
+ l=ASN1_INTEGER_get(bs);
+ if (l < 0)
+ {
+ l= -l;
+ neg="-";
+ }
+ else
+ neg="";
+ if (BIO_printf(bp," %s%lu (%s0x%lx)\n",neg,l,neg,l) <= 0)
return(1);
-
- for (i=0; i<bs->length; i++)
+ if (options->xmlOutput)
+ if (BIO_printf(xml_bp," <serial>%s%lu (%s0x%lx)</serial>\n",neg,l,neg,l) <= 0)
+ return(1);
+ }
+ else
{
- if (BIO_printf(bp,"%02x%c",bs->data[i],
- ((i+1 == bs->length)?'\n':':')) <= 0)
+ neg=(bs->type == V_ASN1_NEG_INTEGER)?" (Negative)":"";
+ if (BIO_printf(bp,"%1s%s","",neg) <= 0)
return(1);
- if (options->xmlOutput) {
- if (i+1 == bs->length)
- {
- if (BIO_printf(xml_bp,"%02x",bs->data[i]) <= 0)
- return(1);
- }
- else
- {
- if (BIO_printf(xml_bp,"%02x%c",bs->data[i], ':') <= 0)
- return(1);
+
+ if (options->xmlOutput)
+ if (BIO_printf(xml_bp," <serial>") <= 0)
+ return(1);
+
+ for (i=0; i<bs->length; i++)
+ {
+ if (BIO_printf(bp,"%02x%c",bs->data[i],
+ ((i+1 == bs->length)?'\n':':')) <= 0)
+ return(1);
+ if (options->xmlOutput) {
+ if (i+1 == bs->length)
+ {
+ if (BIO_printf(xml_bp,"%02x",bs->data[i]) <= 0)
+ return(1);
+ }
+ else
+ {
+ if (BIO_printf(xml_bp,"%02x%c",bs->data[i], ':') <= 0)
+ return(1);
+ }
}
}
- }
- if (options->xmlOutput)
- if (BIO_printf(xml_bp,"</serial>\n") <= 0)
- return(1);
+ if (options->xmlOutput)
+ if (BIO_printf(xml_bp,"</serial>\n") <= 0)
+ return(1);
+ }
+ if(NULL != bp)
+ BIO_free(bp);
+ // We don't free the xml_bp because it will be used in the future
}
- if(NULL != bp)
- BIO_free(bp);
- // We don't free the xml_bp because it will be used in the future
- }
- // Signature Algo...
- if (!(X509_FLAG_COMPAT & X509_FLAG_NO_SIGNAME))
- {
- X509_signature_print(stdoutBIO, X509_get0_tbs_sigalg(x509Cert), NULL);
-/* printf(" Signature Algorithm: ");
- i2a_ASN1_OBJECT(stdoutBIO, X509_get0_tbs_sigalg(x509Cert));
- printf("\n");
-*/
- if (options->xmlOutput)
+ // Signature Algo...
+ if (!(X509_FLAG_COMPAT & X509_FLAG_NO_SIGNAME))
{
- printf_xml(" <signature-algorithm>");
- X509_signature_print(fileBIO, X509_get0_tbs_sigalg(x509Cert), NULL);
- printf_xml("</signature-algorithm>\n");
+ X509_signature_print(stdoutBIO, X509_get0_tbs_sigalg(x509Cert), NULL);
+ /* printf(" Signature Algorithm: ");
+ i2a_ASN1_OBJECT(stdoutBIO, X509_get0_tbs_sigalg(x509Cert));
+ printf("\n");
+ */
+ if (options->xmlOutput)
+ {
+ printf_xml(" <signature-algorithm>");
+ X509_signature_print(fileBIO, X509_get0_tbs_sigalg(x509Cert), NULL);
+ printf_xml("</signature-algorithm>\n");
+ }
}
- }
- // SSL Certificate Issuer...
- if (!(X509_FLAG_COMPAT & X509_FLAG_NO_ISSUER))
- {
- X509_NAME_oneline(X509_get_issuer_name(x509Cert), buffer, sizeof(buffer) - 1);
- printf(" Issuer: %s\n", buffer);
- printf_xml(" <issuer><![CDATA[%s]]></issuer>\n", buffer);
- }
-
- // Validity...
- if (!(X509_FLAG_COMPAT & X509_FLAG_NO_VALIDITY))
- {
- printf(" Not valid before: ");
- ASN1_TIME_print(stdoutBIO, X509_get_notBefore(x509Cert));
- if (options->xmlOutput)
+ // SSL Certificate Issuer...
+ if (!(X509_FLAG_COMPAT & X509_FLAG_NO_ISSUER))
{
- printf_xml(" <not-valid-before>");
- ASN1_TIME_print(fileBIO, X509_get_notBefore(x509Cert));
- printf_xml("</not-valid-before>\n");
+ X509_NAME_oneline(X509_get_issuer_name(x509Cert), buffer, sizeof(buffer) - 1);
+ printf(" Issuer: %s\n", buffer);
+ printf_xml(" <issuer><![CDATA[%s]]></issuer>\n", buffer);
}
- printf("\n Not valid after: ");
- ASN1_TIME_print(stdoutBIO, X509_get_notAfter(x509Cert));
- printf("\n");
- if (options->xmlOutput)
- {
- printf_xml(" <not-valid-after>");
- ASN1_TIME_print(fileBIO, X509_get_notAfter(x509Cert));
- printf_xml("</not-valid-after>\n");
- }
- }
-
- // SSL Certificate Subject...
- if (!(X509_FLAG_COMPAT & X509_FLAG_NO_SUBJECT))
- {
- X509_NAME_oneline(X509_get_subject_name(x509Cert), buffer, sizeof(buffer) - 1);
- printf(" Subject: %s\n", buffer);
- printf_xml(" <subject><![CDATA[%s]]></subject>\n", buffer);
- }
- // Public Key Algo...
- if (!(X509_FLAG_COMPAT & X509_FLAG_NO_PUBKEY))
- {
- printf(" Public Key Algorithm: ");
- ASN1_OBJECT *xpoid = NULL;
- i2a_ASN1_OBJECT(stdoutBIO, xpoid);
- printf("\n");
- if (options->xmlOutput)
+ // Validity...
+ if (!(X509_FLAG_COMPAT & X509_FLAG_NO_VALIDITY))
{
- printf_xml(" <pk-algorithm>");
- i2a_ASN1_OBJECT(fileBIO, xpoid);
- printf_xml("</pk-algorithm>\n");
+ printf(" Not valid before: ");
+ ASN1_TIME_print(stdoutBIO, X509_get_notBefore(x509Cert));
+ if (options->xmlOutput)
+ {
+ printf_xml(" <not-valid-before>");
+ ASN1_TIME_print(fileBIO, X509_get_notBefore(x509Cert));
+ printf_xml("</not-valid-before>\n");
+ }
+ printf("\n Not valid after: ");
+ ASN1_TIME_print(stdoutBIO, X509_get_notAfter(x509Cert));
+ printf("\n");
+ if (options->xmlOutput)
+ {
+ printf_xml(" <not-valid-after>");
+ ASN1_TIME_print(fileBIO, X509_get_notAfter(x509Cert));
+ printf_xml("</not-valid-after>\n");
+ }
}
- // Public Key...
- publicKey = X509_get_pubkey(x509Cert);
- if (publicKey == NULL)
+ // SSL Certificate Subject...
+ if (!(X509_FLAG_COMPAT & X509_FLAG_NO_SUBJECT))
{
- printf(" Public Key: Could not load\n");
- printf_xml(" <pk error=\"true\" />\n");
+ X509_NAME_oneline(X509_get_subject_name(x509Cert), buffer, sizeof(buffer) - 1);
+ printf(" Subject: %s\n", buffer);
+ printf_xml(" <subject><![CDATA[%s]]></subject>\n", buffer);
}
- else
+
+ // Public Key Algo...
+ if (!(X509_FLAG_COMPAT & X509_FLAG_NO_PUBKEY))
{
- switch (EVP_PKEY_id(publicKey))
+ printf(" Public Key Algorithm: ");
+ ASN1_OBJECT *xpoid = NULL;
+ i2a_ASN1_OBJECT(stdoutBIO, xpoid);
+ printf("\n");
+ if (options->xmlOutput)
+ {
+ printf_xml(" <pk-algorithm>");
+ i2a_ASN1_OBJECT(fileBIO, xpoid);
+ printf_xml("</pk-algorithm>\n");
+ }
+
+ // Public Key...
+ publicKey = X509_get_pubkey(x509Cert);
+ if (publicKey == NULL)
{
+ printf(" Public Key: Could not load\n");
+ printf_xml(" <pk error=\"true\" />\n");
+ }
+ else
+ {
+ switch (EVP_PKEY_id(publicKey))
+ {
case EVP_PKEY_RSA:
if (EVP_PKEY_get1_RSA(publicKey)!=NULL)
{
@@ -3049,77 +3067,79 @@
printf(" Public Key: Unknown\n");
printf_xml(" <pk error=\"true\" type=\"unknown\" />\n");
break;
- }
+ }
- EVP_PKEY_free(publicKey);
+ EVP_PKEY_free(publicKey);
+ }
}
- }
- // X509 v3...
- if (!(X509_FLAG_COMPAT & X509_FLAG_NO_EXTENSIONS))
- {
- if (sk_X509_EXTENSION_num(X509_get0_extensions(x509Cert)) > 0)
+ // X509 v3...
+ if (!(X509_FLAG_COMPAT & X509_FLAG_NO_EXTENSIONS))
{
- printf(" X509v3 Extensions:\n");
- printf_xml(" <X509v3-Extensions>\n");
- for (tempInt = 0; tempInt < sk_X509_EXTENSION_num(X509_get0_extensions(x509Cert)); tempInt++)
+ if (sk_X509_EXTENSION_num(X509_get0_extensions(x509Cert)) > 0)
{
- // Get Extension...
- extension = sk_X509_EXTENSION_value(X509_get0_extensions(x509Cert), tempInt);
-
- // Print Extension name...
- printf(" ");
- asn1Object = X509_EXTENSION_get_object(extension);
- i2a_ASN1_OBJECT(stdoutBIO, asn1Object);
- tempInt2 = X509_EXTENSION_get_critical(extension);
- BIO_printf(stdoutBIO, ": %s\n", tempInt2 ? "critical" : "");
- if (options->xmlOutput)
+ printf(" X509v3 Extensions:\n");
+ printf_xml(" <X509v3-Extensions>\n");
+ for (tempInt = 0; tempInt < sk_X509_EXTENSION_num(X509_get0_extensions(x509Cert)); tempInt++)
{
- printf_xml(" <extension name=\"");
- i2a_ASN1_OBJECT(fileBIO, asn1Object);
- BIO_printf(fileBIO, "\"%s><![CDATA[", tempInt2 ? " level=\"critical\"" : "");
- }
+ // Get Extension...
+ extension = sk_X509_EXTENSION_value(X509_get0_extensions(x509Cert), tempInt);
- // Print Extension value...
- if (!X509V3_EXT_print(stdoutBIO, extension, X509_FLAG_COMPAT, 8))
- {
- printf(" ");
- ASN1_STRING_print(stdoutBIO, X509_EXTENSION_get_data(extension));
- }
- if (options->xmlOutput)
- {
- if (!X509V3_EXT_print(fileBIO, extension, X509_FLAG_COMPAT, 0))
- ASN1_STRING_print(stdoutBIO, X509_EXTENSION_get_data(extension));
- printf_xml("]]></extension>\n");
+ // Print Extension name...
+ printf(" ");
+ asn1Object = X509_EXTENSION_get_object(extension);
+ i2a_ASN1_OBJECT(stdoutBIO, asn1Object);
+ tempInt2 = X509_EXTENSION_get_critical(extension);
+ BIO_printf(stdoutBIO, ": %s\n", tempInt2 ? "critical" : "");
+ if (options->xmlOutput)
+ {
+ printf_xml(" <extension name=\"");
+ i2a_ASN1_OBJECT(fileBIO, asn1Object);
+ BIO_printf(fileBIO, "\"%s><![CDATA[", tempInt2 ? " level=\"critical\"" : "");
+ }
+
+ // Print Extension value...
+ if (!X509V3_EXT_print(stdoutBIO, extension, X509_FLAG_COMPAT, 8))
+ {
+ printf(" ");
+ ASN1_STRING_print(stdoutBIO, X509_EXTENSION_get_data(extension));
+ }
+ if (options->xmlOutput)
+ {
+ if (!X509V3_EXT_print(fileBIO, extension, X509_FLAG_COMPAT, 0))
+ ASN1_STRING_print(stdoutBIO, X509_EXTENSION_get_data(extension));
+ printf_xml("]]></extension>\n");
+ }
+ printf("\n");
}
- printf("\n");
+ printf_xml(" </X509v3-Extensions>\n");
}
- printf_xml(" </X509v3-Extensions>\n");
}
- }
- // Verify Certificate...
- printf(" Verify Certificate:\n");
- verifyError = SSL_get_verify_result(ssl);
- if (verifyError == X509_V_OK)
- {
- printf(" Certificate passed verification\n");
+ // Verify Certificate...
+ printf(" Verify m:\n");
+ verifyError = SSL_get_verify_result(ssl);
+ if (verifyError == X509_V_OK)
+ {
+ printf(" Certificate passed verification\n");
+ }
+ else
+ {
+ printf(" %s\n", X509_verify_cert_error_string(verifyError));
+ }
+
+ // Free X509 Certificate...
+ X509_free(x509Cert);
}
+
else
{
- printf(" %s\n", X509_verify_cert_error_string(verifyError));
+ printf(" Unable to parse certificate\n");
}
- // Free X509 Certificate...
- X509_free(x509Cert);
- }
-
- else {
- printf(" Unable to parse certificate\n");
+ printf_xml(" </certificate>\n");
}
- printf_xml(" </certificate>\n");
-
// Free BIO
BIO_free(stdoutBIO);
if (options->xmlOutput)
@@ -3710,8 +3730,9 @@
if (status == true && (options->showCertificate == true || options->checkCertificate == true))
{
printf_xml(" <certificates>\n");
- // Full certificate details (--show-certificates)
- if (status == true && options->showCertificate == true)
+
+ // Full certificate details
+ if (status == true && (options->showCertificate == true || options->showCertificates == true))
{
status = showCertificate(options);
}
@@ -3874,10 +3895,14 @@
options->targets = argLoop;
}
- // Show certificate
+ // Show certificate (only one)
else if (strcmp("--show-certificate", argv[argLoop]) == 0)
options->showCertificate = true;
+ // Show certificates (all)
+ else if (strcmp("--show-certificates", argv[argLoop]) == 0)
+ options->showCertificates = true;
+
// Don't check certificate strength
else if (strcmp("--no-check-certificate", argv[argLoop]) == 0)
options->checkCertificate = false;
@@ -4239,6 +4264,7 @@
printf(" %s--ipv6, -6%s Only use IPv6\n", COL_GREEN, RESET);
printf("\n");
printf(" %s--show-certificate%s Show full certificate information\n", COL_GREEN, RESET);
+ printf(" %s--show-certificates%s Show chain full certificates information\n", COL_GREEN, RESET);
printf(" %s--show-client-cas%s Show trusted CAs for TLS client auth\n", COL_GREEN, RESET);
printf(" %s--no-check-certificate%s Don't warn about weak certificate algorithm or keys\n", COL_GREEN, RESET);
printf(" %s--ocsp%s Request OCSP response from server\n", COL_GREEN, RESET);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sslscan-2.1.3/sslscan.h new/sslscan-2.1.4/sslscan.h
--- old/sslscan-2.1.3/sslscan.h 2024-01-21 14:41:31.000000000 +0100
+++ new/sslscan-2.1.4/sslscan.h 2024-06-16 19:49:50.000000000 +0200
@@ -151,6 +151,7 @@
char addrstr[INET6_ADDRSTRLEN];
int port;
int showCertificate;
+ int showCertificates;
int checkCertificate;
int showTrustedCAs;
int showClientCiphers;
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package scrot for openSUSE:Factory checked in at 2024-07-25 15:39:51
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/scrot (Old)
and /work/SRC/openSUSE:Factory/.scrot.new.1882 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "scrot"
Thu Jul 25 15:39:51 2024 rev:12 rq:1189531 version:1.11
Changes:
--------
--- /work/SRC/openSUSE:Factory/scrot/scrot.changes 2023-09-15 22:10:40.868303485 +0200
+++ /work/SRC/openSUSE:Factory/.scrot.new.1882/scrot.changes 2024-07-25 16:01:46.561640331 +0200
@@ -1,0 +2,27 @@
+Thu Jul 25 07:12:51 UTC 2024 - ming li <mli(a)suse.com>
+
+- update to 1.11:
+ * New feature: zsh and bash completion
+ * Improvement: more detailed --help output and new --list-options flag
+ * Improvement: better error reporting on newer imlib2 versions
+ * Improvement: better handle mutually exclusive options
+ * Improvement: --stack no longer errors out if no compositor is running
+ * Improvement: print a warning if output file was changed
+ * Improvement: default file-name extension is now based on the format used
+ * Improvement: selection line mode will be automatically set to "edge"
+ mode if no compositors is running
+ * Improvement: rewrite autogen.sh to be simpler and more robust
+ * Document: add examples of using scrot with other utilities in manpage
+ * Document: Correct strftime section in the manual
+ * Fixes: selection borders appearing in the screenshot
+ * Fixes: reject filenames with trailing slash
+ * Fixes: incorrect line opacity mapping
+ * Fixes: don't return 0 on exec failure
+ * Fixes: bad extension detection
+ * Fixes: stricter optional argument parsing
+ * Fixes: buffer overrun due to bad x,y in imlib_create_image_from_ximage call
+ * Fixes: printing potentially truncated file-size
+ * Fixes: various memory leaks
+ * Fixes: replace dprintf() calls to fix the SmartOS port
+
+-------------------------------------------------------------------
Old:
----
scrot-1.10.tar.gz
New:
----
scrot-1.11.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ scrot.spec ++++++
--- /var/tmp/diff_new_pack.pNnn4S/_old 2024-07-25 16:01:47.537679560 +0200
+++ /var/tmp/diff_new_pack.pNnn4S/_new 2024-07-25 16:01:47.541679721 +0200
@@ -1,7 +1,7 @@
#
# spec file for package scrot
#
-# 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
@@ -17,7 +17,7 @@
Name: scrot
-Version: 1.10
+Version: 1.11
Release: 0
Summary: Screenshot Capture Utility
License: SUSE-Scrot
++++++ scrot-1.10.tar.gz -> scrot-1.11.tar.gz ++++++
++++ 2603 lines of diff (skipped)
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package rehex for openSUSE:Factory checked in at 2024-07-25 15:39:48
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/rehex (Old)
and /work/SRC/openSUSE:Factory/.rehex.new.1882 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "rehex"
Thu Jul 25 15:39:48 2024 rev:12 rq:1189494 version:0.62.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/rehex/rehex.changes 2024-07-22 17:20:30.395300199 +0200
+++ /work/SRC/openSUSE:Factory/.rehex.new.1882/rehex.changes 2024-07-25 16:00:42.523070295 +0200
@@ -1,0 +2,6 @@
+Thu Jul 25 05:25:48 UTC 2024 - Michael Vetter <mvetter(a)suse.com>
+
+- Update to 0.62.1:
+ * Fix crashes in x86 Windows build on older CPUs.
+
+-------------------------------------------------------------------
Old:
----
rehex-0.62.0.tar.gz
New:
----
rehex-0.62.1.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ rehex.spec ++++++
--- /var/tmp/diff_new_pack.dkQfY5/_old 2024-07-25 16:00:43.075092368 +0200
+++ /var/tmp/diff_new_pack.dkQfY5/_new 2024-07-25 16:00:43.075092368 +0200
@@ -17,7 +17,7 @@
Name: rehex
-Version: 0.62.0
+Version: 0.62.1
Release: 0
Summary: Reverse Engineers' Hex Editor
License: GPL-2.0-only
++++++ rehex-0.62.0.tar.gz -> rehex-0.62.1.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rehex-0.62.0/CHANGES.txt new/rehex-0.62.1/CHANGES.txt
--- old/rehex-0.62.0/CHANGES.txt 2024-07-20 15:00:14.000000000 +0200
+++ new/rehex-0.62.1/CHANGES.txt 2024-07-24 22:31:16.000000000 +0200
@@ -1,3 +1,7 @@
+Version 0.62.1 (2024-07-24):
+
+ * Fix crashes in x86 Windows build on older CPUs.
+
Version 0.62.0 (2024-07-20):
* Add bit array data type (#167).
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rehex-0.62.0/MANIFEST new/rehex-0.62.1/MANIFEST
--- old/rehex-0.62.0/MANIFEST 2024-07-20 15:00:14.000000000 +0200
+++ new/rehex-0.62.1/MANIFEST 2024-07-24 22:31:16.000000000 +0200
@@ -142,6 +142,18 @@
msvc/thirdparty.props
msvc/vcpkg-deploy/install_vcpkg_dependencies.bat
msvc/vcpkg-deploy/ports/.gitignore
+msvc/vcpkg-deploy/ports/botan/configure
+msvc/vcpkg-deploy/ports/botan/configure-zlib.patch
+msvc/vcpkg-deploy/ports/botan/embed-debug-info.patch
+msvc/vcpkg-deploy/ports/botan/fix-cmake-usage.patch
+msvc/vcpkg-deploy/ports/botan/fix_android.patch
+msvc/vcpkg-deploy/ports/botan/libcxx-winpthread-fixes.patch
+msvc/vcpkg-deploy/ports/botan/msvc-clang-isa-flags.patch
+msvc/vcpkg-deploy/ports/botan/pkgconfig.patch
+msvc/vcpkg-deploy/ports/botan/portfile.cmake
+msvc/vcpkg-deploy/ports/botan/processor-rng-rdrand.patch
+msvc/vcpkg-deploy/ports/botan/vcpkg.json
+msvc/vcpkg-deploy/ports/botan/verbose-install.patch
msvc/vcpkg-deploy/triplets/x64-win-llvm/Notes.md
msvc/vcpkg-deploy/triplets/x64-win-llvm/Platform/Clang-CL-C.cmake
msvc/vcpkg-deploy/triplets/x64-win-llvm/Platform/Clang-CL-CXX.cmake
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rehex-0.62.0/Makefile new/rehex-0.62.1/Makefile
--- old/rehex-0.62.0/Makefile 2024-07-20 15:00:14.000000000 +0200
+++ new/rehex-0.62.1/Makefile 2024-07-24 22:31:16.000000000 +0200
@@ -123,7 +123,7 @@
LDLIBS := -lunistring $(WX_LIBS) $(GTK_LIBS) $(BOTAN_LIBS) $(CAPSTONE_LIBS) $(JANSSON_LIBS) $(LUA_LIBS) $(LDLIBS)
# Define this for releases
-VERSION := 0.62.0
+VERSION := 0.62.1
ifdef VERSION
LONG_VERSION := Version $(VERSION)
@@ -139,8 +139,8 @@
GIT_COMMIT_TIME ?= $(call shell-or-die,git log -1 --format="%ct")
- VERSION := 513172506f17f58a4a56045873bcc043eede2a98
- LONG_VERSION := Snapshot 513172506f17f58a4a56045873bcc043eede2a98
+ VERSION := 00e8769954627c990b888104d141f41f19ce058a
+ LONG_VERSION := Snapshot 00e8769954627c990b888104d141f41f19ce058a
endif
DEPDIR := .d
@@ -749,8 +749,8 @@
git ls-files | xargs cp --parents -t rehex-$(VERSION)/
# Inline any references to the HEAD commit sha/timestamp
- sed -i -e "s|\$513172506f17f58a4a56045873bcc043eede2a98|513172506f17f58a4a56045873bcc043eede2a98|g" rehex-$(VERSION)/Makefile
- sed -i -e "s|\$1721479842|1721479842|g" rehex-$(VERSION)/Makefile
+ sed -i -e "s|\$00e8769954627c990b888104d141f41f19ce058a|00e8769954627c990b888104d141f41f19ce058a|g" rehex-$(VERSION)/Makefile
+ sed -i -e "s|\$1721852938|1721852938|g" rehex-$(VERSION)/Makefile
endif
# Generate reproducible tarball. All files use git commit timestamp.
@@ -758,7 +758,7 @@
LC_ALL=C sort -z | \
tar \
--format=ustar \
- --mtime=@1721479842 \
+ --mtime=@1721852938 \
--owner=0 --group=0 --numeric-owner \
--no-recursion --null -T - \
-cf - | \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rehex-0.62.0/msvc/all-tests/all-tests.vcxproj new/rehex-0.62.1/msvc/all-tests/all-tests.vcxproj
--- old/rehex-0.62.0/msvc/all-tests/all-tests.vcxproj 2024-07-20 15:00:14.000000000 +0200
+++ new/rehex-0.62.1/msvc/all-tests/all-tests.vcxproj 2024-07-24 22:31:16.000000000 +0200
@@ -123,7 +123,7 @@
<SDLCheck>true</SDLCheck>
<PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ConformanceMode>true</ConformanceMode>
- <AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
+ <AdditionalOptions>/bigobj -march=pentium-mmx %(AdditionalOptions)</AdditionalOptions>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp20</LanguageStandard>
@@ -147,7 +147,7 @@
<SDLCheck>true</SDLCheck>
<PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ConformanceMode>true</ConformanceMode>
- <AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
+ <AdditionalOptions>/bigobj -march=pentium-mmx %(AdditionalOptions)</AdditionalOptions>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<LanguageStandard>stdcpp20</LanguageStandard>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rehex-0.62.0/msvc/gen_content.bat new/rehex-0.62.1/msvc/gen_content.bat
--- old/rehex-0.62.0/msvc/gen_content.bat 2024-07-20 15:00:14.000000000 +0200
+++ new/rehex-0.62.1/msvc/gen_content.bat 2024-07-24 22:31:16.000000000 +0200
@@ -3,10 +3,7 @@
cd %~dp0
cd ..
-git log -1 --format="#define LONG_VERSION \"Version 0.62.0\"" > res\version_msvc.h
-if %errorlevel% neq 0 exit /b %errorlevel%
-
-git log -1 --format="#define SHORT_VERSION \"0.62.0\"" >> res\version_msvc.h
-if %errorlevel% neq 0 exit /b %errorlevel%
+echo #define LONG_VERSION "Version 0.62.1" > res\version_msvc.h
+echo #define SHORT_VERSION "0.62.1" >> res\version_msvc.h
exit /b 0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rehex-0.62.0/msvc/rehex.vcxproj new/rehex-0.62.1/msvc/rehex.vcxproj
--- old/rehex-0.62.0/msvc/rehex.vcxproj 2024-07-20 15:00:14.000000000 +0200
+++ new/rehex-0.62.1/msvc/rehex.vcxproj 2024-07-24 22:31:16.000000000 +0200
@@ -190,6 +190,7 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<PreprocessorDefinitions>_DEBUG;REHEX_CACHE_CHARACTER_BITMAPS;REHEX_CACHE_STRING_BITMAPS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<LanguageStandard>stdcpp20</LanguageStandard>
+ <AdditionalOptions>-march=pentium-mmx</AdditionalOptions>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
@@ -216,6 +217,7 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<PreprocessorDefinitions>_DEBUG;REHEX_CACHE_CHARACTER_BITMAPS;REHEX_CACHE_STRING_BITMAPS;REHEX_PROFILE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<LanguageStandard>stdcpp20</LanguageStandard>
+ <AdditionalOptions>-march=pentium-mmx</AdditionalOptions>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
@@ -292,6 +294,7 @@
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<PreprocessorDefinitions>NDEBUG;REHEX_CACHE_CHARACTER_BITMAPS;REHEX_CACHE_STRING_BITMAPS;BUILD_HELP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<LanguageStandard>stdcpp20</LanguageStandard>
+ <AdditionalOptions>-march=pentium-mmx</AdditionalOptions>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
@@ -321,6 +324,7 @@
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<PreprocessorDefinitions>NDEBUG;REHEX_CACHE_CHARACTER_BITMAPS;REHEX_CACHE_STRING_BITMAPS;REHEX_PROFILE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<LanguageStandard>stdcpp20</LanguageStandard>
+ <AdditionalOptions>-march=pentium-mmx</AdditionalOptions>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rehex-0.62.0/msvc/vcpkg-deploy/ports/botan/configure new/rehex-0.62.1/msvc/vcpkg-deploy/ports/botan/configure
--- old/rehex-0.62.0/msvc/vcpkg-deploy/ports/botan/configure 1970-01-01 01:00:00.000000000 +0100
+++ new/rehex-0.62.1/msvc/vcpkg-deploy/ports/botan/configure 2024-07-24 22:31:16.000000000 +0200
@@ -0,0 +1,46 @@
+#!/usr/bin/env bash
+
+set -e
+
+declare -a OUT_OPTIONS
+
+INTERPRETER=python3
+
+LAST_SEEN=
+COPY_OPTIONS=no
+COPY_PREFIX=yes
+BUILD_TYPE=RELEASE
+for OPTION; do
+ case "${OPTION},${COPY_OPTIONS}" in
+ */configure.py,no)
+ OUT_OPTIONS+=("${OPTION}")
+ INTERPRETER="${LAST_SEEN}"
+ COPY_OPTIONS=yes
+ ;;
+ --prefix=*,yes)
+ if [ "${COPY_PREFIX}" = "yes" ] ; then
+ OUT_OPTIONS+=("${OPTION}")
+ COPY_PREFIX=no
+ fi
+ ;;
+ --*=*,yes)
+ OUT_OPTIONS+=("${OPTION}")
+ ;;
+ *=*)
+ ;;
+ *,yes)
+ OUT_OPTIONS+=("${OPTION}")
+ if [ "${OPTION}" = "--debug-mode" ] ; then
+ BUILD_TYPE=DEBUG
+ fi
+ ;;
+ esac
+ LAST_SEEN="${OPTION}"
+done
+
+set -x
+export CXXFLAGS="$CPPFLAGS $CXXFLAGS"
+"${INTERPRETER}" "${OUT_OPTIONS[@]}"
+
+sed -e "1i\\
+ZLIB_LIBS = \$(ZLIB_LIBS_${BUILD_TYPE})" -i -- Makefile
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rehex-0.62.0/msvc/vcpkg-deploy/ports/botan/configure-zlib.patch new/rehex-0.62.1/msvc/vcpkg-deploy/ports/botan/configure-zlib.patch
--- old/rehex-0.62.0/msvc/vcpkg-deploy/ports/botan/configure-zlib.patch 1970-01-01 01:00:00.000000000 +0100
+++ new/rehex-0.62.1/msvc/vcpkg-deploy/ports/botan/configure-zlib.patch 2024-07-24 22:31:16.000000000 +0200
@@ -0,0 +1,24 @@
+diff --git a/src/build-data/makefile.in b/src/build-data/makefile.in
+index 5102933..0fa5920 100644
+--- a/src/build-data/makefile.in
++++ b/src/build-data/makefile.in
+@@ -20,7 +20,7 @@ LDFLAGS = %{ldflags}
+
+ EXE_LINK_CMD = %{exe_link_cmd}
+
+-LIB_LINKS_TO = %{external_link_cmd} %{link_to}
++LIB_LINKS_TO = %{external_link_cmd} $(ZLIB_LIBS) %{link_to}
+ BUILD_DIR_LINK_PATH = %{build_dir_link_path}
+ EXE_LINKS_TO = %{link_to_botan} $(LIB_LINKS_TO) %{extra_libs}
+
+diff --git a/src/lib/compression/zlib/info.txt b/src/lib/compression/zlib/info.txt
+index 1102bc5..34047fa 100644
+--- a/src/lib/compression/zlib/info.txt
++++ b/src/lib/compression/zlib/info.txt
+@@ -5,6 +5,4 @@ ZLIB -> 20160412
+ load_on vendor
+
+ <libs>
+-all!windows -> z
+-windows -> zlib
+ </libs>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rehex-0.62.0/msvc/vcpkg-deploy/ports/botan/embed-debug-info.patch new/rehex-0.62.1/msvc/vcpkg-deploy/ports/botan/embed-debug-info.patch
--- old/rehex-0.62.0/msvc/vcpkg-deploy/ports/botan/embed-debug-info.patch 1970-01-01 01:00:00.000000000 +0100
+++ new/rehex-0.62.1/msvc/vcpkg-deploy/ports/botan/embed-debug-info.patch 2024-07-24 22:31:16.000000000 +0200
@@ -0,0 +1,17 @@
+diff --git a/src/build-data/cc/msvc.txt b/src/build-data/cc/msvc.txt
+index 64b6eae..66258ca 100644
+--- a/src/build-data/cc/msvc.txt
++++ b/src/build-data/cc/msvc.txt
+@@ -20,10 +20,10 @@ optimization_flags "/O2 /Oi"
+ size_optimization_flags "/O1 /Os"
+
+ # for debug info in the object file (required if using sccache):
+-#debug_info_flags "/Z7"
++debug_info_flags "/Z7"
+
+ # for using a PDB file:
+-debug_info_flags "/Zi /FS"
++#debug_info_flags "/Zi /FS"
+
+ preproc_flags "/nologo /EP"
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rehex-0.62.0/msvc/vcpkg-deploy/ports/botan/fix-cmake-usage.patch new/rehex-0.62.1/msvc/vcpkg-deploy/ports/botan/fix-cmake-usage.patch
--- old/rehex-0.62.0/msvc/vcpkg-deploy/ports/botan/fix-cmake-usage.patch 1970-01-01 01:00:00.000000000 +0100
+++ new/rehex-0.62.1/msvc/vcpkg-deploy/ports/botan/fix-cmake-usage.patch 2024-07-24 22:31:16.000000000 +0200
@@ -0,0 +1,79 @@
+diff --git a/src/build-data/botan-config.cmake.in b/src/build-data/botan-config.cmake.in
+index 8d14c4e..cfc9277 100644
+--- a/src/build-data/botan-config.cmake.in
++++ b/src/build-data/botan-config.cmake.in
+@@ -65,27 +65,36 @@ if(DEFINED ${CMAKE_FIND_PACKAGE_NAME}_FOUND AND NOT ${${CMAKE_FIND_PACKAGE_NAME}
+ return()
+ endif()
+
+-# botan-config.cmake lives in "${_Botan_PREFIX}/lib/cmake/Botan-X": traverse up to $_Botan_PREFIX
++# botan-config.cmake lives in "${_Botan_PREFIX}/share/botan": traverse up to $_Botan_PREFIX
+ set(_Botan_PREFIX "${CMAKE_CURRENT_LIST_DIR}")
+ get_filename_component(_Botan_PREFIX "${_Botan_PREFIX}" DIRECTORY)
+ get_filename_component(_Botan_PREFIX "${_Botan_PREFIX}" DIRECTORY)
+-get_filename_component(_Botan_PREFIX "${_Botan_PREFIX}" DIRECTORY)
+
+ %{if build_static_lib}
+ if(NOT TARGET Botan::Botan-static)
+ add_library(Botan::Botan-static STATIC IMPORTED)
+ set_target_properties(Botan::Botan-static
+ PROPERTIES
+- IMPORTED_LOCATION "${_Botan_PREFIX}/lib/%{static_lib_name}"
+- INTERFACE_INCLUDE_DIRECTORIES "${_Botan_PREFIX}/include/botan-%{version_major}"
++ INTERFACE_INCLUDE_DIRECTORIES "${_Botan_PREFIX}/include"
+ IMPORTED_LINK_INTERFACE_LANGUAGES "CXX"
+ INTERFACE_LINK_OPTIONS "SHELL:%{cxx_abi_flags}")
++ if(EXISTS "${_Botan_PREFIX}/debug/lib/%{static_lib_name}")
++ set_property(TARGET Botan::Botan-static APPEND PROPERTY IMPORTED_CONFIGURATIONS DEBUG)
++ set_target_properties(Botan::Botan-static PROPERTIES
++ IMPORTED_LOCATION_DEBUG "${_Botan_PREFIX}/debug/lib/%{static_lib_name}"
++ )
++ endif()
++ set_property(TARGET Botan::Botan-static APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE)
++ set_target_properties(Botan::Botan-static PROPERTIES
++ IMPORTED_LOCATION_RELEASE "${_Botan_PREFIX}/lib/%{static_lib_name}"
++ )
+ endif()
+ %{endif}
+
+ %{if implib_name}
+-set(_Botan_implib "${_Botan_PREFIX}/lib/%{implib_name}")
+-set(_Botan_shared_lib "${_Botan_PREFIX}/bin/%{shared_lib_name}")
++set(_Botan_implib "${_Botan_PREFIX}/lib/%{implib_name}")
++set(_Botan_implib_debug "${_Botan_PREFIX}/debug/lib/%{implib_name}")
++set(_Botan_shared_lib "${_Botan_PREFIX}/bin/%{shared_lib_name}")
+ %{endif}
+ %{unless implib_name}
+ set(_Botan_implib "")
+@@ -100,10 +109,28 @@ if(NOT TARGET Botan::Botan)
+ add_library(Botan::Botan SHARED IMPORTED)
+ set_target_properties(Botan::Botan
+ PROPERTIES
+- IMPORTED_LOCATION "${_Botan_shared_lib}"
+- IMPORTED_IMPLIB "${_Botan_implib}"
+- INTERFACE_INCLUDE_DIRECTORIES "${_Botan_PREFIX}/include/botan-%{version_major}"
++ INTERFACE_INCLUDE_DIRECTORIES "${_Botan_PREFIX}/include"
+ INTERFACE_LINK_OPTIONS "SHELL:%{cxx_abi_flags}")
++ if(EXISTS "${_Botan_PREFIX}/debug/lib/%{shared_lib_name}")
++ set_property(TARGET Botan::Botan APPEND PROPERTY IMPORTED_CONFIGURATIONS DEBUG)
++ set_target_properties(Botan::Botan PROPERTIES
++ IMPORTED_LOCATION_DEBUG "${_Botan_PREFIX}/debug/bin/%{shared_lib_name}"
++ )
++ if(NOT _Botan_implib STREQUAL "")
++ set_target_properties(Botan::Botan PROPERTIES
++ IMPORTED_IMPLIB_DEBUG ${_Botan_implib_debug}
++ )
++ endif()
++ endif()
++ set_property(TARGET Botan::Botan APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE)
++ set_target_properties(Botan::Botan PROPERTIES
++ IMPORTED_LOCATION_RELEASE "${_Botan_PREFIX}/bin/%{shared_lib_name}"
++ )
++ if(NOT _Botan_implib STREQUAL "")
++ set_target_properties(Botan::Botan PROPERTIES
++ IMPORTED_IMPLIB_RELEASE ${_Botan_implib}
++ )
++ endif()
+ set_property(TARGET Botan::Botan APPEND PROPERTY IMPORTED_CONFIGURATIONS NOCONFIG)
+ set_target_properties(Botan::Botan
+ PROPERTIES
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rehex-0.62.0/msvc/vcpkg-deploy/ports/botan/fix_android.patch new/rehex-0.62.1/msvc/vcpkg-deploy/ports/botan/fix_android.patch
--- old/rehex-0.62.0/msvc/vcpkg-deploy/ports/botan/fix_android.patch 1970-01-01 01:00:00.000000000 +0100
+++ new/rehex-0.62.1/msvc/vcpkg-deploy/ports/botan/fix_android.patch 2024-07-24 22:31:16.000000000 +0200
@@ -0,0 +1,13 @@
+diff --git a/src/lib/utils/prefetch.cpp b/src/lib/utils/prefetch.cpp
+index 40786b3..e0d5239 100644
+--- a/src/lib/utils/prefetch.cpp
++++ b/src/lib/utils/prefetch.cpp
+@@ -12,7 +12,7 @@
+ namespace Botan {
+
+ uint64_t prefetch_array_raw(size_t bytes, const void* arrayv) noexcept {
+-#if defined(__cpp_lib_hardware_interference_size)
++#if defined(__cpp_lib_hardware_interference_size) && (!defined(BOTAN_TARGET_OS_IS_ANDROID) || defined(NDK_IS_NEWER_THAN_25))
+ const size_t cache_line_size = std::hardware_destructive_interference_size;
+ #else
+ // We arbitrarily use a 64 byte cache line, which is by far the most
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rehex-0.62.0/msvc/vcpkg-deploy/ports/botan/libcxx-winpthread-fixes.patch new/rehex-0.62.1/msvc/vcpkg-deploy/ports/botan/libcxx-winpthread-fixes.patch
--- old/rehex-0.62.0/msvc/vcpkg-deploy/ports/botan/libcxx-winpthread-fixes.patch 1970-01-01 01:00:00.000000000 +0100
+++ new/rehex-0.62.1/msvc/vcpkg-deploy/ports/botan/libcxx-winpthread-fixes.patch 2024-07-24 22:31:16.000000000 +0200
@@ -0,0 +1,23 @@
+--- a/src/tests/tests.h
++++ b/src/tests/tests.h
+@@ -17,6 +17,9 @@
+ #include <map>
+ #include <memory>
+ #include <optional>
++#ifndef __ANDROID__
++#include <ranges>
++#endif
+ #include <set>
+ #include <sstream>
+ #include <string>
+--- a/src/lib/utils/os_utils.cpp
++++ b/src/lib/utils/os_utils.cpp
+@@ -627,6 +627,8 @@
+ static_cast<void>(pthread_set_name_np(thread.native_handle(), name.c_str()));
+ #elif defined(BOTAN_TARGET_OS_IS_NETBSD)
+ static_cast<void>(pthread_setname_np(thread.native_handle(), "%s", const_cast<char*>(name.c_str())));
++ #elif defined(BOTAN_TARGET_OS_HAS_WIN32) && defined(_LIBCPP_HAS_THREAD_API_PTHREAD)
++ static_cast<void>(pthread_setname_np(thread.native_handle(), name.c_str()));
+ #elif defined(BOTAN_TARGET_OS_HAS_WIN32) && defined(BOTAN_BUILD_COMPILER_IS_MSVC)
+ typedef HRESULT(WINAPI * std_proc)(HANDLE, PCWSTR);
+ HMODULE kern = GetModuleHandleA("KernelBase.dll");
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rehex-0.62.0/msvc/vcpkg-deploy/ports/botan/msvc-clang-isa-flags.patch new/rehex-0.62.1/msvc/vcpkg-deploy/ports/botan/msvc-clang-isa-flags.patch
--- old/rehex-0.62.0/msvc/vcpkg-deploy/ports/botan/msvc-clang-isa-flags.patch 1970-01-01 01:00:00.000000000 +0100
+++ new/rehex-0.62.1/msvc/vcpkg-deploy/ports/botan/msvc-clang-isa-flags.patch 2024-07-24 22:31:16.000000000 +0200
@@ -0,0 +1,43 @@
+--- a/src/build-data/cc/msvc.txt
++++ b/src/build-data/cc/msvc.txt
+@@ -56,17 +56,29 @@
+ </sanitizers>
+
+ <isa_flags>
+-sse2 -> ""
+-ssse3 -> ""
+-sse41 -> ""
+-sse42 -> ""
+-x86_64:avx2 -> "/arch:AVX"
+-x86_64:avx512 -> "/arch:AVX512"
+-aesni -> ""
+-clmul -> ""
+-rdrand -> ""
+-rdseed -> ""
+-sha -> ""
++sse2 -> "-msse2"
++ssse3 -> "-mssse3"
++sse41 -> "-msse4.1"
++sse42 -> "-msse4.2"
++avx2 -> "-mavx2"
++avx512 -> "-mavx512f -mavx512bw -mavx512dq -mavx512vbmi -mavx512vbmi2 -mavx512bitalg -mavx512vl -mavx512ifma"
++
++bmi2 -> "-mbmi -mbmi2"
++aesni -> "-maes -mpclmul"
++rdrand -> "-mrdrnd"
++rdseed -> "-mrdseed"
++sha -> "-msha"
++altivec -> "-maltivec"
++
++ppc64:vsx -> "-mvsx"
++ppc64:powercrypto -> "-mcrypto"
++ppc64:power9 -> "-mcpu=power9"
++
++arm64:armv8crypto -> "-march=armv8+crypto"
++arm64:armv8sha512 -> "-march=armv8.2-a+sha3"
++
++arm32:neon -> "-mfpu=neon"
++arm64:neon -> ""
+ </isa_flags>
+
+ <lib_flags>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rehex-0.62.0/msvc/vcpkg-deploy/ports/botan/pkgconfig.patch new/rehex-0.62.1/msvc/vcpkg-deploy/ports/botan/pkgconfig.patch
--- old/rehex-0.62.0/msvc/vcpkg-deploy/ports/botan/pkgconfig.patch 1970-01-01 01:00:00.000000000 +0100
+++ new/rehex-0.62.1/msvc/vcpkg-deploy/ports/botan/pkgconfig.patch 2024-07-24 22:31:16.000000000 +0200
@@ -0,0 +1,14 @@
+diff --git a/src/build-data/botan.pc.in b/src/build-data/botan.pc.in
+index c18b522..a5722c9 100644
+--- a/src/build-data/botan.pc.in
++++ b/src/build-data/botan.pc.in
+@@ -1,7 +1,7 @@
+ prefix=%{prefix}
+ exec_prefix=${prefix}
+-libdir=%{libdir}
+-includedir=${prefix}/include/botan-%{version_major}
++libdir=${prefix}/lib
++includedir=${prefix}/include
+
+ Name: Botan
+ Description: Crypto and TLS for Modern C++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rehex-0.62.0/msvc/vcpkg-deploy/ports/botan/portfile.cmake new/rehex-0.62.1/msvc/vcpkg-deploy/ports/botan/portfile.cmake
--- old/rehex-0.62.0/msvc/vcpkg-deploy/ports/botan/portfile.cmake 1970-01-01 01:00:00.000000000 +0100
+++ new/rehex-0.62.1/msvc/vcpkg-deploy/ports/botan/portfile.cmake 2024-07-24 22:31:16.000000000 +0200
@@ -0,0 +1,216 @@
+vcpkg_from_github(
+ OUT_SOURCE_PATH SOURCE_PATH
+ REPO randombit/botan
+ REF "${VERSION}"
+ SHA512 5b3e22ad14bf0c37d97835c8309d1a5797cfab67b14ebfad9fd69a999ee27fe97d42ecff5e57e598d21575d053c07c30995f8c2d5f3a23433fb59d6bab45e1e7
+ HEAD_REF master
+ PATCHES
+ embed-debug-info.patch
+ pkgconfig.patch
+ verbose-install.patch
+ configure-zlib.patch
+ fix_android.patch
+ libcxx-winpthread-fixes.patch
+ fix-cmake-usage.patch
+ processor-rng-rdrand.patch
+)
+file(COPY "${CMAKE_CURRENT_LIST_DIR}/configure" DESTINATION "${SOURCE_PATH}")
+
+if(VCPKG_TARGET_IS_MINGW)
+ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+endif()
+
+vcpkg_find_acquire_program(PYTHON3)
+
+vcpkg_cmake_get_vars(cmake_vars_file)
+include("${cmake_vars_file}")
+
+set(pkgconfig_syntax "")
+if(VCPKG_DETECTED_CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
+ set(pkgconfig_syntax "--msvc-syntax")
+endif()
+
+vcpkg_list(SET configure_arguments
+ "--distribution-info=vcpkg ${TARGET_TRIPLET}"
+ --disable-cc-tests
+ --with-pkg-config
+ --link-method=copy
+ --with-debug-info
+ --includedir=include
+ --bindir=bin
+ --libdir=lib
+ --without-documentation
+ "--with-external-includedir=${CURRENT_INSTALLED_DIR}/include"
+)
+vcpkg_list(SET pkgconfig_requires)
+
+if("amalgamation" IN_LIST FEATURES)
+ vcpkg_list(APPEND configure_arguments --amalgamation)
+endif()
+
+set(ZLIB_LIBS_RELEASE "")
+set(ZLIB_LIBS_DEBUG "")
+if("zlib" IN_LIST FEATURES)
+ vcpkg_list(APPEND configure_arguments --with-zlib)
+ vcpkg_list(APPEND pkgconfig_requires zlib)
+ x_vcpkg_pkgconfig_get_modules(LIBS PREFIX "ZLIB" MODULES "zlib" ${pkgconfig_syntax})
+endif()
+
+if(VCPKG_TARGET_IS_EMSCRIPTEN)
+ vcpkg_list(APPEND configure_arguments --cpu=wasm)
+elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86")
+ vcpkg_list(APPEND configure_arguments --cpu=x86)
+elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64")
+ vcpkg_list(APPEND configure_arguments --cpu=x86_64)
+elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm")
+ vcpkg_list(APPEND configure_arguments --cpu=arm32)
+elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64")
+ vcpkg_list(APPEND configure_arguments --cpu=arm64)
+else()
+ message(FATAL_ERROR "Unsupported architecture")
+endif()
+
+# Allow disabling use of WinSock2 by setting BOTAN_USE_WINSOCK2=OFF in triplet
+# for targeting older Windows versions with missing APIs.
+if(VCPKG_TARGET_IS_WINDOWS AND DEFINED BOTAN_USE_WINSOCK2 AND NOT BOTAN_USE_WINSOCK2)
+ vcpkg_list(APPEND configure_arguments --without-os-features=winsock2)
+endif()
+
+if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW)
+ vcpkg_list(APPEND configure_arguments --os=windows)
+
+ if(VCPKG_DETECTED_CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
+ vcpkg_list(APPEND configure_arguments --cc=msvc)
+ endif()
+
+ # Botan performs runtime checks for certain CPU extensions/intrinsics before attempting to use
+ # them and falls back to alternative implementations if they're not available.
+ #
+ # When building with MSVC, the builtin functions for those intrinsics can be used even when
+ # they aren't guaranteed by the chosen architecture, whereas Clang requires them to be enabled
+ # for use by the codegen, just for the translation units where they are used. The Botan build
+ # scripts know to enable them for the specific translation units when using GCC/Clang, but not
+ # when using Clang-pretending-to-be-MSVC (i.e. clang-cl), so we patch the compiler metadata to
+ # add the Clang extension flags when using "MSVC" in this configuration.
+
+ if(VCPKG_DETECTED_CMAKE_CXX_COMPILER MATCHES "clang-cl(\.exe)?$")
+ vcpkg_apply_patches(
+ SOURCE_PATH "${SOURCE_PATH}"
+ PATCHES
+ msvc-clang-isa-flags.patch
+ )
+ endif()
+
+ # Forward detected CXXFLAGS to the Botan configure script.
+ vcpkg_list(APPEND configure_arguments "--extra-cxxflags=${VCPKG_DETECTED_CMAKE_CXX_FLAGS}")
+
+ if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
+ vcpkg_list(APPEND configure_arguments --enable-shared-library --disable-static-library)
+ else()
+ vcpkg_list(APPEND configure_arguments --disable-shared-library --enable-static-library)
+ endif()
+
+ if(VCPKG_CRT_LINKAGE STREQUAL "dynamic")
+ set(BOTAN_MSVC_RUNTIME MD)
+ else()
+ set(BOTAN_MSVC_RUNTIME MT)
+ endif()
+
+ vcpkg_install_nmake(
+ SOURCE_PATH "${SOURCE_PATH}"
+ PROJECT_NAME "Makefile"
+ PREFER_JOM
+ PRERUN_SHELL_RELEASE
+ "${PYTHON3}" "${SOURCE_PATH}/configure.py"
+ ${configure_arguments}
+ "--prefix=${CURRENT_PACKAGES_DIR}"
+ "--msvc-runtime=${BOTAN_MSVC_RUNTIME}"
+ "--with-external-libdir=${CURRENT_INSTALLED_DIR}/lib"
+ PRERUN_SHELL_DEBUG
+ "${PYTHON3}" "${SOURCE_PATH}/configure.py"
+ ${configure_arguments}
+ "--prefix=${CURRENT_PACKAGES_DIR}/debug"
+ "--msvc-runtime=${BOTAN_MSVC_RUNTIME}d"
+ "--with-external-libdir=${CURRENT_INSTALLED_DIR}/debug/lib"
+ --debug-mode
+ OPTIONS
+ "CXX=\"${VCPKG_DETECTED_CMAKE_CXX_COMPILER}\""
+ "LINKER=\"${VCPKG_DETECTED_CMAKE_LINKER}\""
+ "AR=\"${VCPKG_DETECTED_CMAKE_AR}\""
+ "EXE_LINK_CMD=\"${VCPKG_DETECTED_CMAKE_LINKER}\" ${VCPKG_LINKER_FLAGS}"
+ OPTIONS_RELEASE
+ "ZLIB_LIBS=${ZLIB_LIBS_RELEASE}"
+ OPTIONS_DEBUG
+ "ZLIB_LIBS=${ZLIB_LIBS_DEBUG}"
+ )
+ vcpkg_copy_tools(TOOL_NAMES botan-cli AUTO_CLEAN)
+ vcpkg_copy_pdbs()
+else()
+ if(VCPKG_TARGET_IS_ANDROID)
+ vcpkg_list(APPEND configure_arguments --os=android)
+ elseif(VCPKG_TARGET_IS_EMSCRIPTEN)
+ vcpkg_list(APPEND configure_arguments --os=emscripten)
+ elseif(VCPKG_TARGET_IS_MINGW)
+ vcpkg_list(APPEND configure_arguments --os=mingw)
+ endif()
+
+ if(VCPKG_TARGET_IS_EMSCRIPTEN)
+ vcpkg_list(APPEND configure_arguments --cc=emcc)
+ elseif(VCPKG_DETECTED_CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
+ vcpkg_list(APPEND configure_arguments --cc=gcc)
+ elseif(VCPKG_DETECTED_CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+ vcpkg_list(APPEND configure_arguments --cc=clang)
+ endif()
+ # botan's install.py doesn't handle DESTDIR on windows host,
+ # so we must avoid the standard '--prefix' and 'DESTDIR' install.
+ vcpkg_configure_make(
+ SOURCE_PATH "${SOURCE_PATH}"
+ DISABLE_VERBOSE_FLAGS
+ NO_ADDITIONAL_PATHS
+ OPTIONS
+ "${PYTHON3}" "${SOURCE_PATH}/configure.py"
+ ${configure_arguments}
+ OPTIONS_RELEASE
+ "--prefix=${CURRENT_PACKAGES_DIR}"
+ "--with-external-libdir=${CURRENT_INSTALLED_DIR}/lib"
+ OPTIONS_DEBUG
+ --debug-mode
+ "--prefix=${CURRENT_PACKAGES_DIR}/debug"
+ "--with-external-libdir=${CURRENT_INSTALLED_DIR}/debug/lib"
+ )
+ vcpkg_build_make(
+ BUILD_TARGET install
+ OPTIONS
+ "ZLIB_LIBS_RELEASE=${ZLIB_LIBS_RELEASE}"
+ "ZLIB_LIBS_DEBUG=${ZLIB_LIBS_DEBUG}"
+ )
+ if(NOT VCPKG_TARGET_IS_EMSCRIPTEN)
+ vcpkg_copy_tools(TOOL_NAMES botan AUTO_CLEAN)
+ endif()
+endif()
+
+vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/Botan-3.3.0)
+
+file(RENAME "${CURRENT_PACKAGES_DIR}/include/botan-3/botan" "${CURRENT_PACKAGES_DIR}/include/botan")
+
+if(pkgconfig_requires)
+ list(JOIN pkgconfig_requires ", " pkgconfig_requires)
+ file(APPEND "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/botan-3.pc" "Requires.private: ${pkgconfig_requires}")
+ if(NOT VCPKG_BUILD_TYPE)
+ file(APPEND "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/botan-3.pc" "Requires.private: ${pkgconfig_requires}")
+ endif()
+endif()
+vcpkg_fixup_pkgconfig()
+
+file(REMOVE_RECURSE
+ "${CURRENT_PACKAGES_DIR}/debug/include"
+ "${CURRENT_PACKAGES_DIR}/debug/share"
+ "${CURRENT_PACKAGES_DIR}/include/botan-3"
+)
+
+vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/botan/build.h" "#define BOTAN_INSTALL_PREFIX R\"(${CURRENT_PACKAGES_DIR})\"" "")
+vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/botan/build.h" "#define BOTAN_INSTALL_LIB_DIR R\"(${CURRENT_PACKAGES_DIR}\\lib)\"" "" IGNORE_UNCHANGED)
+vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/botan/build.h" "#define BOTAN_INSTALL_LIB_DIR R\"(${CURRENT_PACKAGES_DIR}/lib)\"" "" IGNORE_UNCHANGED)
+vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/botan/build.h" "--prefix=${CURRENT_PACKAGES_DIR}" "")
+
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/license.txt")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rehex-0.62.0/msvc/vcpkg-deploy/ports/botan/processor-rng-rdrand.patch new/rehex-0.62.1/msvc/vcpkg-deploy/ports/botan/processor-rng-rdrand.patch
--- old/rehex-0.62.0/msvc/vcpkg-deploy/ports/botan/processor-rng-rdrand.patch 1970-01-01 01:00:00.000000000 +0100
+++ new/rehex-0.62.1/msvc/vcpkg-deploy/ports/botan/processor-rng-rdrand.patch 2024-07-24 22:31:16.000000000 +0200
@@ -0,0 +1,9 @@
+--- a/src/lib/rng/processor_rng/info.txt
++++ b/src/lib/rng/processor_rng/info.txt
+@@ -19,4 +19,6 @@
+
+ <isa>
++x86_32:rdrand
++x86_64:rdrand
+ ppc64:power9
+ </isa>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rehex-0.62.0/msvc/vcpkg-deploy/ports/botan/vcpkg.json new/rehex-0.62.1/msvc/vcpkg-deploy/ports/botan/vcpkg.json
--- old/rehex-0.62.0/msvc/vcpkg-deploy/ports/botan/vcpkg.json 1970-01-01 01:00:00.000000000 +0100
+++ new/rehex-0.62.1/msvc/vcpkg-deploy/ports/botan/vcpkg.json 2024-07-24 22:31:16.000000000 +0200
@@ -0,0 +1,34 @@
+{
+ "name": "botan",
+ "version": "3.3.0",
+ "port-version": 2,
+ "description": "A cryptography library written in C++11",
+ "homepage": "https://botan.randombit.net",
+ "license": "BSD-2-Clause",
+ "supports": "!uwp",
+ "dependencies": [
+ {
+ "name": "vcpkg-cmake-config",
+ "host": true
+ },
+ {
+ "name": "vcpkg-cmake-get-vars",
+ "host": true
+ }
+ ],
+ "features": {
+ "amalgamation": {
+ "description": "Do an amalgamation build of the library"
+ },
+ "zlib": {
+ "description": "Build with zlib. Enable compression pipes.",
+ "dependencies": [
+ {
+ "name": "vcpkg-pkgconfig-get-modules",
+ "host": true
+ },
+ "zlib"
+ ]
+ }
+ }
+}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rehex-0.62.0/msvc/vcpkg-deploy/ports/botan/verbose-install.patch new/rehex-0.62.1/msvc/vcpkg-deploy/ports/botan/verbose-install.patch
--- old/rehex-0.62.0/msvc/vcpkg-deploy/ports/botan/verbose-install.patch 1970-01-01 01:00:00.000000000 +0100
+++ new/rehex-0.62.1/msvc/vcpkg-deploy/ports/botan/verbose-install.patch 2024-07-24 22:31:16.000000000 +0200
@@ -0,0 +1,13 @@
+diff --git a/src/build-data/makefile.in b/src/build-data/makefile.in
+index 1d50a31..64789a5 100644
+--- a/src/build-data/makefile.in
++++ b/src/build-data/makefile.in
+@@ -61,7 +61,7 @@ distclean:
+ "$(PYTHON_EXE)" "$(SCRIPTS_DIR)/cleanup.py" --build-dir="%{build_dir}" --distclean
+
+ install: %{install_targets}
+- "$(PYTHON_EXE)" "$(SCRIPTS_DIR)/install.py" --build-dir="%{build_dir}"
++ "$(PYTHON_EXE)" "$(SCRIPTS_DIR)/install.py" --build-dir="%{build_dir}" --verbose
+
+ check: tests
+ "$(PYTHON_EXE)" "$(SCRIPTS_DIR)/check.py" --build-dir="%{build_dir}"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rehex-0.62.0/msvc/vcpkg-deploy/triplets/x64-win-llvm/x64-win-llvm.toolchain.cmake new/rehex-0.62.1/msvc/vcpkg-deploy/triplets/x64-win-llvm/x64-win-llvm.toolchain.cmake
--- old/rehex-0.62.0/msvc/vcpkg-deploy/triplets/x64-win-llvm/x64-win-llvm.toolchain.cmake 2024-07-20 15:00:14.000000000 +0200
+++ new/rehex-0.62.1/msvc/vcpkg-deploy/triplets/x64-win-llvm/x64-win-llvm.toolchain.cmake 2024-07-24 22:31:16.000000000 +0200
@@ -53,11 +53,14 @@
cmake_language(DEFER CALL add_compile_options "/WX-") # make sure the flag is added at the end!
# general architecture flags
-set(arch_flags "-mcrc32 -msse4.2 -maes -mpclmul")
+# set(arch_flags "-mcrc32 -msse4.2 -maes -mpclmul")
# -mcrc32 for libpq
# -mrtm for tbb (will break qtdeclarative since it cannot run the executables in CI)
# -msse4.2 for everything which normally cl can use. (Otherwise strict sse2 only.)
# -maes -mpclmul mbedtls
+
+set(arch_flags "-march=pentium-mmx")
+
if(VCPKG_TARGET_ARCHITECTURE STREQUAL x86)
string(APPEND arch_flags " -m32 --target=i686-pc-windows-msvc")
endif()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rehex-0.62.0/msvc/wxfreechart/wxfreechart.vcxproj new/rehex-0.62.1/msvc/wxfreechart/wxfreechart.vcxproj
--- old/rehex-0.62.0/msvc/wxfreechart/wxfreechart.vcxproj 2024-07-20 15:00:14.000000000 +0200
+++ new/rehex-0.62.1/msvc/wxfreechart/wxfreechart.vcxproj 2024-07-24 22:31:16.000000000 +0200
@@ -163,6 +163,7 @@
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+ <AdditionalOptions>-march=pentium-mmx %(AdditionalOptions)</AdditionalOptions>
</ClCompile>
<Link>
<SubSystem>
@@ -182,6 +183,7 @@
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+ <AdditionalOptions>-march=pentium-mmx %(AdditionalOptions)</AdditionalOptions>
</ClCompile>
<Link>
<SubSystem>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rehex-0.62.0/msvc/wxlua/wxlua.vcxproj new/rehex-0.62.1/msvc/wxlua/wxlua.vcxproj
--- old/rehex-0.62.0/msvc/wxlua/wxlua.vcxproj 2024-07-20 15:00:14.000000000 +0200
+++ new/rehex-0.62.1/msvc/wxlua/wxlua.vcxproj 2024-07-24 22:31:16.000000000 +0200
@@ -113,6 +113,7 @@
<DisableSpecificWarnings>4996</DisableSpecificWarnings>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+ <AdditionalOptions>-march=pentium-mmx %(AdditionalOptions)</AdditionalOptions>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
@@ -131,6 +132,7 @@
<DisableSpecificWarnings>4996</DisableSpecificWarnings>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+ <AdditionalOptions>-march=pentium-mmx %(AdditionalOptions)</AdditionalOptions>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rehex-0.62.0/res/Info.plist new/rehex-0.62.1/res/Info.plist
--- old/rehex-0.62.0/res/Info.plist 2024-07-20 15:00:14.000000000 +0200
+++ new/rehex-0.62.1/res/Info.plist 2024-07-24 22:31:16.000000000 +0200
@@ -12,7 +12,7 @@
<string>net.solemnwarning.rehex</string>
<key>CFBundleVersion</key>
- <string>0.62.0</string>
+ <string>0.62.1</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package rancher-cli for openSUSE:Factory checked in at 2024-07-25 15:39:33
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/rancher-cli (Old)
and /work/SRC/openSUSE:Factory/.rancher-cli.new.1882 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "rancher-cli"
Thu Jul 25 15:39:33 2024 rev:11 rq:1189463 version:2.9.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/rancher-cli/rancher-cli.changes 2024-05-20 18:12:47.136873699 +0200
+++ /work/SRC/openSUSE:Factory/.rancher-cli.new.1882/rancher-cli.changes 2024-07-25 16:00:34.238739043 +0200
@@ -1,0 +2,55 @@
+Wed Jul 24 18:01:54 UTC 2024 - opensuse_buildservice(a)ojkastl.de
+
+- Update to version 2.9.0:
+ * [v2.9] Bump dependencies (#377)
+ * [v2.9] Upload CLI assets to GCS (#379)
+ * [v2.9][forwardport] Small refactor (error messages) (#375)
+ * use Rancher org FOSSA secret (#373)
+ * add codeowners file
+ * avoid recursive find and inclusion of sha256sum.txt file in
+ shasum (#368)
+ * Fix GitHub Action permission to publish assets (#367)
+ * [v2.9] Migrate from Drone to Github Actions, remove Dapper and
+ add Darwin/arm64 support (#362)
+ * GHA migration: secrets check (#365)
+ * Azuread support (#346)
+ * [v2.9] Updated `k8s.io/client-go` and `rancher/norman`
+ dependencies (#358)
+ * Added linter and removed deprecated and unused packages (#357)
+ * bump to go1.22 (#355)
+ * added test to serverLs, edded config to tabwriter
+ * added serverDelete tests, fix for delete current
+ * changed visibility of server commands funcs
+ * moved cfg to server command
+ * added parallel test
+ * updated tests
+ * validate as beforeFunc
+ * added tests
+ * fix server current panic, server commands refactor
+ * fix panic
+ * fix panics
+ * make runnable on windows
+ * Update saml auth login endpoint to dashboard endpoint
+ * Add missing packages after moving Dapper image to BCI (#339)
+ * Bump Go and Dockerfile versions
+
+-------------------------------------------------------------------
+Wed Jul 24 17:48:32 UTC 2024 - opensuse_buildservice(a)ojkastl.de
+
+- Update to version 2.8.6 (no release 2.8.5):
+ * [v2.8] Bump dependencies (#376)
+ * fix for assets dfestination (#381)
+ * fix for env var (#380)
+ * upload assets to gcs (#378)
+ * [v2.8] Small refactor (error messages) (#374)
+ * [v2.8] [backport] AzureAD support (#363)
+ * use Rancher org FOSSA secret (#372)
+ * Add CODEOWNERS file (#370)
+ * [v2.8][backport] Migrate from Drone to Github Actions, remove
+ Dapper and add Darwin/arm64 support (#366)
+ * bump of k8s.io/client-go and rancher norman (#361)
+ * [v2.8] [backport] Added linter and removed deprecated and
+ unused packages (#357) (#359)
+ * bump to go1.21 (#360)
+
+-------------------------------------------------------------------
Old:
----
cli-2.8.4.obscpio
New:
----
cli-2.9.0.obscpio
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ rancher-cli.spec ++++++
--- /var/tmp/diff_new_pack.HIHoEW/_old 2024-07-25 16:00:35.006769752 +0200
+++ /var/tmp/diff_new_pack.HIHoEW/_new 2024-07-25 16:00:35.010769913 +0200
@@ -18,17 +18,18 @@
%define __arch_install_post export NO_BRP_STRIP_DEBUG=true
Name: rancher-cli
-Version: 2.8.4
+Version: 2.9.0
Release: 0
Summary: Rancher CLI
License: Apache-2.0
URL: https://github.com/rancher/cli
Source: cli-%{version}.tar.gz
Source1: vendor.tar.gz
-BuildRequires: golang(API) = 1.20
+BuildRequires: golang(API) = 1.22
%description
-The Rancher Command Line Interface (CLI) is a unified tool for interacting with your Rancher Server.
+The Rancher Command Line Interface (CLI) is a unified tool for interacting with
+your Rancher Server.
For usage information see: https://rancher.com/docs/rancher/v2.x/en/cli/
%prep
@@ -37,6 +38,7 @@
%build -n cli-%{version}
go build \
-mod=vendor \
+ -buildmode=pie \
-ldflags="-X main.Version=%{version}"
%install
++++++ _service ++++++
--- /var/tmp/diff_new_pack.HIHoEW/_old 2024-07-25 16:00:35.042771192 +0200
+++ /var/tmp/diff_new_pack.HIHoEW/_new 2024-07-25 16:00:35.046771352 +0200
@@ -3,7 +3,7 @@
<param name="url">https://github.com/rancher/cli</param>
<param name="scm">git</param>
<param name="exclude">.git</param>
- <param name="revision">v2.8.4</param>
+ <param name="revision">v2.9.0</param>
<param name="versionformat">@PARENT_TAG@</param>
<param name="changesgenerate">enable</param>
<param name="versionrewrite-pattern">v(.*)</param>
@@ -16,7 +16,7 @@
<param name="compression">gz</param>
</service>
<service name="go_modules" mode="manual">
- <param name="archive">cli-2.8.4.obscpio</param>
+ <param name="archive">cli-2.9.0.obscpio</param>
</service>
</services>
++++++ _servicedata ++++++
--- /var/tmp/diff_new_pack.HIHoEW/_old 2024-07-25 16:00:35.066772152 +0200
+++ /var/tmp/diff_new_pack.HIHoEW/_new 2024-07-25 16:00:35.070772311 +0200
@@ -1,6 +1,6 @@
<servicedata>
<service name="tar_scm">
<param name="url">https://github.com/rancher/cli</param>
- <param name="changesrevision">a45136af410c886f5e201776060cacda5d5eb853</param></service></servicedata>
+ <param name="changesrevision">fbbf20571a909e9fe3c6ced17b39fbbc5dce2ee0</param></service></servicedata>
(No newline at EOF)
++++++ cli-2.8.4.obscpio -> cli-2.9.0.obscpio ++++++
++++ 4904 lines of diff (skipped)
++++++ cli.obsinfo ++++++
--- /var/tmp/diff_new_pack.HIHoEW/_old 2024-07-25 16:00:35.214778070 +0200
+++ /var/tmp/diff_new_pack.HIHoEW/_new 2024-07-25 16:00:35.218778229 +0200
@@ -1,5 +1,5 @@
name: cli
-version: 2.8.4
-mtime: 1712339984
-commit: a45136af410c886f5e201776060cacda5d5eb853
+version: 2.9.0
+mtime: 1721252468
+commit: fbbf20571a909e9fe3c6ced17b39fbbc5dce2ee0
++++++ vendor.tar.gz ++++++
/work/SRC/openSUSE:Factory/rancher-cli/vendor.tar.gz /work/SRC/openSUSE:Factory/.rancher-cli.new.1882/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 python313 for openSUSE:Factory checked in at 2024-07-25 15:38:59
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python313 (Old)
and /work/SRC/openSUSE:Factory/.python313.new.1882 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python313"
Thu Jul 25 15:38:59 2024 rev:3 rq:1189339 version:3.13.0~b4
Changes:
--------
--- /work/SRC/openSUSE:Factory/python313/python313.changes 2024-07-12 17:04:56.896791301 +0200
+++ /work/SRC/openSUSE:Factory/.python313.new.1882/python313.changes 2024-07-25 16:00:13.093893554 +0200
@@ -1,0 +2,152 @@
+Wed Jul 24 08:30:54 UTC 2024 - Daniel Garcia <daniel.garcia(a)suse.com>
+
+- Update F00251-change-user-install-location.patch to install packages
+ in /usr/local by default when using pip outside of a RPMBUILD
+ environment.
+
+-------------------------------------------------------------------
+Mon Jul 22 18:55:00 UTC 2024 - Matej Cepl <mcepl(a)cepl.eu>
+
+- Update to 3.13.0~b4:
+ - Tests
+ - gh-121084: Fix test_typing random leaks. Clear typing ABC
+ caches when running tests for refleaks (-R option): call
+ _abc_caches_clear() on typing abstract classes and their
+ subclasses.
+ - gh-121160: Add a test for
+ readline.set_history_length(). Note that this test may fail
+ on readline libraries.
+ - gh-121200: Fix test_expanduser_pwd2() of
+ test_posixpath. Call getpwnam() to get pw_dir, since it
+ can be different than getpwall() pw_dir.
+ - gh-121188: When creating the JUnit XML file, regrtest
+ now escapes characters which are invalid in XML, such
+ as the chr(27) control character used in ANSI escape
+ sequences.
+ - Library
+ - gh-57141: The shallow argument to filecmp.dircmp (new in
+ Python 3.13) is now keyword-only.
+ - gh-121245: Simplify handling of the history file in
+ site.register_readline() helper. The CAN_USE_PYREPL
+ variable now will be initialized, when imported.
+ - gh-121332: Fix constructor of ast nodes with custom
+ _attributes. Previously, passing custom attributes would
+ raise a DeprecationWarning. Passing arguments to the
+ constructor that are not in _fields or _attributes remains
+ deprecated.
+ - gh-121279: Avoid NameError for the warnings module when
+ accessing the depracated atributes of the importlib.abc
+ module.
+ - gh-121245: Fix a bug in the handling of the command history
+ of the new REPL that caused the history file to be wiped at
+ REPL exit.
+ - gh-87744: Fix waitpid race while calling send_signal() in
+ asyncio.
+ - gh-121018: Fixed other issues where argparse.ArgumentParser
+ did not honor exit_on_error=False.
+ - gh-120678: Fix regression in the new REPL that meant that
+ globals from files passed using the -i argument would not
+ be included in the REPL’s global namespace.
+ - gh-120782: Fix wrong references of the datetime types after
+ reloading the module.
+ - gh-120713: datetime.datetime.strftime() now 0-pads years
+ with less than four digits for the format specifiers %Y and
+ %G on Linux.
+ - gh-117983: Defer the threading import in importlib.util
+ until lazy loading is used.
+ - gh-119189: When using the ** operator or pow() with
+ Fraction as the base and an exponent that is not rational,
+ a float, or a complex, the fraction is no longer converted
+ to a float.
+ - gh-118714: Allow restart in post-mortem debugging of
+ pdb. Removed restart message when the user quits pdb from
+ post-mortem mode.
+ - gh-105623: Fix performance degradation in
+ logging.handlers.RotatingFileHandler.
+ - IDLE
+ - gh-78889: Stop Shell freezes by blocking user access to
+ non-method sys.stdout.shell attributes, which are all
+ private.
+ - Documentation
+ - gh-121749: Fix documentation for PyModule_AddObjectRef().
+ - gh-120012: Clarify the behaviours of
+ multiprocessing.Queue.empty() and
+ multiprocessing.SimpleQueue.empty() on closed queues.
+ - Core and Builtins
+ - gh-121860: Fix crash when rematerializing a managed
+ dictionary after it was deleted.
+ - gh-121814: Fixed the SegFault when PyEval_SetTrace() is
+ used with no Python frame on stack.
+ - gh-121295: Fix PyREPL console getting into a blocked state
+ after interrupting a long paste
+ - gh-121794: Fix bug in free-threaded Python where a
+ resurrected object could lead to a negative ref count
+ assertion failure.
+ - gh-121657: Improve the SyntaxError message if the user
+ tries to use yield from outside a function.
+ - gh-121609: Fix pasting of characters containing unicode
+ character joiners in the new REPL. Patch by Marta Gomez
+ Macias
+ - gh-117482: Unexpected slot wrappers are no longer created
+ for builtin static types in subinterpreters.
+ - gh-121499: Fix a bug affecting how multi-line history was
+ being rendered in the new REPL after interacting with the
+ new screen cache. Patch by Pablo Galindo
+ - gh-121497: Fix a bug that was preventing the REPL to
+ correctly respect the history when an input hook was
+ set. Patch by Pablo Galindo
+ - gh-121012: Tier 2 execution now ensures that list iterators
+ remain exhausted, once they become exhausted.
+ - gh-121439: Allow tuples of length 20 in the freelist to be
+ reused.
+ - gh-121368: Fix race condition in _PyType_Lookup in the
+ free-threaded build due to a missing memory fence. This
+ could lead to _PyType_Lookup returning incorrect results on
+ arm64.
+ - gh-121130: Fix f-strings with debug expressions in format
+ specifiers. Patch by Pablo Galindo
+ - gh-121115: PyLong_AsNativeBytes() no longer
+ uses __index__() methods by default. The
+ Py_ASNATIVEBYTES_ALLOW_INDEX flag has been added to allow
+ it.
+ - C API
+ - gh-89364: Export the PySignal_SetWakeupFd()
+ function. Previously, the function was documented but
+ it couldn’t be used in 3rd party code. Patch by Victor
+ Stinner.
+ - gh-113993: PyUnicode_InternInPlace() no longer
+ Seprevents its argument from being garbage collected
+ Several functions that take char * are now documented
+ Seas possibly preventing string objects from being
+ Segarbage collected; refer to their documentation
+ Sefor details: PyUnicode_InternFromString(),
+ SePyDict_SetItemString(), PyObject_SetAttrString(),
+ SePyObject_DelAttrString(), PyUnicode_InternFromString(),
+ Seand PyModule_Add* convenience functions
+ - gh-113601: Removed debug build assertions related to
+ interning strings, which were falsely triggered by stable
+ ABI extensions.
+ - gh-112136: Restore the private _PyArg_Parser structure and
+ the private _PyArg_ParseTupleAndKeywordsFast() function,
+ previously removed in Python 3.13 alpha 1. Patch by Victor
+ Stinner.
+ - Build
+ - gh-120371: Support WASI SDK 22 by explicitly skipping
+ functions that are just stubs in wasi-libc.
+ - gh-121731: Fix mimalloc compile error on GNU/Hurd
+ - gh-121487: Fix deprecation warning for ATOMIC_VAR_INIT in
+ mimalloc.
+ - gh-121467: Fix a Makefile bug that prevented mimalloc
+ header files from being installed.
+ - gh-121103: On POSIX systems, excluding macOS framework
+ installs, the lib directory for the free-threaded build now
+ includes a “t” suffix to avoid conflicts with a co-located
+ default build installation.
+ - gh-120831: The default minimum iOS version was increased to
+ 13.0.
+ - gh-113565: Improve curses and curses.panel dependency
+ checks in configure.
+- Remove %suse_update_desktop_file macro as it is not useful any
+ more.
+
+-------------------------------------------------------------------
Old:
----
Python-3.13.0b3.tar.xz
Python-3.13.0b3.tar.xz.asc
New:
----
Python-3.13.0b4.tar.xz
Python-3.13.0b4.tar.xz.asc
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python313.spec ++++++
--- /var/tmp/diff_new_pack.062U7W/_old 2024-07-25 16:00:13.985929223 +0200
+++ /var/tmp/diff_new_pack.062U7W/_new 2024-07-25 16:00:13.985929223 +0200
@@ -112,8 +112,8 @@
%define dynlib() %{sitedir}/lib-dynload/%{1}.cpython-%{abi_tag}-%{archname}-%{_os}%{?_gnu}%{?armsuffix}.so
%bcond_without profileopt
Name: %{python_pkg_name}%{psuffix}
-Version: 3.13.0~b3
-%define tarversion 3.13.0b3
+Version: 3.13.0~b4
+%define tarversion 3.13.0b4
%define tarname Python-%{tarversion}
Release: 0
Summary: Python 3 Interpreter
@@ -218,7 +218,6 @@
BuildRequires: readline-devel
BuildRequires: sqlite-devel
BuildRequires: timezone
-BuildRequires: update-desktop-files
BuildRequires: pkgconfig(ncurses)
BuildRequires: pkgconfig(tk)
BuildRequires: pkgconfig(x11)
@@ -680,7 +679,6 @@
cp %{SOURCE19} idle%{python_version}.desktop
sed -i -e 's:idle3:idle%{python_version}:g' idle%{python_version}.desktop
install -m 644 -D -t %{buildroot}%{_datadir}/applications idle%{python_version}.desktop
-%suse_update_desktop_file idle%{python_version}
cp %{SOURCE20} idle%{python_version}.appdata.xml
sed -i -e 's:idle3.desktop:idle%{python_version}.desktop:g' idle%{python_version}.appdata.xml
@@ -793,6 +791,7 @@
%files -n %{python_pkg_name}-curses
%{sitedir}/curses
%{dynlib _curses}
+%{dynlib _curses_panel}
%files -n %{python_pkg_name}-dbm
%{sitedir}/dbm
++++++ F00251-change-user-install-location.patch ++++++
--- /var/tmp/diff_new_pack.062U7W/_old 2024-07-25 16:00:14.013930342 +0200
+++ /var/tmp/diff_new_pack.062U7W/_new 2024-07-25 16:00:14.017930502 +0200
@@ -24,31 +24,15 @@
Co-authored-by: Michal Cyprian <m.cyprian(a)gmail.com>
Co-authored-by: Lumír Balhar <frenzy.madness(a)gmail.com>
---
- Lib/site.py | 9 ++++++++-
- Lib/test/test_sysconfig.py | 17 +++++++++++++++--
- 2 files changed, 23 insertions(+), 3 deletions(-)
+ Lib/site.py | 9 ++++++-
+ Lib/sysconfig.py | 49 +++++++++++++++++++++++++++++++++++++-
+ Lib/test/test_sysconfig.py | 17 +++++++++++--
+ 3 files changed, 71 insertions(+), 4 deletions(-)
---- a/Lib/site.py
-+++ b/Lib/site.py
-@@ -406,8 +406,15 @@ def getsitepackages(prefixes=None):
- return sitepackages
-
- def addsitepackages(known_paths, prefixes=None):
-- """Add site-packages to sys.path"""
-+ """Add site-packages to sys.path
-+
-+ '/usr/local' is included in PREFIXES if RPM build is not detected
-+ to make packages installed into this location visible.
-+
-+ """
- _trace("Processing global site-packages")
-+ if ENABLE_USER_SITE and 'RPM_BUILD_ROOT' not in os.environ:
-+ PREFIXES.insert(0, "/usr/local")
- for sitedir in getsitepackages(prefixes):
- if os.path.isdir(sitedir):
- addsitedir(sitedir, known_paths)
---- a/Lib/test/test_sysconfig.py
-+++ b/Lib/test/test_sysconfig.py
+Index: Python-3.13.0b4/Lib/test/test_sysconfig.py
+===================================================================
+--- Python-3.13.0b4.orig/Lib/test/test_sysconfig.py
++++ Python-3.13.0b4/Lib/test/test_sysconfig.py
@@ -121,8 +121,19 @@ class TestSysConfig(unittest.TestCase):
for scheme in _INSTALL_SCHEMES:
for name in _INSTALL_SCHEMES[scheme]:
@@ -88,4 +72,82 @@
def test_user_similar(self):
# Issue #8759: make sure the posix scheme for the users
# is similar to the global posix_prefix one
+Index: Python-3.13.0b4/Lib/sysconfig/__init__.py
+===================================================================
+--- Python-3.13.0b4.orig/Lib/sysconfig/__init__.py
++++ Python-3.13.0b4/Lib/sysconfig/__init__.py
+@@ -106,6 +106,11 @@ if os.name == 'nt':
+ else:
+ _INSTALL_SCHEMES['venv'] = _INSTALL_SCHEMES['posix_venv']
+
++# For a brief period of time in the Fedora 36 life cycle,
++# this installation scheme existed and was documented in the release notes.
++# For backwards compatibility, we keep it here (at least on 3.10 and 3.11).
++_INSTALL_SCHEMES['rpm_prefix'] = _INSTALL_SCHEMES['posix_prefix']
++
+ def _get_implementation():
+ return 'Python'
+
+@@ -167,6 +172,19 @@ if _HAS_USER_BASE:
+ },
+ }
+
++# This is used by distutils.command.install in the stdlib
++# as well as pypa/distutils (e.g. bundled in setuptools).
++# The self.prefix value is set to sys.prefix + /local/
++# if neither RPM build nor virtual environment is
++# detected to make distutils install packages
++# into the separate location.
++# https://fedoraproject.org/wiki/Changes/Making_sudo_pip_safe
++if (not (hasattr(sys, 'real_prefix') or
++ sys.prefix != sys.base_prefix) and
++ 'RPM_BUILD_ROOT' not in os.environ):
++ _prefix_addition = '/local'
++
++
+ _SCHEME_KEYS = ('stdlib', 'platstdlib', 'purelib', 'platlib', 'include',
+ 'scripts', 'data')
+
+@@ -261,11 +279,40 @@ def _extend_dict(target_dict, other_dict
+ target_dict[key] = value
+
+
++_CONFIG_VARS_LOCAL = None
++
++
++def _config_vars_local():
++ # This function returns the config vars with prefixes amended to /usr/local
++ # https://fedoraproject.org/wiki/Changes/Making_sudo_pip_safe
++ global _CONFIG_VARS_LOCAL
++ if _CONFIG_VARS_LOCAL is None:
++ _CONFIG_VARS_LOCAL = dict(get_config_vars())
++ _CONFIG_VARS_LOCAL['base'] = '/usr/local'
++ _CONFIG_VARS_LOCAL['platbase'] = '/usr/local'
++ return _CONFIG_VARS_LOCAL
++
++
+ def _expand_vars(scheme, vars):
+ res = {}
+ if vars is None:
+ vars = {}
+- _extend_dict(vars, get_config_vars())
++
++ # when we are not in a virtual environment or an RPM build
++ # we change '/usr' to '/usr/local'
++ # to avoid surprises, we explicitly check for the /usr/ prefix
++ # Python virtual environments have different prefixes
++ # we only do this for posix_prefix, not to mangle the venv scheme
++ # posix_prefix is used by sudo pip install
++ # we only change the defaults here, so explicit --prefix will take precedence
++ # https://fedoraproject.org/wiki/Changes/Making_sudo_pip_safe
++ if (scheme == 'posix_prefix' and
++ _PREFIX == '/usr' and
++ 'RPM_BUILD_ROOT' not in os.environ):
++ _extend_dict(vars, _config_vars_local())
++ else:
++ _extend_dict(vars, get_config_vars())
++
+ if os.name == 'nt':
+ # On Windows we want to substitute 'lib' for schemes rather
+ # than the native value (without modifying vars, in case it
++++++ Python-3.13.0b3.tar.xz -> Python-3.13.0b4.tar.xz ++++++
/work/SRC/openSUSE:Factory/python313/Python-3.13.0b3.tar.xz /work/SRC/openSUSE:Factory/.python313.new.1882/Python-3.13.0b4.tar.xz differ: char 26, line 1
++++++ bpo-31046_ensurepip_honours_prefix.patch ++++++
--- /var/tmp/diff_new_pack.062U7W/_old 2024-07-25 16:00:14.113934341 +0200
+++ /var/tmp/diff_new_pack.062U7W/_new 2024-07-25 16:00:14.113934341 +0200
@@ -139,7 +139,7 @@
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
-@@ -2142,7 +2142,7 @@ install: @FRAMEWORKINSTALLFIRST@ @INSTAL
+@@ -2144,7 +2144,7 @@ install: @FRAMEWORKINSTALLFIRST@ @INSTAL
install|*) ensurepip="" ;; \
esac; \
$(RUNSHARED) $(PYTHON_FOR_BUILD) -m ensurepip \
@@ -148,7 +148,7 @@
fi
.PHONY: altinstall
-@@ -2153,7 +2153,7 @@ altinstall: commoninstall
+@@ -2155,7 +2155,7 @@ altinstall: commoninstall
install|*) ensurepip="--altinstall" ;; \
esac; \
$(RUNSHARED) $(PYTHON_FOR_BUILD) -m ensurepip \
++++++ fix_configure_rst.patch ++++++
--- /var/tmp/diff_new_pack.062U7W/_old 2024-07-25 16:00:14.141935461 +0200
+++ /var/tmp/diff_new_pack.062U7W/_new 2024-07-25 16:00:14.141935461 +0200
@@ -4,7 +4,7 @@
--- a/Misc/NEWS
+++ b/Misc/NEWS
-@@ -17608,7 +17608,7 @@ C API
+@@ -17527,7 +17527,7 @@ C API
- bpo-40939: Removed documentation for the removed ``PyParser_*`` C API.
- bpo-43795: The list in :ref:`limited-api-list` now shows the public name
++++++ python-3.3.0b1-fix_date_time_compiler.patch ++++++
--- /var/tmp/diff_new_pack.062U7W/_old 2024-07-25 16:00:14.213938340 +0200
+++ /var/tmp/diff_new_pack.062U7W/_new 2024-07-25 16:00:14.213938340 +0200
@@ -4,7 +4,7 @@
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
-@@ -1664,11 +1664,18 @@ Modules/getbuildinfo.o: $(PARSER_OBJS) \
+@@ -1666,11 +1666,18 @@ Modules/getbuildinfo.o: $(PARSER_OBJS) \
$(DTRACE_OBJS) \
$(srcdir)/Modules/getbuildinfo.c
$(CC) -c $(PY_CORE_CFLAGS) \
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package python-scikit-sparse for openSUSE:Factory checked in at 2024-07-25 15:39:47
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-scikit-sparse (Old)
and /work/SRC/openSUSE:Factory/.python-scikit-sparse.new.1882 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-scikit-sparse"
Thu Jul 25 15:39:47 2024 rev:8 rq:1189518 version:0.4.13
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-scikit-sparse/python-scikit-sparse.changes 2024-02-20 21:13:57.740996327 +0100
+++ /work/SRC/openSUSE:Factory/.python-scikit-sparse.new.1882/python-scikit-sparse.changes 2024-07-25 15:59:19.667740501 +0200
@@ -1,0 +2,12 @@
+Thu Jul 25 06:03:00 UTC 2024 - Steve Kowalik <steven.kowalik(a)suse.com>
+
+- Update to 0.4.13:
+ * Fix breaking changes in isspmatrix of scipy >=1.11.0, discontinuing
+ compatibility with csc_array
+ * remove numpy build restrictions
+- Drop patches scikit-sparse-py312.patch, scipy111.patch:
+ * Included upstream.
+- Add patch support-scipy-1.14.patch:
+ * Do not call a now removed method in scipy.
+
+-------------------------------------------------------------------
Old:
----
scikit-sparse-0.4.12.tar.gz
scikit-sparse-py312.patch
scipy111.patch
New:
----
scikit-sparse-0.4.13.tar.gz
support-scipy-1.14.patch
BETA DEBUG BEGIN:
Old: * remove numpy build restrictions
- Drop patches scikit-sparse-py312.patch, scipy111.patch:
* Included upstream.
Old: * remove numpy build restrictions
- Drop patches scikit-sparse-py312.patch, scipy111.patch:
* Included upstream.
BETA DEBUG END:
BETA DEBUG BEGIN:
New: * Included upstream.
- Add patch support-scipy-1.14.patch:
* Do not call a now removed method in scipy.
BETA DEBUG END:
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-scikit-sparse.spec ++++++
--- /var/tmp/diff_new_pack.rr0gMn/_old 2024-07-25 15:59:20.767784994 +0200
+++ /var/tmp/diff_new_pack.rr0gMn/_new 2024-07-25 15:59:20.783785641 +0200
@@ -19,20 +19,17 @@
# For license file
%define tag c94f8418b6c36c3ff9db4f87e00fc08bd51cfb4b
Name: python-scikit-sparse
-Version: 0.4.12
+Version: 0.4.13
Release: 0
Summary: Scikits sparse matrix package
License: GPL-2.0-or-later AND LGPL-2.1-or-later
-Group: Development/Languages/Python
URL: https://github.com/scikit-sparse/scikit-sparse/
Source: https://files.pythonhosted.org/packages/source/s/scikit-sparse/scikit-spars…
-# PATCH-FIX-UPSTREAM https://github.com/scikit-sparse/scikit-sparse/pull/102 Fix breaking changes in isspmatrix of scipy >=1.11.0
-Patch0: scipy111.patch
-# PATCH-FIX-UPSTREAM scikit-sparse-py312.patch gh#scikit-sparse/scikit-sparse#105
-Patch1: scikit-sparse-py312.patch
+# PATCH-FIX-UPSTREAM Based on gh#scikit-sparse/scikit-sparse#123
+Patch0: support-scipy-1.14.patch
BuildRequires: %{python_module Cython}
BuildRequires: %{python_module devel}
-BuildRequires: %{python_module numpy-devel >= 1.13.3}
+BuildRequires: %{python_module numpy-devel >= 1.23.3}
BuildRequires: %{python_module pip}
BuildRequires: %{python_module scipy >= 0.19}
BuildRequires: %{python_module setuptools >= 18.0}
@@ -40,7 +37,7 @@
BuildRequires: fdupes
BuildRequires: python-rpm-macros
BuildRequires: suitesparse-devel
-Requires: python-numpy >= 1.13.3
+Requires: python-numpy >= 1.23.3
Requires: python-scipy >= 0.18
ExcludeArch: %{ix86}
# SECTION test requirements
@@ -76,5 +73,5 @@
%doc README.md
%license LICENSE.txt
%{python_sitearch}/sksparse
-%{python_sitearch}/scikit_sparse-%{version}*-info
+%{python_sitearch}/scikit_sparse-%{version}.dist-info
++++++ scikit-sparse-0.4.12.tar.gz -> scikit-sparse-0.4.13.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/scikit-sparse-0.4.12/PKG-INFO new/scikit-sparse-0.4.13/PKG-INFO
--- old/scikit-sparse-0.4.12/PKG-INFO 2023-07-21 06:59:19.567062900 +0200
+++ new/scikit-sparse-0.4.13/PKG-INFO 2024-03-20 23:43:29.480010500 +0100
@@ -1,9 +1,9 @@
Metadata-Version: 2.1
Name: scikit-sparse
-Version: 0.4.12
+Version: 0.4.13
Summary: Scikit sparse matrix package
Home-page: https://github.com/scikit-sparse/scikit-sparse
-Maintainer: Justin Ellis
+Maintainer: Aaron Johnson
Maintainer-email: justin.ellis18(a)gmail.com
License: BSD
Classifier: Development Status :: 3 - Alpha
@@ -21,8 +21,11 @@
Classifier: Programming Language :: Python :: 3.9
Classifier: Programming Language :: Python :: 3.10
Classifier: Programming Language :: Python :: 3.11
-Requires-Python: >=3.6, <3.12
+Classifier: Programming Language :: Python :: 3.12
+Requires-Python: >=3.6
License-File: LICENSE.txt
+Requires-Dist: numpy>=1.13.3
+Requires-Dist: scipy>=0.19
Sparse matrix tools.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/scikit-sparse-0.4.12/README.md new/scikit-sparse-0.4.13/README.md
--- old/scikit-sparse-0.4.12/README.md 2023-07-21 06:58:55.000000000 +0200
+++ new/scikit-sparse-0.4.13/README.md 2024-03-20 23:43:07.000000000 +0100
@@ -2,7 +2,7 @@
[![PyPI](https://img.shields.io/pypi/v/scikit-sparse)](https://pypi.org/project/scikit-sparse/)
[![Conda Version](https://img.shields.io/conda/vn/conda-forge/scikit-sparse.svg)](ht…
[![GitHub Workflow Status (event)](https://img.shields.io/github/workflow/status/scikit-sparse/scikit-…)
-[![Python Versions](https://img.shields.io/badge/python-3.6%2C%203.7%2C%203.8%2C%203.9%2C%203.10-blue.svg)]()
+[![Python Versions](https://img.shields.io/badge/python-3.6%2C%203.7%2C%203.8%2C%203.9%2C%203.10%2C%203.11%2C%203.12-blue.svg)]()
[![GitHub license](https://img.shields.io/github/license/scikit-sparse/scikit-sparse)…
# scikit-sparse
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/scikit-sparse-0.4.12/pyproject.toml new/scikit-sparse-0.4.13/pyproject.toml
--- old/scikit-sparse-0.4.12/pyproject.toml 2023-07-21 06:58:55.000000000 +0200
+++ new/scikit-sparse-0.4.13/pyproject.toml 2024-03-20 23:43:07.000000000 +0100
@@ -25,11 +25,6 @@
"setuptools>=40.8.0",
"wheel",
"Cython>=0.22",
- 'numpy==1.13.3; python_version=="3.6"',
- 'numpy==1.14.5; python_version=="3.7"',
- 'numpy==1.17.3; python_version=="3.8"',
- 'numpy==1.19.3; python_version=="3.9"',
- 'numpy==1.23.1; python_version=="3.10"',
- 'numpy==1.23.5; python_version=="3.11"',
+ 'numpy>=1.13.3; python_version>="3.6"',
]
build-backend = "setuptools.build_meta"
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/scikit-sparse-0.4.12/scikit_sparse.egg-info/PKG-INFO new/scikit-sparse-0.4.13/scikit_sparse.egg-info/PKG-INFO
--- old/scikit-sparse-0.4.12/scikit_sparse.egg-info/PKG-INFO 2023-07-21 06:59:19.000000000 +0200
+++ new/scikit-sparse-0.4.13/scikit_sparse.egg-info/PKG-INFO 2024-03-20 23:43:29.000000000 +0100
@@ -1,9 +1,9 @@
Metadata-Version: 2.1
Name: scikit-sparse
-Version: 0.4.12
+Version: 0.4.13
Summary: Scikit sparse matrix package
Home-page: https://github.com/scikit-sparse/scikit-sparse
-Maintainer: Justin Ellis
+Maintainer: Aaron Johnson
Maintainer-email: justin.ellis18(a)gmail.com
License: BSD
Classifier: Development Status :: 3 - Alpha
@@ -21,8 +21,11 @@
Classifier: Programming Language :: Python :: 3.9
Classifier: Programming Language :: Python :: 3.10
Classifier: Programming Language :: Python :: 3.11
-Requires-Python: >=3.6, <3.12
+Classifier: Programming Language :: Python :: 3.12
+Requires-Python: >=3.6
License-File: LICENSE.txt
+Requires-Dist: numpy>=1.13.3
+Requires-Dist: scipy>=0.19
Sparse matrix tools.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/scikit-sparse-0.4.12/setup.py new/scikit-sparse-0.4.13/setup.py
--- old/scikit-sparse-0.4.12/setup.py 2023-07-21 06:58:55.000000000 +0200
+++ new/scikit-sparse-0.4.13/setup.py 2024-03-20 23:43:07.000000000 +0100
@@ -9,6 +9,7 @@
# 2016 Alex Grigorievskiy <alex.grigorievskiy(a)gmail.com>
# 2016-2017 Joscha Reimer <jor(a)informatik.uni-kiel.de>
# 2021- Justin Ellis <justin.ellis18(a)gmail.com>
+# 2022- Aaron Johnson <aaron9035(a)gmail.com>
"""Sparse matrix tools.
@@ -30,7 +31,7 @@
DISTNAME = "scikit-sparse"
DESCRIPTION = "Scikit sparse matrix package"
LONG_DESCRIPTION = __doc__
-MAINTAINER = "Justin Ellis"
+MAINTAINER = "Aaron Johnson"
MAINTAINER_EMAIL = "justin.ellis18(a)gmail.com"
URL = "https://github.com/scikit-sparse/scikit-sparse"
LICENSE = "BSD"
@@ -40,10 +41,13 @@
np.get_include(),
sys.prefix + "/include",
# Debian's suitesparse-dev installs to
- # /usr/include/suitesparse
"/usr/include/suitesparse",
+ # Homebrew macos-latest installs to
+ '/usr/local/opt/suite-sparse/include/suitesparse/',
+]
+LIBRARY_DIRS = [# Homebrew macos-latest installs to
+ '/usr/local/opt/suite-sparse/lib'
]
-LIBRARY_DIRS = []
user_include_dir = os.getenv("SUITESPARSE_INCLUDE_DIR")
user_library_dir = os.getenv("SUITESPARSE_LIBRARY_DIR")
@@ -55,13 +59,13 @@
setup(
install_requires=["numpy>=1.13.3", "scipy>=0.19"],
- python_requires=">=3.6, <3.12",
+ python_requires=">=3.6",
packages=find_packages(),
package_data={
"": ["test_data/*.mtx.gz"],
},
name=DISTNAME,
- version="0.4.12", # remember to update __init__.py
+ version="0.4.13", # remember to update __init__.py
maintainer=MAINTAINER,
maintainer_email=MAINTAINER_EMAIL,
description=DESCRIPTION,
@@ -84,6 +88,7 @@
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
+ "Programming Language :: Python :: 3.12",
],
# You may specify the directory where CHOLMOD is installed using the
# library_dirs and include_dirs keywords in the lines below.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/scikit-sparse-0.4.12/sksparse/__init__.py new/scikit-sparse-0.4.13/sksparse/__init__.py
--- old/scikit-sparse-0.4.12/sksparse/__init__.py 2023-07-21 06:58:55.000000000 +0200
+++ new/scikit-sparse-0.4.13/sksparse/__init__.py 2024-03-20 23:43:07.000000000 +0100
@@ -1 +1 @@
-__version__ = "0.4.12"
+__version__ = "0.4.13"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/scikit-sparse-0.4.12/sksparse/cholmod.pyx new/scikit-sparse-0.4.13/sksparse/cholmod.pyx
--- old/scikit-sparse-0.4.12/sksparse/cholmod.pyx 2023-07-21 06:58:55.000000000 +0200
+++ new/scikit-sparse-0.4.13/sksparse/cholmod.pyx 2024-03-20 23:43:07.000000000 +0100
@@ -403,12 +403,12 @@
warnings.warn(full_msg, CholmodWarning)
def _check_for_csc(m):
- if not sparse.isspmatrix_csc(m):
+ if not sparse.isspmatrix_csc(m) or (hasattr(sparse, "csc_array") and isinstance(m, sparse.csc_array)):
warnings.warn("converting matrix of class %s to CSC format"
% (m.__class__.__name__,),
CholmodTypeConversionWarning)
m = m.tocsc()
- assert sparse.isspmatrix_csc(m)
+ assert sparse.isspmatrix_csc(m) or (hasattr(sparse, "csc_array") and isinstance(m, sparse.csc_array))
return m
cdef class Common:
++++++ support-scipy-1.14.patch ++++++
From ebbbaa4882eeac8fd4a2f4bf8c94c9e6b967cf54 Mon Sep 17 00:00:00 2001
From: Steve Kowalik <steven(a)wedontsleep.org>
Date: Thu, 25 Jul 2024 15:35:29 +1000
Subject: [PATCH] Switch to csc_matrix.T.conjugate() from .H
With scipy 1.14 csc_matrix.H has been removed, after being deprecated in
1.12. T.conjugate() is the replacement method, switch to it.
---
tests/test_cholmod.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sksparse/test_cholmod.py b/sksparse/test_cholmod.py
index ed2af70..95bdb18 100644
--- a/sksparse/test_cholmod.py
+++ b/sksparse/test_cholmod.py
@@ -94,7 +94,7 @@ def complex_matrix():
def factor_of(factor, matrix):
return np.allclose(
- (factor.L() * factor.L().H).todense(), matrix.todense()[factor.P()[:, np.newaxis], factor.P()[np.newaxis, :]]
+ (factor.L() * factor.L().T.conjugate()).todense(), matrix.todense()[factor.P()[:, np.newaxis], factor.P()[np.newaxis, :]]
)
1
0