openSUSE Commits
Threads by month
- ----- 2025 -----
- February
- January
- ----- 2024 -----
- December
- 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
June 2022
- 1 participants
- 2040 discussions
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package rpm for openSUSE:Factory checked in at 2022-06-29 16:00:11
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/rpm (Old)
and /work/SRC/openSUSE:Factory/.rpm.new.1548 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "rpm"
Wed Jun 29 16:00:11 2022 rev:299 rq:985299 version:4.17.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/rpm/rpm.changes 2022-06-25 10:23:34.094614306 +0200
+++ /work/SRC/openSUSE:Factory/.rpm.new.1548/rpm.changes 2022-06-29 16:00:13.700523712 +0200
@@ -55,0 +56,5 @@
+Thu Jan 27 13:26:07 UTC 2022 - Ludwig Nussel <lnussel(a)suse.de>
+
+- make patches git quiltimport friendlier
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ rpm.spec ++++++
--- /var/tmp/diff_new_pack.9CbGFO/_old 2022-06-29 16:00:16.612528099 +0200
+++ /var/tmp/diff_new_pack.9CbGFO/_new 2022-06-29 16:00:16.616528105 +0200
@@ -88,7 +88,6 @@
Patch36: rpmqpack.diff
Patch38: build.diff
Patch43: rpm-shorten-changelog.diff
-Patch45: whatrequires-doc.diff
Patch46: remove-brp-strips.diff
Patch51: specfilemacro.diff
Patch60: safeugid.diff
@@ -118,6 +117,8 @@
Patch134: zstdthreaded.diff
Patch135: ocaml-cmxs.diff
Patch136: 0001-fix-minimize_writes.patch
+# touches a generated file
+Patch180: whatrequires-doc.diff
Patch200: finddebuginfo.diff
Patch201: finddebuginfo-absolute-links.diff
Patch202: debugsubpkg.diff
@@ -237,7 +238,7 @@
%patch -P 5 -P 12 -P 13 -P 16 -P 18
%patch -P 24 -P 25 -P 26 -P 29
%patch -P 30 -P 32 -P 33 -P 34 -P 36 -P 38
-%patch -P 43 -P 45 -P 46
+%patch -P 43 -P 46
%patch -P 51
%patch -P 60 -P 61 -P 66 -P 67 -P 69
%patch -P 70 -P 71 -P 73 -P 77 -P 78 -P 79
@@ -247,6 +248,7 @@
%patch -P 117
%patch -P 122 -P 123 -P 131 -P 132 -P 133 -P 134
%patch -P 135 -P 136
+%patch -P 180
# debugedit patches
pushd debugedit-5.0
++++++ assumeexec.diff ++++++
--- /var/tmp/diff_new_pack.9CbGFO/_old 2022-06-29 16:00:16.664528178 +0200
+++ /var/tmp/diff_new_pack.9CbGFO/_new 2022-06-29 16:00:16.668528183 +0200
@@ -1,5 +1,5 @@
---- ./tools/elfdeps.c.orig 2014-06-26 06:51:55.768815677 +0000
-+++ ./tools/elfdeps.c 2014-08-04 13:02:16.981081591 +0000
+--- tools/elfdeps.c.orig 2014-06-26 06:51:55.768815677 +0000
++++ tools/elfdeps.c 2014-08-04 13:02:16.981081591 +0000
@@ -17,6 +17,7 @@ int soname_only = 0;
int fake_soname = 1;
int filter_soname = 1;
++++++ brp-compress-no-img.patch ++++++
--- /var/tmp/diff_new_pack.9CbGFO/_old 2022-06-29 16:00:16.692528220 +0200
+++ /var/tmp/diff_new_pack.9CbGFO/_new 2022-06-29 16:00:16.692528220 +0200
@@ -1,5 +1,5 @@
---- ./scripts/brp-compress.orig 2020-09-30 13:09:28.846434576 +0000
-+++ ./scripts/brp-compress 2020-09-30 13:09:34.514422459 +0000
+--- scripts/brp-compress.orig 2020-09-30 13:09:28.846434576 +0000
++++ scripts/brp-compress 2020-09-30 13:09:34.514422459 +0000
@@ -51,6 +51,7 @@ do
find $d -type f ! -name dir | while read f
do
++++++ brp.diff ++++++
--- /var/tmp/diff_new_pack.9CbGFO/_old 2022-06-29 16:00:16.704528238 +0200
+++ /var/tmp/diff_new_pack.9CbGFO/_new 2022-06-29 16:00:16.704528238 +0200
@@ -1,5 +1,5 @@
---- ./scripts/brp-strip-comment-note.orig 2021-06-21 12:00:44.650612737 +0000
-+++ ./scripts/brp-strip-comment-note 2021-09-23 19:04:31.249193665 +0000
+--- scripts/brp-strip-comment-note.orig 2021-06-21 12:00:44.650612737 +0000
++++ scripts/brp-strip-comment-note 2021-09-23 19:04:31.249193665 +0000
@@ -16,6 +16,8 @@ esac
# for already stripped elf files in the build root
for f in `find "$RPM_BUILD_ROOT" -type f \( -perm -0100 -or -perm -0010 -or -perm -0001 \) -exec file {} \; | \
@@ -9,8 +9,8 @@
sed -n -e 's/^\(.*\):[ ]*ELF.*, stripped.*/\1/p'`; do
note="-R .note"
if $OBJDUMP -h $f | grep '^[ ]*[0-9]*[ ]*.note[ ]' -A 1 | \
---- ./scripts/brp-strip.orig 2021-09-23 19:04:31.249193665 +0000
-+++ ./scripts/brp-strip 2021-09-23 19:07:10.624868675 +0000
+--- scripts/brp-strip.orig 2021-09-23 19:04:31.249193665 +0000
++++ scripts/brp-strip 2021-09-23 19:07:10.624868675 +0000
@@ -14,4 +14,4 @@ esac
# Strip ELF binaries
++++++ brpcompress.diff ++++++
--- /var/tmp/diff_new_pack.9CbGFO/_old 2022-06-29 16:00:16.716528256 +0200
+++ /var/tmp/diff_new_pack.9CbGFO/_new 2022-06-29 16:00:16.720528262 +0200
@@ -1,5 +1,5 @@
---- ./scripts/brp-compress.orig 2020-05-28 10:04:25.075136894 +0000
-+++ ./scripts/brp-compress 2020-10-27 15:23:57.970737863 +0000
+--- scripts/brp-compress.orig 2020-05-28 10:04:25.075136894 +0000
++++ scripts/brp-compress 2020-10-27 15:23:57.970737863 +0000
@@ -5,6 +5,9 @@ if [ -z "$RPM_BUILD_ROOT" ] || [ "$RPM_B
exit 0
fi
++++++ checkfilesnoinfodir.diff ++++++
--- /var/tmp/diff_new_pack.9CbGFO/_old 2022-06-29 16:00:16.736528286 +0200
+++ /var/tmp/diff_new_pack.9CbGFO/_new 2022-06-29 16:00:16.736528286 +0200
@@ -1,8 +1,8 @@
Exclude /usr/share/info/dir from check-files. Probably only
interesting for SUSE.
---- ./scripts/check-files.orig 2020-09-30 12:36:56.398762048 +0000
-+++ ./scripts/check-files 2020-09-30 12:41:15.294176572 +0000
+--- scripts/check-files.orig 2020-09-30 12:36:56.398762048 +0000
++++ scripts/check-files 2020-09-30 12:41:15.294176572 +0000
@@ -28,5 +28,5 @@ trap "rm -f \"${FILES_DISK}\"" 0 2 3 5 1
# Find non-directory files in the build root and compare to the manifest.
# TODO: regex chars in last sed(1) expression should be escaped
++++++ checksepwarn.diff ++++++
--- /var/tmp/diff_new_pack.9CbGFO/_old 2022-06-29 16:00:16.748528304 +0200
+++ /var/tmp/diff_new_pack.9CbGFO/_new 2022-06-29 16:00:16.752528311 +0200
@@ -1,5 +1,5 @@
---- ./build/parseReqs.c.orig 2019-06-26 14:17:31.396985719 +0000
-+++ ./build/parseReqs.c 2019-10-02 12:10:51.879570016 +0000
+--- build/parseReqs.c.orig 2019-06-26 14:17:31.396985719 +0000
++++ build/parseReqs.c 2019-10-02 12:10:51.879570016 +0000
@@ -42,7 +42,7 @@ static rpmRC checkEpoch(const char *s, c
return RPMRC_OK;
}
@@ -55,8 +55,8 @@
goto exit;
if (nametag == RPMTAG_OBSOLETENAME) {
---- ./macros.in.orig 2019-10-02 12:10:45.431583601 +0000
-+++ ./macros.in 2019-10-02 12:10:51.879570016 +0000
+--- macros.in.orig 2019-10-02 12:10:45.431583601 +0000
++++ macros.in 2019-10-02 12:10:51.879570016 +0000
@@ -452,7 +452,7 @@ package or when debugging this package.\
%_invalid_encoding_terminates_build 1
++++++ db_conversion.diff ++++++
--- /var/tmp/diff_new_pack.9CbGFO/_old 2022-06-29 16:00:16.760528322 +0200
+++ /var/tmp/diff_new_pack.9CbGFO/_new 2022-06-29 16:00:16.764528329 +0200
@@ -1,5 +1,5 @@
---- ./lib/backend/bdb_ro.c.orig 2020-05-28 10:04:25.027136631 +0000
-+++ ./lib/backend/bdb_ro.c 2021-01-07 15:24:08.866776792 +0000
+--- lib/backend/bdb_ro.c.orig 2020-05-28 10:04:25.027136631 +0000
++++ lib/backend/bdb_ro.c 2021-01-07 15:24:08.866776792 +0000
@@ -790,6 +790,7 @@ static unsigned int bdbro_pkgdbKey(dbiIn
struct rpmdbOps_s bdbro_dbops = {
.name = "bdb_ro",
@@ -8,8 +8,8 @@
.open = bdbro_Open,
.close = bdbro_Close,
---- ./lib/backend/dbi.c.orig 2020-08-31 09:14:07.991087349 +0000
-+++ ./lib/backend/dbi.c 2021-01-07 15:24:08.866776792 +0000
+--- lib/backend/dbi.c.orig 2020-08-31 09:14:07.991087349 +0000
++++ lib/backend/dbi.c 2021-01-07 15:24:08.866776792 +0000
@@ -119,11 +119,20 @@ exit:
}
@@ -31,8 +31,8 @@
const char * dbiName(dbiIndex dbi)
{
return dbi->dbi_file;
---- ./lib/backend/dbi.h.orig 2021-01-07 15:23:56.122812108 +0000
-+++ ./lib/backend/dbi.h 2021-01-07 15:24:08.866776792 +0000
+--- lib/backend/dbi.h.orig 2021-01-07 15:23:56.122812108 +0000
++++ lib/backend/dbi.h 2021-01-07 15:24:08.866776792 +0000
@@ -11,6 +11,7 @@ enum rpmdbFlags {
RPMDB_FLAG_REBUILD = (1 << 1),
RPMDB_FLAG_VERIFYONLY = (1 << 2),
@@ -72,8 +72,8 @@
int (*open)(rpmdb rdb, rpmDbiTagVal rpmtag, dbiIndex * dbip, int flags);
int (*close)(dbiIndex dbi, unsigned int flags);
---- ./lib/backend/ndb/rpmpkg.c.orig 2021-01-07 15:24:37.266698082 +0000
-+++ ./lib/backend/ndb/rpmpkg.c 2021-01-07 15:27:46.678173133 +0000
+--- lib/backend/ndb/rpmpkg.c.orig 2021-01-07 15:24:37.266698082 +0000
++++ lib/backend/ndb/rpmpkg.c 2021-01-07 15:27:46.678173133 +0000
@@ -1116,11 +1116,12 @@ static int rpmpkgPutInternal(rpmpkgdb pk
if (rpmpkgWriteBlob(pkgdb, pkgidx, blkoff, blkcnt, blob, blobl, pkgdb->generation)) {
return RPMRC_FAIL;
@@ -90,8 +90,8 @@
if (rpmpkgWriteslot(pkgdb, slotno, pkgidx, blkoff, blkcnt)) {
free(pkgdb->slots);
pkgdb->slots = 0;
---- ./lib/rpmdb.c.orig 2021-01-07 15:23:56.122812108 +0000
-+++ ./lib/rpmdb.c 2021-01-07 15:24:08.866776792 +0000
+--- lib/rpmdb.c.orig 2021-01-07 15:23:56.122812108 +0000
++++ lib/rpmdb.c 2021-01-07 15:24:08.866776792 +0000
@@ -516,7 +516,13 @@ static int openDatabase(const char * pre
rpmsqActivate(1);
}
@@ -158,8 +158,8 @@
rc = 1;
goto exit;
}
---- ./lib/rpmdb_internal.h.orig 2020-05-28 10:04:25.037136686 +0000
-+++ ./lib/rpmdb_internal.h 2021-01-07 15:24:08.866776792 +0000
+--- lib/rpmdb_internal.h.orig 2020-05-28 10:04:25.037136686 +0000
++++ lib/rpmdb_internal.h 2021-01-07 15:24:08.866776792 +0000
@@ -25,6 +25,7 @@ extern "C" {
enum rpmdbRebuildFlags_e {
++++++ dbrointerruptable.diff ++++++
--- /var/tmp/diff_new_pack.9CbGFO/_old 2022-06-29 16:00:16.772528340 +0200
+++ /var/tmp/diff_new_pack.9CbGFO/_new 2022-06-29 16:00:16.776528347 +0200
@@ -1,5 +1,5 @@
---- ./lib/rpmdb.c.orig 2020-05-28 10:04:25.037136686 +0000
-+++ ./lib/rpmdb.c 2020-09-30 12:23:50.708547165 +0000
+--- lib/rpmdb.c.orig 2020-05-28 10:04:25.037136686 +0000
++++ lib/rpmdb.c 2020-09-30 12:23:50.708547165 +0000
@@ -387,9 +387,11 @@ int rpmdbClose(rpmdb db)
{
rpmdb * prev, next;
++++++ debuginfo-mono.patch ++++++
--- /var/tmp/diff_new_pack.9CbGFO/_old 2022-06-29 16:00:16.788528364 +0200
+++ /var/tmp/diff_new_pack.9CbGFO/_new 2022-06-29 16:00:16.796528377 +0200
@@ -1,5 +1,5 @@
---- ./scripts/find-debuginfo.in.orig 2021-09-23 20:28:21.646855995 +0000
-+++ ./scripts/find-debuginfo.in 2021-09-23 20:28:53.530790698 +0000
+--- scripts/find-debuginfo.in.orig 2021-09-23 20:28:21.646855995 +0000
++++ scripts/find-debuginfo.in 2021-09-23 20:28:53.530790698 +0000
@@ -434,6 +434,16 @@ while read nlinks inum f; do
;;
*) continue ;;
++++++ debuglink.diff ++++++
--- /var/tmp/diff_new_pack.9CbGFO/_old 2022-06-29 16:00:16.804528388 +0200
+++ /var/tmp/diff_new_pack.9CbGFO/_new 2022-06-29 16:00:16.808528395 +0200
@@ -1,5 +1,5 @@
---- ./scripts/find-debuginfo.in.orig 2021-09-23 20:27:13.686995174 +0000
-+++ ./scripts/find-debuginfo.in 2021-09-23 20:27:40.826939593 +0000
+--- scripts/find-debuginfo.in.orig 2021-09-23 20:27:13.686995174 +0000
++++ scripts/find-debuginfo.in 2021-09-23 20:27:40.826939593 +0000
@@ -407,7 +407,7 @@ debug_link()
get_debugfn()
{
++++++ debugsubpkg.diff ++++++
--- /var/tmp/diff_new_pack.9CbGFO/_old 2022-06-29 16:00:16.820528413 +0200
+++ /var/tmp/diff_new_pack.9CbGFO/_new 2022-06-29 16:00:16.820528413 +0200
@@ -1,5 +1,5 @@
---- ./scripts/find-debuginfo.in.orig 2021-09-23 20:25:41.059184871 +0000
-+++ ./scripts/find-debuginfo.in 2021-09-23 20:26:40.363063418 +0000
+--- scripts/find-debuginfo.in.orig 2021-09-23 20:25:41.059184871 +0000
++++ scripts/find-debuginfo.in 2021-09-23 20:26:40.363063418 +0000
@@ -643,19 +643,25 @@ if $run_dwz \
fi
fi
++++++ emptymanifest.diff ++++++
--- /var/tmp/diff_new_pack.9CbGFO/_old 2022-06-29 16:00:16.832528430 +0200
+++ /var/tmp/diff_new_pack.9CbGFO/_new 2022-06-29 16:00:16.836528437 +0200
@@ -1,5 +1,5 @@
---- ./macros.in.orig 2017-01-20 10:15:12.677868723 +0000
-+++ ./macros.in 2017-01-20 10:15:30.385819715 +0000
+--- macros.in.orig 2017-01-20 10:15:12.677868723 +0000
++++ macros.in 2017-01-20 10:15:30.385819715 +0000
@@ -403,7 +403,7 @@ package or when debugging this package.\
# Should empty %files manifest file terminate a build?
#
++++++ enable-postin-scripts-error.diff ++++++
--- /var/tmp/diff_new_pack.9CbGFO/_old 2022-06-29 16:00:16.848528455 +0200
+++ /var/tmp/diff_new_pack.9CbGFO/_new 2022-06-29 16:00:16.848528455 +0200
@@ -1,5 +1,5 @@
---- ./lib/rpmscript.c
-+++ ./lib/rpmscript.c
+--- lib/rpmscript.c
++++ lib/rpmscript.c
@@ -390,7 +390,7 @@ rpmRC rpmScriptRun(rpmScript script, int
if (script == NULL) return RPMRC_OK;
@@ -19,8 +19,8 @@
+ flags |= RPMSCRIPT_FLAG_CRITICAL;
+ return flags;
}
---- ./macros.in
-+++ ./macros.in
+--- macros.in
++++ macros.in
@@ -1293,5 +1293,10 @@ end
%{expand:%__scm_setup_%{__scm} %{!-v:-q}}\
%{!-N:%autopatch %{-v} %{-p:-p%{-p*}}}
++++++ fileattrs.diff ++++++
--- /var/tmp/diff_new_pack.9CbGFO/_old 2022-06-29 16:00:16.860528473 +0200
+++ /var/tmp/diff_new_pack.9CbGFO/_new 2022-06-29 16:00:16.864528479 +0200
@@ -1,20 +1,20 @@
---- ./fileattrs/elf.attr.orig 2021-09-23 19:29:51.474079693 +0000
-+++ ./fileattrs/elf.attr 2021-09-23 19:35:43.413332593 +0000
+--- fileattrs/elf.attr.orig 2021-09-23 19:29:51.474079693 +0000
++++ fileattrs/elf.attr 2021-09-23 19:35:43.413332593 +0000
@@ -1,3 +1,4 @@
%__elf_provides %{_rpmconfigdir}/elfdeps --provides
%__elf_requires %{_rpmconfigdir}/elfdeps --requires
%__elf_magic ^(setuid,? )?(setgid,? )?(sticky )?ELF (32|64)-bit.*$
+%__elf_exclude_path ^/usr/lib/debug/
---- ./fileattrs/perl.attr.orig 2021-06-21 12:00:44.587611741 +0000
-+++ ./fileattrs/perl.attr 2021-09-23 19:29:51.474079693 +0000
+--- fileattrs/perl.attr.orig 2021-06-21 12:00:44.587611741 +0000
++++ fileattrs/perl.attr 2021-09-23 19:29:51.474079693 +0000
@@ -1,3 +1,4 @@
-%__perl_requires %{_rpmconfigdir}/perl.req
+# disabled for now
+#%__perl_requires %{_rpmconfigdir}/perl.req
%__perl_magic ^.*[Pp]erl .*$
%__perl_flags exeonly
---- ./fileattrs/perllib.attr.orig 2021-06-21 12:00:44.587611741 +0000
-+++ ./fileattrs/perllib.attr 2021-09-23 19:29:51.478079685 +0000
+--- fileattrs/perllib.attr.orig 2021-06-21 12:00:44.587611741 +0000
++++ fileattrs/perllib.attr 2021-09-23 19:29:51.478079685 +0000
@@ -1,5 +1,6 @@
%__perllib_provides %{_rpmconfigdir}/perl.prov
-%__perllib_requires %{_rpmconfigdir}/perl.req
++++++ find-lang-qt-qm.patch ++++++
--- /var/tmp/diff_new_pack.9CbGFO/_old 2022-06-29 16:00:16.872528491 +0200
+++ /var/tmp/diff_new_pack.9CbGFO/_new 2022-06-29 16:00:16.876528497 +0200
@@ -1,5 +1,5 @@
---- ./scripts/find-lang.sh.orig 2021-09-23 19:57:49.046595975 +0000
-+++ ./scripts/find-lang.sh 2021-09-23 19:59:36.182374732 +0000
+--- scripts/find-lang.sh.orig 2021-09-23 19:57:49.046595975 +0000
++++ scripts/find-lang.sh 2021-09-23 19:59:36.182374732 +0000
@@ -305,7 +305,9 @@ s:%lang(C) ::
find "$TOP_DIR" -type f -o -type l|sed '
++++++ finddebuginfo-absolute-links.diff ++++++
--- /var/tmp/diff_new_pack.9CbGFO/_old 2022-06-29 16:00:16.888528515 +0200
+++ /var/tmp/diff_new_pack.9CbGFO/_new 2022-06-29 16:00:16.892528521 +0200
@@ -1,5 +1,5 @@
---- ./scripts/find-debuginfo.in.orig 2021-09-23 20:23:21.967469723 +0000
-+++ ./scripts/find-debuginfo.in 2021-09-23 20:24:51.623286108 +0000
+--- scripts/find-debuginfo.in.orig 2021-09-23 20:23:21.967469723 +0000
++++ scripts/find-debuginfo.in 2021-09-23 20:24:51.623286108 +0000
@@ -391,7 +391,17 @@ debug_link()
local l="/usr/lib/debug$2"
local t="$1"
++++++ finddebuginfo.diff ++++++
--- /var/tmp/diff_new_pack.9CbGFO/_old 2022-06-29 16:00:16.900528533 +0200
+++ /var/tmp/diff_new_pack.9CbGFO/_new 2022-06-29 16:00:16.904528539 +0200
@@ -1,5 +1,5 @@
---- ./scripts/find-debuginfo.in.orig 2021-07-26 23:05:31.867817624 +0000
-+++ ./scripts/find-debuginfo.in 2021-09-23 20:20:03.763875636 +0000
+--- scripts/find-debuginfo.in.orig 2021-07-26 23:05:31.867817624 +0000
++++ scripts/find-debuginfo.in 2021-09-23 20:20:03.763875636 +0000
@@ -412,12 +412,18 @@ trap 'rm -rf "$temp"' EXIT
# Build a list of unstripped ELF files and their hardlinks
++++++ findlang.diff ++++++
--- /var/tmp/diff_new_pack.9CbGFO/_old 2022-06-29 16:00:16.912528551 +0200
+++ /var/tmp/diff_new_pack.9CbGFO/_new 2022-06-29 16:00:16.916528558 +0200
@@ -1,5 +1,5 @@
---- ./scripts/find-lang.sh.orig 2021-06-21 12:00:44.650612737 +0000
-+++ ./scripts/find-lang.sh 2021-09-23 19:12:01.428275661 +0000
+--- scripts/find-lang.sh.orig 2021-06-21 12:00:44.650612737 +0000
++++ scripts/find-lang.sh 2021-09-23 19:12:01.428275661 +0000
@@ -37,11 +37,11 @@ the top of the tree containing the files
PACKAGE_NAME is the %{name} of the package. This should also be
the basename of the .mo files. the output is written to
++++++ findsupplements.diff ++++++
--- /var/tmp/diff_new_pack.9CbGFO/_old 2022-06-29 16:00:16.928528576 +0200
+++ /var/tmp/diff_new_pack.9CbGFO/_new 2022-06-29 16:00:16.932528581 +0200
@@ -1,5 +1,5 @@
---- ./scripts/Makefile.am.orig 2021-09-23 20:01:42.554113780 +0000
-+++ ./scripts/Makefile.am 2021-09-23 20:02:13.466049945 +0000
+--- scripts/Makefile.am.orig 2021-09-23 20:01:42.554113780 +0000
++++ scripts/Makefile.am 2021-09-23 20:02:13.466049945 +0000
@@ -17,7 +17,7 @@ EXTRA_DIST = \
rpmdb_dump rpmdb_load \
rpm.daily rpm.log rpm.supp rpm2cpio.sh \
@@ -18,8 +18,8 @@
perl.prov perl.req \
pkgconfigdeps.sh \
ocamldeps.sh \
---- ./scripts/find-supplements.orig 2021-09-23 20:01:42.554113780 +0000
-+++ ./scripts/find-supplements 2021-09-23 20:01:42.554113780 +0000
+--- scripts/find-supplements.orig 2021-09-23 20:01:42.554113780 +0000
++++ scripts/find-supplements 2021-09-23 20:01:42.554113780 +0000
@@ -0,0 +1,3 @@
+#!/bin/sh
+
++++++ headerchk2.diff ++++++
--- /var/tmp/diff_new_pack.9CbGFO/_old 2022-06-29 16:00:16.948528605 +0200
+++ /var/tmp/diff_new_pack.9CbGFO/_new 2022-06-29 16:00:16.948528605 +0200
@@ -1,5 +1,5 @@
---- ./lib/header.c.orig 2017-12-01 15:54:04.254399473 +0000
-+++ ./lib/header.c 2017-12-01 15:55:36.389131237 +0000
+--- lib/header.c.orig 2017-12-01 15:54:04.254399473 +0000
++++ lib/header.c 2017-12-01 15:55:36.389131237 +0000
@@ -929,7 +929,8 @@ rpmRC hdrblobImport(hdrblob blob, int fa
rdlen += REGION_TAG_COUNT;
++++++ ignore-auxv.diff ++++++
--- /var/tmp/diff_new_pack.9CbGFO/_old 2022-06-29 16:00:16.960528624 +0200
+++ /var/tmp/diff_new_pack.9CbGFO/_new 2022-06-29 16:00:16.964528629 +0200
@@ -1,5 +1,5 @@
---- ./lib/rpmrc.c.orig 2020-09-30 07:48:01.215567727 +0000
-+++ ./lib/rpmrc.c 2020-09-30 12:22:46.612692258 +0000
+--- lib/rpmrc.c.orig 2020-09-30 07:48:01.215567727 +0000
++++ lib/rpmrc.c 2020-09-30 12:22:46.612692258 +0000
@@ -78,10 +78,12 @@ struct rpmOption {
int localize;
};
++++++ langnoc.diff ++++++
--- /var/tmp/diff_new_pack.9CbGFO/_old 2022-06-29 16:00:16.976528647 +0200
+++ /var/tmp/diff_new_pack.9CbGFO/_new 2022-06-29 16:00:16.980528653 +0200
@@ -1,5 +1,5 @@
---- ./macros.in.orig 2021-09-23 19:54:19.515028659 +0000
-+++ ./macros.in 2021-09-23 19:54:25.495016311 +0000
+--- macros.in.orig 2021-09-23 19:54:19.515028659 +0000
++++ macros.in 2021-09-23 19:54:25.495016311 +0000
@@ -1150,6 +1150,7 @@ package or when debugging this package.\
# %files -f %{name}.lang
#
@@ -8,8 +8,8 @@
# Commands + opts to use for retrieving remote files
# Proxy opts can be set through --httpproxy/--httpport popt aliases,
---- ./scripts/find-lang.sh.orig 2021-09-23 19:54:19.507028675 +0000
-+++ ./scripts/find-lang.sh 2021-09-23 19:54:25.495016311 +0000
+--- scripts/find-lang.sh.orig 2021-09-23 19:54:19.507028675 +0000
++++ scripts/find-lang.sh 2021-09-23 19:54:25.495016311 +0000
@@ -75,6 +75,8 @@ MO=
MO_NAME=${NAMES[0]}.lang
ALL_NAME=#
++++++ leave-malloc-check-set.diff ++++++
--- /var/tmp/diff_new_pack.9CbGFO/_old 2022-06-29 16:00:16.992528672 +0200
+++ /var/tmp/diff_new_pack.9CbGFO/_new 2022-06-29 16:00:16.996528678 +0200
@@ -12,8 +12,8 @@
sign/rpmgensig.c | 1 -
3 files changed, 5 deletions(-)
---- ./build/rpmfc.c
-+++ ./build/rpmfc.c
+--- build/rpmfc.c
++++ build/rpmfc.c
@@ -319,7 +319,6 @@ static int getOutputFrom(ARGV_t argv,
if (buildRoot)
setenv("RPM_BUILD_ROOT", buildRoot, 1);
@@ -22,8 +22,8 @@
execvp(argv[0], (char *const *)argv);
rpmlog(RPMLOG_ERR, _("Couldn't exec %s: %s\n"),
argv[0], strerror(errno));
---- ./lib/rpmscript.c
-+++ ./lib/rpmscript.c
+--- lib/rpmscript.c
++++ lib/rpmscript.c
@@ -245,9 +245,6 @@ static void doScriptExec(ARGV_const_t argv, ARGV_const_t prefixes,
}
@@ -34,8 +34,8 @@
xx = execv(argv[0], argv);
if (xx) {
rpmlog(RPMLOG_ERR,
---- ./sign/rpmgensig.c
-+++ ./sign/rpmgensig.c
+--- sign/rpmgensig.c
++++ sign/rpmgensig.c
@@ -216,7 +216,6 @@ static int runGPG(sigTarget sigt, const char *sigfile)
dup2(pipefd[0], STDIN_FILENO);
close(pipefd[1]);
++++++ localetag.diff ++++++
--- /var/tmp/diff_new_pack.9CbGFO/_old 2022-06-29 16:00:17.004528690 +0200
+++ /var/tmp/diff_new_pack.9CbGFO/_new 2022-06-29 16:00:17.008528695 +0200
@@ -1,8 +1,8 @@
Convert output to the current locale. Assumes utf8 input if the
decoding works, otherwise iso-8859-1.
---- ./lib/tagexts.c.orig 2021-06-21 12:00:44.615612184 +0000
-+++ ./lib/tagexts.c 2021-09-23 18:58:58.461872258 +0000
+--- lib/tagexts.c.orig 2021-06-21 12:00:44.615612184 +0000
++++ lib/tagexts.c 2021-09-23 18:58:58.461872258 +0000
@@ -2,6 +2,7 @@
* \file lib/formats.c
*/
++++++ macrosin.diff ++++++
--- /var/tmp/diff_new_pack.9CbGFO/_old 2022-06-29 16:00:17.020528714 +0200
+++ /var/tmp/diff_new_pack.9CbGFO/_new 2022-06-29 16:00:17.024528720 +0200
@@ -1,5 +1,5 @@
---- ./macros.in.orig 2021-09-23 19:13:54.532045005 +0000
-+++ ./macros.in 2021-09-23 19:13:59.592034687 +0000
+--- macros.in.orig 2021-09-23 19:13:54.532045005 +0000
++++ macros.in 2021-09-23 19:13:59.592034687 +0000
@@ -170,6 +170,7 @@
%{?_unique_debug_names:--unique-debug-suffix "-%{VERSION}-%{RELEASE}.%{_arch}"} \\\
%{?_unique_debug_srcs:--unique-debug-src-base "%{name}-%{VERSION}-%{RELEASE}.%{_arch}"} \\\
++++++ nextiteratorheaderblob.diff ++++++
--- /var/tmp/diff_new_pack.9CbGFO/_old 2022-06-29 16:00:17.036528738 +0200
+++ /var/tmp/diff_new_pack.9CbGFO/_new 2022-06-29 16:00:17.036528738 +0200
@@ -1,5 +1,5 @@
---- ./lib/rpmdb.c.orig 2020-11-27 13:09:17.968992873 +0000
-+++ ./lib/rpmdb.c 2020-11-27 13:14:21.524165780 +0000
+--- lib/rpmdb.c.orig 2020-11-27 13:09:17.968992873 +0000
++++ lib/rpmdb.c 2020-11-27 13:14:21.524165780 +0000
@@ -2679,6 +2679,48 @@ int rpmdbCtrl(rpmdb db, rpmdbCtrlOp ctrl
return dbctrl ? dbCtrl(db, dbctrl) : 1;
}
@@ -49,8 +49,8 @@
char *rpmdbCookie(rpmdb db)
{
void *cookie = NULL;
---- ./lib/rpmdb.h.orig 2020-11-27 13:09:17.968992873 +0000
-+++ ./lib/rpmdb.h 2020-11-27 13:09:36.352942782 +0000
+--- lib/rpmdb.h.orig 2020-11-27 13:09:17.968992873 +0000
++++ lib/rpmdb.h 2020-11-27 13:09:36.352942782 +0000
@@ -253,6 +253,14 @@ int rpmdbStat(const char *prefix, struct
*/
int rpmdbFStat(rpmdb db, struct stat *statbuf);
++++++ nobuildcolor.diff ++++++
--- /var/tmp/diff_new_pack.9CbGFO/_old 2022-06-29 16:00:17.048528756 +0200
+++ /var/tmp/diff_new_pack.9CbGFO/_new 2022-06-29 16:00:17.052528762 +0200
@@ -1,7 +1,7 @@
Disable file coloring for SUSE systems
---- ./build/rpmfc.c.orig 2020-09-30 13:06:07.502865543 +0000
-+++ ./build/rpmfc.c 2020-09-30 13:07:08.530734545 +0000
+--- build/rpmfc.c.orig 2020-09-30 13:06:07.502865543 +0000
++++ build/rpmfc.c 2020-09-30 13:07:08.530734545 +0000
@@ -1607,7 +1607,8 @@ rpmRC rpmfcGenerateDepends(const rpmSpec
goto exit;
++++++ nomagiccheck.diff ++++++
--- /var/tmp/diff_new_pack.9CbGFO/_old 2022-06-29 16:00:17.064528780 +0200
+++ /var/tmp/diff_new_pack.9CbGFO/_new 2022-06-29 16:00:17.064528780 +0200
@@ -1,7 +1,7 @@
Don't let rpm complain about a missing /etc/magic.mgc file
---- ./build/rpmfc.c.orig 2020-09-30 13:08:18.770584384 +0000
-+++ ./build/rpmfc.c 2020-09-30 13:08:54.306508417 +0000
+--- build/rpmfc.c.orig 2020-09-30 13:08:18.770584384 +0000
++++ build/rpmfc.c 2020-09-30 13:08:54.306508417 +0000
@@ -1159,7 +1159,7 @@ static uint32_t getElfColor(const char *
rpmRC rpmfcClassify(rpmfc fc, ARGV_t argv, rpm_mode_t * fmode)
++++++ noprereqdeprec.diff ++++++
--- /var/tmp/diff_new_pack.9CbGFO/_old 2022-06-29 16:00:17.076528798 +0200
+++ /var/tmp/diff_new_pack.9CbGFO/_new 2022-06-29 16:00:17.080528804 +0200
@@ -1,5 +1,5 @@
---- ./build/parsePreamble.c.orig 2019-10-02 11:38:15.807736662 +0000
-+++ ./build/parsePreamble.c 2019-10-02 11:39:12.495617575 +0000
+--- build/parsePreamble.c.orig 2019-10-02 11:38:15.807736662 +0000
++++ build/parsePreamble.c 2019-10-02 11:39:12.495617575 +0000
@@ -1032,7 +1032,7 @@ static struct PreambleRec_s const preamb
{RPMTAG_SUGGESTNAME, 0, 0, 0, LEN_AND_STR("suggests")},
{RPMTAG_SUPPLEMENTNAME, 0, 0, 0, LEN_AND_STR("supplements")},
++++++ ocaml-cmxs.diff ++++++
--- /var/tmp/diff_new_pack.9CbGFO/_old 2022-06-29 16:00:17.092528823 +0200
+++ /var/tmp/diff_new_pack.9CbGFO/_new 2022-06-29 16:00:17.092528823 +0200
@@ -12,8 +12,8 @@
Signed-off-by: Olaf Hering <olaf(a)aepfle.de>
---- ./fileattrs/ocaml.attr.orig 2021-06-21 12:00:44.587611741 +0000
-+++ ./fileattrs/ocaml.attr 2021-12-22 13:54:20.384959876 +0000
+--- fileattrs/ocaml.attr.orig 2021-06-21 12:00:44.587611741 +0000
++++ fileattrs/ocaml.attr 2021-12-22 13:54:20.384959876 +0000
@@ -1,5 +1,5 @@
%__ocaml_provides %{_rpmconfigdir}/ocamldeps.sh --provides
%__ocaml_requires %{_rpmconfigdir}/ocamldeps.sh --requires
@@ -22,8 +22,8 @@
+%__ocaml_magic ^(Objective caml|OCaml) .*$
+%__ocaml_path .(cma|cmi|cmo|cmx|cmxa)$
%__ocaml_flags magic_and_path
---- ./scripts/ocamldeps.sh.orig 2021-06-21 12:00:44.650612737 +0000
-+++ ./scripts/ocamldeps.sh 2021-12-22 13:54:20.384959876 +0000
+--- scripts/ocamldeps.sh.orig 2021-06-21 12:00:44.650612737 +0000
++++ scripts/ocamldeps.sh 2021-12-22 13:54:20.384959876 +0000
@@ -32,6 +32,10 @@
# Implementations imported:
# HASH NAME_FROM_OTHER_MODULE
++++++ platformin.diff ++++++
--- /var/tmp/diff_new_pack.9CbGFO/_old 2022-06-29 16:00:17.104528841 +0200
+++ /var/tmp/diff_new_pack.9CbGFO/_new 2022-06-29 16:00:17.108528846 +0200
@@ -1,5 +1,5 @@
---- ./platform.in.orig 2014-06-26 06:51:54.822818260 +0000
-+++ ./platform.in 2014-08-04 12:38:55.389245494 +0000
+--- platform.in.orig 2014-06-26 06:51:54.822818260 +0000
++++ platform.in 2014-08-04 12:38:55.389245494 +0000
@@ -41,7 +41,7 @@
%_oldincludedir @oldincludedir@
%_infodir @infodir@
++++++ posttrans.diff ++++++
--- /var/tmp/diff_new_pack.9CbGFO/_old 2022-06-29 16:00:17.120528864 +0200
+++ /var/tmp/diff_new_pack.9CbGFO/_new 2022-06-29 16:00:17.120528864 +0200
@@ -1,5 +1,5 @@
---- ./lib/poptI.c.orig 2021-04-09 11:28:12.359647290 +0000
-+++ ./lib/poptI.c 2021-04-09 11:28:15.523640983 +0000
+--- lib/poptI.c.orig 2021-04-09 11:28:12.359647290 +0000
++++ lib/poptI.c 2021-04-09 11:28:15.523640983 +0000
@@ -265,6 +265,10 @@ struct poptOption rpmInstallPoptTable[]
&rpmIArgs.installInterfaceFlags, (INSTALL_REINSTALL|INSTALL_INSTALL),
N_("reinstall package(s)"),
@@ -11,8 +11,8 @@
POPT_TABLEEND
};
---- ./lib/psm.c.orig 2021-04-09 11:28:12.359647290 +0000
-+++ ./lib/psm.c 2021-04-09 11:28:15.527640975 +0000
+--- lib/psm.c.orig 2021-04-09 11:28:12.359647290 +0000
++++ lib/psm.c 2021-04-09 11:28:15.527640975 +0000
@@ -810,7 +810,7 @@ static rpmRC rpmPackageErase(rpmts ts, r
}
if (rc) break;
@@ -22,8 +22,8 @@
/* Prepare post transaction uninstall triggers */
rpmtriggersPrepPostUnTransFileTrigs(psm->ts, psm->te);
}
---- ./lib/rpmcli.h.orig 2021-04-09 11:28:12.359647290 +0000
-+++ ./lib/rpmcli.h 2021-04-09 11:28:15.527640975 +0000
+--- lib/rpmcli.h.orig 2021-04-09 11:28:12.359647290 +0000
++++ lib/rpmcli.h 2021-04-09 11:28:15.527640975 +0000
@@ -304,6 +304,7 @@ enum rpmInstallFlags_e {
INSTALL_ERASE = (1 << 8), /*!< from --erase */
INSTALL_ALLMATCHES = (1 << 9), /*!< from --allmatches */
@@ -48,8 +48,8 @@
*/
extern struct rpmInstallArguments_s rpmIArgs;
---- ./lib/rpminstall.c.orig 2021-04-09 11:28:12.363647282 +0000
-+++ ./lib/rpminstall.c 2021-04-09 11:28:15.527640975 +0000
+--- lib/rpminstall.c.orig 2021-04-09 11:28:12.363647282 +0000
++++ lib/rpminstall.c 2021-04-09 11:28:15.527640975 +0000
@@ -4,6 +4,8 @@
#include "system.h"
@@ -92,8 +92,8 @@
+ argvFree(manifest);
+ return rc;
+}
---- ./lib/rpmtriggers.c.orig 2021-04-09 11:28:12.363647282 +0000
-+++ ./lib/rpmtriggers.c 2021-04-09 11:31:46.999219563 +0000
+--- lib/rpmtriggers.c.orig 2021-04-09 11:28:12.363647282 +0000
++++ lib/rpmtriggers.c 2021-04-09 11:31:46.999219563 +0000
@@ -1,5 +1,6 @@
#include "system.h"
@@ -142,8 +142,8 @@
if (tm == RPMSCRIPT_FILETRIGGER) {
priorityTag = RPMTAG_FILETRIGGERPRIORITIES;
} else {
---- ./lib/rpmtriggers.h.orig 2021-04-09 11:28:12.363647282 +0000
-+++ ./lib/rpmtriggers.h 2021-04-09 11:28:15.527640975 +0000
+--- lib/rpmtriggers.h.orig 2021-04-09 11:28:12.363647282 +0000
++++ lib/rpmtriggers.h 2021-04-09 11:28:15.527640975 +0000
@@ -27,6 +27,10 @@ rpmtriggers rpmtriggersCreate(unsigned i
RPM_GNUC_INTERNAL
rpmtriggers rpmtriggersFree(rpmtriggers triggers);
@@ -155,8 +155,8 @@
/*
* Prepare post trans uninstall file triggers. After transcation uninstalled
* files are not saved anywhere. So we need during uninstalation of every
---- ./lib/rpmts.h.orig 2021-04-09 11:28:12.363647282 +0000
-+++ ./lib/rpmts.h 2021-04-09 11:28:15.527640975 +0000
+--- lib/rpmts.h.orig 2021-04-09 11:28:12.363647282 +0000
++++ lib/rpmts.h 2021-04-09 11:28:15.527640975 +0000
@@ -229,6 +229,15 @@ int rpmtsOrder(rpmts ts);
int rpmtsRun(rpmts ts, rpmps okProbs, rpmprobFilterFlags ignoreSet);
@@ -173,8 +173,8 @@
* Reference a transaction set instance.
* @param ts transaction set
* @return new transaction set reference
---- ./lib/rpmts_internal.h.orig 2021-04-09 11:28:12.363647282 +0000
-+++ ./lib/rpmts_internal.h 2021-04-09 11:28:15.527640975 +0000
+--- lib/rpmts_internal.h.orig 2021-04-09 11:28:12.363647282 +0000
++++ lib/rpmts_internal.h 2021-04-09 11:28:15.527640975 +0000
@@ -87,6 +87,7 @@ struct rpmts_s {
rpmtriggers trigs2run; /*!< Transaction file triggers */
@@ -183,8 +183,8 @@
};
#ifdef __cplusplus
---- ./lib/transaction.c.orig 2021-04-09 11:28:12.363647282 +0000
-+++ ./lib/transaction.c 2021-04-09 11:33:22.247029757 +0000
+--- lib/transaction.c.orig 2021-04-09 11:28:12.363647282 +0000
++++ lib/transaction.c 2021-04-09 11:33:22.247029757 +0000
@@ -1468,6 +1468,8 @@ static int rpmtsSetup(rpmts ts, rpmprobF
/* Get available space on mounted file systems. */
(void) rpmtsInitDSI(ts);
@@ -336,8 +336,8 @@
+ rpmtsEmpty(ts);
+ return rc;
+}
---- ./rpm.c.orig 2021-04-09 11:28:12.363647282 +0000
-+++ ./rpm.c 2021-04-09 11:28:15.527640975 +0000
+--- rpm.c.orig 2021-04-09 11:28:12.363647282 +0000
++++ rpm.c 2021-04-09 11:28:15.527640975 +0000
@@ -19,6 +19,7 @@ enum modes {
MODE_INSTALL = (1 << 1),
MODE_ERASE = (1 << 2),
++++++ python-rpm-packaging.diff ++++++
--- /var/tmp/diff_new_pack.9CbGFO/_old 2022-06-29 16:00:17.132528882 +0200
+++ /var/tmp/diff_new_pack.9CbGFO/_new 2022-06-29 16:00:17.136528889 +0200
@@ -1,13 +1,13 @@
---- ./fileattrs/pythondist.attr.orig 2021-09-23 20:14:04.880605674 +0000
-+++ ./fileattrs/pythondist.attr 2021-09-23 20:15:23.392446317 +0000
+--- fileattrs/pythondist.attr.orig 2021-09-23 20:14:04.880605674 +0000
++++ fileattrs/pythondist.attr 2021-09-23 20:15:23.392446317 +0000
@@ -1,3 +1,4 @@
%__pythondist_provides %{_rpmconfigdir}/pythondistdeps.py --provides --majorver-provides
-%__pythondist_requires %{_rpmconfigdir}/pythondistdeps.py --requires
+#disabled for now
+#%__pythondist_requires %{_rpmconfigdir}/pythondistdeps.py --requires
%__pythondist_path /lib(64)?/python[[:digit:]]\\.[[:digit:]]+/site-packages/[^/]+\\.(dist-info|egg-info|egg-link)$
---- ./scripts/pythondistdeps.py.orig 2021-09-23 20:14:26.496561795 +0000
-+++ ./scripts/pythondistdeps.py 2021-09-23 20:14:30.748553177 +0000
+--- scripts/pythondistdeps.py.orig 2021-09-23 20:14:26.496561795 +0000
++++ scripts/pythondistdeps.py 2021-09-23 20:14:30.748553177 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
++++++ refreshtestarch.diff ++++++
--- /var/tmp/diff_new_pack.9CbGFO/_old 2022-06-29 16:00:17.152528912 +0200
+++ /var/tmp/diff_new_pack.9CbGFO/_new 2022-06-29 16:00:17.156528919 +0200
@@ -1,8 +1,8 @@
Also test architecture in "refresh" test when not colored. This allows
updates to different architectures.
---- ./lib/psm.c.orig 2019-10-02 09:54:56.180565818 +0000
-+++ ./lib/psm.c 2019-10-02 09:55:02.700552941 +0000
+--- lib/psm.c.orig 2019-10-02 09:54:56.180565818 +0000
++++ lib/psm.c 2019-10-02 09:55:02.700552941 +0000
@@ -518,9 +518,9 @@ static void markReplacedInstance(rpmts t
rpmdbSetIteratorRE(mi, RPMTAG_EPOCH, RPMMIRE_STRCMP, rpmteE(te));
rpmdbSetIteratorRE(mi, RPMTAG_VERSION, RPMMIRE_STRCMP, rpmteV(te));
++++++ remove-brp-strips.diff ++++++
--- /var/tmp/diff_new_pack.9CbGFO/_old 2022-06-29 16:00:17.168528937 +0200
+++ /var/tmp/diff_new_pack.9CbGFO/_new 2022-06-29 16:00:17.168528937 +0200
@@ -3,8 +3,8 @@
Some brp-scripts are not used in openSUSE, remove references
to it
---- ./platform.in.orig 2021-09-23 19:23:57.822814696 +0000
-+++ ./platform.in 2021-09-23 19:24:31.534745951 +0000
+--- platform.in.orig 2021-09-23 19:23:57.822814696 +0000
++++ platform.in 2021-09-23 19:24:31.534745951 +0000
@@ -96,8 +96,6 @@
%{?__brp_compress} \
%{?__brp_elfperms} \
++++++ remove-translations.diff ++++++
--- /var/tmp/diff_new_pack.9CbGFO/_old 2022-06-29 16:00:17.180528955 +0200
+++ /var/tmp/diff_new_pack.9CbGFO/_new 2022-06-29 16:00:17.184528961 +0200
@@ -1,5 +1,5 @@
---- ./scripts/find-lang.sh.orig 2018-01-31 13:25:25.229266078 +0000
-+++ ./scripts/find-lang.sh 2018-01-31 13:26:15.128133281 +0000
+--- scripts/find-lang.sh.orig 2018-01-31 13:25:25.229266078 +0000
++++ scripts/find-lang.sh 2018-01-31 13:26:15.128133281 +0000
@@ -119,6 +119,23 @@ fi
MO_NAME_NEW=$MO_NAME.tmp.$$
rm -f $MO_NAME_NEW
++++++ rpm-findlang-inject-metainfo.patch ++++++
--- /var/tmp/diff_new_pack.9CbGFO/_old 2022-06-29 16:00:17.200528985 +0200
+++ /var/tmp/diff_new_pack.9CbGFO/_new 2022-06-29 16:00:17.200528985 +0200
@@ -1,5 +1,5 @@
---- ./scripts/find-lang.sh.orig 2018-01-31 13:37:22.810352621 +0000
-+++ ./scripts/find-lang.sh 2018-01-31 13:39:38.117990971 +0000
+--- scripts/find-lang.sh.orig 2018-01-31 13:37:22.810352621 +0000
++++ scripts/find-lang.sh 2018-01-31 13:39:38.117990971 +0000
@@ -32,6 +32,7 @@ Additional options:
--with-man find localized man pages
--all-name match all package/domain names
++++++ rpm-shorten-changelog.diff ++++++
--- /var/tmp/diff_new_pack.9CbGFO/_old 2022-06-29 16:00:17.212529003 +0200
+++ /var/tmp/diff_new_pack.9CbGFO/_new 2022-06-29 16:00:17.216529010 +0200
@@ -1,5 +1,5 @@
---- ./build/pack.c
-+++ ./build/pack.c
+--- build/pack.c.orig
++++ build/pack.c
@@ -683,6 +683,71 @@
return rc;
}
@@ -84,8 +84,8 @@
headerPutString(pkg->header, RPMTAG_RPMVERSION, VERSION);
headerPutString(pkg->header, RPMTAG_BUILDHOST, spec->buildHost);
---- ./build/parseChangelog.c
-+++ ./build/parseChangelog.c
+--- build/parseChangelog.c.orig
++++ build/parseChangelog.c
@@ -267,6 +267,11 @@
goto exit;
}
++++++ rpmpopt.diff ++++++
--- /var/tmp/diff_new_pack.9CbGFO/_old 2022-06-29 16:00:17.252529063 +0200
+++ /var/tmp/diff_new_pack.9CbGFO/_new 2022-06-29 16:00:17.252529063 +0200
@@ -1,5 +1,5 @@
---- ./rpmpopt.in.orig 2017-12-01 14:58:11.404041985 +0000
-+++ ./rpmpopt.in 2017-12-01 14:59:06.275882759 +0000
+--- rpmpopt.in.orig 2017-12-01 14:58:11.404041985 +0000
++++ rpmpopt.in 2017-12-01 14:59:06.275882759 +0000
@@ -101,7 +101,8 @@ Relocations : %|PREFIXES?{[%{PREFIXES} ]
%|URL?{URL : %{URL}\n}|\
%|BUGURL?{Bug URL : %{BUGURL}\n}|\
++++++ rpmqpack.diff ++++++
--- /var/tmp/diff_new_pack.9CbGFO/_old 2022-06-29 16:00:17.264529081 +0200
+++ /var/tmp/diff_new_pack.9CbGFO/_new 2022-06-29 16:00:17.268529088 +0200
@@ -1,5 +1,5 @@
---- ./Makefile.am.orig 2021-06-21 12:00:44.552611187 +0000
-+++ ./Makefile.am 2021-09-23 19:17:54.619555392 +0000
+--- Makefile.am.orig 2021-06-21 12:00:44.552611187 +0000
++++ Makefile.am 2021-09-23 19:17:54.619555392 +0000
@@ -175,6 +175,10 @@ rpmgraph_LDADD = lib/librpm.la rpmio/lib
dist_bin_SCRIPTS = scripts/gendiff
@@ -11,8 +11,8 @@
rpmconfig_DATA = rpmrc
rpmrc: $(top_srcdir)/rpmrc.in
@$(SED) \
---- ./docs/man/Makefile.am.orig 2021-08-20 08:44:56.263259000 +0000
-+++ ./docs/man/Makefile.am 2021-09-23 19:17:54.619555392 +0000
+--- docs/man/Makefile.am.orig 2021-08-20 08:44:56.263259000 +0000
++++ docs/man/Makefile.am 2021-09-23 19:17:54.619555392 +0000
@@ -9,7 +9,7 @@ EXTRA_DIST += gendiff.1.md
man_man8dir = $(mandir)/man8
@@ -22,8 +22,8 @@
EXTRA_DIST += rpm.8.md rpm-misc.8.md rpmbuild.8.md rpmdeps.8.md rpmgraph.8.md
EXTRA_DIST += rpm2cpio.8.md rpmdb.8.md rpmkeys.8.md rpmsign.8.md rpmspec.8.md
---- ./docs/man/rpmqpack.8.orig 2021-09-23 19:17:54.619555392 +0000
-+++ ./docs/man/rpmqpack.8 2021-09-23 19:17:54.619555392 +0000
+--- docs/man/rpmqpack.8.orig 2021-09-23 19:17:54.619555392 +0000
++++ docs/man/rpmqpack.8 2021-09-23 19:17:54.619555392 +0000
@@ -0,0 +1,25 @@
+.TH RPMQPACK 8 "Mar 2002"
+.SH NAME
@@ -50,8 +50,8 @@
+
+.SH AUTHOR
+Michael Schroeder <mls(a)suse.de>
---- ./rpmqpack.c.orig 2021-09-23 19:17:54.619555392 +0000
-+++ ./rpmqpack.c 2021-09-23 19:17:54.619555392 +0000
+--- rpmqpack.c.orig 2021-09-23 19:17:54.619555392 +0000
++++ rpmqpack.c 2021-09-23 19:17:54.619555392 +0000
@@ -0,0 +1,60 @@
+#include <sys/types.h>
+#include <limits.h>
++++++ rpmrc.diff ++++++
--- /var/tmp/diff_new_pack.9CbGFO/_old 2022-06-29 16:00:17.280529106 +0200
+++ /var/tmp/diff_new_pack.9CbGFO/_new 2022-06-29 16:00:17.284529111 +0200
@@ -1,5 +1,5 @@
---- ./rpmrc.in.orig 2019-06-26 14:17:31.451985635 +0000
-+++ ./rpmrc.in 2019-10-02 11:24:49.601403844 +0000
+--- rpmrc.in.orig 2019-06-26 14:17:31.451985635 +0000
++++ rpmrc.in 2019-10-02 11:24:49.601403844 +0000
@@ -12,16 +12,16 @@
# "fat" binary with both archs, for Darwin
optflags: fat -O2 -g -arch i386 -arch ppc
++++++ safeugid.diff ++++++
--- /var/tmp/diff_new_pack.9CbGFO/_old 2022-06-29 16:00:17.300529136 +0200
+++ /var/tmp/diff_new_pack.9CbGFO/_new 2022-06-29 16:00:17.304529142 +0200
@@ -1,8 +1,8 @@
--- ../safeugid.diff 2019-10-02 13:37:13.191868203 +0200
+++ P 2019-10-02 13:36:09.036002978 +0200
@@ -0,0 +1,211 @@
-+--- ./lib/rpmchroot.c.orig 2019-06-26 14:17:31.411985696 +0000
-++++ ./lib/rpmchroot.c 2019-10-02 11:35:58.788024507 +0000
++--- lib/rpmchroot.c.orig 2019-06-26 14:17:31.411985696 +0000
+++++ lib/rpmchroot.c 2019-10-02 11:35:58.788024507 +0000
+@@ -126,6 +126,7 @@ int rpmChrootIn(void)
+
+ if (chdir("/") == 0 && chroot(rootState.rootDir) == 0) {
@@ -19,8 +19,8 @@
+ } else {
+ rpmlog(RPMLOG_ERR, _("Unable to restore root directory: %m\n"));
+ rc = -1;
-+--- ./lib/rpmug.c.orig 2019-06-26 14:17:31.418985685 +0000
-++++ ./lib/rpmug.c 2019-10-02 11:35:58.788024507 +0000
++--- lib/rpmug.c.orig 2019-06-26 14:17:31.418985685 +0000
+++++ lib/rpmug.c 2019-10-02 11:35:58.788024507 +0000
+@@ -11,6 +11,47 @@
+ #include "lib/rpmug.h"
+ #include "debug.h"
@@ -203,8 +203,8 @@
++ inchroot = in;
++#endif
++}
-+--- ./lib/rpmug.h.orig 2019-06-26 14:17:31.418985685 +0000
-++++ ./lib/rpmug.h 2019-10-02 11:35:58.788024507 +0000
++--- lib/rpmug.h.orig 2019-06-26 14:17:31.418985685 +0000
+++++ lib/rpmug.h 2019-10-02 11:35:58.788024507 +0000
+@@ -15,4 +15,6 @@ int rpmugInit(void);
+
+ void rpmugFree(void);
++++++ singlefilemode.diff ++++++
--- /var/tmp/diff_new_pack.9CbGFO/_old 2022-06-29 16:00:17.316529159 +0200
+++ /var/tmp/diff_new_pack.9CbGFO/_new 2022-06-29 16:00:17.316529159 +0200
@@ -1,5 +1,5 @@
---- ./scripts/find-debuginfo.in.orig 2021-09-24 09:10:06.477724685 +0000
-+++ ./scripts/find-debuginfo.in 2021-09-24 09:10:26.557680705 +0000
+--- scripts/find-debuginfo.in.orig 2021-09-24 09:10:06.477724685 +0000
++++ scripts/find-debuginfo.in 2021-09-24 09:10:26.557680705 +0000
@@ -168,7 +168,6 @@ while [ $# -gt 0 ]; do
;;
--dwz-single-file-mode)
++++++ specfilemacro.diff ++++++
--- /var/tmp/diff_new_pack.9CbGFO/_old 2022-06-29 16:00:17.328529178 +0200
+++ /var/tmp/diff_new_pack.9CbGFO/_new 2022-06-29 16:00:17.332529184 +0200
@@ -1,5 +1,5 @@
---- ./build/parseSpec.c.orig 2013-06-10 15:55:10.000000000 +0000
-+++ ./build/parseSpec.c 2013-07-12 12:04:11.000000000 +0000
+--- build/parseSpec.c.orig 2013-06-10 15:55:10.000000000 +0000
++++ build/parseSpec.c 2013-07-12 12:04:11.000000000 +0000
@@ -561,6 +561,7 @@ static rpmSpec parseSpec(const char *spe
spec = newSpec();
++++++ usr-lib-sysimage-rpm.patch ++++++
--- /var/tmp/diff_new_pack.9CbGFO/_old 2022-06-29 16:00:17.360529226 +0200
+++ /var/tmp/diff_new_pack.9CbGFO/_new 2022-06-29 16:00:17.360529226 +0200
@@ -1,5 +1,5 @@
---- ./macros.in.orig 2021-08-20 08:44:56.264259007 +0000
-+++ ./macros.in 2021-09-23 18:57:26.654059458 +0000
+--- macros.in.orig 2021-08-20 08:44:56.264259007 +0000
++++ macros.in 2021-09-23 18:57:26.654059458 +0000
@@ -140,7 +140,7 @@
%_buildshell /bin/sh
++++++ verbosearg.diff ++++++
--- /var/tmp/diff_new_pack.9CbGFO/_old 2022-06-29 16:00:17.372529244 +0200
+++ /var/tmp/diff_new_pack.9CbGFO/_new 2022-06-29 16:00:17.376529250 +0200
@@ -1,5 +1,5 @@
---- ./rpmio/macro.c.orig
-+++ ./rpmio/macro.c
+--- rpmio/macro.c.orig
++++ rpmio/macro.c
@@ -1141,7 +1141,10 @@ static size_t doExpand(MacroBuf mb, rpmMacroEntry me, ARGV_t argv)
static size_t doVerbose(MacroBuf mb, rpmMacroEntry me, ARGV_t argv)
++++++ weakdepscompat.diff ++++++
--- /var/tmp/diff_new_pack.9CbGFO/_old 2022-06-29 16:00:17.388529268 +0200
+++ /var/tmp/diff_new_pack.9CbGFO/_new 2022-06-29 16:00:17.392529275 +0200
@@ -1,5 +1,5 @@
---- ./build/parsePreamble.c.orig 2014-08-04 13:10:07.530953406 +0000
-+++ ./build/parsePreamble.c 2014-08-04 13:10:12.852929355 +0000
+--- build/parsePreamble.c.orig 2014-08-04 13:10:07.530953406 +0000
++++ build/parsePreamble.c 2014-08-04 13:10:12.852929355 +0000
@@ -343,6 +343,7 @@ static struct tokenBits_s const installS
{ "verify", RPMSENSE_SCRIPT_VERIFY },
{ "pretrans", RPMSENSE_PRETRANS },
++++++ whatrequires-doc.diff ++++++
--- /var/tmp/diff_new_pack.9CbGFO/_old 2022-06-29 16:00:17.404529292 +0200
+++ /var/tmp/diff_new_pack.9CbGFO/_new 2022-06-29 16:00:17.404529292 +0200
@@ -1,5 +1,5 @@
---- ./docs/man/rpm.8.orig 2021-09-23 19:20:46.991203867 +0000
-+++ ./docs/man/rpm.8 2021-09-23 19:22:45.918961340 +0000
+--- docs/man/rpm.8.orig 2021-09-23 19:20:46.991203867 +0000
++++ docs/man/rpm.8 2021-09-23 19:22:45.918961340 +0000
@@ -601,6 +601,11 @@ Query all packages that provide the \f[I
\f[B]--whatrequires \f[R]\f[I]CAPABILITY\f[R]
Query all packages that require \f[I]CAPABILITY\f[R] for proper
++++++ zstdpool.diff ++++++
--- /var/tmp/diff_new_pack.9CbGFO/_old 2022-06-29 16:00:17.416529310 +0200
+++ /var/tmp/diff_new_pack.9CbGFO/_new 2022-06-29 16:00:17.420529316 +0200
@@ -1,5 +1,5 @@
---- ./rpmio/rpmio.c.orig 2021-06-21 12:00:44.648612706 +0000
-+++ ./rpmio/rpmio.c 2022-04-13 13:48:55.224954032 +0000
+--- rpmio/rpmio.c.orig 2021-06-21 12:00:44.648612706 +0000
++++ rpmio/rpmio.c 2022-04-13 13:48:55.224954032 +0000
@@ -8,6 +8,7 @@
#include <ctype.h>
#include <dirent.h>
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package glibc for openSUSE:Factory checked in at 2022-06-29 16:00:10
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/glibc (Old)
and /work/SRC/openSUSE:Factory/.glibc.new.1548 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "glibc"
Wed Jun 29 16:00:10 2022 rev:261 rq:985279 version:2.35
Changes:
--------
--- /work/SRC/openSUSE:Factory/glibc/glibc.changes 2022-06-12 17:36:46.605938687 +0200
+++ /work/SRC/openSUSE:Factory/.glibc.new.1548/glibc.changes 2022-06-29 16:00:11.220519977 +0200
@@ -1,0 +2,8 @@
+Thu Jun 23 09:46:45 UTC 2022 - Andreas Schwab <schwab(a)suse.de>
+
+- read-chk-cancel.patch: debug: make __read_chk a cancellation point
+ (bsc#1200682, BZ #29274)
+- wcrtomb-fortify.patch: wcrtomb: Make behavior POSIX compliant
+ (bsc#1200688)
+
+-------------------------------------------------------------------
New:
----
read-chk-cancel.patch
wcrtomb-fortify.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ glibc.spec ++++++
--- /var/tmp/diff_new_pack.wNyUzy/_old 2022-06-29 16:00:12.432521802 +0200
+++ /var/tmp/diff_new_pack.wNyUzy/_new 2022-06-29 16:00:12.436521808 +0200
@@ -299,6 +299,10 @@
Patch1006: strncpy-power9-vsx.patch
# PATCH-FIX-UPSTREAM nptl: Fix __libc_cleanup_pop_restore asynchronous restore (BZ #29214)
Patch1007: nptl-cleanup-async-restore.patch
+# PATCH-FIX-UPSTREAM debug: make __read_chk a cancellation point (BZ #29274)
+Patch1008: read-chk-cancel.patch
+# PATCH-FIX-UPSTREAM wcrtomb: Make behavior POSIX compliant
+Patch1009: wcrtomb-fortify.patch
###
# Patches awaiting upstream approval
@@ -498,6 +502,10 @@
These libraries are needed to develop programs which use the standard C
library in a cross compilation setting.
+%if 0%{suse_version} >= 1500
+%define make_output_sync -Oline
+%endif
+
%prep
%setup -n glibc-%{version} -q -a 4
%patch6 -p1
@@ -526,6 +534,8 @@
%patch1005 -p1
%patch1006 -p1
%patch1007 -p1
+%patch1008 -p1
+%patch1009 -p1
%patch2000 -p1
%patch2001 -p1
@@ -706,14 +716,14 @@
exit $rc;
}
-make %{?_smp_mflags} CFLAGS="$BuildFlags $ExtraBuildFlags"
+make %{?_smp_mflags} %{?make_output_sync} CFLAGS="$BuildFlags $ExtraBuildFlags"
cd ..
#
# Build html documentation
#
%if %{build_html}
-make %{?_smp_mflags} -C cc-base html
+make %{?_smp_mflags} %{?make_output_sync} -C cc-base html
%endif
%check
@@ -726,7 +736,7 @@
export TIMEOUTFACTOR=16
# The testsuite does its own malloc checking
unset MALLOC_CHECK_
-make %{?_smp_mflags} -C cc-base -k check || {
+make %{?_smp_mflags} %{?make_output_sync} -C cc-base -k check || {
cd cc-base
o=$-
set +x
@@ -751,7 +761,7 @@
# This has to pass on all platforms!
# Exceptions:
# None!
-make %{?_smp_mflags} -C cc-base check-abi
+make %{?_smp_mflags} %{?make_output_sync} -C cc-base check-abi
%endif
%define rtldlib %{_lib}
@@ -869,7 +879,7 @@
export STRIP_KEEP_SYMTAB=*.so*
# Install base glibc
-make %{?_smp_mflags} install_root=%{buildroot} install -C cc-base
+make %{?_smp_mflags} %{?make_output_sync} install_root=%{buildroot} install -C cc-base
# Install locales
%if %{build_locales}
@@ -880,7 +890,7 @@
# Still, on my system this is a speed advantage:
# non-parallel build for install-locales: 9:34mins
# parallel build with fdupes: 7:08mins
- make %{?_smp_mflags} install_root=%{buildroot} localedata/install-locales
+ make %{?_smp_mflags} %{?make_output_sync} install_root=%{buildroot} localedata/install-locales
# Avoid hardlinks across subpackages
mv %{buildroot}/usr/lib/locale/{en_US,C}.utf8 .
%fdupes %{buildroot}/usr/lib/locale
++++++ read-chk-cancel.patch ++++++
From dc30acf20bd635d71cd4c84100e842fdf0429e48 Mon Sep 17 00:00:00 2001
From: Andreas Schwab <schwab(a)suse.de>
Date: Wed, 22 Jun 2022 13:16:30 +0200
Subject: [PATCH] debug: make __read_chk a cancellation point (bug 29274)
The __read_chk function, as the implementation behind the fortified read
function, must be a cancellation point, thus it cannot use INLINE_SYSCALL.
---
debug/Makefile | 7 ++++++
debug/read_chk.c | 10 --------
debug/tst-read-chk-cancel.c | 50 +++++++++++++++++++++++++++++++++++++
3 files changed, 57 insertions(+), 10 deletions(-)
create mode 100644 debug/tst-read-chk-cancel.c
diff --git a/debug/Makefile b/debug/Makefile
index 96029f32ee..456b349c4d 100644
--- a/debug/Makefile
+++ b/debug/Makefile
@@ -110,6 +110,7 @@ CPPFLAGS-tst-longjmp_chk2.c += -D_FORTIFY_SOURCE=1
CFLAGS-tst-longjmp_chk3.c += -fexceptions -fasynchronous-unwind-tables
CPPFLAGS-tst-longjmp_chk3.c += -D_FORTIFY_SOURCE=1
CPPFLAGS-tst-realpath-chk.c += -D_FORTIFY_SOURCE=2
+CPPFLAGS-tst-read-chk-cancel.c += -D_FORTIFY_SOURCE=2
# _FORTIFY_SOURCE tests.
# Auto-generate tests for _FORTIFY_SOURCE for different levels, compilers and
@@ -204,6 +205,10 @@ ifeq ($(have-ssp),yes)
tests += tst-ssp-1
endif
+ifeq ($(have-thread-library), yes)
+tests += tst-read-chk-cancel
+endif
+
ifeq (,$(CXX))
tests-unsupported = $(tests-cc-chk)
endif
@@ -242,3 +247,5 @@ $(objpfx)xtrace: xtrace.sh
-e 's|@BINDIR@|$(bindir)|' -e 's|@PKGVERSION@|$(PKGVERSION)|' \
-e 's|@REPORT_BUGS_TO@|$(REPORT_BUGS_TO)|' $^ > $@.new \
&& rm -f $@ && mv $@.new $@ && chmod +x $@
+
+$(objpfx)tst-read-chk-cancel: $(shared-thread-library)
diff --git a/debug/read_chk.c b/debug/read_chk.c
index 0cd58db8cb..274b4f93e9 100644
--- a/debug/read_chk.c
+++ b/debug/read_chk.c
@@ -16,12 +16,6 @@
<https://www.gnu.org/licenses/>. */
#include <unistd.h>
-#include <sys/param.h>
-#ifdef HAVE_INLINED_SYSCALLS
-# include <errno.h>
-# include <sysdep.h>
-#endif
-
ssize_t
__read_chk (int fd, void *buf, size_t nbytes, size_t buflen)
@@ -29,9 +23,5 @@ __read_chk (int fd, void *buf, size_t nbytes, size_t buflen)
if (nbytes > buflen)
__chk_fail ();
-#ifdef HAVE_INLINED_SYSCALLS
- return INLINE_SYSCALL (read, 3, fd, buf, nbytes);
-#else
return __read (fd, buf, nbytes);
-#endif
}
diff --git a/debug/tst-read-chk-cancel.c b/debug/tst-read-chk-cancel.c
new file mode 100644
index 0000000000..7e06afb596
--- /dev/null
+++ b/debug/tst-read-chk-cancel.c
@@ -0,0 +1,50 @@
+/* Test that __read_chk is a cancellation point (BZ #29274)
+ Copyright (C) 2022 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+
+ The GNU C Library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ The GNU C Library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with the GNU C Library; if not, see
+ <https://www.gnu.org/licenses/>. */
+
+#include <stdint.h>
+#include <support/xunistd.h>
+#include <support/xthread.h>
+
+static int pipe_fds[2];
+static pthread_barrier_t barrier;
+
+static void *
+read_thread (void *n)
+{
+ xpthread_barrier_wait (&barrier);
+ char c;
+ /* This call should be forwarded to __read_chk because the buffer size
+ is known, but the read length is non-constant. */
+ if (read (pipe_fds[0], &c, (uintptr_t) n) != 1)
+ return (void *) -1L;
+ return 0;
+}
+
+static int
+do_test (void)
+{
+ xpthread_barrier_init (&barrier, 0, 2);
+ xpipe (pipe_fds);
+ pthread_t thr = xpthread_create (0, read_thread, (void *) 1L);
+ xpthread_barrier_wait (&barrier);
+ xpthread_cancel (thr);
+ xpthread_join (thr);
+ return 0;
+}
+
+#include <support/test-driver.c>
--
2.35.3
++++++ wcrtomb-fortify.patch ++++++
From 9bcd12d223a8990254b65e2dada54faa5d2742f3 Mon Sep 17 00:00:00 2001
From: Siddhesh Poyarekar <siddhesh(a)sourceware.org>
Date: Fri, 13 May 2022 19:10:15 +0530
Subject: [PATCH] wcrtomb: Make behavior POSIX compliant
The GNU implementation of wcrtomb assumes that there are at least
MB_CUR_MAX bytes available in the destination buffer passed to wcrtomb
as the first argument. This is not compatible with the POSIX
definition, which only requires enough space for the input wide
character.
This does not break much in practice because when users supply buffers
smaller than MB_CUR_MAX (e.g. in ncurses), they compute and dynamically
allocate the buffer, which results in enough spare space (thanks to
usable_size in malloc and padding in alloca) that no actual buffer
overflow occurs. However when the code is built with _FORTIFY_SOURCE,
it runs into the hard check against MB_CUR_MAX in __wcrtomb_chk and
hence fails. It wasn't evident until now since dynamic allocations
would result in wcrtomb not being fortified but since _FORTIFY_SOURCE=3,
that limitation is gone, resulting in such code failing.
To fix this problem, introduce an internal buffer that is MB_LEN_MAX
long and use that to perform the conversion and then copy the resultant
bytes into the destination buffer. Also move the fortification check
into the main implementation, which checks the result after conversion
and aborts if the resultant byte count is greater than the destination
buffer size.
One complication is that applications that assume the MB_CUR_MAX
limitation to be gone may not be able to run safely on older glibcs if
they use static destination buffers smaller than MB_CUR_MAX; dynamic
allocations will always have enough spare space that no actual overruns
will occur. One alternative to fixing this is to bump symbol version to
prevent them from running on older glibcs but that seems too strict a
constraint. Instead, since these users will only have made this
decision on reading the manual, I have put a note in the manual warning
them about the pitfalls of having static buffers smaller than
MB_CUR_MAX and running them on older glibc.
Benchmarking:
The wcrtomb microbenchmark shows significant increases in maximum
execution time for all locales, ranging from 10x for ar_SA.UTF-8 to
1.5x-2x for nearly everything else. The mean execution time however saw
practically no impact, with some results even being quicker, indicating
that cache locality has a much bigger role in the overhead.
Given that the additional copy uses a temporary buffer inside wcrtomb,
it's likely that a hot path will end up putting that buffer (which is
responsible for the additional overhead) in a similar place on stack,
giving the necessary cache locality to negate the overhead. However in
situations where wcrtomb ends up getting called at wildly different
spots on the call stack (or is on different call stacks, e.g. with
threads or different execution contexts) and is still a hotspot, the
performance lag will be visible.
Signed-off-by: Siddhesh Poyarekar <siddhesh(a)sourceware.org>
---
debug/tst-fortify.c | 7 ++++++-
debug/wcrtomb_chk.c | 8 ++------
include/wchar.h | 4 ++++
manual/charset.texi | 11 ++++++-----
wcsmbs/wcrtomb.c | 31 +++++++++++++++++++++++--------
5 files changed, 41 insertions(+), 20 deletions(-)
diff --git a/debug/tst-fortify.c b/debug/tst-fortify.c
index 03c9867714..8e94643bf2 100644
--- a/debug/tst-fortify.c
+++ b/debug/tst-fortify.c
@@ -1478,10 +1478,15 @@ do_test (void)
character which has a multibyte representation which does not
fit. */
CHK_FAIL_START
- char smallbuf[2];
+ char smallbuf[1];
if (wcrtomb (smallbuf, L'\x100', &s) != 2)
FAIL ();
CHK_FAIL_END
+
+ /* Same input with a large enough buffer and we're good. */
+ char bigenoughbuf[2];
+ if (wcrtomb (bigenoughbuf, L'\x100', &s) != 2)
+ FAIL ();
#endif
wchar_t wenough[10];
diff --git a/debug/wcrtomb_chk.c b/debug/wcrtomb_chk.c
index 8b6d026560..28c3ea0d2d 100644
--- a/debug/wcrtomb_chk.c
+++ b/debug/wcrtomb_chk.c
@@ -1,4 +1,5 @@
/* Copyright (C) 2005-2022 Free Software Foundation, Inc.
+ Copyright The GNU Toolchain Authors.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -25,10 +26,5 @@
size_t
__wcrtomb_chk (char *s, wchar_t wchar, mbstate_t *ps, size_t buflen)
{
- /* We do not have to implement the full wctomb semantics since we
- know that S cannot be NULL when we come here. */
- if (buflen < MB_CUR_MAX)
- __chk_fail ();
-
- return __wcrtomb (s, wchar, ps);
+ return __wcrtomb_internal (s, wchar, ps, buflen);
}
diff --git a/include/wchar.h b/include/wchar.h
index 4267985625..db83297bca 100644
--- a/include/wchar.h
+++ b/include/wchar.h
@@ -172,6 +172,10 @@ libc_hidden_proto (__mbrtowc)
libc_hidden_proto (__mbrlen)
extern size_t __wcrtomb (char *__restrict __s, wchar_t __wc,
__mbstate_t *__restrict __ps) attribute_hidden;
+extern size_t __wcrtomb_internal (char *__restrict __s, wchar_t __wc,
+ __mbstate_t *__restrict __ps,
+ size_t __s_size)
+ attribute_hidden;
extern size_t __mbsrtowcs (wchar_t *__restrict __dst,
const char **__restrict __src,
size_t __len, __mbstate_t *__restrict __ps)
diff --git a/manual/charset.texi b/manual/charset.texi
index a9b5cb4a37..427db3bc80 100644
--- a/manual/charset.texi
+++ b/manual/charset.texi
@@ -883,11 +883,12 @@ the string @var{s}. This includes all bytes representing shift
sequences.
One word about the interface of the function: there is no parameter
-specifying the length of the array @var{s}. Instead the function
-assumes that there are at least @code{MB_CUR_MAX} bytes available since
-this is the maximum length of any byte sequence representing a single
-character. So the caller has to make sure that there is enough space
-available, otherwise buffer overruns can occur.
+specifying the length of the array @var{s}, so the caller has to make sure
+that there is enough space available, otherwise buffer overruns can occur.
+This version of @theglibc{} does not assume that @var{s} is at least
+@var{MB_CUR_MAX} bytes long, but programs that need to run on @glibcadj{}
+versions that have this assumption documented in the manual must comply
+with this limit.
@pindex wchar.h
@code{wcrtomb} was introduced in @w{Amendment 1} to @w{ISO C90} and is
diff --git a/wcsmbs/wcrtomb.c b/wcsmbs/wcrtomb.c
index e17438989f..c0cce3792f 100644
--- a/wcsmbs/wcrtomb.c
+++ b/wcsmbs/wcrtomb.c
@@ -1,4 +1,5 @@
/* Copyright (C) 1996-2022 Free Software Foundation, Inc.
+ Copyright The GNU Toolchain Authors.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -20,6 +21,7 @@
#include <errno.h>
#include <gconv.h>
#include <stdlib.h>
+#include <string.h>
#include <wchar.h>
#include <wcsmbsload.h>
@@ -34,7 +36,7 @@
static mbstate_t state;
size_t
-__wcrtomb (char *s, wchar_t wc, mbstate_t *ps)
+__wcrtomb_internal (char *s, wchar_t wc, mbstate_t *ps, size_t s_size)
{
char buf[MB_LEN_MAX];
struct __gconv_step_data data;
@@ -52,14 +54,11 @@ __wcrtomb (char *s, wchar_t wc, mbstate_t *ps)
/* A first special case is if S is NULL. This means put PS in the
initial state. */
if (s == NULL)
- {
- s = buf;
- wc = L'\0';
- }
+ wc = L'\0';
/* Tell where we want to have the result. */
- data.__outbuf = (unsigned char *) s;
- data.__outbufend = (unsigned char *) s + MB_CUR_MAX;
+ data.__outbuf = (unsigned char *) buf;
+ data.__outbufend = (unsigned char *) buf + sizeof buf;
/* Get the conversion functions. */
fcts = get_gconv_fcts (_NL_CURRENT_DATA (LC_CTYPE));
@@ -101,7 +100,17 @@ __wcrtomb (char *s, wchar_t wc, mbstate_t *ps)
if (status == __GCONV_OK || status == __GCONV_EMPTY_INPUT
|| status == __GCONV_FULL_OUTPUT)
- result = data.__outbuf - (unsigned char *) s;
+ {
+ result = data.__outbuf - (unsigned char *) buf;
+
+ if (s != NULL)
+ {
+ if (result > s_size)
+ __chk_fail ();
+
+ memcpy (s, buf, result);
+ }
+ }
else
{
result = (size_t) -1;
@@ -110,5 +119,11 @@ __wcrtomb (char *s, wchar_t wc, mbstate_t *ps)
return result;
}
+
+size_t
+__wcrtomb (char *s, wchar_t wc, mbstate_t *ps)
+{
+ return __wcrtomb_internal (s, wc, ps, (size_t) -1);
+}
weak_alias (__wcrtomb, wcrtomb)
libc_hidden_weak (wcrtomb)
--
2.35.3
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package 000update-repos for openSUSE:Factory checked in at 2022-06-28 21:03:01
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/000update-repos (Old)
and /work/SRC/openSUSE:Factory/.000update-repos.new.1548 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "000update-repos"
Tue Jun 28 21:03:01 2022 rev:2023 rq: version:unknown
Changes:
--------
New Changes file:
NO CHANGES FILE!!!
New:
----
factory:non-oss_3263.1.packages.zst
factory_20220627.packages.zst
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package 000product for openSUSE:Factory checked in at 2022-06-28 19:31:58
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/000product (Old)
and /work/SRC/openSUSE:Factory/.000product.new.1548 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "000product"
Tue Jun 28 19:31:58 2022 rev:3264 rq: version:unknown
Changes:
--------
New Changes file:
NO CHANGES FILE!!!
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ MicroOS-dvd5-dvd-x86_64.kiwi ++++++
--- /var/tmp/diff_new_pack.JKyVti/_old 2022-06-28 19:32:02.498245667 +0200
+++ /var/tmp/diff_new_pack.JKyVti/_new 2022-06-28 19:32:02.502245670 +0200
@@ -1,4 +1,4 @@
-<image name="OBS__MicroOS___20220627" schemaversion="4.1">
+<image name="OBS__MicroOS___20220628" schemaversion="4.1">
<description type="system">
<author>The SUSE Team</author>
<contact>build(a)opensuse.org</contact>
@@ -35,11 +35,11 @@
<productvar name="SEPARATE_MEDIA">true</productvar>
<productvar name="SHA1OPT">-x -2</productvar>
<productvar name="VENDOR">openSUSE</productvar>
- <productvar name="VERSION">20220627</productvar>
+ <productvar name="VERSION">20220628</productvar>
<productinfo name="CONTENTSTYLE">11</productinfo>
- <productinfo name="DISTRO">cpe:/o:opensuse:microos:20220627,openSUSE MicroOS</productinfo>
+ <productinfo name="DISTRO">cpe:/o:opensuse:microos:20220628,openSUSE MicroOS</productinfo>
<productinfo name="LINGUAS">en_US </productinfo>
- <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/MicroOS/20220627/x86_64</productinfo>
+ <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/MicroOS/20220628/x86_64</productinfo>
<productinfo name="VENDOR">openSUSE</productinfo>
<productoption name="INI_DIR">/usr/share/kiwi/modules/plugins/tumbleweed</productoption>
<productoption name="PLUGIN_DIR">/usr/share/kiwi/modules/plugins/tumbleweed</productoption>
++++++ openSUSE-Addon-NonOss-ftp-ftp-i586_x86_64.kiwi ++++++
--- /var/tmp/diff_new_pack.JKyVti/_old 2022-06-28 19:32:02.526245687 +0200
+++ /var/tmp/diff_new_pack.JKyVti/_new 2022-06-28 19:32:02.530245690 +0200
@@ -1,4 +1,4 @@
-<image name="OBS__openSUSE-Addon-NonOss___20220627" schemaversion="4.1">
+<image name="OBS__openSUSE-Addon-NonOss___20220628" schemaversion="4.1">
<description type="system">
<author>The SUSE Team</author>
<contact>build(a)opensuse.org</contact>
@@ -36,11 +36,11 @@
<productvar name="SEPARATE_MEDIA">true</productvar>
<productvar name="SHA1OPT">-x -2</productvar>
<productvar name="VENDOR">openSUSE</productvar>
- <productvar name="VERSION">20220627</productvar>
+ <productvar name="VERSION">20220628</productvar>
<productinfo name="CONTENTSTYLE">11</productinfo>
- <productinfo name="DISTRO">cpe:/o:opensuse:opensuse-addon-nonoss:20220627,openSUSE NonOSS Addon</productinfo>
+ <productinfo name="DISTRO">cpe:/o:opensuse:opensuse-addon-nonoss:20220628,openSUSE NonOSS Addon</productinfo>
<productinfo name="LINGUAS">af ar be_BY bg br ca cy el et ga gl gu_IN he hi_IN hr ka km ko lt mk nn pa_IN rw sk sl sr_CS ss st tg th tr uk ve vi xh zu </productinfo>
- <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE-Addon-NonOss/2022… obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE-Addon-NonOss/2022…</productinfo>
+ <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE-Addon-NonOss/2022… obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE-Addon-NonOss/2022…</productinfo>
<productinfo name="VENDOR">openSUSE</productinfo>
<productoption name="INI_DIR">/usr/share/kiwi/modules/plugins/tumbleweed</productoption>
<productoption name="PLUGIN_DIR">/usr/share/kiwi/modules/plugins/tumbleweed</productoption>
++++++ openSUSE-cd-mini-i586.kiwi ++++++
--- /var/tmp/diff_new_pack.JKyVti/_old 2022-06-28 19:32:02.542245698 +0200
+++ /var/tmp/diff_new_pack.JKyVti/_new 2022-06-28 19:32:02.546245701 +0200
@@ -1,4 +1,4 @@
-<image name="OBS__openSUSE___20220627" schemaversion="4.1">
+<image name="OBS__openSUSE___20220628" schemaversion="4.1">
<description type="system">
<author>The SUSE Team</author>
<contact>build(a)opensuse.org</contact>
@@ -32,11 +32,11 @@
<productvar name="SEPARATE_MEDIA">true</productvar>
<productvar name="SHA1OPT">-x -2</productvar>
<productvar name="VENDOR">openSUSE</productvar>
- <productvar name="VERSION">20220627</productvar>
+ <productvar name="VERSION">20220628</productvar>
<productinfo name="CONTENTSTYLE">11</productinfo>
- <productinfo name="DISTRO">cpe:/o:opensuse:opensuse:20220627,openSUSE Tumbleweed</productinfo>
+ <productinfo name="DISTRO">cpe:/o:opensuse:opensuse:20220628,openSUSE Tumbleweed</productinfo>
<productinfo name="LINGUAS">cs da de el en en_GB en_US es fr hu it ja pl pt pt_BR ru zh zh_CN zh_TW </productinfo>
- <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE/20220627/i586</productinfo>
+ <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE/20220628/i586</productinfo>
<productinfo name="VENDOR">openSUSE</productinfo>
<productoption name="INI_DIR">/usr/share/kiwi/modules/plugins/tumbleweed</productoption>
<productoption name="PLUGIN_DIR">/usr/share/kiwi/modules/plugins/tumbleweed</productoption>
++++++ openSUSE-cd-mini-x86_64.kiwi ++++++
--- /var/tmp/diff_new_pack.JKyVti/_old 2022-06-28 19:32:02.562245712 +0200
+++ /var/tmp/diff_new_pack.JKyVti/_new 2022-06-28 19:32:02.566245715 +0200
@@ -1,4 +1,4 @@
-<image name="OBS__openSUSE___20220627" schemaversion="4.1">
+<image name="OBS__openSUSE___20220628" schemaversion="4.1">
<description type="system">
<author>The SUSE Team</author>
<contact>build(a)opensuse.org</contact>
@@ -35,11 +35,11 @@
<productvar name="SEPARATE_MEDIA">true</productvar>
<productvar name="SHA1OPT">-x -2</productvar>
<productvar name="VENDOR">openSUSE</productvar>
- <productvar name="VERSION">20220627</productvar>
+ <productvar name="VERSION">20220628</productvar>
<productinfo name="CONTENTSTYLE">11</productinfo>
- <productinfo name="DISTRO">cpe:/o:opensuse:opensuse:20220627,openSUSE Tumbleweed</productinfo>
+ <productinfo name="DISTRO">cpe:/o:opensuse:opensuse:20220628,openSUSE Tumbleweed</productinfo>
<productinfo name="LINGUAS">cs da de el en en_GB en_US es fr hu it ja pl pt pt_BR ru zh zh_CN zh_TW </productinfo>
- <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE/20220627/x86_64</productinfo>
+ <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE/20220628/x86_64</productinfo>
<productinfo name="VENDOR">openSUSE</productinfo>
<productoption name="INI_DIR">/usr/share/kiwi/modules/plugins/tumbleweed</productoption>
<productoption name="PLUGIN_DIR">/usr/share/kiwi/modules/plugins/tumbleweed</productoption>
++++++ openSUSE-dvd5-dvd-i586.kiwi ++++++
--- /var/tmp/diff_new_pack.JKyVti/_old 2022-06-28 19:32:02.582245726 +0200
+++ /var/tmp/diff_new_pack.JKyVti/_new 2022-06-28 19:32:02.586245729 +0200
@@ -1,4 +1,4 @@
-<image name="OBS__openSUSE___20220627" schemaversion="4.1">
+<image name="OBS__openSUSE___20220628" schemaversion="4.1">
<description type="system">
<author>The SUSE Team</author>
<contact>build(a)opensuse.org</contact>
@@ -32,11 +32,11 @@
<productvar name="SEPARATE_MEDIA">true</productvar>
<productvar name="SHA1OPT">-x -2</productvar>
<productvar name="VENDOR">openSUSE</productvar>
- <productvar name="VERSION">20220627</productvar>
+ <productvar name="VERSION">20220628</productvar>
<productinfo name="CONTENTSTYLE">11</productinfo>
- <productinfo name="DISTRO">cpe:/o:opensuse:opensuse:20220627,openSUSE Tumbleweed</productinfo>
+ <productinfo name="DISTRO">cpe:/o:opensuse:opensuse:20220628,openSUSE Tumbleweed</productinfo>
<productinfo name="LINGUAS">cs da de el en en_GB en_US es fr hu it ja pl pt pt_BR ru zh zh_CN zh_TW </productinfo>
- <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE/20220627/i586</productinfo>
+ <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE/20220628/i586</productinfo>
<productinfo name="VENDOR">openSUSE</productinfo>
<productoption name="INI_DIR">/usr/share/kiwi/modules/plugins/tumbleweed</productoption>
<productoption name="PLUGIN_DIR">/usr/share/kiwi/modules/plugins/tumbleweed</productoption>
@@ -691,6 +691,7 @@
<repopackage name="gnome-weather"/>
<repopackage name="gnome-weather-lang"/>
<repopackage name="gnomekbd-tools"/>
+ <repopackage name="gnu-unifont-bitmap-fonts"/>
<repopackage name="gnutls"/>
<repopackage name="google-carlito-fonts"/>
<repopackage name="google-droid-fonts"/>
++++++ openSUSE-dvd5-dvd-x86_64.kiwi ++++++
--- /var/tmp/diff_new_pack.JKyVti/_old 2022-06-28 19:32:02.606245744 +0200
+++ /var/tmp/diff_new_pack.JKyVti/_new 2022-06-28 19:32:02.610245746 +0200
@@ -1,4 +1,4 @@
-<image name="OBS__openSUSE___20220627" schemaversion="4.1">
+<image name="OBS__openSUSE___20220628" schemaversion="4.1">
<description type="system">
<author>The SUSE Team</author>
<contact>build(a)opensuse.org</contact>
@@ -35,11 +35,11 @@
<productvar name="SEPARATE_MEDIA">true</productvar>
<productvar name="SHA1OPT">-x -2</productvar>
<productvar name="VENDOR">openSUSE</productvar>
- <productvar name="VERSION">20220627</productvar>
+ <productvar name="VERSION">20220628</productvar>
<productinfo name="CONTENTSTYLE">11</productinfo>
- <productinfo name="DISTRO">cpe:/o:opensuse:opensuse:20220627,openSUSE Tumbleweed</productinfo>
+ <productinfo name="DISTRO">cpe:/o:opensuse:opensuse:20220628,openSUSE Tumbleweed</productinfo>
<productinfo name="LINGUAS">cs da de el en en_GB en_US es fr hu it ja pl pt pt_BR ru zh zh_CN zh_TW </productinfo>
- <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE/20220627/x86_64</productinfo>
+ <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE/20220628/x86_64</productinfo>
<productinfo name="VENDOR">openSUSE</productinfo>
<productoption name="INI_DIR">/usr/share/kiwi/modules/plugins/tumbleweed</productoption>
<productoption name="PLUGIN_DIR">/usr/share/kiwi/modules/plugins/tumbleweed</productoption>
@@ -726,6 +726,7 @@
<repopackage name="gnome-weather"/>
<repopackage name="gnome-weather-lang"/>
<repopackage name="gnomekbd-tools"/>
+ <repopackage name="gnu-unifont-bitmap-fonts"/>
<repopackage name="gnutls"/>
<repopackage name="google-carlito-fonts"/>
<repopackage name="google-droid-fonts"/>
++++++ openSUSE-ftp-ftp-i586_x86_64.kiwi ++++++
--- /var/tmp/diff_new_pack.JKyVti/_old 2022-06-28 19:32:02.626245758 +0200
+++ /var/tmp/diff_new_pack.JKyVti/_new 2022-06-28 19:32:02.630245761 +0200
@@ -1,4 +1,4 @@
-<image name="OBS__openSUSE___20220627" schemaversion="4.1">
+<image name="OBS__openSUSE___20220628" schemaversion="4.1">
<description type="system">
<author>The SUSE Team</author>
<contact>build(a)opensuse.org</contact>
@@ -24,7 +24,7 @@
<productvar name="DISTNAME">openSUSE</productvar>
<productvar name="FLAVOR">ftp</productvar>
<productvar name="MAKE_LISTINGS">true</productvar>
- <productvar name="MEDIUM_NAME">openSUSE-20220627-i586-x86_64</productvar>
+ <productvar name="MEDIUM_NAME">openSUSE-20220628-i586-x86_64</productvar>
<productvar name="MULTIPLE_MEDIA">true</productvar>
<productvar name="PRODUCT_DIR">/</productvar>
<productvar name="PRODUCT_NAME">$DISTNAME-$FLAVOR</productvar>
@@ -36,11 +36,11 @@
<productvar name="SEPARATE_MEDIA">true</productvar>
<productvar name="SHA1OPT">-x -2</productvar>
<productvar name="VENDOR">openSUSE</productvar>
- <productvar name="VERSION">20220627</productvar>
+ <productvar name="VERSION">20220628</productvar>
<productinfo name="CONTENTSTYLE">11</productinfo>
- <productinfo name="DISTRO">cpe:/o:opensuse:opensuse:20220627,openSUSE Tumbleweed</productinfo>
+ <productinfo name="DISTRO">cpe:/o:opensuse:opensuse:20220628,openSUSE Tumbleweed</productinfo>
<productinfo name="LINGUAS">cs da de el en en_GB en_US es fr hu it ja pl pt pt_BR ru zh zh_CN zh_TW </productinfo>
- <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE/20220627/i586 obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE/20220627/x86_64</productinfo>
+ <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE/20220628/i586 obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE/20220628/x86_64</productinfo>
<productinfo name="VENDOR">openSUSE</productinfo>
<productoption name="DEBUGMEDIUM">2</productoption>
<productoption name="INI_DIR">/usr/share/kiwi/modules/plugins/tumbleweed</productoption>
++++++ MicroOS.product ++++++
--- /var/tmp/diff_new_pack.JKyVti/_old 2022-06-28 19:32:02.662245783 +0200
+++ /var/tmp/diff_new_pack.JKyVti/_new 2022-06-28 19:32:02.666245786 +0200
@@ -6,7 +6,7 @@
<name>MicroOS</name>
<releasepkgname>MicroOS-release</releasepkgname>
<endoflife/>
- <version>20220627</version>
+ <version>20220628</version>
<!-- release is no longer optional -->
<release>0</release>
<productline>MicroOS</productline>
++++++ dvd.group ++++++
--- /var/tmp/diff_new_pack.JKyVti/_old 2022-06-28 19:32:02.750245846 +0200
+++ /var/tmp/diff_new_pack.JKyVti/_new 2022-06-28 19:32:02.758245851 +0200
@@ -696,6 +696,7 @@
<package name="gnome-weather" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
<package name="gnome-weather-lang" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
<package name="gnomekbd-tools" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
+ <package name="gnu-unifont-bitmap-fonts" supportstatus="unsupported"/> <!-- reason: common_locks:expansion -->
<package name="gnutls" supportstatus="unsupported"/> <!-- reason: dvd:patterns-server-kvm_tools -->
<package name="google-carlito-fonts" supportstatus="unsupported"/> <!-- reason: dvd:openSUSE-release -->
<package name="google-droid-fonts" supportstatus="unsupported"/> <!-- reason: dvd:patterns-fonts-fonts -->
++++++ openSUSE-Addon-NonOss.product ++++++
--- /var/tmp/diff_new_pack.JKyVti/_old 2022-06-28 19:32:02.774245863 +0200
+++ /var/tmp/diff_new_pack.JKyVti/_new 2022-06-28 19:32:02.778245866 +0200
@@ -4,7 +4,7 @@
<product>
<vendor>openSUSE</vendor>
<name>openSUSE-Addon-NonOss</name>
- <version>20220627</version>
+ <version>20220628</version>
<release>0</release>
<summary>openSUSE NonOSS Addon</summary>
<shortsummary>non oss addon</shortsummary>
++++++ openSUSE.product ++++++
--- /var/tmp/diff_new_pack.JKyVti/_old 2022-06-28 19:32:02.798245880 +0200
+++ /var/tmp/diff_new_pack.JKyVti/_new 2022-06-28 19:32:02.802245883 +0200
@@ -4,7 +4,7 @@
<product>
<vendor>openSUSE</vendor>
<name>openSUSE</name>
- <version>20220627</version>
+ <version>20220628</version>
<release>0</release>
<productline>openSUSE</productline>
++++++ unsorted.yml ++++++
--- /var/tmp/diff_new_pack.JKyVti/_old 2022-06-28 19:32:02.866245928 +0200
+++ /var/tmp/diff_new_pack.JKyVti/_new 2022-06-28 19:32:02.870245931 +0200
@@ -958,6 +958,7 @@
- authbind
- authselect
- authselect-compat
+ - authselect-lang
- authselect-profiles
- auto
- auto-common
@@ -6041,7 +6042,6 @@
- gnu-regexp
- gnu-regexp-demo
- gnu-regexp-javadoc
- - gnu-unifont-bitmap-fonts
- gnu-unifont-legacy-bitmap-fonts
- gnu_ddrescue
- gnu_parallel
@@ -8160,29 +8160,6 @@
- kicad-doc-zh
- kicad-footprints
- kicad-lang
- - kicad-lang-bg
- - kicad-lang-ca
- - kicad-lang-cs
- - kicad-lang-de
- - kicad-lang-el
- - kicad-lang-en
- - kicad-lang-es
- - kicad-lang-fi
- - kicad-lang-fr
- - kicad-lang-hu
- - kicad-lang-it
- - kicad-lang-ja
- - kicad-lang-ko
- - kicad-lang-lt
- - kicad-lang-nl
- - kicad-lang-pl
- - kicad-lang-pt
- - kicad-lang-ru
- - kicad-lang-sk
- - kicad-lang-sl
- - kicad-lang-sv
- - kicad-lang-zh_CN
- - kicad-lang-zh_TW
- kicad-packages3D
- kicad-symbols
- kicad-templates
@@ -10545,7 +10522,7 @@
- libdirac_encoder0-32bit: [x86_64]
- libdiscid-devel
- libdiscid0-32bit: [x86_64]
- - libdiscord-rpc
+ - libdiscord-rpc3_4_0
- libdisomaster1
- libdispatch-devel
- libdispatch1_3
@@ -12157,6 +12134,9 @@
- libmbedx509-1
- libmbedx509-1-32bit: [x86_64]
- libmbim-devel
+ - libmbus
+ - libmbus-devel
+ - libmbus0
- libmca_common_dstore1: [x86_64]
- libmcpp0
- libmd-devel
@@ -12694,16 +12674,18 @@
- libopencsd_c_api1
- libopencsg1
- libopencv3_4
- - libopencv405
- - libopencv_aruco405
- - libopencv_face405
- - libopencv_highgui405
- - libopencv_imgcodecs405
- - libopencv_objdetect405
- - libopencv_superres405
- - libopencv_videoio405
- - libopencv_videostab405
- - libopencv_ximgproc405
+ - libopencv406
+ - libopencv_aruco406
+ - libopencv_face406
+ - libopencv_gapi406
+ - libopencv_highgui406
+ - libopencv_imgcodecs406
+ - libopencv_objdetect406
+ - libopencv_optflow406
+ - libopencv_superres406
+ - libopencv_videoio406
+ - libopencv_videostab406
+ - libopencv_ximgproc406
- libopendkim11
- libopenhpi4
- libopenjp2-7-32bit: [x86_64]
@@ -17237,6 +17219,7 @@
- netdate
- netdiscover
- netease-cloud-music-gtk
+ - netease-cloud-music-gtk-lang
- netgen: [x86_64]
- netgen-devel: [x86_64]
- netgen-examples: [x86_64]
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package 000release-packages for openSUSE:Factory checked in at 2022-06-28 19:31:53
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/000release-packages (Old)
and /work/SRC/openSUSE:Factory/.000release-packages.new.1548 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "000release-packages"
Tue Jun 28 19:31:53 2022 rev:1692 rq: version:unknown
Changes:
--------
New Changes file:
NO CHANGES FILE!!!
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
openSUSE-Addon-NonOss-release.spec: same change
openSUSE-release.spec: same change
stub.spec: same change
++++++ weakremovers.inc ++++++
--- /var/tmp/diff_new_pack.eqLpzA/_old 2022-06-28 19:31:56.026241073 +0200
+++ /var/tmp/diff_new_pack.eqLpzA/_new 2022-06-28 19:31:56.038241081 +0200
@@ -10467,8 +10467,31 @@
Provides: weakremover(kholidays-lang)
Provides: weakremover(kicad-doc-nl)
Provides: weakremover(kicad-doc-pdf-ru)
+Provides: weakremover(kicad-lang-bg)
+Provides: weakremover(kicad-lang-ca)
+Provides: weakremover(kicad-lang-cs)
+Provides: weakremover(kicad-lang-de)
+Provides: weakremover(kicad-lang-el)
+Provides: weakremover(kicad-lang-en)
+Provides: weakremover(kicad-lang-es)
+Provides: weakremover(kicad-lang-fi)
+Provides: weakremover(kicad-lang-fr)
+Provides: weakremover(kicad-lang-hu)
Provides: weakremover(kicad-lang-id)
+Provides: weakremover(kicad-lang-it)
+Provides: weakremover(kicad-lang-ja)
+Provides: weakremover(kicad-lang-ko)
+Provides: weakremover(kicad-lang-lt)
+Provides: weakremover(kicad-lang-nl)
+Provides: weakremover(kicad-lang-pl)
+Provides: weakremover(kicad-lang-pt)
Provides: weakremover(kicad-lang-ro)
+Provides: weakremover(kicad-lang-ru)
+Provides: weakremover(kicad-lang-sk)
+Provides: weakremover(kicad-lang-sl)
+Provides: weakremover(kicad-lang-sv)
+Provides: weakremover(kicad-lang-zh_CN)
+Provides: weakremover(kicad-lang-zh_TW)
Provides: weakremover(kicad-library-install)
Provides: weakremover(kile5-lang)
Provides: weakremover(killswitch-applet)
@@ -12110,6 +12133,7 @@
Provides: weakremover(libdigikamcore5)
Provides: weakremover(libdigikamcore6)
Provides: weakremover(libdigikamcore7)
+Provides: weakremover(libdiscord-rpc)
Provides: weakremover(libdleyna-core-1_0-4)
Provides: weakremover(libdm0)
Provides: weakremover(libdmmp0_1_0)
@@ -13715,19 +13739,29 @@
Provides: weakremover(libopenct1)
Provides: weakremover(libopencv3_2)
Provides: weakremover(libopencv3_3)
+Provides: weakremover(libopencv405)
Provides: weakremover(libopencv4_1)
Provides: weakremover(libopencv4_2)
Provides: weakremover(libopencv4_3)
Provides: weakremover(libopencv4_4)
Provides: weakremover(libopencv4_5)
+Provides: weakremover(libopencv_aruco405)
Provides: weakremover(libopencv_aruco4_5)
+Provides: weakremover(libopencv_face405)
Provides: weakremover(libopencv_face4_5)
+Provides: weakremover(libopencv_highgui405)
Provides: weakremover(libopencv_highgui4_5)
+Provides: weakremover(libopencv_imgcodecs405)
Provides: weakremover(libopencv_imgcodecs4_5)
+Provides: weakremover(libopencv_objdetect405)
Provides: weakremover(libopencv_objdetect4_5)
+Provides: weakremover(libopencv_superres405)
Provides: weakremover(libopencv_superres4_5)
+Provides: weakremover(libopencv_videoio405)
Provides: weakremover(libopencv_videoio4_5)
+Provides: weakremover(libopencv_videostab405)
Provides: weakremover(libopencv_videostab4_5)
+Provides: weakremover(libopencv_ximgproc405)
Provides: weakremover(libopencv_ximgproc4_5)
Provides: weakremover(libopendkim10)
Provides: weakremover(libopenjpeg1)
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package 00Meta for openSUSE:Leap:15.3:Images checked in at 2022-06-28 18:02:26
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Leap:15.3:Images/00Meta (Old)
and /work/SRC/openSUSE:Leap:15.3:Images/.00Meta.new.1548 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "00Meta"
Tue Jun 28 18:02:26 2022 rev:364 rq: version:unknown
Changes:
--------
New Changes file:
NO CHANGES FILE!!!
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ version_snapshot ++++++
--- /var/tmp/diff_new_pack.DcA6MQ/_old 2022-06-28 18:02:27.790537989 +0200
+++ /var/tmp/diff_new_pack.DcA6MQ/_new 2022-06-28 18:02:27.794537992 +0200
@@ -1,3 +1,3 @@
-9.543
+9.544
(No newline at EOF)
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package discord-rpc for openSUSE:Factory checked in at 2022-06-28 16:58:23
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/discord-rpc (Old)
and /work/SRC/openSUSE:Factory/.discord-rpc.new.1548 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "discord-rpc"
Tue Jun 28 16:58:23 2022 rev:2 rq:985131 version:3.4.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/discord-rpc/discord-rpc.changes 2020-10-05 19:41:13.913675380 +0200
+++ /work/SRC/openSUSE:Factory/.discord-rpc.new.1548/discord-rpc.changes 2022-06-28 16:58:24.539478501 +0200
@@ -1,0 +2,6 @@
+Tue Jun 21 15:00:41 UTC 2022 - Jan Engelhardt <jengelh(a)inai.de>
+
+- Add 0001-Add-some-library-versioning.patch to further SLPP
+ compliance.
+
+-------------------------------------------------------------------
New:
----
0001-Add-some-library-versioning.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ discord-rpc.spec ++++++
--- /var/tmp/diff_new_pack.MHFmCg/_old 2022-06-28 16:58:25.167479008 +0200
+++ /var/tmp/diff_new_pack.MHFmCg/_new 2022-06-28 16:58:25.171479012 +0200
@@ -1,7 +1,7 @@
#
# spec file for package discord-rpc
#
-# Copyright (c) 2020 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2022 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -12,18 +12,20 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
Name: discord-rpc
Version: 3.4.0
+%define shver 3_4_0
Release: 0
Summary: Discord rich presence library
License: MIT
Group: Development/Libraries/C and C++
-Url: https://github.com/discordapp/discord-rpc
+URL: https://github.com/discordapp/discord-rpc
Source: https://github.com/discordapp/%{name}/archive/v%{version}.tar.gz
+Patch1: 0001-Add-some-library-versioning.patch
BuildRequires: cmake
BuildRequires: gcc-c++
BuildRequires: rapidjson-devel
@@ -32,23 +34,25 @@
This is a library for interfacing your game with a locally running Discord
desktop client.
-%package -n libdiscord-rpc
+%package -n libdiscord-rpc%{shver}
Summary: Discord RPC library
Group: System/Libraries
Recommends: discord
-%description -n libdiscord-rpc
-Discord RPC shared library
+%description -n libdiscord-rpc%{shver}
+This is a library for interfacing your game with a locally running Discord
+desktop client.
%package devel
Summary: Development files for libdiscord-rpc
-Requires: libdiscord-rpc = %{version}
+Requires: libdiscord-rpc%{shver} = %{version}-%{release}
%description devel
-Header files for the discord-rpc library
+Header files for the discord-rpc library.
%prep
-%setup -q
+%autosetup -p1
+perl -i -lpe 's{\@PACKAGE_VERSION\@}{%version}g' src/CMakeLists.txt
%build
%cmake
@@ -63,8 +67,9 @@
%doc README.md
%{_includedir}/discord_register.h
%{_includedir}/discord_rpc.h
-
-%files -n libdiscord-rpc
%{_libdir}/libdiscord-rpc.so
+%files -n libdiscord-rpc%{shver}
+%{_libdir}/libdiscord-rpc.so.%{version}
+
%changelog
++++++ 0001-Add-some-library-versioning.patch ++++++
From b512cd3cfdc47a9684ea3cf1208a0c7ac921d0dc Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh(a)inai.de>
Date: Mon, 20 Jun 2022 14:14:34 +0200
Subject: [PATCH] Add some library versioning
Upstream: https://github.com/discord/discord-rpc/pull/367/
discord-rpc silently changed ABI between v3.0.0 and v3.4.0.
This requires DT_SONAME changes. Implement something that fulfills
the tagging requirements for distributions.
(SLPP ��4.1 option 2;
https://en.opensuse.org/openSUSE:Shared_library_packaging_policy#When_there…)
---
CMakeLists.txt | 1 +
src/CMakeLists.txt | 1 +
2 files changed, 2 insertions(+)
Index: discord-rpc-3.4.0/CMakeLists.txt
===================================================================
--- discord-rpc-3.4.0.orig/CMakeLists.txt
+++ discord-rpc-3.4.0/CMakeLists.txt
@@ -1,5 +1,6 @@
cmake_minimum_required (VERSION 3.2.0)
project (DiscordRPC)
+set(DRPC_VERSION 3.4.0)
include(GNUInstallDirs)
Index: discord-rpc-3.4.0/src/CMakeLists.txt
===================================================================
--- discord-rpc-3.4.0.orig/src/CMakeLists.txt
+++ discord-rpc-3.4.0/src/CMakeLists.txt
@@ -71,6 +71,7 @@ if(UNIX)
endif(APPLE)
add_library(discord-rpc ${BASE_RPC_SRC})
+ set_target_properties(discord-rpc PROPERTIES SOVERSION ${DRPC_VERSION})
target_link_libraries(discord-rpc PUBLIC pthread)
target_compile_options(discord-rpc PRIVATE
-g
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package 000release-packages for openSUSE:Factory checked in at 2022-06-28 15:42:57
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/000release-packages (Old)
and /work/SRC/openSUSE:Factory/.000release-packages.new.1548 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "000release-packages"
Tue Jun 28 15:42:57 2022 rev:1691 rq: version:unknown
Changes:
--------
New Changes file:
NO CHANGES FILE!!!
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ MicroOS-release.spec ++++++
--- /var/tmp/diff_new_pack.amW0aP/_old 2022-06-28 15:42:59.863787608 +0200
+++ /var/tmp/diff_new_pack.amW0aP/_new 2022-06-28 15:42:59.867787614 +0200
@@ -17,7 +17,7 @@
Name: MicroOS-release
-Version: 20220627
+Version: 20220628
Release: 0
Summary: openSUSE MicroOS
License: GPL-2.0-or-later
@@ -176,9 +176,9 @@
%include %{SOURCE100}
Provides: %name-%version
Provides: product() = MicroOS
-Provides: product(MicroOS) = 20220627-0
+Provides: product(MicroOS) = 20220628-0
Provides: product-label() = openSUSE%20MicroOS
-Provides: product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Amicroos%3A20220627
+Provides: product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Amicroos%3A20220628
Provides: product-url(releasenotes) = http%3A%2F%2Fdoc.opensuse.org%2Frelease%2Dnotes%2Fx86_64%2FopenSUSE%2FTumbleweed%2Frelease%2Dnotes%2DopenSUSE.rpm
Provides: product-endoflife()
Requires: product_flavor(MicroOS)
@@ -194,7 +194,7 @@
Group: System/Fhs
Provides: product_flavor()
Provides: flavor(dvd)
-Provides: product_flavor(MicroOS) = 20220627-0
+Provides: product_flavor(MicroOS) = 20220628-0
Summary: openSUSE MicroOS%{?betaversion: %{betaversion}}
%description dvd
@@ -210,7 +210,7 @@
Group: System/Fhs
Provides: product_flavor()
Provides: flavor(appliance)
-Provides: product_flavor(MicroOS) = 20220627-0
+Provides: product_flavor(MicroOS) = 20220628-0
Summary: openSUSE MicroOS%{?betaversion: %{betaversion}}
%description appliance
@@ -267,11 +267,11 @@
<product schemeversion="0">
<vendor>openSUSE</vendor>
<name>MicroOS</name>
- <version>20220627</version>
+ <version>20220628</version>
<release>0</release>
<endoflife></endoflife>
<arch>%{_target_cpu}</arch>
- <cpeid>cpe:/o:opensuse:microos:20220627</cpeid>
+ <cpeid>cpe:/o:opensuse:microos:20220628</cpeid>
<productline>MicroOS</productline>
<register>
<pool>
++++++ openSUSE-Addon-NonOss-release.spec ++++++
--- /var/tmp/diff_new_pack.amW0aP/_old 2022-06-28 15:42:59.887787643 +0200
+++ /var/tmp/diff_new_pack.amW0aP/_new 2022-06-28 15:42:59.891787650 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package openSUSE-Addon-NonOss-release (Version 20220627)
+# spec file for package openSUSE-Addon-NonOss-release (Version 20220628)
#
# Copyright (c) 2022 openSUSE.
#
@@ -16,16 +16,16 @@
Name: openSUSE-Addon-NonOss-release
%define product openSUSE-Addon-NonOss
Summary: openSUSE NonOSS Addon%{?betaversion: %{betaversion}}
-Version: 20220627
+Version: 20220628
Release: 0
License: BSD-3-Clause
Group: System/Fhs
Provides: %name-%version
Provides: product() = openSUSE-Addon-NonOss
-Provides: product(openSUSE-Addon-NonOss) = 20220627-0
+Provides: product(openSUSE-Addon-NonOss) = 20220628-0
Provides: product-label() = non%20oss%20addon
-Provides: product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Aopensuse%2Daddon%2Dnonoss%3A20220627
+Provides: product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Aopensuse%2Daddon%2Dnonoss%3A20220628
AutoReqProv: on
@@ -48,10 +48,10 @@
<product schemeversion="0">
<vendor>openSUSE</vendor>
<name>openSUSE-Addon-NonOss</name>
- <version>20220627</version>
+ <version>20220628</version>
<release>0</release>
<arch>%{_target_cpu}</arch>
- <cpeid>cpe:/o:opensuse:opensuse-addon-nonoss:20220627</cpeid>
+ <cpeid>cpe:/o:opensuse:opensuse-addon-nonoss:20220628</cpeid>
<register>
<pool>
</pool>
++++++ openSUSE-release.spec ++++++
--- /var/tmp/diff_new_pack.amW0aP/_old 2022-06-28 15:42:59.907787673 +0200
+++ /var/tmp/diff_new_pack.amW0aP/_new 2022-06-28 15:42:59.911787679 +0200
@@ -20,7 +20,7 @@
#define betaversion %{nil}
%define codename Tumbleweed
Name: openSUSE-release
-Version: 20220627
+Version: 20220628
Release: 0
# 0 is the product release, not the build release of this package
Summary: openSUSE Tumbleweed
@@ -178,7 +178,7 @@
%include %{SOURCE100}
Provides: %name-%version
Provides: product() = openSUSE
-Provides: product(openSUSE) = 20220627-0
+Provides: product(openSUSE) = 20220628-0
%ifarch x86_64
Provides: product-register-target() = openSUSE%2DTumbleweed%2Dx86_64
%endif
@@ -192,7 +192,7 @@
Provides: product-register-target() = openSUSE%2DTumbleweed%2Daarch64
%endif
Provides: product-label() = openSUSE
-Provides: product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Aopensuse%3A20220627
+Provides: product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Aopensuse%3A20220628
Provides: product-url(releasenotes) = http%3A%2F%2Fdoc.opensuse.org%2Frelease%2Dnotes%2Fx86_64%2FopenSUSE%2FTumbleweed%2Frelease%2Dnotes%2DopenSUSE.rpm
Provides: product-url(repository) = http%3A%2F%2Fdownload.opensuse.org%2Ftumbleweed%2Frepo%2Foss%2F
Requires: product_flavor(openSUSE)
@@ -206,7 +206,7 @@
Group: System/Fhs
Provides: product_flavor()
Provides: flavor(ftp)
-Provides: product_flavor(openSUSE) = 20220627-0
+Provides: product_flavor(openSUSE) = 20220628-0
Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}}
%description ftp
@@ -221,7 +221,7 @@
Group: System/Fhs
Provides: product_flavor()
Provides: flavor(mini)
-Provides: product_flavor(openSUSE) = 20220627-0
+Provides: product_flavor(openSUSE) = 20220628-0
Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}}
%description mini
@@ -236,7 +236,7 @@
Group: System/Fhs
Provides: product_flavor()
Provides: flavor(dvd)
-Provides: product_flavor(openSUSE) = 20220627-0
+Provides: product_flavor(openSUSE) = 20220628-0
Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}}
%description dvd
@@ -251,7 +251,7 @@
Group: System/Fhs
Provides: product_flavor()
Provides: flavor(livecd-kde)
-Provides: product_flavor(openSUSE) = 20220627-0
+Provides: product_flavor(openSUSE) = 20220628-0
Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}}
%description livecd-kde
@@ -266,7 +266,7 @@
Group: System/Fhs
Provides: product_flavor()
Provides: flavor(livecd-x11)
-Provides: product_flavor(openSUSE) = 20220627-0
+Provides: product_flavor(openSUSE) = 20220628-0
Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}}
%description livecd-x11
@@ -281,7 +281,7 @@
Group: System/Fhs
Provides: product_flavor()
Provides: flavor(livecd-gnome)
-Provides: product_flavor(openSUSE) = 20220627-0
+Provides: product_flavor(openSUSE) = 20220628-0
Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}}
%description livecd-gnome
@@ -296,7 +296,7 @@
Group: System/Fhs
Provides: product_flavor()
Provides: flavor(livecd-xfce)
-Provides: product_flavor(openSUSE) = 20220627-0
+Provides: product_flavor(openSUSE) = 20220628-0
Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}}
%description livecd-xfce
@@ -311,7 +311,7 @@
Group: System/Fhs
Provides: product_flavor()
Provides: flavor(usb-kde)
-Provides: product_flavor(openSUSE) = 20220627-0
+Provides: product_flavor(openSUSE) = 20220628-0
Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}}
%description usb-kde
@@ -326,7 +326,7 @@
Group: System/Fhs
Provides: product_flavor()
Provides: flavor(usb-gnome)
-Provides: product_flavor(openSUSE) = 20220627-0
+Provides: product_flavor(openSUSE) = 20220628-0
Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}}
%description usb-gnome
@@ -341,7 +341,7 @@
Group: System/Fhs
Provides: product_flavor()
Provides: flavor(usb-x11)
-Provides: product_flavor(openSUSE) = 20220627-0
+Provides: product_flavor(openSUSE) = 20220628-0
Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}}
%description usb-x11
@@ -356,7 +356,7 @@
Group: System/Fhs
Provides: product_flavor()
Provides: flavor(appliance)
-Provides: product_flavor(openSUSE) = 20220627-0
+Provides: product_flavor(openSUSE) = 20220628-0
Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}}
%description appliance
@@ -371,7 +371,7 @@
Group: System/Fhs
Provides: product_flavor()
Provides: flavor(appliance-docker)
-Provides: product_flavor(openSUSE) = 20220627-0
+Provides: product_flavor(openSUSE) = 20220628-0
Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}}
%description appliance-docker
@@ -386,7 +386,7 @@
Group: System/Fhs
Provides: product_flavor()
Provides: flavor(appliance-kvm)
-Provides: product_flavor(openSUSE) = 20220627-0
+Provides: product_flavor(openSUSE) = 20220628-0
Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}}
%description appliance-kvm
@@ -401,7 +401,7 @@
Group: System/Fhs
Provides: product_flavor()
Provides: flavor(appliance-vmware)
-Provides: product_flavor(openSUSE) = 20220627-0
+Provides: product_flavor(openSUSE) = 20220628-0
Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}}
%description appliance-vmware
@@ -416,7 +416,7 @@
Group: System/Fhs
Provides: product_flavor()
Provides: flavor(appliance-openstack)
-Provides: product_flavor(openSUSE) = 20220627-0
+Provides: product_flavor(openSUSE) = 20220628-0
Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}}
%description appliance-openstack
@@ -431,7 +431,7 @@
Group: System/Fhs
Provides: product_flavor()
Provides: flavor(appliance-hyperv)
-Provides: product_flavor(openSUSE) = 20220627-0
+Provides: product_flavor(openSUSE) = 20220628-0
Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}}
%description appliance-hyperv
@@ -446,7 +446,7 @@
Group: System/Fhs
Provides: product_flavor()
Provides: flavor(appliance-vagrant)
-Provides: product_flavor(openSUSE) = 20220627-0
+Provides: product_flavor(openSUSE) = 20220628-0
Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}}
%description appliance-vagrant
@@ -461,7 +461,7 @@
Group: System/Fhs
Provides: product_flavor()
Provides: flavor(appliance-wsl)
-Provides: product_flavor(openSUSE) = 20220627-0
+Provides: product_flavor(openSUSE) = 20220628-0
Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}}
%description appliance-wsl
@@ -476,7 +476,7 @@
Group: System/Fhs
Provides: product_flavor()
Provides: flavor(appliance-custom)
-Provides: product_flavor(openSUSE) = 20220627-0
+Provides: product_flavor(openSUSE) = 20220628-0
Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}}
%description appliance-custom
@@ -557,10 +557,10 @@
<product schemeversion="0">
<vendor>openSUSE</vendor>
<name>openSUSE</name>
- <version>20220627</version>
+ <version>20220628</version>
<release>0</release>
<arch>%{_target_cpu}</arch>
- <cpeid>cpe:/o:opensuse:opensuse:20220627</cpeid>
+ <cpeid>cpe:/o:opensuse:opensuse:20220628</cpeid>
<productline>openSUSE</productline>
<register>
<pool>
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package vips for openSUSE:Factory checked in at 2022-06-28 15:23:09
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/vips (Old)
and /work/SRC/openSUSE:Factory/.vips.new.1548 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "vips"
Tue Jun 28 15:23:09 2022 rev:43 rq:985585 version:8.12.2
Changes:
--------
--- /work/SRC/openSUSE:Factory/vips/vips.changes 2022-01-26 21:27:48.501651573 +0100
+++ /work/SRC/openSUSE:Factory/.vips.new.1548/vips.changes 2022-06-28 15:23:28.654041379 +0200
@@ -1,0 +2,16 @@
+Sat Jun 18 14:40:15 UTC 2022 - Dirk M��ller <dmueller(a)suse.com>
+
+- update to 8.12.2:
+ * make exif resuint optional and default to inch
+ * win: don't set create time on inappropriate file descriptors [lovell]
+ * fall back to magicksave for gif if cgif is not present [erik-frontify]
+ * fix a crash with 0 length vectors
+ * change default frame delay for GIFs from 1s to 0.1s
+ * remove stray trailing comma from iiif3 dirnames [whalehub]
+ * fix TTF load [chregu]
+ * revise GIF save alpha threshold [jfcalvo]
+ * raise libpng pixel size limit from 1m to 10m pixels [jskrzypek]
+ * fix gif save change detector [TheEssem]
+ * fix load from pipe with variable size reads
+
+-------------------------------------------------------------------
Old:
----
vips-8.12.1.tar.gz
New:
----
vips-8.12.2.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ vips.spec ++++++
--- /var/tmp/diff_new_pack.AhKmJ5/_old 2022-06-28 15:23:29.150042119 +0200
+++ /var/tmp/diff_new_pack.AhKmJ5/_new 2022-06-28 15:23:29.158042131 +0200
@@ -23,7 +23,7 @@
%define short_version_ 8_12
%define somajor 42
Name: vips
-Version: 8.12.1
+Version: 8.12.2
Release: 0
Summary: C/C++ library for processing large images
License: LGPL-2.1-only
@@ -103,10 +103,10 @@
Group: Development/Libraries/C and C++
Requires: %{libname}%{somajor} = %{version}
Requires: pkgconfig
+Requires: pkgconfig(gobject-2.0)
Requires: pkgconfig(libjpeg)
Requires: pkgconfig(libtiff-4)
Requires: pkgconfig(zlib)
-Requires: pkgconfig(gobject-2.0)
%description -n %{libname}-devel
This package contains the development files for developing applications that
++++++ vips-8.12.1.tar.gz -> vips-8.12.2.tar.gz ++++++
/work/SRC/openSUSE:Factory/vips/vips-8.12.1.tar.gz /work/SRC/openSUSE:Factory/.vips.new.1548/vips-8.12.2.tar.gz differ: char 26, line 1
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package kakoune for openSUSE:Factory checked in at 2022-06-28 15:23:08
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kakoune (Old)
and /work/SRC/openSUSE:Factory/.kakoune.new.1548 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kakoune"
Tue Jun 28 15:23:08 2022 rev:22 rq:985586 version:2021.11.08
Changes:
--------
--- /work/SRC/openSUSE:Factory/kakoune/kakoune.changes 2021-12-05 22:46:13.957618395 +0100
+++ /work/SRC/openSUSE:Factory/.kakoune.new.1548/kakoune.changes 2022-06-28 15:23:27.794040095 +0200
@@ -1,0 +2,5 @@
+Mon Jun 27 20:43:08 UTC 2022 - Antoine Belvire <antoine.belvire(a)opensuse.org>
+
+- Add kakoune-2021.11.08-gcc-12.patch: Fix build with gcc 12.
+
+-------------------------------------------------------------------
New:
----
kakoune-2021.11.08-gcc-12.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kakoune.spec ++++++
--- /var/tmp/diff_new_pack.Gq0dL9/_old 2022-06-28 15:23:28.210040717 +0200
+++ /var/tmp/diff_new_pack.Gq0dL9/_new 2022-06-28 15:23:28.214040722 +0200
@@ -24,6 +24,8 @@
Group: Productivity/Text/Editors
URL: https://kakoune.org/
Source: https://github.com/mawww/kakoune/releases/download/v%{version}/kakoune-%{ve…
+# PATCH-FIX-UPSTREAM kakoune-2021.11.08-gcc-12.patch -- Fix build with gcc 12 (gh#mawww/kakoune#4544)
+Patch: kakoune-2021.11.08-gcc-12.patch
BuildRequires: asciidoc
BuildRequires: fdupes
BuildRequires: gcc-c++ >= 5.0
++++++ kakoune-2021.11.08-gcc-12.patch ++++++
From d1ea2ffa600fd2a7b14e415b68ceedba3325c5db Mon Sep 17 00:00:00 2001
From: Tim Allen <screwtape(a)froup.com>
Date: Sat, 12 Feb 2022 21:35:33 +1100
Subject: [PATCH] Make Color::validate_alpha() a constexpr function.
We call it from a constexpr constructor, so it needs to be constexpr itself.
Fixes #4544.
---
src/color.cc | 7 -------
src/color.hh | 7 ++++++-
2 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/src/color.cc b/src/color.cc
index b355b9cf13..dfe2e955b2 100644
--- a/src/color.cc
+++ b/src/color.cc
@@ -34,13 +34,6 @@ bool is_color_name(StringView color)
return contains(color_names, color);
}
-void Color::validate_alpha()
-{
- static_assert(RGB == 17);
- if (a < RGB)
- throw runtime_error("Colors alpha must be > 16");
-}
-
Color str_to_color(StringView color)
{
auto it = find_if(color_names, [&](const char* c){ return color == c; });
diff --git a/src/color.hh b/src/color.hh
index 943678edfb..85babd9800 100644
--- a/src/color.hh
+++ b/src/color.hh
@@ -1,6 +1,7 @@
#ifndef color_hh_INCLUDED
#define color_hh_INCLUDED
+#include "exception.hh"
#include "hash.hh"
#include "meta.hh"
#include "assert.hh"
@@ -55,7 +56,11 @@ struct Color
}
private:
- void validate_alpha();
+ constexpr void validate_alpha() {
+ static_assert(RGB == 17);
+ if (a < RGB)
+ throw runtime_error("Colors alpha must be > 16");
+ }
};
constexpr bool operator==(Color lhs, Color rhs)
1
0