aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2016-10-06 13:52:30 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2016-10-10 12:04:22 +0000
commit945a13d3c885a537c233ce74f5bc54fcc008d12d (patch)
tree2bda4f029eab972b98da9d74d2249bfed58efd6d
parenta4b5e62b940e507e61815b5dad02a998e1239cac (diff)
downloadaports-945a13d3c885a537c233ce74f5bc54fcc008d12d.tar.bz2
aports-945a13d3c885a537c233ce74f5bc54fcc008d12d.tar.xz
main/partimage: rebuild against libressl
-rw-r--r--main/partimage/APKBUILD18
-rw-r--r--main/partimage/libressl.patch26
2 files changed, 37 insertions, 7 deletions
diff --git a/main/partimage/APKBUILD b/main/partimage/APKBUILD
index 83a01c341d..96f7412f4e 100644
--- a/main/partimage/APKBUILD
+++ b/main/partimage/APKBUILD
@@ -1,20 +1,21 @@
# Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
pkgname=partimage
pkgver=0.6.9
-pkgrel=1
+pkgrel=2
pkgdesc="Saves partitions having a supported filesystem to an image file"
url="http://www.partimage.org"
arch="all"
license="GPL"
depends=
-makedepends="linux-headers bzip2-dev newt-dev zlib-dev gettext-dev slang-dev openssl-dev
- newt-dev"
+makedepends="linux-headers bzip2-dev newt-dev zlib-dev gettext-dev slang-dev
+ libressl-dev newt-dev"
install=
subpackages="$pkgname-doc"
source="http://downloads.sourceforge.net/project/$pkgname/stable/$pkgver/$pkgname-$pkgver.tar.bz2
partimage-0.6.9-zlib-1.2.6.patch
partimage-0.6.9-common.patch
-"
+ libressl.patch
+ "
builddir="$srcdir"/$pkgname-$pkgver
@@ -41,10 +42,13 @@ package() {
md5sums="1bc046fd915c5debbafc85729464e513 partimage-0.6.9.tar.bz2
6139caa49838f71e6b8ac11624252cf7 partimage-0.6.9-zlib-1.2.6.patch
-82e01a132c3d4ca656f3c7e96bf86c72 partimage-0.6.9-common.patch"
+82e01a132c3d4ca656f3c7e96bf86c72 partimage-0.6.9-common.patch
+5eb6e6072b04334c2be6da6147ebcd01 libressl.patch"
sha256sums="753a6c81f4be18033faed365320dc540fe5e58183eaadcd7a5b69b096fec6635 partimage-0.6.9.tar.bz2
67bb600b135ab4e9febf2b17ca4666d8bb0a334abc4e548d555a167a32b9615d partimage-0.6.9-zlib-1.2.6.patch
-5beebb0fa26168eecccbd9baf609d5ed207cdf5f420d75218e700be95c9d6760 partimage-0.6.9-common.patch"
+5beebb0fa26168eecccbd9baf609d5ed207cdf5f420d75218e700be95c9d6760 partimage-0.6.9-common.patch
+8bd59100ddcba4b6e68b81723032b1fa7c8e140721fbd0b4a59b0f182e3b6a4b libressl.patch"
sha512sums="252885921b23933fdcdf0bb6efa4b82066b08ca95cc653296912d384ae875b421c1d39f347a90115315139176d4eab4a930c24919c2d38cf00ed29c764cd14d9 partimage-0.6.9.tar.bz2
f6feaf6967620ca5512aec50ada13e1b3676976ee2e04cebb3cd64c991ec8be47b337cd99c2656b3a1c77ce4ea25661784a8217f6d8325fd346f1d15463392ce partimage-0.6.9-zlib-1.2.6.patch
-39faba3b75302c0fb04e343b3854549c06447e28040f9c49a83d595533901e3c6af252a18d8db0394cbaabc7c9c1bde014f2d423cab80dadb6ea5322dc19a381 partimage-0.6.9-common.patch"
+39faba3b75302c0fb04e343b3854549c06447e28040f9c49a83d595533901e3c6af252a18d8db0394cbaabc7c9c1bde014f2d423cab80dadb6ea5322dc19a381 partimage-0.6.9-common.patch
+9180ec66433e843846f8b50a81962d1ecb992c8314fa83b7ae1e92fc93bab8bf7931027d907a21cb0d503572c23a27166df73f2ed7e868e37c1a380b651157a1 libressl.patch"
diff --git a/main/partimage/libressl.patch b/main/partimage/libressl.patch
new file mode 100644
index 0000000000..47285c1121
--- /dev/null
+++ b/main/partimage/libressl.patch
@@ -0,0 +1,26 @@
+diff --git a/src/client/netclient.cpp b/src/client/netclient.cpp
+index 30b8d5c..c761473 100644
+--- a/src/client/netclient.cpp
++++ b/src/client/netclient.cpp
+@@ -43,7 +43,7 @@ CNetClient::CNetClient(bool bMustLogin, bool bUseSSL):CNet()
+ {
+ showDebug(3, "initializing client ssl\n");
+ SSLeay_add_ssl_algorithms();
+- meth = SSLv2_client_method();
++ meth = TLS_client_method();
+ SSL_load_error_strings();
+ ctx = SSL_CTX_new(meth);
+ if (!ctx)
+diff --git a/src/server/netserver.cpp b/src/server/netserver.cpp
+index b3ba1c7..6bd9944 100644
+--- a/src/server/netserver.cpp
++++ b/src/server/netserver.cpp
+@@ -39,7 +39,7 @@ CNetServer::CNetServer(unsigned short int port):CNet()
+ {
+ SSL_load_error_strings();
+ SSLeay_add_ssl_algorithms();
+- meth = SSLv23_server_method();
++ meth = TLS_server_method();
+ ctx = SSL_CTX_new(meth);
+ if (!ctx)
+ {