From 9a0891956ea48e742a92a8dde8f88f6b1ffd521c Mon Sep 17 00:00:00 2001 From: Juan RP Date: Mon, 14 Jul 2014 11:34:18 +0200 Subject: [PATCH 1/5] curl: drop krb/gss; enable zlib; switch to libressl. --- srcpkgs/curl/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/curl/template b/srcpkgs/curl/template index 07aa9f2472..721e8a71c9 100644 --- a/srcpkgs/curl/template +++ b/srcpkgs/curl/template @@ -1,13 +1,13 @@ # Template build file for 'curl'. pkgname=curl version=7.37.0 -revision=1 +revision=2 build_style=gnu-configure -configure_args="--disable-ldaps --with-gssapi=${XBPS_CROSS_BASE}/usr +configure_args="--disable-ldaps --without-gssapi --enable-threaded-resolver --enable-ipv6 --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt" hostmakedepends="pkg-config perl groff" -makedepends="libidn-devel openssl-devel mit-krb5-devel ca-certificates" +makedepends="zlib-devel libidn-devel libressl-devel ca-certificates" depends="ca-certificates" short_desc="Client that groks URLs" maintainer="Juan RP " @@ -24,7 +24,7 @@ libcurl_package() { } libcurl-devel_package() { - depends="libidn-devel openssl-devel mit-krb5-devel libcurl>=${version}_${revision}" + depends="zlib-devel libidn-devel libressl-devel libcurl>=${version}_${revision}" short_desc="The multiprotocol file transfer library - development files" pkg_install() { vmove usr/bin/curl-config From 39eaa25977d21da280aec66a622abba7c6d8a8c1 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Mon, 14 Jul 2014 11:37:18 +0200 Subject: [PATCH 2/5] git: switch to libressl. --- srcpkgs/git/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/git/template b/srcpkgs/git/template index ea0b8709fc..49286e83b4 100644 --- a/srcpkgs/git/template +++ b/srcpkgs/git/template @@ -1,13 +1,13 @@ # Template build file for "git". pkgname=git version=2.0.1 -revision=1 +revision=2 build_style=gnu-configure configure_args="--with-curl --with-expat --without-tcltk ac_cv_fread_reads_directories=no ac_cv_snprintf_returns_bogus=no" make_install_args="NO_INSTALL_HARDLINKS=1" hostmakedepends="xmlto>=0.0.25_2 asciidoc perl python" -makedepends="openssl-devel libcurl-devel expat-devel ca-certificates" +makedepends="libressl-devel libcurl-devel expat-devel ca-certificates" # Required by https:// depends="ca-certificates" short_desc="GIT Tree History Storage Tool" From e934809d1471fcd210bc950586de684e9c57edc1 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Mon, 14 Jul 2014 11:42:16 +0200 Subject: [PATCH 3/5] iputils: switch to libressl. --- srcpkgs/iputils/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/iputils/template b/srcpkgs/iputils/template index 01b974ac49..62c9b3267d 100644 --- a/srcpkgs/iputils/template +++ b/srcpkgs/iputils/template @@ -1,10 +1,10 @@ # Template file for 'iputils' pkgname=iputils version=20121221 -revision=3 +revision=4 patch_args="-Np1" wrksrc="${pkgname}-s${version}" -makedepends="openssl-devel libcap-devel" +makedepends="libressl-devel libcap-devel" depends="libcap-progs" short_desc="IP Configuration Utilities (and ping)" maintainer="Juan RP " From b9328a1748e8a551c590db7f19a9aeb68bac0e5f Mon Sep 17 00:00:00 2001 From: Juan RP Date: Mon, 14 Jul 2014 11:43:34 +0200 Subject: [PATCH 4/5] libevent: switch to libressl. --- srcpkgs/libevent/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/libevent/template b/srcpkgs/libevent/template index 94621d6352..08b723fb0d 100644 --- a/srcpkgs/libevent/template +++ b/srcpkgs/libevent/template @@ -1,10 +1,10 @@ # Template file for 'libevent' pkgname=libevent version=2.0.21 -revision=4 +revision=5 wrksrc="$pkgname-$version-stable" build_style=gnu-configure -makedepends="openssl-devel" +makedepends="libressl-devel" short_desc="Abstract asynchronous event notification library" maintainer="Juan RP " homepage="http://www.monkey.org/~provos/libevent/" @@ -13,7 +13,7 @@ distfiles="${SOURCEFORGE_SITE}/levent/$pkgname-$version-stable.tar.gz" checksum=22a530a8a5ba1cb9c080cba033206b17dacd21437762155c6d30ee6469f574f5 libevent-devel_package() { - depends="openssl-devel ${sourcepkg}>=${version}_${revision}" + depends="${makedepends} ${sourcepkg}>=${version}_${revision}" short_desc+=" - development files" pkg_install() { vmove usr/bin From 4427ff68f653b17c8d086178fe5e5599ab6468d8 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Mon, 14 Jul 2014 11:47:07 +0200 Subject: [PATCH 5/5] openssl: add conflicts with libressl. --- srcpkgs/openssl/template | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/srcpkgs/openssl/template b/srcpkgs/openssl/template index 7fcea19427..b3e56d0d50 100644 --- a/srcpkgs/openssl/template +++ b/srcpkgs/openssl/template @@ -2,7 +2,7 @@ pkgname=openssl _openssl_version=1.0.1 version=${_openssl_version}h -revision=1 +revision=2 bootstrap=yes short_desc="Secure Socket Layer and cryptographic library - runtime utilities" maintainer="Juan RP " @@ -17,6 +17,7 @@ fi depends="perl" makedepends="zlib-devel" +conflicts="libressl-openssl>=0" conf_files="/etc/ssl/openssl.cnf" make_dirs=" @@ -70,6 +71,7 @@ do_install() { } openssl-devel_package() { + conflicts="libressl-devel>=0" depends="zlib-devel libssl>=${version}_${revision}" short_desc="Secure Socket Layer and cryptographic library - development files" pkg_install() {