openSUSE Commits
Threads by month
- ----- 2025 -----
- January
- ----- 2024 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2013 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2012 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2011 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2010 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2009 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2008 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2007 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2006 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
May 2019
- 1 participants
- 2232 discussions
Hello community,
here is the log from the commit of package python-Cerberus for openSUSE:Factory checked in at 2019-05-02 19:17:16
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-Cerberus (Old)
and /work/SRC/openSUSE:Factory/.python-Cerberus.new.5148 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-Cerberus"
Thu May 2 19:17:16 2019 rev:4 rq:699624 version:1.3
Changes:
…
[View More]--------
--- /work/SRC/openSUSE:Factory/python-Cerberus/python-Cerberus.changes 2019-01-21 10:57:10.955523004 +0100
+++ /work/SRC/openSUSE:Factory/.python-Cerberus.new.5148/python-Cerberus.changes 2019-05-02 19:17:19.305418454 +0200
@@ -1,0 +2,31 @@
+Tue Apr 30 10:41:47 UTC 2019 - Michael Vetter mvetter(a)suse.com
+
+- Update to 1.3:
+ New:
+ * Add require_all rule and validator argument (#417)
+ * The contains rule (#358)
+ * All fields that are defined as readonly are removed from a document when a validator has the purge_readonly flag set to True (#240)
+ * The validator rule is renamed to check_with. The old name is deprecated and will not be available in the next major release of Cerberus (#405)
+ * The rules keyschema and valueschema are renamed to keysrules and valuesrules; the old names are deprecated and will not be available in the next major release of Cerbers (#385)
+ * The meta pseudo-rule can be used to store arbitrary application data related to a field in a schema
+ * Python 3.7 officially supported (#451)
+ * Python 2.6 and 3.3 are no longer supported
+ Fixed:
+ * Fix test test_{default,default_setter}_none_nonnullable (#435)
+ * Normalization rules defined within the items rule are applied (#361)
+ * Defaults are applied to undefined fields from an allow_unknown definition (#310)
+ * The forbidden value now handles any input type (#449)
+ * The allowed rule will not be evaluated on fields that have a legit None value (#454)
+ * If the cerberus distribution cannot not be found, the version is set to the value unknown (#472)
+ Improved:
+ * Suppress DeprecationWarning about collections.abc (#451)
+ * Omit warning when no schema for meta rule constraint is available (#425)
+ * Reformat code to match Black code-style (#402)
+ * Perform lint checks and fixes on staged files, as a pre-commit hook (#402)
+ * Change allowed rule to use containers instead of lists (#384)
+ * Remove Registry from top level namespace (#354)
+ * Check the empty rule against values of type Sized
+ * Various micro optimizations and 'safety belts' that were inspired by adding type annotations to a branch of the code base
+ * Update docs
+
+-------------------------------------------------------------------
Old:
----
Cerberus-1.2.tar.gz
New:
----
Cerberus-1.3.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-Cerberus.spec ++++++
--- /var/tmp/diff_new_pack.iD7dY2/_old 2019-05-02 19:17:19.985419704 +0200
+++ /var/tmp/diff_new_pack.iD7dY2/_new 2019-05-02 19:17:19.985419704 +0200
@@ -12,13 +12,13 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-# Please submit bugfixes or comments via https://bugs.opensuse.org/
+# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
%{?!python_module:%define python_module() python-%{**} python3-%{**}}
Name: python-Cerberus
-Version: 1.2
+Version: 1.3
Release: 0
Summary: Extensible schema and data validation tool for Python dictionaries
License: ISC
++++++ Cerberus-1.2.tar.gz -> Cerberus-1.3.tar.gz ++++++
++++ 6554 lines of diff (skipped)
[View Less]
1
0
Hello community,
here is the log from the commit of package pcmanfm-qt for openSUSE:Factory checked in at 2019-05-02 19:17:11
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/pcmanfm-qt (Old)
and /work/SRC/openSUSE:Factory/.pcmanfm-qt.new.5148 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "pcmanfm-qt"
Thu May 2 19:17:11 2019 rev:12 rq:699603 version:0.14.1
Changes:
--------
--- /…
[View More]work/SRC/openSUSE:Factory/pcmanfm-qt/pcmanfm-qt.changes 2019-03-06 15:48:38.604430846 +0100
+++ /work/SRC/openSUSE:Factory/.pcmanfm-qt.new.5148/pcmanfm-qt.changes 2019-05-02 19:17:14.361409373 +0200
@@ -1,0 +2,5 @@
+Tue Apr 30 10:09:45 UTC 2019 - mvetter(a)suse.com
+
+- bsc#1128570: Add menu-cache to requires
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ pcmanfm-qt.spec ++++++
--- /var/tmp/diff_new_pack.nrraKN/_old 2019-05-02 19:17:15.817412048 +0200
+++ /var/tmp/diff_new_pack.nrraKN/_new 2019-05-02 19:17:15.821412055 +0200
@@ -45,6 +45,8 @@
BuildRequires: pkgconfig(lxqt) >= 0.14.1
#bsc#1100208 - mvetter(a)suse.de
Requires: wallpaper-branding-openSUSE
+#bsc#1128570 - mvetter(a)suse.de
+Requires: menu-cache
Recommends: %{name}-lang
%description
[View Less]
1
0
Hello community,
here is the log from the commit of package geary for openSUSE:Factory checked in at 2019-05-02 19:17:04
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/geary (Old)
and /work/SRC/openSUSE:Factory/.geary.new.5148 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "geary"
Thu May 2 19:17:04 2019 rev:46 rq:699598 version:3.32.1
Changes:
--------
--- /work/SRC/openSUSE:…
[View More]Factory/geary/geary.changes 2019-03-26 15:43:59.980179540 +0100
+++ /work/SRC/openSUSE:Factory/.geary.new.5148/geary.changes 2019-05-02 19:17:08.449398513 +0200
@@ -1,0 +2,7 @@
+Sun Apr 28 10:51:17 UTC 2019 - Bjørn Lie <bjorn.lie(a)gmail.com>
+
+- Update to version 3.32.1:
+ + Bug fixes and server compatibility improvements.
+ + Updated translations.
+
+-------------------------------------------------------------------
Old:
----
geary-3.32.0.tar.xz
New:
----
geary-3.32.1.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ geary.spec ++++++
--- /var/tmp/diff_new_pack.IldihE/_old 2019-05-02 19:17:08.949399432 +0200
+++ /var/tmp/diff_new_pack.IldihE/_new 2019-05-02 19:17:08.949399432 +0200
@@ -17,7 +17,7 @@
Name: geary
-Version: 3.32.0
+Version: 3.32.1
Release: 0
Summary: An email reader for the GNOME desktop
License: LGPL-2.1-or-later AND CC-BY-3.0 AND BSD-2-Clause
++++++ geary-3.32.0.tar.xz -> geary-3.32.1.tar.xz ++++++
++++ 12279 lines of diff (skipped)
[View Less]
1
0
Hello community,
here is the log from the commit of package shotwell for openSUSE:Factory checked in at 2019-05-02 19:17:02
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/shotwell (Old)
and /work/SRC/openSUSE:Factory/.shotwell.new.5148 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "shotwell"
Thu May 2 19:17:02 2019 rev:88 rq:699570 version:0.30.4
Changes:
--------
--- /work/SRC/…
[View More]openSUSE:Factory/shotwell/shotwell.changes 2019-02-11 21:24:31.191108517 +0100
+++ /work/SRC/openSUSE:Factory/.shotwell.new.5148/shotwell.changes 2019-05-02 19:17:04.525391305 +0200
@@ -1,0 +2,13 @@
+Thu Apr 25 08:50:20 UTC 2019 - Bjørn Lie <bjorn.lie(a)gmail.com>
+
+- Update to version 0.30.4:
+ + Fix building against GExiv2 0.12 and later.
+ + Fix camera fall-back icon.
+ + Fix icon resource fall-backs.
+ + Fix issue with ACDSEE hierarchical tags.
+ + Fix compile issue with recent vala.
+ + Fix focus issue in slideshow.
+ + Updated translations.
+- Drop shotwell-Adapt-to-gexiv2-changes.patch: Fixed upstream.
+
+-------------------------------------------------------------------
Old:
----
shotwell-0.30.2.tar.xz
shotwell-Adapt-to-gexiv2-changes.patch
New:
----
shotwell-0.30.4.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ shotwell.spec ++++++
--- /var/tmp/diff_new_pack.OLduog/_old 2019-05-02 19:17:05.565393215 +0200
+++ /var/tmp/diff_new_pack.OLduog/_new 2019-05-02 19:17:05.565393215 +0200
@@ -17,7 +17,7 @@
Name: shotwell
-Version: 0.30.2
+Version: 0.30.4
Release: 0
Summary: Photo Manager for GNOME
License: LGPL-2.1-or-later
@@ -26,8 +26,6 @@
Source0: https://download.gnome.org/sources/%{name}/0.30/%{name}-%{version}.tar.xz
Source99: shotwell-rpmlintrc
-# PATCH-FIX-UPSTREAM shotwell-Adapt-to-gexiv2-changes.patch -- Fix build with new libgexiv2
-Patch0: shotwell-Adapt-to-gexiv2-changes.patch
BuildRequires: appstream-glib
BuildRequires: fdupes
++++++ shotwell-0.30.2.tar.xz -> shotwell-0.30.4.tar.xz ++++++
/work/SRC/openSUSE:Factory/shotwell/shotwell-0.30.2.tar.xz /work/SRC/openSUSE:Factory/.shotwell.new.5148/shotwell-0.30.4.tar.xz differ: char 25, line 1
[View Less]
1
0
Hello community,
here is the log from the commit of package xrdp for openSUSE:Factory checked in at 2019-05-02 19:16:56
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/xrdp (Old)
and /work/SRC/openSUSE:Factory/.xrdp.new.5148 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xrdp"
Thu May 2 19:16:56 2019 rev:22 rq:699567 version:0.9.10
Changes:
--------
--- /work/SRC/openSUSE:Factory/…
[View More]xrdp/xrdp.changes 2019-01-03 18:07:19.616103101 +0100
+++ /work/SRC/openSUSE:Factory/.xrdp.new.5148/xrdp.changes 2019-05-02 19:17:00.073383127 +0200
@@ -1,0 +2,28 @@
+Mon Apr 29 17:25:19 UTC 2019 - Felix Zhang <fezhang(a)suse.com>
+
+- Update to version 0.9.10 (jsc#SLE-5926)
+ + New features
+ - Restrict outbound (server->client) clipboard transfer,
+ configured in `sesman.ini` #1298
+ + Bug fixes
+ - Fix libscp v1 not setting width but height twice #1293
+ - Fix reconnecting to session causes duplicate drive entries
+ in fuse fs #1299
+ - Fix default_wm and reconnect_sh refer wrong path after sesman
+ caught SIGUP #1315 #1331
+ - Shutdown xrdp more responsively #1325
+ - Improve remote file lookup in drive redirection #996 #1327
+ - Overwriting & appending to existing files now supported #1327
+ + Other changes
+ - Add Danish Keyboard #1290
+ - Put xrdp- prefix to some executables appear in man page #1313
+ - Replace some URLs from SF.net to xrdp.org #1313
+ + Known issues
+ - FreeRDP 2.0.0-rc4 or later might not able to connect to xrdp
+ due to xrdp's bad-mannered behaviour, add `+glyph-cache`
+ option to FreeRDP to connect #1266
+ - Audio redirection by MP3 codec doesn't sound with some
+ client, use AAC instead #965
+
+
+-------------------------------------------------------------------
Old:
----
xrdp-0.9.9.tar.gz
xrdp-0.9.9.tar.gz.asc
New:
----
xrdp-0.9.10.tar.gz
xrdp-0.9.10.tar.gz.asc
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xrdp.spec ++++++
--- /var/tmp/diff_new_pack.HyStHA/_old 2019-05-02 19:17:00.933384707 +0200
+++ /var/tmp/diff_new_pack.HyStHA/_new 2019-05-02 19:17:00.937384714 +0200
@@ -1,7 +1,7 @@
#
# spec file for package xrdp
#
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -23,7 +23,7 @@
%define _fwdefdir %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services
Name: xrdp
-Version: 0.9.9
+Version: 0.9.10
Release: 0
Summary: Remote desktop protocol (RDP) server
License: Apache-2.0 AND GPL-2.0-or-later
++++++ xrdp-0.9.9.tar.gz -> xrdp-0.9.10.tar.gz ++++++
++++ 3996 lines of diff (skipped)
[View Less]
1
0
Hello community,
here is the log from the commit of package xorgxrdp for openSUSE:Factory checked in at 2019-05-02 19:16:52
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/xorgxrdp (Old)
and /work/SRC/openSUSE:Factory/.xorgxrdp.new.5148 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xorgxrdp"
Thu May 2 19:16:52 2019 rev:11 rq:699566 version:0.2.9
Changes:
--------
--- /work/SRC/…
[View More]openSUSE:Factory/xorgxrdp/xorgxrdp.changes 2018-12-21 08:22:35.749503884 +0100
+++ /work/SRC/openSUSE:Factory/.xorgxrdp.new.5148/xorgxrdp.changes 2019-05-02 19:16:54.505372899 +0200
@@ -1,0 +2,5 @@
+Mon Apr 29 17:11:02 UTC 2019 - Felix Zhang <fezhang(a)suse.com>
+
+- BuildRequires libXfont2-devel for SLE12-SP4 and later
+
+-------------------------------------------------------------------
@@ -4 +9 @@
-- Update to version 0.2.9
+- Update to version 0.2.9 (jsc#SLE-5926)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xorgxrdp.spec ++++++
--- /var/tmp/diff_new_pack.VBGt4q/_old 2019-05-02 19:16:55.433374604 +0200
+++ /var/tmp/diff_new_pack.VBGt4q/_new 2019-05-02 19:16:55.433374604 +0200
@@ -1,7 +1,7 @@
#
# spec file for package xorgxrdp
#
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -34,8 +34,8 @@
BuildRequires: xrdp-devel
BuildRequires: pkgconfig(xorg-macros)
Requires: xrdp >= 0.9.1
-# For 42.x keep to use libXfont-devel
-%if 0%{?suse_version} > 1320
+# For Leap 42.x and SLE 12.x <= 12.3, keep to use libXfont-devel
+%if 0%{?suse_version} > 1320 || 0%{?sle_version} > 120300
BuildRequires: libXfont2-devel
%else
BuildRequires: libXfont-devel
[View Less]
1
0
Hello community,
here is the log from the commit of package perl-Template-Toolkit for openSUSE:Factory checked in at 2019-05-02 19:16:50
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/perl-Template-Toolkit (Old)
and /work/SRC/openSUSE:Factory/.perl-Template-Toolkit.new.5148 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "perl-Template-Toolkit"
Thu May 2 19:16:50 2019 rev:33 rq:…
[View More]699562 version:2.29
Changes:
--------
--- /work/SRC/openSUSE:Factory/perl-Template-Toolkit/perl-Template-Toolkit.changes 2018-11-10 17:02:25.095530718 +0100
+++ /work/SRC/openSUSE:Factory/.perl-Template-Toolkit.new.5148/perl-Template-Toolkit.changes 2019-05-02 19:16:52.393369019 +0200
@@ -1,0 +2,13 @@
+Tue Apr 30 05:34:12 UTC 2019 - Stephan Kulow <coolo(a)suse.com>
+
+- updated to 2.29
+ see /usr/share/doc/packages/perl-Template-Toolkit/Changes
+
+ # Version 2.29 - 29th April 2019
+ #------------------------------------------------------------------------
+
+ * G. Flohr fixed multiple weaken cyclic reference
+
+ #-----------------------------------------------------------------------
+
+-------------------------------------------------------------------
Old:
----
Template-Toolkit-2.28.tar.gz
New:
----
Template-Toolkit-2.29.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ perl-Template-Toolkit.spec ++++++
--- /var/tmp/diff_new_pack.268fXK/_old 2019-05-02 19:16:53.101370321 +0200
+++ /var/tmp/diff_new_pack.268fXK/_new 2019-05-02 19:16:53.105370328 +0200
@@ -1,7 +1,7 @@
#
# spec file for package perl-Template-Toolkit
#
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,7 @@
Name: perl-Template-Toolkit
-Version: 2.28
+Version: 2.29
Release: 0
%define cpan_name Template-Toolkit
Summary: Template Processing System
@@ -44,10 +44,10 @@
%build
perl Makefile.PL INSTALLDIRS=vendor OPTIMIZE="%{optflags}"
-%{__make} %{?_smp_mflags}
+make %{?_smp_mflags}
%check
-%{__make} test
+make test
%install
%perl_make_install
++++++ Template-Toolkit-2.28.tar.gz -> Template-Toolkit-2.29.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Template-Toolkit-2.28/Changes new/Template-Toolkit-2.29/Changes
--- old/Template-Toolkit-2.28/Changes 2018-10-12 00:46:12.000000000 +0200
+++ new/Template-Toolkit-2.29/Changes 2019-04-29 17:52:56.000000000 +0200
@@ -19,6 +19,12 @@
#------------------------------------------------------------------------
#-----------------------------------------------------------------------
+# Version 2.29 - 29th April 2019
+#------------------------------------------------------------------------
+
+* G. Flohr fixed multiple weaken cyclic reference
+
+#-----------------------------------------------------------------------
# Version 2.28 - 11th October 2018
#------------------------------------------------------------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Template-Toolkit-2.28/HACKING new/Template-Toolkit-2.29/HACKING
--- old/Template-Toolkit-2.28/HACKING 2018-10-12 00:33:16.000000000 +0200
+++ new/Template-Toolkit-2.29/HACKING 2019-04-29 17:52:56.000000000 +0200
@@ -1,11 +1,11 @@
Template Toolkit
- Version 2.28
+ Version 2.29
- October 2018
+ April 2019
- Copyright (C) 1996-2018 Andy Wardley. All Rights Reserved
+ Copyright (C) 1996-2019 Andy Wardley. All Rights Reserved
This is free software; you can redistribute it and/or
modify it under the same terms as Perl itself.
@@ -48,7 +48,7 @@
COPYRIGHT
---------
-Copyright (C) 1996-2018 Andy Wardley. All Rights Reserved.
+Copyright (C) 1996-2019 Andy Wardley. All Rights Reserved.
This is free software; you can redistribute it and/or modify it under
the same terms as Perl itself.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Template-Toolkit-2.28/INSTALL new/Template-Toolkit-2.29/INSTALL
--- old/Template-Toolkit-2.28/INSTALL 2018-10-12 00:33:16.000000000 +0200
+++ new/Template-Toolkit-2.29/INSTALL 2019-04-29 17:52:56.000000000 +0200
@@ -1,11 +1,11 @@
Template Toolkit
- Version 2.28
+ Version 2.29
- October 2018
+ April 2019
- Copyright (C) 1996-2018 Andy Wardley. All Rights Reserved
+ Copyright (C) 1996-2019 Andy Wardley. All Rights Reserved
This is free software; you can redistribute it and/or
modify it under the same terms as Perl itself.
@@ -30,8 +30,8 @@
To install the Template Toolkit from the command line:
- $ tar zxf Template-Toolkit-2.28.tar.gz
- $ cd Template-Toolkit-2.28
+ $ tar zxf Template-Toolkit-2.29.tar.gz
+ $ cd Template-Toolkit-2.29
$ perl Makefile.PL
$ make
$ make test
@@ -85,19 +85,19 @@
Template-Toolkit-<version>.tar.gz
-where <version> represents the current version number, e.g. 2.26.
+where <version> represents the current version number, e.g. 2.29.
To install the Template Toolkit, unpack the distribution archive to
create an installation directory. Something like this:
- $ tar zxf Template-Toolkit-2.26.tar.gz
+ $ tar zxf Template-Toolkit-2.29.tar.gz
or
- $ gunzip Template-Toolkit-2.26.tar.gz
- $ tar xf Template-Toolkit-2.26.tar
+ $ gunzip Template-Toolkit-2.29.tar.gz
+ $ tar xf Template-Toolkit-2.29.tar
You can then 'cd' into the directory created,
- $ cd Template-Toolkit-2.26
+ $ cd Template-Toolkit-2.29
and perform the usual Perl installation procedure:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Template-Toolkit-2.28/MANIFEST new/Template-Toolkit-2.29/MANIFEST
--- old/Template-Toolkit-2.28/MANIFEST 2018-10-12 00:48:23.000000000 +0200
+++ new/Template-Toolkit-2.29/MANIFEST 2019-04-29 17:53:32.000000000 +0200
@@ -236,6 +236,7 @@
t/wrap.t
t/wrapper.t
t/zz-plugin-cycle.t
+t/zz-plugin-leak-gh-213.t
t/zz-plugin-leak-rt-46691.t
t/zz-plugin-leak.t
t/zz-pmv.t
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Template-Toolkit-2.28/META.json new/Template-Toolkit-2.29/META.json
--- old/Template-Toolkit-2.28/META.json 2018-10-12 00:48:22.000000000 +0200
+++ new/Template-Toolkit-2.29/META.json 2019-04-29 17:53:32.000000000 +0200
@@ -57,6 +57,6 @@
"web" : "https://github.com/abw/Template2"
}
},
- "version" : "2.28",
+ "version" : "2.29",
"x_serialization_backend" : "JSON::PP version 2.27400_02"
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Template-Toolkit-2.28/META.yml new/Template-Toolkit-2.29/META.yml
--- old/Template-Toolkit-2.28/META.yml 2018-10-12 00:48:22.000000000 +0200
+++ new/Template-Toolkit-2.29/META.yml 2019-04-29 17:53:32.000000000 +0200
@@ -28,5 +28,5 @@
bugtracker: https://github.com/abw/Template2/issues
homepage: http://www.template-toolkit.org
repository: https://github.com/abw/Template2.git
-version: '2.28'
+version: '2.29'
x_serialization_backend: 'CPAN::Meta::YAML version 0.018'
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Template-Toolkit-2.28/README new/Template-Toolkit-2.29/README
--- old/Template-Toolkit-2.28/README 2018-10-12 00:33:16.000000000 +0200
+++ new/Template-Toolkit-2.29/README 2019-04-29 17:52:56.000000000 +0200
@@ -1,11 +1,11 @@
Template Toolkit
- Version 2.28
+ Version 2.29
- October 2018
+ April 2019
- Copyright (C) 1996-2018 Andy Wardley. All Rights Reserved
+ Copyright (C) 1996-2019 Andy Wardley. All Rights Reserved
This is free software; you can redistribute it and/or
modify it under the same terms as Perl itself.
@@ -44,6 +44,8 @@
WHAT'S NEW?
-----------
+Version 2.29 is a maintenance release fixing a cycling weaken issue.
+
Version 2.28 is a maintenance release fixing some minor bugs and warnings.
GitHub is now the official bug tacker tool for the project.
@@ -346,7 +348,7 @@
COPYRIGHT
---------
-Copyright (C) 1996-2014 Andy Wardley. All Rights Reserved.
+Copyright (C) 1996-2019 Andy Wardley. All Rights Reserved.
This is free software; you can redistribute it and/or modify it under
the same terms as Perl itself.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Template-Toolkit-2.28/lib/Template/Plugin/Filter.pm new/Template-Toolkit-2.29/lib/Template/Plugin/Filter.pm
--- old/Template-Toolkit-2.28/lib/Template/Plugin/Filter.pm 2018-10-11 23:49:04.000000000 +0200
+++ new/Template-Toolkit-2.29/lib/Template/Plugin/Filter.pm 2019-04-29 17:52:56.000000000 +0200
@@ -11,7 +11,7 @@
# Andy Wardley <abw(a)wardley.org>
#
# COPYRIGHT
-# Copyright (C) 2001-2009 Andy Wardley. All Rights Reserved.
+# Copyright (C) 2001-2019 Andy Wardley. All Rights Reserved.
#
# This module is free software; you can redistribute it and/or
# modify it under the same terms as Perl itself.
@@ -23,7 +23,7 @@
use strict;
use warnings;
use base 'Template::Plugin';
-use Scalar::Util 'weaken';
+use Scalar::Util 'weaken', 'isweak';
our $VERSION = 1.38;
@@ -65,7 +65,8 @@
my $this = $self;
# avoid a memory leak
- weaken( $this->{_CONTEXT} ) if ref $this->{_CONTEXT};
+ weaken( $this->{_CONTEXT} ) if ref $this->{_CONTEXT}
+ && !isweak $this->{_CONTEXT};
if ($self->{ _DYNAMIC }) {
return [ sub {
@@ -385,7 +386,7 @@
=head1 COPYRIGHT
-Copyright (C) 1996-2007 Andy Wardley. All Rights Reserved.
+Copyright (C) 1996-2019 Andy Wardley. All Rights Reserved.
This module is free software; you can redistribute it and/or
modify it under the same terms as Perl itself.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Template-Toolkit-2.28/lib/Template/Provider.pm new/Template-Toolkit-2.29/lib/Template/Provider.pm
--- old/Template-Toolkit-2.28/lib/Template/Provider.pm 2018-10-11 23:48:59.000000000 +0200
+++ new/Template-Toolkit-2.29/lib/Template/Provider.pm 2019-04-29 17:52:56.000000000 +0200
@@ -81,17 +81,6 @@
# regex to match relative paths
our $RELATIVE_PATH = qr[(?:^|/)\.+/];
-
-# hack so that 'use bytes' will compile on versions of Perl earlier than
-# 5.6, even though we never call _decode_unicode() on those systems
-BEGIN {
- if ($] < 5.006) {
- package bytes;
- $INC{'bytes.pm'} = 1;
- }
-}
-
-
#========================================================================
# -- PUBLIC METHODS --
#========================================================================
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Template-Toolkit-2.28/lib/Template.pm new/Template-Toolkit-2.29/lib/Template.pm
--- old/Template-Toolkit-2.28/lib/Template.pm 2018-10-12 00:33:16.000000000 +0200
+++ new/Template-Toolkit-2.29/lib/Template.pm 2019-04-29 17:52:56.000000000 +0200
@@ -32,7 +32,7 @@
use File::Path;
use Scalar::Util qw(blessed);
-our $VERSION = '2.28';
+our $VERSION = '2.29';
our $ERROR = '';
our $DEBUG = 0;
our $BINMODE = 0 unless defined $BINMODE;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Template-Toolkit-2.28/t/zz-plugin-leak-gh-213.t new/Template-Toolkit-2.29/t/zz-plugin-leak-gh-213.t
--- old/Template-Toolkit-2.28/t/zz-plugin-leak-gh-213.t 1970-01-01 01:00:00.000000000 +0100
+++ new/Template-Toolkit-2.29/t/zz-plugin-leak-gh-213.t 2019-04-29 17:52:56.000000000 +0200
@@ -0,0 +1,122 @@
+#!/usr/bin/perl
+
+#============================================================= -*-perl-*-
+#
+# t/zz-plugin-leak-gh-213.t
+#
+# Testcase from aka GH #213
+# view https://github.com/abw/Template2/pull/213
+#
+# Written by Nicolas R. <atoomic(a)cpan.org>
+#
+#========================================================================
+
+# stolen from t/filter.t need to refactor
+package Tie::File2Str;
+
+sub TIEHANDLE {
+ my ( $class, $textref ) = @_;
+ bless $textref, $class;
+}
+
+sub PRINT {
+ my $self = shift;
+ $$self .= join( '', @_ );
+}
+
+package main;
+
+use lib qw( t/lib ./lib ../lib ../blib/arch ./test );
+
+use Template;
+use Test::More;
+
+use File::Temp qw(tempfile tempdir);
+
+plan( skip_all => "Developer test only - set RELEASE_TESTING=1" )
+ unless ( $ENV{AUTOMATED_TESTING} or $ENV{RELEASE_TESTING} );
+
+plan tests => 3;
+
+# ------- t1.txt - checkleak template
+my $t1 = <<'EOT';
+[%- USE Echo -%]
+[% FILTER $Echo %]foo[% END %]
+[% FILTER $Echo %]bar[% END %]
+EOT
+
+# ------- checkleak.pm a super checkleak custom filter
+my $plugin_echo = <<'EOT';
+
+package Template::Plugin::Echo;
+
+use base qw(Template::Plugin::Filter);
+
+sub filter {
+ my ($self, $text) = @_;
+
+ return $text . $text;
+}
+
+1;
+EOT
+
+my $template_tmpdir = tempdir( CLEANUP => 1 );
+
+write_text( qq[$template_tmpdir/t1.txt], $t1 );
+
+my $plugindir = tempdir( CLEANUP => 1 );
+
+my $plugin_pm = qq[$plugindir/Template/Plugin/Echo.pm];
+
+# pretty ugly but only run by authors...
+mkdir("$plugindir/Template") && mkdir("$plugindir/Template/Plugin");
+die q[Failed to create plugindir] unless -d "$plugindir/Template/Plugin";
+
+write_text( $plugin_pm, $plugin_echo );
+
+unshift @INC, $plugindir;
+ok eval { do $plugin_pm; 1 }, "can load Template::Plugin::checkleak"
+ or die "Failed to load Template::Plugin::checkleak - $@";
+
+# chdir to our temporary folder with templates
+chdir($template_tmpdir) or die;
+
+my $tt = Template->new( { 'PLUGIN_BASE' => $plugindir } );
+
+my $out;
+my $stderr;
+{
+ local *STDERR;
+ tie( *STDERR, "Tie::File2Str", \$stderr );
+
+ $tt->process(
+ 't1.txt',
+ {},
+ \$out
+ ) || print STDERR "Error: " . $tt->error();
+
+}
+
+# make sure we can process the template without any issues
+# the original bug was doing a weaken on the plugin itself..
+# resulting in not being able to load it a second time
+is $out,
+ <<'EXPECT', "Template processed correctly using Plugin checkleak twice";
+foofoo
+barbar
+EXPECT
+
+is $stderr, undef, "no warning from process 'Reference is already weak'";
+
+done_testing;
+
+exit;
+
+sub write_text { # could also use File::Slurper::write_file ....
+ my ( $file, $content ) = @_;
+
+ open( my $fh, '>', $file ) or die $!;
+ print {$fh} $content;
+ close($fh);
+}
[View Less]
1
0
Hello community,
here is the log from the commit of package carla for openSUSE:Factory checked in at 2019-05-02 19:16:46
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/carla (Old)
and /work/SRC/openSUSE:Factory/.carla.new.5148 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "carla"
Thu May 2 19:16:46 2019 rev:14 rq:699558 version:2.0.0+git20190321.20cc5244
Changes:
--------
--- /…
[View More]work/SRC/openSUSE:Factory/carla/carla.changes 2019-04-03 09:27:50.543810359 +0200
+++ /work/SRC/openSUSE:Factory/.carla.new.5148/carla.changes 2019-05-02 19:16:49.485363678 +0200
@@ -1,0 +2,5 @@
+Tue Apr 30 07:12:42 UTC 2019 - Edgar Aichinger <edogawa(a)aon.at>
+
+- update to 2.0.0
+
+-------------------------------------------------------------------
Old:
----
Carla-1.9.14+git20190227.737a0b0f.tar.xz
New:
----
Carla-2.0.0+git20190321.20cc5244.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ carla.spec ++++++
--- /var/tmp/diff_new_pack.ycXjE0/_old 2019-05-02 19:16:50.217365023 +0200
+++ /var/tmp/diff_new_pack.ycXjE0/_new 2019-05-02 19:16:50.221365030 +0200
@@ -19,7 +19,7 @@
%define __provides_exclude_from ^%{_libdir}/carla/jack/.*.so.0$
Name: carla
-Version: 1.9.14+git20190227.737a0b0f
+Version: 2.0.0+git20190321.20cc5244
Release: 0
Summary: An audio plugin host
License: GPL-2.0-or-later
++++++ Carla-1.9.14+git20190227.737a0b0f.tar.xz -> Carla-2.0.0+git20190321.20cc5244.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Carla-1.9.14+git20190227.737a0b0f/data/carla-native-plugin.pc new/Carla-2.0.0+git20190321.20cc5244/data/carla-native-plugin.pc
--- old/Carla-1.9.14+git20190227.737a0b0f/data/carla-native-plugin.pc 2019-02-27 22:20:39.000000000 +0100
+++ new/Carla-2.0.0+git20190321.20cc5244/data/carla-native-plugin.pc 2019-03-21 18:32:17.000000000 +0100
@@ -3,7 +3,7 @@
includedir=X-INCLUDEDIR-X/carla
Name: carla-native-plugin
-Version: 1.9.14
+Version: 2.0.0
Description: Carla Native Plugin
Libs: -Wl,rpath=${libdir} -L${libdir} -lcarla_native-plugin
Cflags: -DREAL_BUILD -I${includedir} -I${includedir}/includes
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Carla-1.9.14+git20190227.737a0b0f/data/carla-standalone.pc new/Carla-2.0.0+git20190321.20cc5244/data/carla-standalone.pc
--- old/Carla-1.9.14+git20190227.737a0b0f/data/carla-standalone.pc 2019-02-27 22:20:39.000000000 +0100
+++ new/Carla-2.0.0+git20190321.20cc5244/data/carla-standalone.pc 2019-03-21 18:32:17.000000000 +0100
@@ -3,7 +3,7 @@
includedir=X-INCLUDEDIR-X/carla
Name: carla-standalone
-Version: 1.9.14
+Version: 2.0.0
Description: Carla Host Standalone
Libs: -Wl,rpath=${libdir} -L${libdir} -lcarla_standalone2
Cflags: -DREAL_BUILD -I${includedir} -I${includedir}/includes
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Carla-1.9.14+git20190227.737a0b0f/data/carla-utils.pc new/Carla-2.0.0+git20190321.20cc5244/data/carla-utils.pc
--- old/Carla-1.9.14+git20190227.737a0b0f/data/carla-utils.pc 2019-02-27 22:20:39.000000000 +0100
+++ new/Carla-2.0.0+git20190321.20cc5244/data/carla-utils.pc 2019-03-21 18:32:17.000000000 +0100
@@ -3,7 +3,7 @@
includedir=X-INCLUDEDIR-X/carla
Name: carla-utils
-Version: 1.9.14
+Version: 2.0.0
Description: Carla Host Utilities
Libs: -Wl,rpath=${libdir} -L${libdir} -lcarla_utils
Cflags: -DREAL_BUILD -I${includedir} -I${includedir}/includes -I${includedir}/utils
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Carla-1.9.14+git20190227.737a0b0f/data/linux/build-all.sh new/Carla-2.0.0+git20190321.20cc5244/data/linux/build-all.sh
--- old/Carla-1.9.14+git20190227.737a0b0f/data/linux/build-all.sh 2019-02-27 22:20:39.000000000 +0100
+++ new/Carla-2.0.0+git20190321.20cc5244/data/linux/build-all.sh 2019-03-21 18:32:17.000000000 +0100
@@ -24,8 +24,8 @@
source common.env
CHROOT_CARLA_DIR="/tmp/carla-src"
-PKG_FOLDER="Carla_2.0-RC4-linux"
-PKGS_NUM="20190227"
+PKG_FOLDER="Carla_2.0.0-linux"
+PKGS_NUM="20190321"
# ---------------------------------------------------------------------------------------------------------------------
# function to remove old stuff
@@ -139,11 +139,11 @@
fi
if [ ! -d ${CHROOT_CARLA_DIR} ]; then
- git clone --depth=1 git://github.com/falkTX/Carla ${CHROOT_CARLA_DIR}
+ git clone --depth=1 -b master git://github.com/falkTX/Carla ${CHROOT_CARLA_DIR}
fi
if [ ! -f ${CHROOT_CARLA_DIR}/source/native-plugins/external/README.md ]; then
- git clone --depth=1 git://github.com/falkTX/Carla-Plugins ${CHROOT_CARLA_DIR}/source/native-plugins/external
+ git clone --depth=1 -b master git://github.com/falkTX/Carla-Plugins ${CHROOT_CARLA_DIR}/source/native-plugins/external
fi
cd ${CHROOT_CARLA_DIR}
@@ -269,8 +269,8 @@
{
CHROOT_DIR=${TARGETDIR}/chroot${ARCH}
-CARLA_VER="1.9.14+git20190227"
-WINBR_VER="1.9.14+git20190227"
+CARLA_VER="2.0.0"
+WINBR_VER="2.0.0"
WINE32_VER="1.9.14+git20190227"
WINE64_VER="1.9.14.git20190227"
@@ -353,7 +353,9 @@
rm -rf ./tmp-install
make ${MAKE_ARGS} install DESTDIR=./tmp-install PREFIX=/usr
+make -C data/windows/unzipfx-carla -f Makefile.linux ${MAKE_ARGS} clean
make -C data/windows/unzipfx-carla -f Makefile.linux ${MAKE_ARGS}
+make -C data/windows/unzipfx-carla-control -f Makefile.linux ${MAKE_ARGS} clean
make -C data/windows/unzipfx-carla-control -f Makefile.linux ${MAKE_ARGS}
# ---------------------------------------------------------------------------------------------------------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Carla-1.9.14+git20190227.737a0b0f/data/macos/build.sh new/Carla-2.0.0+git20190321.20cc5244/data/macos/build.sh
--- old/Carla-1.9.14+git20190227.737a0b0f/data/macos/build.sh 2019-02-27 22:20:39.000000000 +0100
+++ new/Carla-2.0.0+git20190321.20cc5244/data/macos/build.sh 2019-03-21 18:32:17.000000000 +0100
@@ -15,7 +15,7 @@
# ---------------------------------------------------------------------------------------------------------------------
# set variables
-PKG_FOLDER="Carla_2.0-RC4-macos"
+PKG_FOLDER="Carla_2.0.0-macos"
source data/macos/common.env
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Carla-1.9.14+git20190227.737a0b0f/data/windows/build-win-all.sh new/Carla-2.0.0+git20190321.20cc5244/data/windows/build-win-all.sh
--- old/Carla-1.9.14+git20190227.737a0b0f/data/windows/build-win-all.sh 2019-02-27 22:20:39.000000000 +0100
+++ new/Carla-2.0.0+git20190321.20cc5244/data/windows/build-win-all.sh 2019-03-21 18:32:17.000000000 +0100
@@ -1,6 +1,6 @@
#!/bin/bash
-VERSION="2.0-RC4"
+VERSION="2.0.0"
# ---------------------------------------------------------------------------------------------------------------------
# stop on error
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Carla-1.9.14+git20190227.737a0b0f/data/windows/pack-win.sh new/Carla-2.0.0+git20190321.20cc5244/data/windows/pack-win.sh
--- old/Carla-1.9.14+git20190227.737a0b0f/data/windows/pack-win.sh 2019-02-27 22:20:39.000000000 +0100
+++ new/Carla-2.0.0+git20190321.20cc5244/data/windows/pack-win.sh 2019-03-21 18:32:17.000000000 +0100
@@ -1,5 +1,7 @@
#!/bin/bash
+VERSION="2.0.0"
+
# ---------------------------------------------------------------------------------------------------------------------
# check input
@@ -33,7 +35,7 @@
source data/windows/common.env
-PKG_FOLDER="Carla_2.0-RC4-win${ARCH}"
+PKG_FOLDER="Carla_${VERSION}-win${ARCH}"
export WIN32=true
@@ -174,6 +176,7 @@
mkdir ${PKG_FOLDER}
mkdir ${PKG_FOLDER}/vcredist
cp -r Carla.exe Carla.lv2 README.txt ${PKG_FOLDER}
+unix2dos ${PKG_FOLDER}/README.txt
cp ~/.cache/winetricks/vcrun2010/vcredist_x${VCARCH}.exe ${PKG_FOLDER}/vcredist
zip -r -9 ${PKG_FOLDER}.zip ${PKG_FOLDER}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Carla-1.9.14+git20190227.737a0b0f/resources/ui/carla_database.ui new/Carla-2.0.0+git20190321.20cc5244/resources/ui/carla_database.ui
--- old/Carla-1.9.14+git20190227.737a0b0f/resources/ui/carla_database.ui 2019-02-27 22:20:39.000000000 +0100
+++ new/Carla-2.0.0+git20190321.20cc5244/resources/ui/carla_database.ui 2019-03-21 18:32:17.000000000 +0100
@@ -257,6 +257,9 @@
<property name="sortingEnabled">
<bool>true</bool>
</property>
+ <property name="wordWrap">
+ <bool>false</bool>
+ </property>
<attribute name="horizontalHeaderStretchLastSection">
<bool>true</bool>
</attribute>
@@ -276,7 +279,7 @@
</column>
<column>
<property name="text">
- <string>Label</string>
+ <string>Label/URI</string>
</property>
</column>
<column>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Carla-1.9.14+git20190227.737a0b0f/source/Makefile.mk new/Carla-2.0.0+git20190321.20cc5244/source/Makefile.mk
--- old/Carla-1.9.14+git20190227.737a0b0f/source/Makefile.mk 2019-02-27 22:20:39.000000000 +0100
+++ new/Carla-2.0.0+git20190321.20cc5244/source/Makefile.mk 2019-03-21 18:32:17.000000000 +0100
@@ -115,6 +115,8 @@
# mingw has issues with this specific optimization
# See https://github.com/falkTX/Carla/issues/696
BASE_OPTS += -fno-rerun-cse-after-loop
+# See https://github.com/falkTX/Carla/issues/855
+BASE_OPTS += -mstackrealign
ifeq ($(BUILDING_FOR_WINDOWS),true)
BASE_FLAGS += -DBUILDING_CARLA_FOR_WINDOWS
endif
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Carla-1.9.14+git20190227.737a0b0f/source/backend/plugin/CarlaPluginBridge.cpp new/Carla-2.0.0+git20190321.20cc5244/source/backend/plugin/CarlaPluginBridge.cpp
--- old/Carla-1.9.14+git20190227.737a0b0f/source/backend/plugin/CarlaPluginBridge.cpp 2019-02-27 22:20:39.000000000 +0100
+++ new/Carla-2.0.0+git20190321.20cc5244/source/backend/plugin/CarlaPluginBridge.cpp 2019-03-21 18:32:17.000000000 +0100
@@ -2063,6 +2063,14 @@
}
} break;
+ case kPluginBridgeNonRtServerParameterTouch: {
+ // uint/index, bool/touch
+ const uint32_t index = fShmNonRtServerControl.readUInt();
+ const bool touch = fShmNonRtServerControl.readBool();
+
+ (void)index; (void)touch; // unused
+ } break;
+
case kPluginBridgeNonRtServerDefaultValue: {
// uint/index, float/value
const uint32_t index = fShmNonRtServerControl.readUInt();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Carla-1.9.14+git20190227.737a0b0f/source/backend/plugin/CarlaPluginInternal.cpp new/Carla-2.0.0+git20190321.20cc5244/source/backend/plugin/CarlaPluginInternal.cpp
--- old/Carla-1.9.14+git20190227.737a0b0f/source/backend/plugin/CarlaPluginInternal.cpp 2019-02-27 22:20:39.000000000 +0100
+++ new/Carla-2.0.0+git20190321.20cc5244/source/backend/plugin/CarlaPluginInternal.cpp 2019-03-21 18:32:17.000000000 +0100
@@ -520,7 +520,7 @@
void CarlaPlugin::ProtectedData::PostRtEvents::appendRT(const PluginPostRtEvent& e) noexcept
{
- CARLA_SAFE_ASSERT_RETURN(dataPendingMutex.tryLock(),);
+ CARLA_SAFE_ASSERT_INT2_RETURN(dataPendingMutex.tryLock(), e.type, e.value1,);
dataPendingRT.append(e);
dataPendingMutex.unlock();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Carla-1.9.14+git20190227.737a0b0f/source/backend/plugin/CarlaPluginJack.cpp new/Carla-2.0.0+git20190321.20cc5244/source/backend/plugin/CarlaPluginJack.cpp
--- old/Carla-1.9.14+git20190227.737a0b0f/source/backend/plugin/CarlaPluginJack.cpp 2019-02-27 22:20:39.000000000 +0100
+++ new/Carla-2.0.0+git20190321.20cc5244/source/backend/plugin/CarlaPluginJack.cpp 2019-03-21 18:32:17.000000000 +0100
@@ -1153,6 +1153,7 @@
case kPluginBridgeNonRtServerParameterRanges:
case kPluginBridgeNonRtServerParameterValue:
case kPluginBridgeNonRtServerParameterValue2:
+ case kPluginBridgeNonRtServerParameterTouch:
case kPluginBridgeNonRtServerDefaultValue:
case kPluginBridgeNonRtServerCurrentProgram:
case kPluginBridgeNonRtServerCurrentMidiProgram:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Carla-1.9.14+git20190227.737a0b0f/source/backend/plugin/CarlaPluginLV2.cpp new/Carla-2.0.0+git20190321.20cc5244/source/backend/plugin/CarlaPluginLV2.cpp
--- old/Carla-1.9.14+git20190227.737a0b0f/source/backend/plugin/CarlaPluginLV2.cpp 2019-02-27 22:20:39.000000000 +0100
+++ new/Carla-2.0.0+git20190321.20cc5244/source/backend/plugin/CarlaPluginLV2.cpp 2019-03-21 18:32:17.000000000 +0100
@@ -4205,6 +4205,11 @@
if (std::strstr(rdfUI->URI, "http://calf.sourceforge.net/plugins/gui/") != nullptr)
return pData->engine->getOptions().preferUiBridges;
+ // LSP-Plugins UIs make heavy use of URIDs, for which carla right now is very slow
+ // FIXME after some optimization, remove this
+ if (std::strstr(rdfUI->URI, "http://lsp-plug.in/ui/lv2/") != nullptr)
+ return false;
+
return true;
#else
return false;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Carla-1.9.14+git20190227.737a0b0f/source/backend/plugin/CarlaPluginVST2.cpp new/Carla-2.0.0+git20190321.20cc5244/source/backend/plugin/CarlaPluginVST2.cpp
--- old/Carla-1.9.14+git20190227.737a0b0f/source/backend/plugin/CarlaPluginVST2.cpp 2019-02-27 22:20:39.000000000 +0100
+++ new/Carla-2.0.0+git20190321.20cc5244/source/backend/plugin/CarlaPluginVST2.cpp 2019-03-21 18:32:17.000000000 +0100
@@ -1861,10 +1861,9 @@
}
// plugins should never do this:
- CARLA_SAFE_ASSERT_INT2(index >= 0 && index < static_cast<int32_t>(pData->param.count), index, pData->param.count);
-
- if (index < 0 || index >= static_cast<int32_t>(pData->param.count))
- break;
+ CARLA_SAFE_ASSERT_INT2_BREAK(index >= 0 && index < static_cast<int32_t>(pData->param.count),
+ index,
+ static_cast<int32_t>(pData->param.count));
const uint32_t uindex(static_cast<uint32_t>(index));
const float fixedValue(pData->param.getFixedValue(uindex, opt));
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Carla-1.9.14+git20190227.737a0b0f/source/bridges-plugin/CarlaBridgePlugin.cpp new/Carla-2.0.0+git20190321.20cc5244/source/bridges-plugin/CarlaBridgePlugin.cpp
--- old/Carla-1.9.14+git20190227.737a0b0f/source/bridges-plugin/CarlaBridgePlugin.cpp 2019-02-27 22:20:39.000000000 +0100
+++ new/Carla-2.0.0+git20190321.20cc5244/source/bridges-plugin/CarlaBridgePlugin.cpp 2019-03-21 18:32:17.000000000 +0100
@@ -181,7 +181,7 @@
if (File(gProjectFilename).existsAsFile())
{
if (carla_load_plugin_state(0, gProjectFilename.toRawUTF8()))
- carla_stdout("Plugin state loaded sucessfully");
+ carla_stdout("Plugin state loaded successfully");
else
carla_stderr("Plugin state load failed, error was:\n%s", carla_get_last_error());
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Carla-1.9.14+git20190227.737a0b0f/source/frontend/carla_host.py new/Carla-2.0.0+git20190321.20cc5244/source/frontend/carla_host.py
--- old/Carla-1.9.14+git20190227.737a0b0f/source/frontend/carla_host.py 2019-02-27 22:20:39.000000000 +0100
+++ new/Carla-2.0.0+git20190321.20cc5244/source/frontend/carla_host.py 2019-03-21 18:32:17.000000000 +0100
@@ -139,6 +139,7 @@
# ----------------------------------------------------------------------------------------------------
# Internal stuff
+ self.fIdleTimerNull = self.startTimer(1000) # keep application signals alive
self.fIdleTimerFast = 0
self.fIdleTimerSlow = 0
@@ -285,9 +286,6 @@
if WINDOWS:
self.ui.tabWidget.tabBar().hide()
- if host.isControl:
- self.ui.dockWidget.hide()
-
# ----------------------------------------------------------------------------------------------------
# Set up GUI (disk)
@@ -1562,7 +1560,9 @@
settings.setValue("Geometry", self.saveGeometry())
settings.setValue("ShowToolbar", self.ui.toolBar.isEnabled())
- settings.setValue("ShowSidePanel", self.ui.dockWidget.isEnabled())
+
+ if not self.host.isControl:
+ settings.setValue("ShowSidePanel", self.ui.dockWidget.isEnabled())
diskFolders = []
@@ -1596,7 +1596,7 @@
#else:
#self.ui.splitter.setSizes([210, 99999])
- showSidePanel = settings.value("ShowSidePanel", True, type=bool)
+ showSidePanel = settings.value("ShowSidePanel", True, type=bool) and not self.host.isControl
self.ui.act_settings_show_side_panel.setChecked(showSidePanel)
self.ui.dockWidget.setEnabled(showSidePanel)
self.ui.dockWidget.setVisible(showSidePanel)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Carla-1.9.14+git20190227.737a0b0f/source/frontend/carla_shared.py new/Carla-2.0.0+git20190321.20cc5244/source/frontend/carla_shared.py
--- old/Carla-1.9.14+git20190227.737a0b0f/source/frontend/carla_shared.py 2019-02-27 22:20:39.000000000 +0100
+++ new/Carla-2.0.0+git20190321.20cc5244/source/frontend/carla_shared.py 2019-03-21 18:32:17.000000000 +0100
@@ -66,7 +66,7 @@
# ------------------------------------------------------------------------------------------------------------
# Set Version
-VERSION = "1.9.14 (2.0-RC4)"
+VERSION = "2.0.0"
# ------------------------------------------------------------------------------------------------------------
# Set TMP
@@ -562,7 +562,7 @@
for arg in sys.argv[1:]:
if arg.startswith("--with-appname="):
- initName = os.path.basename(arg.replace("--with-initname=", ""))
+ initName = os.path.basename(arg.replace("--with-appname=", ""))
elif arg.startswith("--with-libprefix="):
libPrefix = arg.replace("--with-libprefix=", "")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Carla-1.9.14+git20190227.737a0b0f/source/frontend/carla_widgets.py new/Carla-2.0.0+git20190321.20cc5244/source/frontend/carla_widgets.py
--- old/Carla-1.9.14+git20190227.737a0b0f/source/frontend/carla_widgets.py 2019-02-27 22:20:39.000000000 +0100
+++ new/Carla-2.0.0+git20190321.20cc5244/source/frontend/carla_widgets.py 2019-03-21 18:32:17.000000000 +0100
@@ -76,7 +76,7 @@
self.ui.l_about.setText(self.tr(""
"<br>Version %s"
"<br>Carla is a fully-featured audio plugin host%s.<br>"
- "<br>Copyright (C) 2011-2018 falkTX<br>"
+ "<br>Copyright (C) 2011-2019 falkTX<br>"
"" % (VERSION, extraInfo)))
if self.ui.about.palette().color(QPalette.Background).blackF() < 0.5:
@@ -100,19 +100,19 @@
self.ui.le_osc_url_udp.setText(self.tr("(Engine not running)"))
self.ui.l_osc_cmds.setText("<table>"
- "<tr><td>" "/set_active" " </td><td><" "i-value" "></td><td>" "</td></tr>"
- "<tr><td>" "/set_drywet" " </td><td><" "f-value" "></td><td>" "</td></tr>"
- "<tr><td>" "/set_volume" " </td><td><" "f-value" "></td><td>" "</td></tr>"
- "<tr><td>" "/set_balance_left" " </td><td><" "f-value" "></td><td>" "</td></tr>"
- "<tr><td>" "/set_balance_right" " </td><td><" "f-value" "></td><td>" "</td></tr>"
- "<tr><td>" "/set_panning" " </td><td><" "f-value" "></td><td>" "</td></tr>"
- "<tr><td>" "/set_parameter_value" " </td><td><" "i-index" "></td><td><" "f-value" "></td></tr>"
- "<tr><td>" "/set_parameter_midi_cc" " </td><td><" "i-index" "></td><td><" "i-cc" "></td></tr>"
- "<tr><td>" "/set_parameter_midi_channel" " </td><td><" "i-index" "></td><td><" "i-channel" "></td></tr>"
- "<tr><td>" "/set_program" " </td><td><" "i-index" "></td><td>" "</td></tr>"
- "<tr><td>" "/set_midi_program" " </td><td><" "i-index" "></td><td>" "</td></tr>"
- "<tr><td>" "/note_on" " </td><td><" "i-note" "></td><td><" "i-velo" "></td></tr>"
- "<tr><td>" "/note_off" " </td><td><" "i-note" "></td><td>" "</td></tr>"
+ "<tr><td>" "/set_active" " </td><td><i-value></td></tr>"
+ "<tr><td>" "/set_drywet" " </td><td><f-value></td></tr>"
+ "<tr><td>" "/set_volume" " </td><td><f-value></td></tr>"
+ "<tr><td>" "/set_balance_left" " </td><td><f-value></td></tr>"
+ "<tr><td>" "/set_balance_right" " </td><td><f-value></td></tr>"
+ "<tr><td>" "/set_panning" " </td><td><f-value></td></tr>"
+ "<tr><td>" "/set_parameter_value" " </td><td><i-index> <f-value></td></tr>"
+ "<tr><td>" "/set_parameter_midi_cc" " </td><td><i-index> <i-cc></td></tr>"
+ "<tr><td>" "/set_parameter_midi_channel" " </td><td><i-index> <i-channel></td></tr>"
+ "<tr><td>" "/set_program" " </td><td><i-index></td></tr>"
+ "<tr><td>" "/set_midi_program" " </td><td><i-index></td></tr>"
+ "<tr><td>" "/note_on" " </td><td><i-channel> <i-note> <i-velo></td></tr>"
+ "<tr><td>" "/note_off" " </td><td><i-channel> <i-note</td></tr>"
"</table>"
)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Carla-1.9.14+git20190227.737a0b0f/source/includes/CarlaDefines.h new/Carla-2.0.0+git20190321.20cc5244/source/includes/CarlaDefines.h
--- old/Carla-1.9.14+git20190227.737a0b0f/source/includes/CarlaDefines.h 2019-02-27 22:20:39.000000000 +0100
+++ new/Carla-2.0.0+git20190321.20cc5244/source/includes/CarlaDefines.h 2019-03-21 18:32:17.000000000 +0100
@@ -32,8 +32,8 @@
#endif
/* Set Version */
-#define CARLA_VERSION_HEX 0x010914
-#define CARLA_VERSION_STRING "1.9.14 (2.0-RC4)"
+#define CARLA_VERSION_HEX 0x020000
+#define CARLA_VERSION_STRING "2.0.0"
/* Check OS */
#if defined(WIN64) || defined(_WIN64) || defined(__WIN64__)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Carla-1.9.14+git20190227.737a0b0f/source/interposer/interposer-jack-x11.cpp new/Carla-2.0.0+git20190321.20cc5244/source/interposer/interposer-jack-x11.cpp
--- old/Carla-1.9.14+git20190227.737a0b0f/source/interposer/interposer-jack-x11.cpp 2019-02-27 22:20:39.000000000 +0100
+++ new/Carla-2.0.0+git20190321.20cc5244/source/interposer/interposer-jack-x11.cpp 2019-03-21 18:32:17.000000000 +0100
@@ -342,7 +342,7 @@
gInterposedCallback(1, nullptr);
event->type = 0;
- carla_stdout("XNextEvent close event catched, hiding UI instead");
+ carla_stdout("XNextEvent close event caught, hiding UI instead");
return real_XUnmapWindow(display, gCurrentlyMappedWindow);
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Carla-1.9.14+git20190227.737a0b0f/source/jackbridge/JackBridge1.cpp new/Carla-2.0.0+git20190321.20cc5244/source/jackbridge/JackBridge1.cpp
--- old/Carla-1.9.14+git20190227.737a0b0f/source/jackbridge/JackBridge1.cpp 2019-02-27 22:20:39.000000000 +0100
+++ new/Carla-2.0.0+git20190321.20cc5244/source/jackbridge/JackBridge1.cpp 2019-03-21 18:32:17.000000000 +0100
@@ -29,6 +29,7 @@
# define JACKSYM_API
#endif
+#include <cerrno>
#include "CarlaLibUtils.hpp"
// -----------------------------------------------------------------------------
@@ -406,7 +407,7 @@
}
else
{
- fprintf(stdout, "%s loaded sucessfully!\n", filename);
+ fprintf(stdout, "%s loaded successfully!\n", filename);
}
#define JOIN(a, b) a ## b
@@ -1537,7 +1538,10 @@
return (jack_connect(client, source_port, destination_port) == 0);
#else
if (getBridgeInstance().connect_ptr != nullptr)
- return (getBridgeInstance().connect_ptr(client, source_port, destination_port) == 0);
+ {
+ const int ret = getBridgeInstance().connect_ptr(client, source_port, destination_port);
+ return ret == 0 || ret == EEXIST;
+ }
#endif
return false;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Carla-1.9.14+git20190227.737a0b0f/source/modules/rtaudio.diff new/Carla-2.0.0+git20190321.20cc5244/source/modules/rtaudio.diff
--- old/Carla-1.9.14+git20190227.737a0b0f/source/modules/rtaudio.diff 2019-02-27 22:20:39.000000000 +0100
+++ new/Carla-2.0.0+git20190321.20cc5244/source/modules/rtaudio.diff 2019-03-21 18:32:17.000000000 +0100
@@ -1,5 +1,5 @@
diff --git a/RtAudio.cpp b/RtAudio.cpp
-index 2ac2179..27a0c83 100644
+index 2ac2179..5fce9b2 100644
--- a/RtAudio.cpp
+++ b/RtAudio.cpp
@@ -76,7 +76,7 @@ const unsigned int RtApi::SAMPLE_RATES[] = {
@@ -156,7 +156,8 @@
{
- RtAudio::DeviceInfo info;
- info.probed = false;
--
++ static RtAudio::DeviceInfo devInfo[3];
+
- jack_options_t options = (jack_options_t) ( JackNoStartServer ); //JackNullOption
- jack_status_t *status = NULL;
- jack_client_t *client = jack_client_open( "RtApiJackInfo", options, status );
@@ -200,8 +201,7 @@
-
- info.preferredSampleRate = jack_get_sample_rate( client );
- info.sampleRates.push_back( info.preferredSampleRate );
-+ static RtAudio::DeviceInfo devInfo[3];
-
+-
- // Count the available ports containing the client name as device
- // channels. Jack "input ports" equal RtAudio output channels.
- unsigned int nChannels = 0;
@@ -706,7 +706,18 @@
if ( nBuffers < 2 ) nBuffers = 3;
// Check the lower range of the user-specified buffer size and set
-@@ -8012,12 +7898,14 @@ static void *alsaCallbackHandler( void *ptr )
+@@ -6795,7 +6681,9 @@ unsigned int RtApiAlsa :: getDeviceCount( void )
+ nDevices++;
+ }
+ nextcard:
+- snd_ctl_close( handle );
++ if (result == 0) {
++ snd_ctl_close( handle );
++ }
+ snd_card_next( &card );
+ }
+
+@@ -8012,12 +7900,14 @@ static void *alsaCallbackHandler( void *ptr )
}
pthread_exit( NULL );
@@ -722,7 +733,7 @@
// Code written by Peter Meerwald, pmeerw(a)pmeerw.net
// and Tristan Matthews.
-@@ -8092,6 +7980,8 @@ static void *pulseaudio_callback( void * user )
+@@ -8092,6 +7982,8 @@ static void *pulseaudio_callback( void * user )
}
pthread_exit( NULL );
@@ -731,7 +742,7 @@
}
void RtApiPulse::closeStream( void )
-@@ -8502,7 +8392,7 @@ bool RtApiPulse::probeDeviceOpen( unsigned int device, StreamMode mode,
+@@ -8502,7 +8394,7 @@ bool RtApiPulse::probeDeviceOpen( unsigned int device, StreamMode mode,
return FAILURE;
}
@@ -740,7 +751,7 @@
#endif
#if defined(__LINUX_OSS__)
-@@ -9446,6 +9336,8 @@ static void *ossCallbackHandler( void *ptr )
+@@ -9446,6 +9338,8 @@ static void *ossCallbackHandler( void *ptr )
}
pthread_exit( NULL );
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Carla-1.9.14+git20190227.737a0b0f/source/native-plugins/resources/carla-plugin new/Carla-2.0.0+git20190321.20cc5244/source/native-plugins/resources/carla-plugin
--- old/Carla-1.9.14+git20190227.737a0b0f/source/native-plugins/resources/carla-plugin 2019-02-27 22:20:39.000000000 +0100
+++ new/Carla-2.0.0+git20190321.20cc5244/source/native-plugins/resources/carla-plugin 2019-03-21 18:32:17.000000000 +0100
@@ -494,7 +494,7 @@
self.host = host
self.fWinId = winId
self.fWidget = self.getWidget()
- self.fWidget.setFixedSize(740, 512)
+ self.fWidget.setFixedSize(1024, 712)
self.fLayout = QVBoxLayout(self.fWidget)
self.fLayout.setContentsMargins(0, 0, 0, 0)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Carla-1.9.14+git20190227.737a0b0f/source/plugin/carla-vst.cpp new/Carla-2.0.0+git20190321.20cc5244/source/plugin/carla-vst.cpp
--- old/Carla-1.9.14+git20190227.737a0b0f/source/plugin/carla-vst.cpp 2019-02-27 22:20:39.000000000 +0100
+++ new/Carla-2.0.0+git20190321.20cc5244/source/plugin/carla-vst.cpp 2019-03-21 18:32:17.000000000 +0100
@@ -105,8 +105,8 @@
fVstRect.top = 0;
fVstRect.left = 0;
- fVstRect.bottom = 512;
- fVstRect.right = 740;
+ fVstRect.bottom = 712;
+ fVstRect.right = 1024;
init();
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Carla-1.9.14+git20190227.737a0b0f/source/utils/CarlaBridgeDefines.hpp new/Carla-2.0.0+git20190321.20cc5244/source/utils/CarlaBridgeDefines.hpp
--- old/Carla-1.9.14+git20190227.737a0b0f/source/utils/CarlaBridgeDefines.hpp 2019-02-27 22:20:39.000000000 +0100
+++ new/Carla-2.0.0+git20190321.20cc5244/source/utils/CarlaBridgeDefines.hpp 2019-03-21 18:32:17.000000000 +0100
@@ -20,7 +20,7 @@
#include "CarlaRingBuffer.hpp"
-#define CARLA_PLUGIN_BRIDGE_API_VERSION 5
+#define CARLA_PLUGIN_BRIDGE_API_VERSION 6
// -------------------------------------------------------------------------------------------------------------------
@@ -90,6 +90,7 @@
kPluginBridgeNonRtServerParameterRanges, // uint/index, float/def, float/min, float/max, float/step, float/stepSmall, float/stepLarge
kPluginBridgeNonRtServerParameterValue, // uint/index, float/value
kPluginBridgeNonRtServerParameterValue2, // uint/index, float/value (used for init/output parameters only, don't resend values)
+ kPluginBridgeNonRtServerParameterTouch, // uint/index, bool/touch
kPluginBridgeNonRtServerDefaultValue, // uint/index, float/value
kPluginBridgeNonRtServerCurrentProgram, // int/index
kPluginBridgeNonRtServerCurrentMidiProgram, // int/index
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Carla-1.9.14+git20190227.737a0b0f/source/utils/CarlaBridgeUtils.hpp new/Carla-2.0.0+git20190321.20cc5244/source/utils/CarlaBridgeUtils.hpp
--- old/Carla-1.9.14+git20190227.737a0b0f/source/utils/CarlaBridgeUtils.hpp 2019-02-27 22:20:39.000000000 +0100
+++ new/Carla-2.0.0+git20190321.20cc5244/source/utils/CarlaBridgeUtils.hpp 2019-03-21 18:32:17.000000000 +0100
@@ -163,6 +163,8 @@
return "kPluginBridgeNonRtServerParameterValue";
case kPluginBridgeNonRtServerParameterValue2:
return "kPluginBridgeNonRtServerParameterValue2";
+ case kPluginBridgeNonRtServerParameterTouch:
+ return "kPluginBridgeNonRtServerParameterTouch";
case kPluginBridgeNonRtServerDefaultValue:
return "kPluginBridgeNonRtServerDefaultValue";
case kPluginBridgeNonRtServerCurrentProgram:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Carla-1.9.14+git20190227.737a0b0f/source/utils/CarlaLv2Utils.hpp new/Carla-2.0.0+git20190321.20cc5244/source/utils/CarlaLv2Utils.hpp
--- old/Carla-1.9.14+git20190227.737a0b0f/source/utils/CarlaLv2Utils.hpp 2019-02-27 22:20:39.000000000 +0100
+++ new/Carla-2.0.0+git20190321.20cc5244/source/utils/CarlaLv2Utils.hpp 2019-03-21 18:32:17.000000000 +0100
@@ -1864,7 +1864,7 @@
rdfPort->Types |= LV2_PORT_DATA_MIDI_EVENT;
}
else
- carla_stderr("lv2_rdf_new(\"%s\") - port '%s' is of unkown data type", uri, rdfPort->Name);
+ carla_stderr("lv2_rdf_new(\"%s\") - port '%s' is of unknown data type", uri, rdfPort->Name);
}
// --------------------------------------------------------------------------------------------------------
++++++ Carla.obsinfo ++++++
--- /var/tmp/diff_new_pack.ycXjE0/_old 2019-05-02 19:16:51.813367954 +0200
+++ /var/tmp/diff_new_pack.ycXjE0/_new 2019-05-02 19:16:51.813367954 +0200
@@ -1,5 +1,5 @@
name: Carla
-version: 1.9.14+git20190227.737a0b0f
-mtime: 1551302439
-commit: 737a0b0fb7dea524eced619d4bc55c7d41e73964
+version: 2.0.0+git20190321.20cc5244
+mtime: 1553189537
+commit: 20cc5244d08de13668a36749b7b165507b4805bf
++++++ _service ++++++
--- /var/tmp/diff_new_pack.ycXjE0/_old 2019-05-02 19:16:51.829367984 +0200
+++ /var/tmp/diff_new_pack.ycXjE0/_new 2019-05-02 19:16:51.829367984 +0200
@@ -5,8 +5,8 @@
<param name="submodules">enable</param>
<param name="exclude">.git</param>
<param name="filename">Carla</param>
- <param name="versionformat">1.9.14+git%cd.%h</param>
- <param name="revision">737a0b0f</param>
+ <param name="versionformat">2.0.0+git%cd.%h</param>
+ <param name="revision">20cc5244</param>
<param name="changesgenerate">disable</param>
</service>
<service name="tar" mode="disabled">
[View Less]
1
0
Hello community,
here is the log from the commit of package erlang for openSUSE:Factory checked in at 2019-05-02 19:16:43
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/erlang (Old)
and /work/SRC/openSUSE:Factory/.erlang.new.5148 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "erlang"
Thu May 2 19:16:43 2019 rev:81 rq:699555 version:21.3.7
Changes:
--------
--- /work/SRC/openSUSE:…
[View More]Factory/erlang/erlang.changes 2019-04-26 22:54:52.693298584 +0200
+++ /work/SRC/openSUSE:Factory/.erlang.new.5148/erlang.changes 2019-05-02 19:16:46.261357756 +0200
@@ -1,0 +2,14 @@
+Mon Apr 29 09:48:44 UTC 2019 - Gabriele Santomaggio <g.santomaggio(a)gmail.com>
+
+- Update to 21.3.7:
+- Changes for 21.3.7:
+ * http://erlang.org/download/OTP-21.3.7.README
+ * ssh: When an SSH server receives the very first message on a
+ new TCP connection, and that message is not the
+ expected one, the 64 first bytes of the received
+ message are now dumped in the INFO REPORT that reports
+ the Protocol Error.
+ This facilitates the debugging of who sends the bad
+ message or of detecting a possible port scanning
+
+-------------------------------------------------------------------
Old:
----
OTP-21.3.6.tar.gz
New:
----
OTP-21.3.7.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ erlang.spec ++++++
--- /var/tmp/diff_new_pack.BuTeZd/_old 2019-05-02 19:16:47.381359813 +0200
+++ /var/tmp/diff_new_pack.BuTeZd/_new 2019-05-02 19:16:47.385359821 +0200
@@ -26,7 +26,7 @@
%endif
Name: erlang
-Version: 21.3.6
+Version: 21.3.7
Release: 0
# not set up to be built with position independend executable support
#!BuildIgnore: gcc-PIE
++++++ OTP-21.3.6.tar.gz -> OTP-21.3.7.tar.gz ++++++
/work/SRC/openSUSE:Factory/erlang/OTP-21.3.6.tar.gz /work/SRC/openSUSE:Factory/.erlang.new.5148/OTP-21.3.7.tar.gz differ: char 14, line 1
[View Less]
1
0
Hello community,
here is the log from the commit of package singularity for openSUSE:Factory checked in at 2019-05-02 19:16:41
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/singularity (Old)
and /work/SRC/openSUSE:Factory/.singularity.new.5148 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "singularity"
Thu May 2 19:16:41 2019 rev:9 rq:699554 version:2.6.1
Changes:
--------
--- /…
[View More]work/SRC/openSUSE:Factory/singularity/singularity.changes 2019-02-19 12:02:40.305067650 +0100
+++ /work/SRC/openSUSE:Factory/.singularity.new.5148/singularity.changes 2019-05-02 19:16:42.857351503 +0200
@@ -1,0 +2,27 @@
+Sun Apr 28 06:32:08 UTC 2019 - Egbert Eich <eich(a)suse.com>
+
+- Improve support for openSUSE/SLE Singularity image creation:
+ * Add-support-for-SLE.patch
+ Add support for SLE.
+ * Create-chroot-only-after-settings-have-been-verified.patch
+ Create chroot only after settings have been verified.
+ * Don-t-hard-code-OS-version-if-non-is-specified.patch
+ Don't hard code OS version if non is specified.
+ * Handle-zypper-error-code-correctly.patch
+ Do not consider installation scriptlet failures an installation
+ failure.
+ * Support-multi-line-bootdef-settings.patch
+ If lines are separated by a '\' in a bootdef setting definition
+ concatenate them. If the characters before the trailing '\' are
+ '\n', replace by a newline.
+ * When-writing-a-file-to-the-container-unlink-if-it-exists-as-link-or-directory.patch
+ If a link or a directory exists with the same name as a file to
+ be written to the container, remove it before writing the the file.
+ Removing a link avoids issues if the link target cannot be written
+ to.
+ * Update README.SUSE: Describe bootdef variables.
+- Fix rpmlint warning:
+ * api.py-Remove-shbang-not-meant-for-direct-execution.patch
+ Remove shbang - not meant for direct execution.
+
+-------------------------------------------------------------------
New:
----
Add-support-for-SLE.patch
Create-chroot-only-after-settings-have-been-verified.patch
Don-t-hard-code-OS-version-if-non-is-specified.patch
Handle-zypper-error-code-correctly.patch
Support-multi-line-bootdef-settings.patch
When-writing-a-file-to-the-container-unlink-if-it-exists-as-link-or-directory.patch
api.py-Remove-shbang-not-meant-for-direct-execution.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ singularity.spec ++++++
--- /var/tmp/diff_new_pack.DZMAQU/_old 2019-05-02 19:16:43.749353142 +0200
+++ /var/tmp/diff_new_pack.DZMAQU/_new 2019-05-02 19:16:43.749353142 +0200
@@ -42,6 +42,14 @@
Source1: README.SUSE
Source5: singularity-rpmlintrc
Patch1: zypper-install-Fix-dbpath-for-newer-versions-of-SUSE-Linux.patch
+Patch2: Handle-zypper-error-code-correctly.patch
+Patch3: When-writing-a-file-to-the-container-unlink-if-it-exists-as-link-or-directory.patch
+Patch4: Support-multi-line-bootdef-settings.patch
+Patch5: api.py-Remove-shbang-not-meant-for-direct-execution.patch
+Patch6: Add-support-for-SLE.patch
+Patch7: Don-t-hard-code-OS-version-if-non-is-specified.patch
+Patch8: Create-chroot-only-after-settings-have-been-verified.patch
+
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: libtool
@@ -87,6 +95,13 @@
%prep
%setup -q -n %{name}-%{github_ref}
%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
+%patch7 -p1
+%patch8 -p1
cp %{S:1} .
%build
++++++ Add-support-for-SLE.patch ++++++
From: Egbert Eich <eich(a)suse.com>
Date: Sun Apr 28 07:36:08 2019 +0200
Subject: Add support for SLE
Patch-mainline: Not yet
Git-commit: da37d2c1863e019a0d187f0c25620bc91649aac1
References:
SLE uses SUSEConnect to register a product and find its repositories.
SLE-15 requires the installer to be present as well as a list of modules.
Signed-off-by: Egbert Eich <eich(a)suse.com>
---
singularity-2.6.0/bootstrap-scripts/deffile-driver-zypper.sh | 116 ++++++++++++++++++---
1 file changed, 103 insertions(+), 13 deletions(-)
diff --git a/singularity-2.6.0/libexec/bootstrap-scripts/deffile-driver-zypper.sh b/singularity-2.6.0/libexec/bootstrap-scripts/deffile-driver-zypper.sh
index 3052a52..d744d9e 100644
--- a/libexec/bootstrap-scripts/deffile-driver-zypper.sh
+++ b/libexec/bootstrap-scripts/deffile-driver-zypper.sh
@@ -37,6 +37,7 @@ if [ -z "${SINGULARITY_ROOTFS:-}" ]; then
exit 1
fi
+BASE_PACKAGE_LIST=aaa_base
########## BEGIN BOOTSTRAP SCRIPT ##########
@@ -88,17 +89,68 @@ if [ -z "${OSVERSION:-}" ]; then
fi
fi
-MIRROR=`echo "${MIRRORURL:-}" | sed -r "s/%\{?OSVERSION\}?/$OSVERSION/gi"`
-MIRROR_META=`echo "${METALINK:-}" | sed -r "s/%\{?OSVERSION\}?/$OSVERSION/gi"`
-if [ -z "${MIRROR:-}" ] && [ -z "${MIRROR_META:-}" ]; then
- message ERROR "No 'MirrorURL' or 'MetaLink' defined in bootstrap definition\n"
- ABORT 1
- fi
+if [ -n "${SLEPRODUCT:-}" -o -n "${SLEUSER:-}" -o -n "${SLEREGCODE:-}" ]; then
+ if [ -z "${SLEPRODUCT:-}" -o -z "${SLEUSER:-}" -o -z "${SLEREGCODE:-}" ]; then
+ message ERROR "For installation of SLE 'SLEProduct', 'SLEUser' and 'SLERegcode' need to be set\n"
+ ABORT 1
+ fi
+
+ if [ -n "${MIRRORURL:-}" -o -n "${UPDATEURL:-}" ]; then
+ message ERROR "'MirrorURL' or 'UpdateURL' may not be defined together with 'SLEProduct', 'SLEUser' and 'SLERegcode'\n"
+ ABORT 1
+ fi
-MIRROR_UPDATES=`echo "${UPDATEURL:-}" | sed -r "s/%\{?OSVERSION\}?/$OSVERSION/gi"`
-MIRROR_UPDATES_META=`echo "${UPDATEMETALINK:-}" | sed -r "s/%\{?OSVERSION\}?/$OSVERSION/gi"`
-if [ -n "${MIRROR_UPDATES:-}" ] || [ -n "${MIRROR_UPDATES_META:-}" ]; then
- message 1 "'UpdateURL' or 'UpdateMetaLink' defined in bootstrap definition\n"
+ SUSECONNECT_CMD=`singularity_which SUSEConnect`
+ if [ -z ${SUSECONNECT_CMD:-} ]; then
+ message ERROR "To install a SLE Product 'SUSEConnect' has to be installed\n"
+ ABORT 1
+ fi
+ if [ -n "${SLEGPG:-}" ]; then
+ SUSECONNECT_GPGKEY=$(mktemp "/tmp/gkgkey-XXXXX")
+ echo "$SLEGPG" > $SUSECONNECT_GPGKEY
+ else
+ message ERROR "No 'SLEgpg' defined in bootstrap definition\n"
+ ABORT 1
+ fi
+ OSMAJOR=${OSVERSION%%.*}
+ tmp=${OSVERSION#*.}
+ if [ $tmp -gt 0 ]; then
+ OSSERVICEPACK=-SP${tmp}
+ OSMINOR=".%{tmp}"
+ else
+ OSSERVICEPACK=
+ OSMINOR=
+ fi
+ if [[ ${SLEPRODUCT} =~ .+/.+/.+ ]]; then
+ SUSECONNECT_PRODUCT=${SLEPRODUCT}
+ SUSECONNECT_MODVER=${SLEPRODUCT#*/}
+ elif [[ ${SLEPRODUCT} =~ .+/.+ ]]; then
+ SUSECONNECT_PRODUCT=${SUSECONNECT_PRODUCT}/$(uname -m)
+ SUSECONNECT_MODVER=${SLEPRODUCT#*/}/$(uname -m)
+ else
+ SUSECONNECT_PRODUCT=${SLEPRODUCT}/$OSVERSION/$(uname -m)
+ SUSECONNECT_MODVER=$OSVERSION/$(uname -m)
+ fi
+ SUSECONNECT_PRODUCT=`echo "${SLEPRODUCT}" | sed -r "s/%\{?OSVERSION\}?/$OSVERSION/gi"`
+ SUSECONNECT_MODVER=`echo "${SUSECONNECT_MODVER}" | sed -r "s/%\{?OSVERSION\}?/${OSMAJOR}${OSMINOR}/gi"`
+
+ INSTALLER=`echo "${SLEINSTALLERURL:-}" | sed -r "s/%\{?OSVERSION\}?/${OSMAJOR}${OSSERVICEPACK}/gi"`
+ if [ ${OSMAJOR} -gt 12 -a -z "${INSTALLER:-}" ] ; then
+ message ERROR "No 'SLEInstallerURL' defined in bootstrap definition\n"
+ ABORT 1
+ fi
+ BASE_PACKAGE_LIST="$BASE_PACKAGE_LIST SUSEConnect"
+else
+ MIRROR=`echo "${MIRRORURL:-}" | sed -r "s/%\{?OSVERSION\}?/$OSVERSION/gi"`
+ if [ -z "${MIRROR:-}" ] ; then
+ message ERROR "No 'MirrorURL' defined in bootstrap definition\n"
+ ABORT 1
+ fi
+
+ MIRROR_UPDATES=`echo "${UPDATEURL:-}" | sed -r "s/%\{?OSVERSION\}?/$OSVERSION/gi"`
+ if [ -n "${MIRROR_UPDATES:-}" ] ; then
+ message 1 "'UpdateURL' defined in bootstrap definition\n"
+ fi
fi
ZYPP_CONF="/etc/zypp/zypp.conf"
@@ -115,12 +167,50 @@ echo "[main]" >> "$SINGULARITY_ROOTFS/$ZYPP_CONF"
echo 'cachedir=/var/cache/zypp-bootstrap' >> "$SINGULARITY_ROOTFS/$ZYPP_CONF"
echo "" >> "$SINGULARITY_ROOTFS/$ZYPP_CONF"
-# Import zypper repos
-$INSTALL_CMD --root $SINGULARITY_ROOTFS ar $MIRROR repo-oss
+# On SLE import zypper repos using SCC
+if [ -n "${SUSECONNECT_PRODUCT:-}" ]; then
+ case ${OSMAJOR} in
+ 12) mkdir -p $SINGULARITY_ROOTFS/var/lib/rpm
+ mkdir -p $SINGULARITY_ROOTFS/usr/lib/sysimage
+ rm -rf $SINGULARITY_ROOTFS/usr/lib/sysimage/rpm
+ ln -s ../../../var/lib/rpm $SINGULARITY_ROOTFS/usr/lib/sysimage/rpm
+ ;;
+ *) mkdir -p $SINGULARITY_ROOTFS/var/lib
+ mkdir -p $SINGULARITY_ROOTFS/usr/lib/sysimage/rpm
+ rm -rf $SINGULARITY_ROOTFS/var/lib/rpm
+ ln -s ../../usr/lib/sysimage/rpm $SINGULARITY_ROOTFS/var/lib/rpm
+ ;;
+ esac
+ rpmkeys --root=$SINGULARITY_ROOTFS --import $SUSECONNECT_GPGKEY
+ rm -f $SUSECONNECT_GPGKEY
+ [ -n "$INSTALLER" ] && $INSTALL_CMD --root $SINGULARITY_ROOTFS ar $INSTALLER Minimal_$OSVERSION
+ if ! eval "$SUSECONNECT_CMD --product $SUSECONNECT_PRODUCT \
+ --root $SINGULARITY_ROOTFS \
+ --email $SLEUSER \
+ --regcode $SLEREGCODE \
+ ${SLEURL:+--url $SLEURL}"; then
+ message ERROR "The 'SUSEConnect' command has failed. No repos available\n"
+ ABORT 1
+ fi
+ OFS=$IFS
+ IFS=,
+ for i in $SLEMODULES; do
+ if ! eval "$SUSECONNECT_CMD -p $i/$SUSECONNECT_MODVER" --root $SINGULARITY_ROOTFS; then
+ message ERROR "Failed to register $i\n"
+ ABORT 1
+ fi
+ done
+ IFS=$OFS
+else
+ $INSTALL_CMD --root $SINGULARITY_ROOTFS ar $MIRROR repo-oss
+ if [ -n "${MIRROR_UPDATES:-}" ]; then
+ $INSTALL_CMD --root $SINGULARITY_ROOTFS ar $MIRROR_UPDATES repo-oss-update
+ fi
+fi
$INSTALL_CMD --root $SINGULARITY_ROOTFS --gpg-auto-import-keys refresh
# Do the install!
-eval "$INSTALL_CMD -c $SINGULARITY_ROOTFS/$ZYPP_CONF --root $SINGULARITY_ROOTFS --releasever=${OSVERSION} -n install --auto-agree-with-licenses aaa_base ${INCLUDE:-}"
+eval "$INSTALL_CMD -c $SINGULARITY_ROOTFS/$ZYPP_CONF --root $SINGULARITY_ROOTFS --releasever=${OSVERSION} -n install --auto-agree-with-licenses ${BASE_PACKAGE_LIST} ${INCLUDE:-}"
ret=$?
case $ret in
0) message 1 "Bootstrap succeeded\n" ;;
++++++ Create-chroot-only-after-settings-have-been-verified.patch ++++++
From: Egbert Eich <eich(a)suse.com>
Date: Sun Apr 28 07:38:30 2019 +0200
Subject: Create chroot only after settings have been verified
Patch-mainline: Not yet
Git-commit: 8615d2ccc92dc756cf9749759b6e746273435991
References:
Signed-off-by: Egbert Eich <eich(a)suse.com>
---
.../bootstrap-scripts/deffile-driver-zypper.sh | 23 ++++++++++------------
1 file changed, 10 insertions(+), 13 deletions(-)
diff --git a/libexec/bootstrap-scripts/deffile-driver-zypper.sh b/libexec/bootstrap-scripts/deffile-driver-zypper.sh
index 8a6d605..5fde90d 100644
--- a/libexec/bootstrap-scripts/deffile-driver-zypper.sh
+++ b/libexec/bootstrap-scripts/deffile-driver-zypper.sh
@@ -17,7 +17,6 @@
# file found in the top-level directory of this distribution and at
# https://github.com/singularityware/singularity/blob/master/LICENSE-LBNL.md.
-
## Basic sanity
if [ -z "$SINGULARITY_libexecdir" ]; then
echo "Could not identify the Singularity libexecdir."
@@ -41,16 +40,6 @@ BASE_PACKAGE_LIST=aaa_base
########## BEGIN BOOTSTRAP SCRIPT ##########
-umask 0002
-
-install -d -m 0755 "$SINGULARITY_ROOTFS/dev"
-
-cp -a /dev/null "$SINGULARITY_ROOTFS/dev/null" 2>/dev/null || > "$SINGULARITY_ROOTFS/dev/null"
-cp -a /dev/zero "$SINGULARITY_ROOTFS/dev/zero" 2>/dev/null || > "$SINGULARITY_ROOTFS/dev/zero"
-cp -a /dev/random "$SINGULARITY_ROOTFS/dev/random" 2>/dev/null || > "$SINGULARITY_ROOTFS/dev/random"
-cp -a /dev/urandom "$SINGULARITY_ROOTFS/dev/urandom" 2>/dev/null || > "$SINGULARITY_ROOTFS/dev/urandom"
-
-
# dnf should probably be preferred if it's present, at some point we will make
# a dnf specific bootstrap module.
if INSTALL_CMD=`singularity_which zypper`; then
@@ -153,13 +142,21 @@ else
message 1 "'UpdateURL' defined in bootstrap definition\n"
fi
fi
+umask 0002
+
+mkdir -p "$SINGULARITY_ROOTFS"
+
+install -d -m 0755 "$SINGULARITY_ROOTFS/dev"
+
+cp -a /dev/null "$SINGULARITY_ROOTFS/dev/null" 2>/dev/null || > "$SINGULARITY_ROOTFS/dev/null"
+cp -a /dev/zero "$SINGULARITY_ROOTFS/dev/zero" 2>/dev/null || > "$SINGULARITY_ROOTFS/dev/zero"
+cp -a /dev/random "$SINGULARITY_ROOTFS/dev/random" 2>/dev/null || > "$SINGULARITY_ROOTFS/dev/random"
+cp -a /dev/urandom "$SINGULARITY_ROOTFS/dev/urandom" 2>/dev/null || > "$SINGULARITY_ROOTFS/dev/urandom"
ZYPP_CONF="/etc/zypp/zypp.conf"
export ZYPP_CONF
# Create the main portion of zypper config
-mkdir -p "$SINGULARITY_ROOTFS"
-
ZYPP_CONF_DIRNAME=`dirname $ZYPP_CONF`
mkdir -m 0755 -p "$SINGULARITY_ROOTFS/$ZYPP_CONF_DIRNAME"
++++++ Don-t-hard-code-OS-version-if-non-is-specified.patch ++++++
From: Egbert Eich <eich(a)suse.com>
Date: Sun Apr 28 07:37:38 2019 +0200
Subject: Don't hard code OS version if non is specified
Patch-mainline: Not yet
Git-commit: 922e74384dd3b48ab424d0e00d4f4658956247a5
References:
Signed-off-by: Egbert Eich <eich(a)suse.com>
---
singularity-2.6.0/libexec/bootstrap-scripts/deffile-driver-zypper.sh | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/singularity-2.6.0/libexec/bootstrap-scripts/deffile-driver-zypper.sh b/singularity-2.6.0/libexec/bootstrap-scripts/deffile-driver-zypper.sh
index d744d9e..8a6d605 100644
--- a/libexec/bootstrap-scripts/deffile-driver-zypper.sh
+++ b/libexec/bootstrap-scripts/deffile-driver-zypper.sh
@@ -85,7 +85,8 @@ if [ -z "${OSVERSION:-}" ]; then
if [ -f "/etc/os-release" ]; then
OSVERSION=`rpm -qf --qf '%{VERSION}' /etc/os-release`
else
- OSVERSION=12.2
+ message ERROR "No OsVersion specified - bailing out\n"
+ ABORT 1
fi
fi
++++++ Handle-zypper-error-code-correctly.patch ++++++
From: Egbert Eich <eich(a)suse.com>
Date: Wed Nov 21 21:02:12 2018 +0100
Subject: Handle zypper error code correctly
Patch-mainline: Not yet
Git-commit: d416e74f7b9184e24ed36366f87fc7ccf555fd46
References:
Do not consider installation scriptlet failures an installation
failure.
Signed-off-by: Egbert Eich <eich(a)suse.com>
---
.../libexec/bootstrap-scripts/deffile-driver-zypper.sh | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/singularity-2.6.0/libexec/bootstrap-scripts/deffile-driver-zypper.sh b/singularity-2.6.0/libexec/bootstrap-scripts/deffile-driver-zypper.sh
index 1f8252d..3052a52 100644
--- a/libexec/bootstrap-scripts/deffile-driver-zypper.sh
+++ b/libexec/bootstrap-scripts/deffile-driver-zypper.sh
@@ -120,10 +120,14 @@ $INSTALL_CMD --root $SINGULARITY_ROOTFS ar $MIRROR repo-oss
$INSTALL_CMD --root $SINGULARITY_ROOTFS --gpg-auto-import-keys refresh
# Do the install!
-if ! eval "$INSTALL_CMD -c $SINGULARITY_ROOTFS/$ZYPP_CONF --root $SINGULARITY_ROOTFS --releasever=${OSVERSION} -n install --auto-agree-with-licenses aaa_base ${INCLUDE:-}"; then
- message ERROR "Bootstrap failed... exiting\n"
- ABORT 255
-fi
+eval "$INSTALL_CMD -c $SINGULARITY_ROOTFS/$ZYPP_CONF --root $SINGULARITY_ROOTFS --releasever=${OSVERSION} -n install --auto-agree-with-licenses aaa_base ${INCLUDE:-}"
+ret=$?
+case $ret in
+ 0) message 1 "Bootstrap succeeded\n" ;;
+ 107) message 1 "Bootstrap succeeded, some RPM scripts failed\n" ;;
+ *) message ERROR "Bootstrap failed... return code: $ret - exiting\n";
+ ABORT 255 ;;
+esac
if ! eval "rm -rf $SINGULARITY_ROOTFS/var/cache/zypp-bootstrap"; then
message WARNING "Failed cleaning Bootstrap packages\n"
++++++ README.SUSE ++++++
--- /var/tmp/diff_new_pack.DZMAQU/_old 2019-05-02 19:16:43.805353245 +0200
+++ /var/tmp/diff_new_pack.DZMAQU/_new 2019-05-02 19:16:43.805353245 +0200
@@ -1,4 +1,4 @@
-openSUSE/SUSE specific settings
+openSUSE/SUSE specific Settings
===============================
Different from the upstream default, the SUID root binaries
@@ -7,3 +7,76 @@
To add a user to the group singularity, execute (as root):
# usermod -a -G singularity <user_login>
+
+Create Singularity Images from openSUSE/SLE
+===========================================
+
+To create openSUSE/SLE singularity images from scratch a number
+of bootdef variables need to be specified:
+
+1. Create a bootdef file 'Singularity', add
+ BootStrap: zypper
+2. Set the OS version:
+ OSVersion: 15.0
+ The version number corresponds to the Leap version or the
+ SLE version and service pack level: <version>.<service_pack_level>
+ Example: SLE-12 SP4 would be 12.4.
+ The inital release of a major version corresponds to
+ <service_pack_level> 0.
+3. For openSUSE the following additional variables need to be
+ specified:
+ * MirrorURL: URL to the installation repository.
+ Check 'man 8 zypper' fir supported formats
+ * UpdateURL: (optional) URI of the update repository
+4. For SLE, all required settings are obtained from SCC.
+ The following variables are recognized:
+ * SLEProduct: The product code: The following forms may be
+ used:
+ <product_id>
+ <product_id>/<os_version>
+ <product_id>/<os_version>/<arch>
+ <product_id>: SLES, SLE-HPC (SLE-12),
+ SLE_HPC (SLE-15), SLED
+ <os_version>: optional, if ommitted, the value
+ of OSVersion will be used.
+ The variable %{OSVERSION} is
+ recognized and replaced by OSVersion.
+ <arch> : The architecture to use. Defaults
+ to 'uname -m'.
+ * SLEUser: The email a subscription is registed with SCC.
+ * SLERegcode: The SCC registration code provided with the subscription.
+ * SLEgpg: The GPG key used to sign the repositories. Each line must
+ be terminated with \n. Long lines may be broken using the
+ continuation character '\'. See below.
+ Beginning with version 15, the URI to the installer image needs to be
+ provided as well:
+ * SLEInstallerURL: See MirrorURL above.
+ Since SLE-15 consists of modules, a list of modules to be used should
+ to be specified as well:
+ * SLEModules: Specify the modules in a comma separated list without
+ spaces. Example:
+ SLEModules: sle-module-basesystem,sle-module-server-applications,sle-module-web-scripting,sle-module-hpc
+
+SLEgpg
+======
+SLEgpg: -----BEGIN PGP PUBLIC KEY BLOCK-----\n\
+Version: rpm-4.11.2 (NSS-3)\n\
+\n\
+mQENBFEKlmsBCADbpZZbbSC5Zi+HxCR/ynYsVxU5JNNiSSZabN5GMgc9Z0hxeXxp\n\
+YWvFoE/4n0+IXIsp83iKvxf06Eu8je/DXp0lMqDZu7WiT3XXAlkOPSNV4akHTDoY\n\
+91SJaZCpgUJ7K1QXOPABNbREsAMN1a7rxBowjNjBUyiTJ2YuvQRLtGdK1kExsVma\n\
+hieh/QxpoDyYd5w/aky3z23erCoEd+OPfAqEHd5tQIa6LOosa63BSCEl3milJ7J9\n\
+vDmoGPAoS6ui7S2R5X4/+PLN8Mm2kOBrFjhmL93LX0mrGCMxsNsKgP6zabYKQEb8\n\
+L028SXvl7EGoA+Vw5Vd3wIGbM73PfbgNrXjfABEBAAG0KFN1U0UgUGFja2FnZSBT\n\
+aWduaW5nIEtleSA8YnVpbGRAc3VzZS5kZT6JATwEEwECACYCGwMGCwkIBwMCBBUC\n\
+CAMEFgIDAQIeAQIXgAUCWEfrHwUJDsIitAAKCRBwr56BOdt8gpqUB/wPSSS5BcDu\n\
+Oi4n02cj4Hdt7WITKBjjo0lG1fXG1ppx1wOST+s8FertMVFY53TW6FGjcYtwVOIq\n\
+rsMYiV6kf1NxUV/jcAy7VmC5EZnO0R/D3sT4Oh5hsLtERauZolK5BZmd0S51Qa8e\n\
+TxZ5mX9PL2i3s/ShETc30drf83ugc7B4yZPNQWXNDPgGcC+hEeC5qw48RzHYIpUt\n\
+RzHmefR5Z3ioTUbDlzy+SGP2uA7mhR4Lfk/df5fYxWfCoKlyGjtrvA65cB+Pksyn\n\
+xrAeBuB+vBM+KnDrxW2Sn4AbWkzH//dfz9OJDJu4UM91hb7qxM0OkrXHQV3iNqzg\n\
+MDEhky/9NqMy\n\
+=GdP5\n\
+-----END PGP PUBLIC KEY BLOCK-----
+
+
++++++ Support-multi-line-bootdef-settings.patch ++++++
From: Egbert Eich <eich(a)suse.com>
Date: Fri Nov 23 18:22:36 2018 +0100
Subject: Support multi-line bootdef settings
Patch-mainline: Not yet
Git-commit: 0891e1c634b6eeb84f2bacc6fe80339965c6be8a
References:
If lines are separated by a '\' in a bootdef setting definition
concatenate them. If the characters before the trailing '\' are
'\n', replace by a newline.
Signed-off-by: Egbert Eich <eich(a)suse.com>
Signed-off-by: Egbert Eich <eich(a)suse.de>
---
singularity-2.6.0/src/builddef.c | 38 +++++++++++++++++++++++++++++++-------
1 file changed, 31 insertions(+), 7 deletions(-)
diff --git a/singularity-2.6.0/src/builddef.c b/singularity-2.6.0/src/builddef.c
index 3bbb044..d79e606 100644
--- a/src/builddef.c
+++ b/src/builddef.c
@@ -112,17 +112,39 @@ int main(int argc, char **argv) {
if ( line[0] == '%' ) { // We hit a section, stop parsing for keyword tags
break;
} else if ( ( bootdef_key = strtok(line, ":") ) != NULL ) {
+ char *tmp, *bootdef_value = NULL;
chomp(bootdef_key);
+ bootdef_key = strdup(bootdef_key);
- char *bootdef_value;
-
- bootdef_value = strtok(NULL, "\n");
- char empty[] = "";
- if (bootdef_value == NULL) {
- bootdef_value = empty;
+ tmp = strtok(NULL, "\n");
+ if (tmp == NULL) {
+ bootdef_value = strdup("");
} else {
- chomp(bootdef_value);
+ int follow_line;
+ do {
+ int len = strlen(tmp) - 1;
+ if (len >= 0 && tmp[len] == '\\') {
+ follow_line = 1;
+ tmp[len] = '\0';
+ if (len > 1 && tmp[len - 2] == '\\' && tmp[len - 1] == 'n') {
+ tmp[len - 2] = '\n';
+ tmp[len - 1] = '\0';
+ }
+ } else {
+ follow_line = 0;
+ }
+ len = (bootdef_value != NULL) ? strlen(bootdef_value) : 0;
+ bootdef_value = (char *)realloc(bootdef_value, len + strlen(tmp) + 1);
+ if (len == 0) bootdef_value[0] = '\0';
+ strcat(bootdef_value, tmp);
+ if (follow_line == 0 ||
+ fgets(line, MAX_LINE_LEN, bootdef_fp) == NULL ||
+ (tmp = strtok(line, "\n")) == NULL ) {
+ break;
+ }
+ } while (1);
+ chomp(bootdef_value);
}
singularity_message(VERBOSE2, "Got bootstrap definition key/val '%s' = '%s'\n", bootdef_key, bootdef_value);
@@ -145,6 +167,8 @@ int main(int argc, char **argv) {
// to environment
envar_set(uppercase(bootdef_key), bootdef_value, 1);
envar_set(strjoin("SINGULARITY_DEFFILE_", uppercase(bootdef_key)), bootdef_value, 1);
+ free(bootdef_key);
+ free(bootdef_value);
}
}
++++++ When-writing-a-file-to-the-container-unlink-if-it-exists-as-link-or-directory.patch ++++++
From: Egbert Eich <eich(a)suse.com>
Date: Wed Nov 21 21:07:46 2018 +0100
Subject: When writing a file to the container unlink if it exists as link or directory
Patch-mainline: Not yet
Git-commit: 52f13615df2b3cd47b6d0c4b7a86ed08de0fbb72
References:
If a link or a directory exists with the same name as a file to
be written to the container, remove it before writing the the file.
Removing a link avoids issues if the link target cannot be written
to.
Signed-off-by: Egbert Eich <eich(a)suse.com>
---
singularity-2.6.0/src/util/file.c | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
diff --git a/singularity-2.6.0/src/util/file.c b/singularity-2.6.0/src/util/file.c
index 0d57a12..f6ab7b9 100644
--- a/src/util/file.c
+++ b/src/util/file.c
@@ -567,6 +567,7 @@ static int fileput(char *path, char *string, unsigned char privileged) {
int fd;
size_t string_len = strlen(string);
struct stat st_dir;
+ int ret = 0;
if ( current == NULL || dir == NULL ) {
singularity_message(ERROR, "Failed to allocate memory\n");
@@ -609,6 +610,22 @@ static int fileput(char *path, char *string, unsigned char privileged) {
singularity_priv_escalate();
}
+ if (is_link(bname)) {
+ ret = unlink(bname);
+ } else if (is_dir(bname)) {
+ ret = s_rmdir(bname);
+ }
+ if (ret < 0) {
+ singularity_message(ERROR, "Could remove %s %s: %s\n",
+ (is_dir(bname) == 0) ? "dir" : "link", path, strerror(errno));
+ if ( privileged ) {
+ singularity_priv_drop();
+ }
+ free(dup_path);
+ free(current);
+ free(dir);
+ return(-1);
+ }
if ( ( fd = open(bname, O_CREAT|O_WRONLY|O_TRUNC|O_NOFOLLOW, 0644) ) < 0 ) { // Flawfinder: ignore
if ( privileged ) {
singularity_priv_drop();
++++++ api.py-Remove-shbang-not-meant-for-direct-execution.patch ++++++
From: Egbert Eich <eich(a)suse.com>
Date: Fri Jan 4 12:01:09 2019 +0100
Subject: api.py: Remove shbang - not meant for direct execution
Patch-mainline: Not yet
Git-commit: d399271d58197bd8f1c52a80ca39b868f8998da2
References:
Signed-off-by: Egbert Eich <eich(a)suse.com>
---
singularity-2.6.0/libexec/python/shub/api.py | 2 --
1 file changed, 2 deletions(-)
diff --git a/singularity-2.6.0/libexec/python/shub/api.py b/singularity-2.6.0/libexec/python/shub/api.py
index ce7574a..276c108 100644
--- a/libexec/python/shub/api.py
+++ b/libexec/python/shub/api.py
@@ -1,5 +1,3 @@
-#!/usr/bin/env python
-
'''
api.py: Singularity Hub helper functions for python
++++++ zypper-install-Fix-dbpath-for-newer-versions-of-SUSE-Linux.patch ++++++
--- /var/tmp/diff_new_pack.DZMAQU/_old 2019-05-02 19:16:43.857353340 +0200
+++ /var/tmp/diff_new_pack.DZMAQU/_new 2019-05-02 19:16:43.857353340 +0200
@@ -9,7 +9,7 @@
---
singularity-2.6.0/libexec/bootstrap-scripts/deffile-driver-zypper.sh | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
-diff --git a/libexec/bootstrap-scripts/deffile-driver-zypper.sh b/libexec/bootstrap-scripts/deffile-driver-zypper.sh
+diff --git a/singularity-2.6.0/libexec/bootstrap-scripts/deffile-driver-zypper.sh b/singularity-2.6.0/libexec/bootstrap-scripts/deffile-driver-zypper.sh
index 5e0470c..1f8252d 100644
--- a/libexec/bootstrap-scripts/deffile-driver-zypper.sh
+++ b/libexec/bootstrap-scripts/deffile-driver-zypper.sh
[View Less]
1
0