December 2020 - openSUSE Commits - openSUSE Mailing Lists

commit rubygem-ffi for openSUSE:Factory
by User for buildservice source handling 21 Dec '20

21 Dec '20

Hello community, here is the log from the commit of package rubygem-ffi for openSUSE:Factory checked in at 2020-12-21 12:35:28 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rubygem-ffi (Old) and /work/SRC/openSUSE:Factory/.rubygem-ffi.new.5145 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "rubygem-ffi" Mon Dec 21 12:35:28 2020 rev:36 rq:857109 version:1.14.1 Changes: -------- --- /work/SRC/openSUSE:Factory/rubygem-ffi/rubygem-ffi.changes 2020-06-25 15:11:46.990185223 +0200 +++ /work/SRC/openSUSE:Factory/.rubygem-ffi.new.5145/rubygem-ffi.changes 2020-12-21 12:35:32.438984167 +0100 @@ -1,0 +2,9 @@ +Sun Dec 20 09:22:59 UTC 2020 - Manuel Schnitzer <mschnitzer(a)suse.com> + +- updated to version 1.14.1 + + Changed: + * Revert changes to FFI::Pointer#write_string made in ffi-1.14.0. + It breaks compatibilty in a way that can cause hard to find errors. #857 + +------------------------------------------------------------------- Old: ---- ffi-1.13.1.gem New: ---- ffi-1.14.1.gem ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rubygem-ffi.spec ++++++ --- /var/tmp/diff_new_pack.IvbHd1/_old 2020-12-21 12:35:33.026985573 +0100 +++ /var/tmp/diff_new_pack.IvbHd1/_new 2020-12-21 12:35:33.030985582 +0100 @@ -24,7 +24,7 @@ # Name: rubygem-ffi -Version: 1.13.1 +Version: 1.14.1 Release: 0 %define mod_name ffi %define mod_full_name %{mod_name}-%{version} ++++++ ffi-1.13.1.gem -> ffi-1.14.1.gem ++++++ ++++ 11338 lines of diff (skipped)

1 0

commit rubygem-tzinfo for openSUSE:Factory
by User for buildservice source handling 21 Dec '20

21 Dec '20

Hello community, here is the log from the commit of package rubygem-tzinfo for openSUSE:Factory checked in at 2020-12-21 12:35:26 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rubygem-tzinfo (Old) and /work/SRC/openSUSE:Factory/.rubygem-tzinfo.new.5145 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "rubygem-tzinfo" Mon Dec 21 12:35:26 2020 rev:25 rq:857107 version:2.0.4 Changes: -------- --- /work/SRC/openSUSE:Factory/rubygem-tzinfo/rubygem-tzinfo.changes 2020-12-11 20:16:25.564652442 +0100 +++ /work/SRC/openSUSE:Factory/.rubygem-tzinfo.new.5145/rubygem-tzinfo.changes 2020-12-21 12:35:27.558972503 +0100 @@ -1,0 +2,10 @@ +Sun Dec 20 09:18:28 UTC 2020 - Manuel Schnitzer <mschnitzer(a)suse.com> + +- updated to version 2.0.4 + + * Fixed an incorrect `InvalidTimezoneIdentifier` exception raised when loading a + zoneinfo file that includes rules specifying an additional transition to the + final defined offset (for example, Africa/Casablanca in version 2018e of the + Time Zone Database). #123. + +------------------------------------------------------------------- Old: ---- tzinfo-2.0.3.gem New: ---- tzinfo-2.0.4.gem ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rubygem-tzinfo.spec ++++++ --- /var/tmp/diff_new_pack.GrJHks/_old 2020-12-21 12:35:29.310976691 +0100 +++ /var/tmp/diff_new_pack.GrJHks/_new 2020-12-21 12:35:29.314976700 +0100 @@ -24,7 +24,7 @@ # Name: rubygem-tzinfo -Version: 2.0.3 +Version: 2.0.4 Release: 0 %define mod_name tzinfo %define mod_full_name %{mod_name}-%{version} ++++++ tzinfo-2.0.3.gem -> tzinfo-2.0.4.gem ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CHANGES.md new/CHANGES.md --- old/CHANGES.md 2020-11-08 14:08:04.000000000 +0100 +++ new/CHANGES.md 2020-12-16 21:58:54.000000000 +0100 @@ -1,5 +1,13 @@ # Changes +## Version 2.0.4 - 16-Dec-2020 + +* Fixed an incorrect InvalidTimezoneIdentifier exception raised when loading a + zoneinfo file that includes rules specifying an additional transition to the + final defined offset (for example, Africa/Casablanca in version 2018e of the + Time Zone Database). #123. + + ## Version 2.0.3 - 8-Nov-2020 * Added support for handling "slim" format zoneinfo files that are produced by @@ -174,6 +182,14 @@ `TZInfo::Country.get('US').zone_identifiers` should be used instead. +## Version 1.2.9 - 16-Dec-2020 + +* Fixed an incorrect InvalidTimezoneIdentifier exception raised when loading a + zoneinfo file that includes rules specifying an additional transition to the + final defined offset (for example, Africa/Casablanca in version 2018e of the + Time Zone Database). #123. + + ## Version 1.2.8 - 8-Nov-2020 * Added support for handling "slim" format zoneinfo files that are produced by Binary files old/checksums.yaml.gz and new/checksums.yaml.gz differ Binary files old/checksums.yaml.gz.sig and new/checksums.yaml.gz.sig differ Binary files old/data.tar.gz.sig and new/data.tar.gz.sig differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/tzinfo/data_sources/zoneinfo_reader.rb new/lib/tzinfo/data_sources/zoneinfo_reader.rb --- old/lib/tzinfo/data_sources/zoneinfo_reader.rb 2020-11-08 14:08:04.000000000 +0100 +++ new/lib/tzinfo/data_sources/zoneinfo_reader.rb 2020-12-16 21:58:54.000000000 +0100 @@ -323,8 +323,11 @@ if last_year <= GENERATE_UP_TO rules = replace_with_existing_offsets(offsets, rules) - generated = rules.transitions(last_year).find_all {|t| t.timestamp_value > last_defined.timestamp_value } + - (last_year + 1).upto(GENERATE_UP_TO).flat_map {|y| rules.transitions(y) } + generated = rules.transitions(last_year).find_all do |t| + t.timestamp_value > last_defined.timestamp_value && !offset_matches_rule?(last_defined.offset, t.offset) + end + + generated += (last_year + 1).upto(GENERATE_UP_TO).flat_map {|y| rules.transitions(y) } unless generated.empty? transitions[-1] = validate_and_fix_last_defined_transition_offset(file, last_defined, generated[0].previous_offset) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/tzinfo/version.rb new/lib/tzinfo/version.rb --- old/lib/tzinfo/version.rb 2020-11-08 14:08:04.000000000 +0100 +++ new/lib/tzinfo/version.rb 2020-12-16 21:58:54.000000000 +0100 @@ -3,5 +3,5 @@ module TZInfo # The TZInfo version number. - VERSION = '2.0.3' + VERSION = '2.0.4' end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/metadata new/metadata --- old/metadata 2020-11-08 14:08:04.000000000 +0100 +++ new/metadata 2020-12-16 21:58:54.000000000 +0100 @@ -1,7 +1,7 @@ --- !ruby/object:Gem::Specification name: tzinfo version: !ruby/object:Gem::Version - version: 2.0.3 + version: 2.0.4 platform: ruby authors: - Philip Ross @@ -29,7 +29,7 @@ J3Zn/kSTjTekiaspyGbczC3PUaeJNxr+yCvR4sk71Xmk/GaKKGOHedJ1uj/LAXrA MR0mpl7b8zCg0PFC1J73uw== -----END CERTIFICATE----- -date: 2020-11-08 00:00:00.000000000 Z +date: 2020-12-16 00:00:00.000000000 Z dependencies: - !ruby/object:Gem::Dependency name: concurrent-ruby @@ -114,9 +114,9 @@ metadata: bug_tracker_uri: https://github.com/tzinfo/tzinfo/issues changelog_uri: https://github.com/tzinfo/tzinfo/blob/master/CHANGES.md - documentation_uri: https://rubydoc.info/gems/tzinfo/2.0.3 + documentation_uri: https://rubydoc.info/gems/tzinfo/2.0.4 homepage_uri: https://tzinfo.github.io - source_code_uri: https://github.com/tzinfo/tzinfo/tree/v2.0.3 + source_code_uri: https://github.com/tzinfo/tzinfo/tree/v2.0.4 post_install_message: rdoc_options: - "--title" Binary files old/metadata.gz.sig and new/metadata.gz.sig differ

1 0

commit containers-systemd for openSUSE:Factory
by User for buildservice source handling 21 Dec '20

21 Dec '20

Hello community, here is the log from the commit of package containers-systemd for openSUSE:Factory checked in at 2020-12-21 12:35:24 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/containers-systemd (Old) and /work/SRC/openSUSE:Factory/.containers-systemd.new.5145 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "containers-systemd" Mon Dec 21 12:35:24 2020 rev:19 rq:857743 version:0.0+git20201220.ed8a6b2 Changes: -------- --- /work/SRC/openSUSE:Factory/containers-systemd/containers-systemd.changes 2020-12-10 15:56:40.842772233 +0100 +++ /work/SRC/openSUSE:Factory/.containers-systemd.new.5145/containers-systemd.changes 2020-12-21 12:35:25.786968268 +0100 @@ -1,0 +2,26 @@ +Sun Dec 20 17:20:42 UTC 2020 - kukuk(a)suse.com + +- Update to version 0.0+git20201220.ed8a6b2: + * Add default for FETCHMAILRC + +------------------------------------------------------------------- +Sun Dec 20 15:35:17 UTC 2020 - kukuk(a)suse.com + +- Update to version 0.0+git20201220.0fae7ba: + * Add service for fetchmail container + +------------------------------------------------------------------- +Sun Dec 20 07:41:26 UTC 2020 - kukuk(a)suse.com + +- Update to version 0.0+git20201220.69a11d7: + * Document spamassassin support + * Add support for a spamassassin container + +------------------------------------------------------------------- +Thu Dec 17 14:50:53 UTC 2020 - Thorsten Kukuk <kukuk(a)suse.com> + +- LDAP_MAIL_READER_PASSWORD was renamed to LDAP_BIND_PASSWORD +- Update to version 0.0+git20201217.a84253d: + * Allow to overwrite TLS key location + +------------------------------------------------------------------- Old: ---- containers-systemd-0.0+git20201208.1b4413e.tar.xz New: ---- containers-systemd-0.0+git20201220.ed8a6b2.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ containers-systemd.spec ++++++ --- /var/tmp/diff_new_pack.Kt6HKd/_old 2020-12-21 12:35:26.358969635 +0100 +++ /var/tmp/diff_new_pack.Kt6HKd/_new 2020-12-21 12:35:26.358969635 +0100 @@ -16,8 +16,8 @@ # -%define containers bind dhcp-server dovecot haproxy mariadb minidlna nginx openldap postfix squid -%define container_services container-bind.service container-dhcp-server.service container-dhcp6-server.service container-dovecot.service container-haproxy.service container-mariadb.service container-minidlna.service container-nginx.service container-openldap.service container-postfix.service container-squid.service container-image-prune.service container-image-prune.timer +%define containers bind dhcp-server dovecot fetchmail haproxy mariadb minidlna nginx openldap postfix spamassassin squid +%define container_services container-bind.service container-dhcp-server.service container-dhcp6-server.service container-dovecot.service container-fetchmail.service container-haproxy.service container-mariadb.service container-minidlna.service container-nginx.service container-openldap.service container-postfix.service container-spamassassin.service container-squid.service container-image-prune.service container-image-prune.timer %if %{undefined service_del_postun_without_restart} %define service_del_postun_without_restart() \ @@ -26,7 +26,7 @@ %endif Name: containers-systemd -Version: 0.0+git20201208.1b4413e +Version: 0.0+git20201220.ed8a6b2 Release: 0 Summary: Systemd service files and config files for openSUSE container License: MIT @@ -38,7 +38,8 @@ %description This package contains the configuration files and systemd units to run the openSUSE containers via podman managed by systemd. -Currently supported are bind, dhcp-server, mariadb, nginx and squid. +Currently supported are bind, dhcp-server, dovecot, fetchmail, haproxy, +mariadb, minidlna, nginx, openldap, postfix, spamassassin and squid. Additional, there is a timer to cleanup dangling container images. %prep @@ -70,7 +71,7 @@ touch %{buildroot}%{_sysconfdir}/openldap-secrets/$i done mkdir -p %{buildroot}%{_sysconfdir}/postfix-secrets -for i in SMTP_PASSWORD LDAP_MAIL_READER_PASSWORD; do +for i in SMTP_PASSWORD LDAP_BIND_PASSWORD; do touch %{buildroot}%{_sysconfdir}/postfix-secrets/$i done @@ -104,6 +105,9 @@ %{_distconfdir}/default/container-dovecot %{_sbindir}/rccontainer-dovecot %ghost %dir /srv/dovecot +%{_unitdir}/container-fetchmail.service +%{_distconfdir}/default/container-fetchmail +%{_sbindir}/rccontainer-fetchmail %{_unitdir}/container-haproxy.service %{_distconfdir}/default/container-haproxy %{_sbindir}/rccontainer-haproxy @@ -138,7 +142,10 @@ %ghost %dir /srv/postfix %dir %attr(0700,root,root) %{_sysconfdir}/postfix-secrets %config(noreplace) %attr(0600,root,root) %{_sysconfdir}/postfix-secrets/SMTP_PASSWORD -%config(noreplace) %attr(0600,root,root) %{_sysconfdir}/postfix-secrets/LDAP_MAIL_READER_PASSWORD +%config(noreplace) %attr(0600,root,root) %{_sysconfdir}/postfix-secrets/LDAP_BIND_PASSWORD +%{_unitdir}/container-spamassassin.service +%{_distconfdir}/default/container-spamassassin +%{_sbindir}/rccontainer-spamassassin %{_unitdir}/container-squid.service %{_distconfdir}/default/container-squid %{_sbindir}/rccontainer-squid ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.Kt6HKd/_old 2020-12-21 12:35:26.394969721 +0100 +++ /var/tmp/diff_new_pack.Kt6HKd/_new 2020-12-21 12:35:26.394969721 +0100 @@ -1,5 +1,5 @@ <servicedata> <service name="tar_scm"> <param name="url">git://github.com/kubic-project/containers-systemd.git</param> - <param name="changesrevision">1b4413e91ca288a52f20d17bf5cb208126c796c0</param></service> + <param name="changesrevision">ed8a6b2787e73999d535ceadf720f2d356217c35</param></service> </servicedata> \ No newline at end of file ++++++ containers-systemd-0.0+git20201208.1b4413e.tar.xz -> containers-systemd-0.0+git20201220.ed8a6b2.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/containers-systemd-0.0+git20201208.1b4413e/README.md new/containers-systemd-0.0+git20201220.ed8a6b2/README.md --- old/containers-systemd-0.0+git20201208.1b4413e/README.md 2020-12-08 16:34:40.000000000 +0100 +++ new/containers-systemd-0.0+git20201220.ed8a6b2/README.md 2020-12-20 18:20:16.000000000 +0100 @@ -8,12 +8,14 @@ * dhcp-server * dhcp6-server * dovecot + * fetchmail * haproxy * mariadb * minidlna * nginx * openldap * postfix + * spamassassin * squid Additional, there is the `container-image-prune.timer` to cleanup @@ -34,6 +36,11 @@ * /usr/etc/default/container-dovecot contains generic settings * /etc/default/container-dovecot is for the admin to overwrite them +## fetchmail + + * /usr/etc/default/container-fetchmail contains generic settings + * /etc/default/container-fetchmail is for the admin to overwrite them + ## haproxy * /usr/etc/default/container-haproxy contains generic settings @@ -73,6 +80,11 @@ * /usr/etc/default/container-postfix contains generic settings * /etc/default/container-postfix is for the admin to overwrite them +## spamassassin + + * /usr/etc/default/container-spamassassin contains generic settings + * /etc/default/container-spamassassin is for the admin to overwrite them + ## squid * /usr/etc/default/container-squid contains generic settings diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/containers-systemd-0.0+git20201208.1b4413e/container-dovecot.service new/containers-systemd-0.0+git20201220.ed8a6b2/container-dovecot.service --- old/containers-systemd-0.0+git20201208.1b4413e/container-dovecot.service 2020-12-08 16:34:40.000000000 +0100 +++ new/containers-systemd-0.0+git20201220.ed8a6b2/container-dovecot.service 2020-12-20 18:20:16.000000000 +0100 @@ -12,7 +12,7 @@ ExecStartPre=-/usr/bin/podman stop dovecot ExecStartPre=-/usr/bin/podman rm dovecot ExecStartPre=-/usr/bin/podman pull ${DOVECOT_IMAGE_PATH} -ExecStart=/bin/sh -c "/usr/bin/podman run -d --conmon-pidfile /%t/%n-pid ${PODMAN_EXTRA_ARGS} -v ${DOVECOT_VMAIL_DIR}:/var/spool/vmail:z -v ${DOVECOT_CERTS_DIR}:/etc/certs:z -v ${EXTRA_PKI_DIR}:/etc/pki:z -v ${SECRETS_DIR}:/etc/dovecot-secrets:Z ${DOVECOT_PORTS} -e USE_VMAIL_USER=${USE_VMAIL_USER} -e VMAIL_UID=${VMAIL_UID} -e USE_LDAP=${USE_LDAP} -e LDAP_HOSTS=${LDAP_HOSTS} -e LDAP_BASE_DN=${LDAP_BASE_DN} -e LDAP_BIND_DN=${LDAP_BIND_DN} -e LDAP_BIND_PASSWORD_FILE=${LDAP_BIND_PASSWORD_FILE} -e LDAP_USE_TLS=${LDAP_USE_TLS} -e ENABLE_IMAP=${ENABLE_IMAP} -e ENABLE_POP3=${ENABLE_POP3} -e ENABLE_LMTP=${ENABLE_LMTP} -e ENABLE_MANAGESIEVE=${ENABLE_MANAGESIEVE} -e DEBUG=${DEBUG} -e TZ=${TZ} --name dovecot ${DOVECOT_IMAGE_PATH}" +ExecStart=/bin/sh -c "/usr/bin/podman run -d --conmon-pidfile /%t/%n-pid ${PODMAN_EXTRA_ARGS} -v ${DOVECOT_VMAIL_DIR}:/var/spool/vmail:z -v ${DOVECOT_CERTS_DIR}:/etc/certs:z -v ${EXTRA_PKI_DIR}:/etc/pki:z -v ${SECRETS_DIR}:/etc/dovecot-secrets:Z ${DOVECOT_PORTS} -e USE_VMAIL_USER=${USE_VMAIL_USER} -e VMAIL_UID=${VMAIL_UID} -e USE_LDAP=${USE_LDAP} -e LDAP_HOSTS=${LDAP_HOSTS} -e LDAP_BASE_DN=${LDAP_BASE_DN} -e LDAP_BIND_DN=${LDAP_BIND_DN} -e LDAP_BIND_PASSWORD_FILE=${LDAP_BIND_PASSWORD_FILE} -e LDAP_USE_TLS=${LDAP_USE_TLS} -e DOVECOT_TLS_CRT=${DOVECOT_TLS_CRT} -e DOVECOT_TLS_KEY=${DOVECOT_TLS_KEY} -e DOVECOT_TLS_CA_CRT=${DOVECOT_TLS_CA_CRT} -e DOVECOT_TLS_CA_KEY=${DOVECOT_TLS_CA_KEY} -e ENABLE_IMAP=${ENABLE_IMAP} -e ENABLE_POP3=${ENABLE_POP3} -e ENABLE_LMTP=${ENABLE_LMTP} -e ENABLE_MANAGESIEVE=${ENABLE_MANAGESIEVE} -e DEBUG=${DEBUG} -e TZ=${TZ} --name dovecot ${DOVECOT_IMAGE_PATH}" ExecStop=/usr/bin/podman stop dovecot KillMode=none Type=forking diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/containers-systemd-0.0+git20201208.1b4413e/container-fetchmail.default new/containers-systemd-0.0+git20201220.ed8a6b2/container-fetchmail.default --- old/containers-systemd-0.0+git20201208.1b4413e/container-fetchmail.default 1970-01-01 01:00:00.000000000 +0100 +++ new/containers-systemd-0.0+git20201220.ed8a6b2/container-fetchmail.default 2020-12-20 18:20:16.000000000 +0100 @@ -0,0 +1,17 @@ +# Variables of this file can be overwritten with +# /etc/default/container-fetchmail + +# Name of the image path to pull the fetchmail image from +FETCHMAIL_IMAGE_PATH=registry.opensuse.org/opensuse/fetchmail:latest + +# fetchmail configuration file +FETCHMAILRC="/etc/fetchmailrc" + +# Intervall in which to poll for new mails +POLLING_INTERVAL="600" + +# Comma seprated list of hosts to forward mail to +SMTP_HOSTS="" + +# Extra arguments for podman to start the container +PODMAN_EXTRA_ARGS="" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/containers-systemd-0.0+git20201208.1b4413e/container-fetchmail.service new/containers-systemd-0.0+git20201220.ed8a6b2/container-fetchmail.service --- old/containers-systemd-0.0+git20201208.1b4413e/container-fetchmail.service 1970-01-01 01:00:00.000000000 +0100 +++ new/containers-systemd-0.0+git20201220.ed8a6b2/container-fetchmail.service 2020-12-20 18:20:16.000000000 +0100 @@ -0,0 +1,21 @@ +[Unit] +Description=openSUSE fetchmail container +Documentation=https://build.opensuse.org/package/show/openSUSE:Factory/opensuse-fetchmail-image +After=network-online.target local-fs.target firewalld.service +Wants=network-online.target + +[Service] +Restart=on-abnormal +EnvironmentFile=/usr/etc/default/container-fetchmail +EnvironmentFile=-/etc/default/container-fetchmail +ExecStartPre=-/usr/bin/podman stop fetchmail +ExecStartPre=-/usr/bin/podman rm fetchmail +ExecStartPre=-/usr/bin/podman pull ${FETCHMAIL_IMAGE_PATH} +ExecStart=/bin/sh -c "/usr/bin/podman run -d --conmon-pidfile /%t/%n-pid --rm ${PODMAN_EXTRA_ARGS} -v ${FETCHMAILRC}:/etc/fetchmailrc:ro -e POLLING_INTERVAL=${POLLING_INTERVAL} -e FETCHALL=${FETCHALL} -e SILENT=${SILENT} -e SMTP_HOSTS=${SMTP_HOSTS} -e DEBUG=${DEBUG} -e TZ=${TZ} --name fetchmail ${FETCHMAIL_IMAGE_PATH}" +ExecStop=/usr/bin/podman stop fetchmail +KillMode=none +Type=forking +PIDFile=/%t/%n-pid + +[Install] +WantedBy=multi-user.target diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/containers-systemd-0.0+git20201208.1b4413e/container-spamassassin.default new/containers-systemd-0.0+git20201220.ed8a6b2/container-spamassassin.default --- old/containers-systemd-0.0+git20201208.1b4413e/container-spamassassin.default 1970-01-01 01:00:00.000000000 +0100 +++ new/containers-systemd-0.0+git20201220.ed8a6b2/container-spamassassin.default 2020-12-20 18:20:16.000000000 +0100 @@ -0,0 +1,8 @@ +# Variables of this file can be overwritten with +# /etc/default/container-spamassassin + +# Name of the image path to pull the spamassassin image from +SPAMASSASSIN_IMAGE_PATH=registry.opensuse.org/opensuse/spamassassin:latest + +# Extra arguments for podman to start the container +PODMAN_EXTRA_ARGS="" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/containers-systemd-0.0+git20201208.1b4413e/container-spamassassin.service new/containers-systemd-0.0+git20201220.ed8a6b2/container-spamassassin.service --- old/containers-systemd-0.0+git20201208.1b4413e/container-spamassassin.service 1970-01-01 01:00:00.000000000 +0100 +++ new/containers-systemd-0.0+git20201220.ed8a6b2/container-spamassassin.service 2020-12-20 18:20:16.000000000 +0100 @@ -0,0 +1,21 @@ +[Unit] +Description=openSUSE SpamAssassin container +Documentation=https://build.opensuse.org/package/show/openSUSE:Factory/opensuse-spamassassin-image +After=network-online.target local-fs.target firewalld.service +Wants=network-online.target + +[Service] +Restart=on-abnormal +EnvironmentFile=/usr/etc/default/container-spamassassin +EnvironmentFile=-/etc/default/container-spamassassin +ExecStartPre=-/usr/bin/podman stop spamassassin +ExecStartPre=-/usr/bin/podman rm spamassassin +ExecStartPre=-/usr/bin/podman pull ${SPAMASSASSIN_IMAGE_PATH} +ExecStart=/bin/sh -c "/usr/bin/podman run -d --conmon-pidfile /%t/%n-pid --rm ${PODMAN_EXTRA_ARGS} -p 783:783 -e DEBUG=${DEBUG} -e TZ=${TZ} --name spamassassin ${SPAMASSASSIN_IMAGE_PATH}" +ExecStop=/usr/bin/podman stop spamassassin +KillMode=none +Type=forking +PIDFile=/%t/%n-pid + +[Install] +WantedBy=multi-user.target

1 0

commit perl-LWP-Protocol-https for openSUSE:Factory
by User for buildservice source handling 21 Dec '20

21 Dec '20

Hello community, here is the log from the commit of package perl-LWP-Protocol-https for openSUSE:Factory checked in at 2020-12-21 12:35:23 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/perl-LWP-Protocol-https (Old) and /work/SRC/openSUSE:Factory/.perl-LWP-Protocol-https.new.5145 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "perl-LWP-Protocol-https" Mon Dec 21 12:35:23 2020 rev:16 rq:856860 version:6.10 Changes: -------- --- /work/SRC/openSUSE:Factory/perl-LWP-Protocol-https/perl-LWP-Protocol-https.changes 2020-10-20 15:59:42.533705741 +0200 +++ /work/SRC/openSUSE:Factory/.perl-LWP-Protocol-https.new.5145/perl-LWP-Protocol-https.changes 2020-12-21 12:35:23.966963918 +0100 @@ -1,0 +2,12 @@ +Fri Dec 18 03:07:41 UTC 2020 - Tina Müller <timueller+perl(a)suse.de> + +- updated to 6.10 + see /usr/share/doc/packages/perl-LWP-Protocol-https/Changes + + 6.10 2020-12-17 15:42:06Z + - Fix #39 - prevent user env from breaking the test (GH#63) (Gianni + Ceccarelli) + - Include Net::SSLeay in reported prereqs (GH#60) (Olaf Alders) + - Use GitHub as a bug tracker (GH#59) (Olaf Alders) + +------------------------------------------------------------------- Old: ---- LWP-Protocol-https-6.09.tar.gz New: ---- LWP-Protocol-https-6.10.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-LWP-Protocol-https.spec ++++++ --- /var/tmp/diff_new_pack.jyJ4Su/_old 2020-12-21 12:35:24.574965371 +0100 +++ /var/tmp/diff_new_pack.jyJ4Su/_new 2020-12-21 12:35:24.578965380 +0100 @@ -17,7 +17,7 @@ Name: perl-LWP-Protocol-https -Version: 6.09 +Version: 6.10 Release: 0 %define cpan_name LWP-Protocol-https Summary: Provide https support for LWP::UserAgent @@ -38,6 +38,7 @@ BuildRequires: perl(LWP::UserAgent) >= 6.06 #BuildRequires: perl(Mozilla::CA) >= 20180117 BuildRequires: perl(Net::HTTPS) >= 6 +BuildRequires: perl(Test::More) >= 0.96 BuildRequires: perl(Test::RequiresInternet) Requires: perl(IO::Socket::SSL) >= 1.54 Requires: perl(LWP::Protocol::http) ++++++ LWP-Protocol-https-6.09.tar.gz -> LWP-Protocol-https-6.10.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/LWP-Protocol-https-6.09/Changes new/LWP-Protocol-https-6.10/Changes --- old/LWP-Protocol-https-6.09/Changes 2020-07-16 15:33:07.000000000 +0200 +++ new/LWP-Protocol-https-6.10/Changes 2020-12-17 16:42:08.000000000 +0100 @@ -1,5 +1,11 @@ Release history for LWP-Protocol-https +6.10 2020-12-17 15:42:06Z + - Fix #39 - prevent user env from breaking the test (GH#63) (Gianni + Ceccarelli) + - Include Net::SSLeay in reported prereqs (GH#60) (Olaf Alders) + - Use GitHub as a bug tracker (GH#59) (Olaf Alders) + 6.09 2020-07-16 13:33:05Z - Make available the version of SSL/TLS protocol used in the connection (GH#56) (Jon Jensen) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/LWP-Protocol-https-6.09/MANIFEST new/LWP-Protocol-https-6.10/MANIFEST --- old/LWP-Protocol-https-6.09/MANIFEST 2020-07-16 15:33:07.000000000 +0200 +++ new/LWP-Protocol-https-6.10/MANIFEST 2020-12-17 16:42:08.000000000 +0100 @@ -1,4 +1,4 @@ -# This file was automatically generated by Dist::Zilla::Plugin::Manifest v6.015. +# This file was automatically generated by Dist::Zilla::Plugin::Manifest v6.017. CONTRIBUTING.md Changes Install @@ -20,6 +20,7 @@ tidyall.ini xt/author/00-compile.t xt/author/clean-namespaces.t +xt/author/distmeta.t xt/author/eol.t xt/author/kwalitee.t xt/author/minimum-version.t @@ -30,4 +31,3 @@ xt/author/portability.t xt/author/test-version.t xt/release/changes_has_content.t -xt/release/distmeta.t diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/LWP-Protocol-https-6.09/META.json new/LWP-Protocol-https-6.10/META.json --- old/LWP-Protocol-https-6.09/META.json 2020-07-16 15:33:07.000000000 +0200 +++ new/LWP-Protocol-https-6.10/META.json 2020-12-17 16:42:08.000000000 +0100 @@ -4,7 +4,7 @@ "Gisle Aas <gisle(a)activestate.com>" ], "dynamic_config" : 0, - "generated_by" : "Dist::Zilla version 6.015, CPAN::Meta::Converter version 2.150010", + "generated_by" : "Dist::Zilla version 6.017, CPAN::Meta::Converter version 2.150010", "license" : [ "perl_5" ], @@ -81,7 +81,7 @@ "IO::Socket::SSL::Utils" : "0", "LWP::UserAgent" : "6.06", "Socket" : "0", - "Test::More" : "0", + "Test::More" : "0.96", "Test::RequiresInternet" : "0", "perl" : "5.008001", "warnings" : "0" @@ -91,15 +91,18 @@ "provides" : { "LWP::Protocol::https" : { "file" : "lib/LWP/Protocol/https.pm", - "version" : "6.09" + "version" : "6.10" }, "LWP::Protocol::https::Socket" : { "file" : "lib/LWP/Protocol/https.pm", - "version" : "6.09" + "version" : "6.10" } }, "release_status" : "stable", "resources" : { + "bugtracker" : { + "web" : "https://github.com/libwww-perl/LWP-Protocol-https/issues" + }, "homepage" : "https://github.com/libwww-perl/LWP-Protocol-https", "repository" : { "type" : "git", @@ -109,10 +112,10 @@ "x_IRC" : "irc://irc.perl.org/#lwp", "x_MailingList" : "mailto:libwww@perl.org" }, - "version" : "6.09", + "version" : "6.10", "x_Dist_Zilla" : { "perl" : { - "version" : "5.030002" + "version" : "5.030003" }, "plugins" : [ { @@ -137,17 +140,17 @@ } }, "name" : "Git::GatherDir", - "version" : "2.046" + "version" : "2.047" }, { "class" : "Dist::Zilla::Plugin::PruneCruft", "name" : "PruneCruft", - "version" : "6.015" + "version" : "6.017" }, { "class" : "Dist::Zilla::Plugin::MetaConfig", "name" : "MetaConfig", - "version" : "6.015" + "version" : "6.017" }, { "class" : "Dist::Zilla::Plugin::MetaProvides::Package", @@ -157,7 +160,7 @@ { "class" : "Dist::Zilla::Plugin::FinderCode", "name" : "MetaProvides::Package/AUTOVIV/:InstallModulesPM", - "version" : "6.015" + "version" : "6.017" } ], "include_underscores" : 0 @@ -179,22 +182,22 @@ { "class" : "Dist::Zilla::Plugin::MetaNoIndex", "name" : "MetaNoIndex", - "version" : "6.015" + "version" : "6.017" }, { "class" : "Dist::Zilla::Plugin::MetaYAML", "name" : "MetaYAML", - "version" : "6.015" + "version" : "6.017" }, { "class" : "Dist::Zilla::Plugin::MetaJSON", "name" : "MetaJSON", - "version" : "6.015" + "version" : "6.017" }, { "class" : "Dist::Zilla::Plugin::MetaResources", "name" : "MetaResources", - "version" : "6.015" + "version" : "6.017" }, { "class" : "Dist::Zilla::Plugin::Git::Check", @@ -211,83 +214,18 @@ "changelog" : "Changes" }, "Dist::Zilla::Role::Git::Repo" : { - "git_version" : "2.27.0", - "repo_root" : "." - } - }, - "name" : "@Git/Check", - "version" : "2.046" - }, - { - "class" : "Dist::Zilla::Plugin::Git::Commit", - "config" : { - "Dist::Zilla::Plugin::Git::Commit" : { - "add_files_in" : [], - "commit_msg" : "v%V%n%n%c" - }, - "Dist::Zilla::Role::Git::DirtyFiles" : { - "allow_dirty" : [ - "Changes", - "dist.ini" - ], - "allow_dirty_match" : [], - "changelog" : "Changes" - }, - "Dist::Zilla::Role::Git::Repo" : { - "git_version" : "2.27.0", - "repo_root" : "." - }, - "Dist::Zilla::Role::Git::StringFormatter" : { - "time_zone" : "local" - } - }, - "name" : "@Git/Commit", - "version" : "2.046" - }, - { - "class" : "Dist::Zilla::Plugin::Git::Tag", - "config" : { - "Dist::Zilla::Plugin::Git::Tag" : { - "branch" : null, - "changelog" : "Changes", - "signed" : 0, - "tag" : "v6.09", - "tag_format" : "v%V", - "tag_message" : "v%V" - }, - "Dist::Zilla::Role::Git::Repo" : { - "git_version" : "2.27.0", - "repo_root" : "." - }, - "Dist::Zilla::Role::Git::StringFormatter" : { - "time_zone" : "local" - } - }, - "name" : "@Git/Tag", - "version" : "2.046" - }, - { - "class" : "Dist::Zilla::Plugin::Git::Push", - "config" : { - "Dist::Zilla::Plugin::Git::Push" : { - "push_to" : [ - "origin" - ], - "remotes_must_exist" : 1 - }, - "Dist::Zilla::Role::Git::Repo" : { - "git_version" : "2.27.0", + "git_version" : "2.29.2", "repo_root" : "." } }, - "name" : "@Git/Push", - "version" : "2.046" + "name" : "Git::Check", + "version" : "2.047" }, { "class" : "Dist::Zilla::Plugin::Git::Contributors", "config" : { "Dist::Zilla::Plugin::Git::Contributors" : { - "git_version" : "2.27.0", + "git_version" : "2.29.2", "include_authors" : 0, "include_releaser" : 1, "order_by" : "name", @@ -310,12 +248,12 @@ { "class" : "Dist::Zilla::Plugin::Manifest", "name" : "Manifest", - "version" : "6.015" + "version" : "6.017" }, { "class" : "Dist::Zilla::Plugin::License", "name" : "License", - "version" : "6.015" + "version" : "6.017" }, { "class" : "Dist::Zilla::Plugin::ReadmeAnyFromPod", @@ -336,7 +274,7 @@ } }, "name" : "@Git::VersionManager/pluginbundle version", - "version" : "6.015" + "version" : "6.017" }, { "class" : "Dist::Zilla::Plugin::RewriteVersion::Transitional", @@ -371,14 +309,15 @@ } }, "name" : "@Git::VersionManager/CopyFilesFromRelease", - "version" : "0.006" + "version" : "0.007" }, { "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" : [ @@ -391,7 +330,7 @@ "changelog" : "Changes" }, "Dist::Zilla::Role::Git::Repo" : { - "git_version" : "2.27.0", + "git_version" : "2.29.2", "repo_root" : "." }, "Dist::Zilla::Role::Git::StringFormatter" : { @@ -399,7 +338,7 @@ } }, "name" : "@Git::VersionManager/release snapshot", - "version" : "2.046" + "version" : "2.047" }, { "class" : "Dist::Zilla::Plugin::Git::Tag", @@ -408,12 +347,12 @@ "branch" : null, "changelog" : "Changes", "signed" : 0, - "tag" : "v6.09", + "tag" : "v6.10", "tag_format" : "v%V", "tag_message" : "v%V" }, "Dist::Zilla::Role::Git::Repo" : { - "git_version" : "2.27.0", + "git_version" : "2.29.2", "repo_root" : "." }, "Dist::Zilla::Role::Git::StringFormatter" : { @@ -421,7 +360,7 @@ } }, "name" : "@Git::VersionManager/Git::Tag", - "version" : "2.046" + "version" : "2.047" }, { "class" : "Dist::Zilla::Plugin::BumpVersionAfterRelease::Transitional", @@ -442,14 +381,15 @@ { "class" : "Dist::Zilla::Plugin::NextRelease", "name" : "@Git::VersionManager/NextRelease", - "version" : "6.015" + "version" : "6.017" }, { "class" : "Dist::Zilla::Plugin::Git::Commit", "config" : { "Dist::Zilla::Plugin::Git::Commit" : { "add_files_in" : [], - "commit_msg" : "increment $VERSION after %v release" + "commit_msg" : "increment $VERSION after %v release", + "signoff" : 0 }, "Dist::Zilla::Role::Git::DirtyFiles" : { "allow_dirty" : [ @@ -463,7 +403,7 @@ "changelog" : "Changes" }, "Dist::Zilla::Role::Git::Repo" : { - "git_version" : "2.27.0", + "git_version" : "2.29.2", "repo_root" : "." }, "Dist::Zilla::Role::Git::StringFormatter" : { @@ -471,12 +411,7 @@ } }, "name" : "@Git::VersionManager/post-release commit", - "version" : "2.046" - }, - { - "class" : "Dist::Zilla::Plugin::NextRelease", - "name" : "NextRelease", - "version" : "6.015" + "version" : "2.047" }, { "class" : "Dist::Zilla::Plugin::Prereqs::FromCPANfile", @@ -488,32 +423,17 @@ "config" : { "Dist::Zilla::Plugin::MakeMaker" : { "make_path" : "make", - "version" : "6.015" + "version" : "6.017" }, "Dist::Zilla::Role::TestRunner" : { "default_jobs" : "4", - "version" : "6.015" + "version" : "6.017" } }, "name" : "MakeMaker::Awesome", "version" : "0.48" }, { - "class" : "Dist::Zilla::Plugin::TestRelease", - "name" : "TestRelease", - "version" : "6.015" - }, - { - "class" : "Dist::Zilla::Plugin::ConfirmRelease", - "name" : "ConfirmRelease", - "version" : "6.015" - }, - { - "class" : "Dist::Zilla::Plugin::UploadToCPAN", - "name" : "UploadToCPAN", - "version" : "6.015" - }, - { "class" : "Dist::Zilla::Plugin::CheckChangeLog", "name" : "CheckChangeLog", "version" : "0.05" @@ -549,7 +469,7 @@ { "class" : "Dist::Zilla::Plugin::Test::ReportPrereqs", "name" : "Test::ReportPrereqs", - "version" : "0.027" + "version" : "0.028" }, { "class" : "Dist::Zilla::Plugin::Test::Compile", @@ -614,7 +534,7 @@ { "class" : "Dist::Zilla::Plugin::MetaTests", "name" : "MetaTests", - "version" : "6.015" + "version" : "6.017" }, { "class" : "Dist::Zilla::Plugin::Test::ChangesHasContent", @@ -634,7 +554,7 @@ { "class" : "Dist::Zilla::Plugin::PodSyntaxTests", "name" : "PodSyntaxTests", - "version" : "6.015" + "version" : "6.017" }, { "class" : "Dist::Zilla::Plugin::Test::Pod::Coverage::Configurable", @@ -678,59 +598,91 @@ "version" : "0.170880" }, { + "class" : "Dist::Zilla::Plugin::TestRelease", + "name" : "TestRelease", + "version" : "6.017" + }, + { + "class" : "Dist::Zilla::Plugin::ConfirmRelease", + "name" : "ConfirmRelease", + "version" : "6.017" + }, + { + "class" : "Dist::Zilla::Plugin::UploadToCPAN", + "name" : "UploadToCPAN", + "version" : "6.017" + }, + { + "class" : "Dist::Zilla::Plugin::Git::Push", + "config" : { + "Dist::Zilla::Plugin::Git::Push" : { + "push_to" : [ + "origin" + ], + "remotes_must_exist" : 1 + }, + "Dist::Zilla::Role::Git::Repo" : { + "git_version" : "2.29.2", + "repo_root" : "." + } + }, + "name" : "Git::Push", + "version" : "2.047" + }, + { "class" : "Dist::Zilla::Plugin::FinderCode", "name" : ":InstallModules", - "version" : "6.015" + "version" : "6.017" }, { "class" : "Dist::Zilla::Plugin::FinderCode", "name" : ":IncModules", - "version" : "6.015" + "version" : "6.017" }, { "class" : "Dist::Zilla::Plugin::FinderCode", "name" : ":TestFiles", - "version" : "6.015" + "version" : "6.017" }, { "class" : "Dist::Zilla::Plugin::FinderCode", "name" : ":ExtraTestFiles", - "version" : "6.015" + "version" : "6.017" }, { "class" : "Dist::Zilla::Plugin::FinderCode", "name" : ":ExecFiles", - "version" : "6.015" + "version" : "6.017" }, { "class" : "Dist::Zilla::Plugin::FinderCode", "name" : ":PerlExecFiles", - "version" : "6.015" + "version" : "6.017" }, { "class" : "Dist::Zilla::Plugin::FinderCode", "name" : ":ShareFiles", - "version" : "6.015" + "version" : "6.017" }, { "class" : "Dist::Zilla::Plugin::FinderCode", "name" : ":MainModule", - "version" : "6.015" + "version" : "6.017" }, { "class" : "Dist::Zilla::Plugin::FinderCode", "name" : ":AllFiles", - "version" : "6.015" + "version" : "6.017" }, { "class" : "Dist::Zilla::Plugin::FinderCode", "name" : ":NoFiles", - "version" : "6.015" + "version" : "6.017" }, { "class" : "Dist::Zilla::Plugin::FinderCode", "name" : "MetaProvides::Package/AUTOVIV/:InstallModulesPM", - "version" : "6.015" + "version" : "6.017" } ], "zilla" : { @@ -738,7 +690,7 @@ "config" : { "is_trial" : 0 }, - "version" : "6.015" + "version" : "6.017" } }, "x_authority" : "cpan:GAAS", @@ -764,6 +716,7 @@ "Father Chrysostomos <sprout(a)cpan.org>", "FWILES <FWILES(a)cpan.org>", "Gavin Peters <gpeters(a)deepsky.com>", + "Gianni Ceccarelli <gianni.ceccarelli(a)broadbean.com>", "Gisle Aas <gisle(a)aas.no>", "Graeme Thompson <Graeme.Thompson(a)mobilecohesion.com>", "Hans-H. Froehlich <hfroehlich(a)co-de-co.de>", @@ -807,7 +760,7 @@ "Yury Zavarin <yury.zavarin(a)gmail.com>", "Zefram <zefram(a)fysh.org>" ], - "x_generated_by_perl" : "v5.30.2", + "x_generated_by_perl" : "v5.30.3", "x_serialization_backend" : "Cpanel::JSON::XS version 4.19", "x_spdx_expression" : "Artistic-1.0-Perl OR GPL-1.0-or-later" } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/LWP-Protocol-https-6.09/META.yml new/LWP-Protocol-https-6.10/META.yml --- old/LWP-Protocol-https-6.09/META.yml 2020-07-16 15:33:07.000000000 +0200 +++ new/LWP-Protocol-https-6.10/META.yml 2020-12-17 16:42:08.000000000 +0100 @@ -12,7 +12,7 @@ IO::Socket::SSL::Utils: '0' LWP::UserAgent: '6.06' Socket: '0' - Test::More: '0' + Test::More: '0.96' Test::RequiresInternet: '0' perl: '5.008001' warnings: '0' @@ -20,7 +20,7 @@ ExtUtils::MakeMaker: '0' perl: '5.008001' dynamic_config: 0 -generated_by: 'Dist::Zilla version 6.015, CPAN::Meta::Converter version 2.150010' +generated_by: 'Dist::Zilla version 6.017, CPAN::Meta::Converter version 2.150010' license: perl meta-spec: url: http://module-build.sourceforge.net/META-spec-v1.4.html @@ -33,10 +33,10 @@ provides: LWP::Protocol::https: file: lib/LWP/Protocol/https.pm - version: '6.09' + version: '6.10' LWP::Protocol::https::Socket: file: lib/LWP/Protocol/https.pm - version: '6.09' + version: '6.10' requires: IO::Socket::SSL: '1.54' LWP::Protocol::http: '0' @@ -49,12 +49,13 @@ resources: IRC: irc://irc.perl.org/#lwp MailingList: mailto:libwww@perl.org + bugtracker: https://github.com/libwww-perl/LWP-Protocol-https/issues homepage: https://github.com/libwww-perl/LWP-Protocol-https repository: https://github.com/libwww-perl/LWP-Protocol-https.git -version: '6.09' +version: '6.10' x_Dist_Zilla: perl: - version: '5.030002' + version: '5.030003' plugins: - class: Dist::Zilla::Plugin::Git::GatherDir @@ -74,15 +75,15 @@ Dist::Zilla::Plugin::Git::GatherDir: include_untracked: 0 name: Git::GatherDir - version: '2.046' + version: '2.047' - class: Dist::Zilla::Plugin::PruneCruft name: PruneCruft - version: '6.015' + version: '6.017' - class: Dist::Zilla::Plugin::MetaConfig name: MetaConfig - version: '6.015' + version: '6.017' - class: Dist::Zilla::Plugin::MetaProvides::Package config: @@ -91,7 +92,7 @@ - class: Dist::Zilla::Plugin::FinderCode name: MetaProvides::Package/AUTOVIV/:InstallModulesPM - version: '6.015' + version: '6.017' include_underscores: 0 Dist::Zilla::Role::MetaProvider::Provider: $Dist::Zilla::Role::MetaProvider::Provider::VERSION: '2.002004' @@ -106,19 +107,19 @@ - class: Dist::Zilla::Plugin::MetaNoIndex name: MetaNoIndex - version: '6.015' + version: '6.017' - class: Dist::Zilla::Plugin::MetaYAML name: MetaYAML - version: '6.015' + version: '6.017' - class: Dist::Zilla::Plugin::MetaJSON name: MetaJSON - version: '6.015' + version: '6.017' - class: Dist::Zilla::Plugin::MetaResources name: MetaResources - version: '6.015' + version: '6.017' - class: Dist::Zilla::Plugin::Git::Check config: @@ -131,63 +132,15 @@ allow_dirty_match: [] changelog: Changes Dist::Zilla::Role::Git::Repo: - git_version: 2.27.0 + git_version: 2.29.2 repo_root: . - name: '@Git/Check' - version: '2.046' - - - class: Dist::Zilla::Plugin::Git::Commit - config: - Dist::Zilla::Plugin::Git::Commit: - add_files_in: [] - commit_msg: v%V%n%n%c - Dist::Zilla::Role::Git::DirtyFiles: - allow_dirty: - - Changes - - dist.ini - allow_dirty_match: [] - changelog: Changes - Dist::Zilla::Role::Git::Repo: - git_version: 2.27.0 - repo_root: . - Dist::Zilla::Role::Git::StringFormatter: - time_zone: local - name: '@Git/Commit' - version: '2.046' - - - class: Dist::Zilla::Plugin::Git::Tag - config: - Dist::Zilla::Plugin::Git::Tag: - branch: ~ - changelog: Changes - signed: 0 - tag: v6.09 - tag_format: v%V - tag_message: v%V - Dist::Zilla::Role::Git::Repo: - git_version: 2.27.0 - repo_root: . - Dist::Zilla::Role::Git::StringFormatter: - time_zone: local - name: '@Git/Tag' - version: '2.046' - - - class: Dist::Zilla::Plugin::Git::Push - config: - Dist::Zilla::Plugin::Git::Push: - push_to: - - origin - remotes_must_exist: 1 - Dist::Zilla::Role::Git::Repo: - git_version: 2.27.0 - repo_root: . - name: '@Git/Push' - version: '2.046' + name: Git::Check + version: '2.047' - class: Dist::Zilla::Plugin::Git::Contributors config: Dist::Zilla::Plugin::Git::Contributors: - git_version: 2.27.0 + git_version: 2.29.2 include_authors: 0 include_releaser: 1 order_by: name @@ -205,11 +158,11 @@ - class: Dist::Zilla::Plugin::Manifest name: Manifest - version: '6.015' + version: '6.017' - class: Dist::Zilla::Plugin::License name: License - version: '6.015' + version: '6.017' - class: Dist::Zilla::Plugin::ReadmeAnyFromPod config: @@ -224,7 +177,7 @@ phase: develop type: recommends name: '@Git::VersionManager/pluginbundle version' - version: '6.015' + version: '6.017' - class: Dist::Zilla::Plugin::RewriteVersion::Transitional config: @@ -250,13 +203,14 @@ - Changes match: [] name: '@Git::VersionManager/CopyFilesFromRelease' - version: '0.006' + version: '0.007' - class: Dist::Zilla::Plugin::Git::Commit config: Dist::Zilla::Plugin::Git::Commit: add_files_in: [] commit_msg: v%V%n%n%c + signoff: 0 Dist::Zilla::Role::Git::DirtyFiles: allow_dirty: - Changes @@ -266,12 +220,12 @@ allow_dirty_match: [] changelog: Changes Dist::Zilla::Role::Git::Repo: - git_version: 2.27.0 + git_version: 2.29.2 repo_root: . Dist::Zilla::Role::Git::StringFormatter: time_zone: local name: '@Git::VersionManager/release snapshot' - version: '2.046' + version: '2.047' - class: Dist::Zilla::Plugin::Git::Tag config: @@ -279,16 +233,16 @@ branch: ~ changelog: Changes signed: 0 - tag: v6.09 + tag: v6.10 tag_format: v%V tag_message: v%V Dist::Zilla::Role::Git::Repo: - git_version: 2.27.0 + git_version: 2.29.2 repo_root: . Dist::Zilla::Role::Git::StringFormatter: time_zone: local name: '@Git::VersionManager/Git::Tag' - version: '2.046' + version: '2.047' - class: Dist::Zilla::Plugin::BumpVersionAfterRelease::Transitional config: @@ -304,13 +258,14 @@ - class: Dist::Zilla::Plugin::NextRelease name: '@Git::VersionManager/NextRelease' - version: '6.015' + version: '6.017' - class: Dist::Zilla::Plugin::Git::Commit config: Dist::Zilla::Plugin::Git::Commit: add_files_in: [] commit_msg: 'increment $VERSION after %v release' + signoff: 0 Dist::Zilla::Role::Git::DirtyFiles: allow_dirty: - Build.PL @@ -320,16 +275,12 @@ - (?^:^lib/.*\.pm$) changelog: Changes Dist::Zilla::Role::Git::Repo: - git_version: 2.27.0 + git_version: 2.29.2 repo_root: . Dist::Zilla::Role::Git::StringFormatter: time_zone: local name: '@Git::VersionManager/post-release commit' - version: '2.046' - - - class: Dist::Zilla::Plugin::NextRelease - name: NextRelease - version: '6.015' + version: '2.047' - class: Dist::Zilla::Plugin::Prereqs::FromCPANfile name: Prereqs::FromCPANfile @@ -339,25 +290,13 @@ config: Dist::Zilla::Plugin::MakeMaker: make_path: make - version: '6.015' + version: '6.017' Dist::Zilla::Role::TestRunner: default_jobs: '4' - version: '6.015' + version: '6.017' name: MakeMaker::Awesome version: '0.48' - - class: Dist::Zilla::Plugin::TestRelease - name: TestRelease - version: '6.015' - - - class: Dist::Zilla::Plugin::ConfirmRelease - name: ConfirmRelease - version: '6.015' - - - class: Dist::Zilla::Plugin::UploadToCPAN - name: UploadToCPAN - version: '6.015' - - class: Dist::Zilla::Plugin::CheckChangeLog name: CheckChangeLog version: '0.05' @@ -385,7 +324,7 @@ - class: Dist::Zilla::Plugin::Test::ReportPrereqs name: Test::ReportPrereqs - version: '0.027' + version: '0.028' - class: Dist::Zilla::Plugin::Test::Compile config: @@ -434,7 +373,7 @@ - class: Dist::Zilla::Plugin::MetaTests name: MetaTests - version: '6.015' + version: '6.017' - class: Dist::Zilla::Plugin::Test::ChangesHasContent name: Test::ChangesHasContent @@ -449,7 +388,7 @@ - class: Dist::Zilla::Plugin::PodSyntaxTests name: PodSyntaxTests - version: '6.015' + version: '6.017' - class: Dist::Zilla::Plugin::Test::Pod::Coverage::Configurable name: Test::Pod::Coverage::Configurable @@ -482,54 +421,78 @@ name: CopyFilesFromBuild version: '0.170880' - + class: Dist::Zilla::Plugin::TestRelease + name: TestRelease + version: '6.017' + - + class: Dist::Zilla::Plugin::ConfirmRelease + name: ConfirmRelease + version: '6.017' + - + class: Dist::Zilla::Plugin::UploadToCPAN + name: UploadToCPAN + version: '6.017' + - + class: Dist::Zilla::Plugin::Git::Push + config: + Dist::Zilla::Plugin::Git::Push: + push_to: + - origin + remotes_must_exist: 1 + Dist::Zilla::Role::Git::Repo: + git_version: 2.29.2 + repo_root: . + name: Git::Push + version: '2.047' + - class: Dist::Zilla::Plugin::FinderCode name: ':InstallModules' - version: '6.015' + version: '6.017' - class: Dist::Zilla::Plugin::FinderCode name: ':IncModules' - version: '6.015' + version: '6.017' - class: Dist::Zilla::Plugin::FinderCode name: ':TestFiles' - version: '6.015' + version: '6.017' - class: Dist::Zilla::Plugin::FinderCode name: ':ExtraTestFiles' - version: '6.015' + version: '6.017' - class: Dist::Zilla::Plugin::FinderCode name: ':ExecFiles' - version: '6.015' + version: '6.017' - class: Dist::Zilla::Plugin::FinderCode name: ':PerlExecFiles' - version: '6.015' + version: '6.017' - class: Dist::Zilla::Plugin::FinderCode name: ':ShareFiles' - version: '6.015' + version: '6.017' - class: Dist::Zilla::Plugin::FinderCode name: ':MainModule' - version: '6.015' + version: '6.017' - class: Dist::Zilla::Plugin::FinderCode name: ':AllFiles' - version: '6.015' + version: '6.017' - class: Dist::Zilla::Plugin::FinderCode name: ':NoFiles' - version: '6.015' + version: '6.017' - class: Dist::Zilla::Plugin::FinderCode name: MetaProvides::Package/AUTOVIV/:InstallModulesPM - version: '6.015' + version: '6.017' zilla: class: Dist::Zilla::Dist::Builder config: is_trial: '0' - version: '6.015' + version: '6.017' x_authority: cpan:GAAS x_contributors: - 'Adam Kennedy <adamk(a)cpan.org>' @@ -553,6 +516,7 @@ - 'Father Chrysostomos <sprout(a)cpan.org>' - 'FWILES <FWILES(a)cpan.org>' - 'Gavin Peters <gpeters(a)deepsky.com>' + - 'Gianni Ceccarelli <gianni.ceccarelli(a)broadbean.com>' - 'Gisle Aas <gisle(a)aas.no>' - 'Graeme Thompson <Graeme.Thompson(a)mobilecohesion.com>' - 'Hans-H. Froehlich <hfroehlich(a)co-de-co.de>' @@ -595,6 +559,6 @@ - 'Yuri Karaban <tech(a)askold.net>' - 'Yury Zavarin <yury.zavarin(a)gmail.com>' - 'Zefram <zefram(a)fysh.org>' -x_generated_by_perl: v5.30.2 +x_generated_by_perl: v5.30.3 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/LWP-Protocol-https-6.09/Makefile.PL new/LWP-Protocol-https-6.10/Makefile.PL --- old/LWP-Protocol-https-6.09/Makefile.PL 2020-07-16 15:33:07.000000000 +0200 +++ new/LWP-Protocol-https-6.10/Makefile.PL 2020-12-17 16:42:08.000000000 +0100 @@ -37,11 +37,11 @@ "IO::Socket::SSL::Utils" => 0, "LWP::UserAgent" => "6.06", "Socket" => 0, - "Test::More" => 0, + "Test::More" => "0.96", "Test::RequiresInternet" => 0, "warnings" => 0 }, - "VERSION" => "6.09", + "VERSION" => "6.10", "test" => { "TESTS" => "t/*.t" } @@ -60,7 +60,7 @@ "Mozilla::CA" => 20180117, "Net::HTTPS" => 6, "Socket" => 0, - "Test::More" => 0, + "Test::More" => "0.96", "Test::RequiresInternet" => 0, "base" => 0, "strict" => 0, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/LWP-Protocol-https-6.09/cpanfile new/LWP-Protocol-https-6.10/cpanfile --- old/LWP-Protocol-https-6.09/cpanfile 2020-07-16 15:33:07.000000000 +0200 +++ new/LWP-Protocol-https-6.10/cpanfile 2020-12-17 16:42:08.000000000 +0100 @@ -4,13 +4,13 @@ }; on 'runtime' => sub { + requires "base" => "0"; requires "IO::Socket::SSL" => "1.54"; requires "LWP::Protocol::http" => "0"; #requires "LWP::Protocol::http::SocketMethods" => "0"; requires "LWP::UserAgent" => "6.06"; requires "Mozilla::CA" => "20180117"; requires "Net::HTTPS" => "6"; - requires "base" => "0"; requires "perl" => "5.008001"; requires "strict" => "0"; }; @@ -22,17 +22,19 @@ requires "IO::Socket::SSL" => "1.54"; requires "IO::Socket::SSL::Utils" => "0"; requires "LWP::UserAgent" => "6.06"; + requires "perl" => "5.008001"; requires "Socket" => "0"; - requires "Test::More" => "0"; + requires "Test::More" => "0.96"; requires "Test::RequiresInternet" => "0"; - requires "perl" => "5.008001"; requires "warnings" => "0"; }; on 'develop' => sub { requires 'Test::CheckManifest' => '1.29'; + requires 'Test::CleanNamespaces'; requires "Test::CPAN::Changes" => "0.19"; requires 'Test::CPAN::Meta'; + requires 'Test::Kwalitee'; requires 'Test::Kwalitee' => '1.22'; requires 'Test::Pod::Spelling::CommonMistakes' => '1.000'; #requires 'Try::Tiny' => '0.24'; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/LWP-Protocol-https-6.09/dist.ini new/LWP-Protocol-https-6.10/dist.ini --- old/LWP-Protocol-https-6.09/dist.ini 2020-07-16 15:33:07.000000000 +0200 +++ new/LWP-Protocol-https-6.10/dist.ini 2020-12-17 16:42:08.000000000 +0100 @@ -24,9 +24,12 @@ [MetaResources] x_IRC = irc://irc.perl.org/#lwp x_MailingList = mailto:libwww@perl.org -[@Git] + +[Git::Check] + [Git::Contributors] [GithubMeta] +issues = 1 user = libwww-perl [Authority] do_munging = 0 @@ -52,16 +55,10 @@ commit_files_after_release = META.json RewriteVersion::Transitional.fallback_version_provider = Git::NextVersion -[NextRelease] -format = %-9v %{yyyy-MM-dd}d - [Prereqs::FromCPANfile] [MakeMaker::Awesome] -[TestRelease] -[ConfirmRelease] -[UploadToCPAN] [CheckChangeLog] [CheckChangesHasContent] ; TODO strict and warnings to quiet the kwalitee tests @@ -71,6 +68,7 @@ [MojibakeTests] [Test::Version] [Test::ReportPrereqs] +include = Net::SSLeay [Test::Compile] bail_out_on_fail = 1 xt_mode = 1 @@ -101,3 +99,8 @@ copy = Makefile.PL copy = META.json copy = LICENSE + +[TestRelease] +[ConfirmRelease] +[UploadToCPAN] +[Git::Push] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/LWP-Protocol-https-6.09/lib/LWP/Protocol/https.pm new/LWP-Protocol-https-6.10/lib/LWP/Protocol/https.pm --- old/LWP-Protocol-https-6.09/lib/LWP/Protocol/https.pm 2020-07-16 15:33:07.000000000 +0200 +++ new/LWP-Protocol-https-6.10/lib/LWP/Protocol/https.pm 2020-12-17 16:42:08.000000000 +0100 @@ -1,7 +1,7 @@ package LWP::Protocol::https; use strict; -our $VERSION = '6.09'; +our $VERSION = '6.10'; use base qw(LWP::Protocol::http); require Net::HTTPS; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/LWP-Protocol-https-6.09/t/00-report-prereqs.dd new/LWP-Protocol-https-6.10/t/00-report-prereqs.dd --- old/LWP-Protocol-https-6.09/t/00-report-prereqs.dd 2020-07-16 15:33:07.000000000 +0200 +++ new/LWP-Protocol-https-6.10/t/00-report-prereqs.dd 2020-12-17 16:42:08.000000000 +0100 @@ -60,7 +60,7 @@ 'IO::Socket::SSL::Utils' => '0', 'LWP::UserAgent' => '6.06', 'Socket' => '0', - 'Test::More' => '0', + 'Test::More' => '0.96', 'Test::RequiresInternet' => '0', 'perl' => '5.008001', 'warnings' => '0' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/LWP-Protocol-https-6.09/t/00-report-prereqs.t new/LWP-Protocol-https-6.10/t/00-report-prereqs.t --- old/LWP-Protocol-https-6.09/t/00-report-prereqs.t 2020-07-16 15:33:07.000000000 +0200 +++ new/LWP-Protocol-https-6.10/t/00-report-prereqs.t 2020-12-17 16:42:08.000000000 +0100 @@ -3,7 +3,7 @@ use strict; use warnings; -# This test was generated by Dist::Zilla::Plugin::Test::ReportPrereqs 0.027 +# This test was generated by Dist::Zilla::Plugin::Test::ReportPrereqs 0.028 use Test::More tests => 1; @@ -60,7 +60,7 @@ } my @include = qw( - + Net::SSLeay ); my @exclude = qw( @@ -188,6 +188,6 @@ ); } -pass; +pass('Reported prereqs'); # vim: ts=4 sts=4 sw=4 et: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/LWP-Protocol-https-6.09/t/https_proxy.t new/LWP-Protocol-https-6.10/t/https_proxy.t --- old/LWP-Protocol-https-6.09/t/https_proxy.t 2020-07-16 15:33:07.000000000 +0200 +++ new/LWP-Protocol-https-6.10/t/https_proxy.t 2020-12-17 16:42:08.000000000 +0100 @@ -85,6 +85,10 @@ SSL_ca_file => $cafile } ); + +# both lower- and upper-case versions are accepted by `env_proxy`, and +# the user may have any of them set: override them all +$ENV{HTTP_PROXY} = $ENV{HTTPS_PROXY} = $ENV{http_proxy} = $ENV{https_proxy} = "http://foo:bar\@$saddr[0]"; $ua{proxy}->env_proxy; $ua{proxy_nokeepalive}->env_proxy; @@ -239,7 +243,7 @@ if ( $ssl_host ) { my ($cert,$key) = @{ $certs{$ssl_host} ||= do { - diag("creating cert for $ssl_host"); + note("creating cert for $ssl_host"); my ($c,$k) = CERT_create( subject => { commonName => $ssl_host }, issuer_cert => $cacert, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/LWP-Protocol-https-6.09/xt/author/distmeta.t new/LWP-Protocol-https-6.10/xt/author/distmeta.t --- old/LWP-Protocol-https-6.09/xt/author/distmeta.t 1970-01-01 01:00:00.000000000 +0100 +++ new/LWP-Protocol-https-6.10/xt/author/distmeta.t 2020-12-17 16:42:08.000000000 +0100 @@ -0,0 +1,6 @@ +#!perl +# This file was automatically generated by Dist::Zilla::Plugin::MetaTests. + +use Test::CPAN::Meta; + +meta_yaml_ok(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/LWP-Protocol-https-6.09/xt/author/pod-spell.t new/LWP-Protocol-https-6.10/xt/author/pod-spell.t --- old/LWP-Protocol-https-6.09/xt/author/pod-spell.t 2020-07-16 15:33:07.000000000 +0200 +++ new/LWP-Protocol-https-6.10/xt/author/pod-spell.t 2020-12-17 16:42:08.000000000 +0100 @@ -22,6 +22,7 @@ Book Bron Burke +Ceccarelli Chase Christopher Chrysostomos @@ -38,6 +39,7 @@ Finch Froehlich Gavin +Gianni Gisle Golden Gondwana @@ -132,6 +134,7 @@ dot drieux ether +gianni gisle github gpeters diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/LWP-Protocol-https-6.09/xt/release/changes_has_content.t new/LWP-Protocol-https-6.10/xt/release/changes_has_content.t --- old/LWP-Protocol-https-6.09/xt/release/changes_has_content.t 2020-07-16 15:33:07.000000000 +0200 +++ new/LWP-Protocol-https-6.10/xt/release/changes_has_content.t 2020-12-17 16:42:08.000000000 +0100 @@ -2,7 +2,7 @@ note 'Checking Changes'; my $changes_file = 'Changes'; -my $newver = '6.09'; +my $newver = '6.10'; my $trial_token = '-TRIAL'; my $encoding = 'UTF-8'; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/LWP-Protocol-https-6.09/xt/release/distmeta.t new/LWP-Protocol-https-6.10/xt/release/distmeta.t --- old/LWP-Protocol-https-6.09/xt/release/distmeta.t 2020-07-16 15:33:07.000000000 +0200 +++ new/LWP-Protocol-https-6.10/xt/release/distmeta.t 1970-01-01 01:00:00.000000000 +0100 @@ -1,6 +0,0 @@ -#!perl -# This file was automatically generated by Dist::Zilla::Plugin::MetaTests. - -use Test::CPAN::Meta; - -meta_yaml_ok();

1 0

commit python-scikit-learn for openSUSE:Factory
by User for buildservice source handling 21 Dec '20

21 Dec '20

Hello community, here is the log from the commit of package python-scikit-learn for openSUSE:Factory checked in at 2020-12-21 12:35:20 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-scikit-learn (Old) and /work/SRC/openSUSE:Factory/.python-scikit-learn.new.5145 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-scikit-learn" Mon Dec 21 12:35:20 2020 rev:12 rq:856853 version:0.23.2 Changes: -------- --- /work/SRC/openSUSE:Factory/python-scikit-learn/python-scikit-learn.changes 2020-10-25 18:10:20.811556909 +0100 +++ /work/SRC/openSUSE:Factory/.python-scikit-learn.new.5145/python-scikit-learn.changes 2020-12-21 12:35:22.854961260 +0100 @@ -1,0 +2,7 @@ +Sun Dec 13 01:16:34 UTC 2020 - Benjamin Greiner <code(a)bnavigator.de> + +- provide "sklearn" only for primary python3 flavor + gh#openSUSE/python-rpm-macros#66 +- clean test setup + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-scikit-learn.spec ++++++ --- /var/tmp/diff_new_pack.KSy5ci/_old 2020-12-21 12:35:23.694963268 +0100 +++ /var/tmp/diff_new_pack.KSy5ci/_new 2020-12-21 12:35:23.698963277 +0100 @@ -46,7 +46,9 @@ Requires: python-threadpoolctl >= 2.0.0 Requires: python-xml Provides: python-sklearn +%if "%{python_flavor}" == "python3" || "%{?python_provides}" == "python3" Provides: sklearn +%endif # SECTION test requirements BuildRequires: %{python_module joblib} BuildRequires: %{python_module matplotlib} @@ -83,25 +85,20 @@ %ifarch %{ix86} x86_64 %check export SKLEARN_SKIP_NETWORK_TESTS=1 -# export PYTHONDONTWRITEBYTECODE=1 NO_TESTS="test_feature_importance_regression or test_minibatch_with_many_reassignments" -NO_TESTS="$NO_TESTS or test_sparse_coder_parallel_mmap or test_explained_variances" +NO_TESTS+=" or test_sparse_coder_parallel_mmap or test_explained_variances" # test_negative_sample_weights_mask_all_samples[weights-are-zero-NuSVC] Fatal Python error: Aborted -NO_TESTS="$NO_TESTS or test_negative_sample_weights_mask_all_samples" -export NO_TESTS -mv sklearn sklearn_temp -rm -rf build _build.* -%{python_expand export PYTHONPATH=%{buildroot}%{$python_sitearch} -rm -rf build _build.* -py.test-%{$python_bin_suffix} -p no:cacheprovider -v -k "not ($NO_TESTS)" %{buildroot}%{$python_sitearch}/sklearn -} -mv sklearn_temp sklearn +NO_TESTS+=" or test_negative_sample_weights_mask_all_samples" +mkdir test_dir +pushd test_dir +%pytest_arch -p no:cacheprovider -v -k "not ($NO_TESTS)" %{buildroot}%{$python_sitearch}/sklearn +popd %endif %files %{python_files} %license COPYING %doc README.rst %{python_sitearch}/sklearn/ -%{python_sitearch}/scikit_learn-%{version}-py*.egg-info +%{python_sitearch}/scikit_learn-%{version}*-info %changelog

