openSUSE Commits
Threads by month
- ----- 2024 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2013 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2012 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2011 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2010 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2009 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2008 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2007 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2006 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
November 2020
- 2 participants
- 2810 discussions
Hello community,
here is the log from the commit of package nodejs14 for openSUSE:Factory checked in at 2020-11-02 09:40:10
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/nodejs14 (Old)
and /work/SRC/openSUSE:Factory/.nodejs14.new.3463 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "nodejs14"
Mon Nov 2 09:40:10 2020 rev:12 rq:844832 version:14.15.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/nodejs14/nodejs14.changes 2020-10-20 16:04:30.253841987 +0200
+++ /work/SRC/openSUSE:Factory/.nodejs14.new.3463/nodejs14.changes 2020-11-02 09:40:19.089605594 +0100
@@ -1,0 +2,13 @@
+Thu Oct 29 10:12:54 UTC 2020 - Adam Majer <adam.majer(a)suse.de>
+
+- Update to LTS version 14.15.0: (jsc#SLE-15774)
+ * no major changes
+ * test: reverts marking test-webcrypto-encrypt-decrypt-aes flaky
+
+-------------------------------------------------------------------
+Tue Oct 20 14:23:42 UTC 2020 - Adam Majer <adam.majer(a)suse.de>
+
+- Use SLE OpenSSL version with 12-SP4+, and not just 12-SP5+
+- Bump mininum ICU version to 65
+
+-------------------------------------------------------------------
Old:
----
node-v14.14.0.tar.xz
New:
----
node-v14.15.0.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ nodejs14.spec ++++++
--- /var/tmp/diff_new_pack.HEu7mQ/_old 2020-11-02 09:40:20.069606535 +0100
+++ /var/tmp/diff_new_pack.HEu7mQ/_new 2020-11-02 09:40:20.073606538 +0100
@@ -26,7 +26,7 @@
###########################################################
Name: nodejs14
-Version: 14.14.0
+Version: 14.15.0
Release: 0
%define node_version_number 14
@@ -57,7 +57,7 @@
%define _libexecdir %{_exec_prefix}/lib
%endif
-%if 0%{?suse_version} >= 1550 || 0%{?sle_version} >= 120500
+%if 0%{?suse_version} >= 1550 || 0%{?sle_version} >= 120400
%bcond_with intree_openssl
%else
%bcond_without intree_openssl
@@ -250,7 +250,7 @@
%endif
%if ! 0%{with intree_icu}
-BuildRequires: pkgconfig(icu-i18n) >= 63
+BuildRequires: pkgconfig(icu-i18n) >= 65
%else
Provides: bundled(icu) = 67.1
%endif
++++++ SHASUMS256.txt ++++++
--- /var/tmp/diff_new_pack.HEu7mQ/_old 2020-11-02 09:40:20.109606573 +0100
+++ /var/tmp/diff_new_pack.HEu7mQ/_new 2020-11-02 09:40:20.109606573 +0100
@@ -1,32 +1,32 @@
-38e9aba76b3c7a75be19f0c44bec9fca6c8c9d3515574fbd209197a82abdb07e node-v14.14.0-aix-ppc64.tar.gz
-c492c905a240eafa5448d6ef8988371afbd76ffa38b7e3deab41bdeed4a580fe node-v14.14.0-darwin-x64.tar.gz
-2f8283d36b3ae018483f6d294c81df246f7201925722d7c7659b7e2769d07797 node-v14.14.0-darwin-x64.tar.xz
-888065c4e8c3aa583328af178b9e51abefa55f675238e66923ae025dfd01f706 node-v14.14.0-headers.tar.gz
-5f96479f0d30ff0ff7a687a89df199a112f0dba7a8bd06ec82ca4bc16a2e6130 node-v14.14.0-headers.tar.xz
-de15496b7a311b5819470cc6df5397095b4e154a3479c6ed41075f0de96ec8a1 node-v14.14.0-linux-arm64.tar.gz
-6aab9915ba00d096343c94bd4894c13801d689c5a214bb9109c235acf1a8cd7d node-v14.14.0-linux-arm64.tar.xz
-9ec25df024af8defbe527919f6ead118542a57a6fb39a02391ba4417c80edd80 node-v14.14.0-linux-armv7l.tar.gz
-e2dafe2b66fc375f1f0030ded0dec4c90fd08c3d9c659b271a95d0e4ddf139dc node-v14.14.0-linux-armv7l.tar.xz
-96b46025c49be804939759e6f50752da7ce369116adc21766fa8665492aeeaed node-v14.14.0-linux-ppc64le.tar.gz
-157a7f7f79d7263f91a82c0ef4350a887f79ee9eb19ede3b8e1ba49f805f513d node-v14.14.0-linux-ppc64le.tar.xz
-a75905727ed7863d37cffde8cd4038032981cac7b266272515b1dd107de33a99 node-v14.14.0-linux-s390x.tar.gz
-c6a4e41601d987ca4750ba1f3fc7cc95ed511f2270b6bc249a288797ff5123e5 node-v14.14.0-linux-s390x.tar.xz
-438cc26853b17f4aad79fb441f6dbcc1128aff9ffcd0c132ae044259f96ff6a8 node-v14.14.0-linux-x64.tar.gz
-8ba22704fee4ad33c7e514ec508272a9502efcee5e608b8218164394c69cf2cd node-v14.14.0-linux-x64.tar.xz
-9ee59e87a3907a00304376eb4672800db5f0204933a86fe06dd777fc818331a3 node-v14.14.0.pkg
-afb0b401d62d9fcfc68258f50d0bf042998d349ce9c1d7a2d45dd87870b3aab7 node-v14.14.0.tar.gz
-04e935f4bd6b1e91c4a491e18d4d7a797009c3760b950cdefb193c4c079df0e6 node-v14.14.0.tar.xz
-af5baa624cb222acf4209d21cfa39c725818e9571ed13df37ba6bf27ba1dd6ca node-v14.14.0-win-x64.7z
-8fd96e1e14526939ed10186eaa51fe47f68612f097e05c1eb92f46c71120c551 node-v14.14.0-win-x64.zip
-bb3e81bcd7224a162d0d3cce02541352ceb142f71f23ab4d8c34ff2738de9f69 node-v14.14.0-win-x86.7z
-16f859aadb6c4a750b4487868d701f802109f30294d06e3411c71e8202e01897 node-v14.14.0-win-x86.zip
-326acab228b970a9dd21dd9f5b2d61e0a9be8a01452ec6de5b3450d380e20b3d node-v14.14.0-x64.msi
-4bd6db3058f21f3e10f171a97321f535e78a29646418fb468f4aa0e32348651e node-v14.14.0-x86.msi
-e7f4736c907c0371b6e8ab9c059d8da5c39d0424f30b24c2e4e0a1536f003080 win-x64/node.exe
-fed883832f78ea588427947182cf4a65e98813f850f804bedf866996bbfb5eb6 win-x64/node.lib
-c2726286f7a28e24fa08e2840866e35d00feb7c1f8c42e81c5e09818351cb11c win-x64/node_pdb.7z
-f3c65c789a1098ed3709bc06ea1f11f4b963a60b89aa3fd622daeb8308b6eecd win-x64/node_pdb.zip
-db27faa64543f424c3af8497c35fb31bc9c346c870414da6c73f3d896188d232 win-x86/node.exe
-4059ab3d45f0e786a6e254492a69474801028f93e9f80ac577ae39935fd46b18 win-x86/node.lib
-af82610d89126c44dd09b0a9a1704c91eb87dbb9da8bbda86355889f39190665 win-x86/node_pdb.7z
-52d866435fd3321ab6b8fd8a5784fbd0756794491d108db111fb763a716bf510 win-x86/node_pdb.zip
+7e82b8faf651c80204cd7272e7cd627b6094de04624a6967d555b02150b6bb26 node-v14.15.0-aix-ppc64.tar.gz
+1389f50d2f9f4993736d0408300513434d7630c2853634fb13f2b69cc9e69cb9 node-v14.15.0-darwin-x64.tar.gz
+cc99d86ae1861d51e8bb4dc0b0895a1e11d3ea48a89426be1f630dccbb3607ce node-v14.15.0-darwin-x64.tar.xz
+fec3d9d9c0d3094ec2737707b21315d5d3dbeea0d4bb79e6cb7f8d06f796f09b node-v14.15.0-headers.tar.gz
+2133f3404c794fa62a15fbb7123bed5320dbf94e9a197c8bb11bdd04974088e5 node-v14.15.0-headers.tar.xz
+bfb59eb99ab60a673f389e8b172ab288e12c8540e0c76a0ae40d189ba5a36cec node-v14.15.0-linux-arm64.tar.gz
+18594c582ccc8c1a1a787d9b21ecb6f315ef879e82be254c598243f58ea7ccb4 node-v14.15.0-linux-arm64.tar.xz
+00b97b3f97d74bdbcbc77f68d692dbbb4fe30a5b16c5a197417aa73df6b5092e node-v14.15.0-linux-armv7l.tar.gz
+9be4afaa963b5742d111245f7cefff72d3dea4226041efbe4fca16bf729f1215 node-v14.15.0-linux-armv7l.tar.xz
+3f02f4939d15ccddf179ddbfc93dd043fa1c749227803eb079e4322f26a9a685 node-v14.15.0-linux-ppc64le.tar.gz
+523f269f1d9f6286bddc37426c2ce5eea86c1fc36957c05676e26a4bf283f69b node-v14.15.0-linux-ppc64le.tar.xz
+d0ee8c3f4aecf2fe147aa395a90cfecbbcd86d26aef50794a6a501d0956f3e5c node-v14.15.0-linux-s390x.tar.gz
+5d3a4cc9c2c32b59e1e1cccc9ad1baa971eae5367ca35cf41d02f2498a2c570b node-v14.15.0-linux-s390x.tar.xz
+085c3b3c262fa58cbaad4f2f62eb6cea943fbbf3492ba457b5efa8f27969e04a node-v14.15.0-linux-x64.tar.gz
+93e5b94cfaa3edec80832725f8c09cde2cd0c327da89ad9ad811cf9a1b5d0f1b node-v14.15.0-linux-x64.tar.xz
+e2eb6497d090926a6c4cce972aefe9a91beb53c495d6e38d91de850ae0c22b61 node-v14.15.0.pkg
+5f9529e0a42985d5a81620635ab2541e3553daede42903d1b3176f808d46411c node-v14.15.0.tar.gz
+3736d8622e7b16913fa20ca3d696e3caa7fdaec30ccc1054d080d98c5c01fb3b node-v14.15.0.tar.xz
+b4f913737be05f9d74618dc5b2293501a4c882d5f148f497e229d5e7d6a828f6 node-v14.15.0-win-x64.7z
+08bbcc453bda374f71a9068ebd76902cfbf3a2b78705f3f6552cbefcc8d76682 node-v14.15.0-win-x64.zip
+3e1811f4f021ffc21fceb48f67bbaad21205e4ed6d1adfc48fe91c9152a988be node-v14.15.0-win-x86.7z
+1b394e6b7a07e14612fe439f3ce4a75ead547f5f8050e05a842a474f92c1d91a node-v14.15.0-win-x86.zip
+cafbd7ed129fb4a56a1751b674ba083d7681b72ae044c4976b3009cb796557af node-v14.15.0-x64.msi
+6c423722aac73f865821e0fd2812326a93ac55ffc219ac429e1076ecb11d1236 node-v14.15.0-x86.msi
+0924ebb1a652516bd632bcdcd40bd73d880bf9bf2b540a12bad5b5387d66b92d win-x64/node.exe
+f8ae0e928d2ca7d6e9ee882dcedb01883f0b2785c751d5805cfa913fb54d1e48 win-x64/node.lib
+d47026cf0beb25c7d95b1a8c83f1d1b8cc42ecd42f384ceeb97a5a567de220f9 win-x64/node_pdb.7z
+a88d109e947021b4147ff0add02ca9ef8c5a37b46db24aada909df351c60fba2 win-x64/node_pdb.zip
+1a66466a2109f9c1d8ccb0bae5c81bee98909e94623a5b014b4090f616e64233 win-x86/node.exe
+5b884e43fb414769be925f71d73829ab8ebe60df200dd16b62195ab6c0225851 win-x86/node.lib
+8106fa9054db1f83ba961126c0caa3215ea282f8ba93b4c8cadd785b7f45c4ee win-x86/node_pdb.7z
+3988a84485d88531a8ec00caeed6148761c3c3672dc628328ff0065fbae6eaef win-x86/node_pdb.zip
++++++ SHASUMS256.txt.sig ++++++
Binary files /var/tmp/diff_new_pack.HEu7mQ/_old and /var/tmp/diff_new_pack.HEu7mQ/_new differ
++++++ node-v14.14.0.tar.xz -> node-v14.15.0.tar.xz ++++++
/work/SRC/openSUSE:Factory/nodejs14/node-v14.14.0.tar.xz /work/SRC/openSUSE:Factory/.nodejs14.new.3463/node-v14.15.0.tar.xz differ: char 27, line 1
++++++ nodejs.keyring ++++++
Binary files /var/tmp/diff_new_pack.HEu7mQ/_old and /var/tmp/diff_new_pack.HEu7mQ/_new differ
1
0
Hello community,
here is the log from the commit of package zypp-plugin for openSUSE:Factory checked in at 2020-11-02 09:40:04
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/zypp-plugin (Old)
and /work/SRC/openSUSE:Factory/.zypp-plugin.new.3463 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "zypp-plugin"
Mon Nov 2 09:40:04 2020 rev:16 rq:844816 version:0.6.3
Changes:
--------
--- /work/SRC/openSUSE:Factory/zypp-plugin/zypp-plugin.changes 2018-07-13 10:15:05.962009884 +0200
+++ /work/SRC/openSUSE:Factory/.zypp-plugin.new.3463/zypp-plugin.changes 2020-11-02 09:40:10.393597249 +0100
@@ -1,0 +2,6 @@
+Fri Oct 23 21:31:23 UTC 2020 - Benjamin Greiner <code(a)bnavigator.de>
+
+- singlespec in Tumbleweed must support multiple python3 flavors
+ in the future gh#openSUSE/python-rpm-macros#66
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ zypp-plugin.spec ++++++
--- /var/tmp/diff_new_pack.6MfcTt/_old 2020-11-02 09:40:10.997597829 +0100
+++ /var/tmp/diff_new_pack.6MfcTt/_new 2020-11-02 09:40:11.001597833 +0100
@@ -1,7 +1,7 @@
#
# spec file for package zypp-plugin
#
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -12,7 +12,7 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
@@ -22,15 +22,16 @@
Version: 0.6.3
Release: 0
Summary: Helper that makes writing ZYpp plugins easier
-License: GPL-2.0
+License: GPL-2.0-only
Group: System/Packages
-Url: https://github.com/openSUSE/zypp-plugin
+URL: https://github.com/openSUSE/zypp-plugin
Source0: %{name}-%{version}.tar.bz2
BuildArch: noarch
%if %{singlespec_py3}
%{?!python_module:%define python_module() python-%{**} python3-%{**}}
BuildRequires: %{python_module devel}
+BuildRequires: fdupes
BuildRequires: python-rpm-macros
Requires: python-base
# provide old names for py2 package
@@ -62,6 +63,16 @@
:
%install
+%if %{singlespec_py3}
+%{python_expand #
+mkdir -p %{buildroot}%{$python_sitelib}
+install -m 0644 python/zypp_plugin.py %{buildroot}%{$python_sitelib}/zypp_plugin.py
+# TODO: replace by $python_compileall as soon as it is available sr#843481
+$python -m compileall %{buildroot}%{$python_sitelib}
+$python -O -m compileall %{buildroot}%{$python_sitelib}
+%fdupes %{buildroot}%{$python_sitelib}
+}
+%else
%if 0%{?have_python2}
mkdir -p %{buildroot}%{python_sitelib}
install -m 0644 python/zypp_plugin.py %{buildroot}%{python_sitelib}/zypp_plugin.py
@@ -72,11 +83,13 @@
install -m 0644 python/zypp_plugin.py %{buildroot}%{python3_sitelib}/zypp_plugin.py
%py3_compile -O %{buildroot}/%{python3_sitelib}
%endif
+%endif
%if %{singlespec_py3}
%files %{python_files}
%doc COPYING
-%{python_sitelib}/*
+%{python_sitelib}/zypp_plugin*
+%pycache_only %{python_sitelib}/__pycache__/*
### ----------------------------------------
### SLE-12* and even older
++++++ zypp-plugin-0.6.3.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zypp-plugin/package/zypp-plugin.changes new/zypp-plugin/package/zypp-plugin.changes
--- old/zypp-plugin/package/zypp-plugin.changes 2018-03-13 15:05:02.000000000 +0100
+++ new/zypp-plugin/package/zypp-plugin.changes 2020-10-28 15:54:54.000000000 +0100
@@ -1,4 +1,10 @@
-------------------------------------------------------------------
+Fri Oct 23 21:31:23 UTC 2020 - Benjamin Greiner <code(a)bnavigator.de>
+
+- singlespec in Tumbleweed must support multiple python3 flavors
+ in the future gh#openSUSE/python-rpm-macros#66
+
+-------------------------------------------------------------------
Tue Mar 13 14:51:18 CET 2018 - ma(a)suse.com
- Provide python3-zypp-plugin down to SLE12 (bsc#1081596)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zypp-plugin/package/zypp-plugin.spec new/zypp-plugin/package/zypp-plugin.spec
--- old/zypp-plugin/package/zypp-plugin.spec 2018-03-13 15:05:02.000000000 +0100
+++ new/zypp-plugin/package/zypp-plugin.spec 2020-10-28 15:54:54.000000000 +0100
@@ -15,6 +15,7 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
+
%define singlespec_py3 ( 0%{?suse_version} > 1330 )
Name: zypp-plugin
@@ -31,6 +32,7 @@
%{?!python_module:%define python_module() python-%{**} python3-%{**}}
BuildRequires: %{python_module devel}
BuildRequires: python-rpm-macros
+BuildRequires: fdupes
Requires: python-base
# provide old names for py2 package
%if "%{python_flavor}" == "python2"
@@ -61,6 +63,16 @@
:
%install
+%if %{singlespec_py3}
+%{python_expand #
+mkdir -p %{buildroot}%{$python_sitelib}
+install -m 0644 python/zypp_plugin.py %{buildroot}%{$python_sitelib}/zypp_plugin.py
+# TODO: replace by $python_compileall as soon as it is available sr#843481
+$python -m compileall %{buildroot}%{$python_sitelib}
+$python -O -m compileall %{buildroot}%{$python_sitelib}
+%fdupes %{buildroot}%{$python_sitelib}
+}
+%else
%if 0%{?have_python2}
mkdir -p %{buildroot}%{python_sitelib}
install -m 0644 python/zypp_plugin.py %{buildroot}%{python_sitelib}/zypp_plugin.py
@@ -71,11 +83,13 @@
install -m 0644 python/zypp_plugin.py %{buildroot}%{python3_sitelib}/zypp_plugin.py
%py3_compile -O %{buildroot}/%{python3_sitelib}
%endif
+%endif
%if %{singlespec_py3}
%files %{python_files}
%doc COPYING
-%{python_sitelib}/*
+%{python_sitelib}/zypp_plugin*
+%pycache_only %{python_sitelib}/__pycache__/*
### ----------------------------------------
### SLE-12* and even older
1
0
Hello community,
here is the log from the commit of package kernel-firmware for openSUSE:Factory checked in at 2020-11-02 09:39:54
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kernel-firmware (Old)
and /work/SRC/openSUSE:Factory/.kernel-firmware.new.3463 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kernel-firmware"
Mon Nov 2 09:39:54 2020 rev:153 rq:844806 version:20201023
Changes:
--------
--- /work/SRC/openSUSE:Factory/kernel-firmware/kernel-firmware.changes 2020-10-14 15:39:14.994363613 +0200
+++ /work/SRC/openSUSE:Factory/.kernel-firmware.new.3463/kernel-firmware.changes 2020-11-02 09:40:04.773591856 +0100
@@ -1,0 +2,16 @@
+Thu Oct 29 08:07:03 UTC 2020 - tiwai(a)suse.com
+
+- Update to version 20201023 (git commit dae4b4cd0841):
+ * cypress: add Cypress firmware and clm_blob files
+ * rtl_bt: Update RTL8821C BT FW to 0xAA6C_A99E
+ * ath10k: add SDIO firmware for QCA9377 WiFi
+ * ice: update package file to 1.3.16.0
+ * mediatek: separate venc service thread
+ * QCA : Updated firmware file for WCN3991
+ * iwlwifi: update and add new FWs from core56-54 release
+ * iwlwifi: update 3168, 7265D, 8000C and 8265 firmwares
+ * i915: Add DG1 DMC v2.02
+ * qcom : updated venus firmware files for v5.4
+- Add _constraints to fix the build error (bsc#1178242)
+
+-------------------------------------------------------------------
Old:
----
kernel-firmware-20201005.tar.xz
New:
----
_constraints
kernel-firmware-20201023.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kernel-firmware.spec ++++++
--- /var/tmp/diff_new_pack.4GJlCA/_old 2020-11-02 09:40:07.405594382 +0100
+++ /var/tmp/diff_new_pack.4GJlCA/_new 2020-11-02 09:40:07.409594386 +0100
@@ -19,10 +19,10 @@
%global flavor @BUILD_FLAVOR@%{nil}
%define __ksyms_path ^/lib/firmware
-%define version_unconverted 20201005
+%define version_unconverted 20201023
Name: kernel-firmware
-Version: 20201005
+Version: 20201023
Release: 0
Summary: Linux kernel firmware files
License: SUSE-Firmware AND GPL-2.0-only AND GPL-2.0-or-later AND MIT
++++++ _constraints ++++++
<constraints>
<hardware>
<disk>
<size unit="G">6</size>
</disk>
</hardware>
</constraints>
++++++ _servicedata ++++++
--- /var/tmp/diff_new_pack.4GJlCA/_old 2020-11-02 09:40:07.517594490 +0100
+++ /var/tmp/diff_new_pack.4GJlCA/_new 2020-11-02 09:40:07.517594490 +0100
@@ -1,4 +1,4 @@
<servicedata>
<service name="tar_scm">
<param name="url">https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git</param>
- <param name="changesrevision">58d41d0facca2478d3e45f6321224361519aee96</param></service></servicedata>
\ No newline at end of file
+ <param name="changesrevision">dae4b4cd084102cd49c37aa8b579b208028ab025</param></service></servicedata>
\ No newline at end of file
++++++ kernel-firmware-20201005.tar.xz -> kernel-firmware-20201023.tar.xz ++++++
/work/SRC/openSUSE:Factory/kernel-firmware/kernel-firmware-20201005.tar.xz /work/SRC/openSUSE:Factory/.kernel-firmware.new.3463/kernel-firmware-20201023.tar.xz differ: char 27, line 1
1
0
Hello community,
here is the log from the commit of package grpc for openSUSE:Factory checked in at 2020-11-02 09:39:49
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/grpc (Old)
and /work/SRC/openSUSE:Factory/.grpc.new.3463 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "grpc"
Mon Nov 2 09:39:49 2020 rev:26 rq:844726 version:1.33.2
Changes:
--------
--- /work/SRC/openSUSE:Factory/grpc/grpc.changes 2020-10-26 16:13:07.618761165 +0100
+++ /work/SRC/openSUSE:Factory/.grpc.new.3463/grpc.changes 2020-11-02 09:39:54.665582157 +0100
@@ -1,0 +2,15 @@
+Wed Oct 28 08:17:46 UTC 2020 - Jan Engelhardt <jengelh(a)inai.de>
+
+- Update to release 1.33.2
+ * Deprecate GRPC_ARG_HTTP2_MIN_SENT_PING_INTERVAL_WITHOUT_DATA_MS.
+ * Expose Cronet error message to the application layer.
+ * Remove grpc_channel_ping from surface API.
+ * Do not send BDP pings if there is no receive side activity.
+
+-------------------------------------------------------------------
+Tue Oct 27 12:31:44 UTC 2020 - Jan Engelhardt <jengelh(a)inai.de>
+
+- Use -DgRPC_ABSL_PROVIDER=package
+ (https://github.com/grpc/grpc/issues/24476)
+
+-------------------------------------------------------------------
Old:
----
v1.33.1.tar.gz
New:
----
v1.33.2.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ grpc.spec ++++++
--- /var/tmp/diff_new_pack.USj3ST/_old 2020-11-02 09:39:55.481582940 +0100
+++ /var/tmp/diff_new_pack.USj3ST/_new 2020-11-02 09:39:55.485582944 +0100
@@ -21,7 +21,7 @@
%define lverplugin 1
%define src_install_dir /usr/src/%name
Name: grpc
-Version: 1.33.1
+Version: 1.33.2
Release: 0
Summary: HTTP/2-based Remote Procedure Call implementation
License: Apache-2.0
@@ -31,7 +31,7 @@
Source2: %name-rpmlintrc
# PATCH-FIX-UPSTREAM grpc-correct-pkgconfig-path.patch badshah400(a)gmail.com -- Make path for pkgconfig file installation consistent with gRPC_INSTALL_LIBDIR specification
Patch1: grpc-correct-pkgconfig-path.patch
-BuildRequires: abseil-cpp-source
+BuildRequires: abseil-cpp-devel
BuildRequires: cmake
BuildRequires: fdupes
BuildRequires: gcc-c++
@@ -129,8 +129,7 @@
%prep
%autosetup -p1
-# Copy abseil-cpp source into empty third_party/abseil-cpp dir
-cp -r %_prefix/src/abseil-cpp/* third_party/abseil-cpp/
+rm -Rf third_party/abseil-cpp/
%build
%define _lto_cflags %nil
@@ -141,8 +140,8 @@
export CXXFLAGS="$CFLAGS"
%cmake -DgRPC_INSTALL=ON \
-DgRPC_INSTALL_LIBDIR:PATH="%_lib" \
- -DgRPC_INSTALL_CMAKEDIR:PATH="%_libdir"/cmake/grpc \
- -DgRPC_ABSL_PROVIDER=module \
+ -DgRPC_INSTALL_CMAKEDIR:PATH="%_libdir/cmake/grpc" \
+ -DgRPC_ABSL_PROVIDER=package \
-DgRPC_CARES_PROVIDER=package \
-DgRPC_PROTOBUF_PROVIDER=package \
-DgRPC_RE2_PROVIDER=package \
++++++ v1.33.1.tar.gz -> v1.33.2.tar.gz ++++++
/work/SRC/openSUSE:Factory/grpc/v1.33.1.tar.gz /work/SRC/openSUSE:Factory/.grpc.new.3463/v1.33.2.tar.gz differ: char 15, line 1
1
0
Hello community,
here is the log from the commit of package ima-evm-utils for openSUSE:Factory checked in at 2020-11-02 09:39:48
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/ima-evm-utils (Old)
and /work/SRC/openSUSE:Factory/.ima-evm-utils.new.3463 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ima-evm-utils"
Mon Nov 2 09:39:48 2020 rev:19 rq:844713 version:1.3.2
Changes:
--------
--- /work/SRC/openSUSE:Factory/ima-evm-utils/ima-evm-utils.changes 2020-10-02 17:17:31.146111718 +0200
+++ /work/SRC/openSUSE:Factory/.ima-evm-utils.new.3463/ima-evm-utils.changes 2020-11-02 09:39:53.969581489 +0100
@@ -1,0 +2,13 @@
+Thu Oct 29 06:12:46 UTC 2020 - Petr Vorel <pvorel(a)suse.cz>
+
+- Update to version 1.3.2
+ * Bugfixes: importing keys
+ * NEW: Docker based travis distro testing
+ * Travis bugfixes, code cleanup, software version update,
+ and script removal
+ * Initial travis testing
+- Remove 0001-help-Add-missing-new-line-for-ignore-violations.patch
+ (patch from this release)
+- Add make check + dependencies (getfattr => attr, xxd => vim)
+
+-------------------------------------------------------------------
Old:
----
0001-help-Add-missing-new-line-for-ignore-violations.patch
ima-evm-utils-1.3.1.tar.gz
New:
----
ima-evm-utils-1.3.2.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ima-evm-utils.spec ++++++
--- /var/tmp/diff_new_pack.8saiuV/_old 2020-11-02 09:39:54.425581927 +0100
+++ /var/tmp/diff_new_pack.8saiuV/_new 2020-11-02 09:39:54.429581931 +0100
@@ -19,15 +19,15 @@
%define sover 2
%define libname libimaevm%{sover}
Name: ima-evm-utils
-Version: 1.3.1
+Version: 1.3.2
Release: 0
Summary: IMA/EVM control utility
License: LGPL-2.1-or-later
Group: System/Base
URL: http://sourceforge.net/projects/linux-ima/
Source0: http://downloads.sourceforge.net/project/linux-ima/ima-evm-utils/%{name}-%{…
-Patch1: 0001-help-Add-missing-new-line-for-ignore-violations.patch
BuildRequires: asciidoc
+BuildRequires: attr
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: docbook-xsl-stylesheets
@@ -38,6 +38,7 @@
BuildRequires: openssl-devel
BuildRequires: pkgconfig
BuildRequires: tpm2-0-tss-devel
+BuildRequires: vim
%description
This package provides the control utility for IMA/EVM (Integrity
@@ -86,6 +87,9 @@
rm -rf %{buildroot}%{_datadir}/doc
find %{buildroot} -type f -name "*.la" -delete -print
+%check
+make %{?_smp_mflags} check
+
%post -n %{libname} -p /sbin/ldconfig
%postun -n %{libname} -p /sbin/ldconfig
++++++ ima-evm-utils-1.3.1.tar.gz -> ima-evm-utils-1.3.2.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ima-evm-utils-1.3.1/.travis.yml new/ima-evm-utils-1.3.2/.travis.yml
--- old/ima-evm-utils-1.3.1/.travis.yml 1970-01-01 01:00:00.000000000 +0100
+++ new/ima-evm-utils-1.3.2/.travis.yml 2020-10-28 18:18:08.000000000 +0100
@@ -0,0 +1,78 @@
+dist: bionic
+language: C
+services:
+ - docker
+
+matrix:
+ include:
+ # 32 bit build
+ - os: linux
+ env: DISTRO=debian:stable VARIANT=i386 ARCH=i386 TSS=tpm2-tss
+ compiler: gcc
+
+ # cross compilation builds
+ - os: linux
+ env: DISTRO=debian:stable VARIANT=cross-compile ARCH=ppc64el TSS=ibmtss
+ compiler: powerpc64le-linux-gnu-gcc
+
+ - os: linux
+ env: DISTRO=debian:stable VARIANT=cross-compile ARCH=arm64 TSS=tpm2-tss
+ compiler: aarch64-linux-gnu-gcc
+
+ - os: linux
+ env: DISTRO=debian:stable VARIANT=cross-compile ARCH=s390x TSS=ibmtss
+ compiler: s390x-linux-gnu-gcc
+
+ # musl
+ - os: linux
+ env: DISTRO=alpine:latest TSS=tpm2-tss
+ compiler: gcc
+
+ # glibc (gcc/clang)
+ - os: linux
+ env: DISTRO=opensuse/tumbleweed TSS=ibmtss
+ compiler: clang
+
+ - os: linux
+ env: DISTRO=opensuse/leap TSS=tpm2-tss
+ compiler: gcc
+
+ - os: linux
+ env: DISTRO=ubuntu:eoan TSS=ibmtss
+ compiler: gcc
+
+ - os: linux
+ env: DISTRO=ubuntu:xenial TSS=tpm2-tss
+ compiler: clang
+
+ - os: linux
+ env: DISTRO=fedora:latest TSS=ibmtss
+ compiler: clang
+
+ - os: linux
+ env: DISTRO=centos:7 TSS=tpm2-tss
+ compiler: gcc
+
+ - os: linux
+ env: DISTRO=centos:latest TSS=tpm2-tss
+ compiler: clang
+
+ - os: linux
+ env: DISTRO=debian:testing TSS=tpm2-tss
+ compiler: clang
+
+ - os: linux
+ env: DISTRO=debian:stable TSS=ibmtss
+ compiler: gcc
+
+before_install:
+ - df -hT
+ - DIR="/usr/src/ima-evm-utils"
+ - printf "FROM $DISTRO\nRUN mkdir -p $DIR\nWORKDIR $DIR\nCOPY . $DIR\n" > Dockerfile
+ - cat Dockerfile
+ - docker build -t ima-evm-utils .
+
+script:
+ - INSTALL="${DISTRO%%:*}"
+ - INSTALL="${INSTALL%%/*}"
+ - docker run -t ima-evm-utils /bin/sh -c "cd travis && if [ \"$VARIANT\" ]; then ARCH=\"$ARCH\" ./$INSTALL.$VARIANT.sh; fi && ARCH=\"$ARCH\" CC=\"$CC\" TSS=\"$TSS\" ./$INSTALL.sh && if [ ! \"$VARIANT\" ]; then which tpm_server || which swtpm || ../tests/install-swtpm.sh; fi && CC=\"$CC\" VARIANT=\"$VARIANT\" ../build.sh"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ima-evm-utils-1.3.1/Makefile.am new/ima-evm-utils-1.3.2/Makefile.am
--- old/ima-evm-utils-1.3.1/Makefile.am 2020-08-11 13:19:04.000000000 +0200
+++ new/ima-evm-utils-1.3.2/Makefile.am 2020-10-28 18:18:08.000000000 +0100
@@ -1,5 +1,7 @@
SUBDIRS = src tests
+if MANPAGE_DOCBOOK_XSL
dist_man_MANS = evmctl.1
+endif
doc_DATA = examples/ima-genkey-self.sh examples/ima-genkey.sh examples/ima-gen-local-ca.sh
EXTRA_DIST = autogen.sh $(doc_DATA)
@@ -23,6 +25,7 @@
cp $(tarname) $(SRCS)/
rpmbuild -ba --nodeps $(SPEC)
+if MANPAGE_DOCBOOK_XSL
evmctl.1.html: README
@asciidoc -o $@ $<
@@ -35,5 +38,6 @@
rm -f evmctl.1
doc: evmctl.1.html rmman evmctl.1
+endif
.PHONY: $(tarname)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ima-evm-utils-1.3.1/NEWS new/ima-evm-utils-1.3.2/NEWS
--- old/ima-evm-utils-1.3.1/NEWS 2020-08-11 13:19:04.000000000 +0200
+++ new/ima-evm-utils-1.3.2/NEWS 2020-10-28 18:18:08.000000000 +0100
@@ -1,3 +1,12 @@
+2020-10-28 Mimi Zohar <zohar(a)linux.ibm.com>
+
+ version 1.3.2:
+ * Bugfixes: importing keys
+ * NEW: Docker based travis distro testing
+ * Travis bugfixes, code cleanup, software version update,
+ and script removal
+ * Initial travis testing
+
2020-08-11 Mimi Zohar <zohar(a)linux.ibm.com>
version 1.3.1:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ima-evm-utils-1.3.1/README new/ima-evm-utils-1.3.2/README
--- old/ima-evm-utils-1.3.1/README 2020-08-11 13:19:04.000000000 +0200
+++ new/ima-evm-utils-1.3.2/README 2020-10-28 18:18:08.000000000 +0100
@@ -28,6 +28,7 @@
import [--rsa] pubkey keyring
sign [-r] [--imahash | --imasig ] [--portable] [--key key] [--pass password] file
verify file
+ ima_boot_aggregate [--pcrs hash-algorithm,file] [TPM 1.2 BIOS event log]
ima_sign [--sigfile] [--key key] [--pass password] file
ima_verify file
ima_hash file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ima-evm-utils-1.3.1/autogen.sh new/ima-evm-utils-1.3.2/autogen.sh
--- old/ima-evm-utils-1.3.1/autogen.sh 2020-08-11 13:19:04.000000000 +0200
+++ new/ima-evm-utils-1.3.2/autogen.sh 2020-10-28 18:18:08.000000000 +0100
@@ -1,16 +1,4 @@
#! /bin/sh
-
set -e
-# new way
-# strange, but need this for Makefile.am, because it has -I m4
-test -d m4 || mkdir m4
-autoreconf -f -i
-
-# old way
-#libtoolize --automake --copy --force
-#aclocal
-#autoconf --force
-#autoheader --force
-#automake --add-missing --copy --force-missing --gnu
-
+autoreconf -i
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ima-evm-utils-1.3.1/build.sh new/ima-evm-utils-1.3.2/build.sh
--- old/ima-evm-utils-1.3.1/build.sh 1970-01-01 01:00:00.000000000 +0100
+++ new/ima-evm-utils-1.3.2/build.sh 2020-10-28 18:18:08.000000000 +0100
@@ -0,0 +1,97 @@
+#!/bin/sh
+# Copyright (c) 2020 Petr Vorel <pvorel(a)suse.cz>
+
+set -e
+
+CC="${CC:-gcc}"
+CFLAGS="${CFLAGS:--Wformat -Werror=format-security -Werror=implicit-function-declaration -Werror=return-type -fno-common}"
+PREFIX="${PREFIX:-$HOME/ima-evm-utils-install}"
+
+export LD_LIBRARY_PATH="$PREFIX/lib64:$PREFIX/lib:/usr/local/lib64:/usr/local/lib"
+export PATH="$PREFIX/bin:/usr/local/bin:$PATH"
+
+title()
+{
+ echo "===== $1 ====="
+}
+
+log_exit()
+{
+ local ret="${3:-$?}"
+ local log="$1"
+ local msg="$2"
+ local prefix
+
+ echo "=== $log ==="
+ [ $ret -eq 0 ] || prefix="FAIL: "
+ cat $log
+ echo
+ echo "$prefix$msg, see output of $log above"
+ exit $ret
+}
+
+cd `dirname $0`
+
+case "$VARIANT" in
+ i386)
+ echo "32-bit compilation"
+ export CFLAGS="-m32 $CFLAGS" LDFLAGS="-m32 $LDFLAGS"
+ export PKG_CONFIG_LIBDIR=/usr/lib/i386-linux-gnu/pkgconfig
+ ;;
+ cross-compile)
+ host="${CC%-gcc}"
+ export CROSS_COMPILE="${host}-"
+ host="--host=$host"
+ echo "cross compilation: $host"
+ echo "CROSS_COMPILE: '$CROSS_COMPILE'"
+ ;;
+ *)
+ if [ "$VARIANT" ]; then
+ echo "Wrong VARIANT: '$VARIANT'" >&2
+ exit 1
+ fi
+ echo "native build"
+ ;;
+esac
+
+title "compiler version"
+$CC --version
+echo "CFLAGS: '$CFLAGS'"
+echo "LDFLAGS: '$LDFLAGS'"
+echo "PREFIX: '$PREFIX'"
+
+title "configure"
+./autogen.sh
+./configure --prefix=$PREFIX $host || log_exit config.log "configure failed"
+
+title "make"
+make -j$(nproc)
+make install
+
+title "test"
+if [ "$VARIANT" = "cross-compile" ]; then
+ echo "skip make check on cross compilation"
+ exit 0
+fi
+
+ret=0
+VERBOSE=1 make check || ret=$?
+
+title "logs"
+if [ $ret -eq 0 ]; then
+ tail -3 tests/ima_hash.log
+ tail -3 tests/sign_verify.log
+ tail -20 tests/boot_aggregate.log
+ exit 0
+fi
+
+cat tests/test-suite.log
+
+if [ $ret -eq 77 ]; then
+ msg="WARN: some tests skipped"
+ ret=0
+else
+ msg="FAIL: tests exited: $ret"
+fi
+
+log_exit tests/test-suite.log "$msg" $ret
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ima-evm-utils-1.3.1/configure.ac new/ima-evm-utils-1.3.2/configure.ac
--- old/ima-evm-utils-1.3.1/configure.ac 2020-08-11 13:19:04.000000000 +0200
+++ new/ima-evm-utils-1.3.2/configure.ac 2020-10-28 18:18:08.000000000 +0100
@@ -1,7 +1,7 @@
# autoconf script
AC_PREREQ([2.65])
-AC_INIT(ima-evm-utils, 1.3.1, zohar(a)linux.ibm.com)
+AC_INIT(ima-evm-utils, 1.3.2, zohar(a)linux.ibm.com)
AM_INIT_AUTOMAKE([foreign])
AC_CONFIG_HEADERS([config.h])
AC_CONFIG_MACRO_DIR([m4])
@@ -30,9 +30,9 @@
AC_CHECK_HEADER(unistd.h)
AC_CHECK_HEADERS(openssl/conf.h)
-AC_CHECK_LIB([tss2-esys], [Esys_PCR_Read])
+AC_CHECK_LIB([tss2-esys], [Esys_Free])
AC_CHECK_LIB([tss2-rc], [Tss2_RC_Decode])
-AM_CONDITIONAL([USE_PCRTSS], [test "x$ac_cv_lib_tss2_esys_Esys_PCR_Read" = "xyes"])
+AM_CONDITIONAL([USE_PCRTSS], [test "x$ac_cv_lib_tss2_esys_Esys_Free" = "xyes"])
AC_CHECK_HEADERS(sys/xattr.h, , [AC_MSG_ERROR([sys/xattr.h header not found. You need the c-library development package.])])
AC_CHECK_HEADERS(keyutils.h, , [AC_MSG_ERROR([keyutils.h header not found. You need the libkeyutils development package.])])
@@ -77,6 +77,7 @@
echo "Configuration:"
echo " debug: $pkg_cv_enable_debug"
echo " openssl-conf: $enable_openssl_conf"
-echo " tss2-esys: $ac_cv_lib_tss2_esys_Esys_PCR_Read"
+echo " tss2-esys: $ac_cv_lib_tss2_esys_Esys_Free"
echo " tss2-rc-decode: $ac_cv_lib_tss2_rc_Tss2_RC_Decode"
+echo " doc: $have_doc"
echo
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ima-evm-utils-1.3.1/m4/manpage-docbook-xsl.m4 new/ima-evm-utils-1.3.2/m4/manpage-docbook-xsl.m4
--- old/ima-evm-utils-1.3.1/m4/manpage-docbook-xsl.m4 2020-08-11 13:19:04.000000000 +0200
+++ new/ima-evm-utils-1.3.2/m4/manpage-docbook-xsl.m4 2020-10-28 18:18:08.000000000 +0100
@@ -1,7 +1,10 @@
-dnl Copyright (c) 2018 Petr Vorel <pvorel(a)suse.cz>
+dnl Copyright (c) 2018-2020 Petr Vorel <pvorel(a)suse.cz>
dnl Find docbook manpage stylesheet
AC_DEFUN([EVMCTL_MANPAGE_DOCBOOK_XSL], [
+ DOCBOOK_XSL_URI="http://docbook.sourceforge.net/release/xsl/current"
+ DOCBOOK_XSL_PATH="manpages/docbook.xsl"
+
AC_PATH_PROGS(XMLCATALOG, xmlcatalog)
AC_ARG_WITH([xml-catalog],
AC_HELP_STRING([--with-xml-catalog=CATALOG],
@@ -9,20 +12,37 @@
[with_xml_catalog=/etc/xml/catalog])
XML_CATALOG_FILE="$with_xml_catalog"
AC_SUBST([XML_CATALOG_FILE])
- AC_MSG_CHECKING([for XML catalog ($XML_CATALOG_FILE)])
- if test -f "$XML_CATALOG_FILE"; then
- have_xmlcatalog_file=yes
- AC_MSG_RESULT([found])
+
+ if test "x${XMLCATALOG}" = "x"; then
+ AC_MSG_WARN([xmlcatalog not found, cannot search for $DOCBOOK_XSL_PATH])
else
- AC_MSG_RESULT([not found])
+ AC_MSG_CHECKING([for XML catalog ($XML_CATALOG_FILE)])
+ if test -f "$XML_CATALOG_FILE"; then
+ have_xmlcatalog_file=yes
+ AC_MSG_RESULT([found])
+ else
+ AC_MSG_RESULT([not found, cannot search for $DOCBOOK_XSL_PATH])
+ fi
fi
+
if test "x${XMLCATALOG}" != "x" -a "x$have_xmlcatalog_file" = "xyes"; then
- DOCBOOK_XSL_URI="http://docbook.sourceforge.net/release/xsl/current"
- DOCBOOK_XSL_PATH="manpages/docbook.xsl"
- MANPAGE_DOCBOOK_XSL=$(${XMLCATALOG} ${XML_CATALOG_FILE} ${DOCBOOK_XSL_URI}/${DOCBOOK_XSL_PATH} | sed -n 's|^file:/\+|/|p;q')
+ MANPAGE_DOCBOOK_XSL=$(${XMLCATALOG} ${XML_CATALOG_FILE} ${DOCBOOK_XSL_URI}/${DOCBOOK_XSL_PATH} | sed 's|^file:/\+|/|')
fi
+
if test "x${MANPAGE_DOCBOOK_XSL}" = "x"; then
MANPAGE_DOCBOOK_XSL="/usr/share/xml/docbook/stylesheet/docbook-xsl/manpages/docbook.xsl"
+ AC_MSG_WARN([trying a default path for $DOCBOOK_XSL_PATH])
fi
+
+ if test -f "$MANPAGE_DOCBOOK_XSL"; then
+ have_doc=yes
+ AC_MSG_NOTICE([using $MANPAGE_DOCBOOK_XSL for generating doc])
+ else
+ AC_MSG_WARN([$DOCBOOK_XSL_PATH not found, generating doc will be skipped])
+ MANPAGE_DOCBOOK_XSL=
+ have_doc=no
+ fi
+ AM_CONDITIONAL(MANPAGE_DOCBOOK_XSL, test "x$have_doc" = xyes)
+
AC_SUBST(MANPAGE_DOCBOOK_XSL)
])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ima-evm-utils-1.3.1/packaging/ima-evm-utils.spec new/ima-evm-utils-1.3.2/packaging/ima-evm-utils.spec
--- old/ima-evm-utils-1.3.1/packaging/ima-evm-utils.spec 2020-08-11 13:19:04.000000000 +0200
+++ new/ima-evm-utils-1.3.2/packaging/ima-evm-utils.spec 2020-10-28 18:18:08.000000000 +0100
@@ -1,5 +1,5 @@
Name: ima-evm-utils
-Version: 1.3.1
+Version: 1.3.2
Release: 1%{?dist}
Summary: ima-evm-utils - IMA/EVM control utility
Group: System/Libraries
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ima-evm-utils-1.3.1/src/evmctl.c new/ima-evm-utils-1.3.2/src/evmctl.c
--- old/ima-evm-utils-1.3.1/src/evmctl.c 2020-08-11 13:19:04.000000000 +0200
+++ new/ima-evm-utils-1.3.2/src/evmctl.c 2020-10-28 18:18:08.000000000 +0100
@@ -221,7 +221,7 @@
fclose(fp);
return NULL;
}
- if (fread(data, len, 1, fp) != len) {
+ if (fread(data, len, 1, fp) != 1) {
log_err("Failed to fread %zu bytes: %s\n", len, name);
fclose(fp);
free(data);
@@ -2467,7 +2467,7 @@
" --caps use custom Capabilities for EVM(unspecified: from FS, empty: do not use)\n"
" --verify-sig verify measurement list signatures\n"
" --engine e preload OpenSSL engine e (such as: gost)\n"
- " --ignore-violations ignore ToMToU measurement violations"
+ " --ignore-violations ignore ToMToU measurement violations\n"
" -v increase verbosity level\n"
" -h, --help display this help and exit\n"
"\n");
@@ -2485,7 +2485,7 @@
{"ima_setxattr", cmd_setxattr_ima, 0, "[--sigfile file]", "Set IMA signature from sigfile\n"},
{"ima_hash", cmd_hash_ima, 0, "file", "Make file content hash.\n"},
{"ima_measurement", cmd_ima_measurement, 0, "[--ignore-violations] [--verify-sig [--key key1, key2, ...]] [--pcrs [hash-algorithm,]file [--pcrs hash-algorithm,file] ...] file", "Verify measurement list (experimental).\n"},
- {"ima_boot_aggregate", cmd_ima_bootaggr, 0, "[file]", "Calculate per TPM bank boot_aggregate digests\n"},
+ {"ima_boot_aggregate", cmd_ima_bootaggr, 0, "[--pcrs hash-algorithm,file] [TPM 1.2 BIOS event log]", "Calculate per TPM bank boot_aggregate digests\n"},
{"ima_fix", cmd_ima_fix, 0, "[-t fdsxm] path", "Recursively fix IMA/EVM xattrs in fix mode.\n"},
{"ima_clear", cmd_ima_clear, 0, "[-t fdsxm] path", "Recursively remove IMA/EVM xattrs.\n"},
{"sign_hash", cmd_sign_hash, 0, "[--key key] [--pass [password]", "Sign hashes from shaXsum output.\n"},
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ima-evm-utils-1.3.1/tests/boot_aggregate.test new/ima-evm-utils-1.3.2/tests/boot_aggregate.test
--- old/ima-evm-utils-1.3.1/tests/boot_aggregate.test 2020-08-11 13:19:04.000000000 +0200
+++ new/ima-evm-utils-1.3.2/tests/boot_aggregate.test 2020-10-28 18:18:08.000000000 +0100
@@ -26,44 +26,49 @@
PCRFILE="/sys/class/tpm/tpm0/device/pcrs"
MISC_PCRFILE="/sys/class/misc/tpm0/device/pcrs"
-if [ "$(id -u)" = 0 ] && [ -c "/dev/tpm0" ]; then
- ASCII_RUNTIME_MEASUREMENTS="/sys/kernel/security/ima/ascii_runtime_measurements"
-else
- BINARY_BIOS_MEASUREMENTS="./sample-binary_bios_measurements-pcrs-8-9"
- ASCII_RUNTIME_MEASUREMENTS="./sample-ascii_runtime_measurements-pcrs-8-9"
- export TPM_INTERFACE_TYPE="socsim"
- export TPM_COMMAND_PORT=2321
-fi
-
-# Only stop this test's software TPM. Preferred method: "tsstpmcmd -stop"
+# Only stop this test's software TPM
cleanup() {
- if [ ! -z "${SWTPM_PPID}" ]; then
- if [ -f "${TSSDIR}/tsstpmcmd" ]; then
- "${TSSDIR}/tsstpmcmd" -stop
- else
- pkill -P "${SWTPM_PPID}"
- fi
+ if [ -n "${SWTPM_PID}" ]; then
+ kill -SIGTERM "${SWTPM_PID}"
+ elif [ -n "${TPMSERVER_PID}" ]; then
+ "${TSSDIR}/tsstpmcmd" -stop
fi
}
# Try to start a software TPM if needed.
swtpm_start() {
- local swtpm
+ local tpm_server swtpm
- swtpm="$(which tpm_server)"
- if [ -z "${swtpm}" ]; then
- echo "${CYAN}SKIP: Softare TPM (tpm_server) not found${NORM}"
+ tpm_server="$(which tpm_server)"
+ swtpm="$(which swtpm)"
+ if [ -z "${tpm_server}" ] && [ -z "${swtpm}" ]; then
+ echo "${CYAN}SKIP: Software TPM (tpm_server and swtpm) not found${NORM}"
return "$SKIP"
fi
- pgrep tpm_server
- if [ $? -eq 0 ]; then
- echo "INFO: Software TPM (tpm_server) already running"
- return 114
- else
- echo "INFO: Starting software TPM: ${swtpm}"
- ${swtpm} > /dev/null 2>&1 &
- SWTPM_PPID=$!
+ if [ -n "${swtpm}" ]; then
+ pgrep swtpm
+ if [ $? -eq 0 ]; then
+ echo "INFO: Software TPM (swtpm) already running"
+ return 114
+ else
+ echo "INFO: Starting software TPM: ${swtpm}"
+ mkdir -p ./myvtpm
+ ${swtpm} socket --tpmstate dir=./myvtpm --tpm2 --ctrl type=tcp,port=2322 --server type=tcp,port=2321 --flags not-need-init > /dev/null 2>&1 &
+ SWTPM_PID=$!
+ fi
+ elif [ -n "${tpm_server}" ]; then
+ # tpm_server uses the Microsoft simulator encapsulated packet format
+ export TPM_SERVER_TYPE="mssim"
+ pgrep tpm_server
+ if [ $? -eq 0 ]; then
+ echo "INFO: Software TPM (tpm_server) already running"
+ return 114
+ else
+ echo "INFO: Starting software TPM: ${tpm_server}"
+ ${tpm_server} > /dev/null 2>&1 &
+ TPMSERVER_PID=$!
+ fi
fi
return 0
}
@@ -75,8 +80,20 @@
return "$SKIP"
fi
- echo "INFO: Walking ${BINARY_BIOS_MEASUREMENTS} initializing the software TPM"
+ echo "INFO: Sending software TPM startup"
"${TSSDIR}/tssstartup"
+ if [ $? -ne 0 ]; then
+ echo "INFO: Retry sending software TPM startup"
+ sleep 1
+ "${TSSDIR}/tssstartup"
+ fi
+
+ if [ $? -ne 0 ]; then
+ echo "INFO: Software TPM startup failed"
+ return "$SKIP"
+ fi
+
+ echo "INFO: Walking ${BINARY_BIOS_MEASUREMENTS} initializing the software TPM"
# $(${TSSDIR}/tsseventextend -tpm -if "${BINARY_BIOS_MEASUREMENTS}" -v) 2>&1 > /dev/null
"${TSSDIR}/tsseventextend" -tpm -if "${BINARY_BIOS_MEASUREMENTS}" -v > /dev/null 2>&1
}
@@ -101,7 +118,7 @@
done
}
-# The first entry in the IMA measuremnet list is the "boot_aggregate".
+# The first entry in the IMA measurement list is the "boot_aggregate".
# For each kexec, an additional "boot_aggregate" will appear in the
# measurement list, assuming the previous measurement list is carried
# across the kexec.
@@ -133,6 +150,24 @@
return "$FAIL"
}
+if [ "$(id -u)" = 0 ] && [ -c "/dev/tpm0" ]; then
+ ASCII_RUNTIME_MEASUREMENTS="/sys/kernel/security/ima/ascii_runtime_measurements"
+ if [ ! -d "/sys/kernel/security/ima" ]; then
+ echo "${CYAN}SKIP: CONFIG_IMA not enabled${NORM}"
+ exit "$SKIP"
+ fi
+else
+ BINARY_BIOS_MEASUREMENTS="./sample-binary_bios_measurements-pcrs-8-9"
+ ASCII_RUNTIME_MEASUREMENTS="./sample-ascii_runtime_measurements-pcrs-8-9"
+ export TPM_INTERFACE_TYPE="socsim"
+ export TPM_COMMAND_PORT=2321
+ export TPM_PLATFORM_PORT=2322
+ export TPM_SERVER_NAME="localhost"
+
+ # swtpm uses the raw, unencapsulated packet format
+ export TPM_SERVER_TYPE="raw"
+fi
+
# Start and initialize a software TPM as needed
if [ "$(id -u)" != 0 ] || [ ! -c "/dev/tpm0" ]; then
if [ -f "$PCRFILE" ] || [ -f "$MISC_PCRFILE" ]; then
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ima-evm-utils-1.3.1/tests/install-swtpm.sh new/ima-evm-utils-1.3.2/tests/install-swtpm.sh
--- old/ima-evm-utils-1.3.1/tests/install-swtpm.sh 1970-01-01 01:00:00.000000000 +0100
+++ new/ima-evm-utils-1.3.2/tests/install-swtpm.sh 2020-10-28 18:18:08.000000000 +0100
@@ -0,0 +1,13 @@
+#!/bin/sh
+set -ex
+
+version=1637
+
+wget --no-check-certificate https://sourceforge.net/projects/ibmswtpm2/files/ibmtpm${version}.tar.gz/do…
+mkdir ibmtpm$version
+cd ibmtpm$version
+tar -xvzf ../download
+cd src
+make -j$(nproc)
+sudo cp tpm_server /usr/local/bin/
+cd ../..
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ima-evm-utils-1.3.1/tests/install-tss.sh new/ima-evm-utils-1.3.2/tests/install-tss.sh
--- old/ima-evm-utils-1.3.1/tests/install-tss.sh 1970-01-01 01:00:00.000000000 +0100
+++ new/ima-evm-utils-1.3.2/tests/install-tss.sh 2020-10-28 18:18:08.000000000 +0100
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+set -ex
+git clone https://git.code.sf.net/p/ibmtpm20tss/tss
+cd tss
+autoreconf -i && ./configure --disable-tpm-1.2 --disable-hwtpm && make -j$(nproc) && sudo make install
+cd ..
+rm -rf tss
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ima-evm-utils-1.3.1/tests/sign_verify.test new/ima-evm-utils-1.3.2/tests/sign_verify.test
--- old/ima-evm-utils-1.3.1/tests/sign_verify.test 2020-08-11 13:19:04.000000000 +0200
+++ new/ima-evm-utils-1.3.2/tests/sign_verify.test 2020-10-28 18:18:08.000000000 +0100
@@ -18,7 +18,14 @@
cd "$(dirname "$0")" || exit 1
PATH=../src:$PATH
source ./functions.sh
-_require evmctl openssl xxd getfattr
+
+_require cmp evmctl getfattr openssl xxd
+
+if cmp -b 2>&1 | grep -q "invalid option"; then
+ echo "cmp does not support -b (cmp from busybox?) Use cmp from diffutils"
+ exit "$HARDFAIL"
+fi
+
./gen-keys.sh >/dev/null 2>&1
trap _report_exit EXIT
@@ -93,7 +100,8 @@
return "$FAIL"
fi
- rm "$file_sig" "$file_sig2"
+ # Leave '$file_sig' for ima_verify --sigfile test.
+ rm "$file_sig2"
}
# Run single sign command
@@ -254,9 +262,12 @@
# Normal verify with proper key should pass
expect_pass check_verify
+ expect_pass check_verify OPTS="--sigfile"
# Multiple files and some don't verify
expect_fail check_verify FILE="/dev/null $file"
+
+ rm "$FILE.sig"
fi
TYPE=evm
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ima-evm-utils-1.3.1/travis/alpine.sh new/ima-evm-utils-1.3.2/travis/alpine.sh
--- old/ima-evm-utils-1.3.1/travis/alpine.sh 1970-01-01 01:00:00.000000000 +0100
+++ new/ima-evm-utils-1.3.2/travis/alpine.sh 2020-10-28 18:18:08.000000000 +0100
@@ -0,0 +1,50 @@
+#!/bin/sh
+# Copyright (c) 2020 Petr Vorel <pvorel(a)suse.cz>
+set -ex
+
+if [ -z "$CC" ]; then
+ echo "missing \$CC!" >&2
+ exit 1
+fi
+
+case "$TSS" in
+ibmtss) echo "No IBM TSS package, will be installed from git" >&2; TSS=;;
+tpm2-tss) TSS="tpm2-tss-dev";;
+'') echo "Missing TSS!" >&2; exit 1;;
+*) echo "Unsupported TSS: '$TSS'!" >&2; exit 1;;
+esac
+
+# ibmswtpm2 requires gcc
+[ "$CC" = "gcc" ] || CC="gcc $CC"
+
+apk update
+
+apk add \
+ $CC $TSS \
+ asciidoc \
+ attr \
+ attr-dev \
+ autoconf \
+ automake \
+ diffutils \
+ docbook-xml \
+ docbook-xsl \
+ keyutils-dev \
+ libtool \
+ libxslt \
+ linux-headers \
+ make \
+ musl-dev \
+ openssl \
+ openssl-dev \
+ pkgconfig \
+ procps \
+ sudo \
+ wget \
+ which \
+ xxd
+
+if [ ! "$TSS" ]; then
+ apk add git
+ ../tests/install-tss.sh
+fi
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ima-evm-utils-1.3.1/travis/centos.sh new/ima-evm-utils-1.3.2/travis/centos.sh
--- old/ima-evm-utils-1.3.1/travis/centos.sh 1970-01-01 01:00:00.000000000 +0100
+++ new/ima-evm-utils-1.3.2/travis/centos.sh 2020-11-02 09:39:54.493581992 +0100
@@ -0,0 +1 @@
+symbolic link to fedora.sh
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ima-evm-utils-1.3.1/travis/debian.cross-compile.sh new/ima-evm-utils-1.3.2/travis/debian.cross-compile.sh
--- old/ima-evm-utils-1.3.1/travis/debian.cross-compile.sh 1970-01-01 01:00:00.000000000 +0100
+++ new/ima-evm-utils-1.3.2/travis/debian.cross-compile.sh 2020-10-28 18:18:08.000000000 +0100
@@ -0,0 +1,23 @@
+#!/bin/sh
+# Copyright (c) 2020 Petr Vorel <pvorel(a)suse.cz>
+set -ex
+
+if [ -z "$ARCH" ]; then
+ echo "missing \$ARCH!" >&2
+ exit 1
+fi
+
+case "$ARCH" in
+arm64) gcc_arch="aarch64";;
+ppc64el) gcc_arch="powerpc64le";;
+s390x) gcc_arch="$ARCH";;
+*) echo "unsupported arch: '$ARCH'!" >&2; exit 1;;
+esac
+
+dpkg --add-architecture $ARCH
+apt update
+
+apt install -y --no-install-recommends \
+ dpkg-dev \
+ gcc-${gcc_arch}-linux-gnu \
+ libc6-dev-${ARCH}-cross
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ima-evm-utils-1.3.1/travis/debian.i386.sh new/ima-evm-utils-1.3.2/travis/debian.i386.sh
--- old/ima-evm-utils-1.3.1/travis/debian.i386.sh 1970-01-01 01:00:00.000000000 +0100
+++ new/ima-evm-utils-1.3.2/travis/debian.i386.sh 2020-10-28 18:18:08.000000000 +0100
@@ -0,0 +1,11 @@
+#!/bin/sh
+# Copyright (c) 2020 Petr Vorel <pvorel(a)suse.cz>
+set -ex
+
+dpkg --add-architecture i386
+apt update
+
+apt install -y --no-install-recommends \
+ linux-libc-dev:i386 \
+ gcc-multilib \
+ pkg-config:i386
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ima-evm-utils-1.3.1/travis/debian.sh new/ima-evm-utils-1.3.2/travis/debian.sh
--- old/ima-evm-utils-1.3.1/travis/debian.sh 1970-01-01 01:00:00.000000000 +0100
+++ new/ima-evm-utils-1.3.2/travis/debian.sh 2020-10-28 18:18:08.000000000 +0100
@@ -0,0 +1,54 @@
+#!/bin/sh
+# Copyright (c) 2020 Petr Vorel <pvorel(a)suse.cz>
+set -ex
+
+if [ -z "$CC" ]; then
+ echo "missing \$CC!" >&2
+ exit 1
+fi
+
+# debian.*.sh must be run first
+if [ "$ARCH" ]; then
+ ARCH=":$ARCH"
+ unset CC
+else
+ apt update
+fi
+
+# ibmswtpm2 requires gcc
+[ "$CC" = "gcc" ] || CC="gcc $CC"
+
+case "$TSS" in
+ibmtss) TSS="libtss-dev";;
+tpm2-tss) TSS="libtss2-dev";;
+'') echo "Missing TSS!" >&2; exit 1;;
+*) [ "$TSS" ] && echo "Unsupported TSS: '$TSS'!" >&2; exit 1;;
+esac
+
+apt="apt install -y --no-install-recommends"
+
+$apt \
+ $CC $TSS \
+ asciidoc \
+ attr \
+ autoconf \
+ automake \
+ diffutils \
+ debianutils \
+ docbook-xml \
+ docbook-xsl \
+ gzip \
+ libattr1-dev$ARCH \
+ libkeyutils-dev$ARCH \
+ libssl-dev$ARCH \
+ libtool \
+ make \
+ openssl \
+ pkg-config \
+ procps \
+ sudo \
+ wget \
+ xsltproc \
+
+$apt xxd || $apt vim-common
+$apt libengine-gost-openssl1.1$ARCH || true
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ima-evm-utils-1.3.1/travis/fedora.sh new/ima-evm-utils-1.3.2/travis/fedora.sh
--- old/ima-evm-utils-1.3.1/travis/fedora.sh 1970-01-01 01:00:00.000000000 +0100
+++ new/ima-evm-utils-1.3.2/travis/fedora.sh 2020-10-28 18:18:08.000000000 +0100
@@ -0,0 +1,44 @@
+#!/bin/sh
+# Copyright (c) 2020 Petr Vorel <pvorel(a)suse.cz>
+set -e
+
+if [ -z "$CC" ]; then
+ echo "missing \$CC!" >&2
+ exit 1
+fi
+
+case "$TSS" in
+ibmtss) TSS="tss2-devel";;
+tpm2-tss) TSS="tpm2-tss-devel";;
+'') echo "Missing TSS!" >&2; exit 1;;
+*) echo "Unsupported TSS: '$TSS'!" >&2; exit 1;;
+esac
+
+# ibmswtpm2 requires gcc
+[ "$CC" = "gcc" ] || CC="gcc $CC"
+
+yum -y install \
+ $CC $TSS \
+ asciidoc \
+ attr \
+ autoconf \
+ automake \
+ diffutils \
+ docbook-xsl \
+ gzip \
+ keyutils-libs-devel \
+ libattr-devel \
+ libtool \
+ libxslt \
+ make \
+ openssl \
+ openssl-devel \
+ pkg-config \
+ procps \
+ sudo \
+ vim-common \
+ wget \
+ which
+
+yum -y install docbook5-style-xsl || true
+yum -y install swtpm || true
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ima-evm-utils-1.3.1/travis/opensuse.sh new/ima-evm-utils-1.3.2/travis/opensuse.sh
--- old/ima-evm-utils-1.3.1/travis/opensuse.sh 1970-01-01 01:00:00.000000000 +0100
+++ new/ima-evm-utils-1.3.2/travis/opensuse.sh 2020-11-02 09:39:54.489581989 +0100
@@ -0,0 +1 @@
+symbolic link to tumbleweed.sh
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ima-evm-utils-1.3.1/travis/tumbleweed.sh new/ima-evm-utils-1.3.2/travis/tumbleweed.sh
--- old/ima-evm-utils-1.3.1/travis/tumbleweed.sh 1970-01-01 01:00:00.000000000 +0100
+++ new/ima-evm-utils-1.3.2/travis/tumbleweed.sh 2020-10-28 18:18:08.000000000 +0100
@@ -0,0 +1,47 @@
+#!/bin/sh
+# Copyright (c) 2020 Petr Vorel <pvorel(a)suse.cz>
+set -ex
+
+if [ -z "$CC" ]; then
+ echo "missing \$CC!" >&2
+ exit 1
+fi
+
+case "$TSS" in
+ibmtss) TSS="ibmtss-devel";;
+tpm2-tss) TSS="tpm2-0-tss-devel";;
+'') echo "Missing TSS!" >&2; exit 1;;
+*) echo "Unsupported TSS: '$TSS'!" >&2; exit 1;;
+esac
+
+# clang has some gcc dependency
+[ "$CC" = "gcc" ] || CC="gcc $CC"
+
+zypper --non-interactive install --force-resolution --no-recommends \
+ $CC $TSS \
+ asciidoc \
+ attr \
+ autoconf \
+ automake \
+ diffutils \
+ docbook_5 \
+ docbook5-xsl-stylesheets \
+ gzip \
+ ibmswtpm2 \
+ keyutils-devel \
+ libattr-devel \
+ libopenssl-devel \
+ libtool \
+ make \
+ openssl \
+ pkg-config \
+ procps \
+ sudo \
+ vim \
+ wget \
+ which \
+ xsltproc
+
+if [ -f /usr/lib/ibmtss/tpm_server ]; then
+ ln -s /usr/lib/ibmtss/tpm_server /usr/local/bin
+fi
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ima-evm-utils-1.3.1/travis/ubuntu.sh new/ima-evm-utils-1.3.2/travis/ubuntu.sh
--- old/ima-evm-utils-1.3.1/travis/ubuntu.sh 1970-01-01 01:00:00.000000000 +0100
+++ new/ima-evm-utils-1.3.2/travis/ubuntu.sh 2020-11-02 09:39:54.481581981 +0100
@@ -0,0 +1 @@
+symbolic link to debian.sh
1
0
Hello community,
here is the log from the commit of package libyui-ncurses for openSUSE:Factory checked in at 2020-11-02 09:39:45
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libyui-ncurses (Old)
and /work/SRC/openSUSE:Factory/.libyui-ncurses.new.3463 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libyui-ncurses"
Mon Nov 2 09:39:45 2020 rev:60 rq:844661 version:2.57.2
Changes:
--------
--- /work/SRC/openSUSE:Factory/libyui-ncurses/libyui-ncurses.changes 2020-10-18 16:25:10.692591152 +0200
+++ /work/SRC/openSUSE:Factory/.libyui-ncurses.new.3463/libyui-ncurses.changes 2020-11-02 09:39:49.677577371 +0100
@@ -1,0 +2,7 @@
+Wed Oct 28 16:23:14 UTC 2020 - Stefan Hundhammer <shundhammer(a)suse.com>
+
+- Explicitly set item and line index in NCMultiSelectionBox and
+ NCSelectionBox (bsc#1177982, bsc#1177985)
+- 2.57.2
+
+-------------------------------------------------------------------
Old:
----
libyui-ncurses-2.57.1.tar.bz2
New:
----
libyui-ncurses-2.57.2.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libyui-ncurses-doc.spec ++++++
--- /var/tmp/diff_new_pack.UQk4i8/_old 2020-11-02 09:39:50.169577843 +0100
+++ /var/tmp/diff_new_pack.UQk4i8/_new 2020-11-02 09:39:50.173577847 +0100
@@ -20,7 +20,7 @@
%define so_version 14
Name: %{parent}-doc
-Version: 2.57.1
+Version: 2.57.2
Release: 0
Source: %{parent}-%{version}.tar.bz2
++++++ libyui-ncurses.spec ++++++
--- /var/tmp/diff_new_pack.UQk4i8/_old 2020-11-02 09:39:50.193577866 +0100
+++ /var/tmp/diff_new_pack.UQk4i8/_new 2020-11-02 09:39:50.197577870 +0100
@@ -17,7 +17,7 @@
Name: libyui-ncurses
-Version: 2.57.1
+Version: 2.57.2
Release: 0
Source: %{name}-%{version}.tar.bz2
++++++ libyui-ncurses-2.57.1.tar.bz2 -> libyui-ncurses-2.57.2.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-ncurses-2.57.1/VERSION.cmake new/libyui-ncurses-2.57.2/VERSION.cmake
--- old/libyui-ncurses-2.57.1/VERSION.cmake 2020-10-16 16:09:16.000000000 +0200
+++ new/libyui-ncurses-2.57.2/VERSION.cmake 2020-10-28 19:29:41.000000000 +0100
@@ -1,6 +1,6 @@
SET( VERSION_MAJOR "2" )
SET( VERSION_MINOR "57" )
-SET( VERSION_PATCH "1" )
+SET( VERSION_PATCH "2" )
SET( VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}${GIT_SHA1_VERSION}" )
##### This is needed for the libyui core ONLY.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-ncurses-2.57.1/package/libyui-ncurses-doc.spec new/libyui-ncurses-2.57.2/package/libyui-ncurses-doc.spec
--- old/libyui-ncurses-2.57.1/package/libyui-ncurses-doc.spec 2020-10-16 16:09:16.000000000 +0200
+++ new/libyui-ncurses-2.57.2/package/libyui-ncurses-doc.spec 2020-10-28 19:29:41.000000000 +0100
@@ -19,7 +19,7 @@
%define so_version 14
Name: %{parent}-doc
-Version: 2.57.1
+Version: 2.57.2
Release: 0
Source: %{parent}-%{version}.tar.bz2
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-ncurses-2.57.1/package/libyui-ncurses.changes new/libyui-ncurses-2.57.2/package/libyui-ncurses.changes
--- old/libyui-ncurses-2.57.1/package/libyui-ncurses.changes 2020-10-16 16:09:16.000000000 +0200
+++ new/libyui-ncurses-2.57.2/package/libyui-ncurses.changes 2020-10-28 19:29:41.000000000 +0100
@@ -1,4 +1,11 @@
-------------------------------------------------------------------
+Wed Oct 28 16:23:14 UTC 2020 - Stefan Hundhammer <shundhammer(a)suse.com>
+
+- Explicitly set item and line index in NCMultiSelectionBox and
+ NCSelectionBox (bsc#1177982, bsc#1177985)
+- 2.57.2
+
+-------------------------------------------------------------------
Thu Oct 15 18:26:45 UTC 2020 - Stefan Hundhammer <shundhammer(a)suse.com>
- Fixed menu hotkeys (bsc#1177760)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-ncurses-2.57.1/package/libyui-ncurses.spec new/libyui-ncurses-2.57.2/package/libyui-ncurses.spec
--- old/libyui-ncurses-2.57.1/package/libyui-ncurses.spec 2020-10-16 16:09:16.000000000 +0200
+++ new/libyui-ncurses-2.57.2/package/libyui-ncurses.spec 2020-10-28 19:29:41.000000000 +0100
@@ -17,7 +17,7 @@
Name: libyui-ncurses
-Version: 2.57.1
+Version: 2.57.2
Release: 0
Source: %{name}-%{version}.tar.bz2
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-ncurses-2.57.1/src/NCMultiSelectionBox.cc new/libyui-ncurses-2.57.2/src/NCMultiSelectionBox.cc
--- old/libyui-ncurses-2.57.1/src/NCMultiSelectionBox.cc 2020-10-16 16:09:16.000000000 +0200
+++ new/libyui-ncurses-2.57.2/src/NCMultiSelectionBox.cc 2020-10-28 19:29:41.000000000 +0100
@@ -81,27 +81,28 @@
}
-
void NCMultiSelectionBox::setCurrentItem( YItem * item )
{
if ( item )
myPad()->ScrlLine( item->index() );
}
+
void NCMultiSelectionBox::addItem( YItem * item )
{
- std::vector<NCTableCol*> Items( 2U, 0 );
+ std::vector<NCTableCol*> cells( 2U, 0 );
if ( item )
{
+ item->setIndex( itemsCount() );
YMultiSelectionBox::addItem( item );
- Items[0] = new NCTableTag( item, item->selected() );
+ cells[0] = new NCTableTag( item, item->selected() );
// Do not set style to NCTableCol::PLAIN here, otherwise the current
- //item will not be highlighted if the cursor is not over the widget
+ // item will not be highlighted if the cursor is not over the widget
- Items[1] = new NCTableCol( item->label() );
- myPad()->Append( Items );
+ cells[1] = new NCTableCol( item->label() );
+ myPad()->Append( cells, item->index() );
DrawPad();
}
}
@@ -133,7 +134,6 @@
}
-
void NCMultiSelectionBox::deleteAllItems()
{
YMultiSelectionBox::deleteAllItems();
@@ -157,11 +157,11 @@
{
YMultiSelectionBox::selectItem( yitem, selected );
- //retrieve pointer to the line tag associated with this item
- NCTableTag * tag = ( NCTableTag * )yitem->data();
+ // retrieve pointer to the line tag associated with this item
+ NCTableTag * tag = (NCTableTag *) yitem->data();
YUI_CHECK_PTR( tag );
- tag->SetSelected( selected );
+ tag->SetSelected( selected );
DrawPad();
}
@@ -177,7 +177,7 @@
NCTableTag *t = tagCell( i );
YUI_CHECK_PTR( t );
- t->SetSelected( false );
+ t->SetSelected( false );
}
DrawPad();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-ncurses-2.57.1/src/NCSelectionBox.cc new/libyui-ncurses-2.57.2/src/NCSelectionBox.cc
--- old/libyui-ncurses-2.57.1/src/NCSelectionBox.cc 2020-10-16 16:09:16.000000000 +0200
+++ new/libyui-ncurses-2.57.2/src/NCSelectionBox.cc 2020-10-28 19:29:41.000000000 +0100
@@ -142,13 +142,14 @@
void NCSelectionBox::addItem( YItem * item )
{
- std::vector<NCTableCol*> Items( 1U, 0 );
+ std::vector<NCTableCol*> cells( 1U, 0 );
if ( item )
{
+ item->setIndex( itemsCount() );
YSelectionBox::addItem( item );
- Items[0] = new NCTableCol( item->label() );
- myPad()->Append( Items );
+ cells[0] = new NCTableCol( item->label() );
+ myPad()->Append( cells, item->index() );
DrawPad();
if ( item->selected() )
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-ncurses-2.57.1/src/NCTablePadBase.h new/libyui-ncurses-2.57.2/src/NCTablePadBase.h
--- old/libyui-ncurses-2.57.1/src/NCTablePadBase.h 2020-10-16 16:09:16.000000000 +0200
+++ new/libyui-ncurses-2.57.2/src/NCTablePadBase.h 2020-10-28 19:29:41.000000000 +0100
@@ -149,7 +149,7 @@
/**
* Create a new item from 'cells' and add it to the end of _items.
**/
- void Append( std::vector<NCTableCol*> & cells, int index = -1 )
+ void Append( std::vector<NCTableCol*> & cells, int index )
{ AddLine( Lines(), new NCTableLine( cells, index ) ); }
/**
1
0
Hello community,
here is the log from the commit of package abseil-cpp for openSUSE:Factory checked in at 2020-11-02 09:39:42
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/abseil-cpp (Old)
and /work/SRC/openSUSE:Factory/.abseil-cpp.new.3463 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "abseil-cpp"
Mon Nov 2 09:39:42 2020 rev:14 rq:844359 version:20200225.2
Changes:
--------
--- /work/SRC/openSUSE:Factory/abseil-cpp/abseil-cpp.changes 2020-09-29 19:00:08.793652727 +0200
+++ /work/SRC/openSUSE:Factory/.abseil-cpp.new.3463/abseil-cpp.changes 2020-11-02 09:39:48.625576361 +0100
@@ -1,0 +2,6 @@
+Tue Oct 27 09:16:46 UTC 2020 - Jan Engelhardt <jengelh(a)inai.de>
+
+- Build shared libraries of abseil for use by grpc
+ (related to https://github.com/grpc/grpc/issues/24476)
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ abseil-cpp.spec ++++++
--- /var/tmp/diff_new_pack.5s1wMq/_old 2020-11-02 09:39:49.229576941 +0100
+++ /var/tmp/diff_new_pack.5s1wMq/_new 2020-11-02 09:39:49.229576941 +0100
@@ -25,14 +25,24 @@
URL: https://abseil.io/
Source0: https://github.com/abseil/abseil-cpp/archive/%{version}.tar.gz#/%{name}-%{v…
Source1: %{name}-rpmlintrc
+BuildRequires: c++_compiler
+BuildRequires: cmake
BuildRequires: fdupes
-BuildArch: noarch
%description
Abseil is a collection of C++11 libraries which augment the C++
standard library. It also provides features incorporated into C++14
and C++17 standards.
+%package devel
+Summary: Header files for Abseil
+Requires: %{name} = %{version}
+
+%description devel
+Abseil is a collection of C++11 libraries which augment the C++
+standard library.
+This package contains headers and build system files for it.
+
%package source
Summary: Source code of Abseil
@@ -42,14 +52,28 @@
features incorporated into C++14 and C++17 standards.
%prep
-%setup -q
+%autosetup -p1
%build
+# let rpm/OBS have some versioning to work with when it comes to upgrades and rebuilds
+cat >"%_builddir/abslx.sym" <<-EOF
+ ABSL_%version { global: *; };
+EOF
+%define build_ldflags -Wl,--version-script=%_builddir/abslx.sym
+%cmake -DBUILD_SHARED_LIBS:BOOL=ON
%install
+%cmake_install
mkdir -p %{buildroot}%{src_install_dir}
cp -r * %{buildroot}%{src_install_dir}
-%fdupes %{buildroot}%{src_install_dir}
+%fdupes %{buildroot}/%{_prefix}
+
+%files
+%{_libdir}/libabsl_*.so
+
+%files devel
+%{_includedir}/absl/
+%{_libdir}/cmake/
%files source
%license LICENSE
1
0
Hello community,
here is the log from the commit of package python-mistune for openSUSE:Factory checked in at 2020-11-02 09:39:38
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-mistune (Old)
and /work/SRC/openSUSE:Factory/.python-mistune.new.3463 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-mistune"
Mon Nov 2 09:39:38 2020 rev:9 rq:845058 version:0.8.4
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-mistune/python-mistune.changes 2020-04-15 19:53:47.557579992 +0200
+++ /work/SRC/openSUSE:Factory/.python-mistune.new.3463/python-mistune.changes 2020-11-02 09:39:45.569573429 +0100
@@ -1,0 +2,6 @@
+Fri Oct 23 14:42:42 UTC 2020 - Matej Cepl <mcepl(a)suse.com>
+
+- Use %pycache_only %python_sitelib instead of %python3_sitelib
+ fixes gh#openSUSE/python-rpm-macros#64#issuecomment-715373348
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-mistune.spec ++++++
--- /var/tmp/diff_new_pack.dk7SYm/_old 2020-11-02 09:39:46.033573874 +0100
+++ /var/tmp/diff_new_pack.dk7SYm/_new 2020-11-02 09:39:46.033573874 +0100
@@ -52,7 +52,7 @@
%license LICENSE
%doc CHANGES.rst README.rst
%{python_sitelib}/mistune.py*
-%pycache_only %{python3_sitelib}/__pycache__/*
+%pycache_only %{python_sitelib}/__pycache__/*
%dir %{python_sitelib}/mistune-%{version}-py*.egg-info
%{python_sitelib}/mistune-%{version}-py*.egg-info/*
1
0
Hello community,
here is the log from the commit of package python-joblib for openSUSE:Factory checked in at 2020-11-02 09:39:34
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-joblib (Old)
and /work/SRC/openSUSE:Factory/.python-joblib.new.3463 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-joblib"
Mon Nov 2 09:39:34 2020 rev:16 rq:845029 version:0.16.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-joblib/python-joblib.changes 2020-10-25 18:09:32.983511644 +0100
+++ /work/SRC/openSUSE:Factory/.python-joblib.new.3463/python-joblib.changes 2020-11-02 09:39:44.893572780 +0100
@@ -1,0 +2,14 @@
+Fri Oct 30 08:23:38 UTC 2020 - pgajdos(a)suse.com
+
+- disable test_hash_numpy_noncontiguous,
+ test_hashes_are_different_between_c_and_fortran_contiguous_arrays,
+ test_hashes_stay_the_same_with_numpy_objects,
+ test_non_contiguous_array_pickling [bsc#1177209]
+
+-------------------------------------------------------------------
+Tue Oct 27 12:01:23 UTC 2020 - pgajdos(a)suse.com
+
+- disable test_nested_loop_error_in_grandchild_resource_tracker_silent
+ [bsc#1177209]
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-joblib.spec ++++++
--- /var/tmp/diff_new_pack.ceJGpg/_old 2020-11-02 09:39:45.401573268 +0100
+++ /var/tmp/diff_new_pack.ceJGpg/_new 2020-11-02 09:39:45.405573271 +0100
@@ -86,13 +86,25 @@
# aarch64:
# test_resource_tracker_silent_when_reference_cycles
# test_child_raises_parent_exits_cleanly
+# i586:
+# test_nested_loop_error_in_grandchild_resource_tracker_silent
+# s390x:
+# test_hash_numpy_noncontiguous
+# test_hashes_are_different_between_c_and_fortran_contiguous_arrays
+# test_hashes_stay_the_same_with_numpy_objects
+# test_non_contiguous_array_pickling
DISABLED_TESTS="test_hash_numpy_noncontiguous or \
test_hashes_are_different_between_c_and_fortran_contiguous_arrays or \
test_hashes_stay_the_same_with_numpy_objects or \
test_non_contiguous_array_pickling or \
test_multithreaded_parallel_termination_resource_tracker_silent or \
test_resource_tracker_silent_when_reference_cycles or \
- test_child_raises_parent_exits_cleanly"
+ test_child_raises_parent_exits_cleanly or \
+ test_nested_loop_error_in_grandchild_resource_tracker_silent or \
+ test_hash_numpy_noncontiguous or \
+ test_hashes_are_different_between_c_and_fortran_contiguous_arrays or \
+ test_hashes_stay_the_same_with_numpy_objects or \
+ test_non_contiguous_array_pickling"
%pytest -k "not ($DISABLED_TESTS)"
%files %{python_files}
1
0
Hello community,
here is the log from the commit of package python-cairocffi for openSUSE:Factory checked in at 2020-11-02 09:39:30
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-cairocffi (Old)
and /work/SRC/openSUSE:Factory/.python-cairocffi.new.3463 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-cairocffi"
Mon Nov 2 09:39:30 2020 rev:15 rq:845028 version:1.2.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-cairocffi/python-cairocffi.changes 2019-09-19 15:45:21.335360245 +0200
+++ /work/SRC/openSUSE:Factory/.python-cairocffi.new.3463/python-cairocffi.changes 2020-11-02 09:39:43.269571223 +0100
@@ -1,0 +2,9 @@
+Fri Oct 30 06:20:59 UTC 2020 - Michael Vetter <mvetter(a)suse.com>
+
+- Update to 1.2.0:
+ * #152: Add NumPy support
+ * #143: Make write_to_png function work on hardened systems
+ * #156: Use major version name to open shared libraries
+ * #165: Don’t list setuptools as required for installation
+
+-------------------------------------------------------------------
Old:
----
cairocffi-1.1.0.tar.gz
New:
----
cairocffi-1.2.0.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-cairocffi.spec ++++++
--- /var/tmp/diff_new_pack.awBljz/_old 2020-11-02 09:39:43.737571671 +0100
+++ /var/tmp/diff_new_pack.awBljz/_new 2020-11-02 09:39:43.741571675 +0100
@@ -1,7 +1,7 @@
#
# spec file for package python-cairocffi
#
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -12,14 +12,14 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
%{?!python_module:%define python_module() python-%{**} python3-%{**}}
%define skip_python2 1
Name: python-cairocffi
-Version: 1.1.0
+Version: 1.2.0
Release: 0
Summary: Python cairo bindings based on cffi
License: BSD-3-Clause
@@ -27,6 +27,7 @@
URL: https://github.com/Kozea/cairocffi
Source: https://files.pythonhosted.org/packages/source/c/cairocffi/cairocffi-%{vers…
BuildRequires: %{python_module cffi >= 1.1.0}
+BuildRequires: %{python_module numpy}
BuildRequires: %{python_module pytest-runner}
BuildRequires: %{python_module setuptools >= 39.2.0}
BuildRequires: %{python_module xcffib >= 0.3.2}
++++++ cairocffi-1.1.0.tar.gz -> cairocffi-1.2.0.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cairocffi-1.1.0/PKG-INFO new/cairocffi-1.2.0/PKG-INFO
--- old/cairocffi-1.1.0/PKG-INFO 2019-09-05 16:09:33.000000000 +0200
+++ new/cairocffi-1.2.0/PKG-INFO 2020-10-29 22:27:52.007522800 +0100
@@ -1,19 +1,16 @@
Metadata-Version: 2.1
Name: cairocffi
-Version: 1.1.0
+Version: 1.2.0
Summary: cffi-based cairo bindings for Python
Home-page: https://github.com/Kozea/cairocffi
Author: Simon Sapin
-Author-email: community(a)kozea.fr
+Author-email: contact(a)courtbouillon.org
License: BSD
Project-URL: Documentation, https://cairocffi.readthedocs.io/
Project-URL: Code, https://github.com/Kozea/cairocffi/
Project-URL: Issue tracker, https://github.com/Kozea/cairocffi/issues
-Project-URL: Donation, https://www.patreon.com/kozea
-Description: cairocffi
- =========
-
- cairocffi is a `CFFI`_-based drop-in replacement for Pycairo_,
+Project-URL: Donation, https://opencollective.com/courtbouillon
+Description: cairocffi is a `CFFI`_-based drop-in replacement for Pycairo_,
a set of Python bindings and object-oriented API for cairo_.
Cairo is a 2D vector graphics library with support for multiple backends
including image buffers, PNG, PostScript, PDF, and SVG file output.
@@ -26,15 +23,27 @@
.. _cairo: http://cairographics.org/
.. _GDK-PixBuf: https://gitlab.gnome.org/GNOME/gdk-pixbuf
- * `Latest documentation <http://cairocffi.readthedocs.io/en/latest/>`_
- * `Source code and issue tracker <https://github.com/Kozea/cairocffi>`_
- on GitHub.
- * Install with ``pip install cairocffi``
- * Python 3.5+. `Tested with CPython and PyPy3
- <https://travis-ci.org/Kozea/cairocffi>`_.
+ * Free software: BSD license
+ * For Python 3.6+, tested on CPython and PyPy
+ * Documentation: https://cairocffi.readthedocs.io
+ * Changelog: https://github.com/Kozea/cairocffi/releases
+ * Code, issues, tests: https://github.com/Kozea/cairocffi
+ * Code of conduct: https://www.courtbouillon.org/code-of-conduct
+ * Professional support: https://www.courtbouillon.org
+ * Donation: https://opencollective.com/courtbouillon
* API partially compatible with Pycairo.
* Works with any version of cairo.
+ cairocffi has been created and developed by Kozea (https://kozea.fr)
+ Professional support, maintenance and community management is provided by
+ CourtBouillon (https://www.courtbouillon.org)
+
+ Copyrights are retained by their contributors, no copyright assignment is
+ required to contribute to cairocffi. Unless explicitly stated otherwise, any
+ contribution intentionally submitted for inclusion is licensed under the BSD
+ 3-clause license, without any additional terms or conditions. For full
+ authorship information, see the version control history.
+
Keywords: cairo,cffi,binding
Platform: Linux
Platform: macOS
@@ -43,12 +52,13 @@
Classifier: Intended Audience :: Developers
Classifier: License :: OSI Approved :: BSD License
Classifier: Programming Language :: Python :: 3 :: Only
-Classifier: Programming Language :: Python :: 3.5
Classifier: Programming Language :: Python :: 3.6
Classifier: Programming Language :: Python :: 3.7
+Classifier: Programming Language :: Python :: 3.8
+Classifier: Programming Language :: Python :: 3.9
Classifier: Topic :: Multimedia :: Graphics
-Requires-Python: >= 3.5
+Requires-Python: >=3.6
Description-Content-Type: text/x-rst
-Provides-Extra: test
Provides-Extra: doc
+Provides-Extra: test
Provides-Extra: xcb
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cairocffi-1.1.0/README.rst new/cairocffi-1.2.0/README.rst
--- old/cairocffi-1.1.0/README.rst 2019-02-06 19:10:15.000000000 +0100
+++ new/cairocffi-1.2.0/README.rst 2020-10-29 22:18:23.000000000 +0100
@@ -1,6 +1,3 @@
-cairocffi
-=========
-
cairocffi is a `CFFI`_-based drop-in replacement for Pycairo_,
a set of Python bindings and object-oriented API for cairo_.
Cairo is a 2D vector graphics library with support for multiple backends
@@ -14,11 +11,23 @@
.. _cairo: http://cairographics.org/
.. _GDK-PixBuf: https://gitlab.gnome.org/GNOME/gdk-pixbuf
-* `Latest documentation <http://cairocffi.readthedocs.io/en/latest/>`_
-* `Source code and issue tracker <https://github.com/Kozea/cairocffi>`_
- on GitHub.
-* Install with ``pip install cairocffi``
-* Python 3.5+. `Tested with CPython and PyPy3
- <https://travis-ci.org/Kozea/cairocffi>`_.
+* Free software: BSD license
+* For Python 3.6+, tested on CPython and PyPy
+* Documentation: https://cairocffi.readthedocs.io
+* Changelog: https://github.com/Kozea/cairocffi/releases
+* Code, issues, tests: https://github.com/Kozea/cairocffi
+* Code of conduct: https://www.courtbouillon.org/code-of-conduct
+* Professional support: https://www.courtbouillon.org
+* Donation: https://opencollective.com/courtbouillon
* API partially compatible with Pycairo.
* Works with any version of cairo.
+
+cairocffi has been created and developed by Kozea (https://kozea.fr)
+Professional support, maintenance and community management is provided by
+CourtBouillon (https://www.courtbouillon.org)
+
+Copyrights are retained by their contributors, no copyright assignment is
+required to contribute to cairocffi. Unless explicitly stated otherwise, any
+contribution intentionally submitted for inclusion is licensed under the BSD
+3-clause license, without any additional terms or conditions. For full
+authorship information, see the version control history.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cairocffi-1.1.0/cairocffi/VERSION new/cairocffi-1.2.0/cairocffi/VERSION
--- old/cairocffi-1.1.0/cairocffi/VERSION 2019-09-05 16:06:18.000000000 +0200
+++ new/cairocffi-1.2.0/cairocffi/VERSION 2020-10-29 22:27:18.000000000 +0100
@@ -1 +1 @@
-1.1.0
\ No newline at end of file
+1.2.0
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cairocffi-1.1.0/cairocffi/__init__.py new/cairocffi-1.2.0/cairocffi/__init__.py
--- old/cairocffi-1.1.0/cairocffi/__init__.py 2019-08-12 15:29:06.000000000 +0200
+++ new/cairocffi-1.2.0/cairocffi/__init__.py 2020-10-29 22:18:23.000000000 +0100
@@ -47,7 +47,7 @@
cairo = dlopen(
ffi, ('cairo', 'libcairo-2'),
- ('libcairo.so', 'libcairo.2.dylib', 'libcairo-2.dll'))
+ ('libcairo.so.2', 'libcairo.2.dylib', 'libcairo-2.dll'))
class _keepref(object):
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cairocffi-1.1.0/cairocffi/pixbuf.py new/cairocffi-1.2.0/cairocffi/pixbuf.py
--- old/cairocffi-1.1.0/cairocffi/pixbuf.py 2019-08-12 15:29:06.000000000 +0200
+++ new/cairocffi-1.2.0/cairocffi/pixbuf.py 2020-10-29 22:18:23.000000000 +0100
@@ -21,18 +21,18 @@
gdk_pixbuf = dlopen(
ffi, ('gdk_pixbuf-2.0', 'libgdk_pixbuf-2.0-0'),
- ('libgdk_pixbuf-2.0.so', 'libgdk_pixbuf-2.0.0.dylib',
+ ('libgdk_pixbuf-2.0.so.0', 'libgdk_pixbuf-2.0.0.dylib',
'libgdk_pixbuf-2.0-0.dll'))
gobject = dlopen(
ffi, ('gobject-2.0', 'libgobject-2.0-0'),
- ('libgobject-2.0.so', 'libgobject-2.0.dylib', 'libgobject-2.0-0.dll'))
+ ('libgobject-2.0.so.0', 'libgobject-2.0.dylib', 'libgobject-2.0-0.dll'))
glib = dlopen(
ffi, ('glib-2.0', 'libglib-2.0-0'),
- ('libglib-2.0.so', 'libglib-2.0.dylib', 'libglib-2.0-0.dll'))
+ ('libglib-2.0.so.0', 'libglib-2.0.dylib', 'libglib-2.0-0.dll'))
try:
gdk = dlopen(
ffi, ('gdk-3', 'libgdk-3-0'),
- ('libgdk-3.so', 'libgdk-3.0.dylib', 'libgdk-3-0.dll'))
+ ('libgdk-3.so.0', 'libgdk-3.0.dylib', 'libgdk-3-0.dll'))
except OSError:
gdk = None
@@ -96,7 +96,7 @@
if width and height:
gdk_pixbuf.gdk_pixbuf_loader_set_size(loader, width, height)
handle_g_error(error, gdk_pixbuf.gdk_pixbuf_loader_write(
- loader, ffi.new('guchar[]', image_data), len(image_data), error))
+ loader, image_data, len(image_data), error))
handle_g_error(error, gdk_pixbuf.gdk_pixbuf_loader_close(loader, error))
format_ = gdk_pixbuf.gdk_pixbuf_loader_get_format(loader)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cairocffi-1.1.0/cairocffi/surfaces.py new/cairocffi-1.2.0/cairocffi/surfaces.py
--- old/cairocffi-1.1.0/cairocffi/surfaces.py 2019-02-06 22:50:51.000000000 +0100
+++ new/cairocffi-1.2.0/cairocffi/surfaces.py 2020-10-29 22:18:23.000000000 +0100
@@ -11,9 +11,13 @@
import ctypes
import io
+import operator
import os
import sys
import weakref
+from functools import reduce
+from pathlib import Path
+from tempfile import NamedTemporaryFile
from . import _check_status, _keepref, cairo, constants, ffi
from .fonts import FontOptions, _encode_string
@@ -76,6 +80,10 @@
# Looks like a array.array object.
address, length = obj.buffer_info()
return address, length * obj.itemsize
+ elif hasattr(obj, '__array_interface__'):
+ # Looks like a numpy.ndarray object
+ length = reduce(operator.mul, obj.shape)
+ return ctypes.addressof(ctypes.c_char.from_buffer(obj)), length
else:
# Other buffers.
# XXX Unfortunately ctypes.c_char.from_buffer
@@ -148,7 +156,11 @@
self._pointer = ffi.gc(
pointer, _keepref(cairo, cairo.cairo_surface_destroy))
self._check_status()
- if target_keep_alive not in (None, ffi.NULL):
+ if hasattr(target_keep_alive, '__array_interface__'):
+ is_empty = target_keep_alive.size == 0
+ else:
+ is_empty = target_keep_alive in (None, ffi.NULL)
+ if not is_empty:
keep_alive = KeepAlive(target_keep_alive)
_check_status(cairo.cairo_surface_set_user_data(
self._pointer, SURFACE_TARGET_KEY, *keep_alive.closure))
@@ -643,9 +655,25 @@
if return_bytes:
target = io.BytesIO()
if hasattr(target, 'write'):
- write_func = _make_write_func(target)
- _check_status(cairo.cairo_surface_write_to_png_stream(
- self._pointer, write_func, ffi.NULL))
+ try:
+ write_func = _make_write_func(target)
+ _check_status(cairo.cairo_surface_write_to_png_stream(
+ self._pointer, write_func, ffi.NULL))
+ except SystemError: # noqa
+ # Callback creation has failed
+ if hasattr(target, 'name'):
+ # File-like object has a name, write here
+ _check_status(cairo.cairo_surface_write_to_png(
+ self._pointer, _encode_filename(target.name)))
+ else:
+ # Use a fallback temporary file
+ with NamedTemporaryFile('wb', delete=False) as fd:
+ filename = fd.name
+ _check_status(cairo.cairo_surface_write_to_png(
+ self._pointer, _encode_filename(filename)))
+ png_file = Path(filename)
+ target.write(png_file.read_bytes())
+ png_file.unlink()
else:
_check_status(cairo.cairo_surface_write_to_png(
self._pointer, _encode_filename(target)))
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cairocffi-1.1.0/cairocffi/test_numpy.py new/cairocffi-1.2.0/cairocffi/test_numpy.py
--- old/cairocffi-1.1.0/cairocffi/test_numpy.py 1970-01-01 01:00:00.000000000 +0100
+++ new/cairocffi-1.2.0/cairocffi/test_numpy.py 2020-10-29 22:18:23.000000000 +0100
@@ -0,0 +1,16 @@
+import math
+
+import cairocffi as cairo
+import numpy
+
+
+def test_numpy():
+ data = numpy.zeros((200, 200, 4), dtype=numpy.uint8)
+ surface = cairo.ImageSurface(cairo.FORMAT_ARGB32, 200, 200, data=data)
+ cr = cairo.Context(surface)
+ cr.set_source_rgb(1.0, 1.0, 1.0)
+ cr.paint()
+ cr.arc(100, 100, 80, 0, 2*math.pi)
+ cr.set_line_width(3)
+ cr.set_source_rgb(1.0, 0.0, 0.0)
+ cr.stroke()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cairocffi-1.1.0/cairocffi.egg-info/PKG-INFO new/cairocffi-1.2.0/cairocffi.egg-info/PKG-INFO
--- old/cairocffi-1.1.0/cairocffi.egg-info/PKG-INFO 2019-09-05 16:09:33.000000000 +0200
+++ new/cairocffi-1.2.0/cairocffi.egg-info/PKG-INFO 2020-10-29 22:27:51.000000000 +0100
@@ -1,19 +1,16 @@
Metadata-Version: 2.1
Name: cairocffi
-Version: 1.1.0
+Version: 1.2.0
Summary: cffi-based cairo bindings for Python
Home-page: https://github.com/Kozea/cairocffi
Author: Simon Sapin
-Author-email: community(a)kozea.fr
+Author-email: contact(a)courtbouillon.org
License: BSD
Project-URL: Documentation, https://cairocffi.readthedocs.io/
Project-URL: Code, https://github.com/Kozea/cairocffi/
Project-URL: Issue tracker, https://github.com/Kozea/cairocffi/issues
-Project-URL: Donation, https://www.patreon.com/kozea
-Description: cairocffi
- =========
-
- cairocffi is a `CFFI`_-based drop-in replacement for Pycairo_,
+Project-URL: Donation, https://opencollective.com/courtbouillon
+Description: cairocffi is a `CFFI`_-based drop-in replacement for Pycairo_,
a set of Python bindings and object-oriented API for cairo_.
Cairo is a 2D vector graphics library with support for multiple backends
including image buffers, PNG, PostScript, PDF, and SVG file output.
@@ -26,15 +23,27 @@
.. _cairo: http://cairographics.org/
.. _GDK-PixBuf: https://gitlab.gnome.org/GNOME/gdk-pixbuf
- * `Latest documentation <http://cairocffi.readthedocs.io/en/latest/>`_
- * `Source code and issue tracker <https://github.com/Kozea/cairocffi>`_
- on GitHub.
- * Install with ``pip install cairocffi``
- * Python 3.5+. `Tested with CPython and PyPy3
- <https://travis-ci.org/Kozea/cairocffi>`_.
+ * Free software: BSD license
+ * For Python 3.6+, tested on CPython and PyPy
+ * Documentation: https://cairocffi.readthedocs.io
+ * Changelog: https://github.com/Kozea/cairocffi/releases
+ * Code, issues, tests: https://github.com/Kozea/cairocffi
+ * Code of conduct: https://www.courtbouillon.org/code-of-conduct
+ * Professional support: https://www.courtbouillon.org
+ * Donation: https://opencollective.com/courtbouillon
* API partially compatible with Pycairo.
* Works with any version of cairo.
+ cairocffi has been created and developed by Kozea (https://kozea.fr)
+ Professional support, maintenance and community management is provided by
+ CourtBouillon (https://www.courtbouillon.org)
+
+ Copyrights are retained by their contributors, no copyright assignment is
+ required to contribute to cairocffi. Unless explicitly stated otherwise, any
+ contribution intentionally submitted for inclusion is licensed under the BSD
+ 3-clause license, without any additional terms or conditions. For full
+ authorship information, see the version control history.
+
Keywords: cairo,cffi,binding
Platform: Linux
Platform: macOS
@@ -43,12 +52,13 @@
Classifier: Intended Audience :: Developers
Classifier: License :: OSI Approved :: BSD License
Classifier: Programming Language :: Python :: 3 :: Only
-Classifier: Programming Language :: Python :: 3.5
Classifier: Programming Language :: Python :: 3.6
Classifier: Programming Language :: Python :: 3.7
+Classifier: Programming Language :: Python :: 3.8
+Classifier: Programming Language :: Python :: 3.9
Classifier: Topic :: Multimedia :: Graphics
-Requires-Python: >= 3.5
+Requires-Python: >=3.6
Description-Content-Type: text/x-rst
-Provides-Extra: test
Provides-Extra: doc
+Provides-Extra: test
Provides-Extra: xcb
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cairocffi-1.1.0/cairocffi.egg-info/SOURCES.txt new/cairocffi-1.2.0/cairocffi.egg-info/SOURCES.txt
--- old/cairocffi-1.1.0/cairocffi.egg-info/SOURCES.txt 2019-09-05 16:09:33.000000000 +0200
+++ new/cairocffi-1.2.0/cairocffi.egg-info/SOURCES.txt 2020-10-29 22:27:51.000000000 +0100
@@ -13,6 +13,7 @@
cairocffi/pixbuf.py
cairocffi/surfaces.py
cairocffi/test_cairo.py
+cairocffi/test_numpy.py
cairocffi/test_pixbuf.py
cairocffi/test_xcb.py
cairocffi/xcb.py
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cairocffi-1.1.0/cairocffi.egg-info/requires.txt new/cairocffi-1.2.0/cairocffi.egg-info/requires.txt
--- old/cairocffi-1.1.0/cairocffi.egg-info/requires.txt 2019-09-05 16:09:33.000000000 +0200
+++ new/cairocffi-1.2.0/cairocffi.egg-info/requires.txt 2020-10-29 22:27:51.000000000 +0100
@@ -1,5 +1,4 @@
cffi>=1.1.0
-setuptools>=39.2.0
[doc]
sphinx
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cairocffi-1.1.0/setup.cfg new/cairocffi-1.2.0/setup.cfg
--- old/cairocffi-1.1.0/setup.cfg 2019-09-05 16:09:33.000000000 +0200
+++ new/cairocffi-1.2.0/setup.cfg 2020-10-29 22:27:52.007522800 +0100
@@ -8,7 +8,7 @@
long_description = file: README.rst
long_description_content_type = text/x-rst
author = Simon Sapin
-author_email = community(a)kozea.fr
+author_email = contact(a)courtbouillon.org
platforms =
Linux
macOS
@@ -22,15 +22,16 @@
Intended Audience :: Developers
License :: OSI Approved :: BSD License
Programming Language :: Python :: 3 :: Only
- Programming Language :: Python :: 3.5
Programming Language :: Python :: 3.6
Programming Language :: Python :: 3.7
+ Programming Language :: Python :: 3.8
+ Programming Language :: Python :: 3.9
Topic :: Multimedia :: Graphics
project_urls =
Documentation = https://cairocffi.readthedocs.io/
Code = https://github.com/Kozea/cairocffi/
Issue tracker = https://github.com/Kozea/cairocffi/issues
- Donation = https://www.patreon.com/kozea
+ Donation = https://opencollective.com/courtbouillon
[options]
packages = find:
@@ -40,13 +41,13 @@
setuptools
install_requires =
cffi >= 1.1.0
- setuptools >= 39.2.0
tests_require =
pytest-cov
pytest-flake8
pytest-isort
pytest-runner
-python_requires = >= 3.5
+ numpy
+python_requires = >= 3.6
[options.package_data]
cairocffi = VERSION
@@ -83,7 +84,7 @@
cairocffi/_generated/*.py
[isort]
-default_section = THIRDPARTY
+default_section = FIRSTPARTY
multi_line_output = 4
[coverage:report]
1
0