June 2023 - openSUSE Commits - openSUSE Mailing Lists

commit podman for openSUSE:Factory
by Source-Sync 01 Jun '23

01 Jun '23

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package podman for openSUSE:Factory checked in at 2023-06-01 17:18:55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/podman (Old) and /work/SRC/openSUSE:Factory/.podman.new.2531 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "podman" Thu Jun 1 17:18:55 2023 rev:107 rq:1089696 version:4.5.1 Changes: -------- --- /work/SRC/openSUSE:Factory/podman/podman.changes 2023-04-20 15:14:10.201873316 +0200 +++ /work/SRC/openSUSE:Factory/.podman.new.2531/podman.changes 2023-06-01 17:18:57.589961008 +0200 @@ -1,0 +2,30 @@ +Mon May 29 10:56:00 UTC 2023 - danish.prakash(a)suse.com + +- Update to version 4.5.1: + * Release v4.5.1 + * [CI:DOCS] Final release notes for v4.5.1 + * [CI:BUILD] Packit: set propose-downstream action type to pre-sync + * Revert "Resolve symlink path for qemu directory if possible" + * no need for podman-next rpm test on maint branch + * [CI:BUILD] Packit: add jobs for downstream Fedora package builds + * libpod: configureNetNS() tear down on errors + * libpod: rootlessNetNs.Cleanup() fix error message + * network create/update: allow dns servers comma separated + * machine: fix default connection URL to use 127.0.0.1 + * compat: accept tag in /images/create?fromSrc + * compat container create: match duplicate mounts correctly + * machine: qemu only remove connection after confirmation + * windows: podman save allow the use of stdout + * remote: exec inspect update exec session status + * podman-remote logs: handle server error correctly + * libpod: stop containers with --restart=always + * Do not include image annotations when building spec + * [v4.5] system tests: fix race in kube-play read-only + * api: fix parsing filters + * Support systemd optional prefix '-' for devices. + * *: migrate image registry to registry.k8s.io + * Makefile: include `release-artifacts` target + * [CI:BUILD] Packit: Initial Enablement + * Bump to v4.5.1-dev + +------------------------------------------------------------------- Old: ---- podman-4.5.0.tar.xz New: ---- podman-4.5.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ podman.spec ++++++ --- /var/tmp/diff_new_pack.2AqdWX/_old 2023-06-01 17:18:59.229970729 +0200 +++ /var/tmp/diff_new_pack.2AqdWX/_new 2023-06-01 17:18:59.285971061 +0200 @@ -18,7 +18,7 @@ %{!?_user_tmpfilesdir: %global _user_tmpfilesdir %{_datadir}/user-tmpfiles.d} %define project github.com/containers/podman Name: podman -Version: 4.5.0 +Version: 4.5.1 Release: 0 Summary: Daemon-less container engine for managing containers, pods and images License: Apache-2.0 ++++++ _service ++++++ --- /var/tmp/diff_new_pack.2AqdWX/_old 2023-06-01 17:18:59.613973006 +0200 +++ /var/tmp/diff_new_pack.2AqdWX/_new 2023-06-01 17:18:59.633973124 +0200 @@ -2,7 +2,7 @@ <service name="tar_scm" mode="disabled"> <param name="url">https://github.com/containers/podman.git</param> <param name="scm">git</param> - <param name="revision">v4.5.0</param> + <param name="revision">v4.5.1</param> <param name="versionformat">@PARENT_TAG@</param> <param name="changesgenerate">enable</param> <param name="versionrewrite-pattern">v(.*)</param> ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.2AqdWX/_old 2023-06-01 17:18:59.701973528 +0200 +++ /var/tmp/diff_new_pack.2AqdWX/_new 2023-06-01 17:18:59.721973646 +0200 @@ -1,6 +1,6 @@ <servicedata> <service name="tar_scm"> <param name="url">https://github.com/containers/podman.git</param> - <param name="changesrevision">75e3c12579d391b81d871fd1cded6cf0d043550a</param></service></servicedata> + <param name="changesrevision">9eef30051c83f62816a1772a743e5f1271b196d7</param></service></servicedata> (No newline at EOF) ++++++ podman-4.5.0.tar.xz -> podman-4.5.1.tar.xz ++++++ /work/SRC/openSUSE:Factory/podman/podman-4.5.0.tar.xz /work/SRC/openSUSE:Factory/.podman.new.2531/podman-4.5.1.tar.xz differ: char 15, line 1

1 0

commit python-ini2toml for openSUSE:Factory
by Source-Sync 01 Jun '23

01 Jun '23

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package python-ini2toml for openSUSE:Factory checked in at 2023-06-01 17:18:52 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-ini2toml (Old) and /work/SRC/openSUSE:Factory/.python-ini2toml.new.2531 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-ini2toml" Thu Jun 1 17:18:52 2023 rev:7 rq:1089694 version:0.12 Changes: -------- --- /work/SRC/openSUSE:Factory/python-ini2toml/python-ini2toml.changes 2023-05-19 11:55:51.827380722 +0200 +++ /work/SRC/openSUSE:Factory/.python-ini2toml.new.2531/python-ini2toml.changes 2023-06-01 17:18:53.577937225 +0200 @@ -1,0 +2,6 @@ +Tue May 30 06:22:39 UTC 2023 - Daniel Garcia <daniel.garcia(a)suse.com> + +- Remove ConfigUpdater dependency for tests when it's not building for + the -full or -all subpackage. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-ini2toml.spec ++++++ --- /var/tmp/diff_new_pack.2FmYDJ/_old 2023-06-01 17:18:53.965939525 +0200 +++ /var/tmp/diff_new_pack.2FmYDJ/_new 2023-06-01 17:18:53.973939572 +0200 @@ -49,7 +49,6 @@ %bcond_with experimental %define skip_python2 1 -%{?sle15_python_module_pythons} Name: python-ini2toml%{psuffix} Version: 0.12 Release: 0 @@ -64,7 +63,6 @@ Requires(post): update-alternatives Requires(postun):update-alternatives %if %{with test} -BuildRequires: %{python_module ConfigUpdater} BuildRequires: %{python_module packaging >= 20.7} BuildRequires: %{python_module pytest} BuildRequires: %{python_module validate-pyproject >= 0.6 with %python-validate-pyproject < 2} @@ -77,6 +75,11 @@ %if %{with all} BuildRequires: %{python_module ini2toml-all = %{version}} %endif + +%if %{with full} || %{with all} +BuildRequires: %{python_module ConfigUpdater} +%endif + %if %{with experimental} BuildRequires: %{python_module ini2toml-experimental = %{version}} %endif @@ -164,6 +167,7 @@ --ignore tests/plugins/test_mypy.py --ignore tests/plugins/test_pytest.py --ignore tests/plugins/test_setuptools_pep621.py + --ignore tests/plugins/test_toml_incompatibilities.py ) %endif %if %{without experimental}

1 0

commit qclib for openSUSE:Factory
by Source-Sync 01 Jun '23

01 Jun '23

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package qclib for openSUSE:Factory checked in at 2023-06-01 17:18:53 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/qclib (Old) and /work/SRC/openSUSE:Factory/.qclib.new.2531 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "qclib" Thu Jun 1 17:18:53 2023 rev:14 rq:1089695 version:2.4.0 Changes: -------- --- /work/SRC/openSUSE:Factory/qclib/qclib.changes 2022-09-22 14:49:15.570348740 +0200 +++ /work/SRC/openSUSE:Factory/.qclib.new.2531/qclib.changes 2023-06-01 17:18:54.345941777 +0200 @@ -1,0 +2,11 @@ +Tue May 30 06:23:30 UTC 2023 - Nikolay Gueorguiev <nikolay.gueorguiev(a)suse.com> + +- Upgrade to version 2.4.0 (jsc#PED-3284, jsc#PED-3285) + * Changes: + - Recognize single frame models and rackable models + - zname: Add support for option --json + - qc_dump: Add trace and JSON dump to .tgz +- Amended the .spec file for the error "static-library-without-debuginfo" + * Removed the line: gzip -9 %{buildroot}/%{_mandir}/man8/* + +------------------------------------------------------------------- Old: ---- qclib-2.3.2.tar.gz New: ---- qclib-2.4.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qclib.spec ++++++ --- /var/tmp/diff_new_pack.tocVVy/_old 2023-06-01 17:18:54.797944457 +0200 +++ /var/tmp/diff_new_pack.tocVVy/_new 2023-06-01 17:18:54.801944480 +0200 @@ -1,7 +1,7 @@ # # spec file for package qclib # -# Copyright (c) 2017-2022 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,8 +16,10 @@ # +%global _lto_cflags %{?_lto_cflags} -ffat-lto-objects + Name: qclib -Version: 2.3.2 +Version: 2.4.0 Release: 0 Summary: Query Capacity library License: BSD-3-Clause @@ -28,7 +30,7 @@ BuildRequires: doxygen BuildRequires: gcc-c++ ExclusiveArch: s390 s390x -%if 0%{?suse_version} > 1300 +%if 0%{?suse_version} > 1500 BuildRequires: glibc-devel-static %else BuildRequires: glibc-devel @@ -107,7 +109,6 @@ %install %make_install V=1 -gzip -9 %{buildroot}/%{_mandir}/man8/* make installdoc DESTDIR=%{buildroot} V=1 %post -n libqc2 -p /sbin/ldconfig ++++++ qclib-2.3.2.tar.gz -> qclib-2.4.0.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qclib-2.3.2/Makefile new/qclib-2.4.0/Makefile --- old/qclib-2.3.2/Makefile 2022-09-19 12:07:33.000000000 +0200 +++ new/qclib-2.4.0/Makefile 2023-04-08 23:49:23.000000000 +0200 @@ -4,7 +4,7 @@ # major : Backwards compatible changes to the API # minor : Additions leaving the API unmodified # bugfix: Bugfixes only -VERSION = 2.3.2 +VERSION = 2.4.0 VERM = $(shell echo $(VERSION) | cut -d '.' -f 1) CFLAGS ?= -g -Wall -O2 LDFLAGS ?= diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qclib-2.3.2/README.md new/qclib-2.4.0/README.md --- old/qclib-2.3.2/README.md 2022-09-19 12:07:33.000000000 +0200 +++ new/qclib-2.4.0/README.md 2023-04-08 23:49:23.000000000 +0200 @@ -87,6 +87,13 @@ Release History --------------- +* __v2.4.0 (2023-04-08)__ + + _Changes_: + - Recognize single frame models and rackable models + - `zname`: Add support for option `--json` + - `qc_dump`: Add trace and JSON dump to `.tgz` + * __v2.3.2 (2022-09-19)__ _Changes_: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qclib-2.3.2/qc_dump new/qclib-2.4.0/qc_dump --- old/qclib-2.3.2/qc_dump 2022-09-19 12:07:33.000000000 +0200 +++ new/qclib-2.4.0/qc_dump 2023-04-08 23:49:23.000000000 +0200 @@ -5,16 +5,21 @@ qcbin="zname"; if [ $# -eq 1 ]; then qcbin="$1"; -fi - -if [ ! -x $qcbin ]; then - echo "Error: $qcbin not found or not executable"; - echo "Note: You can specify an arbitrary executable as an argument to qc_dump"; - exit 2; + if [ ! -x $qcbin ]; then + echo "Error: $qcbin not found or not executable"; + exit 1; + fi +else + which $qcbin > /dev/null; + if [ $? -ne 0 ]; then + echo "Error: $qcbin not found or not executable"; + echo "Note: You can specify an arbitrary executable as an argument to qc_dump"; + exit 2; + fi fi echo "Executing $qcbin..."; -QC_DEBUG=2 $qcbin >/tmp/ref_result.txt; +QC_DEBUG=2 $qcbin --json >/tmp/ref_result.txt; if [ $? -ne 0 ]; then echo "$qcbin failed - good thing we're creating a dump"; @@ -31,12 +36,13 @@ mv ref_result.txt $dump; lscpu -e > $dump/lscpu.output; hostname > $dump/hostname.output; +cp `ls -rtd qclib-?????? | tail -1` $dump; tgt=${dump%.*}.tgz; if [ -e /dev/vmcp ]; then vmcp QUERY MULTITHREAD > $dump/QUERY_MULTITHREAD.output; fi echo "Creating package..."; -tar cvfz $tgt $dump| sed -e 's/^/ /g'; +tar cvfz $tgt $dump | sed -e 's/^/ /g'; echo "Dump written to $PWD/$tgt"; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qclib-2.3.2/query_capacity.c new/qclib-2.4.0/query_capacity.c --- old/qclib-2.3.2/query_capacity.c 2022-09-19 12:07:33.000000000 +0200 +++ new/qclib-2.4.0/query_capacity.c 2023-04-08 23:49:23.000000000 +0200 @@ -523,39 +523,44 @@ struct qc_mtype { int type; - char *zname; // IBM Z - char *lname; // LinuxONE + char *zname; // IBM Z + char *lname; // LinuxONE + char *zrack_type; // IBM Z rack mount model type + char *zrack_name; + char *lrack_type; // LinuxONE rack mount model type + char *lrack_name; }; static struct qc_mtype mtypes[] = { // IBM Z LinuxONE - {4381, "IBM 4381", NULL}, - {3090, "IBM 3090", NULL}, - {9221, "IBM S/390 9221", NULL}, - {9021, "IBM ES/9000 9021", NULL}, - {2003, "IBM S/390 Multiprise 2000", NULL}, - {3000, "IBM S/390 StarterPak 3000", NULL}, - {9672, "IBM S/390 9672", NULL}, - {2066, "IBM zSeries 800", NULL}, - {2064, "IBM zSeries 900", NULL}, - {2086, "IBM zSeries 890", NULL}, - {2084, "IBM zSeries 990", NULL}, - {2096, "IBM System z9 BC", NULL}, - {2094, "IBM System z9 EC", NULL}, - {2098, "IBM System z10 BC", NULL}, - {2097, "IBM System z10 EC", NULL}, - {2818, "IBM zEnterprise 114", NULL}, - {2817, "IBM zEnterprise 196", NULL}, - {2827, "IBM zEnterprise EC12", NULL}, - {2828, "IBM zEnterprise BC12", NULL}, - {2965, "IBM z13s", "IBM LinuxONE Rockhopper"}, - {2964, "IBM z13", "IBM LinuxONE Emperor"}, - {3907, "IBM z14 ZR1", "IBM LinuxONE Rockhopper II"}, - {3906, "IBM z14", "IBM LinuxONE Emperor II"}, - {8561, "IBM z15", "IBM LinuxONE III"}, - {8562, "IBM z15 Model T02", "IBM LinuxONE III Model LT2"}, - {3931, "IBM z16", "IBM LinuxONE Emperor 4"}, - {0, NULL, NULL} + {4381, "IBM 4381", NULL, NULL, NULL, NULL, NULL}, + {3090, "IBM 3090", NULL, NULL, NULL, NULL, NULL}, + {9221, "IBM S/390 9221", NULL, NULL, NULL, NULL, NULL}, + {9021, "IBM ES/9000 9021", NULL, NULL, NULL, NULL, NULL}, + {2003, "IBM S/390 Multiprise 2000", NULL, NULL, NULL, NULL, NULL}, + {3000, "IBM S/390 StarterPak 3000", NULL, NULL, NULL, NULL, NULL}, + {9672, "IBM S/390 9672", NULL, NULL, NULL, NULL, NULL}, + {2066, "IBM zSeries 800", NULL, NULL, NULL, NULL, NULL}, + {2064, "IBM zSeries 900", NULL, NULL, NULL, NULL, NULL}, + {2086, "IBM zSeries 890", NULL, NULL, NULL, NULL, NULL}, + {2084, "IBM zSeries 990", NULL, NULL, NULL, NULL, NULL}, + {2096, "IBM System z9 BC", NULL, NULL, NULL, NULL, NULL}, + {2094, "IBM System z9 EC", NULL, NULL, NULL, NULL, NULL}, + {2098, "IBM System z10 BC", NULL, NULL, NULL, NULL, NULL}, + {2097, "IBM System z10 EC", NULL, NULL, NULL, NULL, NULL}, + {2818, "IBM zEnterprise 114", NULL, NULL, NULL, NULL, NULL}, + {2817, "IBM zEnterprise 196", NULL, NULL, NULL, NULL, NULL}, + {2827, "IBM zEnterprise EC12", NULL, NULL, NULL, NULL, NULL}, + {2828, "IBM zEnterprise BC12", NULL, NULL, NULL, NULL, NULL}, + {2965, "IBM z13s", "IBM LinuxONE Rockhopper", NULL, NULL, NULL, NULL}, + {2964, "IBM z13", "IBM LinuxONE Emperor", NULL, NULL, NULL, NULL}, + {3907, "IBM z14 ZR1", "IBM LinuxONE Rockhopper II", NULL, NULL, NULL, NULL}, + {3906, "IBM z14", "IBM LinuxONE Emperor II", NULL, NULL, NULL, NULL}, + {8561, "IBM z15", "IBM LinuxONE III", NULL, NULL, NULL, NULL}, + {8562, "IBM z15 Model T02", "IBM LinuxONE III Model LT2", NULL, NULL, NULL, NULL}, + {3931, "IBM z16", "IBM LinuxONE Emperor 4", NULL, NULL, NULL, NULL}, + {3932, "IBM z16 A02", "IBM LinuxONE Rockhopper 4", "AGZ", "IBM z16 AGZ", "AGL", "IBM LinuxONE Rockhopper 4"}, + {0, NULL, NULL, NULL, NULL, NULL, NULL} }; static int qc_post_process_ziip_thrds(struct qc_handle *hdl) { @@ -582,12 +587,17 @@ cpuid = atoi(str); for (type = mtypes; type->type; ++type) { if (cpuid == type->type) { - if (type->lname && - (str = qc_get_attr_value_string(hdl, qc_model)) != NULL && - *str == 'L') { + if ((str = qc_get_attr_value_string(hdl, qc_model)) == NULL) + goto out; + if (type->lname && *str == 'L') { str = type->lname; - family = QC_TYPE_FAMILY_LINUXONE; - } else + family = QC_TYPE_FAMILY_LINUXONE; + } else if (type->lrack_type && strncmp(str, type->lrack_type, 3) == 0) { + str = type->lrack_name; + family = QC_TYPE_FAMILY_LINUXONE; + } else if (type->zrack_type && strncmp(str, type->zrack_type, 3) == 0) + str = type->zrack_name; + else str = type->zname; if (qc_set_attr_string(hdl, qc_type_name, str, ATTR_SRC_POSTPROC) || qc_set_attr_int(hdl, qc_type_family, family, ATTR_SRC_POSTPROC)) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qclib-2.3.2/query_capacity.h new/qclib-2.4.0/query_capacity.h --- old/qclib-2.3.2/query_capacity.h 2022-09-19 12:07:33.000000000 +0200 +++ new/qclib-2.4.0/query_capacity.h 2023-04-08 23:49:23.000000000 +0200 @@ -5,7 +5,7 @@ #ifndef QUERY_CAPACITY #define QUERY_CAPACITY -#define QC_VERSION "2.3.2" +#define QC_VERSION "2.4.0" /* Build Customization */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qclib-2.3.2/zhypinfo.8 new/qclib-2.4.0/zhypinfo.8 --- old/qclib-2.3.2/zhypinfo.8 2022-09-19 12:07:33.000000000 +0200 +++ new/qclib-2.4.0/zhypinfo.8 2023-04-08 23:49:23.000000000 +0200 @@ -52,8 +52,9 @@ Print usage information and exit. .TP .BR "\-j, \-\-json" -Dump all available data in JSON format. Known limitation: No character set -conversion or proper escaping is performed. +Dump all available data in JSON format. +.br +Known limitation: No character set conversion or proper escaping is performed. .TP .BR "\-l, \-\-layers" Print number of layers. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qclib-2.3.2/zname.8 new/qclib-2.4.0/zname.8 --- old/qclib-2.3.2/zname.8 2022-09-19 12:07:33.000000000 +0200 +++ new/qclib-2.4.0/zname.8 2023-04-08 23:49:23.000000000 +0200 @@ -25,11 +25,16 @@ .BR "\-c, \-\-capacity" Print capacity information. .TP +.BR "\-h, \-\-help" +Print usage information and exit. +.TP .BR "\-i, \-\-cpuid" Print the CPU identifier. .TP -.BR "\-h, \-\-help" -Print usage information and exit. +.BR "\-j, \-\-json" +Dump all available data in JSON format. +.br +Known limitation: No character set conversion or proper escaping is performed. .TP .BR "\-m, \-\-model" Print model information. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qclib-2.3.2/zname.c new/qclib-2.4.0/zname.c --- old/qclib-2.3.2/zname.c 2022-09-19 12:07:33.000000000 +0200 +++ new/qclib-2.4.0/zname.c 2023-04-08 23:49:23.000000000 +0200 @@ -53,6 +53,7 @@ printf(" -c, --capacity Print capacity information\n"); printf(" -h, --help Print usage information and exit\n"); printf(" -i, --cpuid Print the CPU identifier\n"); + printf(" -j, --json Dump all available data in JSON format\n"); printf(" -m, --model Print model information\n"); printf(" -n, --name Print the model name (default)\n"); printf(" -u, --manufacturer Print the manufacturer\n"); @@ -70,6 +71,7 @@ { "capacity", no_argument, NULL, 'c'}, { "cpuid", no_argument, NULL, 'i'}, { "help", no_argument, NULL, 'h'}, + { "json", no_argument, NULL, 'j'}, { "manufacturer", no_argument, NULL, 'u'}, { "model", no_argument, NULL, 'm'}, { "name", no_argument, NULL, 'n'}, @@ -78,9 +80,9 @@ }; int layers, i, type, opts = 0, rc = 0; void *hdl = NULL; - int c; + int c, json = 0; - while ((c = getopt_long(argc, argv, "achimnuv", long_options, NULL)) != EOF) { + while ((c = getopt_long(argc, argv, "achijmnuv", long_options, NULL)) != EOF) { switch (c) { case 'a': opts |= OPTS_ALL; break; @@ -90,6 +92,8 @@ return 0; case 'i': opts |= OPTS_CPUID; break; + case 'j': json = 1; + break; case 'm': opts |= OPTS_MODEL; break; case 'n': opts |= OPTS_NAME; @@ -102,12 +106,24 @@ return 1; } } - if (!opts) - opts = OPTS_NAME; + if (json && opts) { + fprintf(stderr, "Error: Specifiy either one of the options to print info, or --json\n"); + rc = 2; + goto out; + } if ((rc = get_handle(&hdl, &layers)) != 0) goto out; + if (json) { + qc_export_json(hdl); + rc = 0; + goto out; + } + + if (!opts) + opts = OPTS_NAME; + for (i = 0; i < layers; i++) { if (qc_get_attribute_int(hdl, qc_layer_type_num, i, &type) <= 0) { fprintf(stderr, "Error: Failed to retrieve layer type information\n");

1 0

commit man-pages for openSUSE:Factory
by Source-Sync 01 Jun '23

01 Jun '23

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package man-pages for openSUSE:Factory checked in at 2023-06-01 17:18:48 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/man-pages (Old) and /work/SRC/openSUSE:Factory/.man-pages.new.2531 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "man-pages" Thu Jun 1 17:18:48 2023 rev:149 rq:1089673 version:6.04 Changes: -------- --- /work/SRC/openSUSE:Factory/man-pages/man-pages.changes 2023-01-04 17:50:36.861478430 +0100 +++ /work/SRC/openSUSE:Factory/.man-pages.new.2531/man-pages.changes 2023-06-01 17:18:50.377918255 +0200 @@ -1,0 +2,14 @@ +Mon May 29 19:52:12 UTC 2023 - Dirk M��ller <dmueller(a)suse.com> + +- update to 6.04: + * Newly documented interfaces in existing pages + * proc.5 + KPF_PGTABLE (Linux 4.18) + * landlock.7 + LANDLOCK_ACCESS_FS_REFER (Linux 5.19) + * udp.7 + UDP_GRO (Linux 5.0) + UDP_SEGMENT (Linux 4.18) + * Changes to individual pages + +------------------------------------------------------------------- Old: ---- man-pages-6.02.tar.sign man-pages-6.02.tar.xz New: ---- man-pages-6.04.tar.sign man-pages-6.04.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ man-pages.spec ++++++ --- /var/tmp/diff_new_pack.QnZ9VQ/_old 2023-06-01 17:18:50.889921290 +0200 +++ /var/tmp/diff_new_pack.QnZ9VQ/_new 2023-06-01 17:18:50.897921338 +0200 @@ -1,7 +1,7 @@ # # spec file for package man-pages # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: man-pages -Version: 6.02 +Version: 6.04 Release: 0 Summary: Linux Manual Pages License: BSD-3-Clause AND GPL-2.0-or-later AND MIT ++++++ man-pages-6.02.tar.xz -> man-pages-6.04.tar.xz ++++++ ++++ 90790 lines of diff (skipped)

1 0

commit javapackages-tools for openSUSE:Factory
by Source-Sync 01 Jun '23

01 Jun '23

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package javapackages-tools for openSUSE:Factory checked in at 2023-06-01 17:18:46 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/javapackages-tools (Old) and /work/SRC/openSUSE:Factory/.javapackages-tools.new.2531 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "javapackages-tools" Thu Jun 1 17:18:46 2023 rev:35 rq:1089671 version:6.1.0 Changes: -------- --- /work/SRC/openSUSE:Factory/javapackages-tools/javapackages-tools.changes 2022-11-10 14:19:26.557390715 +0100 +++ /work/SRC/openSUSE:Factory/.javapackages-tools.new.2531/javapackages-tools.changes 2023-06-01 17:18:49.413912541 +0200 @@ -1,0 +2,7 @@ +Sun May 28 19:15:09 UTC 2023 - Fridrich Strba <fstrba(a)suse.com> + +- Enable the tests also for older distributions +- Require python3-xml (python-xml for distributions that use + versioned modules), since module xml needed by some scripts. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ javapackages-tools.spec ++++++ --- /var/tmp/diff_new_pack.7VaBg6/_old 2023-06-01 17:18:49.905915457 +0200 +++ /var/tmp/diff_new_pack.7VaBg6/_new 2023-06-01 17:18:49.913915505 +0200 @@ -1,7 +1,7 @@ # # spec file # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -63,9 +63,7 @@ Obsoletes: jpackage-utils < %{version} %if %{with python} BuildRequires: %{python_module lxml} -%if 0%{?suse_version} > 1320 BuildRequires: %{python_module pytest} -%endif BuildRequires: %{python_module setuptools} BuildRequires: python-rpm-macros BuildArch: noarch @@ -109,6 +107,7 @@ Summary: Module for handling various files for Java packaging Group: Development/Languages/Java Requires: python-lxml +Requires: python-xml %description -n python-javapackages Module for handling, querying and manipulating of various files for Java @@ -120,6 +119,7 @@ Summary: Module for handling various files for Java packaging Group: Development/Languages/Java Requires: python3-lxml +Requires: python3-xml Obsoletes: python-javapackages < %{version}-%{release} Provides: python-javapackages = %{version}-%{release} @@ -210,7 +210,6 @@ %fdupes %{buildroot}/%{_prefix} -%if 0%{?suse_version} > 1320 %check # reference: ./check, but we don't want to check coverage and don't need old nose ( @@ -228,7 +227,6 @@ %pytest popd %endif -%endif %if !%{with python} %files -f files-tools

1 0

commit openssl for openSUSE:Factory
by Source-Sync 01 Jun '23

01 Jun '23

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package openssl for openSUSE:Factory checked in at 2023-06-01 17:18:45 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/openssl (Old) and /work/SRC/openSUSE:Factory/.openssl.new.2531 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "openssl" Thu Jun 1 17:18:45 2023 rev:165 rq:1089934 version:3.1.1 Changes: -------- --- /work/SRC/openSUSE:Factory/openssl/openssl.changes 2023-02-20 17:45:03.811163791 +0100 +++ /work/SRC/openSUSE:Factory/.openssl.new.2531/openssl.changes 2023-06-01 17:18:48.645907988 +0200 @@ -1,0 +2,10 @@ +Tue May 30 14:00:15 UTC 2023 - Otto Hollmann <otto.hollmann(a)suse.com> + +- Update to 3.1.1 + +------------------------------------------------------------------- +Tue Mar 14 09:24:03 UTC 2023 - Otto Hollmann <otto.hollmann(a)suse.com> + +- Update to 3.1.0 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ openssl.spec ++++++ --- /var/tmp/diff_new_pack.p8RLvf/_old 2023-06-01 17:18:49.221911403 +0200 +++ /var/tmp/diff_new_pack.p8RLvf/_new 2023-06-01 17:18:49.229911450 +0200 @@ -18,7 +18,7 @@ %define _sonum 3 Name: openssl -Version: 3.0.8 +Version: 3.1.1 Release: 0 Summary: Secure Sockets and Transport Layer Security # Yes there is no license but to not confuse people keep it aligned to the pkg

1 0

commit openssl-3 for openSUSE:Factory
by Source-Sync 01 Jun '23

01 Jun '23

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package openssl-3 for openSUSE:Factory checked in at 2023-06-01 17:18:42 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/openssl-3 (Old) and /work/SRC/openSUSE:Factory/.openssl-3.new.2531 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "openssl-3" Thu Jun 1 17:18:42 2023 rev:11 rq:1089933 version:3.1.1 Changes: -------- --- /work/SRC/openSUSE:Factory/openssl-3/openssl-3.changes 2023-03-12 16:22:18.796254105 +0100 +++ /work/SRC/openSUSE:Factory/.openssl-3.new.2531/openssl-3.changes 2023-06-01 17:18:47.285899926 +0200 @@ -1,0 +2,134 @@ +Tue May 30 15:14:51 UTC 2023 - Otto Hollmann <otto.hollmann(a)suse.com> + +- Update to 3.1.1: + * Restrict the size of OBJECT IDENTIFIERs that OBJ_obj2txt will translate + (CVE-2023-2650, bsc#1211430) + * Multiple algorithm implementation fixes for ARM BE platforms. + * Added a -pedantic option to fipsinstall that adjusts the various settings + to ensure strict FIPS compliance rather than backwards compatibility. + * Fixed buffer overread in AES-XTS decryption on ARM 64 bit platforms which + happens if the buffer size is 4 mod 5 in 16 byte AES blocks. This can + trigger a crash of an application using AES-XTS decryption if the memory + just after the buffer being decrypted is not mapped. Thanks to Anton + Romanov (Amazon) for discovering the issue. (CVE-2023-1255, bsc#1210714) + * Add FIPS provider configuration option to disallow the use of truncated + digests with Hash and HMAC DRBGs (q.v. FIPS 140-3 IG D.R.). The + option '-no_drbg_truncated_digests' can optionally be supplied + to 'openssl fipsinstall'. + * Corrected documentation of X509_VERIFY_PARAM_add0_policy() to mention that + it does not enable policy checking. Thanks to David Benjamin for + discovering this issue. (CVE-2023-0466, bsc#1209873) + * Fixed an issue where invalid certificate policies in leaf certificates are + silently ignored by OpenSSL and other certificate policy checks are + skipped for that certificate. A malicious CA could use this to + deliberately assert invalid certificate policies in order to circumvent + policy checking on the certificate altogether. (CVE-2023-0465, bsc#1209878) + * Limited the number of nodes created in a policy tree to mitigate against + CVE-2023-0464. The default limit is set to 1000 nodes, which should be + sufficient for most installations. If required, the limit can be adjusted + by setting the OPENSSL_POLICY_TREE_NODES_MAX build time define to a + desired maximum number of nodes or zero to allow unlimited growth. + (CVE-2023-0464, bsc#1209624) + * Update openssl.keyring with key + A21F AB74 B008 8AA3 6115 2586 B8EF 1A6B A9DA 2D5C (Tomas Mraz) + * Rebased patches: + - openssl-Add-support-for-PROFILE-SYSTEM-system-default-cipher.patch + - openssl-Add_support_for_Windows_CA_certificate_store.patch + * Removed patches: + - openssl-CVE-2023-0464.patch + - openssl-Fix-OBJ_nid2obj-regression.patch + - openssl-CVE-2023-0465.patch + - openssl-CVE-2023-0466.patch + +------------------------------------------------------------------- +Mon May 29 07:31:07 UTC 2023 - Pedro Monreal <pmonreal(a)suse.com> + +- FIPS: Merge libopenssl3-hmac package into the library [bsc#1185116] + +------------------------------------------------------------------- +Mon May 15 09:00:04 UTC 2023 - Otto Hollmann <otto.hollmann(a)suse.com> + +- Add support for Windows CA certificate store [bsc#1209430] + https://github.com/openssl/openssl/pull/18070 + * Add openssl-Add_support_for_Windows_CA_certificate_store.patch + +------------------------------------------------------------------- +Wed Mar 29 12:11:10 UTC 2023 - Otto Hollmann <otto.hollmann(a)suse.com> + +- Security Fix: [CVE-2023-0465, bsc#1209878] + * Invalid certificate policies in leaf certificates are silently ignored + * Add openssl-CVE-2023-0465.patch +- Security Fix: [CVE-2023-0466, bsc#1209873] + * Certificate policy check not enabled + * Add openssl-CVE-2023-0466.patch + +------------------------------------------------------------------- +Tue Mar 28 12:19:06 UTC 2023 - Pedro Monreal <pmonreal(a)suse.com> + +- Fix regression in the OBJ_nid2obj() function: [bsc#1209430] + * Upstream https://github.com/openssl/openssl/issues/20555 + * Add openssl-Fix-OBJ_nid2obj-regression.patch + +------------------------------------------------------------------- +Mon Mar 27 14:44:32 UTC 2023 - Otto Hollmann <otto.hollmann(a)suse.com> + +- Fix compiler error "initializer element is not constant" on s390 + * Add openssl-z16-s390x.patch + +------------------------------------------------------------------- +Fri Mar 24 13:55:25 UTC 2023 - Otto Hollmann <otto.hollmann(a)suse.com> + +- Security Fix: [CVE-2023-0464, bsc#1209624] + * Excessive Resource Usage Verifying X.509 Policy Constraints + * Add openssl-CVE-2023-0464.patch + +------------------------------------------------------------------- +Wed Mar 15 14:55:29 UTC 2023 - Otto Hollmann <otto.hollmann(a)suse.com> + +- Pass over with spec-cleaner + +------------------------------------------------------------------- +Tue Mar 14 13:34:13 UTC 2023 - Otto Hollmann <otto.hollmann(a)suse.com> + +- Update to 3.1.0: + * Add FIPS provider configuration option to enforce the Extended Master + Secret (EMS) check during the TLS1_PRF KDF. The option '-ems-check' can + optionally be supplied to 'openssl fipsinstall'. + * The FIPS provider includes a few non-approved algorithms for backward + compatibility purposes and the "fips=yes" property query must be used for + all algorithm fetches to ensure FIPS compliance. The algorithms that are + included but not approved are Triple DES ECB, Triple DES CBC and EdDSA. + * Added support for KMAC in KBKDF. + * RNDR and RNDRRS support in provider functions to provide random number + generation for Arm CPUs (aarch64). + * s_client and s_server apps now explicitly say when the TLS version does not + include the renegotiation mechanism. This avoids confusion between that + scenario versus when the TLS version includes secure renegotiation but the + peer lacks support for it. + * AES-GCM enabled with AVX512 vAES and vPCLMULQDQ. + * The various OBJ_* functions have been made thread safe. + * Parallel dual-prime 1536/2048-bit modular exponentiation for AVX512_IFMA + capable processors. + * The functions OPENSSL_LH_stats, OPENSSL_LH_node_stats, + OPENSSL_LH_node_usage_stats, OPENSSL_LH_stats_bio, + OPENSSL_LH_node_stats_bio and OPENSSL_LH_node_usage_stats_bio are now + marked deprecated from OpenSSL 3.1 onwards and can be disabled by defining + OPENSSL_NO_DEPRECATED_3_1. The macro DEFINE_LHASH_OF is now deprecated in + favour of the macro DEFINE_LHASH_OF_EX, which omits the corresponding + type-specific function definitions for these functions regardless of + whether OPENSSL_NO_DEPRECATED_3_1 is defined. Users of DEFINE_LHASH_OF may + start receiving deprecation warnings for these functions regardless of + whether they are using them. It is recommended that users transition to the + new macro, DEFINE_LHASH_OF_EX. + * When generating safe-prime DH parameters set the recommended private key + length equivalent to minimum key lengths as in RFC 7919. + * Change the default salt length for PKCS#1 RSASSA-PSS signatures to the + maximum size that is smaller or equal to the digest length to comply with + FIPS 186-4 section 5. This is implemented by a new option + OSSL_PKEY_RSA_PSS_SALT_LEN_AUTO_DIGEST_MAX ("auto-digestmax") for the + rsa_pss_saltlen parameter, which is now the default. Signature verification + is not affected by this change and continues to work as before. + * Update openssl.keyring with key + 8657 ABB2 60F0 56B1 E519 0839 D9C4 D26D 0E60 4491 (Matt Caswell) + +------------------------------------------------------------------- Old: ---- openssl-3.0.8.tar.gz openssl-3.0.8.tar.gz.asc New: ---- openssl-3.1.1.tar.gz openssl-3.1.1.tar.gz.asc openssl-Add_support_for_Windows_CA_certificate_store.patch openssl-z16-s390x.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ openssl-3.spec ++++++ --- /var/tmp/diff_new_pack.zeYJCU/_old 2023-06-01 17:18:48.145905024 +0200 +++ /var/tmp/diff_new_pack.zeYJCU/_new 2023-06-01 17:18:48.149905048 +0200 @@ -22,7 +22,7 @@ %define man_suffix 3ssl Name: openssl-3 # Don't forget to update the version in the "openssl" meta-package! -Version: 3.0.8 +Version: 3.1.1 Release: 0 Summary: Secure Sockets and Transport Layer Security License: Apache-2.0 @@ -46,6 +46,10 @@ # Add crypto-policies support Patch7: openssl-Add-support-for-PROFILE-SYSTEM-system-default-cipher.patch Patch8: openssl-Override-default-paths-for-the-CA-directory-tree.patch +# PATCH-FIX-OPENSUSE: Fix compiler error "initializer element is not constant" on s390 +Patch9: openssl-z16-s390x.patch +# PATCH-FIX-UPSTREAM: bsc#1209430 Upgrade OpenSSL from 3.0.8 to 3.1.0 in TW +Patch10: openssl-Add_support_for_Windows_CA_certificate_store.patch BuildRequires: pkgconfig BuildRequires: pkgconfig(zlib) @@ -54,14 +58,14 @@ Conflicts: ssl Provides: ssl Provides: openssl(cli) -%if 0%{?suse_version} >= 1550 || 0%{?sle_version} >= 150400 -Requires: crypto-policies -%endif # Needed for clean upgrade path, boo#1070003 Obsoletes: openssl-1_0_0 # Needed for clean upgrade from former openssl-1_1_0, boo#1081335 Obsoletes: openssl-1_1_0 %{?suse_build_hwcaps_libs} +%if 0%{?suse_version} >= 1550 || 0%{?sle_version} >= 150400 +Requires: crypto-policies +%endif %description OpenSSL is a software library to be used in applications that need to @@ -71,16 +75,21 @@ %package -n libopenssl3 Summary: Secure Sockets and Transport Layer Security -License: Apache-2.0 +BuildRequires: fipscheck +Recommends: ca-certificates-mozilla +Conflicts: %{name} < %{version}-%{release} +# Needed for clean upgrade from former openssl-1_1_0, boo#1081335 +Obsoletes: libopenssl1_1_0 %if 0%{?suse_version} >= 1550 || 0%{?sle_version} >= 150400 Requires: crypto-policies %endif -Recommends: ca-certificates-mozilla -# install libopenssl and libopenssl-hmac close together (bsc#1090765) -Suggests: libopenssl3-hmac = %{version}-%{release} +# Merge back the hmac files bsc#1185116 +Provides: libopenssl3-hmac = %{version}-%{release} +Obsoletes: libopenssl3-hmac < %{version}-%{release} # Needed for clean upgrade from former openssl-1_1_0, boo#1081335 -Obsoletes: libopenssl1_1_0 -Conflicts: %{name} < %{version}-%{release} +Obsoletes: libopenssl1_1_0-hmac +# Needed for clean upgrade from SLE-12 openssl-1_0_0, bsc#1158499 +Obsoletes: libopenssl-1_0_0-hmac %description -n libopenssl3 OpenSSL is a software library to be used in applications that need to @@ -90,13 +99,12 @@ %package -n libopenssl-3-devel Summary: Development files for OpenSSL -License: Apache-2.0 Requires: libopenssl3 = %{version} Requires: pkgconfig(zlib) Recommends: %{name} = %{version} -Conflicts: libressl-devel # Conflicting names with libopenssl-1_1-devel Conflicts: libopenssl-1_1-devel +Conflicts: libressl-devel # Needed for clean upgrade from former openssl-1_1_0, boo#1081335 Obsoletes: libopenssl-1_1_0-devel # Needed for clean upgrade from SLE-12 openssl-1_0_0, bsc#1158499 @@ -108,7 +116,6 @@ %package doc Summary: Additional Package Documentation -License: Apache-2.0 Conflicts: openssl-doc Provides: openssl-doc = %{version} Obsoletes: openssl-doc < %{version} @@ -118,20 +125,6 @@ This package contains optional documentation provided in addition to this package's base documentation. -%package -n libopenssl3-hmac -Summary: HMAC files for FIPS 140-3 integrity checking of the openssl shared libraries -License: BSD-3-Clause -Requires: libopenssl3 = %{version}-%{release} -BuildRequires: fipscheck -# Needed for clean upgrade from former openssl-1_1_0, boo#1081335 -Obsoletes: libopenssl1_1_0-hmac -# Needed for clean upgrade from SLE-12 openssl-1_0_0, bsc#1158499 -Obsoletes: libopenssl-1_0_0-hmac - -%description -n libopenssl3-hmac -The FIPS compliant operation of the openssl shared libraries is NOT -possible without the HMAC hashes contained in this package! - %prep %autosetup -p1 -n %{_rname}-%{version} @@ -179,7 +172,7 @@ %check # Relax the crypto-policies requirements for the regression tests # Revert patch8 before running tests -patch -p1 -R < %{P:8} +patch -p1 -R < %{PATCH8} export OPENSSL_SYSTEM_CIPHERS_OVERRIDE=xyz_nonexistent_file export MALLOC_CHECK_=3 @@ -212,8 +205,8 @@ cp %{buildroot}%{ssletcdir}/openssl.cnf %{buildroot}%{ssletcdir}/openssl-orig.cnf # Create openssl ca-certificates dir required by nodejs regression tests [bsc#1207484] -mkdir -p %{buildroot}/var/lib/ca-certificates/openssl -install -d -m 555 %{buildroot}/var/lib/ca-certificates/openssl +mkdir -p %{buildroot}%{_localstatedir}/lib/ca-certificates/openssl +install -d -m 555 %{buildroot}%{_localstatedir}/lib/ca-certificates/openssl # Remove the fipsmodule.cnf because FIPS module is loaded automatically rm -f %{buildroot}%{ssletcdir}/fipsmodule.cnf @@ -263,8 +256,6 @@ %dir %{_libdir}/ossl-modules %{_libdir}/ossl-modules/fips.so %{_libdir}/ossl-modules/legacy.so - -%files -n libopenssl3-hmac %{_libdir}/.libssl.so.%{sover}.hmac %{_libdir}/.libcrypto.so.%{sover}.hmac @@ -291,8 +282,8 @@ %attr(700,root,root) %{ssletcdir}/private %dir %{_datadir}/ssl %{_datadir}/ssl/misc -%dir /var/lib/ca-certificates/ -%dir /var/lib/ca-certificates/openssl +%dir %{_localstatedir}/lib/ca-certificates/ +%dir %{_localstatedir}/lib/ca-certificates/openssl %{_bindir}/%{_rname} %{_bindir}/c_rehash %{_mandir}/man1/* ++++++ baselibs.conf ++++++ --- /var/tmp/diff_new_pack.zeYJCU/_old 2023-06-01 17:18:48.217905451 +0200 +++ /var/tmp/diff_new_pack.zeYJCU/_new 2023-06-01 17:18:48.221905475 +0200 @@ -1,7 +1,7 @@ libopenssl3 obsoletes "libopenssl1_1_0-<targettype>" -libopenssl3-hmac - requires "libopenssl3-<targettype> = <version>-%release" + provides "libopenssl3-hmac-<targettype> = <version>-%release" + obsoletes "libopenssl3-hmac-<targettype> < <version>-%release" libopenssl-3-devel provides "libopenssl-devel-<targettype> = <version>" conflicts "otherproviders(libopenssl-devel-<targettype>)" ++++++ openssl-3.0.8.tar.gz -> openssl-3.1.1.tar.gz ++++++ /work/SRC/openSUSE:Factory/openssl-3/openssl-3.0.8.tar.gz /work/SRC/openSUSE:Factory/.openssl-3.new.2531/openssl-3.1.1.tar.gz differ: char 13, line 1 ++++++ openssl-Add-support-for-PROFILE-SYSTEM-system-default-cipher.patch ++++++ --- /var/tmp/diff_new_pack.zeYJCU/_old 2023-06-01 17:18:48.265905736 +0200 +++ /var/tmp/diff_new_pack.zeYJCU/_new 2023-06-01 17:18:48.269905759 +0200 @@ -97,7 +97,7 @@ "High" encryption cipher suites. This currently means those with key lengths --- a/include/openssl/ssl.h.in +++ b/include/openssl/ssl.h.in -@@ -210,6 +210,11 @@ extern "C" { +@@ -213,6 +213,11 @@ extern "C" { * throwing out anonymous and unencrypted ciphersuites! (The latter are not * actually enabled by ALL, but "ALL:RSA" would enable some of them.) */ @@ -111,7 +111,7 @@ # define SSL_SENT_SHUTDOWN 1 --- a/ssl/ssl_ciph.c +++ b/ssl/ssl_ciph.c -@@ -1438,6 +1438,53 @@ int SSL_set_ciphersuites(SSL *s, const c +@@ -1443,6 +1443,53 @@ int SSL_set_ciphersuites(SSL *s, const c return ret; } @@ -165,7 +165,7 @@ STACK_OF(SSL_CIPHER) *ssl_create_cipher_list(SSL_CTX *ctx, STACK_OF(SSL_CIPHER) *tls13_ciphersuites, STACK_OF(SSL_CIPHER) **cipher_list, -@@ -1452,15 +1499,25 @@ STACK_OF(SSL_CIPHER) *ssl_create_cipher_ +@@ -1457,15 +1504,25 @@ STACK_OF(SSL_CIPHER) *ssl_create_cipher_ CIPHER_ORDER *co_list = NULL, *head = NULL, *tail = NULL, *curr; const SSL_CIPHER **ca_list = NULL; const SSL_METHOD *ssl_method = ctx->method; @@ -193,7 +193,7 @@ /* * To reduce the work to do we only want to process the compiled -@@ -1482,7 +1539,7 @@ STACK_OF(SSL_CIPHER) *ssl_create_cipher_ +@@ -1487,7 +1544,7 @@ STACK_OF(SSL_CIPHER) *ssl_create_cipher_ co_list = OPENSSL_malloc(sizeof(*co_list) * num_of_ciphers); if (co_list == NULL) { ERR_raise(ERR_LIB_SSL, ERR_R_MALLOC_FAILURE); @@ -202,7 +202,7 @@ } ssl_cipher_collect_ciphers(ssl_method, num_of_ciphers, -@@ -1548,8 +1605,7 @@ STACK_OF(SSL_CIPHER) *ssl_create_cipher_ +@@ -1553,8 +1610,7 @@ STACK_OF(SSL_CIPHER) *ssl_create_cipher_ * in force within each class */ if (!ssl_cipher_strength_sort(&head, &tail)) { @@ -212,7 +212,7 @@ } /* -@@ -1593,9 +1649,8 @@ STACK_OF(SSL_CIPHER) *ssl_create_cipher_ +@@ -1598,9 +1654,8 @@ STACK_OF(SSL_CIPHER) *ssl_create_cipher_ num_of_alias_max = num_of_ciphers + num_of_group_aliases + 1; ca_list = OPENSSL_malloc(sizeof(*ca_list) * num_of_alias_max); if (ca_list == NULL) { @@ -223,7 +223,7 @@ } ssl_cipher_collect_aliases(ca_list, num_of_group_aliases, disabled_mkey, disabled_auth, disabled_enc, -@@ -1628,8 +1683,7 @@ STACK_OF(SSL_CIPHER) *ssl_create_cipher_ +@@ -1633,8 +1688,7 @@ STACK_OF(SSL_CIPHER) *ssl_create_cipher_ OPENSSL_free(ca_list); /* Not needed anymore */ if (!ok) { /* Rule processing failure */ @@ -233,7 +233,7 @@ } /* -@@ -1637,10 +1691,13 @@ STACK_OF(SSL_CIPHER) *ssl_create_cipher_ +@@ -1642,10 +1696,13 @@ STACK_OF(SSL_CIPHER) *ssl_create_cipher_ * if we cannot get one. */ if ((cipherstack = sk_SSL_CIPHER_new_null()) == NULL) { @@ -249,7 +249,7 @@ /* Add TLSv1.3 ciphers first - we always prefer those if possible */ for (i = 0; i < sk_SSL_CIPHER_num(tls13_ciphersuites); i++) { const SSL_CIPHER *sslc = sk_SSL_CIPHER_value(tls13_ciphersuites, i); -@@ -1692,6 +1749,14 @@ STACK_OF(SSL_CIPHER) *ssl_create_cipher_ +@@ -1697,6 +1754,14 @@ STACK_OF(SSL_CIPHER) *ssl_create_cipher_ *cipher_list = cipherstack; return cipherstack; @@ -266,7 +266,7 @@ char *SSL_CIPHER_description(const SSL_CIPHER *cipher, char *buf, int len) --- a/ssl/ssl_lib.c +++ b/ssl/ssl_lib.c -@@ -660,7 +660,7 @@ int SSL_CTX_set_ssl_version(SSL_CTX *ctx +@@ -661,7 +661,7 @@ int SSL_CTX_set_ssl_version(SSL_CTX *ctx ctx->tls13_ciphersuites, &(ctx->cipher_list), &(ctx->cipher_list_by_id), @@ -275,7 +275,7 @@ if ((sk == NULL) || (sk_SSL_CIPHER_num(sk) <= 0)) { ERR_raise(ERR_LIB_SSL, SSL_R_SSL_LIBRARY_HAS_NO_CIPHERS); return 0; -@@ -3285,7 +3285,7 @@ SSL_CTX *SSL_CTX_new_ex(OSSL_LIB_CTX *li +@@ -3286,7 +3286,7 @@ SSL_CTX *SSL_CTX_new_ex(OSSL_LIB_CTX *li if (!ssl_create_cipher_list(ret, ret->tls13_ciphersuites, &ret->cipher_list, &ret->cipher_list_by_id, @@ -298,9 +298,9 @@ return 1; --- a/util/libcrypto.num +++ b/util/libcrypto.num -@@ -5428,3 +5428,4 @@ EVP_PKEY_CTX_get0_provider - OPENSSL_strcasecmp 5556 3_0_3 EXIST::FUNCTION: - OPENSSL_strncasecmp 5557 3_0_3 EXIST::FUNCTION: - OSSL_CMP_CTX_reset_geninfo_ITAVs 5558 3_0_8 EXIST::FUNCTION:CMP -+ossl_safe_getenv ? 3_0_0 EXIST::FUNCTION: +@@ -5435,3 +5435,4 @@ EVP_MD_CTX_dup + EVP_CIPHER_CTX_dup 5563 3_1_0 EXIST::FUNCTION: + BN_are_coprime 5564 3_1_0 EXIST::FUNCTION: + OSSL_CMP_MSG_update_recipNonce 5565 3_0_9 EXIST::FUNCTION:CMP ++ossl_safe_getenv ? 3_0_0 EXIST::FUNCTION: ++++++ openssl-Add_support_for_Windows_CA_certificate_store.patch ++++++ ++++ 744 lines (skipped) ++++++ openssl-z16-s390x.patch ++++++ iIndex: openssl-3.1.0/crypto/s390xcap.c =================================================================== --- openssl-3.1.0.orig/crypto/s390xcap.c +++ openssl-3.1.0/crypto/s390xcap.c @@ -674,7 +674,105 @@ static int parse_env(struct OPENSSL_s390 * z16 (2022) - z/Architecture POP * Implements MSA and MSA1-9 (same as z15). */ +#if defined(__GNUC__) && __GNUC__<13 && (defined(__s390__) || defined(__s390x__)) + static const struct OPENSSL_s390xcap_st z16 = { + /*.stfle = */{S390X_CAPBIT(S390X_MSA) + | S390X_CAPBIT(S390X_STCKF) + | S390X_CAPBIT(S390X_MSA5), + S390X_CAPBIT(S390X_MSA3) + | S390X_CAPBIT(S390X_MSA4), + S390X_CAPBIT(S390X_VX) + | S390X_CAPBIT(S390X_VXD) + | S390X_CAPBIT(S390X_VXE) + | S390X_CAPBIT(S390X_MSA8) + | S390X_CAPBIT(S390X_MSA9), + 0ULL}, + /*.kimd = */{S390X_CAPBIT(S390X_QUERY) + | S390X_CAPBIT(S390X_SHA_1) + | S390X_CAPBIT(S390X_SHA_256) + | S390X_CAPBIT(S390X_SHA_512) + | S390X_CAPBIT(S390X_SHA3_224) + | S390X_CAPBIT(S390X_SHA3_256) + | S390X_CAPBIT(S390X_SHA3_384) + | S390X_CAPBIT(S390X_SHA3_512) + | S390X_CAPBIT(S390X_SHAKE_128) + | S390X_CAPBIT(S390X_SHAKE_256), + S390X_CAPBIT(S390X_GHASH)}, + /*.klmd = */{S390X_CAPBIT(S390X_QUERY) + | S390X_CAPBIT(S390X_SHA_1) + | S390X_CAPBIT(S390X_SHA_256) + | S390X_CAPBIT(S390X_SHA_512) + | S390X_CAPBIT(S390X_SHA3_224) + | S390X_CAPBIT(S390X_SHA3_256) + | S390X_CAPBIT(S390X_SHA3_384) + | S390X_CAPBIT(S390X_SHA3_512) + | S390X_CAPBIT(S390X_SHAKE_128) + | S390X_CAPBIT(S390X_SHAKE_256), + 0ULL}, + /*.km = */{S390X_CAPBIT(S390X_QUERY) + | S390X_CAPBIT(S390X_AES_128) + | S390X_CAPBIT(S390X_AES_192) + | S390X_CAPBIT(S390X_AES_256) + | S390X_CAPBIT(S390X_XTS_AES_128) + | S390X_CAPBIT(S390X_XTS_AES_256), + 0ULL}, + /*.kmc = */{S390X_CAPBIT(S390X_QUERY) + | S390X_CAPBIT(S390X_AES_128) + | S390X_CAPBIT(S390X_AES_192) + | S390X_CAPBIT(S390X_AES_256), + 0ULL}, + /*.kmac = */{S390X_CAPBIT(S390X_QUERY) + | S390X_CAPBIT(S390X_AES_128) + | S390X_CAPBIT(S390X_AES_192) + | S390X_CAPBIT(S390X_AES_256), + 0ULL}, + /*.kmctr = */{S390X_CAPBIT(S390X_QUERY) + | S390X_CAPBIT(S390X_AES_128) + | S390X_CAPBIT(S390X_AES_192) + | S390X_CAPBIT(S390X_AES_256), + 0ULL}, + /*.kmo = */{S390X_CAPBIT(S390X_QUERY) + | S390X_CAPBIT(S390X_AES_128) + | S390X_CAPBIT(S390X_AES_192) + | S390X_CAPBIT(S390X_AES_256), + 0ULL}, + /*.kmf = */{S390X_CAPBIT(S390X_QUERY) + | S390X_CAPBIT(S390X_AES_128) + | S390X_CAPBIT(S390X_AES_192) + | S390X_CAPBIT(S390X_AES_256), + 0ULL}, + /*.prno = */{S390X_CAPBIT(S390X_QUERY) + | S390X_CAPBIT(S390X_SHA_512_DRNG), + S390X_CAPBIT(S390X_TRNG)}, + /*.kma = */{S390X_CAPBIT(S390X_QUERY) + | S390X_CAPBIT(S390X_AES_128) + | S390X_CAPBIT(S390X_AES_192) + | S390X_CAPBIT(S390X_AES_256), + 0ULL}, + /*.pcc = */{S390X_CAPBIT(S390X_QUERY), + S390X_CAPBIT(S390X_SCALAR_MULTIPLY_P256) + | S390X_CAPBIT(S390X_SCALAR_MULTIPLY_P384) + | S390X_CAPBIT(S390X_SCALAR_MULTIPLY_P521) + | S390X_CAPBIT(S390X_SCALAR_MULTIPLY_ED25519) + | S390X_CAPBIT(S390X_SCALAR_MULTIPLY_ED448) + | S390X_CAPBIT(S390X_SCALAR_MULTIPLY_X25519) + | S390X_CAPBIT(S390X_SCALAR_MULTIPLY_X448)}, + /*.kdsa = */{S390X_CAPBIT(S390X_QUERY) + | S390X_CAPBIT(S390X_ECDSA_VERIFY_P256) + | S390X_CAPBIT(S390X_ECDSA_VERIFY_P384) + | S390X_CAPBIT(S390X_ECDSA_VERIFY_P521) + | S390X_CAPBIT(S390X_ECDSA_SIGN_P256) + | S390X_CAPBIT(S390X_ECDSA_SIGN_P384) + | S390X_CAPBIT(S390X_ECDSA_SIGN_P521) + | S390X_CAPBIT(S390X_EDDSA_VERIFY_ED25519) + | S390X_CAPBIT(S390X_EDDSA_VERIFY_ED448) + | S390X_CAPBIT(S390X_EDDSA_SIGN_ED25519) + | S390X_CAPBIT(S390X_EDDSA_SIGN_ED448), + 0ULL}, + }; +#else static const struct OPENSSL_s390xcap_st z16 = z15; +#endif char *tok_begin, *tok_end, *buff, tok[S390X_STFLE_MAX][LEN + 1]; int rc, off, i, n; ++++++ openssl.keyring ++++++ --- /var/tmp/diff_new_pack.zeYJCU/_old 2023-06-01 17:18:48.325906091 +0200 +++ /var/tmp/diff_new_pack.zeYJCU/_new 2023-06-01 17:18:48.329906115 +0200 @@ -1,95 +1,118 @@ -----BEGIN PGP PUBLIC KEY BLOCK----- -Comment: 7953 AC1F BC3D C8B3 B292 393E D5E9 E43F 7DF9 EE8C -Comment: Richard Levitte <levitte(a)lp.se> -Comment: Richard Levitte <levitte(a)openssl.org> -Comment: Richard Levitte <richard(a)levitte.org> +Comment: A21F AB74 B008 8AA3 6115 2586 B8EF 1A6B A9DA 2D5C +Comment: Tom�� Mr��z <tm(a)t8m.info> +Comment: Tom�� Mr��z <tomas(a)arleto.cz> +Comment: Tom�� Mr��z <tomas(a)openssl.org> -xsFNBFQwazYBEAC01v949yFYzwbn0UkEkM3MHTrDqWbp+erhXqdVD5ymG/pXvmqx -5KlxL1TZMuWEFuaq9EVkW8Wm5glk4D14IalIVKARAMDwqgNrPnw0GCAmNIf+Omvl -G7gdsSR93eALJp1vvKZpeEVZj0M0gQ1i4QIIR8PMqs+2jaYyed4HhRYzUbGKZMnr -94Onby8FIAYq0B79VqBv5NfMc2KEKrLXwuDSjtZd2TGB7qeLF7sCczyFoi5XTj+B -iVfdxCzoYEa1Rjp5hGllVj85w2DdfKED/BW7VCel4H+WTZGqTFQ1e3kPo1KdqlwD -F+Ci2JFU6myPy0LpHrNhn6FsdQGOuRKgYPycol7VzJHKtcGNMDkUFGV2DsgljQuW -Sj5TNNX5umFCIIN94eLvHtV9bXP98yKB/5pr2JhagL6kdU7OE0c/mugA05gGQTUJ -DeLNsRq54YC+CLyM9dxMvH7yB43yMfUvgKcSRt0sHUo8g5aOYdFq0SXQUr8+t/iH -3t5/JxhqBik8FBiu0aISsTDUbvbxQQQe/LhfR+FWDZRFwHOL0VELapfw1whitGG+ -y+F9fQIJfa5yzEiC9AWYZjHRaFB7q6LAvF0V8vP+pkT157fTK63W53mt1+VPMt2L -732i+/Cqy/6HzwOdnNnNyfEdvm2Jojs8KXN20vChnfUGifvTjxuiFib9sQARAQAB -zR9SaWNoYXJkIExldml0dGUgPGxldml0dGVAbHAuc2U+wsGPBBMBAgAiBQJUMGwd -AhsDBgsJCAcDAgYVCAIJCgsEFgIDAQIeAQIXgAAhCRDV6eQ/ffnujBYhBHlTrB+8 -PcizspI5PtXp5D99+e6Mq7QP/iNhBEDJYRTrYc6JAmRIg6YyiKjeOx8kXtVCe9+q -CzC+Y9ehyZB5Dyl0Ybej9jNJdEDJzDHKzVwU4NrfefcTWqUOQDNbpClGtXcQHlUt -hjREPWpyAEH1OhD5NDTSMI5YYKZDEfiN6oEpWlc7WK0mXZuY5mHOo0B3yNDfV845 -+7CGPK9zuE56/f9SLmCaFsCkNMGbvV4ybLRoBfZdnC5NPOKyJXQ0TG0CbxGMgIN5 -cOrBphU+ZrPYY+p4jEoD5rvFugQl4+oRsvxygpJV5t8pe1ihNMhmzu3CpRtMjmRA -dzK+27Z8p7m8BORuoC+NbXVpcmjIueXDkYdxP+09qUyw8xE398tAuEXpbCVoQ68b -6NDCBpowgvUu34zxDn0wKdt2YGHB6z7Kl7b8RycWG3Y8u/Hs+l6QehEmiy6UKXl7 -zW3PIi3192WzElUi7TtG/btqC6YPs0U3SQMkNWzwkjbKM9bC4gPFMK05a8QENc66 -M+USWjNg0TiAkGP9PDlpYyhtjicCTgL51lDm8LBXr9cbzvXav7Jc6NVh7Zby89r1 -DsPFzfDkccOX6nSnqYMISmvRUGrGfgrkeeM0MNu93aPTrs+0fxq+HJIZEhX/YCyQ -N4jqM+hQGh9bOwM7BacaP9F9vnq2hDK2WIXlWChX9Q70xArViJqzI8/76Ph1inPb -jbJczSVSaWNoYXJkIExldml0dGUgPGxldml0dGVAb3BlbnNzbC5vcmc+wsGPBBMB -AgAiBQJUMGwKAhsDBgsJCAcDAgYVCAIJCgsEFgIDAQIeAQIXgAAhCRDV6eQ/ffnu -jBYhBHlTrB+8PcizspI5PtXp5D99+e6M1bAP/0byoJMiMsswapbBypQCT/vQmaoX -jZzNcU4qAKlB5EMlHkxl1T8ytEXxmNMd/e0ltV9HALeBqX1eYHS7oTG3rMXKuYVY -TO19eM2wLiCW664EUtOsB9zAnpp6X+8UWMoNEpWlEHgkdlADQ0xIrrH3pt29SAbd -x0QsvwkWPawEoKMoUiGPnVY4hAt7Xx9gDmWEa2T6tExd9soBBTIuIpTH3MbAEHsv -nBbdyarNltGF/pXYGMmGaYmU0WujqKzqpBpy3zwd0Rx1Kms5e0ZcypVzqx3Xgcue -W8fbMPTZbG+Z922GUFDJ139WjAA2FsMJ9ES7XIIoJh/4nfBwk+PXcj29TieDnl2r -d4x7Yxnqp4Vzau+IARz9Vr1OIFVlQbaSdXfmDFi/fvVf9CJZnWwcSwkqp4pk50Zy -nEA+8TzEQj08jdj0+yrJNvbRxqbIafzSmoU77bANs4gc0WOdTTpvv4honUQROARp -G/JT47hE7ATVGNdF7bmWNEyEYFtZMdGP0xD+K0xEgsir65aruVixVrNKxOX9wqx6 -JGzHTSTgtAVYAvMIsWJTLuCXZbMRmmmmubfyVaMAisz5UIYD+TCPncuJ1dMUW9WI -uLNFGLTRGHri01EWe2epaHZWA0WB0cQZaeGpc7C986WskDi9SA9ZzCIGW4oQIBQX -lRJjjYxIBCnjxtUWzSVSaWNoYXJkIExldml0dGUgPHJpY2hhcmRAbGV2aXR0ZS5v -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 -=1H60 +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 +TIdjvGbJ/k4qxw== +=fnGl -----END PGP PUBLIC KEY BLOCK-----

1 0

commit lua54 for openSUSE:Factory
by Source-Sync 01 Jun '23

01 Jun '23

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package lua54 for openSUSE:Factory checked in at 2023-06-01 17:18:41 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/lua54 (Old) and /work/SRC/openSUSE:Factory/.lua54.new.2531 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "lua54" Thu Jun 1 17:18:41 2023 rev:25 rq:1089611 version:5.4.6 Changes: -------- --- /work/SRC/openSUSE:Factory/lua54/lua54.changes 2023-04-06 15:55:17.620076197 +0200 +++ /work/SRC/openSUSE:Factory/.lua54.new.2531/lua54.changes 2023-06-01 17:18:45.001886387 +0200 @@ -1,0 +2,37 @@ +Mon May 29 16:23:16 UTC 2023 - Callum Farmer <gmbr3(a)opensuse.org> + +- Library is always liblua5_4-5: due to SOVERSION leading digit + being 5 + +------------------------------------------------------------------- +Mon May 22 09:39:52 UTC 2023 - Matej Cepl <mcepl(a)suse.com> + +- Final release of 5.4.6. No change in the changelog. + +------------------------------------------------------------------- +Tue May 9 12:43:31 UTC 2023 - Matej Cepl <mcepl(a)suse.com> + +- Experimenting with lua 5.4.6-rc1 (release 5.4.5 has been + effectively withdrawn). + +------------------------------------------------------------------- +Sun Apr 30 12:22:03 UTC 2023 - Matej Cepl <mcepl(a)suse.com> + +- Update to 5.4.5: + - this is a bug-fix release. + - Lua 5.4.5 also contains several internal improvements and + includes a revised reference manual +- Remove upstreamed patches: + - luabugs1.patch + - luabugs10.patch + - luabugs11.patch + - luabugs2.patch + - luabugs3.patch + - luabugs4.patch + - luabugs5.patch + - luabugs6.patch + - luabugs7.patch + - luabugs8.patch + - luabugs9.patch + +------------------------------------------------------------------- Old: ---- lua-5.4.4-tests.tar.gz lua-5.4.4.tar.gz luabugs1.patch luabugs10.patch luabugs11.patch luabugs2.patch luabugs3.patch luabugs4.patch luabugs5.patch luabugs6.patch luabugs7.patch luabugs8.patch luabugs9.patch New: ---- lua-5.4.6-tests.tar.gz lua-5.4.6.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lua54.spec ++++++ --- /var/tmp/diff_new_pack.QQNUdh/_old 2023-06-01 17:18:45.773890963 +0200 +++ /var/tmp/diff_new_pack.QQNUdh/_new 2023-06-01 17:18:45.781891011 +0200 @@ -1,5 +1,5 @@ # -# spec file for package lua54 +# spec file # # Copyright (c) 2023 SUSE LLC # @@ -15,6 +15,7 @@ # Please submit bugfixes or comments via https://bugs.opensuse.org/ # + %global flavor @BUILD_FLAVOR@%{nil} %if "%{flavor}" == "test" %define name_ext -test @@ -24,16 +25,15 @@ %endif %define major_version 5.4 %define libname liblua5_4-5 - Name: lua54%{name_ext} -Version: 5.4.4 +Version: 5.4.6 Release: 0 Summary: Small Embeddable Language with Procedural Syntax License: GPL-3.0-or-later Group: Development/Languages/Other URL: https://www.lua.org -Source: http://www.lua.org/ftp/lua-%{version}.tar.gz -Source1: http://www.lua.org/tests/lua-%{version}-tests.tar.gz +Source: https://www.lua.org/ftp/lua-%{version}.tar.gz +Source1: https://www.lua.org/tests/lua-%{version}-tests.tar.gz Source99: baselibs.conf # PATCH-FIX-SUSE tweak the buildsystem to produce what is needed for SUSE Patch0: lua-build-system.patch @@ -43,19 +43,11 @@ Patch2: files_test.patch Patch3: main_test.patch Patch6: shared_link.patch -# PATCH-FIX-UPSTREAM luabugsX.patch https://www.lua.org/bugs.html#5.4.4-X -Patch7: luabugs1.patch -Patch8: luabugs2.patch -Patch9: luabugs3.patch -Patch10: luabugs4.patch -Patch11: luabugs5.patch -Patch12: luabugs6.patch -Patch13: luabugs7.patch -Patch14: luabugs8.patch -Patch15: luabugs9.patch -Patch16: luabugs10.patch -Patch17: luabugs11.patch -# +Requires(post): update-alternatives +Requires(postun):update-alternatives +Provides: lua = %{version} +Obsoletes: lua < %{version} +Provides: Lua(API) = %{major_version} %if "%{flavor}" == "test" BuildRequires: lua54 %else @@ -64,11 +56,6 @@ BuildRequires: pkgconfig BuildRequires: readline-devel %endif -Requires(post): update-alternatives -Requires(postun): update-alternatives -Provides: lua = %{version} -Obsoletes: lua < %{version} -Provides: Lua(API) = %{major_version} %description Lua is a programming language originally designed for extending @@ -90,7 +77,7 @@ Requires: %{name} = %{version} Requires: lua-macros Requires(post): update-alternatives -Requires(postun): update-alternatives +Requires(postun):update-alternatives Provides: lua-devel = %{version} Provides: Lua(devel) = %{major_version} Provides: pkgconfig(lua) = %{version} @@ -107,16 +94,16 @@ Summary: The Lua integration library License: MIT Group: System/Libraries +Provides: liblua5_4 = %{version}-%{release} +Obsoletes: liblua5_4 < %{version}-%{release} +Provides: %{name}-libs = %{version} +Obsoletes: %{name}-libs < %{version} # Compat as libtool changes the soname %ifarch aarch64 x86_64 ppc64 ppc64le s390x riscv64 Provides: liblua.so.5.4()(64bit) %else Provides: liblua.so.5.4 %endif -Provides: liblua5_4 = %{version}-%{release} -Obsoletes: liblua5_4 < %{version}-%{release} -Provides: %{name}-libs = %{version} -Obsoletes: %{name}-libs < %{version} %description -n %{libname} Lua is a programming language originally designed for extending @@ -163,8 +150,8 @@ %build sed -i -e "s@lib/lua/@%{_lib}/lua/@g" src/luaconf.h -make linux-readline %{_smp_mflags} VERBOSE=1 -C src \ - CC="cc" \ +%make_build linux-readline -C src \ + CC="cc" LIBDIR="%{_libdir}" \ MYCFLAGS="%{optflags} -std=gnu99 -D_GNU_SOURCE -fPIC -DLUA_COMPAT_MODULE" \ V=%{major_version} \ LIBTOOL="libtool --quiet" @@ -173,7 +160,8 @@ %make_install \ LIBTOOL="libtool --quiet" \ INSTALL_TOP="%{buildroot}%{_prefix}" \ - INSTALL_LIB="%{buildroot}%{_libdir}" + INSTALL_LIB="%{buildroot}%{_libdir}" \ + INSTALL_MAN="%{buildroot}%{_mandir}/man1" find %{buildroot} -type f -name "*.la" -delete -print @@ -192,6 +180,7 @@ Libs: -llua%{major_version} -lm Cflags: -I\${includedir} EOF + install -D -m 644 lua%{major_version}.pc %{buildroot}%{_libdir}/pkgconfig/lua%{major_version}.pc # update-alternatives @@ -213,6 +202,7 @@ touch %{buildroot}%{_sysconfdir}/alternatives/lua.pc ln -sf %{_sysconfdir}/alternatives/lua.pc %{buildroot}%{_libdir}/pkgconfig/lua.pc %else + %check cd testes LD_LIBRARY_PATH=%{_libdir} %{_bindir}/lua%{major_version} all.lua @@ -286,4 +276,5 @@ %doc doc/* %endif + %changelog ++++++ attrib_test.patch ++++++ --- /var/tmp/diff_new_pack.QQNUdh/_old 2023-06-01 17:18:45.821891248 +0200 +++ /var/tmp/diff_new_pack.QQNUdh/_new 2023-06-01 17:18:45.825891272 +0200 @@ -1,3 +1,7 @@ +--- + testes/attrib.lua | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + --- a/testes/attrib.lua +++ b/testes/attrib.lua @@ -269,7 +269,7 @@ local p = "" -- On Mac OS X, redefine ++++++ files_test.patch ++++++ --- /var/tmp/diff_new_pack.QQNUdh/_old 2023-06-01 17:18:45.849891414 +0200 +++ /var/tmp/diff_new_pack.QQNUdh/_new 2023-06-01 17:18:45.853891438 +0200 @@ -1,7 +1,9 @@ -Index: lua/files.lua -=================================================================== ---- lua.orig/testes/files.lua -+++ lua/testes/files.lua +--- + testes/files.lua | 12 +++++++++--- + 1 file changed, 9 insertions(+), 3 deletions(-) + +--- a/testes/files.lua ++++ b/testes/files.lua @@ -81,7 +81,7 @@ assert(io.output() ~= io.stdout) if not _port then -- invalid seek @@ -11,7 +13,7 @@ end assert(io.output():seek() == 0) -@@ -744,7 +744,7 @@ if not _port then +@@ -746,7 +746,7 @@ if not _port then {"exit 129", "exit", 129}, {"kill -s HUP $$", "signal", 1}, {"kill -s KILL $$", "signal", 9}, @@ -20,7 +22,7 @@ {progname .. ' -e " "', "ok"}, {progname .. ' -e "os.exit(0, true)"', "ok"}, {progname .. ' -e "os.exit(20, true)"', "exit", 20}, -@@ -757,6 +757,9 @@ if not _port then +@@ -759,6 +759,9 @@ if not _port then if v[2] == "ok" then assert(x and y == 'exit' and z == 0) else @@ -30,7 +32,7 @@ assert(not x and y == v[2]) -- correct status and 'what' -- correct code if known (but always different from 0) assert((v[3] == nil and z > 0) or v[3] == z) -@@ -791,6 +791,7 @@ assert(os.date(string.rep("%d", 1000), t +@@ -793,6 +796,7 @@ assert(os.date(string.rep("%d", 1000), t assert(os.date(string.rep("%", 200)) == string.rep("%", 100)) local function checkDateTable (t) @@ -38,7 +40,7 @@ _G.D = os.date("*t", t) assert(os.time(D) == t) load(os.date([[assert(D.year==%Y and D.month==%m and D.day==%d and -@@ -806,7 +806,9 @@ if not _port then +@@ -808,7 +812,9 @@ if not _port then checkDateTable(1) checkDateTable(1000) checkDateTable(0x7fffffff) ++++++ lua-5.4.4-tests.tar.gz -> lua-5.4.6-tests.tar.gz ++++++ ++++ 2686 lines of diff (skipped) ++++++ lua-5.4.4-tests.tar.gz -> lua-5.4.6.tar.gz ++++++ ++++ 62781 lines of diff (skipped) ++++++ lua-build-system.patch ++++++ --- /var/tmp/diff_new_pack.QQNUdh/_old 2023-06-01 17:18:46.161893263 +0200 +++ /var/tmp/diff_new_pack.QQNUdh/_new 2023-06-01 17:18:46.177893358 +0200 @@ -2,9 +2,15 @@ Date: Wed, 06 May 2020 10:31:53 +0300 Subject: build system +--- + Makefile | 22 +++++++++++----------- + src/Makefile | 43 +++++++++++++++++++++++++------------------ + src/luaconf.h | 2 +- + 3 files changed, 37 insertions(+), 30 deletions(-) + --- a/Makefile +++ b/Makefile -@@ -10,19 +12,19 @@ +@@ -10,18 +10,18 @@ PLAT= guess # so take care if INSTALL_TOP is not an absolute path. See the local target. # You may want to make INSTALL_LMOD and INSTALL_CMOD consistent with # LUA_ROOT, LUA_LDIR, and LUA_CDIR in luaconf.h. @@ -20,7 +26,7 @@ INSTALL_LMOD= $(INSTALL_TOP)/share/lua/$V -INSTALL_CMOD= $(INSTALL_TOP)/lib/lua/$V +INSTALL_CMOD= $(INSTALL_LIB)/lua/$V - + # How to install. If your install program does not support "-p", then # you may have to run ranlib on the installed liblua.a. INSTALL= install -p @@ -29,10 +35,9 @@ INSTALL_DATA= $(INSTALL) -m 0644 # # If you don't have "install" you can use "cp" instead. - # INSTALL= cp -p -@@ -39,10 +42,10 @@ - PLATS= guess aix bsd c89 freebsd generic linux linux-readline macosx mingw posix solaris - +@@ -39,10 +39,10 @@ RM= rm -f + PLATS= guess aix bsd c89 freebsd generic ios linux linux-readline macosx mingw posix solaris + # What to install. -TO_BIN= lua luac +TO_BIN= lua$(V) luac$(V) @@ -41,16 +46,16 @@ -TO_MAN= lua.1 luac.1 +TO_LIB= liblua$(V).la +TO_MAN= lua$(V).1 luac$(V).1 - + # Lua version and release. V= 5.4 -@@ -52,13 +55,13 @@ +@@ -52,13 +52,13 @@ R= $V.6 all: $(PLAT) - + $(PLATS) help test clean: - @cd src && $(MAKE) $@ + @cd src && $(MAKE) $@ V=$(V) - + install: dummy cd src && $(MKDIR) $(INSTALL_BIN) $(INSTALL_INC) $(INSTALL_LIB) $(INSTALL_MAN) $(INSTALL_LMOD) $(INSTALL_CMOD) + cd src && $(INSTALL_EXEC) $(TO_LIB) $(INSTALL_LIB) @@ -58,31 +63,34 @@ cd src && $(INSTALL_DATA) $(TO_INC) $(INSTALL_INC) - cd src && $(INSTALL_DATA) $(TO_LIB) $(INSTALL_LIB) cd doc && $(INSTALL_DATA) $(TO_MAN) $(INSTALL_MAN) - + uninstall: - --- a/src/Makefile +++ b/src/Makefile @@ -7,7 +7,7 @@ PLAT= guess - + CC= gcc -std=gnu99 -CFLAGS= -O2 -Wall -Wextra -DLUA_COMPAT_5_3 $(SYSCFLAGS) $(MYCFLAGS) +CFLAGS= -Wall -Wextra -DLUA_COMPAT_5_3 $(SYSCFLAGS) $(MYCFLAGS) LDFLAGS= $(SYSLDFLAGS) $(MYLDFLAGS) LIBS= -lm $(SYSLIBS) $(MYLIBS) - -@@ -22,25 +22,40 @@ - + +@@ -19,28 +19,44 @@ UNAME= uname + SYSCFLAGS= + SYSLDFLAGS= + SYSLIBS= ++LIBDIR=/usr/lib + MYCFLAGS= MYLDFLAGS= -MYLIBS= +MYLIBS=-ldl MYOBJS= - + # Special flags for compiler modules; -Os reduces code size. CMCFLAGS= - + +%.o : %.c + $(LIBTOOL) --mode=compile --tag=CC $(CC) $(CFLAGS) -c $< -o $@ + @@ -99,49 +107,49 @@ + $(LIBTOOL) --mode=compile --tag=CC $(CC) $(CFLAGS) -Os -c $< -o $@ + # == END OF USER SETTINGS -- NO NEED TO CHANGE ANYTHING BELOW THIS LINE ======= - - PLATS= guess aix bsd c89 freebsd generic linux linux-readline macosx mingw posix solaris - + + PLATS= guess aix bsd c89 freebsd generic ios linux linux-readline macosx mingw posix solaris + -LUA_A= liblua.a +LUA_A= liblua$(V).la CORE_O= lapi.o lcode.o lctype.o ldebug.o ldo.o ldump.o lfunc.o lgc.o llex.o lmem.o lobject.o lopcodes.o lparser.o lstate.o lstring.o ltable.o ltm.o lundump.o lvm.o lzio.o LIB_O= lauxlib.o lbaselib.o lcorolib.o ldblib.o liolib.o lmathlib.o loadlib.o loslib.o lstrlib.o ltablib.o lutf8lib.o linit.o BASE_O= $(CORE_O) $(LIB_O) $(MYOBJS) - + -LUA_T= lua +LUA_T= lua$(V) LUA_O= lua.o - + -LUAC_T= luac +LUAC_T= luac$(V) LUAC_O= luac.o - + ALL_O= $(BASE_O) $(LUA_O) $(LUAC_O) -@@ -57,17 +72,16 @@ +@@ -57,17 +73,16 @@ o: $(ALL_O) a: $(ALL_A) - + $(LUA_A): $(BASE_O) - $(AR) $@ $(BASE_O) - $(RANLIB) $@ -+ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -lm -ldl $(BASE_O:.o=.lo) -shared -rpath /usr/lib -version-info 9:0:4 -o $(LUA_A) - ++ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -lm -ldl $(BASE_O:.o=.lo) -shared -rpath $(LIBDIR) -version-info 9:0:4 -o $(LUA_A) + $(LUA_T): $(LUA_O) $(LUA_A) - $(CC) -o $@ $(LDFLAGS) $(LUA_O) $(LUA_A) $(LIBS) + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) $(LIBS) $(LUA_A) -Wl,-E lua.lo -o $@ - + $(LUAC_T): $(LUAC_O) $(LUA_A) - $(CC) -o $@ $(LDFLAGS) $(LUAC_O) $(LUA_A) $(LIBS) + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) $(LUA_A) luac.lo -o $@ - + test: - ./$(LUA_T) -v + $(LIBTOOL) --mode=execute -dlopen ./$(LUA_A) ./$(LUA_T) -v - + clean: - $(RM) $(ALL_T) $(ALL_O) -@@ -144,14 +159,6 @@ + $(RM) $(ALL_T) $(ALL_O) +@@ -147,14 +162,6 @@ SunOS solaris: .PHONY: all $(PLATS) help test clean default o a depend echo - + # Compiler modules may use special flags. -llex.o: - $(CC) $(CFLAGS) $(CMCFLAGS) -c llex.c @@ -151,19 +159,18 @@ - -lcode.o: - $(CC) $(CFLAGS) $(CMCFLAGS) -c lcode.c - + # DO NOT DELETE - - + --- a/src/luaconf.h +++ b/src/luaconf.h -@@ -217,7 +217,7 @@ - +@@ -223,7 +223,7 @@ + #else /* }{ */ - + -#define LUA_ROOT "/usr/local/" +#define LUA_ROOT "/usr/" #define LUA_LDIR LUA_ROOT "share/lua/" LUA_VDIR "/" #define LUA_CDIR LUA_ROOT "lib/lua/" LUA_VDIR "/" - + ++++++ main_test.patch ++++++ --- /var/tmp/diff_new_pack.QQNUdh/_old 2023-06-01 17:18:46.209893548 +0200 +++ /var/tmp/diff_new_pack.QQNUdh/_new 2023-06-01 17:18:46.213893571 +0200 @@ -1,6 +1,10 @@ +--- + testes/main.lua | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + --- a/testes/main.lua +++ b/testes/main.lua -@@ -47,7 +47,7 @@ +@@ -47,7 +47,7 @@ local function checkprogout (s) assert(string.sub(s, -1) == "\n") local t = getoutput() for line in string.gmatch(s, ".-\n") do @@ -8,8 +12,8 @@ + -- assert(string.find(t, line, 1, true)) end end - -@@ -307,11 +307,11 @@ + +@@ -367,11 +367,11 @@ a = 2 ]] RUN([[lua -e "%s" -i < %s > %s]], prompt, prog, out) local t = getoutput() @@ -23,7 +27,7 @@ +-- 2a = 2 +-- 3 +-- ]], 1, true)) - - + + -- test for error objects ++++++ shared_link.patch ++++++ --- /var/tmp/diff_new_pack.QQNUdh/_old 2023-06-01 17:18:46.229893666 +0200 +++ /var/tmp/diff_new_pack.QQNUdh/_new 2023-06-01 17:18:46.233893690 +0200 @@ -1,28 +1,23 @@ +--- + src/ldebug.h | 2 +- + src/lmem.h | 2 +- + src/lundump.h | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + --- a/src/ldebug.h +++ b/src/ldebug.h @@ -36,7 +36,7 @@ #endif - - + + -LUAI_FUNC int luaG_getfuncline (const Proto *f, int pc); +LUA_API int luaG_getfuncline (const Proto *f, int pc); LUAI_FUNC const char *luaG_findlocal (lua_State *L, CallInfo *ci, int n, StkId *pos); LUAI_FUNC l_noret luaG_typeerror (lua_State *L, const TValue *o, ---- a/src/lundump.h -+++ b/src/lundump.h -@@ -30,7 +30,7 @@ - LUAI_FUNC LClosure* luaU_undump (lua_State* L, ZIO* Z, const char* name); - - /* dump one chunk; from ldump.c */ --LUAI_FUNC int luaU_dump (lua_State* L, const Proto* f, lua_Writer w, -+LUA_API int luaU_dump (lua_State* L, const Proto* f, lua_Writer w, - void* data, int strip); - - #endif --- a/src/lmem.h +++ b/src/lmem.h -@@ -81,7 +81,7 @@ +@@ -81,7 +81,7 @@ LUAI_FUNC void *luaM_realloc_ (lua_State size_t size); LUAI_FUNC void *luaM_saferealloc_ (lua_State *L, void *block, size_t oldsize, size_t size); @@ -31,4 +26,15 @@ LUAI_FUNC void *luaM_growaux_ (lua_State *L, void *block, int nelems, int *size, int size_elem, int limit, const char *what); +--- a/src/lundump.h ++++ b/src/lundump.h +@@ -30,7 +30,7 @@ + LUAI_FUNC LClosure* luaU_undump (lua_State* L, ZIO* Z, const char* name); + + /* dump one chunk; from ldump.c */ +-LUAI_FUNC int luaU_dump (lua_State* L, const Proto* f, lua_Writer w, ++LUA_API int luaU_dump (lua_State* L, const Proto* f, lua_Writer w, + void* data, int strip); + + #endif

1 0

commit ncurses for openSUSE:Factory
by Source-Sync 01 Jun '23

01 Jun '23

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package ncurses for openSUSE:Factory checked in at 2023-06-01 17:18:40 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ncurses (Old) and /work/SRC/openSUSE:Factory/.ncurses.new.2531 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ncurses" Thu Jun 1 17:18:40 2023 rev:240 rq:1089508 version:unknown Changes: -------- --- /work/SRC/openSUSE:Factory/ncurses/ncurses.changes 2023-05-10 16:16:12.810154479 +0200 +++ /work/SRC/openSUSE:Factory/.ncurses.new.2531/ncurses.changes 2023-06-01 17:18:41.733867015 +0200 @@ -1,0 +2,16 @@ +Mon May 22 06:21:42 UTC 2023 - Dr. Werner Fink <werner(a)suse.de> + +- Add ncurses patch 20230520 + + fixes for compiler warnings in MinGW environments. + +------------------------------------------------------------------- +Mon May 15 09:05:32 UTC 2023 - Dr. Werner Fink <werner(a)suse.de> + +- Add ncurses patch 20230514 + + modify test-package "ncurses6-doc" to use manpage-aliases, which in + turn required a change to the configure script to factor in the + extra-suffix option when deriving alias names. + + add mode 1004 to xterm+sm+1006 from xterm #380 -TD +- Port and correct offsets of patch ncurses-6.4.dif + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ncurses.spec ++++++ --- /var/tmp/diff_new_pack.37cTd8/_old 2023-06-01 17:18:43.561877851 +0200 +++ /var/tmp/diff_new_pack.37cTd8/_new 2023-06-01 17:18:43.569877899 +0200 @@ -520,6 +520,7 @@ --with-normal \ --with-manpage-renames=${PWD}/man/man_db.renames.in \ --with-manpage-aliases \ + --with-manpage-symlinks \ --with-ospeed=speed_t \ %if 0%{?suse_version} > 1310 --with-gpm=$(readlink %{_libdir}/libgpm.so) \ ++++++ ncurses-6.4-patches.tar.bz2 ++++++ ++++ 9020 lines of diff (skipped) ++++++ ncurses-6.4.dif ++++++ --- /var/tmp/diff_new_pack.37cTd8/_old 2023-06-01 17:18:44.605884040 +0200 +++ /var/tmp/diff_new_pack.37cTd8/_new 2023-06-01 17:18:44.609884064 +0200 @@ -1,6 +1,6 @@ --- - aclocal.m4 | 38 ++++++++------- - configure | 46 +++++++++--------- + aclocal.m4 | 37 +++++++------- + configure | 45 +++++++++-------- include/curses.h.in | 5 + include/termcap.h.in | 2 include/tic.h | 4 - @@ -15,11 +15,11 @@ progs/Makefile.in | 4 - test/test.priv.h | 4 - test/tracemunch | 2 - 16 files changed, 207 insertions(+), 70 deletions(-) + 16 files changed, 203 insertions(+), 72 deletions(-) --- aclocal.m4 -+++ aclocal.m4 2023-04-24 06:50:39.671979319 +0000 -@@ -5992,12 +5992,15 @@ cat >>$cf_edit_man <<CF_EOF ++++ aclocal.m4 2023-05-15 09:12:36.855207662 +0000 +@@ -5992,12 +5992,12 @@ cat >>$cf_edit_man <<CF_EOF echo "? missing rename for \$cf_source" cf_target="\$cf_source" fi @@ -31,13 +31,10 @@ cat >>$cf_edit_man <<CF_EOF +for t in \$cf_target; do + t="\$cf_subdir\${section}/\${t}" -+CF_EOF -+ -+cat >>$cf_edit_man <<CF_EOF sed -f "$cf_man_alias" \\ CF_EOF -@@ -6007,7 +6010,7 @@ cat >>$cf_edit_man <<CF_EOF +@@ -6007,7 +6007,7 @@ cat >>$cf_edit_man <<CF_EOF CF_EOF else cat >>$cf_edit_man <<CF_EOF @@ -46,7 +43,7 @@ CF_EOF fi -@@ -6047,7 +6050,7 @@ cat >>$cf_edit_man <<CF_EOF +@@ -6047,7 +6047,7 @@ cat >>$cf_edit_man <<CF_EOF mv \$TMP.$cf_manpage_so_strip \$TMP fi fi @@ -55,7 +52,7 @@ CF_EOF fi -@@ -6056,23 +6059,23 @@ case "$MANPAGE_FORMAT" in +@@ -6056,31 +6056,31 @@ case "$MANPAGE_FORMAT" in cat >>$cf_edit_man <<CF_EOF if test "\$form" = format ; then # BSDI installs only .0 suffixes in the cat directories @@ -69,6 +66,15 @@ cat >>$cf_edit_man <<CF_EOF - suffix=\`basename "\$cf_target" | sed -e 's%^[[^.]]*%%'\` + suffix=\`basename "\$t" | sed -e 's%^[[^.]]*%%'\` + extra_suffix= + if test -n "$EXTRA_SUFFIX" ; then +- case \$cf_target in ++ case \$t in + (*${EXTRA_SUFFIX}\$suffix) + extra_suffix="$EXTRA_SUFFIX" + ;; + esac + fi if test "\$verb" = installing ; then - echo "\$verb \$cf_target" - \$INSTALL_DATA \$TMP "\$cf_target" @@ -85,7 +91,7 @@ for cf_alias in \$aliases do if test "\$section" = 1 ; then -@@ -6081,7 +6084,7 @@ cat >>$cf_edit_man <<CF_EOF +@@ -6090,7 +6090,7 @@ cat >>$cf_edit_man <<CF_EOF if test "$MANPAGE_SYMLINKS" = yes ; then if test -f "\$cf_alias\${suffix}" ; then @@ -94,7 +100,7 @@ then continue fi -@@ -6091,18 +6094,18 @@ CF_EOF +@@ -6100,18 +6100,18 @@ CF_EOF case "x$LN_S" in (*-f) cat >>$cf_edit_man <<CF_EOF @@ -116,7 +122,7 @@ echo ".so \$cf_source" >\$TMP CF_EOF if test -n "$cf_manpage_compress" ; then -@@ -6122,9 +6125,9 @@ cat >>$cf_edit_man <<CF_EOF +@@ -6131,9 +6131,9 @@ cat >>$cf_edit_man <<CF_EOF ) ) elif test "\$verb" = removing ; then @@ -129,7 +135,7 @@ ) test -d "\$cf_subdir\${section}" && test -n "\$aliases" && ( -@@ -6144,6 +6147,7 @@ cat >>$cf_edit_man <<CF_EOF +@@ -6154,6 +6154,7 @@ cat >>$cf_edit_man <<CF_EOF # echo ".hy 0" cat \$TMP fi @@ -138,7 +144,7 @@ esac done --- configure -+++ configure 2023-04-24 06:52:13.042243156 +0000 ++++ configure 2023-05-15 09:14:30.917179621 +0000 @@ -6438,7 +6438,7 @@ echo $ECHO_N "checking for an rpath opti fi ;; @@ -168,7 +174,7 @@ do if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "$cf_with_pcre2"; then -@@ -15237,12 +15237,15 @@ cat >>$cf_edit_man <<CF_EOF +@@ -15237,12 +15237,12 @@ cat >>$cf_edit_man <<CF_EOF echo "? missing rename for \$cf_source" cf_target="\$cf_source" fi @@ -180,13 +186,10 @@ cat >>$cf_edit_man <<CF_EOF +for t in \$cf_target; do + t="\$cf_subdir\${section}/\${t}" -+CF_EOF -+ -+cat >>$cf_edit_man <<CF_EOF sed -f "$cf_man_alias" \\ CF_EOF -@@ -15252,7 +15255,7 @@ cat >>$cf_edit_man <<CF_EOF +@@ -15252,7 +15252,7 @@ cat >>$cf_edit_man <<CF_EOF CF_EOF else cat >>$cf_edit_man <<CF_EOF @@ -195,7 +198,7 @@ CF_EOF fi -@@ -15292,7 +15295,7 @@ cat >>$cf_edit_man <<CF_EOF +@@ -15292,7 +15292,7 @@ cat >>$cf_edit_man <<CF_EOF mv \$TMP.$cf_manpage_so_strip \$TMP fi fi @@ -204,7 +207,7 @@ CF_EOF fi -@@ -15301,23 +15304,23 @@ case "$MANPAGE_FORMAT" in +@@ -15301,31 +15301,31 @@ case "$MANPAGE_FORMAT" in cat >>$cf_edit_man <<CF_EOF if test "\$form" = format ; then # BSDI installs only .0 suffixes in the cat directories @@ -218,6 +221,15 @@ cat >>$cf_edit_man <<CF_EOF - suffix=\`basename "\$cf_target" | sed -e 's%^[^.]*%%'\` + suffix=\`basename "\$t" | sed -e 's%^[^.]*%%'\` + extra_suffix= + if test -n "$EXTRA_SUFFIX" ; then +- case \$cf_target in ++ case \$t in + (*${EXTRA_SUFFIX}\$suffix) + extra_suffix="$EXTRA_SUFFIX" + ;; + esac + fi if test "\$verb" = installing ; then - echo "\$verb \$cf_target" - \$INSTALL_DATA \$TMP "\$cf_target" @@ -234,7 +246,7 @@ for cf_alias in \$aliases do if test "\$section" = 1 ; then -@@ -15326,7 +15329,7 @@ cat >>$cf_edit_man <<CF_EOF +@@ -15335,7 +15335,7 @@ cat >>$cf_edit_man <<CF_EOF if test "$MANPAGE_SYMLINKS" = yes ; then if test -f "\$cf_alias\${suffix}" ; then @@ -243,7 +255,7 @@ then continue fi -@@ -15336,18 +15339,18 @@ CF_EOF +@@ -15345,18 +15345,18 @@ CF_EOF case "x$LN_S" in (*-f) cat >>$cf_edit_man <<CF_EOF @@ -265,7 +277,7 @@ echo ".so \$cf_source" >\$TMP CF_EOF if test -n "$cf_manpage_compress" ; then -@@ -15367,9 +15370,9 @@ cat >>$cf_edit_man <<CF_EOF +@@ -15376,9 +15376,9 @@ cat >>$cf_edit_man <<CF_EOF ) ) elif test "\$verb" = removing ; then @@ -278,7 +290,7 @@ ) test -d "\$cf_subdir\${section}" && test -n "\$aliases" && ( -@@ -15389,6 +15392,7 @@ cat >>$cf_edit_man <<CF_EOF +@@ -15399,6 +15399,7 @@ cat >>$cf_edit_man <<CF_EOF # echo ".hy 0" cat \$TMP fi

1 0