1 0

commit python-mocket for openSUSE:Factory
by User for buildservice source handling 21 Dec '20

21 Dec '20

Hello community, here is the log from the commit of package python-mocket for openSUSE:Factory checked in at 2020-12-21 12:35:17 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-mocket (Old) and /work/SRC/openSUSE:Factory/.python-mocket.new.5145 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-mocket" Mon Dec 21 12:35:17 2020 rev:8 rq:856852 version:3.9.4 Changes: -------- --- /work/SRC/openSUSE:Factory/python-mocket/python-mocket.changes 2020-12-12 20:32:10.649840343 +0100 +++ /work/SRC/openSUSE:Factory/.python-mocket.new.5145/python-mocket.changes 2020-12-21 12:35:21.446957894 +0100 @@ -1,0 +2,13 @@ +Thu Dec 17 17:09:52 UTC 2020 - Benjamin Greiner <code(a)bnavigator.de> + +- Do not require and test with pook on Python2 + +------------------------------------------------------------------- +Thu Dec 17 15:10:50 UTC 2020 - Benjamin Greiner <code(a)bnavigator.de> + +- Update to version 3.9.4 + * fix for new version of pip resolver +- Skip python38 only tests in python36 flavor and python3 flavor + if python3 <= 3.8 (Leap) + +------------------------------------------------------------------- Old: ---- mocket-3.9.3.tar.gz New: ---- mocket-3.9.4.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-mocket.spec ++++++ --- /var/tmp/diff_new_pack.FTwdH9/_old 2020-12-21 12:35:22.282959893 +0100 +++ /var/tmp/diff_new_pack.FTwdH9/_new 2020-12-21 12:35:22.286959902 +0100 @@ -26,7 +26,7 @@ %bcond_with test %endif Name: python-mocket%{psuffix} -Version: 3.9.3 +Version: 3.9.4 Release: 0 Summary: Python socket mock framework License: BSD-3-Clause @@ -53,7 +53,12 @@ BuildRequires: %{python_module gevent} BuildRequires: %{python_module http-parser >= 0.9.0} BuildRequires: %{python_module mock} +%if 0%{suse_version} >= 1550 +# Optional pook is only available for Python 3, but in TW we will have more than one flavor BuildRequires: %{python_module pook} +%else +BuildRequires: python3-pook +%endif BuildRequires: %{python_module pyOpenSSL} BuildRequires: %{python_module pytest} BuildRequires: %{python_module python-magic} @@ -96,8 +101,12 @@ %if %{with test} export LANG=en_US.UTF-8 export SKIP_TRUE_HTTP=1 -%define pytest_ignore_python2 --ignore tests/tests35 --ignore tests/tests38 -%pytest -k 'not RedisTestCase' %{?pytest_ignore%{$python_version}} +pytest_python2_ignore="--ignore tests/tests35 --ignore tests/tests38 --ignore tests/main/test_pook.py" +pytest_python36_ignore="--ignore tests/tests38" +%if %{python3_version_nodots} < 38 +pytest_python3_ignore="--ignore tests/tests38" +%endif +%pytest -k 'not RedisTestCase' ${pytest_$python_ignore} %endif %if !%{with test} ++++++ mocket-3.9.3.tar.gz -> mocket-3.9.4.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mocket-3.9.3/PKG-INFO new/mocket-3.9.4/PKG-INFO --- old/mocket-3.9.3/PKG-INFO 2020-11-09 11:51:48.694063000 +0100 +++ new/mocket-3.9.4/PKG-INFO 2020-12-02 23:09:34.530291300 +0100 @@ -1,6 +1,6 @@ Metadata-Version: 2.1 Name: mocket -Version: 3.9.3 +Version: 3.9.4 Summary: Socket Mock Framework - for all kinds of socket animals, web-clients included - with gevent/asyncio/SSL support Home-page: https://github.com/mindflayer/python-mocket Author: Giorgio Salluzzo diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mocket-3.9.3/Pipfile new/mocket-3.9.4/Pipfile --- old/mocket-3.9.3/Pipfile 1970-01-01 01:00:00.000000000 +0100 +++ new/mocket-3.9.4/Pipfile 2020-12-02 23:09:20.000000000 +0100 @@ -0,0 +1,30 @@ +[[source]] +url = "https://pypi.python.org/simple" +verify_ssl = true +name = "pypi" + +[packages] +python-magic = ">=0.4.5" +six = ">=1.5.0" +decorator = ">=4.0.0" +urllib3 = ">=1.25.3" +http-parser = ">=0.9.0" + +[dev-packages] +pre-commit = "*" +pytest = ">4.6" +pytest-cov = "*" +mock = "*" +requests = "*" +redis = "*" +gevent = "*" +sure = "*" +pook = "*" +flake8 = "*" +twine = "*" +anaconda-client = "*" +pipfile = "*" +wheel = "*" + +[requires] +python_version = "3.8" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mocket-3.9.3/mocket/__init__.py new/mocket-3.9.4/mocket/__init__.py --- old/mocket-3.9.3/mocket/__init__.py 2020-11-09 11:49:45.000000000 +0100 +++ new/mocket-3.9.4/mocket/__init__.py 2020-12-02 23:09:20.000000000 +0100 @@ -7,4 +7,4 @@ __all__ = ("mocketize", "Mocket", "MocketEntry", "Mocketizer") -__version__ = "3.9.3" +__version__ = "3.9.4" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mocket-3.9.3/mocket/mocket.py new/mocket-3.9.4/mocket/mocket.py --- old/mocket-3.9.3/mocket/mocket.py 2020-11-09 11:49:45.000000000 +0100 +++ new/mocket-3.9.4/mocket/mocket.py 2020-11-09 17:07:57.000000000 +0100 @@ -271,10 +271,9 @@ def recv(self, buffersize, flags=None): if Mocket.r_fd and Mocket.w_fd: return os.read(Mocket.r_fd, buffersize) - if self.fd: - data = self.read(buffersize) - if data: - return data + data = self.read(buffersize) + if data: + return data # used by Redis mock exc = BlockingIOError() exc.errno = errno.EWOULDBLOCK diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mocket-3.9.3/mocket.egg-info/PKG-INFO new/mocket-3.9.4/mocket.egg-info/PKG-INFO --- old/mocket-3.9.3/mocket.egg-info/PKG-INFO 2020-11-09 11:51:48.000000000 +0100 +++ new/mocket-3.9.4/mocket.egg-info/PKG-INFO 2020-12-02 23:09:34.000000000 +0100 @@ -1,6 +1,6 @@ Metadata-Version: 2.1 Name: mocket -Version: 3.9.3 +Version: 3.9.4 Summary: Socket Mock Framework - for all kinds of socket animals, web-clients included - with gevent/asyncio/SSL support Home-page: https://github.com/mindflayer/python-mocket Author: Giorgio Salluzzo diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mocket-3.9.3/mocket.egg-info/SOURCES.txt new/mocket-3.9.4/mocket.egg-info/SOURCES.txt --- old/mocket-3.9.3/mocket.egg-info/SOURCES.txt 2020-11-09 11:51:48.000000000 +0100 +++ new/mocket-3.9.4/mocket.egg-info/SOURCES.txt 2020-12-02 23:09:34.000000000 +0100 @@ -1,5 +1,6 @@ LICENSE MANIFEST.in +Pipfile README.rst requirements.txt setup.py diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mocket-3.9.3/mocket.egg-info/requires.txt new/mocket-3.9.4/mocket.egg-info/requires.txt --- old/mocket-3.9.3/mocket.egg-info/requires.txt 2020-11-09 11:51:48.000000000 +0100 +++ new/mocket-3.9.4/mocket.egg-info/requires.txt 2020-12-02 23:09:34.000000000 +0100 @@ -1,8 +1,8 @@ -decorator==4.4.2 -http-parser==0.9.0 -python-magic==0.4.18 -six==1.15.0 -urllib3==1.25.11 +decorator>=4.0.0 +http-parser>=0.9.0 +python-magic>=0.4.5 +six>=1.5.0 +urllib3>=1.25.3 [dev] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mocket-3.9.3/requirements.txt new/mocket-3.9.4/requirements.txt --- old/mocket-3.9.3/requirements.txt 2020-11-09 11:51:45.000000000 +0100 +++ new/mocket-3.9.4/requirements.txt 2020-12-02 23:09:34.000000000 +0100 @@ -1,6 +1,5 @@ --i https://pypi.python.org/simple -decorator==4.4.2 -http-parser==0.9.0 -python-magic==0.4.18 -six==1.15.0 -urllib3==1.25.11 +python-magic>=0.4.5 +six>=1.5.0 +decorator>=4.0.0 +urllib3>=1.25.3 +http-parser>=0.9.0

