diff options
author | Pacho Ramos <pacho@gentoo.org> | 2016-04-04 21:05:48 +0200 |
---|---|---|
committer | Pacho Ramos <pacho@gentoo.org> | 2016-04-04 21:06:31 +0200 |
commit | 24acb0590289957f65b0595b9b8bfa044c864c7a (patch) | |
tree | 656f4c654225cd3a90f4979c4ca915ec61dc7bd0 /gnome-extra/gnome-user-share | |
parent | app-office/calligra: Drop failing live ebuild (diff) | |
download | gentoo-24acb0590289957f65b0595b9b8bfa044c864c7a.tar.gz gentoo-24acb0590289957f65b0595b9b8bfa044c864c7a.tar.bz2 gentoo-24acb0590289957f65b0595b9b8bfa044c864c7a.zip |
gnome-extra/gnome-user-share: Avoid apache prefork requirement (#551012)
Package-Manager: portage-2.2.28
Diffstat (limited to 'gnome-extra/gnome-user-share')
-rw-r--r-- | gnome-extra/gnome-user-share/files/gnome-user-share-3.18.1-no-prefork.patch | 10 | ||||
-rw-r--r-- | gnome-extra/gnome-user-share/gnome-user-share-3.18.1-r1.ebuild | 51 |
2 files changed, 61 insertions, 0 deletions
diff --git a/gnome-extra/gnome-user-share/files/gnome-user-share-3.18.1-no-prefork.patch b/gnome-extra/gnome-user-share/files/gnome-user-share-3.18.1-no-prefork.patch new file mode 100644 index 000000000000..156721d286cf --- /dev/null +++ b/gnome-extra/gnome-user-share/files/gnome-user-share-3.18.1-no-prefork.patch @@ -0,0 +1,10 @@ +--- gnome-user-share-3.14.2/data/dav_user_2.4.conf.orig 2015-06-03 20:21:27.512774376 -0600
++++ gnome-user-share-3.14.2/data/dav_user_2.4.conf 2015-06-03 20:21:33.588774303 -0600
+@@ -9,7 +9,6 @@
+ LimitXMLRequestBody 100000
+
+ LoadModule unixd_module ${HTTP_MODULES_PATH}/mod_unixd.so
+-LoadModule mpm_prefork_module ${HTTP_MODULES_PATH}/mod_mpm_prefork.so
+ LoadModule dav_module ${HTTP_MODULES_PATH}/mod_dav.so
+ LoadModule dav_fs_module ${HTTP_MODULES_PATH}/mod_dav_fs.so
+ LoadModule authn_core_module ${HTTP_MODULES_PATH}/mod_authn_core.so
\ No newline at end of file diff --git a/gnome-extra/gnome-user-share/gnome-user-share-3.18.1-r1.ebuild b/gnome-extra/gnome-user-share/gnome-user-share-3.18.1-r1.ebuild new file mode 100644 index 000000000000..a29c422bff2b --- /dev/null +++ b/gnome-extra/gnome-user-share/gnome-user-share-3.18.1-r1.ebuild @@ -0,0 +1,51 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" +GCONF_DEBUG="no" +GNOME2_LA_PUNT="yes" + +inherit eutils gnome2 multilib + +DESCRIPTION="Personal file sharing for the GNOME desktop" +HOMEPAGE="https://git.gnome.org/browse/gnome-user-share" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +# FIXME: could libnotify be made optional ? +# FIXME: selinux automagic support +RDEPEND=" + >=dev-libs/glib-2.28:2 + >=x11-libs/gtk+-3:3 + >=gnome-base/nautilus-2.91.7 + media-libs/libcanberra[gtk3] + >=www-apache/mod_dnssd-0.6 + >=www-servers/apache-2.2[apache2_modules_dav,apache2_modules_dav_fs,apache2_modules_authn_file,apache2_modules_auth_digest,apache2_modules_authz_groupfile] + >=x11-libs/libnotify-0.7:= +" +DEPEND="${RDEPEND} + !<gnome-base/gnome-control-center-3.9 + app-text/yelp-tools + app-text/docbook-xml-dtd:4.1.2 + >=dev-util/intltool-0.35 + sys-devel/gettext + virtual/pkgconfig +" + +src_prepare() { + # Upstream forces to use prefork because of Fedora defaults, but + # that is problematic for us (bug #551012) + # https://bugzilla.gnome.org/show_bug.cgi?id=750525#c2 + epatch "${FILESDIR}"/${PN}-3.18.1-no-prefork.patch + gnome2_src_prepare +} + +src_configure() { + gnome2_src_configure \ + --with-httpd=apache2 \ + --with-modules-path=/usr/$(get_libdir)/apache2/modules/ +} |