Date: Thursday, October 19, 2017 @ 13:44:28 Author: heftig Revision: 308256
1.12.3-2 Modified: gst-plugins-good/trunk/PKGBUILD Deleted: gst-plugins-good/trunk/0002-tests-souphttpsrc-Make-ssl_cert-key_file-static.patch gst-plugins-good/trunk/0003-tests-souphttpsrc-Avoid-deprecated-server-ssl-proper.patch gst-plugins-good/trunk/0004-tests-souphttpsrc-Avoid-deprecated-ssl-ca-file-prope.patch -----------------------------------------------------------------+ 0002-tests-souphttpsrc-Make-ssl_cert-key_file-static.patch | 47 ------- 0003-tests-souphttpsrc-Avoid-deprecated-server-ssl-proper.patch | 60 ---------- 0004-tests-souphttpsrc-Avoid-deprecated-ssl-ca-file-prope.patch | 54 --------- PKGBUILD | 16 +- 4 files changed, 6 insertions(+), 171 deletions(-) Deleted: 0002-tests-souphttpsrc-Make-ssl_cert-key_file-static.patch =================================================================== --- 0002-tests-souphttpsrc-Make-ssl_cert-key_file-static.patch 2017-10-19 11:22:51 UTC (rev 308255) +++ 0002-tests-souphttpsrc-Make-ssl_cert-key_file-static.patch 2017-10-19 13:44:28 UTC (rev 308256) @@ -1,47 +0,0 @@ -From e0ac30bc06da0ffd78334621c9ee42fa8f92f195 Mon Sep 17 00:00:00 2001 -From: "Jan Alexander Steffens (heftig)" <jan.steff...@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 - Deleted: 0003-tests-souphttpsrc-Avoid-deprecated-server-ssl-proper.patch =================================================================== --- 0003-tests-souphttpsrc-Avoid-deprecated-server-ssl-proper.patch 2017-10-19 11:22:51 UTC (rev 308255) +++ 0003-tests-souphttpsrc-Avoid-deprecated-server-ssl-proper.patch 2017-10-19 13:44:28 UTC (rev 308256) @@ -1,60 +0,0 @@ -From bf9331fa8a68e58abbed72d25ccf2ab9e044669c Mon Sep 17 00:00:00 2001 -From: "Jan Alexander Steffens (heftig)" <jan.steff...@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 - Deleted: 0004-tests-souphttpsrc-Avoid-deprecated-ssl-ca-file-prope.patch =================================================================== --- 0004-tests-souphttpsrc-Avoid-deprecated-ssl-ca-file-prope.patch 2017-10-19 11:22:51 UTC (rev 308255) +++ 0004-tests-souphttpsrc-Avoid-deprecated-ssl-ca-file-prope.patch 2017-10-19 13:44:28 UTC (rev 308256) @@ -1,54 +0,0 @@ -From 4dde7d0061b6d2f9159d3f31f9c3c1faf9038fdb Mon Sep 17 00:00:00 2001 -From: "Jan Alexander Steffens (heftig)" <jan.steff...@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 - Modified: PKGBUILD =================================================================== --- PKGBUILD 2017-10-19 11:22:51 UTC (rev 308255) +++ PKGBUILD 2017-10-19 13:44:28 UTC (rev 308256) @@ -4,7 +4,7 @@ pkgname=gst-plugins-good pkgver=1.12.3 -pkgrel=1 +pkgrel=2 pkgdesc="GStreamer Multimedia Framework Good Plugins" url="https://gstreamer.freedesktop.org/" arch=(i686 x86_64) @@ -18,15 +18,11 @@ source=("git+https://anongit.freedesktop.org/git/gstreamer/gst-plugins-good#commit=$_commit" "gst-common::git+https://anongit.freedesktop.org/git/gstreamer/common" 0001-tests-souphttpsrc-Update-test-cert.pem.patch - 0002-tests-souphttpsrc-Make-ssl_cert-key_file-static.patch - 0003-tests-souphttpsrc-Avoid-deprecated-server-ssl-proper.patch - 0004-tests-souphttpsrc-Avoid-deprecated-ssl-ca-file-prope.patch) + 0001-v4l2deviceprovider-Ignore-touch-sensing-devices.patch) sha256sums=('SKIP' 'SKIP' 'c8ebf17293c7c2a623cc40339b5619d3496e49a41229780f113ea84ce83c1e60' - 'a1ff7f89a23f84ee0b407f61c32421d875e2a04b06d6d493d1e5e25f3d6e569a' - '77df36fcf0760f2bda577887ad0b2908900320d4a4f65f002cb8d8452e060d1d' - 'befe8bab743a80e5a5a8d1e3e7b6908405f7d6dce471a6d1dace243986d72428') + '7c992ae42698144be8769c276fb0e796e61400532839e6c803dc69a4dbec2d5d') pkgver() { cd $pkgname @@ -38,10 +34,10 @@ # https://bugzilla.gnome.org/show_bug.cgi?id=784005 patch -Np1 -i ../0001-tests-souphttpsrc-Update-test-cert.pem.patch - patch -Np1 -i ../0002-tests-souphttpsrc-Make-ssl_cert-key_file-static.patch - patch -Np1 -i ../0003-tests-souphttpsrc-Avoid-deprecated-server-ssl-proper.patch - patch -Np1 -i ../0004-tests-souphttpsrc-Avoid-deprecated-ssl-ca-file-prope.patch + # https://bugzilla.gnome.org/show_bug.cgi?id=789197 + patch -Np1 -i ../0001-v4l2deviceprovider-Ignore-touch-sensing-devices.patch + git submodule init git config --local submodule.common.url "$srcdir/gst-common" git submodule update