1 0

commit yast2-schema for openSUSE:Factory
by User for buildservice source handling 21 Dec '20

21 Dec '20

Hello community, here is the log from the commit of package yast2-schema for openSUSE:Factory checked in at 2020-12-21 12:35:16 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-schema (Old) and /work/SRC/openSUSE:Factory/.yast2-schema.new.5145 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-schema" Mon Dec 21 12:35:16 2020 rev:64 rq:856846 version:4.3.16 Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-schema/yast2-schema.changes 2020-10-29 09:22:18.498687872 +0100 +++ /work/SRC/openSUSE:Factory/.yast2-schema.new.5145/yast2-schema.changes 2020-12-21 12:35:20.198954911 +0100 @@ -1,0 +2,6 @@ +Mon Dec 14 10:21:57 UTC 2020 - Imobach Gonzalez Sosa <igonzalezsosa(a)suse.com> + +- Add support for Btrfs quotas (jsc#SLE-7742). +- 4.3.16 + +------------------------------------------------------------------- Old: ---- yast2-schema-4.3.15.tar.bz2 New: ---- yast2-schema-4.3.16.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-schema.spec ++++++ --- /var/tmp/diff_new_pack.81wANN/_old 2020-12-21 12:35:20.750956230 +0100 +++ /var/tmp/diff_new_pack.81wANN/_new 2020-12-21 12:35:20.754956240 +0100 @@ -17,7 +17,7 @@ Name: yast2-schema -Version: 4.3.15 +Version: 4.3.16 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -34,8 +34,8 @@ # All packages providing RNG files for AutoYaST # in /usr/share/YaST2/schema/autoyast/rng/*.rng -# set 't' element in 'backup' and 'upgrade' elements -BuildRequires: autoyast2 >= 4.3.61 +# 'quotas' and 'referenced_limit' elements (jsc#SLE-7742) +BuildRequires: autoyast2 >= 4.3.64 BuildRequires: yast2 # add_on_products and add_on_others types BuildRequires: yast2-add-on >= 4.3.3 ++++++ yast2-schema-4.3.15.tar.bz2 -> yast2-schema-4.3.16.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-schema-4.3.15/.github/workflows/ci.yml new/yast2-schema-4.3.16/.github/workflows/ci.yml --- old/yast2-schema-4.3.15/.github/workflows/ci.yml 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-schema-4.3.16/.github/workflows/ci.yml 2020-12-14 13:36:34.000000000 +0100 @@ -0,0 +1,27 @@ + +# See https://docs.github.com/en/actions/reference/workflow-syntax-for-github-act… + +name: CI + +on: [push, pull_request] + +jobs: + + Package: + runs-on: ubuntu-latest + container: registry.opensuse.org/yast/head/containers/yast-ruby:latest + + steps: + + - name: Git Checkout + uses: actions/checkout@v1 + + - name: Install Dependencies + run: rake build_dependencies:install + + # just for easier debugging... + - name: Inspect Installed Packages + run: rpm -qa | sort + + - name: Package Build + run: yast-ci-ruby -o package diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-schema-4.3.15/.travis.yml new/yast2-schema-4.3.16/.travis.yml --- old/yast2-schema-4.3.15/.travis.yml 2020-10-26 17:01:06.000000000 +0100 +++ new/yast2-schema-4.3.16/.travis.yml 1970-01-01 01:00:00.000000000 +0100 @@ -1,14 +0,0 @@ -sudo: required -language: bash -services: - - docker - -before_install: - - docker build -t yast-schema-image . - # list the installed packages (just for easier debugging) - - docker run --rm -it yast-schema-image rpm -qa | sort - -script: - # the "yast-travis-ruby" script is included in the base yastdevel/ruby image - # see https://github.com/yast/docker-yast-ruby/blob/master/yast-travis-ruby - - docker run --privileged -it -e TRAVIS=1 -e TRAVIS_JOB_ID="$TRAVIS_JOB_ID" yast-schema-image yast-travis-ruby diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-schema-4.3.15/Dockerfile new/yast2-schema-4.3.16/Dockerfile --- old/yast2-schema-4.3.15/Dockerfile 2020-10-26 17:01:06.000000000 +0100 +++ new/yast2-schema-4.3.16/Dockerfile 1970-01-01 01:00:00.000000000 +0100 @@ -1,35 +0,0 @@ -FROM registry.opensuse.org/yast/head/containers/yast-ruby:latest -RUN zypper --gpg-auto-import-keys --non-interactive in --no-recommends \ - autoyast2 \ - libxml2-tools \ - jing \ - trang \ - yast2 \ - yast2-add-on \ - yast2-audit-laf \ - yast2-auth-client \ - yast2-auth-server \ - yast2-bootloader \ - yast2-country \ - yast2-dhcp-server \ - yast2-dns-server \ - yast2-firewall \ - yast2-firstboot \ - yast2-ftp-server \ - yast2-http-server \ - yast2-tftp-server \ - yast2-installation \ - yast2-iscsi-client \ - yast2-kdump \ - yast2-mail \ - yast2-network \ - yast2-nfs-client \ - yast2-nfs-server \ - yast2-nis-client \ - yast2-nis-server \ - yast2-ntp-client \ - yast2-online-update-configuration \ - yast2-printer \ - yast2-proxy \ - && zypper clean -a -COPY . /usr/src/app diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-schema-4.3.15/README.md new/yast2-schema-4.3.16/README.md --- old/yast2-schema-4.3.15/README.md 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-schema-4.3.16/README.md 2020-12-14 13:36:34.000000000 +0100 @@ -0,0 +1,11 @@ +## AutoYaST XML Schema Definition + +[![Workflow Status](https://github.com/yast/yast-perl-bindings/workflows/CI/badge.svg?b… +https://github.com/yast/yast-perl-bindings/actions?query=branch%3Amaster) +[![Jenkins Status](https://ci.opensuse.org/buildStatus/icon?job=yast-yast-perl-binding… +https://ci.opensuse.org/view/Yast/job/yast-yast-perl-bindings-master/) + +This package contains the XML schema definition for AutoYaST. + +*Note: Some parts of the schema definition are imported from the respective +YaST modules.* diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-schema-4.3.15/package/yast2-schema.changes new/yast2-schema-4.3.16/package/yast2-schema.changes --- old/yast2-schema-4.3.15/package/yast2-schema.changes 2020-10-26 17:01:06.000000000 +0100 +++ new/yast2-schema-4.3.16/package/yast2-schema.changes 2020-12-14 13:36:34.000000000 +0100 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Dec 14 10:21:57 UTC 2020 - Imobach Gonzalez Sosa <igonzalezsosa(a)suse.com> + +- Add support for Btrfs quotas (jsc#SLE-7742). +- 4.3.16 + +------------------------------------------------------------------- Tue Oct 20 16:15:12 CEST 2020 - schubi(a)suse.de - Registration/Addons: Architecture and version are optional. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-schema-4.3.15/package/yast2-schema.spec new/yast2-schema-4.3.16/package/yast2-schema.spec --- old/yast2-schema-4.3.15/package/yast2-schema.spec 2020-10-26 17:01:06.000000000 +0100 +++ new/yast2-schema-4.3.16/package/yast2-schema.spec 2020-12-14 13:36:34.000000000 +0100 @@ -17,7 +17,7 @@ Name: yast2-schema -Version: 4.3.15 +Version: 4.3.16 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -36,8 +36,8 @@ # All packages providing RNG files for AutoYaST # in /usr/share/YaST2/schema/autoyast/rng/*.rng -# set 't' element in 'backup' and 'upgrade' elements -BuildRequires: autoyast2 >= 4.3.61 +# 'quotas' and 'referenced_limit' elements (jsc#SLE-7742) +BuildRequires: autoyast2 >= 4.3.64 BuildRequires: yast2 # add_on_products and add_on_others types BuildRequires: yast2-add-on >= 4.3.3

1 0

commit blosc for openSUSE:Factory
by User for buildservice source handling 21 Dec '20

21 Dec '20

