Page MenuHomeSolus
Files F11048039

D18.id2473.diff
No OneTemporary
Actions

D18.id2473.diff
View Options

diff --git a/abi_used_libs b/abi_used_libs
--- a/abi_used_libs
+++ b/abi_used_libs
@@ -3,6 +3,7 @@
libXdamage.so.1
libXext.so.6
libXfixes.so.3
+libaa.so.1
libbz2.so.1.0
libc.so.6
libcairo-gobject.so.2
diff --git a/files/0001-tests-souphttpsrc-Update-test-cert.pem.patch b/files/0001-tests-souphttpsrc-Update-test-cert.pem.patch
new file mode 100644
--- /dev/null
+++ b/files/0001-tests-souphttpsrc-Update-test-cert.pem.patch
@@ -0,0 +1,58 @@
+From 5166461059402fb0a7130fdc100e96698b1f90b7 Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
+Date: Tue, 20 Jun 2017 16:28:35 +0200
+Subject: [PATCH 1/4] tests: souphttpsrc: Update test-cert.pem
+
+Recent GnuTLS disregards the Common Name and only looks at the Subject
+Alternative Name extension. Since our test-cert has no SAN extension,
+validation fails.
+
+Generate a new certificate with SAN. In addition to 127.0.0.1, for good
+measure make it valid for localhost and ::1, too.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=784005
+---
+ tests/files/test-cert.pem | 31 ++++++++++++++++---------------
+ 1 file changed, 16 insertions(+), 15 deletions(-)
+
+diff --git a/tests/files/test-cert.pem b/tests/files/test-cert.pem
+index 7f2062665529424e..ff863b4d1387270f 100644
+--- a/tests/files/test-cert.pem
++++ b/tests/files/test-cert.pem
+@@ -1,17 +1,18 @@
+ -----BEGIN CERTIFICATE-----
+-MIICpDCCAYwCCQC8Suc8hjfgujANBgkqhkiG9w0BAQUFADAUMRIwEAYDVQQDDAkx
+-MjcuMC4wLjEwHhcNMTEwOTE5MTkyMjA1WhcNMjEwOTE2MTkyMjA1WjAUMRIwEAYD
+-VQQDDAkxMjcuMC4wLjEwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCr
+-OH7kblu+5zkYTk/ZG21OgbIyltxhLDHPmUpl4yDUFqX5BEtoVfg0Ms4ZuaoeDi4t
+-b2LV6Em3UDQwmwPMm2SakfJvRd3nfL6G3UkkBsVqT3V04M9u8fk6YgHPT8PN1Lj7
+-5bv9AMRyQRV1QIPondMhbt8JhlmCR6ALbxYtsXkbQF7qzbj7Y2cjvoHzPQSk0QpB
+-rEUpj6Schm1NkPen48Z1X1faGL0F3roFHEsf6U1AjP5A4A/UGQsRtq35VzVnKgxW
+-N7jumUevEMIvyqLjmvK864AHMIRVCOls9GcIta80bViuVqgtuGgVGM/7SoZfIvPF
+-A10jIe7KQoXWAwRi4WclAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAJfihY634dRr
+-DeEA4SQ1e0/kB6EF8oeaC+5EuGOJxtoX+yXJfWJsEtmjRwobyOBVV997hdOtdZjo
+-mdJOCKerOFKccO9PLNJZ+/l4+NHv9OwOcu4UqvrSsps/pmr/22SIyQswbLLJfPAT
+-KjGTDLlj//zrLxzUGsu7lgGsY4s4fVbftFZv7P5AyErpwiFk8qM1BP0NMkn4XWSA
+-uSyTeB6O+tWYdh3bA1BeKC2P85sl6xFJI2gxvNTxtdcg9beDqNuEheJ+mEtD3P4w
+-HDG1vFaAX0MH1RJSDO/dIoJerN6LTjiTYYYg8yV0lmBxijv25Z/3Gi33OuG9jkdR
+-vXDwJpC+/ko=
++MIIC2zCCAcOgAwIBAgIJALRbg2WnuAAqMA0GCSqGSIb3DQEBCwUAMBQxEjAQBgNV
++BAMMCTEyNy4wLjAuMTAeFw0xNzA2MjAxNDI3MzBaFw0yNzA2MTgxNDI3MzBaMBQx
++EjAQBgNVBAMMCTEyNy4wLjAuMTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
++ggEBAKs4fuRuW77nORhOT9kbbU6BsjKW3GEsMc+ZSmXjINQWpfkES2hV+DQyzhm5
++qh4OLi1vYtXoSbdQNDCbA8ybZJqR8m9F3ed8vobdSSQGxWpPdXTgz27x+TpiAc9P
++w83UuPvlu/0AxHJBFXVAg+id0yFu3wmGWYJHoAtvFi2xeRtAXurNuPtjZyO+gfM9
++BKTRCkGsRSmPpJyGbU2Q96fjxnVfV9oYvQXeugUcSx/pTUCM/kDgD9QZCxG2rflX
++NWcqDFY3uO6ZR68Qwi/KouOa8rzrgAcwhFUI6Wz0Zwi1rzRtWK5WqC24aBUYz/tK
++hl8i88UDXSMh7spChdYDBGLhZyUCAwEAAaMwMC4wLAYDVR0RBCUwI4IJbG9jYWxo
++b3N0hwR/AAABhxAAAAAAAAAAAAAAAAAAAAABMA0GCSqGSIb3DQEBCwUAA4IBAQBj
+++U8tebwg5/pof5Rht6TMHqeg6Fcr4OJkL2ph2g+T/AMTS7kEGeFIKJN5AZ+S/qIY
++cdoDKHwc8+bCK/mG6DPmJ4z/2Eamb85YhplOLVrLRwfxRebTK9CtnjcjnflAiU9H
++7vPVwXIvkwebhBSQNKTdkBlPXKaTNWXuygeFG2OVQkPf/KAxSdtg2R+owv/s802Z
++HISk26wY9oFIQz6AiXWdrY1QqNOltZ7rlU5iofAH7X+9ryZlxPWj/gHg2YQRvvLl
++dq6nCF+ED0ke7h0lg5nU0beKEygwli8DlLVbu0JK0PkARFp5t7wUtzC9DCjzvfOc
++gxR44PyZX7/2oaTDm4PS
+ -----END CERTIFICATE-----
+--
+2.13.1
+
diff --git a/files/0002-tests-souphttpsrc-Make-ssl_cert-key_file-static.patch b/files/0002-tests-souphttpsrc-Make-ssl_cert-key_file-static.patch
new file mode 100644
--- /dev/null
+++ b/files/0002-tests-souphttpsrc-Make-ssl_cert-key_file-static.patch
@@ -0,0 +1,47 @@
+From e0ac30bc06da0ffd78334621c9ee42fa8f92f195 Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
+Date: Tue, 20 Jun 2017 16:34:41 +0200
+Subject: [PATCH 2/4] tests: souphttpsrc: Make ssl_cert/key_file static
+
+Just a bit of cleanup.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=784005
+---
+ tests/check/elements/souphttpsrc.c | 7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/tests/check/elements/souphttpsrc.c b/tests/check/elements/souphttpsrc.c
+index a6231fab85eeb9e2..6dedae50a64a3dc0 100644
+--- a/tests/check/elements/souphttpsrc.c
++++ b/tests/check/elements/souphttpsrc.c
+@@ -52,6 +52,9 @@ static const char *realm = "SOUPHTTPSRC_REALM";
+ static const char *basic_auth_path = "/basic_auth";
+ static const char *digest_auth_path = "/digest_auth";
+
++static const char *ssl_cert_file = GST_TEST_FILES_PATH "/test-cert.pem";
++static const char *ssl_key_file = GST_TEST_FILES_PATH "/test-key.pem";
++
+ static guint get_port_from_server (SoupServer * server);
+ static SoupServer *run_server (gboolean use_https);
+
+@@ -123,7 +126,7 @@ run_test (gboolean use_https, const gchar * path, gint expected)
+ g_free (url);
+
+ g_object_set (src, "automatic-redirect", redirect, NULL);
+- g_object_set (src, "ssl-ca-file", GST_TEST_FILES_PATH "/test-cert.pem", NULL);
++ g_object_set (src, "ssl-ca-file", ssl_cert_file, NULL);
+ if (cookies != NULL)
+ g_object_set (src, "cookies", cookies, NULL);
+ g_object_set (sink, "signal-handoffs", TRUE, NULL);
+@@ -572,8 +575,6 @@ run_server (gboolean use_https)
+
+
+ if (use_https) {
+- const char *ssl_cert_file = GST_TEST_FILES_PATH "/test-cert.pem";
+- const char *ssl_key_file = GST_TEST_FILES_PATH "/test-key.pem";
+ GTlsBackend *backend = g_tls_backend_get_default ();
+
+ if (backend == NULL || !g_tls_backend_supports_tls (backend)) {
+--
+2.13.1
+
diff --git a/files/0003-tests-souphttpsrc-Avoid-deprecated-server-ssl-proper.patch b/files/0003-tests-souphttpsrc-Avoid-deprecated-server-ssl-proper.patch
new file mode 100644
--- /dev/null
+++ b/files/0003-tests-souphttpsrc-Avoid-deprecated-server-ssl-proper.patch
@@ -0,0 +1,60 @@
+From bf9331fa8a68e58abbed72d25ccf2ab9e044669c Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
+Date: Tue, 20 Jun 2017 16:37:55 +0200
+Subject: [PATCH 3/4] tests: souphttpsrc: Avoid deprecated server ssl
+ properties
+
+The ssl-cert-file and ssl-key-file properties are deprecated. Use the
+soup_server_set_ssl_cert_file function to load the files.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=784005
+---
+ tests/check/elements/souphttpsrc.c | 21 +++++++++++++--------
+ 1 file changed, 13 insertions(+), 8 deletions(-)
+
+diff --git a/tests/check/elements/souphttpsrc.c b/tests/check/elements/souphttpsrc.c
+index 6dedae50a64a3dc0..d5eefb9364f78280 100644
+--- a/tests/check/elements/souphttpsrc.c
++++ b/tests/check/elements/souphttpsrc.c
+@@ -569,25 +569,30 @@ get_port_from_server (SoupServer * server)
+ static SoupServer *
+ run_server (gboolean use_https)
+ {
+- SoupServer *server;
+- SoupServerListenOptions listen_flags;
++ SoupServer *server = soup_server_new (NULL, NULL);
++ SoupServerListenOptions listen_flags = 0;
+ guint port;
+
+
+ if (use_https) {
+ GTlsBackend *backend = g_tls_backend_get_default ();
++ GError *err = NULL;
+
+ if (backend == NULL || !g_tls_backend_supports_tls (backend)) {
+ GST_INFO ("No TLS support");
++ g_object_unref (server);
+ return NULL;
+ }
+
+- server = soup_server_new (SOUP_SERVER_SSL_CERT_FILE, ssl_cert_file,
+- SOUP_SERVER_SSL_KEY_FILE, ssl_key_file, NULL);
+- listen_flags = SOUP_SERVER_LISTEN_HTTPS;
+- } else {
+- server = soup_server_new (NULL, NULL);
+- listen_flags = 0;
++ if (!soup_server_set_ssl_cert_file (server, ssl_cert_file, ssl_key_file,
++ &err)) {
++ GST_INFO ("Failed to load certificate: %s", err->message);
++ g_object_unref (server);
++ g_error_free (err);
++ return NULL;
++ }
++
++ listen_flags |= SOUP_SERVER_LISTEN_HTTPS;
+ }
+
+ soup_server_add_handler (server, NULL, server_callback, NULL, NULL);
+--
+2.13.1
+
diff --git a/files/0004-tests-souphttpsrc-Avoid-deprecated-ssl-ca-file-prope.patch b/files/0004-tests-souphttpsrc-Avoid-deprecated-ssl-ca-file-prope.patch
new file mode 100644
--- /dev/null
+++ b/files/0004-tests-souphttpsrc-Avoid-deprecated-ssl-ca-file-prope.patch
@@ -0,0 +1,54 @@
+From 4dde7d0061b6d2f9159d3f31f9c3c1faf9038fdb Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
+Date: Tue, 20 Jun 2017 16:39:36 +0200
+Subject: [PATCH 4/4] tests: souphttpsrc: Avoid deprecated ssl-ca-file property
+
+SoupSession's ssl-ca-file property is deprecated. Use the recommended
+tls-database property.
+
+This is a bit more complex as it requires creating a GTlsFileDatabase
+object for an absolute (!) path to the CA certificates file.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=784005
+---
+ tests/check/elements/souphttpsrc.c | 23 ++++++++++++++++++++++-
+ 1 file changed, 22 insertions(+), 1 deletion(-)
+
+diff --git a/tests/check/elements/souphttpsrc.c b/tests/check/elements/souphttpsrc.c
+index d5eefb9364f78280..40d4dbbb6ebef05c 100644
+--- a/tests/check/elements/souphttpsrc.c
++++ b/tests/check/elements/souphttpsrc.c
+@@ -125,8 +125,29 @@ run_test (gboolean use_https, const gchar * path, gint expected)
+ g_object_set (src, "location", url, NULL);
+ g_free (url);
+
++ if (use_https) {
++ GTlsDatabase *tlsdb;
++ GError *error = NULL;
++ gchar *path;
++
++ /* GTlsFileDatabase needs an absolute path. Using a relative one
++ * causes a warning from GLib-Net followed by a segfault in GnuTLS */
++ if (g_path_is_absolute (ssl_cert_file)) {
++ path = g_strdup (ssl_cert_file);
++ } else {
++ path = g_build_filename (g_get_current_dir (), ssl_cert_file, NULL);
++ }
++
++ tlsdb = g_tls_file_database_new (path, &error);
++ fail_unless (tlsdb, "Failed to load certificate: %s", error->message);
++
++ g_object_set (src, "tls-database", tlsdb, NULL);
++
++ g_object_unref (tlsdb);
++ g_free (path);
++ }
++
+ g_object_set (src, "automatic-redirect", redirect, NULL);
+- g_object_set (src, "ssl-ca-file", ssl_cert_file, NULL);
+ if (cookies != NULL)
+ g_object_set (src, "cookies", cookies, NULL);
+ g_object_set (sink, "signal-handoffs", TRUE, NULL);
+--
+2.13.1
+
diff --git a/package.yml b/package.yml
--- a/package.yml
+++ b/package.yml
@@ -1,13 +1,17 @@
name : gstreamer-1.0-plugins-good
-version : 1.10.4
-release : 15
+version : 1.12.3
+release : 16
source :
- - https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.10.4.tar.xz : 8a86c61434a8c44665365bd0b3557a040937d1f44bf69caee4e9ea816ce74d7e
+ - https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.12.3.tar.xz : 13e7f479296891fef5a686438f20ba7d534680becf2269ecc5ee24aa83b45f03
license : LGPL-2.1
component : multimedia.gstreamer
summary : Plugins deemed to be of good quality
description: |
- Plugins that the GStreamer developers believe to be of good quality and licensing
+ GStreamer is a streaming media framework, based on graphs of elements which
+ operate on media data.
+
+ GStreamer Good Plugins is a collection of well-supported plugins of
+ good quality and under the LGPL license.
builddeps :
- pkgconfig(cairo-gobject)
- pkgconfig(flac)
@@ -30,14 +34,23 @@
- pkgconfig(wavpack)
- pkgconfig(xdamage)
- pkgconfig(xfixes)
- - wavpack-utils
- - libjpeg-turbo-devel
- aalib-devel
+ - bzip2-devel
+ - libjpeg-turbo-devel
+ - wavpack-utils
setup : |
+ %patch -p1 < $pkgfiles/0001-tests-souphttpsrc-Update-test-cert.pem.patch
+ %patch -p1 < $pkgfiles/0002-tests-souphttpsrc-Make-ssl_cert-key_file-static.patch
+ %patch -p1 < $pkgfiles/0003-tests-souphttpsrc-Avoid-deprecated-server-ssl-proper.patch
+ %patch -p1 < $pkgfiles/0004-tests-souphttpsrc-Avoid-deprecated-ssl-ca-file-prope.patch
+
%configure --disable-static \
- --with-package-name="GStreamer Good Plugins 1.6.1 Solus" \
+ --enable-experimental \
+ --with-package-name="GStreamer Good Plugins ${version} Solus" \
--with-package-origin="https://solus-project.com"
build : |
%make
install : |
%make_install
+check : |
+ %make check
diff --git a/pspec_x86_64.xml b/pspec_x86_64.xml
--- a/pspec_x86_64.xml
+++ b/pspec_x86_64.xml
@@ -2,23 +2,32 @@
<Source>
<Name>gstreamer-1.0-plugins-good</Name>
<Packager>
- <Name>Ikey Doherty</Name>
- <Email>ikey@solus-project.com</Email>
+ <Name>Pierre-Yves</Name>
+ <Email>pyu@riseup.net</Email>
</Packager>
<License>LGPL-2.1</License>
<PartOf>multimedia.gstreamer</PartOf>
<Summary xml:lang="en">Plugins deemed to be of good quality</Summary>
- <Description xml:lang="en">Plugins that the GStreamer developers believe to be of good quality and licensing
+ <Description xml:lang="en">GStreamer is a streaming media framework, based on graphs of elements which
+operate on media data.
+
+GStreamer Good Plugins is a collection of well-supported plugins of
+good quality and under the LGPL license.
</Description>
<Archive type="binary" sha1sum="79eb0752a961b8e0d15c77d298c97498fbc89c5a">https://solus-project.com/sources/README.Solus</Archive>
</Source>
<Package>
<Name>gstreamer-1.0-plugins-good</Name>
<Summary xml:lang="en">Plugins deemed to be of good quality</Summary>
- <Description xml:lang="en">Plugins that the GStreamer developers believe to be of good quality and licensing
+ <Description xml:lang="en">GStreamer is a streaming media framework, based on graphs of elements which
+operate on media data.
+
+GStreamer Good Plugins is a collection of well-supported plugins of
+good quality and under the LGPL license.
</Description>
<PartOf>multimedia.gstreamer</PartOf>
<Files>
+ <Path fileType="library">/usr/lib64/gstreamer-1.0/libgstaasink.so</Path>
<Path fileType="library">/usr/lib64/gstreamer-1.0/libgstalaw.so</Path>
<Path fileType="library">/usr/lib64/gstreamer-1.0/libgstalpha.so</Path>
<Path fileType="library">/usr/lib64/gstreamer-1.0/libgstalphacolor.so</Path>
@@ -50,14 +59,15 @@
<Path fileType="library">/usr/lib64/gstreamer-1.0/libgstjpeg.so</Path>
<Path fileType="library">/usr/lib64/gstreamer-1.0/libgstlevel.so</Path>
<Path fileType="library">/usr/lib64/gstreamer-1.0/libgstmatroska.so</Path>
+ <Path fileType="library">/usr/lib64/gstreamer-1.0/libgstmonoscope.so</Path>
<Path fileType="library">/usr/lib64/gstreamer-1.0/libgstmulaw.so</Path>
<Path fileType="library">/usr/lib64/gstreamer-1.0/libgstmultifile.so</Path>
<Path fileType="library">/usr/lib64/gstreamer-1.0/libgstmultipart.so</Path>
<Path fileType="library">/usr/lib64/gstreamer-1.0/libgstnavigationtest.so</Path>
- <Path fileType="library">/usr/lib64/gstreamer-1.0/libgstoss4audio.so</Path>
+ <Path fileType="library">/usr/lib64/gstreamer-1.0/libgstoss4.so</Path>
<Path fileType="library">/usr/lib64/gstreamer-1.0/libgstossaudio.so</Path>
<Path fileType="library">/usr/lib64/gstreamer-1.0/libgstpng.so</Path>
- <Path fileType="library">/usr/lib64/gstreamer-1.0/libgstpulse.so</Path>
+ <Path fileType="library">/usr/lib64/gstreamer-1.0/libgstpulseaudio.so</Path>
<Path fileType="library">/usr/lib64/gstreamer-1.0/libgstreplaygain.so</Path>
<Path fileType="library">/usr/lib64/gstreamer-1.0/libgstrtp.so</Path>
<Path fileType="library">/usr/lib64/gstreamer-1.0/libgstrtpmanager.so</Path>
@@ -65,7 +75,7 @@
<Path fileType="library">/usr/lib64/gstreamer-1.0/libgstshapewipe.so</Path>
<Path fileType="library">/usr/lib64/gstreamer-1.0/libgstshout2.so</Path>
<Path fileType="library">/usr/lib64/gstreamer-1.0/libgstsmpte.so</Path>
- <Path fileType="library">/usr/lib64/gstreamer-1.0/libgstsouphttpsrc.so</Path>
+ <Path fileType="library">/usr/lib64/gstreamer-1.0/libgstsoup.so</Path>
<Path fileType="library">/usr/lib64/gstreamer-1.0/libgstspectrum.so</Path>
<Path fileType="library">/usr/lib64/gstreamer-1.0/libgstspeex.so</Path>
<Path fileType="library">/usr/lib64/gstreamer-1.0/libgsttaglib.so</Path>
@@ -91,7 +101,11 @@
<Package>
<Name>gstreamer-1.0-plugins-good-docs</Name>
<Summary xml:lang="en">Documentation for gstreamer-1.0-plugins-good</Summary>
- <Description xml:lang="en">Plugins that the GStreamer developers believe to be of good quality and licensing
+ <Description xml:lang="en">GStreamer is a streaming media framework, based on graphs of elements which
+operate on media data.
+
+GStreamer Good Plugins is a collection of well-supported plugins of
+good quality and under the LGPL license.
</Description>
<PartOf>programming.docs</PartOf>
<Files>
@@ -99,12 +113,12 @@
</Files>
</Package>
<History>
- <Update release="15">
- <Date>2017-04-13</Date>
- <Version>1.10.4</Version>
+ <Update release="16">
+ <Date>2017-09-19</Date>
+ <Version>1.12.3</Version>
<Comment>Packaging update</Comment>
- <Name>Ikey Doherty</Name>
- <Email>ikey@solus-project.com</Email>
+ <Name>Pierre-Yves</Name>
+ <Email>pyu@riseup.net</Email>
</Update>
</History>
</PISI>
\ No newline at end of file

File Metadata

Mime Type
text/plain
Expires
Fri, Aug 11, 4:02 PM (3 h, 3 m ago)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
5794029
Default Alt Text
D18.id2473.diff (17 KB)

Event Timeline

Copyright © 2015-2021 Solus Project. The Solus logo is Copyright © 2016-2021 Solus Project. All Rights Reserved.