Date: Sunday, February 4, 2018 @ 11:05:12 Author: foutrelis Revision: 288955
archrelease: copy trunk to multilib-x86_64 Added: lib32-gst-plugins-good/repos/multilib-x86_64/PKGBUILD (from rev 288954, lib32-gst-plugins-good/trunk/PKGBUILD) Deleted: lib32-gst-plugins-good/repos/multilib-x86_64/0001-tests-souphttpsrc-Update-test-cert.pem.patch lib32-gst-plugins-good/repos/multilib-x86_64/0002-tests-souphttpsrc-Make-ssl_cert-key_file-static.patch lib32-gst-plugins-good/repos/multilib-x86_64/0003-tests-souphttpsrc-Avoid-deprecated-server-ssl-proper.patch lib32-gst-plugins-good/repos/multilib-x86_64/0004-tests-souphttpsrc-Avoid-deprecated-ssl-ca-file-prope.patch lib32-gst-plugins-good/repos/multilib-x86_64/PKGBUILD -----------------------------------------------------------------+ 0001-tests-souphttpsrc-Update-test-cert.pem.patch | 58 --- 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 | 156 ++++------ 5 files changed, 71 insertions(+), 304 deletions(-) Deleted: 0001-tests-souphttpsrc-Update-test-cert.pem.patch =================================================================== --- 0001-tests-souphttpsrc-Update-test-cert.pem.patch 2018-02-04 11:04:59 UTC (rev 288954) +++ 0001-tests-souphttpsrc-Update-test-cert.pem.patch 2018-02-04 11:05:12 UTC (rev 288955) @@ -1,58 +0,0 @@ -From 5166461059402fb0a7130fdc100e96698b1f90b7 Mon Sep 17 00:00:00 2001 -From: "Jan Alexander Steffens (heftig)" <jan.steff...@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 - Deleted: 0002-tests-souphttpsrc-Make-ssl_cert-key_file-static.patch =================================================================== --- 0002-tests-souphttpsrc-Make-ssl_cert-key_file-static.patch 2018-02-04 11:04:59 UTC (rev 288954) +++ 0002-tests-souphttpsrc-Make-ssl_cert-key_file-static.patch 2018-02-04 11:05:12 UTC (rev 288955) @@ -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 2018-02-04 11:04:59 UTC (rev 288954) +++ 0003-tests-souphttpsrc-Avoid-deprecated-server-ssl-proper.patch 2018-02-04 11:05:12 UTC (rev 288955) @@ -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 2018-02-04 11:04:59 UTC (rev 288954) +++ 0004-tests-souphttpsrc-Avoid-deprecated-ssl-ca-file-prope.patch 2018-02-04 11:05:12 UTC (rev 288955) @@ -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 - Deleted: PKGBUILD =================================================================== --- PKGBUILD 2018-02-04 11:04:59 UTC (rev 288954) +++ PKGBUILD 2018-02-04 11:05:12 UTC (rev 288955) @@ -1,85 +0,0 @@ -# $Id$ -# Maintainer: Felix Yan <felixonm...@archlinux.org> -# Contributor: Jan de Groot <j...@archlinux.org> - -_basename=gst-plugins-good -pkgname=lib32-gst-plugins-good -pkgver=1.12.2 -pkgrel=1 -pkgdesc="GStreamer Multimedia Framework Good Plugins (32-bit)" -url="https://gstreamer.freedesktop.org/" -arch=('x86_64') -license=('LGPL') -depends=(lib32-libpulse lib32-jack lib32-libsoup lib32-gst-plugins-base-libs lib32-wavpack - lib32-aalib lib32-taglib lib32-libdv lib32-libshout lib32-libvpx lib32-gdk-pixbuf2 - lib32-libcaca lib32-libavc1394 lib32-libiec61883 lib32-libxdamage lib32-v4l-utils - lib32-cairo lib32-libgudev lib32-speex lib32-flac lib32-libraw1394 gst-plugins-good) -makedepends=(lib32-gstreamer python autoconf-archive git) -checkdepends=(lib32-gst-plugins-base) -options=(!emptydirs) -_commit=188ab74da41dc0d0c62e7918327fba7bdabdf314 # tags/1.12.2^0 -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) -sha512sums=('SKIP' - 'SKIP' - 'b5e675448dc80f32207046a5fa6bd8b59da8d63bf2a0fc35763e39dac343cef4e88564e7fba4aa8ac0408370cf3d50b2f081c139c353e9b79982a03d58d77ef2' - 'b795d1f17c134b2cf3d9ccd1a016f54ab1a963dcd37386f8ec32a80af74844caaa1493a66cf3ed55ca5c9372d67e0bfd3e60671c4e2ec4f09d9a865b3b6a6975' - 'f55e304abda9b62e6bc811f0224585bbfb92de6802dabd24d08b0ff03dcfa97c8857f0be86a5af23ead46373c130f06264e435a44f0aac88b794112a9691245d' - '672f7ef0d2e5352de589640537a00de9a22fc615568440761b46fee8645989da2653baa73e330f841cb1180acad9779b2067d8084c04cd884a1acacd6fbc3509') - -pkgver() { - cd $_basename - git describe --tags | sed 's/-//g' -} - -prepare() { - cd $_basename - - # 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 - - git submodule init - git config --local submodule.common.url "$srcdir/gst-common" - git submodule update - - NOCONFIGURE=1 ./autogen.sh -} - -build() { - cd $_basename - - export CC='gcc -m32' - export CXX='g++ -m32' - export PKG_CONFIG_PATH='/usr/lib32/pkgconfig' - - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ - --build=i686-pc-linux-gnu --libdir=/usr/lib32 \ - --with-package-name="GStreamer Good Plugins (Arch Linux)" \ - --with-package-origin="https://www.archlinux.org/" \ - --enable-experimental --disable-static --disable-gtk-doc \ - - # https://bugzilla.gnome.org/show_bug.cgi?id=655517 - sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool - - make -} - -# FAIL: elements/rtp-payloading -#check() { -# cd $_basename -# make check -#} - -package() { - cd $_basename - make DESTDIR="${pkgdir}" install - - rm -r "$pkgdir"/usr/share -} Copied: lib32-gst-plugins-good/repos/multilib-x86_64/PKGBUILD (from rev 288954, lib32-gst-plugins-good/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2018-02-04 11:05:12 UTC (rev 288955) @@ -0,0 +1,71 @@ +# $Id$ +# Maintainer: Felix Yan <felixonm...@archlinux.org> +# Contributor: Jan de Groot <j...@archlinux.org> + +_basename=gst-plugins-good +pkgname=lib32-gst-plugins-good +pkgver=1.12.4 +pkgrel=1 +pkgdesc="GStreamer Multimedia Framework Good Plugins (32-bit)" +url="https://gstreamer.freedesktop.org/" +arch=('x86_64') +license=('LGPL') +depends=(lib32-libpulse lib32-jack lib32-libsoup lib32-gst-plugins-base-libs lib32-wavpack + lib32-aalib lib32-taglib lib32-libdv lib32-libshout lib32-libvpx lib32-gdk-pixbuf2 + lib32-libcaca lib32-libavc1394 lib32-libiec61883 lib32-libxdamage lib32-v4l-utils + lib32-cairo lib32-libgudev lib32-speex lib32-flac lib32-libraw1394 gst-plugins-good) +makedepends=(lib32-gstreamer aalib python autoconf-archive git) +checkdepends=(lib32-gst-plugins-base) +options=(!emptydirs) +_commit=224938300a3b0fd8263422c3548576ac939032e5 # tags/1.12.4^0 +source=("git+https://anongit.freedesktop.org/git/gstreamer/gst-plugins-good#commit=$_commit" + "gst-common::git+https://anongit.freedesktop.org/git/gstreamer/common") +sha512sums=('SKIP' + 'SKIP') + +pkgver() { + cd $_basename + git describe --tags | sed 's/-//g' +} + +prepare() { + cd $_basename + + git submodule init + git config --local submodule.common.url "$srcdir/gst-common" + git submodule update + + NOCONFIGURE=1 ./autogen.sh +} + +build() { + cd $_basename + + export CC='gcc -m32' + export CXX='g++ -m32' + export PKG_CONFIG_PATH='/usr/lib32/pkgconfig' + + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ + --build=i686-pc-linux-gnu --libdir=/usr/lib32 \ + --with-package-name="GStreamer Good Plugins (Arch Linux)" \ + --with-package-origin="https://www.archlinux.org/" \ + --enable-experimental --disable-static --disable-gtk-doc \ + + # https://bugzilla.gnome.org/show_bug.cgi?id=655517 + sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool + + make +} + +# FAIL: elements/rtp-payloading +#check() { +# cd $_basename +# make check +#} + +package() { + cd $_basename + make DESTDIR="${pkgdir}" install + + rm -r "$pkgdir"/usr/share +}