Hello community, here is the log from the commit of package blosc for openSUSE:Factory checked in at 2020-12-21 12:35:10 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/blosc (Old) and /work/SRC/openSUSE:Factory/.blosc.new.5145 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "blosc" Mon Dec 21 12:35:10 2020 rev:20 rq:856832 version:1.20.1 Changes: -------- --- /work/SRC/openSUSE:Factory/blosc/blosc.changes 2020-09-04 11:02:22.490728240 +0200 +++ /work/SRC/openSUSE:Factory/.blosc.new.5145/blosc.changes 2020-12-21 12:35:17.954949548 +0100 @@ -1,0 +2,8 @@ +Fri Dec 18 08:06:48 UTC 2020 - Martin Pluskal <mpluskal(a)suse.com> + +- Update to version 1.20.1 boo#1179914 CVE-2020-29367: + * More saftey checks have been implemented so that potential flaws discovered by new fuzzers in OSS-Fuzzer are fixed now + * BloscLZ updated to 2.3.0. Expect better compression ratios for faster codecs. For details, see our new blog post: https://blosc.org/posts/beast-release/ + * Fixed the _xgetbv() collision. Thanks to Michał Górny (@mgorny). + +------------------------------------------------------------------- Old: ---- blosc-1.19.0.tar.gz New: ---- blosc-1.20.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ blosc.spec ++++++ --- /var/tmp/diff_new_pack.8MrbQM/_old 2020-12-21 12:35:18.550950972 +0100 +++ /var/tmp/diff_new_pack.8MrbQM/_new 2020-12-21 12:35:18.550950972 +0100 @@ -19,7 +19,7 @@ %define major 1 %define libname lib%{name}%{major} Name: blosc -Version: 1.19.0 +Version: 1.20.1 Release: 0 Summary: A blocking, shuffling and lossless compression library License: MIT AND BSD-3-Clause AND BSD-2-Clause @@ -28,10 +28,10 @@ Source: https://github.com/Blosc/c-blosc/archive/v%{version}.tar.gz#/%{name}-%{vers… BuildRequires: cmake BuildRequires: gcc-c++ -BuildRequires: libzstd-devel BuildRequires: pkgconfig BuildRequires: snappy-devel BuildRequires: pkgconfig(liblz4) +BuildRequires: pkgconfig(libzstd) BuildRequires: pkgconfig(zlib) %description @@ -100,12 +100,11 @@ %files -n %{libname} %doc LICENSES/*.txt -%doc ANNOUNCE.rst README.md README_THREADED.rst RELEASE_NOTES.rst THANKS.rst +%doc ANNOUNCE.rst README.md RELEASE_NOTES.rst THANKS.rst %{_libdir}/libblosc.so.%{major} %{_libdir}/libblosc.so.%{version} %files devel -%doc README_HEADER.rst %doc examples/ %{_includedir}/blosc.h %{_includedir}/blosc-export.h ++++++ blosc-1.19.0.tar.gz -> blosc-1.20.1.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/c-blosc-1.19.0/.github/workflows/cmake.yml new/c-blosc-1.20.1/.github/workflows/cmake.yml --- old/c-blosc-1.19.0/.github/workflows/cmake.yml 2020-06-05 11:09:21.000000000 +0200 +++ new/c-blosc-1.20.1/.github/workflows/cmake.yml 2020-09-08 17:23:32.000000000 +0200 @@ -143,7 +143,7 @@ run: | mkdir ${{ matrix.build-dir || '.not-used' }} cd ${{ matrix.build-dir || '.' }} - cmake ${{ matrix.build-src-dir || '.' }} ${{ matrix.cmake-args }} -DCMAKE_BUILD_TYPE=${{ matrix.build-config || 'Release' }} -DBUILD_SHARED_LIBS=OFF + cmake ${{ matrix.build-src-dir || '.' }} ${{ matrix.cmake-args }} -DCMAKE_BUILD_TYPE=${{ matrix.build-config || 'Release' }} -DBUILD_SHARED_LIBS=OFF -DBUILD_FUZZERS=ON env: CC: ${{ matrix.compiler }} CFLAGS: ${{ matrix.cflags }} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/c-blosc-1.19.0/ANNOUNCE.rst new/c-blosc-1.20.1/ANNOUNCE.rst --- old/c-blosc-1.19.0/ANNOUNCE.rst 2020-06-05 11:09:21.000000000 +0200 +++ new/c-blosc-1.20.1/ANNOUNCE.rst 2020-09-08 17:23:32.000000000 +0200 @@ -1,19 +1,14 @@ =============================================================== - Announcing C-Blosc 1.19.0 + Announcing C-Blosc 1.20.1 A blocking, shuffling and lossless compression library for C =============================================================== What is new? ============ -The algorithm for choosing the blocksize automatically in fast codecs -(lz4 and blosclz) has been refined to provide better compression ratios -and better performance on modern CPUs (L2 cache sizes >= 256KB), while -staying reasonably fast on less powerful CPUs. - -Also, new versions for blosclz (2.1.0) and zstd (1.4.5) codecs have -been integrated. Expect better compression ratios and performance with -these new versions too. +This is a maintenance release. Vendored zlib 1.2.8 is now compatible +with Python 3.8 in recent Mac OSX. For details, see: +https://github.com/Blosc/python-blosc/issues/229 For more info, please see the release notes in: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/c-blosc-1.19.0/CMakeLists.txt new/c-blosc-1.20.1/CMakeLists.txt --- old/c-blosc-1.19.0/CMakeLists.txt 2020-06-05 11:09:21.000000000 +0200 +++ new/c-blosc-1.20.1/CMakeLists.txt 2020-09-08 17:23:32.000000000 +0200 @@ -9,6 +9,8 @@ # build the shared library version of the Blosc library # BUILD_TESTS: default ON # build test programs and generates the "test" target +# BUILD_FUZZERS: default ON +# build fuzz test programs and generates the "test" target # BUILD_BENCHMARKS: default ON # build the benchmark program # DEACTIVATE_SSE2: default OFF @@ -93,13 +95,15 @@ option(BUILD_SHARED "Build a shared library version of the blosc library." ON) option(BUILD_TESTS - "Build test programs form the blosc compression library" ON) + "Build test programs from the blosc compression library" ON) +option(BUILD_FUZZERS + "Build fuzzer programs from the blosc compression library" ${BUILD_STATIC}) option(BUILD_BENCHMARKS - "Build benchmark programs form the blosc compression library" ON) + "Build benchmark programs from the blosc compression library" ON) option(DEACTIVATE_SSE2 - "Do not attempt to build with SSE2 instructions" OFF) + "Do not attempt to build with SSE2 instructions" OFF) option(DEACTIVATE_AVX2 - "Do not attempt to build with AVX2 instructions" OFF) + "Do not attempt to build with AVX2 instructions" OFF) option(DEACTIVATE_LZ4 "Do not include support for the LZ4 library." OFF) option(DEACTIVATE_SNAPPY @@ -107,9 +111,9 @@ option(DEACTIVATE_ZLIB "Do not include support for the Zlib library." OFF) option(DEACTIVATE_ZSTD - "Do not include support for the Zstd library." OFF) + "Do not include support for the Zstd library." OFF) option(DEACTIVATE_SYMBOLS_CHECK - "Do not check for symbols in shared or static libraries." ON) + "Do not check for symbols in shared or static libraries." ON) option(PREFER_EXTERNAL_LZ4 "Find and use external LZ4 library instead of included sources." OFF) option(PREFER_EXTERNAL_ZLIB @@ -318,6 +322,14 @@ add_subdirectory(compat) endif(BUILD_TESTS) +if(BUILD_FUZZERS) + if(NOT BUILD_STATIC) + message(FATAL_ERROR "BUILD_FUZZERS requires BUILD_STATIC to be enabled.") + endif() + enable_testing() + add_subdirectory(tests/fuzz) +endif(BUILD_FUZZERS) + if(BUILD_BENCHMARKS) add_subdirectory(bench) endif(BUILD_BENCHMARKS) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/c-blosc-1.19.0/CODE_OF_CONDUCT.md new/c-blosc-1.20.1/CODE_OF_CONDUCT.md --- old/c-blosc-1.19.0/CODE_OF_CONDUCT.md 2020-06-05 11:09:21.000000000 +0200 +++ new/c-blosc-1.20.1/CODE_OF_CONDUCT.md 1970-01-01 01:00:00.000000000 +0100 @@ -1,5 +0,0 @@ -# Code of Conduct - -The Blosc community has adopted a Code of Conduct that we expect project participants to adhere to. -Please read the [full text](https://github.com/Blosc/CodeOfConduct/README.md) -so that you can understand what actions will and will not be tolerated. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/c-blosc-1.19.0/README.md new/c-blosc-1.20.1/README.md --- old/c-blosc-1.19.0/README.md 2020-06-05 11:09:21.000000000 +0200 +++ new/c-blosc-1.20.1/README.md 2020-09-08 17:23:32.000000000 +0200 @@ -3,10 +3,9 @@ |--------|---------|-----| | Blosc Development Team | blosc(a)blosc.org | http://www.blosc.org | -| Gitter | GH Actions | NumFOCUS | -|--------|------------|----------| -| [![Gitter](https://badges.gitter.im/Blosc/c-blosc.svg)](https://gitter.im/Blosc/c-blosc?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) | [![CI CMake](https://github.com/Blosc/c-blosc/workflows/CI%20CMake/badge.svg)](ht… | [![Powered by NumFOCUS](https://img.shields.io/badge/powered%20by-NumFOCUS-orange.svg?style=flat&colorA=E1523D&colorB=007D8A)](http://numfocus.org) | - +| Gitter | GH Actions | NumFOCUS | Code of Conduct | +|--------|------------|----------|-----------------| +| [![Gitter](https://badges.gitter.im/Blosc/c-blosc.svg)](https://gitter.im/Blosc/c-blosc?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) | [![CI CMake](https://github.com/Blosc/c-blosc/workflows/CI%20CMake/badge.svg)](ht… | [![Powered by NumFOCUS](https://img.shields.io/badge/powered%20by-NumFOCUS-orange.svg?style=flat&colorA=E1523D&colorB=007D8A)](http://numfocus.org) | [![Contributor Covenant](https://img.shields.io/badge/Contributor%20Covenant-v2.0%20adopted-ff69b4.svg)](code_of_conduct.md) | ## What is it? diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/c-blosc-1.19.0/README_CHUNK_FORMAT.rst new/c-blosc-1.20.1/README_CHUNK_FORMAT.rst --- old/c-blosc-1.19.0/README_CHUNK_FORMAT.rst 1970-01-01 01:00:00.000000000 +0100 +++ new/c-blosc-1.20.1/README_CHUNK_FORMAT.rst 2020-09-08 17:23:32.000000000 +0200 @@ -0,0 +1,97 @@ +Blosc Chunk Format +================== + +The chunk is composed by a header and a blocks / splits section:: + + +---------+--------+---------+ + | header | blocks / splits | + +---------+--------+---------+ + +These are described below. + +The header section +------------------ + +Blosc (as of Version 1.0.0) has the following 16 byte header that stores +information about the compressed buffer:: + + |-0-|-1-|-2-|-3-|-4-|-5-|-6-|-7-|-8-|-9-|-A-|-B-|-C-|-D-|-E-|-F-| + ^ ^ ^ ^ | nbytes | blocksize | cbytes | + | | | | + | | | +--typesize + | | +------flags + | +----------versionlz + +--------------version + +Datatypes of the header entries +------------------------------- + +All entries are little endian. + +:version: + (``uint8``) Blosc format version. +:versionlz: + (``uint8``) Version of the internal compressor used. +:flags and compressor enumeration: + (``bitfield``) The flags of the buffer + + :bit 0 (``0x01``): + Whether the byte-shuffle filter has been applied or not. + :bit 1 (``0x02``): + Whether the internal buffer is a pure memcpy or not. + :bit 2 (``0x04``): + Whether the bit-shuffle filter has been applied or not. + :bit 3 (``0x08``): + Reserved, must be zero. + :bit 4 (``0x10``): + If set, the blocks will not be split in sub-blocks during compression. + :bit 5 (``0x20``): + Part of the enumeration for compressors. + :bit 6 (``0x40``): + Part of the enumeration for compressors. + :bit 7 (``0x80``): + Part of the enumeration for compressors. + + The last three bits form an enumeration that allows to use alternative + compressors. + + :``0``: + ``blosclz`` + :``1``: + ``lz4`` or ``lz4hc`` + :``2``: + ``snappy`` + :``3``: + ``zlib`` + :``4``: + ``zstd`` + +:typesize: + (``uint8``) Number of bytes for the atomic type. +:nbytes: + (``uint32``) Uncompressed size of the buffer (this header is not included). +:blocksize: + (``uint32``) Size of internal blocks. +:cbytes: + (``uint32``) Compressed size of the buffer (including this header). + +The blocks / splits section +--------------------------- + +After the header, there come the blocks / splits section. Blocks are equal-sized parts of the chunk, except for the last block that can be shorter or equal than the rest. + +At the beginning of the blocks section, there come a list of `int32_t bstarts` to indicate where the different encoded blocks starts (counting from the end of this `bstarts` section):: + + +=========+=========+========+=========+ + | bstart0 | bstart1 | ... | bstartN | + +=========+=========+========+=========+ + +Finally, it comes the actual list of compressed blocks / splits data streams. It turns out that a block may optionally (see bit 4 in `flags` above) be further split in so-called splits which are the actual data streams that are transmitted to codecs for compression. If a block is not split, then the split is equivalent to a whole block. Before each split in the list, there is the compressed size of it, expressed as an `int32_t`:: + + +========+========+========+========+========+========+========+ + | csize0 | split0 | csize1 | split1 | ... | csizeN | splitN | + +========+========+========+========+========+========+========+ + + +*Note*: all the integers are stored in little endian. + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/c-blosc-1.19.0/README_HEADER.rst new/c-blosc-1.20.1/README_HEADER.rst --- old/c-blosc-1.19.0/README_HEADER.rst 2020-06-05 11:09:21.000000000 +0200 +++ new/c-blosc-1.20.1/README_HEADER.rst 1970-01-01 01:00:00.000000000 +0100 @@ -1,65 +0,0 @@ -Blosc Header Format -=================== - -Blosc (as of Version 1.0.0) has the following 16 byte header that stores -information about the compressed buffer:: - - |-0-|-1-|-2-|-3-|-4-|-5-|-6-|-7-|-8-|-9-|-A-|-B-|-C-|-D-|-E-|-F-| - ^ ^ ^ ^ | nbytes | blocksize | ctbytes | - | | | | - | | | +--typesize - | | +------flags - | +----------versionlz - +--------------version - -Datatypes of the Header Entries -------------------------------- - -All entries are little endian. - -:version: - (``uint8``) Blosc format version. -:versionlz: - (``uint8``) Version of the internal compressor used. -:flags and compressor enumeration: - (``bitfield``) The flags of the buffer - - :bit 0 (``0x01``): - Whether the byte-shuffle filter has been applied or not. - :bit 1 (``0x02``): - Whether the internal buffer is a pure memcpy or not. - :bit 2 (``0x04``): - Whether the bit-shuffle filter has been applied or not. - :bit 3 (``0x08``): - Reserved, must be zero. - :bit 4 (``0x10``): - If set, the blocks will not be split in sub-blocks during compression. - :bit 5 (``0x20``): - Part of the enumeration for compressors. - :bit 6 (``0x40``): - Part of the enumeration for compressors. - :bit 7 (``0x80``): - Part of the enumeration for compressors. - - The last three bits form an enumeration that allows to use alternative - compressors. - - :``0``: - ``blosclz`` - :``1``: - ``lz4`` or ``lz4hc`` - :``2``: - ``snappy`` - :``3``: - ``zlib`` - :``4``: - ``zstd`` - -:typesize: - (``uint8``) Number of bytes for the atomic type. -:nbytes: - (``uint32``) Uncompressed size of the buffer. -:blocksize: - (``uint32``) Size of internal blocks. -:ctbytes: - (``uint32``) Compressed size of the buffer. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/c-blosc-1.19.0/RELEASE_NOTES.rst new/c-blosc-1.20.1/RELEASE_NOTES.rst --- old/c-blosc-1.19.0/RELEASE_NOTES.rst 2020-06-05 11:09:21.000000000 +0200 +++ new/c-blosc-1.20.1/RELEASE_NOTES.rst 2020-09-08 17:23:32.000000000 +0200 @@ -2,6 +2,38 @@ Release notes for C-Blosc =========================== +Changes from 1.20.0 to 1.20.1 +============================= + +* Added `<unistd.h>` in vendored zlib 1.2.8 for compatibility with Python 3.8 + in recent Mac OSX. For details, see: + https://github.com/Blosc/python-blosc/issues/229 + +Changes from 1.19.1 to 1.20.0 +============================= + +* More saftey checks have been implemented so that potential flaws + discovered by new fuzzers in OSS-Fuzzer are fixed now. Thanks to + Nathan Moinvaziri (@nmoinvaz). + +* BloscLZ updated to 2.3.0. Expect better compression ratios for faster + codecs. For details, see our new blog post: + https://blosc.org/posts/beast-release/ + +* Fixed the `_xgetbv()` collision. Thanks to Michał Górny (@mgorny). + +* The chunk format has been fully described so that 3rd party software + may come with a different implementation, but still compatible with + C-Blosc chunks. + + +Changes from 1.19.0 to 1.19.1 +============================= + +- pthread_create() errors are now handled and propagated back to the user. + See https://github.com/Blosc/c-blosc/pull/299. + + Changes from 1.18.1 to 1.19.0 ============================= @@ -15,6 +47,11 @@ Also, a new OSS-Fuzz workflow has been added for increased detection of possible vulnerabilities. Thanks to Nathan Moinvaziri. +- For small buffers that cannot be compressed (typically < 128 bytes), + `blosc_compress()` returns now a 0 (cannot compress) instead of a negative + number (internal error). See https://github.com/Blosc/c-blosc/pull/294. + Thanks to @kalvdans for providing the initial patch. + - blosclz codec updated to 2.1.0. Expect better compression ratios and performance in a wider variety of scenarios. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/c-blosc-1.19.0/bench/plot-speeds.py new/c-blosc-1.20.1/bench/plot-speeds.py --- old/c-blosc-1.19.0/bench/plot-speeds.py 2020-06-05 11:09:21.000000000 +0200 +++ new/c-blosc-1.20.1/bench/plot-speeds.py 2020-09-08 17:23:32.000000000 +0200 @@ -29,16 +29,12 @@ tmp = line.split('-->')[1] parts = tmp.split(', ') nthreads, size, elsize, sbits, codec, shuffle = parts[:6] - safe = 'unsafe' - if len(parts) > 6: - safe = parts[6] nthreads, size, elsize, sbits = map(int, (nthreads, size, elsize, sbits)) - values["size"] = size * NCHUNKS / MB_ + values["size"] = size / MB_ values["elsize"] = elsize values["sbits"] = sbits values["codec"] = codec values["shuffle"] = shuffle - values["safe"] = safe # New run for nthreads (ratios, speedsw, speedsr) = ([], [], []) # Add a new entry for (ratios, speedw, speedr) @@ -47,21 +43,21 @@ elif line.startswith('memcpy(write):'): tmp = line.split(',')[1] memcpyw = float(tmp.split(' ')[1]) - values["memcpyw"].append(memcpyw) + values["memcpyw"].append(memcpyw / 1024) elif line.startswith('memcpy(read):'): tmp = line.split(',')[1] memcpyr = float(tmp.split(' ')[1]) - values["memcpyr"].append(memcpyr) + values["memcpyr"].append(memcpyr / 1024) elif line.startswith('comp(write):'): tmp = line.split(',')[1] speedw = float(tmp.split(' ')[1]) ratio = float(line.split(':')[-1]) - speedsw.append(speedw) + speedsw.append(speedw / 1024) ratios.append(ratio) elif line.startswith('decomp(read):'): tmp = line.split(',')[1] speedr = float(tmp.split(' ')[1]) - speedsr.append(speedr) + speedsr.append(speedr / 1024) if "OK" not in line: print("WARNING! OK not found in decomp line!") @@ -71,7 +67,7 @@ def show_plot(plots, yaxis, legends, gtitle, xmax=None, ymax=None): xlabel('Compresssion ratio') - ylabel('Speed (MB/s)') + ylabel('Speed (GB/s)') title(gtitle) xlim(0, xmax) ylim(0, ymax) @@ -190,7 +186,7 @@ if options.title: plot_title = options.title else: - plot_title += " (%(size).1f MB, %(elsize)d bytes, %(sbits)d bits), %(codec)s %(shuffle)s %(safe)s" % values + plot_title += " (%(size).1f MB, %(elsize)d bytes, %(sbits)d bits), %(codec)s %(shuffle)s" % values gtitle = plot_title @@ -219,7 +215,7 @@ mean = np.mean(values["memcpyr"]) message = "memcpy (read from memory)" plot_ = axhline(mean, linewidth=3, linestyle='-.', color='black') - text(4.0, mean+400, message) + text(4.0, mean+.4, message) plots.append(plot_) show_plot(plots, yaxis, legends, gtitle, xmax=int(options.xmax) if options.xmax else None, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/c-blosc-1.19.0/blosc/CMakeLists.txt new/c-blosc-1.20.1/blosc/CMakeLists.txt --- old/c-blosc-1.19.0/blosc/CMakeLists.txt 2020-06-05 11:09:21.000000000 +0200 +++ new/c-blosc-1.20.1/blosc/CMakeLists.txt 2020-09-08 17:23:32.000000000 +0200 @@ -86,6 +86,7 @@ else(LZ4_FOUND) file(GLOB LZ4_FILES ${LZ4_LOCAL_DIR}/*.c) set(SOURCES ${SOURCES} ${LZ4_FILES}) + source_group("LZ4" FILES ${LZ4_FILES}) endif(LZ4_FOUND) endif(NOT DEACTIVATE_LZ4) @@ -95,6 +96,7 @@ else(SNAPPY_FOUND) file(GLOB SNAPPY_FILES ${SNAPPY_LOCAL_DIR}/*.cc) set(SOURCES ${SOURCES} ${SNAPPY_FILES}) + source_group("Snappy" FILES ${SNAPPY_FILES}) endif(SNAPPY_FOUND) endif(NOT DEACTIVATE_SNAPPY) @@ -104,6 +106,7 @@ else(ZLIB_FOUND) file(GLOB ZLIB_FILES ${ZLIB_LOCAL_DIR}/*.c) set(SOURCES ${SOURCES} ${ZLIB_FILES}) + source_group("Zlib" FILES ${ZLIB_FILES}) endif(ZLIB_FOUND) endif(NOT DEACTIVATE_ZLIB) @@ -116,6 +119,7 @@ ${ZSTD_LOCAL_DIR}/compress/*.c ${ZSTD_LOCAL_DIR}/decompress/*.c) set(SOURCES ${SOURCES} ${ZSTD_FILES}) + source_group("Zstd" FILES ${ZSTD_FILES}) endif (ZSTD_FOUND) endif (NOT DEACTIVATE_ZSTD) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/c-blosc-1.19.0/blosc/blosc.c new/c-blosc-1.20.1/blosc/blosc.c --- old/c-blosc-1.19.0/blosc/blosc.c 2020-06-05 11:09:21.000000000 +0200 +++ new/c-blosc-1.20.1/blosc/blosc.c 2020-09-08 17:23:32.000000000 +0200 @@ -423,10 +423,10 @@ char* output, size_t maxout, int clevel) { int cbytes; - if (input_length > (size_t)(2<<30)) - return -1; /* input larger than 1 GB is not supported */ + if (input_length > (size_t)(UINT32_C(2)<<30)) + return -1; /* input larger than 2 GB is not supported */ /* clevel for lz4hc goes up to 12, at least in LZ4 1.7.5 - * but levels larger than 9 does not buy much compression. */ + * but levels larger than 9 do not buy much compression. */ cbytes = LZ4_compress_HC(input, output, (int)input_length, (int)maxout, clevel); return cbytes; @@ -877,7 +877,9 @@ (void)rc; // just to avoid 'unused-variable' warning /* Check whether we need to restart threads */ - blosc_set_nthreads_(context); + if (blosc_set_nthreads_(context) < 0) { + return -1; + } /* Set sentinels */ context->thread_giveup_code = 1; @@ -1976,7 +1978,9 @@ /* Launch a new pool of threads */ if (context->numthreads > 1 && context->numthreads != context->threads_started) { blosc_release_threadpool(context); - init_threads(context); + if (init_threads(context) < 0) { + return -1; + } } /* We have now started the threads */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/c-blosc-1.19.0/blosc/blosc.h new/c-blosc-1.20.1/blosc/blosc.h --- old/c-blosc-1.19.0/blosc/blosc.h 2020-06-05 11:09:21.000000000 +0200 +++ new/c-blosc-1.20.1/blosc/blosc.h 2020-09-08 17:23:32.000000000 +0200 @@ -18,14 +18,14 @@ /* Version numbers */ #define BLOSC_VERSION_MAJOR 1 /* for major interface/format changes */ -#define BLOSC_VERSION_MINOR 19 /* for minor interface/format changes */ -#define BLOSC_VERSION_RELEASE 0 /* for tweaks, bug-fixes, or development */ +#define BLOSC_VERSION_MINOR 20 /* for minor interface/format changes */ +#define BLOSC_VERSION_RELEASE 1 /* for tweaks, bug-fixes, or development */ -#define BLOSC_VERSION_STRING "1.19.0" /* string version. Sync with above! */ +#define BLOSC_VERSION_STRING "1.20.1" /* string version. Sync with above! */ #define BLOSC_VERSION_REVISION "$Rev$" /* revision version */ -#define BLOSC_VERSION_DATE "$Date:: 2020-06-05 #$" /* date version */ +#define BLOSC_VERSION_DATE "$Date:: 2020-09-08 #$" /* date version */ -#define BLOSCLZ_VERSION_STRING "2.1.0" /* the internal compressor version */ +#define BLOSCLZ_VERSION_STRING "2.3.0" /* the internal compressor version */ /* The *_FORMAT symbols should be just 1-byte long */ #define BLOSC_VERSION_FORMAT 2 /* Blosc format version, starting at 1 */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/c-blosc-1.19.0/blosc/blosclz.c new/c-blosc-1.20.1/blosc/blosclz.c --- old/c-blosc-1.19.0/blosc/blosclz.c 2020-06-05 11:09:21.000000000 +0200 +++ new/c-blosc-1.20.1/blosc/blosclz.c 2020-09-08 17:23:32.000000000 +0200 @@ -14,19 +14,7 @@ #include <stdio.h> - -#if defined(_WIN32) && !defined(__MINGW32__) - #include <windows.h> - /* stdint.h only available in VS2010 (VC++ 16.0) and newer */ - #if defined(_MSC_VER) && _MSC_VER < 1600 - #include "win32/stdint-windows.h" - #else - #include <stdint.h> - #endif -#else - #include <stdint.h> -#endif /* _WIN32 */ - +#include <stdbool.h> #include "blosclz.h" #include "fastcopy.h" #include "blosc-common.h" @@ -36,11 +24,11 @@ * Give hints to the compiler for branch prediction optimization. */ #if defined(__GNUC__) && (__GNUC__ > 2) -#define BLOSCLZ_EXPECT_CONDITIONAL(c) (__builtin_expect((c), 1)) -#define BLOSCLZ_UNEXPECT_CONDITIONAL(c) (__builtin_expect((c), 0)) +#define BLOSCLZ_LIKELY(c) (__builtin_expect((c), 1)) +#define BLOSCLZ_UNLIKELY(c) (__builtin_expect((c), 0)) #else -#define BLOSCLZ_EXPECT_CONDITIONAL(c) (c) -#define BLOSCLZ_UNEXPECT_CONDITIONAL(c) (c) +#define BLOSCLZ_LIKELY(c) (c) +#define BLOSCLZ_UNLIKELY(c) (c) #endif /* @@ -62,28 +50,13 @@ #define BLOSCLZ_READU32(p) *((const uint32_t*)(p)) #endif -#define HASH_LOG (12) +#define HASH_LOG (12U) // This is used in LZ4 and seems to work pretty well here too -#define HASH_FUNCTION(v, s, h) { \ - v = (s * 2654435761U) >> (32U - h); \ -} - - -#define LITERAL(ip, op, op_limit, anchor, copy) { \ - if (BLOSCLZ_UNEXPECT_CONDITIONAL(op + 2 > op_limit)) \ - goto out; \ - *op++ = *anchor++; \ - ip = anchor; \ - copy++; \ - if (BLOSCLZ_UNEXPECT_CONDITIONAL(copy == MAX_COPY)) { \ - copy = 0; \ - *op++ = MAX_COPY-1; \ - } \ +#define HASH_FUNCTION(v, s, h) { \ + v = (s * 2654435761U) >> (32U - h); \ } -#define IP_BOUNDARY 2 -#define BYTES_IN_CYCLE 512 #if defined(__AVX2__) static uint8_t *get_run_32(uint8_t *ip, const uint8_t *ip_bound, const uint8_t *ref) { @@ -191,6 +164,7 @@ } #else + static uint8_t *get_run(uint8_t *ip, const uint8_t *ip_bound, const uint8_t *ref) { uint8_t x = ip[-1]; int64_t value, value2; @@ -217,6 +191,7 @@ while ((ip < ip_bound) && (*ref++ == x)) ip++; return ip; } + #endif @@ -324,42 +299,236 @@ #endif +static uint8_t* get_run_or_match(uint8_t* ip, uint8_t* ip_bound, const uint8_t* ref, bool run) { + if (BLOSCLZ_UNLIKELY(run)) { +#if defined(__AVX2__) + ip = get_run_32(ip, ip_bound, ref); +#elif defined(__SSE2__) + ip = get_run_16(ip, ip_bound, ref); +#else + ip = get_run(ip, ip_bound, ref); +#endif + } + else { +#if defined(__AVX2__) + ip = get_match_32(ip, ip_bound, ref); +#elif defined(__SSE2__) + ip = get_match_16(ip, ip_bound, ref); +#else + ip = get_match(ip, ip_bound, ref); +#endif + } + + return ip; +} + + +#define LITERAL(ip, op, op_limit, anchor, copy) { \ + if (BLOSCLZ_UNLIKELY(op + 2 > op_limit)) \ + goto out; \ + *op++ = *anchor++; \ + ip = anchor; \ + copy++; \ + if (BLOSCLZ_UNLIKELY(copy == MAX_COPY)) { \ + copy = 0; \ + *op++ = MAX_COPY-1; \ + } \ +} + +#define LITERAL2(ip, oc, anchor, copy) { \ + oc++; anchor++; \ + ip = anchor; \ + copy++; \ + if (BLOSCLZ_UNLIKELY(copy == MAX_COPY)) { \ + copy = 0; \ + oc++; \ + } \ +} + +#define DISTANCE_SHORT(op, op_limit, len, distance) { \ + if (BLOSCLZ_UNLIKELY(op + 2 > op_limit)) \ + goto out; \ + *op++ = (uint8_t)((len << 5U) + (distance >> 8U)); \ + *op++ = (uint8_t)((distance & 255U)); \ +} + +#define DISTANCE_LONG(op, op_limit, len, distance) { \ + if (BLOSCLZ_UNLIKELY(op + 1 > op_limit)) \ + goto out; \ + *op++ = (uint8_t)((7U << 5U) + (distance >> 8U)); \ + for (len -= 7; len >= 255; len -= 255) { \ + if (BLOSCLZ_UNLIKELY(op + 1 > op_limit)) \ + goto out; \ + *op++ = 255; \ + } \ + if (BLOSCLZ_UNLIKELY(op + 2 > op_limit)) \ + goto out; \ + *op++ = (uint8_t)len; \ + *op++ = (uint8_t)((distance & 255U)); \ +} + +#define DISTANCE_SHORT_FAR(op, op_limit, len, distance) { \ + if (BLOSCLZ_UNLIKELY(op + 4 > op_limit)) \ + goto out; \ + *op++ = (uint8_t)((len << 5U) + 31); \ + *op++ = 255; \ + *op++ = (uint8_t)(distance >> 8U); \ + *op++ = (uint8_t)(distance & 255U); \ +} + +#define DISTANCE_LONG_FAR(op, op_limit, len, distance) { \ + if (BLOSCLZ_UNLIKELY(op + 1 > op_limit)) \ + goto out; \ + *op++ = (7U << 5U) + 31; \ + for (len -= 7; len >= 255; len -= 255) { \ + if (BLOSCLZ_UNLIKELY(op + 1 > op_limit)) \ + goto out; \ + *op++ = 255; \ + } \ + if (BLOSCLZ_UNLIKELY(op + 4 > op_limit)) \ + goto out; \ + *op++ = (uint8_t)len; \ + *op++ = 255; \ + *op++ = (uint8_t)(distance >> 8U); \ + *op++ = (uint8_t)(distance & 255U); \ +} + + +// Get the compressed size of a buffer. Useful for testing compression ratios for high clevels. +static int get_csize(uint8_t* ibase, int maxlen, bool force_3b_shift) { + uint8_t* ip = ibase; + int32_t oc = 0; + uint8_t* ip_bound = ibase + maxlen - 1; + uint8_t* ip_limit = ibase + maxlen - 12; + uint32_t htab[1U << (uint8_t)HASH_LOG]; + uint32_t hval; + uint32_t seq; + uint8_t copy; + + // Initialize the hash table to distances of 0 + for (unsigned i = 0; i < (1U << HASH_LOG); i++) { + htab[i] = 0; + } + + /* we start with literal copy */ + copy = 4; + oc += 5; + + /* main loop */ + while (BLOSCLZ_LIKELY(ip < ip_limit)) { + const uint8_t* ref; + unsigned distance; + uint8_t* anchor = ip; /* comparison starting-point */ + + /* find potential match */ + seq = BLOSCLZ_READU32(ip); + HASH_FUNCTION(hval, seq, HASH_LOG) + ref = ibase + htab[hval]; + + /* calculate distance to the match */ + distance = anchor - ref; + + /* update hash table */ + htab[hval] = (uint32_t) (anchor - ibase); + + if (distance == 0 || (distance >= MAX_FARDISTANCE)) { + LITERAL2(ip, oc, anchor, copy) + continue; + } + + /* is this a match? check the first 4 bytes */ + if (BLOSCLZ_UNLIKELY(BLOSCLZ_READU32(ref) == BLOSCLZ_READU32(ip))) { + ref += 4; + } + else { + /* no luck, copy as a literal */ + LITERAL2(ip, oc, anchor, copy) + continue; + } + + /* last matched byte */ + ip = anchor + 4; + + /* distance is biased */ + distance--; + + /* get runs or matches; zero distance means a run */ + ip = get_run_or_match(ip, ip_bound, ref, !distance); + + ip -= force_3b_shift ? 3 : 4; + unsigned len = (int)(ip - anchor); + // If match is close, let's reduce the minimum length to encode it + unsigned minlen = (distance < MAX_DISTANCE) ? 3 : 4; + // Encoding short lengths is expensive during decompression + if (len < minlen) { + LITERAL2(ip, oc, anchor, copy) + continue; + } + + /* if we have'nt copied anything, adjust the output counter */ + if (!copy) + oc--; + /* reset literal counter */ + copy = 0; + + /* encode the match */ + if (distance < MAX_DISTANCE) { + if (len >= 7) { + oc += ((len - 7) / 255) + 1; + } + oc += 2; + } + else { + /* far away, but not yet in the another galaxy... */ + if (len >= 7) { + oc += ((len - 7) / 255) + 1; + } + oc += 4; + } + + /* update the hash at match boundary */ + seq = BLOSCLZ_READU32(ip); + HASH_FUNCTION(hval, seq, HASH_LOG) + htab[hval] = (uint32_t) (ip++ - ibase); + seq >>= 8U; + HASH_FUNCTION(hval, seq, HASH_LOG) + htab[hval] = (uint32_t) (ip++ - ibase); + /* assuming literal copy */ + oc++; + + } + + /* if we have copied something, adjust the copy length */ + if (!copy) + oc--; + + return (int)oc; +} + + int blosclz_compress(const int clevel, const void* input, int length, void* output, int maxout) { uint8_t* ibase = (uint8_t*)input; uint8_t* ip = ibase; - uint8_t* icycle = ibase; - uint8_t* ip_bound = ibase + length - IP_BOUNDARY; + uint8_t* ip_bound = ibase + length - 1; uint8_t* ip_limit = ibase + length - 12; uint8_t* op = (uint8_t*)output; - uint8_t* ocycle = op; uint8_t* op_limit; uint32_t htab[1U << (uint8_t)HASH_LOG]; uint32_t hval; uint32_t seq; uint8_t copy; - long skip_cycle = 0; - double cratio; - // Minimum cratios before issuing and _early giveup_ - // Remind that blosclz is not meant for cratios <= 2 (too costly to decompress) - double maxlength_[10] = {-1, .07, .1, .2, .4, .5, .5, .5, .5, .6}; - int32_t maxlength = (int32_t)(length * maxlength_[clevel]); - if (maxlength > (int32_t)maxout) { - maxlength = (int32_t)maxout; - } - op_limit = op + maxlength; - - // The maximum amount of cycles to skip match lookups - // A 0 means just _early giveup_ whereas > 0 use _entropy sensing_ too - long max_skip_cycles_[10] = {255, 0, 0, 0, 3, 2, 2, 1, 1, 0}; - long max_skip_cycles = max_skip_cycles_[clevel]; - // The minimum compression ratio before skipping a number of cycles - double min_cratio_[10] = {-1, 0., 0., 0., 5., 4., 4., 3., 2., 1.}; - double min_cratio = min_cratio_[clevel]; + op_limit = op + maxout; + + // Minimum lengths for encoding + unsigned minlen_[10] = {0, 12, 12, 11, 10, 9, 8, 7, 6, 5}; + + // Minimum compression ratios for initiate encoding + double cratio_[10] = {0, 2, 2, 2, 2, 1.8, 1.6, 1.4, 1.2, 1.1}; uint8_t hashlog_[10] = {0, HASH_LOG - 2, HASH_LOG - 1, HASH_LOG, HASH_LOG, - HASH_LOG, HASH_LOG, HASH_LOG, HASH_LOG, HASH_LOG}; + HASH_LOG, HASH_LOG, HASH_LOG, HASH_LOG, HASH_LOG}; uint8_t hashlog = hashlog_[clevel]; // Initialize the hash table to distances of 0 for (unsigned i = 0; i < (1U << hashlog); i++) { @@ -371,50 +540,74 @@ return 0; } + /* When we go back in a match (shift), we obtain quite different compression properties. + * It looks like 4 is more useful in combination with bitshuffle and small typesizes + * (compress better and faster in e.g. `b2bench blosclz bitshuffle single 6 6291456 1 19`). + * Fallback to 4 because it provides more consistent results on small itemsizes. + * + * In this block we also check cratios for the beginning of the buffers and + * eventually discard those that are small (take too long to decompress). + * This process is called _entropy probing_. + */ + int ipshift = 4; + int maxlen; // maximum length for entropy probing + int csize_3b; + int csize_4b; + double cratio = 0; + switch (clevel) { + case 1: + case 2: + case 3: + maxlen = length / 8; + csize_4b = get_csize(ibase, maxlen, false); + cratio = (double)maxlen / csize_4b; + break; + case 4: + case 5: + case 6: + case 7: + case 8: + maxlen = length / 8; + csize_4b = get_csize(ibase, maxlen, false); + cratio = (double)maxlen / csize_4b; + break; + case 9: + // case 9 is special. we need to asses the optimal shift + maxlen = length / 8; + csize_3b = get_csize(ibase, maxlen, true); + csize_4b = get_csize(ibase, maxlen, false); + ipshift = (csize_3b < csize_4b) ? 3 : 4; + cratio = (csize_3b < csize_4b) ? ((double)maxlen / csize_3b) : ((double)maxlen / csize_4b); + break; + default: + break; + } + // discard probes with small compression ratios (too expensive) + if (cratio < cratio_ [clevel]) { + goto out; + } + /* we start with literal copy */ - copy = 2; + copy = 4; *op++ = MAX_COPY - 1; *op++ = *ip++; *op++ = *ip++; + *op++ = *ip++; + *op++ = *ip++; /* main loop */ - while (BLOSCLZ_EXPECT_CONDITIONAL(ip < ip_limit)) { + while (BLOSCLZ_LIKELY(ip < ip_limit)) { const uint8_t* ref; - uint32_t distance; - uint32_t len = 4; /* minimum match length */ + unsigned distance; uint8_t* anchor = ip; /* comparison starting-point */ - if (BLOSCLZ_EXPECT_CONDITIONAL(max_skip_cycles)) { - // Enter the entropy probing mode - if (skip_cycle) { - LITERAL(ip, op, op_limit, anchor, copy) - // Start a new cycle every 256 bytes - if (BLOSCLZ_UNEXPECT_CONDITIONAL(ip - icycle) >= BYTES_IN_CYCLE) { - skip_cycle--; - icycle = ip; - ocycle = op; - } - continue; - } - // Check whether we are doing well with compression ratios - if (BLOSCLZ_UNEXPECT_CONDITIONAL((op - ocycle) >= BYTES_IN_CYCLE)) { - cratio = (double) (ip - icycle) / (double) (op - ocycle); - if (cratio < min_cratio) { - skip_cycle = max_skip_cycles; - icycle = ip; - ocycle = op; - continue; - } - } - } - /* find potential match */ seq = BLOSCLZ_READU32(ip); HASH_FUNCTION(hval, seq, hashlog) ref = ibase + htab[hval]; /* calculate distance to the match */ - distance = (int32_t)(anchor - ref); + distance = anchor - ref; /* update hash table */ htab[hval] = (uint32_t) (anchor - ibase); @@ -425,39 +618,35 @@ } /* is this a match? check the first 4 bytes */ - if (BLOSCLZ_UNEXPECT_CONDITIONAL(BLOSCLZ_READU32(ref) == BLOSCLZ_READU32(ip))) { + if (BLOSCLZ_UNLIKELY(BLOSCLZ_READU32(ref) == BLOSCLZ_READU32(ip))) { ref += 4; - } - else { + } else { /* no luck, copy as a literal */ LITERAL(ip, op, op_limit, anchor, copy) continue; } /* last matched byte */ - ip = anchor + len; + ip = anchor + 4; /* distance is biased */ distance--; - if (BLOSCLZ_UNEXPECT_CONDITIONAL(!distance)) { - /* zero distance means a run */ -#if defined(__AVX2__) - ip = get_run_32(ip, ip_bound, ref); -#elif defined(__SSE2__) - ip = get_run_16(ip, ip_bound, ref); -#else - ip = get_run(ip, ip_bound, ref); -#endif - } - else { -#if defined(__AVX2__) - ip = get_match_32(ip, ip_bound + IP_BOUNDARY, ref); -#elif defined(__SSE2__) - ip = get_match_16(ip, ip_bound + IP_BOUNDARY, ref); -#else - ip = get_match(ip, ip_bound + IP_BOUNDARY, ref); -#endif + /* get runs or matches; zero distance means a run */ + ip = get_run_or_match(ip, ip_bound, ref, !distance); + + /* length is biased, '1' means a match of 3 bytes */ + ip -= ipshift; + + unsigned len = (int)(ip - anchor); + // If match is close, let's reduce the minimum length to encode it + unsigned minlen = (clevel == 9) ? ipshift : minlen_[clevel]; + + // Encoding short lengths is expensive during decompression + // Encode only for reasonable lengths (extensive experiments done) + if (len < minlen || (len <= 5 && distance >= MAX_DISTANCE)) { + LITERAL(ip, op, op_limit, anchor, copy) + continue; } /* if we have copied something, adjust the copy count */ @@ -467,46 +656,23 @@ else /* back, to overwrite the copy count */ op--; - /* reset literal counter */ copy = 0; - /* length is biased, '1' means a match of 3 bytes */ - ip -= 3; - len = (int32_t)(ip - anchor); - /* encode the match */ if (distance < MAX_DISTANCE) { if (len < 7) { - *op++ = (uint8_t)((len << 5U) + (distance >> 8U)); - *op++ = (uint8_t)((distance & 255U)); - } - else { - *op++ = (uint8_t)((7U << 5U) + (distance >> 8U)); - for (len -= 7; len >= 255; len -= 255) - *op++ = 255; - *op++ = (uint8_t)len; - *op++ = (uint8_t)((distance & 255U)); + DISTANCE_SHORT(op, op_limit, len, distance) + } else { + DISTANCE_LONG(op, op_limit, len, distance) } - } - else { + } else { /* far away, but not yet in the another galaxy... */ + distance -= MAX_DISTANCE; if (len < 7) { - distance -= MAX_DISTANCE; - *op++ = (uint8_t)((len << 5U) + 31); - *op++ = 255; - *op++ = (uint8_t)(distance >> 8U); - *op++ = (uint8_t)(distance & 255U); - } - else { - distance -= MAX_DISTANCE; - *op++ = (7U << 5U) + 31; - for (len -= 7; len >= 255; len -= 255) - *op++ = 255; - *op++ = (uint8_t)len; - *op++ = 255; - *op++ = (uint8_t)(distance >> 8U); - *op++ = (uint8_t)(distance & 255U); + DISTANCE_SHORT_FAR(op, op_limit, len, distance) + } else { + DISTANCE_LONG_FAR(op, op_limit, len, distance) } } @@ -518,17 +684,18 @@ HASH_FUNCTION(hval, seq, hashlog) htab[hval] = (uint32_t) (ip++ - ibase); /* assuming literal copy */ - *op++ = MAX_COPY - 1; + if (BLOSCLZ_UNLIKELY(op + 1 > op_limit)) + goto out; + *op++ = MAX_COPY - 1; } /* left-over as literal copy */ - ip_bound++; - while (BLOSCLZ_UNEXPECT_CONDITIONAL(ip <= ip_bound)) { - if (BLOSCLZ_UNEXPECT_CONDITIONAL(op + 2 > op_limit)) goto out; + while (BLOSCLZ_UNLIKELY(ip <= ip_bound)) { + if (BLOSCLZ_UNLIKELY(op + 2 > op_limit)) goto out; *op++ = *ip++; copy++; - if (BLOSCLZ_UNEXPECT_CONDITIONAL(copy == MAX_COPY)) { + if (BLOSCLZ_UNLIKELY(copy == MAX_COPY)) { copy = 0; *op++ = MAX_COPY - 1; } @@ -547,7 +714,6 @@ out: return 0; - } // See https://habr.com/en/company/yandex/blog/457612/ @@ -605,6 +771,14 @@ } #endif +// LZ4 wildCopy which can reach excellent copy bandwidth (even if insecure) +static inline void wild_copy(uint8_t *out, const uint8_t* from, uint8_t* end) { + uint8_t* d = out; + const uint8_t* s = from; + uint8_t* const e = end; + + do { memcpy(d,s,8); d+=8; s+=8; } while (d<e); +} int blosclz_decompress(const void* input, int length, void* output, int maxout) { const uint8_t* ip = (const uint8_t*)input; @@ -612,23 +786,22 @@ uint8_t* op = (uint8_t*)output; uint32_t ctrl; uint8_t* op_limit = op + maxout; - if (BLOSCLZ_UNEXPECT_CONDITIONAL(length == 0)) { + if (BLOSCLZ_UNLIKELY(length == 0)) { return 0; } ctrl = (*ip++) & 31U; while (1) { - uint8_t* ref = op; - int32_t len = ctrl >> 5U; - int32_t ofs = (ctrl & 31U) << 8U; - if (ctrl >= 32) { + // match + int32_t len = (ctrl >> 5U) - 1 ; + int32_t ofs = (ctrl & 31U) << 8U; uint8_t code; - len--; - ref -= ofs; + const uint8_t* ref = op - ofs; + if (len == 7 - 1) { do { - if (BLOSCLZ_UNEXPECT_CONDITIONAL(ip + 1 >= ip_limit)) { + if (BLOSCLZ_UNLIKELY(ip + 1 >= ip_limit)) { return 0; } code = *ip++; @@ -636,17 +809,18 @@ } while (code == 255); } else { - if (BLOSCLZ_UNEXPECT_CONDITIONAL(ip + 1 >= ip_limit)) { + if (BLOSCLZ_UNLIKELY(ip + 1 >= ip_limit)) { return 0; } } code = *ip++; + len += 3; ref -= code; /* match from 16-bit distance */ - if (BLOSCLZ_UNEXPECT_CONDITIONAL(code == 255)) { - if (BLOSCLZ_EXPECT_CONDITIONAL(ofs == (31U << 8U))) { - if (BLOSCLZ_UNEXPECT_CONDITIONAL(ip + 1 >= ip_limit)) { + if (BLOSCLZ_UNLIKELY(code == 255)) { + if (ofs == (31U << 8U)) { + if (ip + 1 >= ip_limit) { return 0; } ofs = (*ip++) << 8U; @@ -655,29 +829,30 @@ } } - if (BLOSCLZ_UNEXPECT_CONDITIONAL(op + len + 3 > op_limit)) { + if (BLOSCLZ_UNLIKELY(op + len > op_limit)) { return 0; } - if (BLOSCLZ_UNEXPECT_CONDITIONAL(ref - 1 < (uint8_t*)output)) { + if (BLOSCLZ_UNLIKELY(ref - 1 < (uint8_t*)output)) { return 0; } - if (BLOSCLZ_EXPECT_CONDITIONAL(ip < ip_limit)) - ctrl = *ip++; - else - break; + if (BLOSCLZ_UNLIKELY(ip >= ip_limit)) break; + ctrl = *ip++; - if (ref == op) { + ref--; + if (ref == op - 1) { /* optimized copy for a run */ - uint8_t b = ref[-1]; - memset(op, b, len + 3); - op += len + 3; + memset(op, *ref, len); + op += len; + } + else if ((op - ref >= 8) && (op_limit - op >= len + 8)) { + // copy with an overlap not larger than 8 + wild_copy(op, ref, op + len); + op += len; } else { - /* copy from reference */ - ref--; - len += 3; + // general copy with any overlap #ifdef __AVX2__ if (op - ref <= 16) { // This is not faster on a combination of compilers (clang, gcc, icc) or machines, but @@ -686,7 +861,6 @@ } else { #endif - // We absolutely need a copy_match here op = copy_match(op, ref, (unsigned) len); #ifdef __AVX2__ } @@ -694,21 +868,23 @@ } } else { + // literal ctrl++; - if (BLOSCLZ_UNEXPECT_CONDITIONAL(op + ctrl > op_limit)) { + if (BLOSCLZ_UNLIKELY(op + ctrl > op_limit)) { return 0; } - if (BLOSCLZ_UNEXPECT_CONDITIONAL(ip + ctrl > ip_limit)) { + if (BLOSCLZ_UNLIKELY(ip + ctrl > ip_limit)) { return 0; } - // memcpy(op, ip, ctrl); op += ctrl; ip += ctrl; + memcpy(op, ip, ctrl); op += ctrl; ip += ctrl; // On GCC-6, fastcopy this is still faster than plain memcpy // However, using recent CLANG/LLVM 9.0, there is almost no difference // in performance. - op = fastcopy(op, ip, (unsigned) ctrl); ip += ctrl; + // And starting on CLANG/LLVM 10 and GCC 9, memcpy is generally faster. + // op = fastcopy(op, ip, (unsigned) ctrl); ip += ctrl; - if (BLOSCLZ_UNEXPECT_CONDITIONAL(ip >= ip_limit)) break; + if (BLOSCLZ_UNLIKELY(ip >= ip_limit)) break; ctrl = *ip++; } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/c-blosc-1.19.0/blosc/shuffle.c new/c-blosc-1.20.1/blosc/shuffle.c --- old/c-blosc-1.19.0/blosc/shuffle.c 2020-06-05 11:09:21.000000000 +0200 +++ new/c-blosc-1.20.1/blosc/shuffle.c 2020-09-08 17:23:32.000000000 +0200 @@ -195,6 +195,10 @@ return ((uint64_t)edx << 32) | eax; } +#else + +#define blosc_internal_xgetbv _xgetbv + #endif // !(defined(_IMMINTRIN_H_INCLUDED) && (BLOSC_GCC_VERSION >= 900)) #endif /* defined(_MSC_FULL_VER) */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/c-blosc-1.19.0/code_of_conduct.md new/c-blosc-1.20.1/code_of_conduct.md --- old/c-blosc-1.19.0/code_of_conduct.md 1970-01-01 01:00:00.000000000 +0100 +++ new/c-blosc-1.20.1/code_of_conduct.md 2020-09-08 17:23:32.000000000 +0200 @@ -0,0 +1,5 @@ +# Code of Conduct + +The Blosc community has adopted a Code of Conduct that we expect project participants to adhere to. +Please read the [full text](https://github.com/Blosc/community/blob/master/code_of_conduct.md) +so that you can understand what actions will and will not be tolerated. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/c-blosc-1.19.0/internal-complibs/zlib-1.2.8/gzguts.h new/c-blosc-1.20.1/internal-complibs/zlib-1.2.8/gzguts.h --- old/c-blosc-1.19.0/internal-complibs/zlib-1.2.8/gzguts.h 2020-06-05 11:09:21.000000000 +0200 +++ new/c-blosc-1.20.1/internal-complibs/zlib-1.2.8/gzguts.h 2020-09-08 17:23:32.000000000 +0200 @@ -3,6 +3,10 @@ * For conditions of distribution and use, see copyright notice in zlib.h */ +#ifndef _WIN32 + #include <unistd.h> +#endif + #ifdef _LARGEFILE64_SOURCE # ifndef _LARGEFILE_SOURCE # define _LARGEFILE_SOURCE 1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/c-blosc-1.19.0/tests/fuzz/CMakeLists.txt new/c-blosc-1.20.1/tests/fuzz/CMakeLists.txt --- old/c-blosc-1.19.0/tests/fuzz/CMakeLists.txt 1970-01-01 01:00:00.000000000 +0100 +++ new/c-blosc-1.20.1/tests/fuzz/CMakeLists.txt 2020-09-08 17:23:32.000000000 +0200 @@ -0,0 +1,62 @@ +# flags +link_directories(${PROJECT_BINARY_DIR}/blosc) + +# look for fuzzing lib and link with it if found +if(CMAKE_C_COMPILER_ID STREQUAL "Clang") + enable_language(CXX) + + if(DEFINED ENV{LIB_FUZZING_ENGINE}) + set(FUZZING_ENGINE $ENV{LIB_FUZZING_ENGINE}) + set(FUZZING_ENGINE_FOUND TRUE) + else() + find_library(FUZZING_ENGINE "FuzzingEngine") + endif() +endif() + +# If fuzzing lib not found then create standalone fuzz runner +if(NOT FUZZING_ENGINE_FOUND) + set(FUZZER_SRC standalone.c) +else() + set(FUZZER_SRC) +endif() + +# sources +file(GLOB SOURCES fuzz_*.c) + +# targets and tests +foreach(source ${SOURCES}) + get_filename_component(target ${source} NAME_WE) + + # Enable support for testing accelerated shuffles + if(COMPILER_SUPPORT_SSE2) + # Define a symbol so tests for SSE2 shuffle/unshuffle will be compiled in. + set_property( + SOURCE ${source} + APPEND PROPERTY COMPILE_DEFINITIONS SHUFFLE_SSE2_ENABLED) + endif(COMPILER_SUPPORT_SSE2) +# if(COMPILER_SUPPORT_AVX2) +# # Define a symbol so tests for AVX2 shuffle/unshuffle will be compiled in. +# set_property( +# SOURCE ${source} +# APPEND PROPERTY COMPILE_DEFINITIONS SHUFFLE_AVX2_ENABLED) +# endif(COMPILER_SUPPORT_AVX2) + + add_executable(${target} ${source} ${FUZZER_SRC}) + + # OSS-Fuzz expect fuzzers to end with _fuzzer + string(REPLACE "fuzz_" "" output_name ${target}) + set_target_properties(${target} PROPERTIES OUTPUT_NAME ${output_name}_fuzzer) + + if(FUZZING_ENGINE_FOUND) + set_target_properties(${target} PROPERTIES LINKER_LANGUAGE CXX) + target_link_libraries(${target} ${FUZZING_ENGINE}) + endif() + + target_link_libraries(${target} blosc_static) + add_dependencies(${target} blosc_static) + + # run standalone fuzzer against each file + file(GLOB COMPAT_FILES ${PROJECT_SOURCE_DIR}/compat/*.cdata) + add_test(NAME ${target} COMMAND ${target} ${COMPAT_FILES}) + +endforeach(source) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/c-blosc-1.19.0/tests/fuzz/fuzz_compress.c new/c-blosc-1.20.1/tests/fuzz/fuzz_compress.c --- old/c-blosc-1.19.0/tests/fuzz/fuzz_compress.c 1970-01-01 01:00:00.000000000 +0100 +++ new/c-blosc-1.20.1/tests/fuzz/fuzz_compress.c 2020-09-08 17:23:32.000000000 +0200 @@ -0,0 +1,65 @@ +#include <stdint.h> +#include <stdlib.h> + +#include "blosc.h" + +#ifdef __cplusplus +extern "C" { +#endif + +int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) { + const char *compressors[] = { "blosclz", "lz4", "lz4hc", "snappy", "zlib", "zstd" }; + int level = 9, filter = BLOSC_BITSHUFFLE, cindex = 0, i = 0; + size_t nbytes, cbytes, blocksize; + void *output, *input; + + blosc_set_nthreads(1); + + if (size > 0) + level = data[0] % (9 + 1); + if (size > 1) + filter = data[1] % (BLOSC_BITSHUFFLE + 1); + if (size > 2) + cindex = data[2]; + + /* Find next available compressor */ + while (blosc_set_compressor(compressors[cindex % 6]) == -1 && i < 6) { + cindex++, i++; + } + if (i == 6) { + /* No compressors available */ + return 0; + } + + if (size > 3 && data[3] % 7 == 0) + blosc_set_blocksize(4096); + + if (size > 4) + blosc_set_splitmode(data[4] % BLOSC_FORWARD_COMPAT_SPLIT + 1); + + output = malloc(size + 1); + if (output == NULL) + return 0; + + if (blosc_compress(level, filter, 1, size, data, output, size) == 0) { + /* Cannot compress src buffer into dest */ + free(output); + return 0; + } + + blosc_cbuffer_sizes(output, &nbytes, &cbytes, &blocksize); + + input = malloc(cbytes); + if (input != NULL) { + blosc_decompress(output, input, cbytes); + free(input); + } + + free(output); + + return 0; +} + +#ifdef __cplusplus +} +#endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/c-blosc-1.19.0/tests/fuzz/fuzz_decompress.c new/c-blosc-1.20.1/tests/fuzz/fuzz_decompress.c --- old/c-blosc-1.19.0/tests/fuzz/fuzz_decompress.c 1970-01-01 01:00:00.000000000 +0100 +++ new/c-blosc-1.20.1/tests/fuzz/fuzz_decompress.c 2020-09-08 17:23:32.000000000 +0200 @@ -0,0 +1,41 @@ +#include <stdint.h> +#include <stdlib.h> + +#include "blosc.h" + +#ifdef __cplusplus +extern "C" { +#endif + +int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) { + size_t nbytes, cbytes, blocksize; + void *output; + + if (size < BLOSC_MIN_HEADER_LENGTH) { + return 0; + } + + blosc_cbuffer_sizes(data, &nbytes, &cbytes, &blocksize); + if (cbytes != size) { + return 0; + } + if (nbytes == 0) { + return 0; + } + + if (blosc_cbuffer_validate(data, size, &nbytes) != 0) { + /* Unexpected nbytes specified in blosc header */ + return 0; + } + + output = malloc(cbytes); + if (output != NULL) { + blosc_decompress(data, output, cbytes); + free(output); + } + return 0; +} + +#ifdef __cplusplus +} +#endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/c-blosc-1.19.0/tests/fuzz/standalone.c new/c-blosc-1.20.1/tests/fuzz/standalone.c --- old/c-blosc-1.19.0/tests/fuzz/standalone.c 1970-01-01 01:00:00.000000000 +0100 +++ new/c-blosc-1.20.1/tests/fuzz/standalone.c 2020-09-08 17:23:32.000000000 +0200 @@ -0,0 +1,44 @@ +#include <assert.h> +#include <stdio.h> +#include <stdlib.h> + +extern int LLVMFuzzerTestOneInput(const unsigned char *data, size_t size); + +int main(int argc, char **argv) { + int i; + fprintf(stderr, "Running %d inputs\n", argc - 1); + + for (i = 1; i < argc; i++) { + size_t len, err, n_read = 0; + unsigned char *buf; + FILE *f = NULL; + + f = fopen(argv[i], "rb+"); + if (f == NULL) { + /* Failed to open this file: it may be a directory. */ + fprintf(stderr, "Skipping: %s\n", argv[i]); + continue; + } + fprintf(stderr, "Running: %s %s\n", argv[0], argv[i]); + + fseek(f, 0, SEEK_END); + len = ftell(f); + fseek(f, 0, SEEK_SET); + + buf = (unsigned char *)malloc(len); + if (buf != NULL) { + n_read = fread(buf, 1, len, f); + assert(n_read == len); + LLVMFuzzerTestOneInput(buf, len); + free(buf); + } + + err = fclose(f); + assert(err == 0); + (void)err; + + fprintf(stderr, "Done: %s: (%d bytes)\n", argv[i], (int)n_read); + } + + return 0; +}

