* [gentoo-commits] proj/gnome:master commit in: net-libs/glib-networking/, net-libs/glib-networking/files/
@ 2012-01-29 8:26 Priit Laes
0 siblings, 0 replies; 5+ messages in thread
From: Priit Laes @ 2012-01-29 8:26 UTC (permalink / raw
To: gentoo-commits
commit: bc231552d1a7c16797b801e291369cb3882f0265
Author: Priit Laes <plaes <AT> plaes <DOT> org>
AuthorDate: Sun Jan 29 08:22:47 2012 +0000
Commit: Priit Laes <plaes <AT> plaes <DOT> org>
CommitDate: Sun Jan 29 08:22:47 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=bc231552
net-libs/glib-networking: Add patch against crasher in TLS code
---
.../glib-networking/files/tls-async-crasher.patch | 33 ++++++++++++++++++++
.../glib-networking/glib-networking-2.31.6.ebuild | 4 ++
2 files changed, 37 insertions(+), 0 deletions(-)
diff --git a/net-libs/glib-networking/files/tls-async-crasher.patch b/net-libs/glib-networking/files/tls-async-crasher.patch
new file mode 100644
index 0000000..4ea8eb1
--- /dev/null
+++ b/net-libs/glib-networking/files/tls-async-crasher.patch
@@ -0,0 +1,33 @@
+From 51938b5e9771095f1d0feb1cab3e6d402ca7f6da Mon Sep 17 00:00:00 2001
+From: Dan Winship <danw@gnome.org>
+Date: Thu, 26 Jan 2012 12:56:51 +0000
+Subject: gnutls: fix an async handshake crash
+
+g_tls_connection_gnutls_handshake_async() would cause a crash if the
+handshake either succeeded or failed immediately (rather than getting
+an EAGAIN after making partial progress).
+
+https://bugzilla.gnome.org/show_bug.cgi?id=658771
+---
+diff --git a/tls/gnutls/gtlsconnection-gnutls.c b/tls/gnutls/gtlsconnection-gnutls.c
+index f1655d6..4bed055 100644
+--- a/tls/gnutls/gtlsconnection-gnutls.c
++++ b/tls/gnutls/gtlsconnection-gnutls.c
+@@ -969,6 +969,7 @@ g_tls_connection_gnutls_handshake_async (GTlsConnection *conn,
+ g_simple_async_result_set_op_res_gboolean (simple, TRUE);
+ g_simple_async_result_complete_in_idle (simple);
+ g_object_unref (simple);
++ return;
+ }
+ else if (!g_error_matches (error, G_IO_ERROR, G_IO_ERROR_WOULD_BLOCK))
+ {
+@@ -976,6 +977,7 @@ g_tls_connection_gnutls_handshake_async (GTlsConnection *conn,
+ g_error_free (error);
+ g_simple_async_result_complete_in_idle (simple);
+ g_object_unref (simple);
++ return;
+ }
+ else if (error)
+ g_error_free (error);
+--
+cgit v0.9.0.2
diff --git a/net-libs/glib-networking/glib-networking-2.31.6.ebuild b/net-libs/glib-networking/glib-networking-2.31.6.ebuild
index cf94aa7..10a0261 100644
--- a/net-libs/glib-networking/glib-networking-2.31.6.ebuild
+++ b/net-libs/glib-networking/glib-networking-2.31.6.ebuild
@@ -31,6 +31,10 @@ DEPEND="${RDEPEND}
test? ( sys-apps/dbus[X] )"
# eautoreconf needs >=sys-devel/autoconf-2.65:2.5
+src_prepare() {
+ epatch "${FILESDIR}/tls-async-crasher.patch"
+}
+
pkg_setup() {
# AUTHORS, ChangeLog are empty
DOCS="NEWS README"
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: net-libs/glib-networking/, net-libs/glib-networking/files/
@ 2012-01-29 9:42 Priit Laes
0 siblings, 0 replies; 5+ messages in thread
From: Priit Laes @ 2012-01-29 9:42 UTC (permalink / raw
To: gentoo-commits
commit: 1c5036dc904539163657a337503bf34769b1ec82
Author: Priit Laes <plaes <AT> plaes <DOT> org>
AuthorDate: Sun Jan 29 09:39:16 2012 +0000
Commit: Priit Laes <plaes <AT> plaes <DOT> org>
CommitDate: Sun Jan 29 09:39:16 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=1c5036dc
net-libs/glib-networking: Add pkcs11 support
---
.../files/skip-broken-assert-in-pkcs11-tests.patch | 45 ++++++++++++++++++++
.../glib-networking/glib-networking-2.31.6.ebuild | 14 ++++--
2 files changed, 54 insertions(+), 5 deletions(-)
diff --git a/net-libs/glib-networking/files/skip-broken-assert-in-pkcs11-tests.patch b/net-libs/glib-networking/files/skip-broken-assert-in-pkcs11-tests.patch
new file mode 100644
index 0000000..18b815e
--- /dev/null
+++ b/net-libs/glib-networking/files/skip-broken-assert-in-pkcs11-tests.patch
@@ -0,0 +1,45 @@
+From b35f613474c3eb1f037191b29976527cf27807dd Mon Sep 17 00:00:00 2001
+From: Priit Laes <plaes@plaes.org>
+Date: Sun, 29 Jan 2012 11:31:04 +0200
+Subject: [PATCH] Skip broken assert in pkcs11 tests
+
+https://bugzilla.gnome.org/show_bug.cgi?id=668945
+---
+ tls/tests/pkcs11-pin.c | 6 ++++++
+ 1 files changed, 6 insertions(+), 0 deletions(-)
+
+diff --git a/tls/tests/pkcs11-pin.c b/tls/tests/pkcs11-pin.c
+index d4051f9..250307b 100644
+--- a/tls/tests/pkcs11-pin.c
++++ b/tls/tests/pkcs11-pin.c
+@@ -101,13 +101,17 @@ test_set_get_value (TestPin *test,
+
+ value = g_tls_password_get_value (test->pin, &n_value);
+ g_assert_cmpuint (n_value, ==, 6);
++#if 0
+ g_assert_cmpstr ((const gchar *)value, ==, "secret");
++#endif
+
+ g_tls_password_set_value (test->pin, (const guchar *)"other", 5);
+
+ value = g_tls_password_get_value (test->pin, &n_value);
+ g_assert_cmpuint (n_value, ==, 5);
++#if 0
+ g_assert_cmpstr ((const gchar *)value, ==, "other");
++#endif
+ }
+
+ static void
+@@ -124,7 +128,9 @@ test_internal_pin (TestPin *test,
+
+ value = p11_kit_pin_get_value (pin, &n_value);
+ g_assert_cmpuint (n_value, ==, 6);
++#if 0
+ g_assert_cmpstr ((const gchar *)value, ==, "secret");
++#endif
+
+ p11_kit_pin_unref (pin);
+ }
+--
+1.7.8.4
+
diff --git a/net-libs/glib-networking/glib-networking-2.31.6.ebuild b/net-libs/glib-networking/glib-networking-2.31.6.ebuild
index 10a0261..84959b4 100644
--- a/net-libs/glib-networking/glib-networking-2.31.6.ebuild
+++ b/net-libs/glib-networking/glib-networking-2.31.6.ebuild
@@ -14,12 +14,14 @@ HOMEPAGE="http://git.gnome.org/browse/glib-networking/"
LICENSE="LGPL-2"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE="+gnome +libproxy +ssl test" # pkcs11
+IUSE="+gnome +libproxy pkcs11 +ssl test"
-# pkcs support requires gnutls-2.12.8, p11-kit-0.8
RDEPEND=">=dev-libs/glib-2.31.6:2
gnome? ( gnome-base/gsettings-desktop-schemas )
libproxy? ( >=net-libs/libproxy-0.4.6-r3 )
+ pkcs11? (
+ >=app-crypt/p11-kit-0.8
+ >=net-libs/gnutls-2.12.8[pkcs11] )
ssl? (
app-misc/ca-certificates
>=net-libs/gnutls-2.11.0 )
@@ -32,7 +34,10 @@ DEPEND="${RDEPEND}
# eautoreconf needs >=sys-devel/autoconf-2.65:2.5
src_prepare() {
+ # Applied upstream
epatch "${FILESDIR}/tls-async-crasher.patch"
+ # https://bugzilla.gnome.org/show_bug.cgi?id=668945
+ epatch "${FILESDIR}/skip-broken-assert-in-pkcs11-tests.patch"
}
pkg_setup() {
@@ -43,9 +48,8 @@ pkg_setup() {
--with-ca-certificates="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt
$(use_with gnome gnome-proxy)
$(use_with libproxy)
- $(use_with ssl gnutls)
- --without-pkcs11"
- #$(use_with pkcs11 pkcs11)
+ $(use_with pkcs11)
+ $(use_with ssl gnutls)"
}
src_test() {
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: net-libs/glib-networking/, net-libs/glib-networking/files/
@ 2012-03-07 0:58 Alexandre Restovtsev
0 siblings, 0 replies; 5+ messages in thread
From: Alexandre Restovtsev @ 2012-03-07 0:58 UTC (permalink / raw
To: gentoo-commits
commit: 3b3e708aa0aa0e9c8687a5f4338d0b9447171fe1
Author: Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 7 00:54:03 2012 +0000
Commit: Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Wed Mar 7 00:56:27 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=3b3e708a
net-libs/glib-networking: 2.31.6 → 2.31.20
Patches were applied upstream. Update -D*DEPRECATED-disabling sed from
gentoo-x86.
---
.../files/skip-broken-assert-in-pkcs11-tests.patch | 45 --------------------
.../glib-networking/files/tls-async-crasher.patch | 33 --------------
....31.6.ebuild => glib-networking-2.31.20.ebuild} | 24 +++++++---
3 files changed, 17 insertions(+), 85 deletions(-)
diff --git a/net-libs/glib-networking/files/skip-broken-assert-in-pkcs11-tests.patch b/net-libs/glib-networking/files/skip-broken-assert-in-pkcs11-tests.patch
deleted file mode 100644
index 18b815e..0000000
--- a/net-libs/glib-networking/files/skip-broken-assert-in-pkcs11-tests.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From b35f613474c3eb1f037191b29976527cf27807dd Mon Sep 17 00:00:00 2001
-From: Priit Laes <plaes@plaes.org>
-Date: Sun, 29 Jan 2012 11:31:04 +0200
-Subject: [PATCH] Skip broken assert in pkcs11 tests
-
-https://bugzilla.gnome.org/show_bug.cgi?id=668945
----
- tls/tests/pkcs11-pin.c | 6 ++++++
- 1 files changed, 6 insertions(+), 0 deletions(-)
-
-diff --git a/tls/tests/pkcs11-pin.c b/tls/tests/pkcs11-pin.c
-index d4051f9..250307b 100644
---- a/tls/tests/pkcs11-pin.c
-+++ b/tls/tests/pkcs11-pin.c
-@@ -101,13 +101,17 @@ test_set_get_value (TestPin *test,
-
- value = g_tls_password_get_value (test->pin, &n_value);
- g_assert_cmpuint (n_value, ==, 6);
-+#if 0
- g_assert_cmpstr ((const gchar *)value, ==, "secret");
-+#endif
-
- g_tls_password_set_value (test->pin, (const guchar *)"other", 5);
-
- value = g_tls_password_get_value (test->pin, &n_value);
- g_assert_cmpuint (n_value, ==, 5);
-+#if 0
- g_assert_cmpstr ((const gchar *)value, ==, "other");
-+#endif
- }
-
- static void
-@@ -124,7 +128,9 @@ test_internal_pin (TestPin *test,
-
- value = p11_kit_pin_get_value (pin, &n_value);
- g_assert_cmpuint (n_value, ==, 6);
-+#if 0
- g_assert_cmpstr ((const gchar *)value, ==, "secret");
-+#endif
-
- p11_kit_pin_unref (pin);
- }
---
-1.7.8.4
-
diff --git a/net-libs/glib-networking/files/tls-async-crasher.patch b/net-libs/glib-networking/files/tls-async-crasher.patch
deleted file mode 100644
index 4ea8eb1..0000000
--- a/net-libs/glib-networking/files/tls-async-crasher.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 51938b5e9771095f1d0feb1cab3e6d402ca7f6da Mon Sep 17 00:00:00 2001
-From: Dan Winship <danw@gnome.org>
-Date: Thu, 26 Jan 2012 12:56:51 +0000
-Subject: gnutls: fix an async handshake crash
-
-g_tls_connection_gnutls_handshake_async() would cause a crash if the
-handshake either succeeded or failed immediately (rather than getting
-an EAGAIN after making partial progress).
-
-https://bugzilla.gnome.org/show_bug.cgi?id=658771
----
-diff --git a/tls/gnutls/gtlsconnection-gnutls.c b/tls/gnutls/gtlsconnection-gnutls.c
-index f1655d6..4bed055 100644
---- a/tls/gnutls/gtlsconnection-gnutls.c
-+++ b/tls/gnutls/gtlsconnection-gnutls.c
-@@ -969,6 +969,7 @@ g_tls_connection_gnutls_handshake_async (GTlsConnection *conn,
- g_simple_async_result_set_op_res_gboolean (simple, TRUE);
- g_simple_async_result_complete_in_idle (simple);
- g_object_unref (simple);
-+ return;
- }
- else if (!g_error_matches (error, G_IO_ERROR, G_IO_ERROR_WOULD_BLOCK))
- {
-@@ -976,6 +977,7 @@ g_tls_connection_gnutls_handshake_async (GTlsConnection *conn,
- g_error_free (error);
- g_simple_async_result_complete_in_idle (simple);
- g_object_unref (simple);
-+ return;
- }
- else if (error)
- g_error_free (error);
---
-cgit v0.9.0.2
diff --git a/net-libs/glib-networking/glib-networking-2.31.6.ebuild b/net-libs/glib-networking/glib-networking-2.31.20.ebuild
similarity index 76%
rename from net-libs/glib-networking/glib-networking-2.31.6.ebuild
rename to net-libs/glib-networking/glib-networking-2.31.20.ebuild
index 84959b4..9ea9568 100644
--- a/net-libs/glib-networking/glib-networking-2.31.6.ebuild
+++ b/net-libs/glib-networking/glib-networking-2.31.20.ebuild
@@ -33,13 +33,6 @@ DEPEND="${RDEPEND}
test? ( sys-apps/dbus[X] )"
# eautoreconf needs >=sys-devel/autoconf-2.65:2.5
-src_prepare() {
- # Applied upstream
- epatch "${FILESDIR}/tls-async-crasher.patch"
- # https://bugzilla.gnome.org/show_bug.cgi?id=668945
- epatch "${FILESDIR}/skip-broken-assert-in-pkcs11-tests.patch"
-}
-
pkg_setup() {
# AUTHORS, ChangeLog are empty
DOCS="NEWS README"
@@ -52,6 +45,23 @@ pkg_setup() {
$(use_with ssl gnutls)"
}
+src_prepare() {
+ gnome2_src_prepare
+
+ # Drop DEPRECATED flags
+ sed -e 's:-D[A-Z_]*DISABLE_DEPRECATED *\\:\\:g' \
+ -e 's:-D[A-Z_]*DISABLE_DEPRECATED:$(NULL):g' \
+ -i Makefile.{decl,in} \
+ proxy/gnome/Makefile.in \
+ proxy/libproxy/Makefile.in \
+ proxy/tests/Makefile.in \
+ tls/gnutls/Makefile.in \
+ tls/pkcs11/Makefile.{am,in} \
+ tls/tests/Makefile.in || die
+ sed -i -e 's:-D[A-Z_]*DISABLE_DEPRECATED:$(NULL):g' \
+ tls/pkcs11/Makefile.{am,in} || die
+}
+
src_test() {
Xemake check
}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: net-libs/glib-networking/, net-libs/glib-networking/files/
@ 2014-04-25 21:07 Gilles Dartiguelongue
0 siblings, 0 replies; 5+ messages in thread
From: Gilles Dartiguelongue @ 2014-04-25 21:07 UTC (permalink / raw
To: gentoo-commits
commit: 91d983740041a978dbd5d8592013f33fb7c1bf00
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 23 21:25:32 2014 +0000
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Fri Apr 25 21:06:49 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=91d98374
net-libs/glib-networking: 2.40.0 → 2.40.1
---
.../files/glib-networking-2.40.1-unittests.patch | 45 ++++++++++++++++++++++
...2.40.0.ebuild => glib-networking-2.40.1.ebuild} | 9 ++++-
2 files changed, 53 insertions(+), 1 deletion(-)
diff --git a/net-libs/glib-networking/files/glib-networking-2.40.1-unittests.patch b/net-libs/glib-networking/files/glib-networking-2.40.1-unittests.patch
new file mode 100644
index 0000000..4301b84
--- /dev/null
+++ b/net-libs/glib-networking/files/glib-networking-2.40.1-unittests.patch
@@ -0,0 +1,45 @@
+From 8867e6a0b3b84b41b5a61c5194fa1300c5c39d8c Mon Sep 17 00:00:00 2001
+From: Gilles Dartiguelongue <eva@gentoo.org>
+Date: Fri, 25 Apr 2014 22:59:01 +0200
+Subject: [PATCH] test connection is not PKCS#11 related
+
+Avoids silly test failure:
+
+CCLD connection
+/usr/lib/gcc/x86_64-pc-linux-gnu/4.8.2/../../../../lib64/Scrt1.o: In
+function `_start':
+(.text+0x20): undefined reference to `main'
+collect2: error: ld returned 1 exit status
+Makefile:897: recipe for target 'connection' failed
+make[4]: *** [connection] Error 1
+---
+ tls/tests/Makefile.am | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/tls/tests/Makefile.am b/tls/tests/Makefile.am
+index 6287b9c..009b388 100644
+--- a/tls/tests/Makefile.am
++++ b/tls/tests/Makefile.am
+@@ -15,6 +15,9 @@ test_programs = \
+ connection \
+ $(NULL)
+
++connection_SOURCES = connection.c \
++ mock-interaction.c mock-interaction.h
++
+ if HAVE_PKCS11
+
+ test_programs += \
+@@ -33,9 +36,6 @@ pkcs11_slot_SOURCES = pkcs11-slot.c \
+ mock-pkcs11.c mock-pkcs11.h \
+ mock-interaction.c mock-interaction.h
+
+-connection_SOURCES = connection.c \
+- mock-interaction.c mock-interaction.h
+-
+ endif
+
+ testfiles_data = \
+--
+1.9.0
+
diff --git a/net-libs/glib-networking/glib-networking-2.40.0.ebuild b/net-libs/glib-networking/glib-networking-2.40.1.ebuild
similarity index 90%
rename from net-libs/glib-networking/glib-networking-2.40.0.ebuild
rename to net-libs/glib-networking/glib-networking-2.40.1.ebuild
index a76e962..ed2b92f 100644
--- a/net-libs/glib-networking/glib-networking-2.40.0.ebuild
+++ b/net-libs/glib-networking/glib-networking-2.40.1.ebuild
@@ -6,7 +6,7 @@ EAPI="5"
GCONF_DEBUG="no"
GNOME2_LA_PUNT="yes"
-inherit gnome2 virtualx
+inherit autotools eutils gnome2 virtualx
DESCRIPTION="Network-related giomodules for glib"
HOMEPAGE="http://git.gnome.org/browse/glib-networking/"
@@ -35,6 +35,13 @@ DEPEND="${RDEPEND}
"
# eautoreconf needs >=sys-devel/autoconf-2.65:2.5
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-unittests.patch
+ eautoreconf
+ gnome2_src_prepare
+}
+
+
src_configure() {
gnome2_src_configure \
--disable-static \
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: net-libs/glib-networking/, net-libs/glib-networking/files/
@ 2019-02-23 20:37 Mart Raudsepp
0 siblings, 0 replies; 5+ messages in thread
From: Mart Raudsepp @ 2019-02-23 20:37 UTC (permalink / raw
To: gentoo-commits
commit: 7d166928ab8579e94f9f7e3961356275c46fc14f
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 23 20:26:35 2019 +0000
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Sat Feb 23 20:26:35 2019 +0000
URL: https://gitweb.gentoo.org/proj/gnome.git/commit/?id=7d166928
net-libs/glib-networking: remove, newer available in ::gentoo
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>
....0-Fix-building-tls-plugin-without-pkcs11.patch | 57 --------------
.../glib-networking-2.56.0-r1.ebuild | 88 ----------------------
net-libs/glib-networking/metadata.xml | 12 ---
3 files changed, 157 deletions(-)
diff --git a/net-libs/glib-networking/files/2.56.0-Fix-building-tls-plugin-without-pkcs11.patch b/net-libs/glib-networking/files/2.56.0-Fix-building-tls-plugin-without-pkcs11.patch
deleted file mode 100644
index b460b248..00000000
--- a/net-libs/glib-networking/files/2.56.0-Fix-building-tls-plugin-without-pkcs11.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From 4e9bfe7e32767be5a18fc38734da09607f13799a Mon Sep 17 00:00:00 2001
-From: Tom Schoonjans <Tom.Schoonjans@diamond.ac.uk>
-Date: Tue, 13 Mar 2018 16:57:03 +0000
-Subject: [PATCH] Fix building tls plugin without pkcs11
-
-https://bugzilla.gnome.org/show_bug.cgi?id=794292
----
- meson.build | 3 +--
- tls/tests/meson.build | 7 ++++---
- 2 files changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/meson.build b/meson.build
-index f923e53..0eb39e3 100644
---- a/meson.build
-+++ b/meson.build
-@@ -92,6 +92,7 @@ pkg = import('pkgconfig')
- po_dir = join_paths(meson.source_root(), 'po')
-
- top_inc = include_directories('.')
-+tls_inc = include_directories('tls')
-
- subdir('po')
-
-@@ -113,8 +114,6 @@ if enable_libproxy_support or enable_gnome_proxy_support
- endif
-
- if enable_pkcs11_support
-- tls_inc = include_directories('tls')
--
- subdir('tls/pkcs11')
- endif
-
-diff --git a/tls/tests/meson.build b/tls/tests/meson.build
-index 7e1ae13..d3611c1 100644
---- a/tls/tests/meson.build
-+++ b/tls/tests/meson.build
-@@ -1,4 +1,7 @@
--incs = [top_inc]
-+incs = [
-+ top_inc,
-+ tls_inc
-+]
-
- deps = [
- gio_dep,
-@@ -25,8 +28,6 @@ test_programs = [
- ]
-
- if enable_pkcs11_support
-- incs += tls_inc
--
- pkcs11_deps = deps + [
- libgiopkcs11_dep,
- pkcs11_dep
---
-2.17.0
-
diff --git a/net-libs/glib-networking/glib-networking-2.56.0-r1.ebuild b/net-libs/glib-networking/glib-networking-2.56.0-r1.ebuild
deleted file mode 100644
index e38ed708..00000000
--- a/net-libs/glib-networking/glib-networking-2.56.0-r1.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-
-inherit gnome-meson multilib-minimal virtualx
-
-DESCRIPTION="Network-related giomodules for glib"
-HOMEPAGE="https://git.gnome.org/browse/glib-networking/"
-
-LICENSE="LGPL-2+"
-SLOT="0"
-IUSE="+gnome +libproxy smartcard test"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-
-RDEPEND="
- >=dev-libs/glib-2.56.0:2[${MULTILIB_USEDEP}]
- app-misc/ca-certificates
- >=net-libs/gnutls-3:=[${MULTILIB_USEDEP}]
- gnome? ( gnome-base/gsettings-desktop-schemas )
- libproxy? ( >=net-libs/libproxy-0.4.11-r1:=[${MULTILIB_USEDEP}] )
- smartcard? (
- >=app-crypt/p11-kit-0.18.4[${MULTILIB_USEDEP}]
- >=net-libs/gnutls-3:=[pkcs11,${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}
- >=sys-devel/gettext-0.19.4
- >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
- test? ( sys-apps/dbus[X] )
-"
-
-PATCHES=(
- "${FILESDIR}"/2.56.0-Fix-building-tls-plugin-without-pkcs11.patch
-)
-
-src_prepare() {
- default
- # Disable SSLv3 requiring fallback test, which fails with net-libs/gnutls[-sslv3], bug 595952
- # https://bugzilla.gnome.org/show_bug.cgi?id=782853
- sed -i -e '/\/tls\/connection\/fallback\/SSL/d' "${S}"/tls/tests/connection.c || die
-}
-
-multilib_src_configure() {
- gnome-meson_src_configure \
- -Dstatic_modules=false \
- -Dca_certificates_path="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt \
- $(meson_use gnome gnome_proxy_support) \
- $(meson_use libproxy libproxy_support) \
- $(meson_use smartcard pkcs11_support)
- # TODO gnutls is mandatory with meson
-}
-
-multilib_src_compile() {
- gnome-meson_src_compile
-}
-
-multilib_src_test() {
- # XXX: non-native tests fail if glib-networking is already installed.
- # have no idea what's wrong. would appreciate some help.
- multilib_is_native_abi || return 0
-
- virtx meson_src_test
-}
-
-multilib_src_install() {
- gnome-meson_src_install
-}
-
-pkg_postinst() {
- gnome-meson_pkg_postinst
-
- multilib_pkg_postinst() {
- gnome2_giomodule_cache_update \
- || die "Update GIO modules cache failed (for ${ABI})"
- }
- multilib_foreach_abi multilib_pkg_postinst
-}
-
-pkg_postrm() {
- gnome-meson_pkg_postrm
-
- multilib_pkg_postrm() {
- gnome2_giomodule_cache_update \
- || die "Update GIO modules cache failed (for ${ABI})"
- }
- multilib_foreach_abi multilib_pkg_postrm
-}
diff --git a/net-libs/glib-networking/metadata.xml b/net-libs/glib-networking/metadata.xml
deleted file mode 100644
index a1db58db..00000000
--- a/net-libs/glib-networking/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>gnome@gentoo.org</email>
- <name>Gentoo GNOME Desktop</name>
- </maintainer>
- <use>
- <flag name="libproxy">Use <pkg>net-libs/libproxy</pkg> for getting the HTTP/HTTPS/SOCKS proxy configuration</flag>
- <flag name="gnome">Extract HTTP/HTTPS/SOCKS proxy configuration stored using GSettings</flag>
- </use>
-</pkgmetadata>
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2019-02-23 20:37 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-01-29 9:42 [gentoo-commits] proj/gnome:master commit in: net-libs/glib-networking/, net-libs/glib-networking/files/ Priit Laes
-- strict thread matches above, loose matches on Subject: below --
2019-02-23 20:37 Mart Raudsepp
2014-04-25 21:07 Gilles Dartiguelongue
2012-03-07 0:58 Alexandre Restovtsev
2012-01-29 8:26 Priit Laes
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox