by Ross Burton
3.26.5:
- Add g_auto* cleanup support
- Add asynchronous version of totem_pl_parser_save()
- Fixed parsing of some remote MP3 files
---
Makefile | 2 +-
NEWS | 5 +++++
buildreq_cache | 2 +-
options.conf | 2 +-
release | 2 +-
symbols | 2 ++
testresults | 6 +++---
totem-pl-parser.spec | 27 +++++++++++++++++----------
upstream | 2 +-
versions | 2 +-
10 files changed, 33 insertions(+), 19 deletions(-)
diff --git a/options.conf b/options.conf
index 6ea927a..6fb404e 100644
--- a/options.conf
+++ b/options.conf
@@ -1,6 +1,6 @@
[package]
name = totem-pl-parser
-url = https://download.gnome.org/sources/totem-pl-parser/3.26/totem-pl-parser-3.2…
+url = https://download.gnome.org/sources/totem-pl-parser/3.26/totem-pl-parser-3.2…
archives =
giturl = https://github.com/GNOME/totem-pl-parser.git
domain =
diff --git a/testresults b/testresults
index 92c6b06..670e7f7 100644
--- a/testresults
+++ b/testresults
@@ -1,5 +1,5 @@
+Total : 2
+Pass : 1
+Fail : 1
Skip : 0
XFail : 0
diff --git a/totem-pl-parser.spec b/totem-pl-parser.spec
index 0c4964c..fc45375 100644
--- a/totem-pl-parser.spec
+++ b/totem-pl-parser.spec
@@ -97,9 +97,16 @@ export CXXFLAGS="$CXXFLAGS -O3 -ffat-lto-objects -flto=4 "
CFLAGS="$CFLAGS" CXXFLAGS="$CXXFLAGS" LDFLAGS="$LDFLAGS" meson --libdir=lib64 --prefix=/usr --buildtype=plain builddir
ninja -v -C builddir
+%check
+meson test -C builddir || :
+
%install
mkdir -p %{buildroot}/usr/share/package-licenses/totem-pl-parser
-cp %{_builddir}/totem-pl-parser-3.26.4/COPYING.LIB %{buildroot}/usr/share/package-licenses/totem-pl-parser/6dc7e8e303a34d293043bf562030c8c98c4747a6
+cp %{_builddir}/totem-pl-parser-3.26.5/COPYING.LIB %{buildroot}/usr/share/package-licenses/totem-pl-parser/6dc7e8e303a34d293043bf562030c8c98c4747a6
DESTDIR=%{buildroot} ninja -C builddir install
%find_lang totem-pl-parser
@@ -126,9 +133,9 @@ DESTDIR=%{buildroot} ninja -C builddir install
%files lib
%defattr(-,root,root,-)
/usr/lib64/libtotem-plparser-mini.so.18
-/usr/lib64/libtotem-plparser-mini.so.18.2.4
+/usr/lib64/libtotem-plparser-mini.so.18.3.4
/usr/lib64/libtotem-plparser.so.18
-/usr/lib64/libtotem-plparser.so.18.2.4
+/usr/lib64/libtotem-plparser.so.18.3.4
%files license
%defattr(0644,root,root,0755)
by Ross Burton
What's new in at-spi2-atk 2.34.2:
* Meson: don't hard-code shared_library (!19).
* Mitigate missing window events at startup.
* Set C standard to gnu99 (#10).
* Tests: include sys/time.h (#14).
---
Makefile | 2 +-
NEWS | 12 +++++++++++-
at-spi2-atk.spec | 32 +++++++++++++++++++++-----------
buildreq_cache | 2 --
options.conf | 2 +-
release | 2 +-
symbols | 4 +++-
symbols32 | 4 +++-
testresults | 4 ++--
upstream | 2 +-
versions | 2 +-
11 files changed, 45 insertions(+), 23 deletions(-)
delete mode 100644 buildreq_cache
diff --git a/at-spi2-atk.spec b/at-spi2-atk.spec
index 33e9ef3..fdf020c 100644
--- a/at-spi2-atk.spec
+++ b/at-spi2-atk.spec
@@ -106,7 +107,7 @@ export FFLAGS="$CFLAGS -O3 -Os -fdata-sections -ffat-lto-objects -ffunction-sect
export CXXFLAGS="$CXXFLAGS -O3 -Os -fdata-sections -ffat-lto-objects -ffunction-sections -flto=4 -fno-semantic-interposition "
CFLAGS="$CFLAGS" CXXFLAGS="$CXXFLAGS" LDFLAGS="$LDFLAGS" meson --libdir=lib64 --prefix=/usr --buildtype=plain builddir
ninja -v -C builddir
-pushd ../build32
+pushd ../build32/
export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
export ASFLAGS="${ASFLAGS}${ASFLAGS:+ }--32"
export CFLAGS="${CFLAGS}${CFLAGS:+ }-m32 -mstackrealign"
@@ -116,10 +117,19 @@ meson --libdir=lib32 --prefix=/usr --buildtype=plain builddir
ninja -v -C builddir
popd
+%check
+meson test -C builddir || :
+cd ../build32;
+meson test -C builddir || : || :
+
%install
mkdir -p %{buildroot}/usr/share/package-licenses/at-spi2-atk
-cp COPYING %{buildroot}/usr/share/package-licenses/at-spi2-atk/COPYING
-pushd ../build32
+cp %{_builddir}/at-spi2-atk-2.34.2/COPYING %{buildroot}/usr/share/package-licenses/at-spi2-atk/01a6b4bf79aca9b556822601186afab86e8c4fbf
+pushd ../build32/
DESTDIR=%{buildroot} ninja -C builddir install
if [ -d %{buildroot}/usr/lib32/pkgconfig ]
then
@@ -161,4 +171,4 @@ DESTDIR=%{buildroot} ninja -C builddir install
%files license
%defattr(0644,root,root,0755)
-/usr/share/package-licenses/at-spi2-atk/COPYING
+/usr/share/package-licenses/at-spi2-atk/01a6b4bf79aca9b556822601186afab86e8c4fbf
diff --git a/options.conf b/options.conf
index 9c0c544..332dd89 100644
--- a/options.conf
+++ b/options.conf
@@ -1,6 +1,6 @@
[package]
name = at-spi2-atk
-url = https://download.gnome.org/sources/at-spi2-atk/2.34/at-spi2-atk-2.34.1.tar.…
+url = https://download.gnome.org/sources/at-spi2-atk/2.34/at-spi2-atk-2.34.2.tar.…
archives =
giturl = https://github.com/GNOME/at-spi2-atk.git
domain =
diff --git a/testresults b/testresults
index 92c6b06..3dc61f3 100644
--- a/testresults
+++ b/testresults
@@ -1,5 +1,5 @@
+Total : 4
Pass : 0
+Fail : 4
Skip : 0
XFail : 0
by Ross Burton
Anders Jonsson (1):
Update Swedish translation
Andika Triwidada (2):
Update Indonesian translation
Update Indonesian translation
Anish Sheela (1):
Update Malayalam translation
Asier Sarasua Garmendia (1):
Update Basque translation
Ask Hjorth Larsen (3):
Updated Danish translation
Updated Danish translation
Updated Danish translation
Aurimas Äernius (1):
Updated Lithuanian translation
Balasankar C (1):
Update Malayalam translation
Balázs Meskó (1):
Update Hungarian translation
Bastien Nocera (2):
Fix obsolete API doc for clutter_table_layout_pack()
docs: Fix typo in ClutterLayoutManager doc
Baurzhan Muftakhidinov (1):
Update Kazakh translation
Bruce Cowan (1):
Update British English translation
Charles Monzat (2):
Update French translation
Update French translation
Chris Mayo (1):
docs: Add missing settings.ini Environment group keys
Daniel Mustieles (1):
Updated Spanish translation
Daniel ÈerbÄnescu (2):
Update Romanian translation
Update Romanian translation
Dušan Kazik (1):
Update Slovak translation
Emin Tufan Ãetin (1):
Update Turkish translation
Emmanuele Bassi (34):
Post-release version bump to 1.26.3
build: Use newer glib-genmarshal argument
Bump up the GLib requirement
Initial port to Meson
Clean up the generated enumeration type template
Update the clutter-config header template
Drop duplicate const specifier
Ignore deprecation warning for g_object_newv()
gdk: Handle all GDK device types
gdk: Remove unused variable
Rename build directory to build-aux
Move all cookbook files under the same directory
meson: Add rules for generating the documentation
Cast the g_object_ref() return value
meson: Add conformance test suite
docs: Update the links for Clutter resources
docs: Move to Markdown
build: Add the Meson files to the Autotools dist
build: Generate all pkgconfig files
Add CI infrastructure for Clutter
tests: Disable actor-shader-effect
Add po/LINGUAS
docs: Fix the entity name
build: Add missing files
build: Compile and install the cookbook examples
build: Install public headers
docs: Handle smooth scrolling in cookbook example
docs: Remove unused color definitions
build: Install autocleanups header
docs: Move contribution guide to the top-level directory
build: Fix soname when building with Meson
meson: Add more Requires to pkg-config files
Update README.md
Release Clutter 1.26.4
Fabio Tomat (5):
Update Friulian translation
Update Friulian translation
Update Friulian translation
Update Friulian translation
Update Friulian translation
Floris Van den Abeele (2):
Handle 8 and 10 bits colour depth in picking code (#11)
Fix coding style issues in MR !10
Fran Dieguez (1):
Update Galician translation
Furkan Tokaç (1):
Update Turkish translation
Jiri Grönroos (1):
Update Finnish translation
Jonas Ã
dahl (3):
tests/conform: Fix actor-offscreen-redirect
clutter/actor: Mark implicit transitions as remove-on-complete
transition: Don't split reference counting with actor
Jordi Mas (4):
Fixes to Catalan translation
Update Catalan translation
Update Catalan translation
Update Catalan translation
Justin Kim (1):
docs: Fix typo in Environment Variables (gsk->gdk)
Kristjan SCHMIDT (1):
Update Esperanto translation
Marek Cernocky (1):
Updated Czech translation
Mario Blättermann (1):
Update German translation
Matej UrbanÄiÄ (1):
Added Slovenian translation
Milo Casagrande (1):
Update Italian translation
Muhammet Kara (3):
Update Turkish translation
Update Turkish translation
Update Turkish translation
Nathan Follens (3):
Update Dutch translation
Update Dutch translation
Update Dutch translation
Pawan Chitrakar (2):
Add Nepali translation
Update Nepali translation
Piotr DrÄ
g (3):
Use Unicode in translatable strings
Update Polish translation
Update MSGID_BUGS_ADDRESS in po/Makevars
Rafael Fontenelle (1):
Update Brazilian Portuguese translation
Rico Tzschichholz (1):
g-i: Annotate "callback" type of clutter_binding_pool_override_action()
Ryuta Fujii (2):
Update Japanese translation
Update Japanese translation
RÅ«dolfs Mazurs (1):
Update Latvian translation
Sabri Ãnal (1):
Update Turkish translation
Sjoerd Simons (1):
gdk: Ensure surface buffer scale is set
Ting-Wei Lan (2):
configure: Don't declare functions in AC_TRY_LINK and AC_TRY_COMPILE
meson: Don't use undocumented -export-dynamic option
Tom Tryfonidis (1):
Update Greek translation
Umarzuki Bin Mochlis Moktar (1):
Add Malay translation
Xavi Ivars (1):
[l10n] Updated Catalan (Valencian) translation
Yi-Jyun Pan (1):
Update Chinese (Taiwan) translation
Yuras Shumovich (1):
Update Belarusian translation
ÃaÄatay YiÄit Åahin (1):
Update Turkish translation
ÐаÑко ÐоÑÑÐ¸Ñ (1):
Update Serbian translation
Clutter 1.26.4 2020-03-09
===============================================================================
---
Makefile | 2 +-
NEWS | 34 ++++++++++++++++++++++++++++++++++
buildreq_cache | 2 +-
clutter.spec | 37 +++++++++++++++++++------------------
meson_options.txt | 32 ++++++++++++++++++++++++++++++++
options.conf | 2 +-
release | 2 +-
upstream | 2 +-
versions | 2 +-
9 files changed, 91 insertions(+), 24 deletions(-)
create mode 100644 meson_options.txt
diff --git a/clutter.spec b/clutter.spec
index 647d691..da47626 100644
--- a/clutter.spec
+++ b/clutter.spec
@@ -3,18 +3,19 @@
# Generated by: autospec.py
#
Name : clutter
Summary : Clutter Core Library
Group : Development/Tools
-License : LGPL-2.1
+License : LGPL-2.0 LGPL-2.1
Requires: clutter-data = %{version}-%{release}
Requires: clutter-lib = %{version}-%{release}
Requires: clutter-license = %{version}-%{release}
Requires: clutter-locales = %{version}-%{release}
BuildRequires : buildreq-gnome
+BuildRequires : buildreq-meson
BuildRequires : docbook-xml
BuildRequires : gettext
BuildRequires : gobject-introspection-dev
@@ -44,9 +45,8 @@ BuildRequires : sed
BuildRequires : xorgproto-dev
%description
-===============================================================================
-Clutter is an open source software library for creating fast, compelling,
-portable, and dynamic graphical user interfaces.
+The code in this directory is meant to be XIncluded into the Clutter API
+reference, and thus is to be considered part of the Clutter documentation.
%package data
Summary: data components for the clutter package.
@@ -145,11 +145,11 @@ export LDFLAGS="$LDFLAGS -m64 -march=haswell"
make %{?_smp_mflags}
popd
%install
rm -rf %{buildroot}
mkdir -p %{buildroot}/usr/share/package-licenses/clutter
-cp %{_builddir}/clutter-1.26.2/COPYING %{buildroot}/usr/share/package-licenses/clutter/01a6b4bf79aca9b556822601186afab86e8c4fbf
-cp %{_builddir}/clutter-1.26.2/doc/reference/html/license.html %{buildroot}/usr/share/package-licenses/clutter/19635e262e81479760b4313330c76b99de1be815
+cp %{_builddir}/clutter-1.26.4/COPYING %{buildroot}/usr/share/package-licenses/clutter/01a6b4bf79aca9b556822601186afab86e8c4fbf
+cp %{_builddir}/clutter-1.26.4/doc/reference/html/license.html %{buildroot}/usr/share/package-licenses/clutter/9cc6b307b71af5508e15bc0bdcb1bb1bc92443c0
pushd ../buildavx2/
%make_install_avx2
popd
@@ -165,6 +165,7 @@ popd
/usr/lib64/girepository-1.0/Clutter-1.0.typelib
/usr/lib64/girepository-1.0/ClutterGdk-1.0.typelib
/usr/lib64/girepository-1.0/ClutterX11-1.0.typelib
+/usr/share/clutter-1.0/valgrind/clutter.supp
/usr/share/gir-1.0/*.gir
%files dev
@@ -508,16 +509,16 @@ popd
%files lib
%defattr(-,root,root,-)
/usr/lib64/haswell/libclutter-1.0.so.0
-/usr/lib64/haswell/libclutter-1.0.so.0.2600.2
+/usr/lib64/haswell/libclutter-1.0.so.0.2600.4
/usr/lib64/haswell/libclutter-glx-1.0.so.0
/usr/lib64/libclutter-1.0.so.0
-/usr/lib64/libclutter-1.0.so.0.2600.2
+/usr/lib64/libclutter-1.0.so.0.2600.4
/usr/lib64/libclutter-glx-1.0.so.0
%files license
%defattr(0644,root,root,0755)
/usr/share/package-licenses/clutter/01a6b4bf79aca9b556822601186afab86e8c4fbf
-/usr/share/package-licenses/clutter/19635e262e81479760b4313330c76b99de1be815
+/usr/share/package-licenses/clutter/9cc6b307b71af5508e15bc0bdcb1bb1bc92443c0
%files locales -f clutter-1.0.lang
%defattr(-,root,root,-)
diff --git a/meson_options.txt b/meson_options.txt
new file mode 100644
index 0000000..dadb2ea
--- /dev/null
+++ b/meson_options.txt
@@ -0,0 +1,32 @@
+option('backends',
+ description: 'Comma-separated list of windowing system backends, ("all", "system", "x11", "gdk", "win32", "wayland", "quartz", "eglnative")',
+ type: 'string',
+ value: 'system')
+option('drivers',
+ description: 'Comma-separated list of Cogl drivers to use, or "all"',
+ type: 'string',
+ value: 'all')
+option('build_tests',
+ description: 'Build the Clutter tests suites',
+ type: 'boolean',
+ value: true)
+option('build_examples',
+ description: 'Build the Clutter examples',
+ type: 'boolean',
+ value: true)
+option('documentation',
+ description: 'Generate the Clutter documentation (requires gtk-doc)',
+ type: 'boolean',
+ value: true)
+option('introspection',
+ description: 'Generate the GObject introspection data (requires gobject-introspection)',
+ type: 'boolean',
+ value: true)
+option('wayland_compositor',
+ description: 'Enable Wayland compositor features',
+ type: 'boolean',
+ value: false)
+option('pixbuf_tests',
+ description: 'Enable GdkPixbuf-based tests and examples',
+ type: 'boolean',
+ value: true)
diff --git a/options.conf b/options.conf
index 15accc0..bb8ff92 100644
--- a/options.conf
+++ b/options.conf
@@ -1,6 +1,6 @@
[package]
name = clutter
-url = https://download.gnome.org/sources/clutter/1.26/clutter-1.26.2.tar.xz
+url = https://download.gnome.org/sources/clutter/1.26/clutter-1.26.4.tar.xz
archives =
giturl = https://github.com/GNOME/clutter.git
domain =
by Ross Burton
Overview of Changes in GTK+ 3.24.14
===================================
* Fix the opaque region for windows on X11
* theme:
- Fix flat buttons in backdrop
- Make popovers look more similar to menus
- Tweak checkbox & radiobutton appearance
- Add general typography classes (heading, title-1, etc)
* language bindings:
- Fix annotations for gtk_tree_model_sort_new_with_model
* switch: Fix touch support
(NEWS truncated at 15 lines)
---
Makefile | 2 +-
NEWS | 68 ++++++++++++++++++++++++++++++++++++++++++++++++++
buildreq_cache | 7 ++----
gtk3.spec | 50 ++++++++++++++++---------------------
options.conf | 2 +-
release | 2 +-
upstream | 2 +-
versions | 2 +-
8 files changed, 97 insertions(+), 38 deletions(-)
diff --git a/gtk3.spec b/gtk3.spec
index 5a42d01..13467c6 100644
--- a/gtk3.spec
+++ b/gtk3.spec
@@ -3,12 +3,12 @@
# Generated by: autospec.py
#
Name : gtk3
Source1 : icon-cache-update-trigger.service
-Summary : GObject-based multi-platform GUI toolkit
+Summary : GTK+ Unix print support
Group : Development/Tools
License : LGPL-2.0 LGPL-2.1
Requires: gtk3-bin = %{version}-%{release}
@@ -118,13 +115,12 @@ Patch5: add-icon-cache-update-script.patch
Patch6: expand-search-for-icon-theme.cache.patch
%description
-Summary
--------
-* Do not edit the CSS directly, edit the source SCSS files
-* To be able to use the latest/adequate version of SASS, install sassc
-* The configure script will detect whether or not you have sassc installed;
-if you do, it will regenerate the CSS every time you modify the SCSS files
-and rebuild GTK+.
+General Information
+===================
+This is GTK+ version 3.24.14. GTK+ is a multi-platform toolkit for
+creating graphical user interfaces. Offering a complete set of widgets,
+GTK+ is suitable for projects ranging from small one-off projects to
+complete application suites.
%package bin
Summary: bin components for the gtk3 package.
@@ -307,11 +301,11 @@ cd ../build32;
make VERBOSE=1 V=1 %{?_smp_mflags} check || : || :
%install
rm -rf %{buildroot}
mkdir -p %{buildroot}/usr/share/package-licenses/gtk3
-cp %{_builddir}/gtk+-3.24.13/COPYING %{buildroot}/usr/share/package-licenses/gtk3/ba8966e2473a9969bdcab3dc82274c817cfd98a1
-cp %{_builddir}/gtk+-3.24.13/gdk/COPYING %{buildroot}/usr/share/package-licenses/gtk3/01a6b4bf79aca9b556822601186afab86e8c4fbf
+cp %{_builddir}/gtk+-3.24.14/COPYING %{buildroot}/usr/share/package-licenses/gtk3/ba8966e2473a9969bdcab3dc82274c817cfd98a1
+cp %{_builddir}/gtk+-3.24.14/gdk/COPYING %{buildroot}/usr/share/package-licenses/gtk3/01a6b4bf79aca9b556822601186afab86e8c4fbf
pushd ../build32/
%make_install32
if [ -d %{buildroot}/usr/lib32/pkgconfig ]
@@ -1527,9 +1521,9 @@ sed -i -e "s/.*Created by.*//g" %{buildroot}/usr/lib64/gtk-3.0/3.0.0/immodules.
/usr/lib64/libgailutil-3.so.0
/usr/lib64/libgailutil-3.so.0.0.0
/usr/lib64/libgdk-3.so.0
-/usr/lib64/libgdk-3.so.0.2404.9
+/usr/lib64/libgdk-3.so.0.2404.10
/usr/lib64/libgtk-3.so.0
-/usr/lib64/libgtk-3.so.0.2404.9
+/usr/lib64/libgtk-3.so.0.2404.10
%files lib32
%defattr(-,root,root,-)
@@ -1549,9 +1543,9 @@ sed -i -e "s/.*Created by.*//g" %{buildroot}/usr/lib64/gtk-3.0/3.0.0/immodules.
/usr/lib32/libgailutil-3.so.0
/usr/lib32/libgailutil-3.so.0.0.0
/usr/lib32/libgdk-3.so.0
-/usr/lib32/libgdk-3.so.0.2404.9
+/usr/lib32/libgdk-3.so.0.2404.10
/usr/lib32/libgtk-3.so.0
-/usr/lib32/libgtk-3.so.0.2404.9
+/usr/lib32/libgtk-3.so.0.2404.10
%files license
%defattr(0644,root,root,0755)
diff --git a/options.conf b/options.conf
index 048ba14..e3b6fe5 100644
--- a/options.conf
+++ b/options.conf
@@ -1,6 +1,6 @@
[package]
name = gtk3
-url = https://download.gnome.org/sources/gtk+/3.24/gtk+-3.24.13.tar.xz
+url = https://download.gnome.org/sources/gtk+/3.24/gtk+-3.24.14.tar.xz
archives =
giturl = https://github.com/GNOME/gtk+.git
domain =
by Ross Burton
Balázs Ãr (1):
Update Hungarian translation
Emmanuele Bassi (3):
Post-release version bump to 1.22.5
Add fallback for semi-private symbols in Pango
Release Cogl 1.22.6
Jiri Grönroos (1):
Add Finnish translation
Jordi Mas (1):
Update Catalan translation
Milo Casagrande (1):
Update Italian translation
Simon McVittie (2):
gst, pango: Add missing pkg-config dependencies
cogl-pango-2.0-experimental.pc: Reference correct library name
Stas Solovey (1):
Update Russian translation
Umarzuki Bin Mochlis Moktar (1):
Add Malay translation
Wolfgang Stöggl (1):
Update German translation
Cogl 1.22.6 2020-03-09
---
.gitignore | 6 ++++++
Makefile | 2 +-
NEWS | 8 ++++++++
buildreq_ban | 1 +
buildreq_cache | 2 +-
cogl.spec | 41 +++++++++++++++++++++++++----------------
options.conf | 7 +++++--
release | 2 +-
upstream | 2 +-
used_libs | 1 +
versions | 1 +
11 files changed, 51 insertions(+), 22 deletions(-)
create mode 100644 versions
diff --git a/buildreq_ban b/buildreq_ban
index bf7accf..a0e5b37 100644
--- a/buildreq_ban
+++ b/buildreq_ban
@@ -1,2 +1,3 @@
# This file contains build requirements that get picked up but are
# undesirable. One entry per line, no whitespace.
+apache-ant
diff --git a/cogl.spec b/cogl.spec
index ffb4ed2..4d515d2 100644
--- a/cogl.spec
+++ b/cogl.spec
@@ -36,9 +36,14 @@ BuildRequires : pkgconfig(wayland-server)
BuildRequires : pkgconfig(x11)
%description
-gmodule is taken from the same glib version as deps/glib.
-The only modification is to drop the support for .la libtool archive, which
-avoid pulling in GParser (and its dependencies).
+/*
+*/
+General Polygon Tesselation
+---------------------------
+This note describes a tesselator for polygons consisting of one or
+more closed contours. It is backward-compatible with the current
+OpenGL Utilities tesselator, and is intended to replace it. Here is
+a summary of the major differences:
%package data
Summary: data components for the cogl package.
@@ -110,18 +117,19 @@ export CXXFLAGS="$CXXFLAGS -O3 -ffat-lto-objects -flto=4 "
make %{?_smp_mflags}
%check
export http_proxy=http://127.0.0.1:9/
export https_proxy=http://127.0.0.1:9/
export no_proxy=localhost,127.0.0.1,0.0.0.0
make VERBOSE=1 V=1 %{?_smp_mflags} check || :
%install
rm -rf %{buildroot}
mkdir -p %{buildroot}/usr/share/package-licenses/cogl
-cp COPYING %{buildroot}/usr/share/package-licenses/cogl/COPYING
-cp deps/glib/COPYING %{buildroot}/usr/share/package-licenses/cogl/deps_glib_COPYING
+cp %{_builddir}/cogl-1.22.6/COPYING %{buildroot}/usr/share/package-licenses/cogl/c40ca709f2b0391c439d2a9dce38541da745a1b9
+cp %{_builddir}/cogl-1.22.6/deps/glib/COPYING %{buildroot}/usr/share/package-licenses/cogl/bf50bac24e7ec325dbb09c6b6c4dcc88a7d79e8f
+cp %{_builddir}/cogl-1.22.6/doc/reference/cogl-2.0-experimental/html/license.html %{buildroot}/usr/share/package-licenses/cogl/0bc9f8b5963e51ac143e24decc4e2292734af460
%make_install
%find_lang cogl
@@ -268,8 +276,9 @@ cp deps/glib/COPYING %{buildroot}/usr/share/package-licenses/cogl/deps_glib_COPY
%files license
%defattr(0644,root,root,0755)
-/usr/share/package-licenses/cogl/COPYING
-/usr/share/package-licenses/cogl/deps_glib_COPYING
+/usr/share/package-licenses/cogl/0bc9f8b5963e51ac143e24decc4e2292734af460
+/usr/share/package-licenses/cogl/bf50bac24e7ec325dbb09c6b6c4dcc88a7d79e8f
+/usr/share/package-licenses/cogl/c40ca709f2b0391c439d2a9dce38541da745a1b9
%files locales -f cogl.lang
%defattr(-,root,root,-)
diff --git a/options.conf b/options.conf
index e86e256..bfb5c67 100644
--- a/options.conf
+++ b/options.conf
@@ -1,8 +1,9 @@
[package]
name = cogl
-url = https://download.gnome.org/sources/cogl/1.22/cogl-1.22.4.tar.xz
+url = https://download.gnome.org/sources/cogl/1.22/cogl-1.22.6.tar.xz
archives =
giturl = https://github.com/GNOME/cogl.git
+domain =
[autospec]
# build 32 bit libraries
diff --git a/used_libs b/used_libs
index d352ca6..4b9d1b3 100644
--- a/used_libs
+++ b/used_libs
@@ -6,6 +6,7 @@ libgdk_pixbuf-2.0.so.0
libglib-2.0.so.0
libgmodule-2.0.so.0
libgobject-2.0.so.0
+libharfbuzz.so.0
libm.so.6
libpango-1.0.so.0
libpangocairo-1.0.so.0
by Fredheim
-----Original Message-----
From: dev-request(a)lists.clearlinux.org <dev-request(a)lists.clearlinux.org >
Sent: Monday, March 16, 2020 10:02 AM
To: dev(a)lists.clearlinux.org
Subject: Dev Digest, Vol 59, Issue 11
Send Dev mailing list submissions to
dev(a)lists.clearlinux.org
To subscribe or unsubscribe via email, send a message with subject or body 'help' to
dev-request(a)lists.clearlinux.org
You can reach the person managing the list at
dev-owner(a)lists.clearlinux.org
When replying, please edit your Subject line so it is more specific than "Re: Contents of Dev digest..."
Today's Topics:
1. Re: [PATCH udisks2] Remove obsolete patch (Ross Burton)
2. Re: [PATCH udisks2] udisks2: Autospec creation for version 2.8.4
(Ross Burton)
3. Re: [PATCH udisks2] udisks2: Autospec creation for version 2.8.4
(Douglas, William)
4. Re: [PATCH udisks2] udisks2: Autospec creation for version 2.8.4
(Arjan van de Ven)
5. [PATCH udisks2 v2 1/2] Remove obsolete patch (Ross Burton)
6. [PATCH udisks2 v2 2/2] udisks2: backport a patch to fix the test suite with latest GLib
(Ross Burton)
7. Re: [PATCH udisks2 v2 2/2] udisks2: backport a patch to fix the test suite with latest GLib
(Douglas, William)
----------------------------------------------------------------------
Date: Mon, 16 Mar 2020 16:23:11 +0000
From: Ross Burton <ross.burton(a)intel.com >
Subject: [Clr-dev] Re: [PATCH udisks2] Remove obsolete patch
To: "Melo, Anselmo" <anselmo.melo(a)intel.com >,
"dev(a)lists.clearlinux.org " <dev(a)lists.clearlinux.org >
Message-ID: <40511caf-2b73-1237-64c9-448a89c45ef9(a)intel.com >
Content-Type: text/plain; charset="utf-8"; format=flowed
On 16/03/2020 16:17, Melo, Anselmo wrote:
>> ________________________________________
>> From: Ross Burton [ross.burton(a)intel.com ]
>> Sent: Monday, March 16, 2020 7:49 AM
>> To: dev(a)lists.clearlinux.org
>> Subject: [Clr-dev] [PATCH udisks2] Remove obsolete patch
>
>> CVE-2018-17336 was fixed in udisks 2.8.1 onwards.
>> ---
>> CVE-2018-17336.patch | 32 ---------------------------
>> encoding.patch | 52 ++++++++++++++++++++++++++++++++++++++++++++
>
> CVE patch removal: +1
>
> Was adding encoding.patch intended?
No, that was meant to be part of 2/2. I'll fix up the history before pushing.
Ross
------------------------------
Date: Mon, 16 Mar 2020 16:25:32 +0000
From: Ross Burton <ross.burton(a)intel.com >
Subject: [Clr-dev] Re: [PATCH udisks2] udisks2: Autospec creation for
version 2.8.4
To: "Douglas, William" <william.douglas(a)intel.com >
Cc: "dev(a)lists.clearlinux.org " <dev(a)lists.clearlinux.org >
Message-ID: <308ff9d1-e5a3-98b5-03ee-7fcb72049c48(a)intel.com >
Content-Type: text/plain; charset="utf-8"; format=flowed
On 16/03/2020 16:21, Douglas, William wrote:
> Hrm this diff isn't super helpful, why is the encoding patch added?
Well I obviously drove git wrong at some point and got it added to the 'remove obsolete patch' commit accidentally. I also note that for some reason my explanation as to why this patch is needed was dropped somewhere.
I'll fix it all and send a v2 :/
Ross
------------------------------
Date: Mon, 16 Mar 2020 09:28:13 -0700
From: "Douglas, William" <william.douglas(a)intel.com >
Subject: [Clr-dev] Re: [PATCH udisks2] udisks2: Autospec creation for
version 2.8.4
To: Ross Burton <ross.burton(a)intel.com >
Cc: "dev(a)lists.clearlinux.org " <dev(a)lists.clearlinux.org >
Message-ID:
<CABhPDt_0WZdDNU-3JBRLrG_Eg1wimLqTNMRiE+6wFz0F81p_uw(a)mail.gmail.com >
Content-Type: text/plain; charset="UTF-8"
Ah I see the other thread now, all the fun. If the patch is intended to be dropped after an update, having a naming scheme as per Arjan's suggestion in the patch thread would be nice to keep.
On Mon, Mar 16, 2020 at 9:21 AM Douglas, William <william.douglas(a)intel.com > wrote:
>
> Hrm this diff isn't super helpful, why is the encoding patch added?
>
> On Mon, Mar 16, 2020 at 7:55 AM Ross Burton <ross.burton(a)intel.com > wrote:
> >
> > ---
> > release | 2 +-
> > series | 1 +
> > udisks2.spec | 8 +++++---
> > 3 files changed, 7 insertions(+), 4 deletions(-)
> >
> > diff --git a/series b/series
> > index 75e72d0..4940b15 100644
> > --- a/series
> > +++ b/series
> > @@ -1 +1,2 @@
> > 0001-Add-support-for-a-stateless-configuration-file.patch
> > +encoding.patch
> > diff --git a/udisks2.spec b/udisks2.spec index 8b3e7ca..2df6cc9
> > 100644
> > --- a/udisks2.spec
> > +++ b/udisks2.spec
> > @@ -54,6 +54,7 @@ BuildRequires : pkgconfig(mount) BuildRequires :
> > pkgconfig(polkit-agent-1) BuildRequires :
> > pkgconfig(polkit-gobject-1)
> > Patch1: 0001-Add-support-for-a-stateless-configuration-file.patch
> > +Patch2: encoding.patch
> >
> > %description
> > CI status
> > @@ -168,13 +169,14 @@ services components for the udisks2 package.
> > %setup -q -n udisks-2.8.4
> > cd %{_builddir}/udisks-2.8.4
> > %patch1 -p1
> > +%patch2 -p1
> >
> > %build
> > export http_proxy=http://127.0.0.1:9/ export
> > https_proxy=http://127.0.0.1:9/ export
> > no_proxy=localhost,127.0.0.1,0.0.0.0
> > export LANG=C.UTF-8
> > export GCC_IGNORE_WERROR=1
> > export CFLAGS="$CFLAGS -fno-lto "
> > export FCFLAGS="$CFLAGS -fno-lto "
> > _______________________________________________
> > Dev mailing list -- dev(a)lists.clearlinux.org To unsubscribe send an
> > email to dev-leave(a)lists.clearlinux.org
------------------------------
Date: Mon, 16 Mar 2020 09:33:37 -0700
From: Arjan van de Ven <arjan(a)linux.intel.com >
Subject: [Clr-dev] Re: [PATCH udisks2] udisks2: Autospec creation for
version 2.8.4
To: "Douglas, William" <william.douglas(a)intel.com >, Ross Burton
<ross.burton(a)intel.com >
Cc: "dev(a)lists.clearlinux.org " <dev(a)lists.clearlinux.org >
Message-ID: <5ca4fc07-fb74-518b-2aa2-19a66c5e9727(a)linux.intel.com >
Content-Type: text/plain; charset=utf-8; format=flowed
On 3/16/2020 9:28 AM, Douglas, William wrote:
> Ah I see the other thread now, all the fun. If the patch is intended
> to be dropped after an update, having a naming scheme as per Arjan's
> suggestion in the patch thread would be nice to keep.
upstream merged I'm fine to drop and a name helps
but also I am strongly in the camp of not too aggressively deleting .patch files.
yes it's still in git history
but it's many more steps to look backwards in time.... especially for CVE patches it's nice to keep around to quickly see "yes we fixed it" and it's then easy to do various git status/log/etc on that file
------------------------------
Date: Mon, 16 Mar 2020 16:57:03 +0000
From: Ross Burton <ross.burton(a)intel.com >
Subject: [Clr-dev] [PATCH udisks2 v2 1/2] Remove obsolete patch
To: dev(a)lists.clearlinux.org
Message-ID: <20200316165704.316476-1-ross.burton(a)intel.com >
CVE-2018-17336 was fixed in udisks 2.8.1 onwards.
---
CVE-2018-17336.patch | 32 --------------------------------
1 file changed, 32 deletions(-)
delete mode 100644 CVE-2018-17336.patch
diff --git a/CVE-2018-17336.patch b/CVE-2018-17336.patch deleted file mode 100644 index c3c083d..0000000
--- a/CVE-2018-17336.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From e369a9b4b08e9373c814c05328b366c938284eb5 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Kai=20L=C3=BCke?= <kailueke(a)riseup.net >
-Date: Tue, 18 Sep 2018 13:12:14 +0200
-Subject: [PATCH] Fix string format vulnerability
-
-If the message in g_log_structured itself -contained format sequences like %d or %n they -were applied again, leading to leaked stack contents -and possibly memory corruption. It can be triggered -e.g. by a volume label containing format sequences.
-
-Print the message argument itself into a "%s" string -to avoid intepreting format sequences.
-
-https://github.com/storaged-project/udisks/issues/578
----
- src/udiskslogging.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/udiskslogging.c b/src/udiskslogging.c -index ab49fcbf..47a3af23 100644
---- a/src/udiskslogging.c
-+++ b/src/udiskslogging.c
-@@ -60,7 +60,7 @@ udisks_log (UDisksLogLevel level,
-
- #if GLIB_CHECK_VERSION(2, 50, 0)
- g_log_structured ("udisks", (GLogLevelFlags) level,
-- "MESSAGE", message, "THREAD_ID", "%d", (gint) syscall (SYS_gettid),
-+ "MESSAGE", "%s", message, "THREAD_ID", "%d",
-+ (gint) syscall (SYS_gettid),
- "CODE_FUNC", function, "CODE_FILE", location);
- #else
- g_log ("udisks", level, "[%d]: %s [%s, %s()]", (gint) syscall (SYS_gettid), message, location, function);
--
2.25.1
------------------------------
Date: Mon, 16 Mar 2020 16:57:04 +0000
From: Ross Burton <ross.burton(a)intel.com >
Subject: [Clr-dev] [PATCH udisks2 v2 2/2] udisks2: backport a patch to
fix the test suite with latest GLib
To: dev(a)lists.clearlinux.org
Message-ID: <20200316165704.316476-2-ross.burton(a)intel.com >
Content-Type: text/plain; charset=UTF-8
---
backport-encoding.patch | 52 +++++++++++++++++++++++++++++++++++++++++
release | 2 +-
series | 1 +
udisks2.spec | 8 ++++---
4 files changed, 59 insertions(+), 4 deletions(-) create mode 100644 backport-encoding.patch
diff --git a/backport-encoding.patch b/backport-encoding.patch new file mode 100644 index 0000000..e939b11
--- /dev/null
+++ b/backport-encoding.patch
@@ -0,0 +1,52 @@
+Fix the test suite failing with latest GLib
+
+Upstream-Status: Backport
+[https://github.com/storaged-project/udisks/pull/729]
+Signed-off-by: Ross Burton <ross.burton(a)intel.com >
+
+From 60a0c1c967821d317046d9494e45b9a8e4e7a1c1 Mon Sep 17 00:00:00 2001
+From: Philip Withnall <withnall(a)endlessm.com >
+Date: Mon, 17 Feb 2020 16:08:28 +0000
+Subject: [PATCH] udisksspawnedjob: Clear encoding of stdout and stderr
+channels
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+We want to be able to read binary data from the stderr and stdout of
+spawned processes, so unset the encoding for those channels — otherwise
+it will be validated as UTF-8 and invalid data (particularly embedded
+nuls) will be dropped.
+
+GLib became stricter at validating this with
+https://gitlab.gnome.org/GNOME/glib/merge_requests/967 in GLib 2.63.0,
+but it’s not an API break.
+
+Signed-off-by: Philip Withnall <withnall(a)endlessm.com >
+
+Fixes: #724
+---
+ src/udisksspawnedjob.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/src/udisksspawnedjob.c b/src/udisksspawnedjob.c index
+9d12aa842..8062c1e3c 100644
+--- a/src/udisksspawnedjob.c
++++ b/src/udisksspawnedjob.c
+@@ -1032,6 +1032,8 @@ void udisks_spawned_job_start (UDisksSpawnedJob *job)
+ }
+
+ job->child_stdout_channel = g_io_channel_unix_new
+ (job->child_stdout_fd);
++ /* we want to read binary, suppress checking the encoding: */
++ g_io_channel_set_encoding (job->child_stdout_channel, NULL, NULL);
+ g_io_channel_set_flags (job->child_stdout_channel, G_IO_FLAG_NONBLOCK, NULL);
+ job->child_stdout_source = g_io_create_watch
+(job->child_stdout_channel, G_IO_IN); #if __GNUC__ >= 8 @@ -1050,6
++1052,8 @@ void udisks_spawned_job_start (UDisksSpawnedJob *job)
+ g_source_unref (job->child_stdout_source);
+
+ job->child_stderr_channel = g_io_channel_unix_new
+ (job->child_stderr_fd);
++ /* we want to read binary, suppress checking the encoding: */
++ g_io_channel_set_encoding (job->child_stderr_channel, NULL, NULL);
+ g_io_channel_set_flags (job->child_stderr_channel, G_IO_FLAG_NONBLOCK, NULL);
+ job->child_stderr_source = g_io_create_watch
+ (job->child_stderr_channel, G_IO_IN); #if __GNUC__ >= 8
diff --git a/release b/release
index b1bd38b..8351c19 100644
--- a/release
+++ b/release
@@ -1 +1 @@
-13
+14
diff --git a/series b/series
index 75e72d0..d89cd04 100644
--- a/series
+++ b/series
@@ -1 +1,2 @@
0001-Add-support-for-a-stateless-configuration-file.patch
+backport-encoding.patch
diff --git a/udisks2.spec b/udisks2.spec index 8b3e7ca..0ee88df 100644
--- a/udisks2.spec
+++ b/udisks2.spec
@@ -4,7 +4,7 @@
#
Name : udisks2
Version : 2.8.4
-Release : 13
+Release : 14
URL : https://github.com/storaged-project/udisks/releases/download/udisks-2.8.4/u…
Source0 : https://github.com/storaged-project/udisks/releases/download/udisks-2.8.4/u…
Summary : UDisks Client Library
@@ -54,6 +54,7 @@ BuildRequires : pkgconfig(mount) BuildRequires : pkgconfig(polkit-agent-1) BuildRequires : pkgconfig(polkit-gobject-1)
Patch1: 0001-Add-support-for-a-stateless-configuration-file.patch
+Patch2: backport-encoding.patch
%description
CI status
@@ -168,13 +169,14 @@ services components for the udisks2 package.
%setup -q -n udisks-2.8.4
cd %{_builddir}/udisks-2.8.4
%patch1 -p1
+%patch2 -p1
%build
export http_proxy=http://127.0.0.1:9/
export https_proxy=http://127.0.0.1:9/
export no_proxy=localhost,127.0.0.1,0.0.0.0
export LANG=C.UTF-8
-export SOURCE_DATE_EPOCH=1579635003
+export SOURCE_DATE_EPOCH=1584369487
export GCC_IGNORE_WERROR=1
export CFLAGS="$CFLAGS -fno-lto "
export FCFLAGS="$CFLAGS -fno-lto "
@@ -191,7 +193,7 @@ export no_proxy=localhost,127.0.0.1,0.0.0.0
make VERBOSE=1 V=1 %{?_smp_mflags} check
%install
-export SOURCE_DATE_EPOCH=1579635003
+export SOURCE_DATE_EPOCH=1584369487
rm -rf %{buildroot}
mkdir -p %{buildroot}/usr/share/package-licenses/udisks2
cp %{_builddir}/udisks-2.8.4/COPYING %{buildroot}/usr/share/package-licenses/udisks2/83b927c3fa44af01d2515ea8575f8d4848cc10ec
--
2.25.1
------------------------------
Date: Mon, 16 Mar 2020 10:01:07 -0700
From: "Douglas, William" <william.douglas(a)intel.com >
Subject: [Clr-dev] Re: [PATCH udisks2 v2 2/2] udisks2: backport a
patch to fix the test suite with latest GLib
To: Ross Burton <ross.burton(a)intel.com >
Cc: "dev(a)lists.clearlinux.org " <dev(a)lists.clearlinux.org >
Message-ID:
<CABhPDt9YK5jn48yoeh2kdfPAKYKKZofEMPmVCa62sRcq_zGe9A(a)mail.gmail.com >
Content-Type: text/plain; charset="UTF-8"
+1
On Mon, Mar 16, 2020 at 9:57 AM Ross Burton <ross.burton(a)intel.com > wrote:
>
> ---
> backport-encoding.patch | 52 +++++++++++++++++++++++++++++++++++++++++
> release | 2 +-
> series | 1 +
> udisks2.spec | 8 ++++---
> 4 files changed, 59 insertions(+), 4 deletions(-) create mode 100644
> backport-encoding.patch
>
> diff --git a/backport-encoding.patch b/backport-encoding.patch new
> file mode 100644 index 0000000..e939b11
> --- /dev/null
> +++ b/backport-encoding.patch
> @@ -0,0 +1,52 @@
> +Fix the test suite failing with latest GLib
> +
> +Upstream-Status: Backport
> +[https://github.com/storaged-project/udisks/pull/729]
> +Signed-off-by: Ross Burton <ross.burton(a)intel.com >
> +
> +From 60a0c1c967821d317046d9494e45b9a8e4e7a1c1 Mon Sep 17 00:00:00
> +2001
> +From: Philip Withnall <withnall(a)endlessm.com >
> +Date: Mon, 17 Feb 2020 16:08:28 +0000
> +Subject: [PATCH] udisksspawnedjob: Clear encoding of stdout and
> +stderr channels
> +MIME-Version: 1.0
> +Content-Type: text/plain; charset=UTF-8
> +Content-Transfer-Encoding: 8bit
> +
> +We want to be able to read binary data from the stderr and stdout of
> +spawned processes, so unset the encoding for those channels —
> +otherwise it will be validated as UTF-8 and invalid data
> +(particularly embedded
> +nuls) will be dropped.
> +
> +GLib became stricter at validating this with
> +https://gitlab.gnome.org/GNOME/glib/merge_requests/967 in GLib
> +2.63.0, but it’s not an API break.
> +
> +Signed-off-by: Philip Withnall <withnall(a)endlessm.com >
> +
> +Fixes: #724
> +---
> + src/udisksspawnedjob.c | 4 ++++
> + 1 file changed, 4 insertions(+)
> +
> +diff --git a/src/udisksspawnedjob.c b/src/udisksspawnedjob.c index
> +9d12aa842..8062c1e3c 100644
> +--- a/src/udisksspawnedjob.c
> ++++ b/src/udisksspawnedjob.c
> +@@ -1032,6 +1032,8 @@ void udisks_spawned_job_start (UDisksSpawnedJob *job)
> + }
> +
> + job->child_stdout_channel = g_io_channel_unix_new
> + (job->child_stdout_fd);
> ++ /* we want to read binary, suppress checking the encoding: */
> ++ g_io_channel_set_encoding (job->child_stdout_channel, NULL, NULL);
> + g_io_channel_set_flags (job->child_stdout_channel, G_IO_FLAG_NONBLOCK, NULL);
> + job->child_stdout_source = g_io_create_watch
> +(job->child_stdout_channel, G_IO_IN); #if __GNUC__ >= 8 @@ -1050,6
> ++1052,8 @@ void udisks_spawned_job_start (UDisksSpawnedJob *job)
> + g_source_unref (job->child_stdout_source);
> +
> + job->child_stderr_channel = g_io_channel_unix_new
> + (job->child_stderr_fd);
> ++ /* we want to read binary, suppress checking the encoding: */
> ++ g_io_channel_set_encoding (job->child_stderr_channel, NULL, NULL);
> + g_io_channel_set_flags (job->child_stderr_channel, G_IO_FLAG_NONBLOCK, NULL);
> + job->child_stderr_source = g_io_create_watch
> + (job->child_stderr_channel, G_IO_IN); #if __GNUC__ >= 8
> diff --git a/release b/release
> index b1bd38b..8351c19 100644
> --- a/release
> +++ b/release
> @@ -1 +1 @@
> -13
> +14
> diff --git a/series b/series
> index 75e72d0..d89cd04 100644
> --- a/series
> +++ b/series
> @@ -1 +1,2 @@
> 0001-Add-support-for-a-stateless-configuration-file.patch
> +backport-encoding.patch
> diff --git a/udisks2.spec b/udisks2.spec index 8b3e7ca..0ee88df 100644
> --- a/udisks2.spec
> +++ b/udisks2.spec
> @@ -4,7 +4,7 @@
> #
> Name : udisks2
> Version : 2.8.4
> -Release : 13
> +Release : 14
> URL : https://github.com/storaged-project/udisks/releases/download/udisks-2.8.4/u…
> Source0 :
> https://github.com/storaged-project/udisks/releases/download/udisks-2 .
> 8.4/udisks-2.8.4.tar.bz2
> Summary : UDisks Client Library
> @@ -54,6 +54,7 @@ BuildRequires : pkgconfig(mount) BuildRequires :
> pkgconfig(polkit-agent-1) BuildRequires : pkgconfig(polkit-gobject-1)
> Patch1: 0001-Add-support-for-a-stateless-configuration-file.patch
> +Patch2: backport-encoding.patch
>
> %description
> CI status
> @@ -168,13 +169,14 @@ services components for the udisks2 package.
> %setup -q -n udisks-2.8.4
> cd %{_builddir}/udisks-2.8.4
> %patch1 -p1
> +%patch2 -p1
>
> %build
> export http_proxy=http://127.0.0.1:9/ export
> https_proxy=http://127.0.0.1:9/ export
> no_proxy=localhost,127.0.0.1,0.0.0.0
> export LANG=C.UTF-8
> -export SOURCE_DATE_EPOCH=1579635003
> +export SOURCE_DATE_EPOCH=1584369487
> export GCC_IGNORE_WERROR=1
> export CFLAGS="$CFLAGS -fno-lto "
> export FCFLAGS="$CFLAGS -fno-lto "
> @@ -191,7 +193,7 @@ export no_proxy=localhost,127.0.0.1,0.0.0.0
> make VERBOSE=1 V=1 %{?_smp_mflags} check
>
> %install
> -export SOURCE_DATE_EPOCH=1579635003
> +export SOURCE_DATE_EPOCH=1584369487
> rm -rf %{buildroot}
> mkdir -p %{buildroot}/usr/share/package-licenses/udisks2
> cp %{_builddir}/udisks-2.8.4/COPYING
> %{buildroot}/usr/share/package-licenses/udisks2/83b927c3fa44af01d2515e
> a8575f8d4848cc10ec
> --
> 2.25.1
> _______________________________________________
> Dev mailing list -- dev(a)lists.clearlinux.org To unsubscribe send an
> email to dev-leave(a)lists.clearlinux.org
------------------------------
Subject: Digest Footer
_______________________________________________
Dev mailing list -- dev(a)lists.clearlinux.org To unsubscribe send an email to dev-leave(a)lists.clearlinux.org
------------------------------
End of Dev Digest, Vol 59, Issue 11
***********************************
by Ross Burton
CVE-2018-17336 was fixed in udisks 2.8.1 onwards.
---
CVE-2018-17336.patch | 32 --------------------------------
1 file changed, 32 deletions(-)
delete mode 100644 CVE-2018-17336.patch
diff --git a/CVE-2018-17336.patch b/CVE-2018-17336.patch
deleted file mode 100644
index c3c083d..0000000
--- a/CVE-2018-17336.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From e369a9b4b08e9373c814c05328b366c938284eb5 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Kai=20L=C3=BCke?= <kailueke(a)riseup.net >
-Date: Tue, 18 Sep 2018 13:12:14 +0200
-Subject: [PATCH] Fix string format vulnerability
-
-If the message in g_log_structured itself
-contained format sequences like %d or %n they
-were applied again, leading to leaked stack contents
-and possibly memory corruption. It can be triggered
-e.g. by a volume label containing format sequences.
-
-Print the message argument itself into a "%s" string
-to avoid intepreting format sequences.
-
-https://github.com/storaged-project/udisks/issues/578
----
- src/udiskslogging.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/udiskslogging.c b/src/udiskslogging.c
-index ab49fcbf..47a3af23 100644
---- a/src/udiskslogging.c
-+++ b/src/udiskslogging.c
-@@ -60,7 +60,7 @@ udisks_log (UDisksLogLevel level,
-
- #if GLIB_CHECK_VERSION(2, 50, 0)
- g_log_structured ("udisks", (GLogLevelFlags) level,
-- "MESSAGE", message, "THREAD_ID", "%d", (gint) syscall (SYS_gettid),
-+ "MESSAGE", "%s", message, "THREAD_ID", "%d", (gint) syscall (SYS_gettid),
- "CODE_FUNC", function, "CODE_FILE", location);
- #else
- g_log ("udisks", level, "[%d]: %s [%s, %s()]", (gint) syscall (SYS_gettid), message, location, function);
--
2.25.1
by Arjan van de Ven
On 3/16/2020 9:28 AM, Douglas, William wrote:
> Ah I see the other thread now, all the fun. If the patch is intended
> to be dropped after an update, having a naming scheme as per Arjan's
> suggestion in the patch thread would be nice to keep.
upstream merged I'm fine to drop and a name helps
but also I am strongly in the camp of not too aggressively deleting .patch files.
yes it's still in git history
but it's many more steps to look backwards in time.... especially for CVE patches it's nice to keep around to quickly see
"yes we fixed it" and it's then easy to do various git status/log/etc on that file