1 0

commit python-pylint for openSUSE:Factory
by User for buildservice source handling 21 Dec '20

21 Dec '20

Hello community, here is the log from the commit of package python-pylint for openSUSE:Factory checked in at 2020-12-21 12:35:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-pylint (Old) and /work/SRC/openSUSE:Factory/.python-pylint.new.5145 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-pylint" Mon Dec 21 12:35:08 2020 rev:20 rq:856770 version:2.6.0 Changes: -------- --- /work/SRC/openSUSE:Factory/python-pylint/python-pylint.changes 2020-09-04 10:58:55.834617526 +0200 +++ /work/SRC/openSUSE:Factory/.python-pylint.new.5145/python-pylint.changes 2020-12-21 12:35:16.466945991 +0100 @@ -1,0 +2,6 @@ +Thu Dec 17 21:43:53 UTC 2020 - Benjamin Greiner <code(a)bnavigator.de> + +- Skip the failing test for unused imports on python36 flavor + gh#openSUSE/python-rpm-macros#66 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-pylint.spec ++++++ --- /var/tmp/diff_new_pack.xkgI33/_old 2020-12-21 12:35:17.186947712 +0100 +++ /var/tmp/diff_new_pack.xkgI33/_new 2020-12-21 12:35:17.186947712 +0100 @@ -102,7 +102,9 @@ # others must not import from local source dir # gh#PyCQA/pylint#3636 export PYTHONPATH="" -%pytest -k "not test_version" --benchmark-disable +# test_functional[unused_typing_imports] fails in the python36 flavor for TW +python36_skiptest=" or (test_functional and unused_typing_imports)" +%pytest -k "not (test_version ${$python_skiptest})" --benchmark-disable %endif %files %{python_files}

1 0

commit python-build for openSUSE:Factory
by User for buildservice source handling 21 Dec '20

21 Dec '20

Hello community, here is the log from the commit of package python-build for openSUSE:Factory checked in at 2020-12-21 12:35:06 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-build (Old) and /work/SRC/openSUSE:Factory/.python-build.new.5145 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-build" Mon Dec 21 12:35:06 2020 rev:2 rq:856769 version:0.1.0 Changes: -------- --- /work/SRC/openSUSE:Factory/python-build/python-build.changes 2020-11-24 22:17:16.315762023 +0100 +++ /work/SRC/openSUSE:Factory/.python-build.new.5145/python-build.changes 2020-12-21 12:35:10.330931325 +0100 @@ -1,0 +2,5 @@ +Thu Dec 17 14:52:54 UTC 2020 - Benjamin Greiner <code(a)bnavigator.de> + +- Add remove-unused-import.patch to work with importlib_metadata + +------------------------------------------------------------------- New: ---- remove-unused-import.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-build.spec ++++++ --- /var/tmp/diff_new_pack.DNYx8y/_old 2020-12-21 12:35:13.002937712 +0100 +++ /var/tmp/diff_new_pack.DNYx8y/_new 2020-12-21 12:35:13.006937721 +0100 @@ -17,6 +17,8 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} +# TW defined --without python2 +%bcond_without python2 Name: python-build Version: 0.1.0 Release: 0 @@ -25,25 +27,36 @@ Group: Development/Languages/Python URL: https://github.com/pypa/build Source: https://github.com/pypa/build/archive/%{version}.tar.gz#/build-%{version}.t… +# PATCH-FIX-UPSTREAM remove-unused-import.patch -- remove unused import https://github.com/pypa/build/commit/efa3710 +Patch0: remove-unused-import.patch +BuildRequires: %{python_module packaging} +BuildRequires: %{python_module pep517 >= 0.9} BuildRequires: %{python_module setuptools} +BuildRequires: %{python_module toml} BuildRequires: fdupes BuildRequires: python-rpm-macros +%if %{with python2} +BuildRequires: python-typing +BuildRequires: python-virtualenv >= 20.0.35 +%endif +BuildRequires: (python3-importlib_metadata if python3-base < 3.8) +BuildRequires: (python36-importlib_metadata if python36-base) Requires: python-packaging Requires: python-pep517 >= 0.9 Requires: python-toml +Requires: (python-importlib_metadata if python-base < 3.8) +%ifpython2 Requires: python-typing +Requires: python-virtualenv >= 20.0.35 +%endif Requires(post): update-alternatives Requires(postun): update-alternatives BuildArch: noarch # SECTION test requirements BuildRequires: %{python_module filelock} -BuildRequires: %{python_module packaging} -BuildRequires: %{python_module pep517 >= 0.9} BuildRequires: %{python_module pytest-mock} +BuildRequires: %{python_module pytest-xdist} BuildRequires: %{python_module pytest} -BuildRequires: %{python_module toml} -BuildRequires: %{python_module typing} -BuildRequires: %{python_module virtualenv} # /SECTION %python_subpackages @@ -51,7 +64,7 @@ Simple PEP517 package builder. %prep -%setup -q -n build-%{version} +%autosetup -p1 -n build-%{version} %build %python_build ++++++ remove-unused-import.patch ++++++ Index: build-0.1.0/tests/test_projectbuilder.py =================================================================== --- build-0.1.0.orig/tests/test_projectbuilder.py +++ build-0.1.0/tests/test_projectbuilder.py @@ -13,15 +13,10 @@ import pytest import build if sys.version_info >= (3, 8): # pragma: no cover - import email from importlib import metadata as importlib_metadata - - email_message_from_string = email.message_from_string else: # pragma: no cover import importlib_metadata - email_message_from_string = importlib_metadata._compat.email_message_from_string - if sys.version_info >= (3,): # pragma: no cover build_open_owner = 'builtins' else: # pragma: no cover

1 0