Merge branch 'master' of gnunet.org:youbroketheinternet-overlay

3 files changed, 94 insertions, 0 deletions

diff --git a/net-misc/gnurl/Manifest b/net-misc/gnurl/Manifest
index cc3948f..3c81713 100644
--- a/net-misc/gnurl/Manifest
+++ b/net-misc/gnurl/Manifest
@@ -1 +1,2 @@
 DIST gnurl-7_50_3.tar.bz2 4663008 SHA256 d332717f56c9a8b8062c9c4c9b8ed42d86161609d30c0262cdee4e60644d321e SHA512 cbdc37aee2e03659f2ba17899d0025105dd869237c108f08a611a6f502e37a429bad79729082cfe57f054ba31c11de8447d35a04145e7479e1d79dc7982e34b1 WHIRLPOOL fe0131f9db346bcc41932ac7c24d74807cc8a71d2ec3dceb0e35d44d7a06e82671772f16df4d92705c54cf095a03ea58535984bedbfd6d54bceb029e68357c87
+DIST gnurl-7_51_0.tar.bz2 4675633 SHA256 2f0200d38eca6c9567447d2b8ac4676911ec73b9613a15bef31bbe9f9f22f4e5 SHA512 9b7ce9f5f54f6b3f52b7d3152d36a591dd6be125db8d9b4199c82d5a092dc6d15c3f3d7dd4690693fbcbbff903391990ea4f51573b8aeb6966cf78fdf23232df WHIRLPOOL 88c7c3c1836ee62359e9197e930dddfe9247d228b25660969ae2a5ae47b513659a0e5e186ffbd7ba135f3392167c61019b25c2663b384ceffbb6d62419faffcb
diff --git a/net-misc/gnurl/gnurl-7.51.0.ebuild b/net-misc/gnurl/gnurl-7.51.0.ebuild
new file mode 100644
index 0000000..44db29e
--- /dev/null
+++ b/net-misc/gnurl/gnurl-7.51.0.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="A reliable small footprint version of Curl based on gnutls only"
+HOMEPAGE="https://gnunet.org/gnurl"
+
+inherit autotools eutils prefix versionator
+
+#MY_PV="$(replace_all_version_separators '_')"
+MY_P=${PN}-$(replace_all_version_separators '_')
+#SRC_URI="https://gnunet.org/sites/default/files/gnurl-7_50_2-1.tar.bz2 -> ${MY_P}.tar.bz2"
+SRC_URI="https://gnunet.org/sites/default/files/${MY_P}.tar.bz2 -> ${MY_P}.tar.bz2"
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~"
+IUSE="dane"
+
+RDEPEND=">=net-libs/gnutls-3[dane?]
+        sys-libs/zlib"
+DEPEND="${RDEPEND}"
+
+DOCS=( CHANGES README docs/FEATURES docs/MANUAL docs/FAQ docs/BUGS )
+S=${WORKDIR}/${MY_P}
+
+# TODO: check if this phase is still appropriate in content!
+src_prepare() {
+                sed -i '/LD_LIBRARY_PATH=/d' configure.ac || die #382241
+
+                eapply_user
+                eprefixify gnurl-config.in
+                eautoreconf
+
+                # Fix conflicts with Curl: UGLY HACK AHEAD /!\
+                # (The fork maintainer should do that.)
+
+                # XXX Fix this upstream: Rename include/curl to include/gnurl
+                mv include/curl include/gnurl
+                # FIX: Tune explicit paths in source files (~400 lines)
+                grep -ERl 'include(.*curl/|/curl)' | \
+                        xargs sed -i -r \
+                                  -e 's:include/curl:include/gnurl:g' \
+                                  -e 's:(include.*)curl/:\1gnurl/:g' || die
+                # FIX: Tune relative 'curl' path in makefiles under include/
+                grep -Rl 'SUBDIRS\s*=\s*curl' | \
+                        xargs sed -i -r 's:(SUBDIRS\s*=\s*)curl:\1@PACKAGE@:g' || die
+                # FIX: Tune relative 'curl' path in makefiles, install phase
+                grep -Rl 'pkgincludedir\s*=\s*.*curl' | \
+                        xargs sed -i -r 's:(pkgincludedir\s*=\s*.*)curl:\1@PACKAGE@:g' || die
+                # FIX: Skip examples and man3
+                grep -Rl 'SUBDIRS\s*=\s*.*libcurl' docs/ | \
+                        xargs sed -i -r '/SUBDIRS\s*=\s*.*libcurl/s:^:#:g' || die
+                default
+}
+
+src_configure() {
+        econf \
+                --enable-ipv6 \
+                --with-gnutls \
+                --without-cyassl \
+                --without-darwinssl \
+                --without-libmetalink \
+                --without-librtmp \
+                --without-libssh2 \
+                --without-nghttp2 \
+                --without-nss \
+                --without-polarssl \
+                --without-ssl \
+                --without-winidn \
+                --without-winssl \
+                --disable-dict \
+                --disable-file \
+                --disable-ftp \
+                --disable-gopher \
+                --disable-imap \
+                --disable-ldap \
+                --disable-ntlm-wb \
+                --disable-pop3 \
+                --disable-rtsp \
+                --disable-smtp \
+                --disable-sspi \
+                --disable-telnet \
+                --disable-tftp \
+                --disable-smb
+}
+
+src_install() {
+        default
+}
diff --git a/profiles/package.mask b/profiles/package.mask
index 70260d9..e59926a 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -9,6 +9,9 @@ sys-apps/nix
 # masked for testing
 =net-misc/gnurl-9999
 
+# security fixes, mask older versions of gnurl
+=net-misc/gnurl-7.50.3
+
 # It is known and intentional that 0.9, 0.10.1, and current (HEAD) are incompatible
 # GNUnet versions in gnunet-fs.  This leads to wrong assumptions about GNUnet, we
 # only provide a pin to certain HEAD version now and 0.10.2 when it is released.