* [gentoo-commits] repo/gentoo:master commit in: gnome-base/gnome-vfs/files/, gnome-base/gnome-vfs/
@ 2016-06-11 20:22 Michał Górny
0 siblings, 0 replies; 2+ messages in thread
From: Michał Górny @ 2016-06-11 20:22 UTC (permalink / raw
To: gentoo-commits
commit: 3ed0516c7dc1c1162f1924e00965d4f3f931f021
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 11 20:16:00 2016 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Jun 11 20:22:40 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3ed0516c
gnome-base/gnome-vfs: Fix gnutls-3.4+ compatibility, #560084
.../files/gnome-vfs-2.24.4-gnutls34.patch | 38 ++++++
gnome-base/gnome-vfs/gnome-vfs-2.24.4-r5.ebuild | 151 +++++++++++++++++++++
2 files changed, 189 insertions(+)
diff --git a/gnome-base/gnome-vfs/files/gnome-vfs-2.24.4-gnutls34.patch b/gnome-base/gnome-vfs/files/gnome-vfs-2.24.4-gnutls34.patch
new file mode 100644
index 0000000..78942f0
--- /dev/null
+++ b/gnome-base/gnome-vfs/files/gnome-vfs-2.24.4-gnutls34.patch
@@ -0,0 +1,38 @@
+diff -uprw gnome-vfs-2.24.4.orig/libgnomevfs/gnome-vfs-ssl.c gnome-vfs-2.24.4/libgnomevfs/gnome-vfs-ssl.c
+--- gnome-vfs-2.24.4.orig/libgnomevfs/gnome-vfs-ssl.c 2010-02-09 14:16:14.000000000 +0200
++++ gnome-vfs-2.24.4/libgnomevfs/gnome-vfs-ssl.c 2015-04-14 00:01:51.272451668 +0300
+@@ -314,21 +314,6 @@ gnome_vfs_ssl_create (GnomeVFSSSL **hand
+ #endif
+ }
+
+-#ifdef HAVE_GNUTLS
+-static const int protocol_priority[] = {GNUTLS_TLS1, GNUTLS_SSL3, 0};
+-static const int cipher_priority[] =
+- {GNUTLS_CIPHER_RIJNDAEL_128_CBC, GNUTLS_CIPHER_3DES_CBC,
+- GNUTLS_CIPHER_RIJNDAEL_256_CBC, GNUTLS_CIPHER_ARCFOUR, 0};
+-static const int comp_priority[] =
+- {GNUTLS_COMP_ZLIB, GNUTLS_COMP_NULL, 0};
+-static const int kx_priority[] =
+- {GNUTLS_KX_DHE_RSA, GNUTLS_KX_RSA, GNUTLS_KX_DHE_DSS, 0};
+-static const int mac_priority[] =
+- {GNUTLS_MAC_SHA, GNUTLS_MAC_MD5, 0};
+-
+-#endif
+-
+-
+ /**
+ * gnome_vfs_ssl_create_from_fd:
+ * @handle_return: pointer to a #GnomeVFSSSL struct, which will
+@@ -437,11 +422,7 @@ gnome_vfs_ssl_create_from_fd (GnomeVFSSS
+ gnutls_transport_set_ptr (ssl->private->tlsstate,
+ GINT_TO_POINTER (fd));
+
+- gnutls_protocol_set_priority (ssl->private->tlsstate, protocol_priority);
+- gnutls_cipher_set_priority (ssl->private->tlsstate, cipher_priority);
+- gnutls_compression_set_priority (ssl->private->tlsstate, comp_priority);
+- gnutls_kx_set_priority (ssl->private->tlsstate, kx_priority);
+- gnutls_mac_set_priority (ssl->private->tlsstate, mac_priority);
++ gnutls_set_default_priority (ssl->private->tlsstate);
+
+ gnutls_cred_set (ssl->private->tlsstate, GNUTLS_CRD_CERTIFICATE,
+ ssl->private->xcred);
diff --git a/gnome-base/gnome-vfs/gnome-vfs-2.24.4-r5.ebuild b/gnome-base/gnome-vfs/gnome-vfs-2.24.4-r5.ebuild
new file mode 100644
index 0000000..177eff7
--- /dev/null
+++ b/gnome-base/gnome-vfs/gnome-vfs-2.24.4-r5.ebuild
@@ -0,0 +1,151 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+GCONF_DEBUG="no"
+GNOME_TARBALL_SUFFIX="bz2"
+GNOME2_LA_PUNT="yes"
+
+inherit autotools eutils gnome2 multilib-minimal virtualx
+
+DESCRIPTION="Gnome Virtual Filesystem"
+HOMEPAGE="https://www.gnome.org/"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE="acl gnutls ipv6 kerberos libressl samba ssl zeroconf"
+
+RDEPEND="
+ >=gnome-base/gconf-2.32.4-r1[${MULTILIB_USEDEP}]
+ >=dev-libs/glib-2.34.3[${MULTILIB_USEDEP}]
+ >=dev-libs/libxml2-2.9.1-r4[${MULTILIB_USEDEP}]
+ >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}]
+ gnome-base/gnome-mime-data
+ >=x11-misc/shared-mime-info-0.14
+ >=dev-libs/dbus-glib-0.100.2[${MULTILIB_USEDEP}]
+ acl? (
+ >=sys-apps/acl-2.2.52-r1[${MULTILIB_USEDEP}]
+ >=sys-apps/attr-2.4.47-r1[${MULTILIB_USEDEP}] )
+ kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
+ samba? ( >=net-fs/samba-3.6.23-r1[${MULTILIB_USEDEP}] )
+ ssl? (
+ gnutls? (
+ >=net-libs/gnutls-2.12.23-r6[${MULTILIB_USEDEP}]
+ !gnome-extra/gnome-vfs-sftp )
+ !gnutls? (
+ !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0[${MULTILIB_USEDEP}] )
+ libressl? ( dev-libs/libressl[${MULTILIB_USEDEP}] )
+ !gnome-extra/gnome-vfs-sftp ) )
+ zeroconf? ( >=net-dns/avahi-0.6.31-r2[${MULTILIB_USEDEP}] )
+ abi_x86_32? (
+ !<=app-emulation/emul-linux-x86-gtklibs-20140508-r1
+ !app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)]
+ )
+"
+DEPEND="${RDEPEND}
+ sys-devel/gettext
+ gnome-base/gnome-common
+ >=dev-util/intltool-0.40
+ >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+ >=dev-util/gtk-doc-am-1.13
+"
+
+src_prepare() {
+ # Allow the Trash on afs filesystems (#106118)
+ epatch "${FILESDIR}"/${PN}-2.12.0-afs.patch
+
+ # Fix compiling with headers missing
+ epatch "${FILESDIR}"/${PN}-2.15.2-headers-define.patch
+
+ # Fix for crashes running programs via sudo
+ epatch "${FILESDIR}"/${PN}-2.16.0-no-dbus-crash.patch
+
+ # Fix automagic dependencies, upstream bug #493475
+ epatch "${FILESDIR}"/${PN}-2.20.0-automagic-deps.patch
+ epatch "${FILESDIR}"/${PN}-2.20.1-automagic-deps.patch
+
+ # Fix to identify ${HOME} (#200897)
+ # thanks to debian folks
+ epatch "${FILESDIR}"/${PN}-2.24.4-home_dir_fakeroot.patch
+
+ # Configure with gnutls-2.7, bug #253729
+ # Fix building with gnutls-2.12, bug #388895
+ epatch "${FILESDIR}"/${PN}-2.24.4-gnutls27.patch
+
+ # Prevent duplicated volumes, bug #193083
+ epatch "${FILESDIR}"/${PN}-2.24.0-uuid-mount.patch
+
+ # Do not build tests with FEATURES="-test", bug #226221
+ epatch "${FILESDIR}"/${PN}-2.24.4-build-tests-asneeded.patch
+
+ # Disable broken test, bug #285706
+ epatch "${FILESDIR}"/${PN}-2.24.4-disable-test-async-cancel.patch
+
+ # Fix for automake-1.13 compatibility, #466944
+ epatch "${FILESDIR}"/${P}-automake-1.13.patch
+
+ # Fix gnutls-3.4+ compatibility, #560084
+ # always use system defaults (patch from Arch Linux)
+ epatch "${FILESDIR}"/${P}-gnutls34.patch
+
+ sed -e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/" -i configure.in || die
+
+ eautoreconf
+ gnome2_src_prepare
+}
+
+multilib_src_configure() {
+ local myconf=(
+ --disable-schemas-install
+ --disable-static
+ --disable-cdda
+ --disable-fam
+ --disable-hal
+ --disable-howl
+ $(use_enable acl)
+ $(use_enable gnutls)
+ $(use_enable ipv6)
+ $(use_enable kerberos krb5)
+ $(use_enable samba)
+ $(use_enable ssl openssl)
+ $(use_enable zeroconf avahi)
+ # Useless ? --enable-http-neon
+
+ # fix path to krb5-config
+ KRB5_CONFIG=/usr/bin/${CHOST}-krb5-config
+ )
+
+ # this works because of the order of configure parsing
+ # so should always be behind the use_enable options
+ # foser <foser@gentoo.org 19 Apr 2004
+ use gnutls && use ssl && myconf+=( --disable-openssl )
+
+ #bug #519060
+ #configure script is so messed up on res_init on Darwin
+ [[ ${CHOST} == *-darwin* ]] && export LIBS="${LIBS} -lresolv"
+
+ ECONF_SOURCE=${S} \
+ gnome2_src_configure "${myconf[@]}"
+
+ if multilib_is_native_abi; then
+ ln -s "${S}"/doc/html doc/html || die
+ fi
+}
+
+multilib_src_test() {
+ unset DISPLAY
+ # Fix bug #285706
+ unset XAUTHORITY
+ Xemake check
+}
+
+multilib_src_install() {
+ gnome2_src_install
+}
+
+multilib_src_install_all() {
+ DOCS="AUTHORS ChangeLog HACKING NEWS README TODO"
+ einstalldocs
+}
^ permalink raw reply related [flat|nested] 2+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: gnome-base/gnome-vfs/files/, gnome-base/gnome-vfs/
@ 2021-04-04 13:55 Andreas Sturmlechner
0 siblings, 0 replies; 2+ messages in thread
From: Andreas Sturmlechner @ 2021-04-04 13:55 UTC (permalink / raw
To: gentoo-commits
commit: ed699c8184f70d7ca5e3acd33fb9d700daa54e1b
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 30 19:28:20 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Apr 4 13:51:20 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ed699c81
gnome-base/gnome-vfs: EAPI-7 bump, drop eutils, drop obsolete sed
Use GNOME2_EAUTORECONF="yes"
The only sed match was already dropped by gnome-vfs-2.24.4-automake-1.13.patch.
The same files are installed in the same locations and tests pass.
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
| 4 +--
.../files/gnome-vfs-2.20.0-automagic-deps.patch | 4 +--
.../files/gnome-vfs-2.20.1-automagic-deps.patch | 4 +--
.../files/gnome-vfs-2.24.4-openssl-1.1.patch | 4 +--
gnome-base/gnome-vfs/gnome-vfs-2.24.4-r5.ebuild | 30 +++++++---------------
5 files changed, 17 insertions(+), 29 deletions(-)
--git a/gnome-base/gnome-vfs/files/gnome-vfs-2.15.2-headers-define.patch b/gnome-base/gnome-vfs/files/gnome-vfs-2.15.2-headers-define.patch
index f74db8edb1c..9d6e9978242 100644
--- a/gnome-base/gnome-vfs/files/gnome-vfs-2.15.2-headers-define.patch
+++ b/gnome-base/gnome-vfs/files/gnome-vfs-2.15.2-headers-define.patch
@@ -1,5 +1,5 @@
---- configure.in 2006-06-13 00:36:14.000000000 -0500
-+++ configure.in 2006-06-13 00:54:15.000000000 -0500
+--- a/configure.in
++++ b/configure.in
@@ -191,6 +191,16 @@
AC_CHECK_HEADERS(sys/param.h sys/resource.h sys/vfs.h sys/mount.h sys/statfs.h sys/statvfs.h sys/param.h wctype.h sys/poll.h poll.h)
diff --git a/gnome-base/gnome-vfs/files/gnome-vfs-2.20.0-automagic-deps.patch b/gnome-base/gnome-vfs/files/gnome-vfs-2.20.0-automagic-deps.patch
index 876148b891f..18d900ac12c 100644
--- a/gnome-base/gnome-vfs/files/gnome-vfs-2.20.0-automagic-deps.patch
+++ b/gnome-base/gnome-vfs/files/gnome-vfs-2.20.0-automagic-deps.patch
@@ -1,7 +1,7 @@
Index: configure.in
===================================================================
---- configure.in (révision 5413)
-+++ configure.in (copie de travail)
+--- a/configure.in
++++ b/configure.in
@@ -448,9 +448,13 @@
dnl GSSAPI
dnl Check for Kerberos installation
diff --git a/gnome-base/gnome-vfs/files/gnome-vfs-2.20.1-automagic-deps.patch b/gnome-base/gnome-vfs/files/gnome-vfs-2.20.1-automagic-deps.patch
index 11ac34c0721..63be9f95b9d 100644
--- a/gnome-base/gnome-vfs/files/gnome-vfs-2.20.1-automagic-deps.patch
+++ b/gnome-base/gnome-vfs/files/gnome-vfs-2.20.1-automagic-deps.patch
@@ -1,5 +1,5 @@
---- configure.in. 2007-11-30 04:15:01.000000000 +0100
-+++ configure.in 2007-11-30 04:16:21.000000000 +0100
+--- a/configure.in
++++ b/configure.in
@@ -1102,6 +1102,7 @@
AS_HELP_STRING([--disable-acl],[Don't use libacl support]),
[],[enable_acl=yes])
diff --git a/gnome-base/gnome-vfs/files/gnome-vfs-2.24.4-openssl-1.1.patch b/gnome-base/gnome-vfs/files/gnome-vfs-2.24.4-openssl-1.1.patch
index 14207f28d19..cb1886ef4a2 100644
--- a/gnome-base/gnome-vfs/files/gnome-vfs-2.24.4-openssl-1.1.patch
+++ b/gnome-base/gnome-vfs/files/gnome-vfs-2.24.4-openssl-1.1.patch
@@ -4,8 +4,8 @@ struct SSL is opaque in openssl-1.1; and the SSL_free() man page
says that one should not free members of it manually (in both
the openssl-1.0 and openssl-1.1 man pages).
---- libgnomevfs/gnome-vfs-ssl.c.orig 2010-02-09 12:16:14.000000000 +0000
-+++ libgnomevfs/gnome-vfs-ssl.c
+--- a/libgnomevfs/gnome-vfs-ssl.c
++++ b/libgnomevfs/gnome-vfs-ssl.c
@@ -400,9 +400,6 @@ gnome_vfs_ssl_create_from_fd (GnomeVFSSS
}
}
diff --git a/gnome-base/gnome-vfs/gnome-vfs-2.24.4-r5.ebuild b/gnome-base/gnome-vfs/gnome-vfs-2.24.4-r5.ebuild
index ace27c50d46..aba99abca80 100644
--- a/gnome-base/gnome-vfs/gnome-vfs-2.24.4-r5.ebuild
+++ b/gnome-base/gnome-vfs/gnome-vfs-2.24.4-r5.ebuild
@@ -1,12 +1,11 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
-GCONF_DEBUG="no"
-GNOME_TARBALL_SUFFIX="bz2"
-GNOME2_LA_PUNT="yes"
+EAPI=7
-inherit autotools eutils gnome2 multilib-minimal virtualx
+GNOME_TARBALL_SUFFIX="bz2"
+GNOME2_EAUTORECONF="yes"
+inherit gnome2 multilib-minimal virtualx
DESCRIPTION="Gnome Virtual Filesystem"
HOMEPAGE="https://www.gnome.org/"
@@ -39,7 +38,8 @@ RDEPEND="
!gnome-extra/gnome-vfs-sftp ) )
zeroconf? ( >=net-dns/avahi-0.6.31-r2[dbus,${MULTILIB_USEDEP}] )
"
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
dev-util/glib-utils
sys-devel/gettext
gnome-base/gnome-common
@@ -48,6 +48,8 @@ DEPEND="${RDEPEND}
>=dev-util/gtk-doc-am-1.13
"
+DOCS=( "${S}"/{AUTHORS,ChangeLog,HACKING,NEWS,README,TODO} )
+
PATCHES=(
# Allow the Trash on afs filesystems (#106118)
"${FILESDIR}"/${PN}-2.12.0-afs.patch
@@ -90,15 +92,6 @@ PATCHES=(
"${FILESDIR}"/${PN}-2.24.4-openssl-1.1.patch
)
-src_prepare() {
- epatch "${PATCHES[@]}"
-
- sed -e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/" -i configure.in || die
-
- eautoreconf
- gnome2_src_prepare
-}
-
multilib_src_configure() {
local myconf=(
--disable-schemas-install
@@ -141,14 +134,9 @@ multilib_src_test() {
unset DISPLAY
# Fix bug #285706
unset XAUTHORITY
- Xemake check
+ virtx emake check
}
multilib_src_install() {
gnome2_src_install
}
-
-multilib_src_install_all() {
- DOCS="AUTHORS ChangeLog HACKING NEWS README TODO"
- einstalldocs
-}
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-04-04 13:56 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-06-11 20:22 [gentoo-commits] repo/gentoo:master commit in: gnome-base/gnome-vfs/files/, gnome-base/gnome-vfs/ Michał Górny
-- strict thread matches above, loose matches on Subject: below --
2021-04-04 13:55 Andreas Sturmlechner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox