diff options
author | Dominik Kriegner <dominik.kriegner@gmail.com> | 2015-04-15 23:43:31 +0200 |
---|---|---|
committer | Dominik Kriegner <dominik.kriegner@gmail.com> | 2015-04-15 23:43:31 +0200 |
commit | d0aaecf49bf5cf745e42ed6d0d7ebb823fc99287 (patch) | |
tree | d3758c2332e26080e4093c08fd4a82622bd848b1 | |
parent | bump xrayutilities to 1.0.3 (diff) | |
download | anaximander-d0aaecf49bf5cf745e42ed6d0d7ebb823fc99287.tar.gz anaximander-d0aaecf49bf5cf745e42ed6d0d7ebb823fc99287.tar.bz2 anaximander-d0aaecf49bf5cf745e42ed6d0d7ebb823fc99287.zip |
remove davfs2
I do not use this package anymore. the local patches are now included in
new upstream releases [1]. A version bump would be the best to get this
into Gentoo.
[1] http://savannah.nongnu.org/bugs/?41438
-rw-r--r-- | net-fs/davfs2/Manifest | 4 | ||||
-rw-r--r-- | net-fs/davfs2/davfs2-1.4.7-r9999.ebuild | 64 | ||||
-rw-r--r-- | net-fs/davfs2/files/davfs2-1.4.7-cookie-oneNetNetStorage.patch | 121 | ||||
-rw-r--r-- | net-fs/davfs2/files/davfs2-1.4.7-destdir.patch | 18 |
4 files changed, 0 insertions, 207 deletions
diff --git a/net-fs/davfs2/Manifest b/net-fs/davfs2/Manifest deleted file mode 100644 index 501a7bb..0000000 --- a/net-fs/davfs2/Manifest +++ /dev/null @@ -1,4 +0,0 @@ -AUX davfs2-1.4.7-cookie-oneNetNetStorage.patch 3147 SHA256 feb88c7438ddd8034e650df305ef4e71c20b97837228d33f326b9e3939cb16d1 SHA512 09926603669b7105b8aa48adadffecfd4dc61e6e350748dd311b6d31b8ded2fd167f1561e948a3a1edb28f71f2a6313e0bc68cb452fc848317f39d5741401dd7 WHIRLPOOL dde9c1b30ce044f0f44a8e11d520588d25173d5d59e95791e5827777b7e5c9650ca19f81d3a0b63a7d3e897a8bb474e339b9d5fe83d999b929c73baed3a5d1e6 -AUX davfs2-1.4.7-destdir.patch 653 SHA256 d504c6df76e6502faeae9f8210dd5674c7e0379fea27959edbf4f3f832cfb64c SHA512 c0acbf7dd716470bfcd3bd5dee4a7b8bad40623cfa488d64441c07b0df32197d33aba61be21aa1acbf5ceadb705a95ddfea7bfbefe9d5d99d80d714c16c8dcf8 WHIRLPOOL 34bd94cce6fdddf8b636aa47967bf29326b955318f1616ad074de6e0314a588551ea2179d01f641ee5b2d324d5371de573d1d468f6b6bf71816227409d2a3bc3 -DIST davfs2-1.4.7.tar.gz 444398 SHA256 50c0ee2a12e8d09fc6a852d32bdfebb1f784939433a85f05254bc7ef28cff044 SHA512 6754d08cdfcceea47a4248fb05a6f5a1907acbc9a6c0ab175dce640b160ee24b7efdf9da38be1cc8bd6dbb0825c88a7017a3534a7c3188860dcd1bef12a5d4ae WHIRLPOOL f4c44ccc1fbd146f563605b2290068b549f6dcf247224685f2efaf9cda91a947a45dceed17d3d585407dc8e4ffa85c933d6eb5b4e78e0f00bd18cfbd53f52c7d -EBUILD davfs2-1.4.7-r9999.ebuild 1563 SHA256 51b315f07c2787cbbf33fa72a2f57be6105041261d92371559792448733ffd5b SHA512 dfecd7feb66d9b2099bf310b20ff85d93f90f5c16211bd96c6c66c5b736858b63d8afd2ecb3036aa9334fabaf9422f8c7147ccb48a48bf781888067a609c60ec WHIRLPOOL ba7b97736dee11a29222b8444af103161d3bd4ae995def98bc272d446fba7eda7696bc7ed3b684b77ce5ae6ba25667c3ae842b46c976d09c5b7faf985eb50636 diff --git a/net-fs/davfs2/davfs2-1.4.7-r9999.ebuild b/net-fs/davfs2/davfs2-1.4.7-r9999.ebuild deleted file mode 100644 index fa4d5ac..0000000 --- a/net-fs/davfs2/davfs2-1.4.7-r9999.ebuild +++ /dev/null @@ -1,64 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-fs/davfs2/davfs2-1.4.7.ebuild,v 1.6 2012/10/17 03:44:53 phajdan.jr Exp $ - -EAPI=4 - -inherit autotools eutils linux-mod user - -DESCRIPTION="Linux FUSE (or coda) driver that allows you to mount a WebDAV resource." -HOMEPAGE="http://savannah.nongnu.org/projects/davfs2" -SRC_URI="http://mirror.lihnidos.org/GNU/savannah/davfs2/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ppc x86" -IUSE="" -RESTRICT="test" - -DEPEND="dev-libs/libxml2 - net-libs/neon - sys-libs/zlib" -RDEPEND="${DEPEND}" - -pkg_setup() { - enewgroup davfs2 -} - -src_prepare() { - epatch "${FILESDIR}"/${P}-destdir.patch # fixed in 1.4.7+ upstream - epatch "${FILESDIR}"/${P}-cookie-oneNetNetStorage.patch - sed -e "s/^NE_REQUIRE_VERSIONS.*29/& 30/" -i configure.ac - eautoreconf -} - -src_configure() { - econf dav_user=nobody --enable-largefile --docdir=/usr/share/doc/${P} -} - -src_compile() { - emake -} - -src_install() { - emake DESTDIR="${D}" install -# dodoc AUTHORS BUGS ChangeLog FAQ NEWS README README.translators THANKS TODO - - dodir /var/run/mount.davfs - keepdir /var/run/mount.davfs - fowners root:davfs2 /var/run/mount.davfs - fperms 1774 /var/run/mount.davfs - -} - -pkg_postinst() { - elog - elog "Quick setup:" - elog " (as root)" - elog " # gpasswd -a \${your_user} davfs2" - elog " # echo 'http://path/to/dav /home/\${your_user}/dav davfs rw,user,noauto 0 0' >> /etc/fstab" - elog " (as user)" - elog " # mkdir -p ~/dav" - elog " \$ mount ~/dav" - elog -} diff --git a/net-fs/davfs2/files/davfs2-1.4.7-cookie-oneNetNetStorage.patch b/net-fs/davfs2/files/davfs2-1.4.7-cookie-oneNetNetStorage.patch deleted file mode 100644 index b05199a..0000000 --- a/net-fs/davfs2/files/davfs2-1.4.7-cookie-oneNetNetStorage.patch +++ /dev/null @@ -1,121 +0,0 @@ ---- davfs2-1.4.5-org/src/webdav.c 2009-11-01 18:14:07.000000000 +0100 -+++ davfs2-1.4.5-cookie/src/webdav.c 2011-08-03 18:43:16.000000000 +0200 -@@ -217,10 +217,8 @@ - /* A user defined header that is added to all requests. */ - char *custom_header; - --#if NE_VERSION_MINOR > 25 - /* Session cookie. */ --static char *cookie; --#endif -+static char *cookie_hdr; - - - /* Private function prototypes and inline functions */ -@@ -296,12 +294,34 @@ - static int - ssl_verify(void *userdata, int failures, const ne_ssl_certificate *cert); - --#if NE_VERSION_MINOR > 25 --static int --update_cookie(ne_request *req, void *userdata, const ne_status *status); --#endif /* NE_VERSION_MINOR > 25 */ - -+static void -+cookie_out(ne_request *req, void *userdata, ne_buffer *header){ -+ if(NULL != cookie_hdr){ -+ ne_buffer_zappend(header, cookie_hdr); -+ } -+} -+ -+static int -+cookie_in(ne_request *req, void *userdata, const ne_status *status){ -+ const char* value = ne_get_response_header(req, "Set-Cookie"); -+ if(value != NULL){ -+ if(cookie_hdr != NULL){ -+ ne_free(cookie_hdr); -+ } -+ char* sep = strchr(value, ';'); -+ char* clean; -+ if(sep == NULL){ -+ clean = ne_strdup(value); -+ }else{ -+ clean = ne_strndup(value, sep-value); -+ } -+ cookie_hdr = ne_concat("Cookie: ", clean, "\r\n", NULL); -+ ne_free(clean); -+ } - -+ return NE_OK; -+} - /* Public functions */ - /*==================*/ - -@@ -355,6 +375,11 @@ - } - - session = ne_session_create(args->scheme, args->host, args->port); -+ -+ if(args->allow_cookie){ -+ ne_hook_pre_send(session, cookie_out, NULL); -+ ne_hook_post_send(session, cookie_in, NULL); -+ } - - ne_set_read_timeout(session, args->read_timeout); - -@@ -460,11 +485,6 @@ - ne_hook_pre_send(session, add_header, custom_header); - } - --#if NE_VERSION_MINOR > 25 -- if (args->allow_cookie) -- ne_hook_post_send(session, update_cookie, NULL); --#endif /* NE_VERSION_MINOR > 25 */ -- - use_expect100 = args->expect100; - has_if_match_bug = args->if_match_bug; - drop_weak_etags = args->drop_weak_etags; -@@ -1994,43 +2014,3 @@ - return ret; - } - -- --#if NE_VERSION_MINOR > 25 --static int --update_cookie(ne_request *req, void *userdata, const ne_status *status) --{ -- if (status->klass != 2) -- return NE_OK; -- -- const char *cookie_hdr = ne_get_response_header(req, "Set-Cookie2"); -- if (!cookie_hdr) { -- cookie_hdr = ne_get_response_header(req, "Set-Cookie"); -- } -- if (!cookie_hdr) -- return NE_OK; -- -- if (cookie && strstr(cookie_hdr, cookie) == cookie_hdr) -- return NE_OK; -- -- char *sep = strpbrk(cookie_hdr, "\",; \n\r\0"); -- if (!sep) -- return NE_OK; -- if (*sep == '\"') -- sep = strpbrk(sep + 1, "\""); -- if (!sep) -- return NE_OK; -- -- if (cookie) { -- ne_unhook_pre_send(session, add_header, cookie); -- free(cookie); -- cookie = NULL; -- } -- -- char *value = ne_strndup(cookie_hdr, sep - cookie_hdr + 1); -- cookie = ne_concat("Cookie: $Version=1;", value, "\r\n", NULL); -- free(value); -- -- ne_hook_pre_send(session, add_header, cookie); -- return NE_OK; --} --#endif /* NE_VERSION_MINOR > 25 */ diff --git a/net-fs/davfs2/files/davfs2-1.4.7-destdir.patch b/net-fs/davfs2/files/davfs2-1.4.7-destdir.patch deleted file mode 100644 index 40dbd95..0000000 --- a/net-fs/davfs2/files/davfs2-1.4.7-destdir.patch +++ /dev/null @@ -1,18 +0,0 @@ -https://bugs.gentoo.org/384703 -Patch by Jeroen Roovers - -https://savannah.nongnu.org/support/?108104 - ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -51,8 +51,8 @@ - chmod u+s $(DESTDIR)$(sbindir)/mount.davfs; \ - if test "$(sbindir)" != "$(ssbindir)"; then \ - $(mkinstalldirs) $(DESTDIR)$(ssbindir); \ -- $(LN_S) -f $(DESTDIR)$(sbindir)/mount.davfs $(DESTDIR)$(ssbindir)/mount.davfs; \ -- $(LN_S) -f $(DESTDIR)$(sbindir)/umount.davfs $(DESTDIR)$(ssbindir)/umount.davfs; \ -+ $(LN_S) -f $(sbindir)/mount.davfs $(DESTDIR)$(ssbindir)/mount.davfs; \ -+ $(LN_S) -f $(sbindir)/umount.davfs $(DESTDIR)$(ssbindir)/umount.davfs; \ - fi - - uninstall-hook: |