June 2021 - openSUSE Commits - openSUSE Mailing Lists

commit jdom2 for openSUSE:Factory
by Source-Sync 29 Jun '21

29 Jun '21

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package jdom2 for openSUSE:Factory checked in at 2021-06-29 22:43:37 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/jdom2 (Old) and /work/SRC/openSUSE:Factory/.jdom2.new.2625 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "jdom2" Tue Jun 29 22:43:37 2021 rev:3 rq:903078 version:2.0.6 Changes: -------- --- /work/SRC/openSUSE:Factory/jdom2/jdom2.changes 2019-10-04 11:22:29.648933748 +0200 +++ /work/SRC/openSUSE:Factory/.jdom2.new.2625/jdom2.changes 2021-06-29 22:44:20.910959860 +0200 @@ -1,0 +2,8 @@ +Thu Jun 17 09:17:40 UTC 2021 - Pedro Monreal <pmonreal(a)suse.com> + +- Security fix: [bsc#1187446, CVE-2021-33813] + * XXE issue in SAXBuilder can cause a denial of service via + a crafted HTTP request +- Add jdom2-CVE-2021-33813.patch + +------------------------------------------------------------------- New: ---- jdom2-CVE-2021-33813.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ jdom2.spec ++++++ --- /var/tmp/diff_new_pack.t0KLFg/_old 2021-06-29 22:44:21.326960408 +0200 +++ /var/tmp/diff_new_pack.t0KLFg/_new 2021-06-29 22:44:21.330960414 +0200 @@ -1,7 +1,7 @@ # # spec file for package jdom2 # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -31,6 +31,8 @@ # Disable gpg signatures # Process contrib and junit pom files Patch0: 0001-Adapt-build.patch +# PATCH-FIX-UPSTREAM bsc#1187446 CVE-2021-33813 Fix XXE issue in SAXBuilder +Patch1: jdom2-CVE-2021-33813.patch BuildRequires: ant BuildRequires: ant-junit BuildRequires: fdupes @@ -65,6 +67,7 @@ find -name '*.class' -delete %patch0 -p1 +%patch1 -p1 cp -p %{SOURCE1} maven/contrib.pom cp -p %{SOURCE2} maven/junit.pom @@ -74,11 +77,10 @@ # Unable to run coverage: use log4j12 but switch to log4j 2.x sed -i.coverage "s|coverage, jars|jars|" build.xml +%build mkdir lib build-jar-repository lib xerces-j2 xml-commons-apis jaxen junit isorelax xalan-j2 xalan-j2-serializer - -%build -ant -Dversion=%{version} -Dcompile.target=6 -Dcompile.source=6 -Dj2se.apidoc=%{_javadocdir}/java maven +%ant -Dversion=%{version} -Dcompile.target=6 -Dcompile.source=6 -Dj2se.apidoc=%{_javadocdir}/java maven %install # jar ++++++ jdom2-CVE-2021-33813.patch ++++++ From bd3ab78370098491911d7fe9d7a43b97144a234e Mon Sep 17 00:00:00 2001 From: Esti <esther.burs(a)gmail.com> Date: Thu, 18 Feb 2021 16:40:01 +0200 Subject: [PATCH] fix setFeature bug and add test case --- core/src/java/org/jdom2/input/SAXBuilder.java | 10 ++++------ .../test/cases/input/TestSAXBuilder.java | 20 +++++++++++++++++++ 2 files changed, 24 insertions(+), 6 deletions(-) diff --git a/core/src/java/org/jdom2/input/SAXBuilder.java b/core/src/java/org/jdom2/input/SAXBuilder.java index d7105ec6..a1462334 100644 --- a/core/src/java/org/jdom2/input/SAXBuilder.java +++ b/core/src/java/org/jdom2/input/SAXBuilder.java @@ -971,11 +971,6 @@ protected void configureParser(final XMLReader parser, final SAXHandler contentH } } - // Set any user-specified features on the parser. - for (final Map.Entry<String, Boolean> me : features.entrySet()) { - internalSetFeature(parser, me.getKey(), me.getValue().booleanValue(), me.getKey()); - } - // Set any user-specified properties on the parser. for (final Map.Entry<String, Object> me : properties.entrySet()) { internalSetProperty(parser, me.getKey(), me.getValue(), me.getKey()); @@ -1007,7 +1002,10 @@ protected void configureParser(final XMLReader parser, final SAXHandler contentH // No lexical reporting available } } - + // Set any user-specified features on the parser. + for (final Map.Entry<String, Boolean> me : features.entrySet()) { + internalSetFeature(parser, me.getKey(), me.getValue().booleanValue(), me.getKey()); + } } /** diff --git a/test/src/java/org/jdom2/test/cases/input/TestSAXBuilder.java b/test/src/java/org/jdom2/test/cases/input/TestSAXBuilder.java index 4ef34834..a69380ba 100644 --- a/test/src/java/org/jdom2/test/cases/input/TestSAXBuilder.java +++ b/test/src/java/org/jdom2/test/cases/input/TestSAXBuilder.java @@ -600,6 +600,26 @@ public void testSetFeature() { } } + @Test + public void testSetExternalFeature() { + String feature = "http://xml.org/sax/features/external-general-entities"; + MySAXBuilder sb = new MySAXBuilder(); + try { + sb.setFeature(feature, true); + XMLReader reader = sb.createParser(); + assertNotNull(reader); + assertTrue(reader.getFeature(feature)); + sb.setFeature(feature, false); + reader = sb.createParser(); + assertNotNull(reader); + assertFalse(reader.getFeature(feature)); + + } catch (Exception e) { + e.printStackTrace(); + fail("Could not create parser: " + e.getMessage()); + } + } + @Test public void testSetProperty() { LexicalHandler lh = new LexicalHandler() {

1 0

commit packETH for openSUSE:Factory
by Source-Sync 29 Jun '21

29 Jun '21

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package packETH for openSUSE:Factory checked in at 2021-06-29 22:43:36 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/packETH (Old) and /work/SRC/openSUSE:Factory/.packETH.new.2625 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "packETH" Tue Jun 29 22:43:36 2021 rev:4 rq:903076 version:2.1 Changes: -------- --- /work/SRC/openSUSE:Factory/packETH/packETH.changes 2020-07-05 01:20:55.197506728 +0200 +++ /work/SRC/openSUSE:Factory/.packETH.new.2625/packETH.changes 2021-06-29 22:44:20.366959142 +0200 @@ -1,0 +2,13 @@ +Mon May 17 22:26:18 UTC 2021 - Ferdinand Thiessen <rpm(a)fthiessen.de> + +- Update to version 2.1 + * packETHcli added burst mode (-m -6) + * packETHcli added receiver option (mode -m -9) to count received + packets + * packETHcli added option to incluce pattern (predifined or custom) + which can be checked by packETHcli in receiver mode if all packets + that were sent were also correctly received at the receiver site + * packETHcli - nanoseconds support +- Replaced packeth-ftbs-gcc10.patch with e72195b573.patch + +------------------------------------------------------------------- Old: ---- packETH-1.8.1.tar.bz2 packeth-ftbs-gcc10.patch New: ---- e72195b573.patch packETH-2.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ packETH.spec ++++++ --- /var/tmp/diff_new_pack.Zk9k08/_old 2021-06-29 22:44:20.770959675 +0200 +++ /var/tmp/diff_new_pack.Zk9k08/_new 2021-06-29 22:44:20.770959675 +0200 @@ -1,7 +1,7 @@ # # spec file for package packETH # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,39 +16,75 @@ # +# Uses x86 ASM +%ifarch %ix86 x86_64 amd64 ia32e +%bcond_without cli +%else +%bcond_with cli +%endif Name: packETH -Version: 1.8.1 +Version: 2.1 Release: 0 Summary: Packet generator tool for ethernet License: GPL-3.0-or-later Group: Productivity/Networking/Diagnostic URL: http://packeth.sourceforge.net/packeth/Home.html -Source0: http://downloads.sourceforge.net/project/packeth/packETH-%{version}.tar.bz2 +Source0: https://github.com/jemcek/packETH/archive/refs/tags/%{version}.tar.gz#/%{na… +# PATCH-FIX-UPSTREAM e72195b573.patch -- https://github.com/jemcek/packETH/pull/22 +Patch0: https://github.com/jemcek/packETH/commit/e72195b573.patch +BuildRequires: automake BuildRequires: pkgconfig -BuildRequires: pkgconfig(glib-2.0) -BuildRequires: pkgconfig(gtk+-2.0) -Patch0: packeth-ftbs-gcc10.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRequires: pkgconfig(glib-2.0) >= 2.4 +BuildRequires: pkgconfig(gthread-2.0) +BuildRequires: pkgconfig(gtk+-2.0) >= 2.4 %description packETH is tool for generating packets to send over ethernet. +%if %{with cli} + +%package cli +Summary: CLI only packet generator tool for ethernet +Group: Productivity/Networking/Diagnostic + +%description cli +packETHcli is a command line version of packETH. + +It allows you to easily send packets from pcap file. +It has different sending options although not all features from packETH are supported. +It also has a receiver mode where packets sent by packETH or packETHcli can be captured +and checked for errors. + +%files cli +%license COPYING +%doc cli/NEWS cli/README +%{_bindir}/packETHcli + +%endif + %prep %autosetup -p1 -# yay, lm is not in checked libs -sed -i -e 's:$(DEPS_LIBS):$(DEPS_LIBS) -lm:' Makefile.in %build -export CFLAGS="%optflags -fvisibility=hidden" +autoreconf -fi %configure -make %{?_smp_mflags} +%make_build +%if %{with cli} +# CLI +pushd cli +%make_build CFLAGS="%{optflags}" +popd +%endif %install -make DESTDIR=%{buildroot} install %{?_smp_mflags} +%make_install +%if %{with cli} +install -D -m 0755 cli/packETHcli %{buildroot}%{_bindir}/packETHcli +%endif %files -%defattr(-,root,root) -%doc COPYING CHANGELOG AUTHORS +%license COPYING +%doc CHANGELOG AUTHORS %{_bindir}/%{name} %{_datadir}/packeth ++++++ e72195b573.patch ++++++ From e72195b573a17e68632e5461db72dc2a4d142c94 Mon Sep 17 00:00:00 2001 From: Jeroen Roovers <jer(a)gentoo.org> Date: Mon, 3 Feb 2020 20:48:26 +0100 Subject: [PATCH] Fix GCC-10 / CFLAGS=-fno-common GCC 10 will enable -fno-common by default[0], which causes the linker to fail like this [1], even for older GCC versions for which it is explicitly enabled: ``` ld: src/function_send.o:(.bss+0x0): multiple definition of `iftext'; src/callbacks.o:(.bss+0x0): first defined here ``` Fix[2] this by declaring iftext as extern in the header and by defining it just once. [0] https://gcc.gnu.org/gcc-10/porting_to.html#common [1] https://bugs.gentoo.org/708048 [2] Note that src/function.h uses CRLF line endings. --- src/callbacks.c | 1 - src/function.c | 2 +- src/function.h | 2 ++ src/function_send.c | 1 - 4 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/callbacks.c b/src/callbacks.c index ef02fb1..5efde80 100644 --- a/src/callbacks.c +++ b/src/callbacks.c @@ -65,7 +65,6 @@ extern int number; extern int stop_flag; extern long desired_bw; gint row_number;/* this is because i cant get the selected row number*/ -gchar iftext[20]; gchar address_filename[100] = "addresslist"; static GtkWidget *entry_field; static GtkWidget *entry_field_ip; diff --git a/src/function.c b/src/function.c index 1d7dfe2..96e4d8f 100644 --- a/src/function.c +++ b/src/function.c @@ -66,7 +66,7 @@ int ipv4_start = 0; int ipv6_start = 0; int eth_start = 0; gboolean stop_flag = 0; -extern char iftext[20]; +char iftext[20]; static unsigned long crc32_table[256]; int crc32_table_init = 0; int ip_proto_used = 0; // 0 - none, 4 - ipv4, 6- IPv6, 806 - ARP diff --git a/src/function.h b/src/function.h index 304caf5..461ce01 100644 --- a/src/function.h +++ b/src/function.h @@ -22,6 +22,8 @@ #include <gtk/gtk.h> +extern char iftext[20]; + signed int char2x(char *p); char c4(int value); guint32 get_checksum32(int start, int stop); diff --git a/src/function_send.c b/src/function_send.c index ca49639..5d3f1f6 100644 --- a/src/function_send.c +++ b/src/function_send.c @@ -55,7 +55,6 @@ extern long li_last_packets_sent; extern long li_packets_sent_lastsec; extern long sentstream[10]; extern long sendtime; -char iftext[20]; struct params { long long del;

1 0

commit batctl for openSUSE:Factory
by Source-Sync 29 Jun '21

29 Jun '21

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package batctl for openSUSE:Factory checked in at 2021-06-29 22:43:36 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/batctl (Old) and /work/SRC/openSUSE:Factory/.batctl.new.2625 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "batctl" Tue Jun 29 22:43:36 2021 rev:20 rq:903075 version:2021.0 Changes: -------- --- /work/SRC/openSUSE:Factory/batctl/batctl.changes 2018-06-29 22:32:08.242221829 +0200 +++ /work/SRC/openSUSE:Factory/.batctl.new.2625/batctl.changes 2021-06-29 22:44:19.642958186 +0200 @@ -1,0 +2,37 @@ +Thu May 13 00:26:26 UTC 2021 - Ferdinand Thiessen <rpm(a)fthiessen.de> + +- Update to version 2021.0 + * Drop support for batman-adv's sysfs+debugfs + * Drop support for automatic destruction of empty meshifs + * Drop support for deprecated log command support + * Drop of the legacy vis subcommands + * Add per interface hop penalty command + * Add tcpdump support for MCAST TVLV, unicast fragments and coded + packets + * Add support for hardif specific settings + * Add multicast_fanout setting subcommand + * Add hop_penalty setting subcommand + * Add gateway selection manpage section for B.A.T.M.A.N. V + * New subcommand "event" to receive netlink notifications + * Bugs squashed: + * Fix query of meshif's ap_isolation status + * Ignore "interface already exists" error during "interface add" + * Fix endianness in ICMPv6 Echo Request/Reply parsing + * Fix parsing of radiotap headers on big endian systems + * Fix error code on throughputmeter errors + * Re-integrate support for translation table unicast/multicast + filter + * Avoid incorrect warning about disabled mesh interface when + debugfs support is not enabled in batman-adv + * Allow to select routing algorithm during creation of interface + * implement support for multicast RTR flags + * avoid some kernel deprecation warning by using more generic + netlink over sysfs + * use type specific prefixes to select mesh interface or vlan + instead of '-m' + * implement netlink based support for remaining sysfs-only features + * remove non-netlink support for translating MAC addresses to originators + * introduce support for batadv meshif, hardif and vlan configuration via netlink + * replace multicast_mode with multicast_forceflood settings subcommand + +------------------------------------------------------------------- Old: ---- batctl-2018.1.tar.gz batctl-2018.1.tar.gz.asc New: ---- batctl-2021.0.tar.gz batctl-2021.0.tar.gz.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ batctl.spec ++++++ --- /var/tmp/diff_new_pack.9qMkUD/_old 2021-06-29 22:44:20.074958756 +0200 +++ /var/tmp/diff_new_pack.9qMkUD/_new 2021-06-29 22:44:20.078958762 +0200 @@ -1,7 +1,7 @@ # # spec file for package batctl # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,12 +12,12 @@ # 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: batctl -Version: 2018.1 +Version: 2021.0 Release: 0 Summary: B.A.T.M.A.N. advanced control and management tool License: GPL-2.0-only AND MIT @@ -42,7 +42,7 @@ %build export CFLAGS='%{optflags}' -make %{?_smp_mflags} +%make_build %install mkdir -p %{buildroot}%{_bindir} ++++++ batctl-2018.1.tar.gz -> batctl-2021.0.tar.gz ++++++ ++++ 12905 lines of diff (skipped)

1 0

commit matrix-synapse for openSUSE:Factory
by Source-Sync 29 Jun '21

29 Jun '21

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package matrix-synapse for openSUSE:Factory checked in at 2021-06-29 22:43:35 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/matrix-synapse (Old) and /work/SRC/openSUSE:Factory/.matrix-synapse.new.2625 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "matrix-synapse" Tue Jun 29 22:43:35 2021 rev:38 rq:903072 version:1.37.0 Changes: -------- --- /work/SRC/openSUSE:Factory/matrix-synapse/matrix-synapse.changes 2021-06-16 20:36:53.431330036 +0200 +++ /work/SRC/openSUSE:Factory/.matrix-synapse.new.2625/matrix-synapse.changes 2021-06-29 22:44:18.782957051 +0200 @@ -1,0 +2,113 @@ +Tue Jun 29 10:44:06 UTC 2021 - Marcus Rueckert <mrueckert(a)suse.de> + +- Update to 1.37.0 + This release deprecates the current spam checker interface. See + the upgrade notes for more information on how to update to the + new generic module interface. + + This release also removes support for fetching and renewing TLS + certificates using the ACME v1 protocol, which has been fully + decommissioned by Let's Encrypt on June 1st 2021. Admins + previously using this feature should use a reverse proxy to + handle TLS termination, or use an external ACME client (such as + certbot) to retrieve a certificate and key and provide them to + Synapse using the tls_certificate_path and tls_private_key_path + configuration settings. + + - Features + - Implement "room knocking" as per MSC2403. Contributed by + @Sorunome and anoa. (#6739, #9359, #10167, #10212, #10227) + - Add experimental support for backfilling history into rooms + (MSC2716). (#9247) + - Implement a generic interface for third-party plugin modules. + (#10062, #10206) + - Implement config option sso.update_profile_information to + sync SSO users' profile information with the identity + provider each time they login. Currently only displayname is + supported. (#10108) + - Ensure that errors during startup are written to the logs and + the console. (#10191) + - Bugfixes + - Fix a bug introduced in Synapse v1.25.0 that prevented the + ip_range_whitelist configuration option from working for + federation and identity servers. Contributed by @mikure. + (#10115) + - Remove a broken import line in Synapse's admin_cmd worker. + Broke in Synapse v1.33.0. (#10154) + - Fix a bug introduced in Synapse v1.21.0 which could cause + /sync to return immediately with an empty response. (#10157, + #10158) + - Fix a minor bug in the response to + /_matrix/client/r0/user/{user}/openid/request_token causing + expires_in to be a float instead of an integer. Contributed + by @lukaslihotzki. (#10175) + - Always require users to re-authenticate for dangerous + operations: deactivating an account, modifying an account + password, and adding 3PIDs. (#10184) + - Fix a bug introduced in Synpase v1.7.2 where remote server + count metrics collection would be incorrectly delayed on + startup. Found by @heftig. (#10195) + - Fix a bug introduced in Synapse v1.35.1 where an allow key of + a m.room.join_rules event could be applied for incorrect room + versions and configurations. (#10208) + - Fix performance regression in responding to user key requests + over federation. Introduced in Synapse v1.34.0rc1. (#10221) + - Improved Documentation + - Add a new guide to decoding request logs. (#8436) + - Mention in the sample homeserver config that you may need to + configure max upload size in your reverse proxy. Contributed + by @aaronraimist. (#10122) + - Fix broken links in documentation. (#10180) + - Deploy a snapshot of the documentation website upon each new + Synapse release. (#10198) + - Deprecations and Removals + - The current spam checker interface is deprecated in favour of + a new generic modules system. See the upgrade notes for more + information on how to update to the new system. (#10062, + #10210, #10238) + - Stop supporting the unstable spaces prefixes from MSC1772. + (#10161) + - Remove Synapse's support for automatically fetching and + renewing certificates using the ACME v1 protocol. This + protocol has been fully turned off by Let's Encrypt for + existing installations on June 1st 2021. Admins previously + using this feature should use a reverse proxy to handle TLS + termination, or use an external ACME client (such as certbot) + to retrieve a certificate and key and provide them to Synapse + using the tls_certificate_path and tls_private_key_path + configuration settings. (#10194) + - Internal Changes + - Update the database schema versioning to support gradual + migration away from legacy tables. (#9933) + - Add type hints to the federation servlets. (#10080) + - Improve OpenTracing for event persistence. (#10134, #10193) + - Clean up the interface for injecting OpenTracing over HTTP. + (#10143) + - Limit the number of in-flight /keys/query requests from a + single device. (#10144) + - Refactor EventPersistenceQueue. (#10145) + - Document SYNAPSE_TEST_LOG_LEVEL to see the logger output when + running tests. (#10148) + - Update the Complement build tags in GitHub Actions to test + currently experimental features. (#10155) + - Add a synapse_federation_soft_failed_events_total metric to + track how often events are soft failed. (#10156) + - Fetch the corresponding complement branch when performing CI. + (#10160) + - Add some developer documentation about boolean columns in + database schemas. (#10164) + - Add extra logging fields to better debug where events are + being soft failed. (#10168) + - Add debug logging for when we enter and exit Measure blocks. + (#10183) + - Improve comments in structured logging code. (#10188) + - Update MSC3083 support with modifications from the MSC. + (#10189) + - Remove redundant DNS lookup limiter. (#10190) + - Upgrade black linting tool to 21.6b0. (#10197) + - Expose OpenTracing trace id in response headers. (#10199) +- refresh patches to apply cleanly again: + dont-bump-cryptography-with-system-openssl.patch + matrix-synapse-1.4.1-paths.patch + +------------------------------------------------------------------- Old: ---- matrix-synapse-1.36.0.obscpio New: ---- matrix-synapse-1.37.0.obscpio ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ matrix-synapse-test.spec ++++++ --- /var/tmp/diff_new_pack.Rwwl7k/_old 2021-06-29 22:44:19.354957806 +0200 +++ /var/tmp/diff_new_pack.Rwwl7k/_new 2021-06-29 22:44:19.358957811 +0200 @@ -27,7 +27,7 @@ %define pkgname matrix-synapse Name: %{pkgname}-test -Version: 1.36.0 +Version: 1.37.0 Release: 0 Summary: Test package for %{pkgname} License: Apache-2.0 ++++++ matrix-synapse.spec ++++++ --- /var/tmp/diff_new_pack.Rwwl7k/_old 2021-06-29 22:44:19.374957832 +0200 +++ /var/tmp/diff_new_pack.Rwwl7k/_new 2021-06-29 22:44:19.378957838 +0200 @@ -29,8 +29,6 @@ %bcond_with opentracing # matrix-synapse-ldap isn't packaged on openSUSE. %bcond_with ldap -# txacme is broken in openSUSE. -%bcond_with acme # sentry-sdk isn't packaged on openSUSE. %bcond_with sentry @@ -52,7 +50,7 @@ %define pkgname matrix-synapse %define eggname matrix_synapse Name: %{pkgname} -Version: 1.36.0 +Version: 1.37.0 Release: 0 Summary: Matrix protocol reference homeserver License: Apache-2.0 @@ -92,7 +90,7 @@ %requires_eq %{use_python}-PyYAML BuildRequires: %{use_python}-Twisted >= 20.3.0 %requires_eq %{use_python}-Twisted -BuildRequires: ((%{use_python}-attrs >= 19.1.0 with %{use_python}-attrs < 21.1.0) or %{use_python}-attrs > 21.1.0) +BuildRequires: ((%{use_python}-attrs >= 19.2.0 with %{use_python}-attrs < 21.1.0) or %{use_python}-attrs > 21.1.0) %requires_eq %{use_python}-attrs BuildRequires: %{use_python}-bcrypt >= 3.2.0 %requires_eq %{use_python}-bcrypt @@ -154,10 +152,6 @@ BuildRequires: %{use_python}-psycopg2 >= 2.8 %requires_eq %{use_python}-psycopg2 %endif -%if %{with acme} -BuildRequires: %{use_python}-txacme >= 0.9.2 -%requires_eq %{use_python}-txacme -%endif %if %{with saml} BuildRequires: %{use_python}-pysaml2 >= 4.5.0 %requires_eq %{use_python}-pysaml2 ++++++ _service ++++++ --- /var/tmp/diff_new_pack.Rwwl7k/_old 2021-06-29 22:44:19.414957885 +0200 +++ /var/tmp/diff_new_pack.Rwwl7k/_new 2021-06-29 22:44:19.418957890 +0200 @@ -4,11 +4,11 @@ <param name="versionformat">@PARENT_TAG@</param> <param name="url">https://github.com/matrix-org/synapse.git</param> <param name="scm">git</param> - <param name="revision">v1.36.0</param> + <param name="revision">v1.37.0</param> <param name="versionrewrite-pattern">v(.*)</param> <param name="versionrewrite-replacement">\1</param>  ++++++ dont-bump-cryptography-with-system-openssl.patch ++++++ --- /var/tmp/diff_new_pack.Rwwl7k/_old 2021-06-29 22:44:19.422957896 +0200 +++ /var/tmp/diff_new_pack.Rwwl7k/_new 2021-06-29 22:44:19.426957901 +0200 @@ -2,7 +2,7 @@ =================================================================== --- synapse.orig/synapse/python_dependencies.py +++ synapse/synapse/python_dependencies.py -@@ -86,7 +86,8 @@ REQUIREMENTS = [ +@@ -84,7 +84,8 @@ REQUIREMENTS = [ "typing-extensions>=3.7.4", # We enforce that we have a `cryptography` version that bundles an `openssl` # with the latest security patches. ++++++ matrix-synapse-1.36.0.obscpio -> matrix-synapse-1.37.0.obscpio ++++++ /work/SRC/openSUSE:Factory/matrix-synapse/matrix-synapse-1.36.0.obscpio /work/SRC/openSUSE:Factory/.matrix-synapse.new.2625/matrix-synapse-1.37.0.obscpio differ: char 49, line 1 ++++++ matrix-synapse-1.4.1-paths.patch ++++++ --- /var/tmp/diff_new_pack.Rwwl7k/_old 2021-06-29 22:44:19.450957933 +0200 +++ /var/tmp/diff_new_pack.Rwwl7k/_new 2021-06-29 22:44:19.450957933 +0200 @@ -50,7 +50,7 @@ =================================================================== --- synapse.orig/synapse/config/server.py +++ synapse/synapse/config/server.py -@@ -726,7 +726,7 @@ class ServerConfig(Config): +@@ -729,7 +729,7 @@ class ServerConfig(Config): bind_port = 8448 unsecure_port = 8008 @@ -63,8 +63,8 @@ =================================================================== --- synapse.orig/synapse/config/tls.py +++ synapse/synapse/config/tls.py -@@ -236,7 +236,7 @@ class TlsConfig(Config): - If the TLS paths are not specified the default will be certs in the +@@ -200,7 +200,7 @@ class TlsConfig(Config): + """If the TLS paths are not specified the default will be certs in the config directory""" - base_key_name = os.path.join(config_dir_path, server_name) @@ -72,12 +72,3 @@ if bool(tls_certificate_path) != bool(tls_private_key_path): raise ConfigError( -@@ -255,7 +255,7 @@ class TlsConfig(Config): - acme_enabled = bool(acme_domain) - acme_domain = "matrix.example.com" - -- default_acme_account_file = os.path.join(data_dir_path, "acme_account.key") -+ default_acme_account_file = os.path.join('/etc/matrix-synapse/keys.d', "acme_account.key") - - # this is to avoid the max line length. Sorrynotsorry - proxypassline = ( ++++++ matrix-synapse.obsinfo ++++++ --- /var/tmp/diff_new_pack.Rwwl7k/_old 2021-06-29 22:44:19.486957980 +0200 +++ /var/tmp/diff_new_pack.Rwwl7k/_new 2021-06-29 22:44:19.486957980 +0200 @@ -1,5 +1,5 @@ name: matrix-synapse -version: 1.36.0 -mtime: 1623768122 -commit: 1c8045f67477599fabc5759205c018e44d770078 +version: 1.37.0 +mtime: 1624958203 +commit: 88f9e8d62e0573b5b6f1c3a8bfe4d87f9aebde47

1 0

commit libindi for openSUSE:Factory
by Source-Sync 29 Jun '21

29 Jun '21

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package libindi for openSUSE:Factory checked in at 2021-06-29 22:43:35 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libindi (Old) and /work/SRC/openSUSE:Factory/.libindi.new.2625 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libindi" Tue Jun 29 22:43:35 2021 rev:46 rq:903068 version:1.9.1 Changes: -------- --- /work/SRC/openSUSE:Factory/libindi/libindi.changes 2021-06-09 21:53:02.690554175 +0200 +++ /work/SRC/openSUSE:Factory/.libindi.new.2625/libindi.changes 2021-06-29 22:44:17.550955425 +0200 @@ -1,0 +2,27 @@ +Mon Jun 28 05:36:16 UTC 2021 - Paolo Stivanin <info(a)paolostivanin.com> + +- Update to 1.9.1: + * New AstroTrac 360 driver (Experimental). + * New Pegasus FlatMaster and UHC drivers + * New Deep Sky Dad Field Rotator + * Core INDI Library improvements to base device and client classes + * Paramount TCP improvements + * Spectrograph and Receiver classes + * OnStep improvements + * RST-135 location and time fix + * Dome OTA fixes + * Object Azimuth and Altitude added to FITS header + * Rainbow Focuser fixes + * Support for CGX-L + * Fix crash in SkyWatcher API mount driver + * Fix iOptron DST bug + * Fix lunar and solar order + * PMC8 Driver v0.4 (Improved manual slewing, guiding, and other features) + * Try to send the guide pulses asynchronously to TheSkyX + * Use encoders for parking + * Lots of other smmall fixes, for the full changelog please check + https://github.com/indilib/indi/blob/master/ChangeLog +- Drop ioptron_dst_fix.patch (change has been upstreamed) +- Add fix_include_path.patch + +------------------------------------------------------------------- Old: ---- indi-1.9.0.tar.gz ioptron_dst_fix.patch New: ---- fix_include_path.patch indi-1.9.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libindi.spec ++++++ --- /var/tmp/diff_new_pack.2LtFQK/_old 2021-06-29 22:44:17.946955948 +0200 +++ /var/tmp/diff_new_pack.2LtFQK/_new 2021-06-29 22:44:17.950955953 +0200 @@ -19,7 +19,7 @@ %define so_ver 1 %define _udevdir %(pkg-config --variable udevdir udev) Name: libindi -Version: 1.9.0 +Version: 1.9.1 Release: 0 Summary: Instrument Neutral Distributed Interface License: GPL-2.0-or-later AND LGPL-2.1-or-later AND GPL-3.0-or-later @@ -28,8 +28,7 @@ Source0: https://github.com/indilib/indi/archive/v%{version}.tar.gz#/indi-%{version}… # PATCH-FIX-UPSTREAM Patch0: 0001-Fix-warnings.patch -# PATCH-FIX-UPSTREAM (release 1.9.1 will contain the fix) -Patch1: ioptron_dst_fix.patch +Patch1: fix_include_path.patch BuildRequires: cmake BuildRequires: gcc-c++ BuildRequires: gsl-devel @@ -125,7 +124,11 @@ # libindi doesn't check whether CMAKE_INSTALL_LIBDIR is relative or not... sed -i 's|${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}|${CMAKE_INSTALL_LIBDIR}|' libs/indibase/alignment/CMakeLists.txt -%cmake -DUDEVRULES_INSTALL_DIR=%{_udevdir}/rules.d \ +export CFLAGS="%(echo %{optflags}) -Wno-stringop-truncation" +export CXXFLAGS="$CFLAGS" + +%cmake \ + -DUDEVRULES_INSTALL_DIR=%{_udevdir}/rules.d \ -DINDI_BUILD_QT5_CLIENT=ON \ -DINDI_BUILD_WEBSOCKET=ON \ -DCMAKE_SHARED_LINKER_FLAGS="-Wl,--as-needed -Wl,-z,now" ++++++ fix_include_path.patch ++++++ --- indi-1.9.1/libs/indibase/baseclient.h.orig 2021-06-29 07:33:35.235578806 +0200 +++ indi-1.9.1/libs/indibase/baseclient.h 2021-06-29 07:33:52.763714581 +0200 @@ -20,11 +20,11 @@ #include "indiapi.h" #include "indibase.h" +#include "indimacros.h" #include <string> #include <vector> -#include <indimacros.h> #include <memory> // #define MAXRBUF 2048 // #PS: defined in indibase.h ++++++ indi-1.9.0.tar.gz -> indi-1.9.1.tar.gz ++++++ ++++ 41668 lines of diff (skipped)

1 0

commit python-sphinxcontrib-plantuml for openSUSE:Factory
by Source-Sync 29 Jun '21

29 Jun '21

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package python-sphinxcontrib-plantuml for openSUSE:Factory checked in at 2021-06-29 22:43:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-sphinxcontrib-plantuml (Old) and /work/SRC/openSUSE:Factory/.python-sphinxcontrib-plantuml.new.2625 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-sphinxcontrib-plantuml" Tue Jun 29 22:43:34 2021 rev:4 rq:903060 version:0.21 Changes: -------- --- /work/SRC/openSUSE:Factory/python-sphinxcontrib-plantuml/python-sphinxcontrib-plantuml.changes 2020-04-23 18:38:41.365034923 +0200 +++ /work/SRC/openSUSE:Factory/.python-sphinxcontrib-plantuml.new.2625/python-sphinxcontrib-plantuml.changes 2021-06-29 22:44:16.890954554 +0200 @@ -1,0 +2,6 @@ +Tue Jun 29 08:58:05 UTC 2021 - Linnaea Lavia <obs(a)lavia.moe> + +- Version update to 0.21, drops python2 + * py3-for-tests.patch: refreshed + +------------------------------------------------------------------- Old: ---- sphinxcontrib-plantuml-0.18.tar.gz New: ---- sphinxcontrib-plantuml-0.21.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-sphinxcontrib-plantuml.spec ++++++ --- /var/tmp/diff_new_pack.ol2J3m/_old 2021-06-29 22:44:17.302955098 +0200 +++ /var/tmp/diff_new_pack.ol2J3m/_new 2021-06-29 22:44:17.302955098 +0200 @@ -16,9 +16,11 @@ # -%{?!python_module:%define python_module() python-%{**} python3-%{**}} +%define skip_python2 1 +%{?!python_module:%define python_module() python3-%{**}} + Name: python-sphinxcontrib-plantuml -Version: 0.18 +Version: 0.21 Release: 0 Summary: Sphinx API for Web Apps License: BSD-2-Clause @@ -26,9 +28,8 @@ URL: https://github.com/sphinx-contrib/plantuml/ Source: https://github.com/sphinx-contrib/plantuml/archive/%{version}.tar.gz#/sphin… Patch0: py3-for-tests.patch -BuildRequires: %{python_module Sphinx >= 1.1} +BuildRequires: %{python_module Sphinx >= 2} BuildRequires: %{python_module Sphinx-latex} -BuildRequires: %{python_module nose} BuildRequires: %{python_module pytest} BuildRequires: %{python_module setuptools} BuildRequires: fdupes @@ -37,7 +38,7 @@ BuildRequires: texlive-epstopdf BuildRequires: tox Requires: plantuml -Requires: python-Sphinx >= 1.1 +Requires: python-Sphinx >= 2 BuildArch: noarch %python_subpackages ++++++ py3-for-tests.patch ++++++ --- /var/tmp/diff_new_pack.ol2J3m/_old 2021-06-29 22:44:17.326955129 +0200 +++ /var/tmp/diff_new_pack.ol2J3m/_new 2021-06-29 22:44:17.326955129 +0200 @@ -2,13 +2,8 @@ =================================================================== --- plantuml-0.18.orig/tests/fakecmd.py +++ plantuml-0.18/tests/fakecmd.py -@@ -1,7 +1,7 @@ +@@ -1,3 +1,3 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 import sys - # embed as PostScript comment --print '%', ' '.join(sys.argv) -+print('%', ' '.join(sys.argv)) - for line in sys.stdin: - sys.stdout.write('% ' + line) ++++++ sphinxcontrib-plantuml-0.18.tar.gz -> sphinxcontrib-plantuml-0.21.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/plantuml-0.18/Makefile new/plantuml-0.21/Makefile --- old/plantuml-0.18/Makefile 2020-01-01 02:34:22.000000000 +0100 +++ new/plantuml-0.21/Makefile 2021-05-11 12:04:36.000000000 +0200 @@ -1,9 +1,10 @@ -PYTHON = python +FAKEROOT = fakeroot +PYTHON = python3 TWINE = twine .PHONY: dist dist: - $(PYTHON) setup.py sdist + $(FAKEROOT) $(PYTHON) setup.py sdist .PHONY: upload upload: dist @@ -11,7 +12,7 @@ .PHONY: check check: - $(PYTHON) `which nosetests` + $(PYTHON) -m pytest .PHONY: clean clean: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/plantuml-0.18/README.rst new/plantuml-0.21/README.rst --- old/plantuml-0.18/README.rst 2020-01-01 02:34:22.000000000 +0100 +++ new/plantuml-0.21/README.rst 2021-05-11 12:04:36.000000000 +0200 @@ -1,36 +1,49 @@ PlantUML for Sphinx =================== +Installation +------------ + +.. code-block:: + + pip install sphinxcontrib-plantuml + Usage ----- -Once you enable this extension, -:: +Add ``sphinxcontrib.plantuml`` to your extensions list in your ``conf.py``: + + +.. code-block:: python - # Add any Sphinx extension module names here, as strings. They can be extensions - # coming with Sphinx (named 'sphinx.ext.*') or your custom ones. - extensions = ['sphinxcontrib.plantuml'] + extensions = [ + 'sphinxcontrib.plantuml', + ] -you may need to specify plantuml command in your conf.py:: +You may also need to specify the plantuml command in your **conf.py**: - plantuml = 'java -jar /path/to/plantuml.jar' +.. code-block:: python -Instead, you can install a wrapper script in your PATH:: + plantuml = 'java -jar /path/to/plantuml.jar' - % cat <<EOT > /usr/local/bin/plantuml - #!/bin/sh -e - java -jar /path/to/plantuml.jar "$@" - EOT - % chmod +x /usr/local/bin/plantuml +Instead, you can install a wrapper script in your PATH: -Then, write PlantUML text under ``.. uml::`` directive:: +.. code-block:: console + + % cat <<EOT > /usr/local/bin/plantuml + #!/bin/sh -e + java -jar /path/to/plantuml.jar "$@" + EOT + % chmod +x /usr/local/bin/plantuml + +Then, write PlantUML text under the ``.. uml::`` directive:: .. uml:: Alice -> Bob: Hi! Alice <- Bob: How are you? -or specify path to external PlantUML file:: +or specify path to an external PlantUML file:: .. uml:: external.uml @@ -42,7 +55,7 @@ Foo <|-- Bar -You can specify a caption:: +You can also specify a caption:: .. uml:: :caption: Caption with **bold** and *italic* @@ -92,3 +105,16 @@ plantuml_syntax_error_image Should plantuml generate images with render errors. (default: False) + +plantuml_cache_path + Directory where image cache is stored. (default: '_plantuml') + +plantuml_batch_size + **(EXPERIMENTAL)** + Run plantuml command per the specified number of images. (default: 1) + + If enabled, plantuml documents will be first written to the cache directory, + and rendered in batches. This eliminates bootstrapping overhead of Java + runtime and allows plantuml to leverage multiple CPU cores. + + To enable batch rendering, set the size to 100-1000. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/plantuml-0.18/setup.py new/plantuml-0.21/setup.py --- old/plantuml-0.18/setup.py 2020-01-01 02:34:22.000000000 +0100 +++ new/plantuml-0.21/setup.py 2021-05-11 12:04:36.000000000 +0200 @@ -4,11 +4,11 @@ long_desc = open('README.rst').read() -requires = ['Sphinx>=1.1'] +requires = ['Sphinx>=1.6'] setup( name='sphinxcontrib-plantuml', - version='0.18', + version='0.21', url='https://github.com/sphinx-contrib/plantuml/', download_url='https://pypi.python.org/pypi/sphinxcontrib-plantuml', license='BSD', diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/plantuml-0.18/sphinxcontrib/plantuml.py new/plantuml-0.21/sphinxcontrib/plantuml.py --- old/plantuml-0.18/sphinxcontrib/plantuml.py 2020-01-01 02:34:22.000000000 +0100 +++ new/plantuml-0.21/sphinxcontrib/plantuml.py 2021-05-11 12:04:36.000000000 +0200 @@ -15,17 +15,23 @@ import os import re import shlex +import shutil import subprocess from contextlib import contextmanager from docutils import nodes from docutils.parsers.rst import directives from docutils.parsers.rst import Directive + +from sphinx import util from sphinx.errors import SphinxError +from sphinx.util import ( + i18n, + logging, +) from sphinx.util.nodes import set_source_info from sphinx.util.osutil import ( ensuredir, - ENOENT, ) try: @@ -33,20 +39,21 @@ except ImportError: Image = None -try: - from sphinx.util.i18n import search_image_for_language -except ImportError: # Sphinx < 1.4 - def search_image_for_language(filename, env): - return filename -try: - from sphinx.util import logging - logger = logging.getLogger(__name__) - def _warn(self, msg): - logger.warning(msg) -except (AttributeError, ImportError): # Sphinx < 1.6 - def _warn(self, msg): - self.builder.warn(msg) +logger = logging.getLogger(__name__) + + +if os.name == 'nt': + def rename(src, dst): + try: + os.rename(src, dst) + except OSError as err: + if err.errno != errno.EEXIST: + raise + os.unlink(dst) + os.rename(src, dst) +else: + rename = os.rename class PlantUmlError(SphinxError): @@ -105,7 +112,7 @@ return [warning('uml directive cannot have both content and ' 'a filename argument', line=self.lineno)] if self.arguments: - fn = search_image_for_language(self.arguments[0], env) + fn = i18n.search_image_for_language(self.arguments[0], env) relfn, absfn = env.relfn2path(fn) env.note_dependency(relfn) try: @@ -152,13 +159,17 @@ fp.close() -def generate_name(self, node, fileformat): +def hash_plantuml_node(node): h = hashlib.sha1() # may include different file relative to doc h.update(node['incdir'].encode('utf-8')) h.update(b'\0') h.update(node['uml'].encode('utf-8')) - key = h.hexdigest() + return h.hexdigest() + + +def generate_name(self, node, fileformat): + key = hash_plantuml_node(node) fname = 'plantuml-%s.%s' % (key, fileformat) imgpath = getattr(self.builder, 'imgpath', None) if imgpath: @@ -203,30 +214,12 @@ refname, outfname = generate_name(self, node, fileformat) if os.path.exists(outfname): return refname, outfname # don't regenerate - absincdir = os.path.join(self.builder.srcdir, node['incdir']) + + cachefname = self.builder.plantuml_builder.render(node, fileformat) ensuredir(os.path.dirname(outfname)) - f = open(outfname, 'wb') - try: - try: - p = subprocess.Popen(generate_plantuml_args(self, node, - fileformat), - stdout=f, stdin=subprocess.PIPE, - stderr=subprocess.PIPE, - cwd=absincdir) - except OSError as err: - if err.errno != ENOENT: - raise - raise PlantUmlError('plantuml command %r cannot be run' - % self.builder.config.plantuml) - serr = p.communicate(node['uml'].encode('utf-8'))[1] - if p.returncode != 0: - if self.builder.config.plantuml_syntax_error_image: - _warn(self, 'error while running plantuml\n\n%s' % serr) - else: - raise PlantUmlError('error while running plantuml\n\n%s' % serr) - return refname, outfname - finally: - f.close() + # TODO: optionally do symlink/link + shutil.copyfile(cachefname, outfname) + return refname, outfname def render_plantuml_inline(self, node, fileformat): @@ -238,7 +231,7 @@ stderr=subprocess.PIPE, cwd=absincdir) except OSError as err: - if err.errno != ENOENT: + if err.errno != errno.ENOENT: raise raise PlantUmlError('plantuml command %r cannot be run' % self.builder.config.plantuml) @@ -248,6 +241,135 @@ return sout.decode('utf-8') +class PlantumlBuilder(object): + def __init__(self, builder): + # for compatibility with existing functions which expect self.builder + # TODO: remove self.builder + self.builder = builder + + self.batch_size = builder.config.plantuml_batch_size + self.cache_dir = os.path.join(builder.outdir, + builder.config.plantuml_cache_path) + + self._base_cmdargs = _split_cmdargs(builder.config.plantuml) + self._base_cmdargs.extend(['-charset', 'utf-8']) + + self.image_formats = [] + if builder.format == 'html': + fmt = builder.config.plantuml_output_format + if fmt != 'none': + fileformats, _gettag = _lookup_html_format(fmt) + self.image_formats = list(fileformats) + elif builder.format == 'latex': + fmt = builder.config.plantuml_latex_output_format + if fmt != 'none': + fileformat, _postproc = _lookup_latex_format(fmt) + self.image_formats = [fileformat] + + self._known_keys = set() + self._pending_keys = [] + + def collect_nodes(self, doctree): + for node in doctree.traverse(plantuml): + key = hash_plantuml_node(node) + if key in self._known_keys: + continue + self._known_keys.add(key) + + doc = node['uml'].encode('utf-8') + if b'!include' in doc or b'%filename' in doc: + # Heuristic to work around the path/filename issue. There's no + # easy way to specify the cwd of the doc without using -pipe. + continue + + outdir = os.path.join(self.cache_dir, key[:2]) + outfbase = os.path.join(outdir, key) + if all(os.path.exists('%s.%s' % (outfbase, sfx)) + for sfx in ['puml'] + self.image_formats): + continue + + ensuredir(outdir) + with open(outfbase + '.puml', 'wb') as f: + # @startuml/enduml is mandatory in non-pipe mode. For backward + # compatibility, we do wrap the document only if @startXYZ is + # not specified. + started = doc.lstrip().startswith(b'@start') + if not started: + f.write(b'@startuml\n') + f.write(doc) + if not started: + f.write(b'\n@enduml\n') + + self._pending_keys.append(key) + + def render_batches(self): + pending_keys = sorted(self._pending_keys) + for fileformat in self.image_formats: + for i in range(0, len(pending_keys), self.batch_size): + keys = pending_keys[i:i + self.batch_size] + with util.progress_message( + 'rendering plantuml diagrams [%d..%d/%d]' + % (i, i + len(keys), len(pending_keys))): + self._render_files(keys, fileformat) + + del self._pending_keys[:] + + def _render_files(self, keys, fileformat): + cmdargs = self._base_cmdargs[:] + cmdargs.extend(_ARGS_BY_FILEFORMAT[fileformat]) + cmdargs.extend(os.path.join(k[:2], '%s.puml' % k) for k in keys) + try: + p = subprocess.Popen(cmdargs, stderr=subprocess.PIPE, + cwd=self.cache_dir) + except OSError as err: + if err.errno != errno.ENOENT: + raise + raise PlantUmlError('plantuml command %r cannot be run' + % self.builder.config.plantuml) + serr = p.communicate()[1] + if p.returncode != 0: + if self.builder.config.plantuml_syntax_error_image: + logger.warning('error while running plantuml\n\n%s' % serr) + else: + raise PlantUmlError('error while running plantuml\n\n%s' % serr) + + def render(self, node, fileformat): + key = hash_plantuml_node(node) + outdir = os.path.join(self.cache_dir, key[:2]) + outfname = os.path.join(outdir, '%s.%s' % (key, fileformat)) + if os.path.exists(outfname): + return outfname + + ensuredir(outdir) + absincdir = os.path.join(self.builder.srcdir, node['incdir']) + with open(outfname + '.new', 'wb') as f: + try: + p = subprocess.Popen(generate_plantuml_args(self, node, + fileformat), + stdout=f, stdin=subprocess.PIPE, + stderr=subprocess.PIPE, + cwd=absincdir) + except OSError as err: + if err.errno != errno.ENOENT: + raise + raise PlantUmlError('plantuml command %r cannot be run' + % self.builder.config.plantuml) + serr = p.communicate(node['uml'].encode('utf-8'))[1] + if p.returncode != 0: + if self.builder.config.plantuml_syntax_error_image: + logger.warning('error while running plantuml\n\n%s' % serr) + else: + raise PlantUmlError('error while running plantuml\n\n%s' + % serr) + + rename(outfname + '.new', outfname) + return outfname + + +def _render_batches_on_vist(self): + self.builder.plantuml_builder.render_batches() + + def _get_png_tag(self, fnames, node): refname, outfname = fnames['png'] alt = node.get('alt', node['uml']) @@ -256,9 +378,9 @@ # process images prior to html_vist. scale_attrs = [k for k in ('scale', 'width', 'height') if k in node] if scale_attrs and Image is None: - _warn(self, ('plantuml: unsupported scaling attributes: %s ' - '(install PIL or Pillow)' - % ', '.join(scale_attrs))) + logger.warning(('plantuml: unsupported scaling attributes: %s ' + '(install PIL or Pillow)' + % ', '.join(scale_attrs))) if not scale_attrs or Image is None: return ('<img src="%s" alt="%s"/>\n' % (self.encode(refname), self.encode(alt))) @@ -289,7 +411,7 @@ styles.extend('%s: %s%s' % (a, w * scale / 100, 'px') for a, w in zip(['width', 'height'], im.size)) except (IOError, OSError) as err: - _warn(self, 'plantuml: failed to get image size: %s' % err) + logger.warning('plantuml: failed to get image size: %s' % err) return ('<a href="%s"><img src="%s" alt="%s" style="%s"/>' '</a>\n' @@ -352,27 +474,29 @@ } +def _lookup_html_format(fmt): + try: + return _KNOWN_HTML_FORMATS[fmt] + except KeyError: + raise PlantUmlError( + 'plantuml_output_format must be one of %s, but is %r' + % (', '.join(map(repr, _KNOWN_HTML_FORMATS)), fmt)) + + @contextmanager def _prepare_html_render(self, fmt): if fmt == 'none': raise nodes.SkipNode try: - try: - fileformats, gettag = _KNOWN_HTML_FORMATS[fmt] - except KeyError: - raise PlantUmlError( - 'plantuml_output_format must be one of %s, but is %r' - % (', '.join(map(repr, _KNOWN_HTML_FORMATS)), fmt)) - - yield fileformats, gettag - + yield _lookup_html_format(fmt) except PlantUmlError as err: - _warn(self, str(err)) + logger.warning(str(err)) raise nodes.SkipNode def html_visit_plantuml(self, node): + _render_batches_on_vist(self) if 'html_format' in node: fmt = node['html_format'] else: @@ -403,13 +527,13 @@ p = subprocess.Popen(['bash'] + args, stdout=subprocess.PIPE, stderr=subprocess.PIPE) except OSError as err: - if err.errno != ENOENT: + if err.errno != errno.ENOENT: raise raise PlantUmlError('epstopdf command %r cannot be run' % self.builder.config.plantuml_epstopdf) serr = p.communicate()[1] if p.returncode != 0: - raise PlantUmlError('error while running epstopdf\n\n' + serr) + raise PlantUmlError('error while running epstopdf\n\n%s' % serr) return refname[:-4] + '.pdf', fname[:-4] + '.pdf' @@ -420,7 +544,17 @@ } +def _lookup_latex_format(fmt): + try: + return _KNOWN_LATEX_FORMATS[fmt] + except KeyError: + raise PlantUmlError( + 'plantuml_latex_output_format must be one of %s, but is %r' + % (', '.join(map(repr, _KNOWN_LATEX_FORMATS)), fmt)) + + def latex_visit_plantuml(self, node): + _render_batches_on_vist(self) if 'latex_format' in node: fmt = node['latex_format'] else: @@ -428,16 +562,11 @@ if fmt == 'none': raise nodes.SkipNode try: - try: - fileformat, postproc = _KNOWN_LATEX_FORMATS[fmt] - except KeyError: - raise PlantUmlError( - 'plantuml_latex_output_format must be one of %s, but is %r' - % (', '.join(map(repr, _KNOWN_LATEX_FORMATS)), fmt)) + fileformat, postproc = _lookup_latex_format(fmt) refname, outfname = render_plantuml(self, node, fileformat) refname, outfname = postproc(self, refname, outfname) except PlantUmlError as err: - _warn(self, str(err)) + logger.warning(str(err)) raise nodes.SkipNode # put node representing rendered image @@ -453,34 +582,27 @@ def confluence_visit_plantuml(self, node): + _render_batches_on_vist(self) fmt = self.builder.config.plantuml_output_format with _prepare_html_render(self, fmt) as (fileformats, _): _, outfname = render_plantuml(self, node, fileformats[0]) - # Create a new image node in the document - img_node = nodes.image(uri=outfname, **node.attributes) - img_node.delattr('uml') - img_node.document = node.document - img_node.parent = node.parent - node.parent.children.insert(node.parent.children.index(node), img_node) - if not img_node.hasattr('alt'): - img_node['alt'] = node['uml'] + # put node representing rendered image + img_node = nodes.image(uri=outfname, alt=node.get('alt', node['uml'])) + node.replace_self(img_node) + self.visit_image(img_node) - # Confluence builder needs to be aware of the new asset - from sphinxcontrib.confluencebuilder import ConfluenceLogger - ConfluenceLogger.info('re-scanning for assets... ', nonl=0) - self.assets.process(list(self.assets.env.all_docs.keys())) - ConfluenceLogger.info('done\n') - # Handle the new node as a regular image - return self.visit_image(img_node) +def confluence_depart_plantuml(self, node): + pass def text_visit_plantuml(self, node): + _render_batches_on_vist(self) try: text = render_plantuml_inline(self, node, 'txt') except PlantUmlError as err: - _warn(self, str(err)) + logger.warning(str(err)) text = node['uml'] # fall back to uml text, which is still readable self.new_state() @@ -490,18 +612,19 @@ def pdf_visit_plantuml(self, node): + _render_batches_on_vist(self) try: refname, outfname = render_plantuml(self, node, 'eps') refname, outfname = _convert_eps_to_pdf(self, refname, outfname) except PlantUmlError as err: - _warn(self, str(err)) + logger.warning(str(err)) raise nodes.SkipNode rep = nodes.image(uri=outfname, alt=node.get('alt', node['uml'])) node.parent.replace(node, rep) def unsupported_visit_plantuml(self, node): - _warn(self, 'plantuml: unsupported output format (node skipped)') + logger.warning('plantuml: unsupported output format (node skipped)') raise nodes.SkipNode @@ -511,10 +634,30 @@ 'man': (unsupported_visit_plantuml, None), # TODO 'texinfo': (unsupported_visit_plantuml, None), # TODO 'text': (text_visit_plantuml, None), - 'confluence': (confluence_visit_plantuml, None), + 'confluence': (confluence_visit_plantuml, confluence_depart_plantuml), + 'singleconfluence': (confluence_visit_plantuml, confluence_depart_plantuml), } +def _on_builder_inited(app): + app.builder.plantuml_builder = PlantumlBuilder(app.builder) + + +def _on_doctree_read(app, doctree): + # Collect as many static nodes as possible prior to start building. + if app.builder.plantuml_builder.batch_size > 1: + app.builder.plantuml_builder.collect_nodes(doctree) + + +def _on_doctree_resolved(app, doctree, docname): + # Dynamically generated nodes will be collected here, which will be + # batched at node visitor. Since 'doctree-resolved' and node visits + # can be intermixed, there's no way to batch rendering of dynamic nodes + # at once. + if app.builder.plantuml_builder.batch_size > 1: + app.builder.plantuml_builder.collect_nodes(doctree) + + def setup(app): app.add_node(plantuml, **_NODE_VISITORS) app.add_directive('uml', UmlDirective) @@ -528,6 +671,11 @@ app.add_config_value('plantuml_epstopdf', 'epstopdf', '') app.add_config_value('plantuml_latex_output_format', 'png', '') app.add_config_value('plantuml_syntax_error_image', False, '') + app.add_config_value('plantuml_cache_path', '_plantuml', '') + app.add_config_value('plantuml_batch_size', 1, '') + app.connect('builder-inited', _on_builder_inited) + app.connect('doctree-read', _on_doctree_read) + app.connect('doctree-resolved', _on_doctree_resolved) # imitate what app.add_node() does if 'rst2pdf.pdfbuilder' in app.config.extensions: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/plantuml-0.18/tests/fakecmd.py new/plantuml-0.21/tests/fakecmd.py --- old/plantuml-0.18/tests/fakecmd.py 2020-01-01 02:34:22.000000000 +0100 +++ new/plantuml-0.21/tests/fakecmd.py 2021-05-11 12:04:36.000000000 +0200 @@ -1,7 +1,18 @@ #!/usr/bin/env python import sys -# embed as PostScript comment -print '%', ' '.join(sys.argv) -for line in sys.stdin: - sys.stdout.write('% ' + line) +def dump(fout, fin): + # embed as PostScript comment + fout.write('% ' + ' '.join(sys.argv) + '\n') + for line in fin: + fout.write('% ' + line) + +if '-pipe' in sys.argv: + dump(sys.stdout, sys.stdin) +else: + for fname in sys.argv[1:]: + if not fname.endswith('.puml'): + continue + with open(fname[:-5] + '.png', 'w') as fout: + with open(fname, 'r') as fin: + dump(fout, fin) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/plantuml-0.18/tests/fixture/hello.puml new/plantuml-0.21/tests/fixture/hello.puml --- old/plantuml-0.18/tests/fixture/hello.puml 1970-01-01 01:00:00.000000000 +0100 +++ new/plantuml-0.21/tests/fixture/hello.puml 2021-05-11 12:04:36.000000000 +0200 @@ -0,0 +1,3 @@ +@startuml +Hello +@enduml diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/plantuml-0.18/tests/test_functional.py new/plantuml-0.21/tests/test_functional.py --- old/plantuml-0.18/tests/test_functional.py 2020-01-01 02:34:22.000000000 +0100 +++ new/plantuml-0.21/tests/test_functional.py 2021-05-11 12:04:36.000000000 +0200 @@ -1,18 +1,15 @@ import glob -import nose import os import re import tempfile import shutil import sys +import unittest from sphinx.application import Sphinx -from nose.tools import * - _fixturedir = os.path.join(os.path.dirname(__file__), 'fixture') _fakecmd = os.path.join(os.path.dirname(__file__), 'fakecmd.py') -_fakeepstopdf = os.path.join(os.path.dirname(__file__), 'fakeepstopdf.py') def setup(): global _tempdir, _srcdir, _outdir @@ -42,7 +39,7 @@ app.build() def with_runsphinx(builder, **kwargs): - confoverrides = {'plantuml': _fakecmd} + confoverrides = {'plantuml': [sys.executable, _fakecmd]} confoverrides.update(kwargs) def wrapfunc(func): def test(): @@ -51,7 +48,7 @@ import rst2pdf rst2pdf.__file__ except ImportError: - raise nose.SkipTest + raise unittest.SkipTest src = '\n'.join(l[4:] for l in func.__doc__.splitlines()[2:]) os.mkdir(_outdir) try: @@ -82,10 +79,10 @@ pngcontent = readfile(pngfiles[0]).splitlines() assert b'-pipe' in pngcontent[0] - assert_equals(b'Hello', pngcontent[1][2:]) + assert pngcontent[1][2:] == b'Hello' svgcontent = readfile(svgfiles[0]).splitlines() assert b'-tsvg' in svgcontent[0] - assert_equals(b'Hello', svgcontent[1][2:]) + assert svgcontent[1][2:] == b'Hello' @with_runsphinx('html', plantuml_output_format='none') def test_buildhtml_no_output(): @@ -148,7 +145,7 @@ Hello """ - assert b'<div class="figure" id="label">' in readfile('index.html') + re.search(br'<div class="figure[^"]*" id="label">', readfile('index.html')) @with_runsphinx('html') def test_buildhtml_nonascii(): @@ -161,7 +158,47 @@ files = glob.glob(os.path.join(_outdir, '_images', 'plantuml-*.png')) content = readfile(files[0]).splitlines() assert b'-charset utf-8' in content[0] - assert_equals(u'\u3042', content[1][2:].decode('utf-8')) + assert content[1][2:].decode('utf-8') == u'\u3042' + +@with_runsphinx('html', plantuml_batch_size=2) +def test_buildhtml_in_batches(): + """Render in batches + + .. uml:: + + Hello + + .. uml:: + + Hello! + + .. uml:: + + @startuml + Hello!! + @enduml + + .. uml:: + + !include seq.ja.uml + """ + puml_files = glob.glob(os.path.join(_outdir, '_plantuml', '*', '*.puml')) + assert len(puml_files) == 3 + puml_contents = [readfile(f).splitlines() for f in puml_files] + assert all(len(lines) == 3 for lines in puml_contents) + assert all(lines[0] == b'@startuml' for lines in puml_contents) + assert all(lines[-1] == b'@enduml' for lines in puml_contents) + assert (sorted(lines[1] for lines in puml_contents) + == [b'Hello', b'Hello!', b'Hello!!']) + + # batches: [2, 1], excluded: 1 + png_files = glob.glob(os.path.join(_outdir, '_plantuml', '*', '*.png')) + assert len(png_files) == 4 + png_commands = [readfile(f).splitlines()[0] for f in png_files] + assert len(set(png_commands)) == 3 + assert sum(b'-pipe' in cmd for cmd in set(png_commands)) == 1 + assert sorted(sum(c.endswith(b'.puml') for c in cmd.split()) + for cmd in set(png_commands)) == [0, 1, 2] @with_runsphinx('latex') def test_buildlatex_simple(): @@ -178,7 +215,7 @@ content = readfile(files[0]).splitlines() assert b'-pipe' in content[0] - assert_equals(b'Hello', content[1][2:]) + assert content[1][2:] == b'Hello' @with_runsphinx('latex', plantuml_latex_output_format='eps') def test_buildlatex_simple_with_eps(): @@ -195,7 +232,7 @@ content = readfile(files[0]).splitlines() assert b'-teps' in content[0] - assert_equals(b'Hello', content[1][2:]) + assert content[1][2:] == b'Hello' @with_runsphinx('latex', plantuml_latex_output_format='pdf') def test_buildlatex_simple_with_pdf(): @@ -214,7 +251,7 @@ epscontent = readfile(epsfiles[0]).splitlines() assert b'-teps' in epscontent[0] - assert_equals(b'Hello', epscontent[1][2:]) + assert epscontent[1][2:] == b'Hello' @with_runsphinx('latex', plantuml_latex_output_format='none') def test_buildlatex_no_output(): @@ -269,4 +306,4 @@ epscontent = readfile(epsfiles[0]).splitlines() assert b'-teps' in epscontent[0] - assert_equals(b'Hello', epscontent[1][2:]) + assert epscontent[1][2:] == b'Hello' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/plantuml-0.18/tests/test_svgstyle.py new/plantuml-0.21/tests/test_svgstyle.py --- old/plantuml-0.18/tests/test_svgstyle.py 2020-01-01 02:34:22.000000000 +0100 +++ new/plantuml-0.21/tests/test_svgstyle.py 2021-05-11 12:04:36.000000000 +0200 @@ -2,8 +2,6 @@ import shutil import tempfile -from nose.tools import * - from sphinxcontrib import plantuml def setup(): @@ -28,4 +26,4 @@ '<svg xmlns="http://www.w3.org/2000/svg" height="147pt" ' 'style="width:115px;height:147px;" version="1.1" viewBox="0 0 115 147" ' 'width="115pt"><defs/>') - assert_equals('width:115px;height:147px;', plantuml._get_svg_style(fname)) + assert plantuml._get_svg_style(fname) == 'width:115px;height:147px;' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/plantuml-0.18/tox.ini new/plantuml-0.21/tox.ini --- old/plantuml-0.18/tox.ini 2020-01-01 02:34:22.000000000 +0100 +++ new/plantuml-0.21/tox.ini 2021-05-11 12:04:36.000000000 +0200 @@ -3,6 +3,6 @@ [testenv] deps = - nose + pytest rst2pdf -commands = nosetests +commands = pytest

1 0

commit sbcl for openSUSE:Factory
by Source-Sync 29 Jun '21

29 Jun '21

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package sbcl for openSUSE:Factory checked in at 2021-06-29 22:43:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/sbcl (Old) and /work/SRC/openSUSE:Factory/.sbcl.new.2625 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "sbcl" Tue Jun 29 22:43:33 2021 rev:68 rq:903057 version:2.1.6 Changes: -------- --- /work/SRC/openSUSE:Factory/sbcl/sbcl.changes 2021-06-01 10:41:02.241178299 +0200 +++ /work/SRC/openSUSE:Factory/.sbcl.new.2625/sbcl.changes 2021-06-29 22:44:15.566952806 +0200 @@ -1,0 +2,23 @@ +Tue Jun 29 08:44:12 UTC 2021 - John Paul Adrian Glaubitz <adrian.glaubitz(a)suse.com> + +- Update to version 2.1.6 + * minor incompatible change: COMPILE-FILE does not merge the input file's + pathname-directory into the output path if :OUTPUT-FILE was specified + and has a directory that is not :UNSPECIFIC. + * platform support: + ** improvements to unwind code generation on arm64. + ** on x86-64, accept three operands for vshufpd. (reported by Bela + Pecsek) + ** on x86-64, improvements to use of popcount + ** improve exception handling on 64-bit Windows. (thanks to Luis Borges + de Oliveira) + * bug fix: allow use of macros with improper argument list. (lp#1929623, + thanks to Sean Maher) + * bug fix: COERCE no longer attempts to guess what the user meant if they + provide a type specifier of a union of types other than STRING. + (lp#1929614) + * bug fix: print a single trailing zero after the decimal point for FORMAT + ~E if there are no digits remaining to be printed and the width allows it. + (lp#883520) + +------------------------------------------------------------------- Old: ---- sbcl-2.1.5-source.tar.bz2 New: ---- sbcl-2.1.6-source.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sbcl.spec ++++++ --- /var/tmp/diff_new_pack.ohfYnd/_old 2021-06-29 22:44:16.686954285 +0200 +++ /var/tmp/diff_new_pack.ohfYnd/_new 2021-06-29 22:44:16.690954290 +0200 @@ -21,7 +21,7 @@ Name: sbcl #!BuildIgnore: gcc-PIE -Version: 2.1.5 +Version: 2.1.6 Release: 0 Summary: Steel Bank Common Lisp License: BSD-3-Clause AND SUSE-Public-Domain ++++++ sbcl-2.1.5-source.tar.bz2 -> sbcl-2.1.6-source.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/sbcl/sbcl-2.1.5-source.tar.bz2 /work/SRC/openSUSE:Factory/.sbcl.new.2625/sbcl-2.1.6-source.tar.bz2 differ: char 11, line 1

1 0

commit cockpit-machines for openSUSE:Factory
by Source-Sync 29 Jun '21

29 Jun '21

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package cockpit-machines for openSUSE:Factory checked in at 2021-06-29 22:43:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cockpit-machines (Old) and /work/SRC/openSUSE:Factory/.cockpit-machines.new.2625 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "cockpit-machines" Tue Jun 29 22:43:33 2021 rev:2 rq:903045 version:243.1 Changes: -------- --- /work/SRC/openSUSE:Factory/cockpit-machines/cockpit-machines.changes 2021-05-11 23:03:40.741089429 +0200 +++ /work/SRC/openSUSE:Factory/.cockpit-machines.new.2625/cockpit-machines.changes 2021-06-29 22:44:13.450950013 +0200 @@ -1,0 +2,5 @@ +Sun Jun 27 15:30:19 UTC 2021 - ecsos <ecsos(a)opensuse.org> + +- Add source-offest to _service to fix build error in Leap 15.3. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cockpit-machines.spec ++++++ --- /var/tmp/diff_new_pack.fPOarg/_old 2021-06-29 22:44:15.042952115 +0200 +++ /var/tmp/diff_new_pack.fPOarg/_new 2021-06-29 22:44:15.046952120 +0200 @@ -20,7 +20,7 @@ Version: 243.1 Release: 0 Summary: Cockpit user interface for virtual machines -License: LGPL-2.1-or-later and MIT +License: LGPL-2.1-or-later AND MIT URL: https://github.com/cockpit-project/cockpit-machines Source: cockpit-machines-%{version}.tar Source10: package-lock.json ++++++ _service ++++++ --- /var/tmp/diff_new_pack.fPOarg/_old 2021-06-29 22:44:15.074952157 +0200 +++ /var/tmp/diff_new_pack.fPOarg/_new 2021-06-29 22:44:15.074952157 +0200 @@ -8,6 +8,7 @@ <service name="node_modules" mode="manual"> <param name="cpio">node_modules.obscpio</param> <param name="output">node_modules.spec.inc</param> + <param name="source-offset">10000</param> </service> <service mode="buildtime" name="tar"> <param name="obsinfo">cockpit-machines.obsinfo</param> ++++++ cockpit-machines-243.1.obscpio ++++++ ++++++ node_modules.obscpio ++++++ /work/SRC/openSUSE:Factory/cockpit-machines/node_modules.obscpio /work/SRC/openSUSE:Factory/.cockpit-machines.new.2625/node_modules.obscpio differ: char 27, line 1 ++++++ node_modules.spec.inc ++++++ ++++ 2433 lines (skipped) ++++ between /work/SRC/openSUSE:Factory/cockpit-machines/node_modules.spec.inc ++++ and /work/SRC/openSUSE:Factory/.cockpit-machines.new.2625/node_modules.spec.inc

1 0

commit csound for openSUSE:Factory
by Source-Sync 29 Jun '21

29 Jun '21

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package csound for openSUSE:Factory checked in at 2021-06-29 22:43:32 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/csound (Old) and /work/SRC/openSUSE:Factory/.csound.new.2625 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "csound" Tue Jun 29 22:43:32 2021 rev:33 rq:903054 version:6.16.0 Changes: -------- --- /work/SRC/openSUSE:Factory/csound/csound.changes 2021-06-13 23:06:24.751697801 +0200 +++ /work/SRC/openSUSE:Factory/.csound.new.2625/csound.changes 2021-06-29 22:44:12.618948916 +0200 @@ -1,0 +2,7 @@ +Tue Jun 29 01:50:28 UTC 2021 - Konstantin Voinov <kv(a)kott.no-ip.biz> + +- Update to version 6.16.0 +- add python3-csound package +- update csound-rename-sndinfo.patch + +------------------------------------------------------------------- Old: ---- csound-6.15.0.tar.gz New: ---- csound-6.16.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ csound.spec ++++++ --- /var/tmp/diff_new_pack.5sk1TV/_old 2021-06-29 22:44:13.206949692 +0200 +++ /var/tmp/diff_new_pack.5sk1TV/_new 2021-06-29 22:44:13.210949697 +0200 @@ -30,7 +30,7 @@ %define min 0 Name: csound -Version: 6.15.0 +Version: 6.16.0 Release: 0 Summary: Computer Sound Synthesis and Composition Program License: GPL-2.0-or-later AND LGPL-2.1-or-later @@ -120,6 +120,13 @@ %description plugins Plugins for csound +%package -n python3-csound +Summary: Csound opcodes for python +Group: Productivity/Multimedia/Other + +%description -n python3-csound +Csound opcodes for python + %package samples Summary: Data files for csound License: MIT @@ -215,6 +222,13 @@ %files samples %{_datadir}/samples/ +%files -n python3-csound +%if 0%{?suse_version} > 1500 +%{python_sitearch}/ctcsound.py +%else +%{_libdir}/python3.6/site-packages/ctcsound.py +%endif + %files devel %{_includedir}/csound/ %{_libdir}/libcs*.so ++++++ csound-6.15.0.tar.gz -> csound-6.16.0.tar.gz ++++++ /work/SRC/openSUSE:Factory/csound/csound-6.15.0.tar.gz /work/SRC/openSUSE:Factory/.csound.new.2625/csound-6.16.0.tar.gz differ: char 13, line 1 ++++++ csound-rename-sndinfo.patch ++++++ --- /var/tmp/diff_new_pack.5sk1TV/_old 2021-06-29 22:44:13.298949813 +0200 +++ /var/tmp/diff_new_pack.5sk1TV/_new 2021-06-29 22:44:13.298949813 +0200 @@ -1,113 +1,11 @@ -Index: csound-6.14.0/util/CMakeLists.txt -=================================================================== ---- csound-6.14.0.orig/util/CMakeLists.txt 2020-06-02 12:05:59.179933351 +0200 -+++ csound-6.14.0/util/CMakeLists.txt 2020-06-02 12:11:39.845373490 +0200 -@@ -1,54 +1,54 @@ --# UTILITY PLUGIN AND PROGRAMS -- --set(stdutil_SRCS -- atsa.c cvanal.c dnoise.c envext.c -- het_export.c het_import.c hetro.c lpanal.c -- lpc_export.c lpc_import.c mixer.c pvanal.c -- pv_export.c pv_import.c pvlook.c scale.c -- sndinfo.c srconv.c std_util.c xtrct.c -- SDIF/sdif.c) -- --if(MSVC) -- set(LIBSNDFILE_LIBRARY sndfile-static) --endif() -- --make_plugin(stdutil "${stdutil_SRCS}" ${MATH_LIBRARY} ${LIBSNDFILE_LIBRARY} ${LIBSNDFILE_SUPPORT_LIBS}) --add_dependency_to_framework(stdutil ${LIBSNDFILE_LIBRARY}) -- --if(BUILD_UTILITIES) -- make_utility(atsa atsa_main.c) -- make_utility(csanalyze csanalyze.c) -- make_utility(cvanal cvl_main.c) -- make_utility(dnoise dnoise_main.c) -- make_utility(envext env_main.c) -- make_utility(extractor xtrc_main.c) -- make_utility(het_export hetx_main.c) -- make_utility(het_import heti_main.c) -- make_utility(hetro het_main.c) -- make_utility(lpanal lpc_main.c) -- make_utility(lpc_export lpcx_main.c ${MATH_LIBRARY}) -- make_utility(lpc_import lpci_main.c ${MATH_LIBRARY}) -- make_executable(mixer-bin mixer_main.c "${CSOUNDLIB};${MATH_LIBRARY}" mixer) -- make_utility(pvanal pvc_main.c) -- make_utility(pvlook pvl_main.c) -- make_utility(pv_export pvx_main.c) -- make_utility(pv_import pvi_main.c) -- make_utility(scale scale_main.c) +--- csound-6.16.0/util/CMakeLists.txt.orig 2021-06-10 18:27:41.000000000 +1000 ++++ csound-6.16.0/util/CMakeLists.txt 2021-06-29 11:16:01.079617007 +1000 +@@ -34,7 +34,7 @@ + make_utility(pv_export pvx_main.c) + make_utility(pv_import pvi_main.c) + make_utility(scale scale_main.c) - make_utility(sndinfo sndinfo_main.c) -- make_utility(srconv srconv_main.c) -- -- -- #find_library(LIBSNDFILE_LIBRARY sndfile libsndfile-1) -- find_library(LIBSAMPLERATE_LIBRARY NAMES samplerate libsamplerate-0) -- -- if(LIBSNDFILE_LIBRARY AND LIBSAMPLERATE_LIBRARY) -- make_executable(src_conv new_srconv.c "${LIBSNDFILE_LIBRARY};${LIBSAMPLERATE_LIBRARY}") -- if(MSVC) -- target_link_libraries(src_conv ${LIBSNDFILE_SUPPORT_LIBS}) -- endif() -- else() -- message(STATUS "Not building src_conv (libsndfile or libsamplerate not found).") -- endif() -- --endif() --add_subdirectory(SDIF) -+# UTILITY PLUGIN AND PROGRAMS -+ -+set(stdutil_SRCS -+ atsa.c cvanal.c dnoise.c envext.c -+ het_export.c het_import.c hetro.c lpanal.c -+ lpc_export.c lpc_import.c mixer.c pvanal.c -+ pv_export.c pv_import.c pvlook.c scale.c -+ sndinfo.c srconv.c std_util.c xtrct.c -+ SDIF/sdif.c) -+ -+if(MSVC) -+ set(LIBSNDFILE_LIBRARY sndfile-static) -+endif() -+ -+make_plugin(stdutil "${stdutil_SRCS}" ${MATH_LIBRARY} ${LIBSNDFILE_LIBRARY} ${LIBSNDFILE_SUPPORT_LIBS}) -+add_dependency_to_framework(stdutil ${LIBSNDFILE_LIBRARY}) -+ -+if(BUILD_UTILITIES) -+ make_utility(atsa atsa_main.c) -+ make_utility(csanalyze csanalyze.c) -+ make_utility(cvanal cvl_main.c) -+ make_utility(dnoise dnoise_main.c) -+ make_utility(envext env_main.c) -+ make_utility(extractor xtrc_main.c) -+ make_utility(het_export hetx_main.c) -+ make_utility(het_import heti_main.c) -+ make_utility(hetro het_main.c) -+ make_utility(lpanal lpc_main.c) -+ make_utility(lpc_export lpcx_main.c ${MATH_LIBRARY}) -+ make_utility(lpc_import lpci_main.c ${MATH_LIBRARY}) -+ make_executable(mixer-bin mixer_main.c "${CSOUNDLIB};${MATH_LIBRARY}" mixer) -+ make_utility(pvanal pvc_main.c) -+ make_utility(pvlook pvl_main.c) -+ make_utility(pv_export pvx_main.c) -+ make_utility(pv_import pvi_main.c) -+ make_utility(scale scale_main.c) -+ make_utility(csndinfo sndinfo_main.c) -+ make_utility(srconv srconv_main.c) -+ -+ -+ #find_library(LIBSNDFILE_LIBRARY sndfile libsndfile-1) -+ find_library(LIBSAMPLERATE_LIBRARY NAMES samplerate libsamplerate-0) -+ -+ if(LIBSNDFILE_LIBRARY AND LIBSAMPLERATE_LIBRARY) -+ make_executable(src_conv new_srconv.c "${LIBSNDFILE_LIBRARY};${LIBSAMPLERATE_LIBRARY}") -+ if(MSVC) -+ target_link_libraries(src_conv ${LIBSNDFILE_SUPPORT_LIBS}) -+ endif() -+ else() -+ message(STATUS "Not building src_conv (libsndfile or libsamplerate not found).") -+ endif() -+ -+endif() -+add_subdirectory(SDIF) ++ make_utility(csndinfo sndinfo_main.c) + make_utility(srconv srconv_main.c) + +

1 0

commit perl-Data-OptList for openSUSE:Factory
by Source-Sync 29 Jun '21

29 Jun '21

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package perl-Data-OptList for openSUSE:Factory checked in at 2021-06-29 22:43:31 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/perl-Data-OptList (Old) and /work/SRC/openSUSE:Factory/.perl-Data-OptList.new.2625 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "perl-Data-OptList" Tue Jun 29 22:43:31 2021 rev:19 rq:903048 version:0.112 Changes: -------- --- /work/SRC/openSUSE:Factory/perl-Data-OptList/perl-Data-OptList.changes 2016-03-31 13:03:05.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.perl-Data-OptList.new.2625/perl-Data-OptList.changes 2021-06-29 22:44:10.390945975 +0200 @@ -1,0 +2,15 @@ +Sun Jun 27 03:07:03 UTC 2021 - Tina M��ller <timueller+perl(a)suse.de> + +- updated to 0.112 + see /usr/share/doc/packages/perl-Data-OptList/Changes + + 0.112 2021-06-26 11:01:31-04:00 America/New_York + - no changes since last trial release (0.111) + + 0.111 2021-06-20 20:55:10-04:00 America/New_York (TRIAL RELEASE) + - update author contact info + - add perl version support to docs + - replace a "goto" deep in the guts with a sub call, for speed (thanks, + Olivier Mengu�� and Graham Knop) + +------------------------------------------------------------------- Old: ---- Data-OptList-0.110.tar.gz New: ---- Data-OptList-0.112.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-Data-OptList.spec ++++++ --- /var/tmp/diff_new_pack.PYUSoa/_old 2021-06-29 22:44:10.810946529 +0200 +++ /var/tmp/diff_new_pack.PYUSoa/_new 2021-06-29 22:44:10.810946529 +0200 @@ -1,7 +1,7 @@ # # spec file for package perl-Data-OptList # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,24 +12,23 @@ # 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/ # +%define cpan_name Data-OptList Name: perl-Data-OptList -Version: 0.110 +Version: 0.112 Release: 0 -%define cpan_name Data-OptList -Summary: Parse and Validate Simple Name/Value Option Pairs -License: Artistic-1.0 or GPL-1.0+ -Group: Development/Libraries/Perl -Url: http://search.cpan.org/dist/Data-OptList/ -Source0: http://www.cpan.org/authors/id/R/RJ/RJBS/%{cpan_name}-%{version}.tar.gz +Summary: Parse and validate simple name/value option pairs +License: Artistic-1.0 OR GPL-1.0-or-later +URL: https://metacpan.org/release/%{cpan_name} +Source0: https://cpan.metacpan.org/authors/id/R/RJ/RJBS/%{cpan_name}-%{version}.tar.… Source1: cpanspec.yml BuildArch: noarch -BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: perl BuildRequires: perl-macros +BuildRequires: perl(ExtUtils::MakeMaker) >= 6.78 BuildRequires: perl(Params::Util) BuildRequires: perl(Sub::Install) >= 0.921 BuildRequires: perl(Test::More) >= 0.96 @@ -72,14 +71,14 @@ following a name is its value. %prep -%setup -q -n %{cpan_name}-%{version} +%autosetup -n %{cpan_name}-%{version} %build -%{__perl} Makefile.PL INSTALLDIRS=vendor -%{__make} %{?_smp_mflags} +perl Makefile.PL INSTALLDIRS=vendor +%make_build %check -%{__make} test +make test %install %perl_make_install @@ -87,7 +86,7 @@ %perl_gen_filelist %files -f %{name}.files -%defattr(-,root,root,755) -%doc Changes LICENSE README +%doc Changes README +%license LICENSE %changelog ++++++ Data-OptList-0.110.tar.gz -> Data-OptList-0.112.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Data-OptList-0.110/Changes new/Data-OptList-0.112/Changes --- old/Data-OptList-0.110/Changes 2016-03-25 02:20:57.000000000 +0100 +++ new/Data-OptList-0.112/Changes 2021-06-26 17:01:35.000000000 +0200 @@ -1,5 +1,14 @@ Revision history for Sub-Exporter +0.112 2021-06-26 11:01:31-04:00 America/New_York + - no changes since last trial release (0.111) + +0.111 2021-06-20 20:55:10-04:00 America/New_York (TRIAL RELEASE) + - update author contact info + - add perl version support to docs + - replace a "goto" deep in the guts with a sub call, for speed (thanks, + Olivier Mengu�� and Graham Knop) + 0.110 2016-03-24 21:20:54-04:00 America/New_York - major optimization to mkopt (thanks, Olivier Mengu��) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Data-OptList-0.110/LICENSE new/Data-OptList-0.112/LICENSE --- old/Data-OptList-0.110/LICENSE 2016-03-25 02:20:57.000000000 +0100 +++ new/Data-OptList-0.112/LICENSE 2021-06-26 17:01:35.000000000 +0200 @@ -292,21 +292,21 @@ - "Package" refers to the collection of files distributed by the Copyright Holder, and derivatives of that collection of files created through - textual modification. + textual modification. - "Standard Version" refers to such a Package if it has not been modified, or has been modified in accordance with the wishes of the Copyright - Holder. + Holder. - "Copyright Holder" is whoever is named in the copyright or copyrights for - the package. + the package. - "You" is you, if you're thinking about copying or distributing this Package. - "Reasonable copying fee" is whatever you can justify on the basis of media cost, duplication charges, time of people involved, and so on. (You will not be required to justify it to the Copyright Holder, but only to the - computing community at large as a market that must bear the fee.) + computing community at large as a market that must bear the fee.) - "Freely Available" means that no fee is charged for the item itself, though there may be fees involved in handling the item. It also means that recipients of the item may redistribute it under the same conditions they - received it. + received it. 1. You may make and give away verbatim copies of the source form of the Standard Version of this Package without restriction, provided that you @@ -373,7 +373,7 @@ 9. THIS PACKAGE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF -MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. The End diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Data-OptList-0.110/MANIFEST new/Data-OptList-0.112/MANIFEST --- old/Data-OptList-0.110/MANIFEST 2016-03-25 02:20:57.000000000 +0100 +++ new/Data-OptList-0.112/MANIFEST 2021-06-26 17:01:35.000000000 +0200 @@ -1,4 +1,4 @@ -# This file was automatically generated by Dist::Zilla::Plugin::Manifest v5.043. +# This file was automatically generated by Dist::Zilla::Plugin::Manifest v6.021. Changes LICENSE MANIFEST diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Data-OptList-0.110/META.json new/Data-OptList-0.112/META.json --- old/Data-OptList-0.110/META.json 2016-03-25 02:20:57.000000000 +0100 +++ new/Data-OptList-0.112/META.json 2021-06-26 17:01:35.000000000 +0200 @@ -1,10 +1,10 @@ { "abstract" : "parse and validate simple name/value option pairs", "author" : [ - "Ricardo Signes <rjbs(a)cpan.org>" + "Ricardo Signes <rjbs(a)semiotic.systems>" ], "dynamic_config" : 0, - "generated_by" : "Dist::Zilla version 5.043, CPAN::Meta::Converter version 2.150005", + "generated_by" : "Dist::Zilla version 6.021, CPAN::Meta::Converter version 2.150010", "license" : [ "perl_5" ], @@ -16,7 +16,7 @@ "prereqs" : { "configure" : { "requires" : { - "ExtUtils::MakeMaker" : "0" + "ExtUtils::MakeMaker" : "6.78" }, "suggests" : { "JSON::PP" : "2.27300" @@ -24,6 +24,7 @@ }, "develop" : { "requires" : { + "Encode" : "0", "Test::More" : "0", "Test::Pod" : "1.41" } @@ -60,10 +61,10 @@ "web" : "https://github.com/rjbs/Data-OptList" } }, - "version" : "0.110", + "version" : "0.112", "x_Dist_Zilla" : { "perl" : { - "version" : "5.023008" + "version" : "5.035001" }, "plugins" : [ { @@ -83,17 +84,17 @@ } }, "name" : "@RJBS/Git::GatherDir", - "version" : "2.036" + "version" : "2.047" }, { "class" : "Dist::Zilla::Plugin::CheckPrereqsIndexed", "name" : "@RJBS/CheckPrereqsIndexed", - "version" : "0.017" + "version" : "0.021" }, { "class" : "Dist::Zilla::Plugin::CheckExtraTests", "name" : "@RJBS/CheckExtraTests", - "version" : "0.028" + "version" : "0.029" }, { "class" : "Dist::Zilla::Plugin::PromptIfStale", @@ -105,11 +106,12 @@ "Dist::Zilla::PluginBundle::RJBS" ], "phase" : "build", + "run_under_travis" : 0, "skip" : [] } }, "name" : "@RJBS/RJBS-Outdated", - "version" : "0.047" + "version" : "0.057" }, { "class" : "Dist::Zilla::Plugin::PromptIfStale", @@ -119,66 +121,69 @@ "check_all_prereqs" : 0, "modules" : [], "phase" : "release", - "skip" : [] + "run_under_travis" : 0, + "skip" : [ + "Dist::Zilla::Plugin::RJBSMisc" + ] } }, "name" : "@RJBS/CPAN-Outdated", - "version" : "0.047" + "version" : "0.057" }, { "class" : "Dist::Zilla::Plugin::PruneCruft", "name" : "@RJBS/@Filter/PruneCruft", - "version" : "5.043" + "version" : "6.021" }, { "class" : "Dist::Zilla::Plugin::ManifestSkip", "name" : "@RJBS/@Filter/ManifestSkip", - "version" : "5.043" + "version" : "6.021" }, { "class" : "Dist::Zilla::Plugin::MetaYAML", "name" : "@RJBS/@Filter/MetaYAML", - "version" : "5.043" + "version" : "6.021" }, { "class" : "Dist::Zilla::Plugin::License", "name" : "@RJBS/@Filter/License", - "version" : "5.043" + "version" : "6.021" }, { "class" : "Dist::Zilla::Plugin::Readme", "name" : "@RJBS/@Filter/Readme", - "version" : "5.043" + "version" : "6.021" }, { "class" : "Dist::Zilla::Plugin::ExecDir", "name" : "@RJBS/@Filter/ExecDir", - "version" : "5.043" + "version" : "6.021" }, { "class" : "Dist::Zilla::Plugin::ShareDir", "name" : "@RJBS/@Filter/ShareDir", - "version" : "5.043" + "version" : "6.021" }, { "class" : "Dist::Zilla::Plugin::Manifest", "name" : "@RJBS/@Filter/Manifest", - "version" : "5.043" + "version" : "6.021" }, { "class" : "Dist::Zilla::Plugin::TestRelease", "name" : "@RJBS/@Filter/TestRelease", - "version" : "5.043" + "version" : "6.021" }, { "class" : "Dist::Zilla::Plugin::ConfirmRelease", "name" : "@RJBS/@Filter/ConfirmRelease", - "version" : "5.043" + "version" : "6.021" }, { "class" : "Dist::Zilla::Plugin::UploadToCPAN", "name" : "@RJBS/@Filter/UploadToCPAN", - "version" : "5.043" + "version" : "6.021" }, { "class" : "Dist::Zilla::Plugin::MakeMaker", @@ -188,62 +193,63 @@ } }, "name" : "@RJBS/MakeMaker", - "version" : "5.043" + "version" : "6.021" }, { "class" : "Dist::Zilla::Plugin::AutoPrereqs", "name" : "@RJBS/AutoPrereqs", - "version" : "5.043" + "version" : "6.021" }, { "class" : "Dist::Zilla::Plugin::Git::NextVersion", "config" : { "Dist::Zilla::Plugin::Git::NextVersion" : { "first_version" : "0.001", - "version_by_branch" : 0, + "version_by_branch" : 1, "version_regexp" : "(?^:^([0-9]+\\.[0-9]+)$)" }, "Dist::Zilla::Role::Git::Repo" : { + "git_version" : "2.30.1 (Apple Git-130)", "repo_root" : "." } }, "name" : "@RJBS/Git::NextVersion", - "version" : "2.036" + "version" : "2.047" }, { "class" : "Dist::Zilla::Plugin::PkgVersion", "name" : "@RJBS/PkgVersion", - "version" : "5.043" + "version" : "6.021" }, { "class" : "Dist::Zilla::Plugin::MetaConfig", "name" : "@RJBS/MetaConfig", - "version" : "5.043" + "version" : "6.021" }, { "class" : "Dist::Zilla::Plugin::MetaJSON", "name" : "@RJBS/MetaJSON", - "version" : "5.043" + "version" : "6.021" }, { "class" : "Dist::Zilla::Plugin::NextRelease", "name" : "@RJBS/NextRelease", - "version" : "5.043" + "version" : "6.021" }, { "class" : "Dist::Zilla::Plugin::Test::ChangesHasContent", "name" : "@RJBS/Test::ChangesHasContent", - "version" : "0.008" + "version" : "0.011" }, { "class" : "Dist::Zilla::Plugin::PodSyntaxTests", "name" : "@RJBS/PodSyntaxTests", - "version" : "5.043" + "version" : "6.021" }, { "class" : "Dist::Zilla::Plugin::Test::ReportPrereqs", "name" : "@RJBS/Test::ReportPrereqs", - "version" : "0.024" + "version" : "0.028" }, { "class" : "Dist::Zilla::Plugin::Prereqs", @@ -254,7 +260,7 @@ } }, "name" : "@RJBS/TestMoreWithSubtests", - "version" : "5.043" + "version" : "6.021" }, { "class" : "Dist::Zilla::Plugin::PodWeaver", @@ -271,82 +277,87 @@ { "class" : "Pod::Weaver::Plugin::EnsurePod5", "name" : "@CorePrep/EnsurePod5", - "version" : "4.012" + "version" : "4.018" }, { "class" : "Pod::Weaver::Plugin::H1Nester", "name" : "@CorePrep/H1Nester", - "version" : "4.012" + "version" : "4.018" }, { "class" : "Pod::Weaver::Plugin::SingleEncoding", "name" : "@RJBS/SingleEncoding", - "version" : "4.012" + "version" : "4.018" }, { "class" : "Pod::Weaver::Section::Name", "name" : "@RJBS/Name", - "version" : "4.012" + "version" : "4.018" }, { "class" : "Pod::Weaver::Section::Version", "name" : "@RJBS/Version", - "version" : "4.012" + "version" : "4.018" }, { "class" : "Pod::Weaver::Section::Region", "name" : "@RJBS/Prelude", - "version" : "4.012" + "version" : "4.018" }, { "class" : "Pod::Weaver::Section::Generic", "name" : "@RJBS/Synopsis", - "version" : "4.012" + "version" : "4.018" }, { "class" : "Pod::Weaver::Section::Generic", "name" : "@RJBS/Description", - "version" : "4.012" + "version" : "4.018" }, { "class" : "Pod::Weaver::Section::Generic", "name" : "@RJBS/Overview", - "version" : "4.012" + "version" : "4.018" }, { "class" : "Pod::Weaver::Section::Generic", "name" : "@RJBS/Stability", - "version" : "4.012" + "version" : "4.018" + }, + { + "class" : "Pod::Weaver::Section::GenerateSection", + "name" : "@RJBS/PerlSupport", + "version" : "4.018" }, { "class" : "Pod::Weaver::Section::Collect", "name" : "Attributes", - "version" : "4.012" + "version" : "4.018" }, { "class" : "Pod::Weaver::Section::Collect", "name" : "Methods", - "version" : "4.012" + "version" : "4.018" }, { "class" : "Pod::Weaver::Section::Collect", "name" : "Functions", - "version" : "4.012" + "version" : "4.018" }, { "class" : "Pod::Weaver::Section::Leftovers", "name" : "@RJBS/Leftovers", - "version" : "4.012" + "version" : "4.018" }, { "class" : "Pod::Weaver::Section::Region", "name" : "@RJBS/postlude", - "version" : "4.012" + "version" : "4.018" }, { "class" : "Pod::Weaver::Section::Authors", "name" : "@RJBS/Authors", - "version" : "4.012" + "version" : "4.018" }, { "class" : "Pod::Weaver::Section::Contributors", @@ -356,23 +367,28 @@ { "class" : "Pod::Weaver::Section::Legal", "name" : "@RJBS/Legal", - "version" : "4.012" + "version" : "4.018" }, { "class" : "Pod::Weaver::Plugin::Transformer", "name" : "@RJBS/List", - "version" : "4.012" + "version" : "4.018" } ] } }, "name" : "@RJBS/PodWeaver", - "version" : "4.006" + "version" : "4.009" + }, + { + "class" : "Dist::Zilla::Plugin::RJBSMisc", + "name" : "@RJBS/RJBSMisc", + "version" : "5.019" }, { "class" : "Dist::Zilla::Plugin::GithubMeta", "name" : "@RJBS/GithubMeta", - "version" : "0.54" + "version" : "0.58" }, { "class" : "Dist::Zilla::Plugin::Git::Check", @@ -389,18 +405,20 @@ "changelog" : "Changes" }, "Dist::Zilla::Role::Git::Repo" : { + "git_version" : "2.30.1 (Apple Git-130)", "repo_root" : "." } }, "name" : "@RJBS/@Git/Check", - "version" : "2.036" + "version" : "2.047" }, { "class" : "Dist::Zilla::Plugin::Git::Commit", "config" : { "Dist::Zilla::Plugin::Git::Commit" : { "add_files_in" : [], - "commit_msg" : "v%v%n%n%c" + "commit_msg" : "v%V%n%n%c", + "signoff" : 0 }, "Dist::Zilla::Role::Git::DirtyFiles" : { "allow_dirty" : [ @@ -411,6 +429,7 @@ "changelog" : "Changes" }, "Dist::Zilla::Role::Git::Repo" : { + "git_version" : "2.30.1 (Apple Git-130)", "repo_root" : "." }, "Dist::Zilla::Role::Git::StringFormatter" : { @@ -418,7 +437,7 @@ } }, "name" : "@RJBS/@Git/Commit", - "version" : "2.036" + "version" : "2.047" }, { "class" : "Dist::Zilla::Plugin::Git::Tag", @@ -427,11 +446,12 @@ "branch" : null, "changelog" : "Changes", "signed" : 0, - "tag" : "0.110", + "tag" : "0.112", "tag_format" : "%v", - "tag_message" : "v%v" + "tag_message" : "v%V" }, "Dist::Zilla::Role::Git::Repo" : { + "git_version" : "2.30.1 (Apple Git-130)", "repo_root" : "." }, "Dist::Zilla::Role::Git::StringFormatter" : { @@ -439,102 +459,104 @@ } }, "name" : "@RJBS/@Git/Tag", - "version" : "2.036" + "version" : "2.047" }, { "class" : "Dist::Zilla::Plugin::Git::Push", "config" : { "Dist::Zilla::Plugin::Git::Push" : { "push_to" : [ - "origin :", "github :" ], "remotes_must_exist" : 0 }, "Dist::Zilla::Role::Git::Repo" : { + "git_version" : "2.30.1 (Apple Git-130)", "repo_root" : "." } }, "name" : "@RJBS/@Git/Push", - "version" : "2.036" + "version" : "2.047" }, { "class" : "Dist::Zilla::Plugin::Git::Contributors", "config" : { "Dist::Zilla::Plugin::Git::Contributors" : { + "git_version" : "2.30.1 (Apple Git-130)", "include_authors" : 0, "include_releaser" : 1, "order_by" : "name", - "paths" : [ - "." - ] + "paths" : [] } }, "name" : "@RJBS/Git::Contributors", - "version" : "0.020" + "version" : "0.036" }, { "class" : "Dist::Zilla::Plugin::FinderCode", "name" : ":InstallModules", - "version" : "5.043" + "version" : "6.021" }, { "class" : "Dist::Zilla::Plugin::FinderCode", "name" : ":IncModules", - "version" : "5.043" + "version" : "6.021" }, { "class" : "Dist::Zilla::Plugin::FinderCode", "name" : ":TestFiles", - "version" : "5.043" + "version" : "6.021" }, { "class" : "Dist::Zilla::Plugin::FinderCode", "name" : ":ExtraTestFiles", - "version" : "5.043" + "version" : "6.021" }, { "class" : "Dist::Zilla::Plugin::FinderCode", "name" : ":ExecFiles", - "version" : "5.043" + "version" : "6.021" }, { "class" : "Dist::Zilla::Plugin::FinderCode", "name" : ":PerlExecFiles", - "version" : "5.043" + "version" : "6.021" }, { "class" : "Dist::Zilla::Plugin::FinderCode", "name" : ":ShareFiles", - "version" : "5.043" + "version" : "6.021" }, { "class" : "Dist::Zilla::Plugin::FinderCode", "name" : ":MainModule", - "version" : "5.043" + "version" : "6.021" }, { "class" : "Dist::Zilla::Plugin::FinderCode", "name" : ":AllFiles", - "version" : "5.043" + "version" : "6.021" }, { "class" : "Dist::Zilla::Plugin::FinderCode", "name" : ":NoFiles", - "version" : "5.043" + "version" : "6.021" } ], "zilla" : { "class" : "Dist::Zilla::Dist::Builder", "config" : { - "is_trial" : "0" + "is_trial" : 0 }, - "version" : "5.043" + "version" : "6.021" } }, "x_contributors" : [ - "Olivier Mengu�� <dolmen(a)cpan.org>", - "Ricardo SIGNES <rjbs(a)codesimply.com>" - ] + "Olivier Mengu\u00e9 <dolmen(a)cpan.org>" + ], + "x_generated_by_perl" : "v5.35.1", + "x_rjbs_perl_support" : "long-term", + "x_serialization_backend" : "Cpanel::JSON::XS version 4.26", + "x_spdx_expression" : "Artistic-1.0-Perl OR GPL-1.0-or-later" } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Data-OptList-0.110/META.yml new/Data-OptList-0.112/META.yml --- old/Data-OptList-0.110/META.yml 2016-03-25 02:20:57.000000000 +0100 +++ new/Data-OptList-0.112/META.yml 2021-06-26 17:01:35.000000000 +0200 @@ -1,15 +1,15 @@ --- abstract: 'parse and validate simple name/value option pairs' author: - - 'Ricardo Signes <rjbs(a)cpan.org>' + - 'Ricardo Signes <rjbs(a)semiotic.systems>' build_requires: ExtUtils::MakeMaker: '0' File::Spec: '0' Test::More: '0.96' configure_requires: - ExtUtils::MakeMaker: '0' + ExtUtils::MakeMaker: '6.78' dynamic_config: 0 -generated_by: 'Dist::Zilla version 5.043, CPAN::Meta::Converter version 2.150005' +generated_by: 'Dist::Zilla version 6.021, CPAN::Meta::Converter version 2.150010' license: perl meta-spec: url: http://module-build.sourceforge.net/META-spec-v1.4.html @@ -25,10 +25,10 @@ bugtracker: https://github.com/rjbs/Data-OptList/issues homepage: https://github.com/rjbs/Data-OptList repository: https://github.com/rjbs/Data-OptList.git -version: '0.110' +version: '0.112' x_Dist_Zilla: perl: - version: '5.023008' + version: '5.035001' plugins: - class: Dist::Zilla::Plugin::Git::GatherDir @@ -44,15 +44,15 @@ Dist::Zilla::Plugin::Git::GatherDir: include_untracked: 0 name: '@RJBS/Git::GatherDir' - version: '2.036' + version: '2.047' - class: Dist::Zilla::Plugin::CheckPrereqsIndexed name: '@RJBS/CheckPrereqsIndexed' - version: '0.017' + version: '0.021' - class: Dist::Zilla::Plugin::CheckExtraTests name: '@RJBS/CheckExtraTests' - version: '0.028' + version: '0.029' - class: Dist::Zilla::Plugin::PromptIfStale config: @@ -62,9 +62,10 @@ modules: - Dist::Zilla::PluginBundle::RJBS phase: build + run_under_travis: 0 skip: [] name: '@RJBS/RJBS-Outdated' - version: '0.047' + version: '0.057' - class: Dist::Zilla::Plugin::PromptIfStale config: @@ -73,103 +74,106 @@ check_all_prereqs: 0 modules: [] phase: release - skip: [] + run_under_travis: 0 + skip: + - Dist::Zilla::Plugin::RJBSMisc name: '@RJBS/CPAN-Outdated' - version: '0.047' + version: '0.057' - class: Dist::Zilla::Plugin::PruneCruft name: '@RJBS/@Filter/PruneCruft' - version: '5.043' + version: '6.021' - class: Dist::Zilla::Plugin::ManifestSkip name: '@RJBS/@Filter/ManifestSkip' - version: '5.043' + version: '6.021' - class: Dist::Zilla::Plugin::MetaYAML name: '@RJBS/@Filter/MetaYAML' - version: '5.043' + version: '6.021' - class: Dist::Zilla::Plugin::License name: '@RJBS/@Filter/License' - version: '5.043' + version: '6.021' - class: Dist::Zilla::Plugin::Readme name: '@RJBS/@Filter/Readme' - version: '5.043' + version: '6.021' - class: Dist::Zilla::Plugin::ExecDir name: '@RJBS/@Filter/ExecDir' - version: '5.043' + version: '6.021' - class: Dist::Zilla::Plugin::ShareDir name: '@RJBS/@Filter/ShareDir' - version: '5.043' + version: '6.021' - class: Dist::Zilla::Plugin::Manifest name: '@RJBS/@Filter/Manifest' - version: '5.043' + version: '6.021' - class: Dist::Zilla::Plugin::TestRelease name: '@RJBS/@Filter/TestRelease' - version: '5.043' + version: '6.021' - class: Dist::Zilla::Plugin::ConfirmRelease name: '@RJBS/@Filter/ConfirmRelease' - version: '5.043' + version: '6.021' - class: Dist::Zilla::Plugin::UploadToCPAN name: '@RJBS/@Filter/UploadToCPAN' - version: '5.043' + version: '6.021' - class: Dist::Zilla::Plugin::MakeMaker config: Dist::Zilla::Role::TestRunner: default_jobs: 9 name: '@RJBS/MakeMaker' - version: '5.043' + version: '6.021' - class: Dist::Zilla::Plugin::AutoPrereqs name: '@RJBS/AutoPrereqs' - version: '5.043' + version: '6.021' - class: Dist::Zilla::Plugin::Git::NextVersion config: Dist::Zilla::Plugin::Git::NextVersion: first_version: '0.001' - version_by_branch: 0 + version_by_branch: 1 version_regexp: (?^:^([0-9]+\.[0-9]+)$) Dist::Zilla::Role::Git::Repo: + git_version: '2.30.1 (Apple Git-130)' repo_root: . name: '@RJBS/Git::NextVersion' - version: '2.036' + version: '2.047' - class: Dist::Zilla::Plugin::PkgVersion name: '@RJBS/PkgVersion' - version: '5.043' + version: '6.021' - class: Dist::Zilla::Plugin::MetaConfig name: '@RJBS/MetaConfig' - version: '5.043' + version: '6.021' - class: Dist::Zilla::Plugin::MetaJSON name: '@RJBS/MetaJSON' - version: '5.043' + version: '6.021' - class: Dist::Zilla::Plugin::NextRelease name: '@RJBS/NextRelease' - version: '5.043' + version: '6.021' - class: Dist::Zilla::Plugin::Test::ChangesHasContent name: '@RJBS/Test::ChangesHasContent' - version: '0.008' + version: '0.011' - class: Dist::Zilla::Plugin::PodSyntaxTests name: '@RJBS/PodSyntaxTests' - version: '5.043' + version: '6.021' - class: Dist::Zilla::Plugin::Test::ReportPrereqs name: '@RJBS/Test::ReportPrereqs' - version: '0.024' + version: '0.028' - class: Dist::Zilla::Plugin::Prereqs config: @@ -177,7 +181,7 @@ phase: test type: requires name: '@RJBS/TestMoreWithSubtests' - version: '5.043' + version: '6.021' - class: Dist::Zilla::Plugin::PodWeaver config: @@ -191,67 +195,71 @@ - class: Pod::Weaver::Plugin::EnsurePod5 name: '@CorePrep/EnsurePod5' - version: '4.012' + version: '4.018' - class: Pod::Weaver::Plugin::H1Nester name: '@CorePrep/H1Nester' - version: '4.012' + version: '4.018' - class: Pod::Weaver::Plugin::SingleEncoding name: '@RJBS/SingleEncoding' - version: '4.012' + version: '4.018' - class: Pod::Weaver::Section::Name name: '@RJBS/Name' - version: '4.012' + version: '4.018' - class: Pod::Weaver::Section::Version name: '@RJBS/Version' - version: '4.012' + version: '4.018' - class: Pod::Weaver::Section::Region name: '@RJBS/Prelude' - version: '4.012' + version: '4.018' - class: Pod::Weaver::Section::Generic name: '@RJBS/Synopsis' - version: '4.012' + version: '4.018' - class: Pod::Weaver::Section::Generic name: '@RJBS/Description' - version: '4.012' + version: '4.018' - class: Pod::Weaver::Section::Generic name: '@RJBS/Overview' - version: '4.012' + version: '4.018' - class: Pod::Weaver::Section::Generic name: '@RJBS/Stability' - version: '4.012' + version: '4.018' + - + class: Pod::Weaver::Section::GenerateSection + name: '@RJBS/PerlSupport' + version: '4.018' - class: Pod::Weaver::Section::Collect name: Attributes - version: '4.012' + version: '4.018' - class: Pod::Weaver::Section::Collect name: Methods - version: '4.012' + version: '4.018' - class: Pod::Weaver::Section::Collect name: Functions - version: '4.012' + version: '4.018' - class: Pod::Weaver::Section::Leftovers name: '@RJBS/Leftovers' - version: '4.012' + version: '4.018' - class: Pod::Weaver::Section::Region name: '@RJBS/postlude' - version: '4.012' + version: '4.018' - class: Pod::Weaver::Section::Authors name: '@RJBS/Authors' - version: '4.012' + version: '4.018' - class: Pod::Weaver::Section::Contributors name: '@RJBS/Contributors' @@ -259,17 +267,21 @@ - class: Pod::Weaver::Section::Legal name: '@RJBS/Legal' - version: '4.012' + version: '4.018' - class: Pod::Weaver::Plugin::Transformer name: '@RJBS/List' - version: '4.012' + version: '4.018' name: '@RJBS/PodWeaver' - version: '4.006' + version: '4.009' + - + class: Dist::Zilla::Plugin::RJBSMisc + name: '@RJBS/RJBSMisc' + version: '5.019' - class: Dist::Zilla::Plugin::GithubMeta name: '@RJBS/GithubMeta' - version: '0.54' + version: '0.58' - class: Dist::Zilla::Plugin::Git::Check config: @@ -282,15 +294,17 @@ allow_dirty_match: [] changelog: Changes Dist::Zilla::Role::Git::Repo: + git_version: '2.30.1 (Apple Git-130)' repo_root: . name: '@RJBS/@Git/Check' - version: '2.036' + version: '2.047' - class: Dist::Zilla::Plugin::Git::Commit config: Dist::Zilla::Plugin::Git::Commit: add_files_in: [] - commit_msg: v%v%n%n%c + commit_msg: v%V%n%n%c + signoff: '0' Dist::Zilla::Role::Git::DirtyFiles: allow_dirty: - Changes @@ -298,11 +312,12 @@ allow_dirty_match: [] changelog: Changes Dist::Zilla::Role::Git::Repo: + git_version: '2.30.1 (Apple Git-130)' repo_root: . Dist::Zilla::Role::Git::StringFormatter: time_zone: local name: '@RJBS/@Git/Commit' - version: '2.036' + version: '2.047' - class: Dist::Zilla::Plugin::Git::Tag config: @@ -310,83 +325,87 @@ branch: ~ changelog: Changes signed: 0 - tag: '0.110' + tag: '0.112' tag_format: '%v' - tag_message: v%v + tag_message: v%V Dist::Zilla::Role::Git::Repo: + git_version: '2.30.1 (Apple Git-130)' repo_root: . Dist::Zilla::Role::Git::StringFormatter: time_zone: local name: '@RJBS/@Git/Tag' - version: '2.036' + version: '2.047' - class: Dist::Zilla::Plugin::Git::Push config: Dist::Zilla::Plugin::Git::Push: push_to: - - 'origin :' - 'github :' remotes_must_exist: 0 Dist::Zilla::Role::Git::Repo: + git_version: '2.30.1 (Apple Git-130)' repo_root: . name: '@RJBS/@Git/Push' - version: '2.036' + version: '2.047' - class: Dist::Zilla::Plugin::Git::Contributors config: Dist::Zilla::Plugin::Git::Contributors: + git_version: '2.30.1 (Apple Git-130)' include_authors: 0 include_releaser: 1 order_by: name - paths: - - . + paths: [] name: '@RJBS/Git::Contributors' - version: '0.020' + version: '0.036' - class: Dist::Zilla::Plugin::FinderCode name: ':InstallModules' - version: '5.043' + version: '6.021' - class: Dist::Zilla::Plugin::FinderCode name: ':IncModules' - version: '5.043' + version: '6.021' - class: Dist::Zilla::Plugin::FinderCode name: ':TestFiles' - version: '5.043' + version: '6.021' - class: Dist::Zilla::Plugin::FinderCode name: ':ExtraTestFiles' - version: '5.043' + version: '6.021' - class: Dist::Zilla::Plugin::FinderCode name: ':ExecFiles' - version: '5.043' + version: '6.021' - class: Dist::Zilla::Plugin::FinderCode name: ':PerlExecFiles' - version: '5.043' + version: '6.021' - class: Dist::Zilla::Plugin::FinderCode name: ':ShareFiles' - version: '5.043' + version: '6.021' - class: Dist::Zilla::Plugin::FinderCode name: ':MainModule' - version: '5.043' + version: '6.021' - class: Dist::Zilla::Plugin::FinderCode name: ':AllFiles' - version: '5.043' + version: '6.021' - class: Dist::Zilla::Plugin::FinderCode name: ':NoFiles' - version: '5.043' + version: '6.021' zilla: class: Dist::Zilla::Dist::Builder config: is_trial: '0' - version: '5.043' + version: '6.021' x_contributors: - 'Olivier Mengu�� <dolmen(a)cpan.org>' - - 'Ricardo SIGNES <rjbs(a)codesimply.com>' +x_generated_by_perl: v5.35.1 +x_rjbs_perl_support: long-term +x_serialization_backend: 'YAML::Tiny version 1.73' +x_spdx_expression: 'Artistic-1.0-Perl OR GPL-1.0-or-later' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Data-OptList-0.110/Makefile.PL new/Data-OptList-0.112/Makefile.PL --- old/Data-OptList-0.110/Makefile.PL 2016-03-25 02:20:57.000000000 +0100 +++ new/Data-OptList-0.112/Makefile.PL 2021-06-26 17:01:35.000000000 +0200 @@ -1,16 +1,16 @@ -# This file was automatically generated by Dist::Zilla::Plugin::MakeMaker v5.043. +# This file was automatically generated by Dist::Zilla::Plugin::MakeMaker v6.021. use strict; use warnings; -use ExtUtils::MakeMaker; +use ExtUtils::MakeMaker 6.78; my %WriteMakefileArgs = ( "ABSTRACT" => "parse and validate simple name/value option pairs", - "AUTHOR" => "Ricardo Signes <rjbs\(a)cpan.org>", + "AUTHOR" => "Ricardo Signes <rjbs\(a)semiotic.systems>", "CONFIGURE_REQUIRES" => { - "ExtUtils::MakeMaker" => 0 + "ExtUtils::MakeMaker" => "6.78" }, "DISTNAME" => "Data-OptList", "LICENSE" => "perl", @@ -27,7 +27,7 @@ "File::Spec" => 0, "Test::More" => "0.96" }, - "VERSION" => "0.110", + "VERSION" => "0.112", "test" => { "TESTS" => "t/*.t" } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Data-OptList-0.110/README new/Data-OptList-0.112/README --- old/Data-OptList-0.110/README 2016-03-25 02:20:57.000000000 +0100 +++ new/Data-OptList-0.112/README 2021-06-26 17:01:35.000000000 +0200 @@ -1,7 +1,5 @@ - - This archive contains the distribution Data-OptList, -version 0.110: +version 0.112: parse and validate simple name/value option pairs @@ -11,5 +9,4 @@ the same terms as the Perl 5 programming language system itself. -This README file was generated by Dist::Zilla::Plugin::Readme v5.043. - +This README file was generated by Dist::Zilla::Plugin::Readme v6.021. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Data-OptList-0.110/dist.ini new/Data-OptList-0.112/dist.ini --- old/Data-OptList-0.110/dist.ini 2016-03-25 02:20:57.000000000 +0100 +++ new/Data-OptList-0.112/dist.ini 2021-06-26 17:01:35.000000000 +0200 @@ -1,8 +1,9 @@ name = Data-OptList -author = Ricardo Signes <rjbs(a)cpan.org> +author = Ricardo Signes <rjbs(a)semiotic.systems> license = Perl_5 copyright_holder = Ricardo Signes copyright_year = 2006 [@RJBS] - +perl-support = long-term +package-name-version = 0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Data-OptList-0.110/lib/Data/OptList.pm new/Data-OptList-0.112/lib/Data/OptList.pm --- old/Data-OptList-0.110/lib/Data/OptList.pm 2016-03-25 02:20:57.000000000 +0100 +++ new/Data-OptList-0.112/lib/Data/OptList.pm 2021-06-26 17:01:35.000000000 +0200 @@ -2,7 +2,7 @@ use warnings; package Data::OptList; # ABSTRACT: parse and validate simple name/value option pairs -$Data::OptList::VERSION = '0.110'; +$Data::OptList::VERSION = '0.112'; use List::Util (); use Params::Util (); use Sub::Install 0.921 (); @@ -152,8 +152,8 @@ $must_be = [ $must_be ] unless ref $must_be; my @checks = map { my $class = $_; - $test_for{$_} - || sub { $_[1] = $class; goto \&Params::Util::_INSTANCE } + $test_for{$class} + || sub { Params::Util::_INSTANCE($_[0], $class) } } @$must_be; $is_a = (@checks == 1) @@ -249,7 +249,7 @@ =head1 VERSION -version 0.110 +version 0.112 =head1 SYNOPSIS @@ -313,6 +313,16 @@ This works by assuming that any defined scalar is a name and any reference following a name is its value. +=head1 PERL VERSION SUPPORT + +This module has a long-term perl support period. That means it will not +require a version of perl released fewer than five years ago. + +Although it may work on older versions of perl, no guarantee is made that the +minimum required version will not be increased. The version may be increased +for any reason, and there is no promise that patches will be accepted to lower +the minimum required perl. + =head1 FUNCTIONS =head2 mkopt @@ -378,24 +388,14 @@ =head1 AUTHOR -Ricardo Signes <rjbs(a)cpan.org> - -=head1 CONTRIBUTORS +Ricardo Signes <rjbs(a)semiotic.systems> -=for stopwords Olivier Mengu�� Ricardo SIGNES +=head1 CONTRIBUTOR -=over 4 - -=item * +=for stopwords Olivier Mengu�� Olivier Mengu�� <dolmen(a)cpan.org> -=item * - -Ricardo SIGNES <rjbs(a)codesimply.com> - -=back - =head1 COPYRIGHT AND LICENSE This software is copyright (c) 2006 by Ricardo Signes. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Data-OptList-0.110/t/00-report-prereqs.dd new/Data-OptList-0.112/t/00-report-prereqs.dd --- old/Data-OptList-0.110/t/00-report-prereqs.dd 2016-03-25 02:20:57.000000000 +0100 +++ new/Data-OptList-0.112/t/00-report-prereqs.dd 2021-06-26 17:01:35.000000000 +0200 @@ -1,7 +1,7 @@ do { my $x = { 'configure' => { 'requires' => { - 'ExtUtils::MakeMaker' => '0' + 'ExtUtils::MakeMaker' => '6.78' }, 'suggests' => { 'JSON::PP' => '2.27300' @@ -9,6 +9,7 @@ }, 'develop' => { 'requires' => { + 'Encode' => '0', 'Test::More' => '0', 'Test::Pod' => '1.41' } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Data-OptList-0.110/t/00-report-prereqs.t new/Data-OptList-0.112/t/00-report-prereqs.t --- old/Data-OptList-0.110/t/00-report-prereqs.t 2016-03-25 02:20:57.000000000 +0100 +++ new/Data-OptList-0.112/t/00-report-prereqs.t 2021-06-26 17:01:35.000000000 +0200 @@ -3,7 +3,7 @@ use strict; use warnings; -# This test was generated by Dist::Zilla::Plugin::Test::ReportPrereqs 0.024 +# This test was generated by Dist::Zilla::Plugin::Test::ReportPrereqs 0.028 use Test::More tests => 1; @@ -68,7 +68,7 @@ ); # Add static prereqs to the included modules list -my $static_prereqs = do 't/00-report-prereqs.dd'; +my $static_prereqs = do './t/00-report-prereqs.dd'; # Merge all prereqs (either with ::Prereqs or a hashref) my $full_prereqs = _merge_prereqs( @@ -78,12 +78,14 @@ # Add dynamic prereqs to the included modules list (if we can) my ($source) = grep { -f } 'MYMETA.json', 'MYMETA.yml'; -if ( $source && $HAS_CPAN_META ) { - if ( my $meta = eval { CPAN::Meta->load_file($source) } ) { - $full_prereqs = _merge_prereqs($full_prereqs, $meta->prereqs); - } +my $cpan_meta_error; +if ( $source && $HAS_CPAN_META + && (my $meta = eval { CPAN::Meta->load_file($source) } ) +) { + $full_prereqs = _merge_prereqs($full_prereqs, $meta->prereqs); } else { + $cpan_meta_error = $@; # capture error from CPAN::Meta->load_file($source) $source = 'static metadata'; } @@ -169,15 +171,23 @@ diag "\nVersions for all modules listed in $source (including optional ones):\n\n", @full_reports; } +if ( $cpan_meta_error || @dep_errors ) { + diag "\n*** WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING ***\n"; +} + +if ( $cpan_meta_error ) { + my ($orig_source) = grep { -f } 'MYMETA.json', 'MYMETA.yml'; + diag "\nCPAN::Meta->load_file('$orig_source') failed with: $cpan_meta_error\n"; +} + if ( @dep_errors ) { diag join("\n", - "\n*** WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING ***\n", - "The following REQUIRED prerequisites were not satisfied:\n", + "\nThe following REQUIRED prerequisites were not satisfied:\n", @dep_errors, "\n" ); } -pass; +pass('Reported prereqs'); # vim: ts=4 sts=4 sw=4 et: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Data-OptList-0.110/xt/release/changes_has_content.t new/Data-OptList-0.112/xt/release/changes_has_content.t --- old/Data-OptList-0.110/xt/release/changes_has_content.t 2016-03-25 02:20:57.000000000 +0100 +++ new/Data-OptList-0.112/xt/release/changes_has_content.t 2021-06-26 17:01:35.000000000 +0200 @@ -1,11 +1,10 @@ -#!perl - use Test::More tests => 2; note 'Checking Changes'; my $changes_file = 'Changes'; -my $newver = '0.110'; +my $newver = '0.112'; my $trial_token = '-TRIAL'; +my $encoding = 'UTF-8'; SKIP: { ok(-e $changes_file, "$changes_file file exists") @@ -16,8 +15,6 @@ done_testing; -# _get_changes copied and adapted from Dist::Zilla::Plugin::Git::Commit -# by Jerome Quelin sub _get_changes { my $newver = shift; @@ -25,6 +22,10 @@ # parse changelog to find commit message open(my $fh, '<', $changes_file) or die "cannot open $changes_file: $!"; my $changelog = join('', <$fh>); + if ($encoding) { + require Encode; + $changelog = Encode::decode($encoding, $changelog, Encode::FB_CROAK()); + } close $fh; my @content =

1 0