mirror of
https://gitlab.alpinelinux.org/alpine/aports.git
synced 2025-12-25 19:32:44 +01:00
main/partimage: rebuild against openssl 1.1
This commit is contained in:
Natanael Copa
parent
dc40601472
commit
9c960af877
@ -1,27 +1,28 @@
|
||||
# Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
|
||||
pkgname=partimage
|
||||
pkgver=0.6.9
|
||||
pkgrel=5
|
||||
pkgrel=6
|
||||
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
|
||||
libressl-dev newt-dev"
|
||||
openssl-dev newt-dev autoconf automake libtool"
|
||||
install=
|
||||
subpackages="$pkgname-doc"
|
||||
source="https://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
|
||||
Use-SSLv3-by-default.patch
|
||||
openssl-1.1.patch
|
||||
"
|
||||
|
||||
builddir="$srcdir"/$pkgname-$pkgver
|
||||
|
||||
prepare() {
|
||||
default_prepare || return 1
|
||||
update_config_guess || return 1
|
||||
default_prepare
|
||||
autoreconf -vif
|
||||
}
|
||||
|
||||
build() {
|
||||
@ -32,7 +33,7 @@ build() {
|
||||
--mandir=/usr/share/man \
|
||||
--infodir=/usr/share/info \
|
||||
--disable-nls
|
||||
make || return 1
|
||||
make
|
||||
}
|
||||
|
||||
package() {
|
||||
@ -40,15 +41,8 @@ package() {
|
||||
make DESTDIR="$pkgdir" install
|
||||
}
|
||||
|
||||
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
|
||||
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
|
||||
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
|
||||
9180ec66433e843846f8b50a81962d1ecb992c8314fa83b7ae1e92fc93bab8bf7931027d907a21cb0d503572c23a27166df73f2ed7e868e37c1a380b651157a1 libressl.patch"
|
||||
580d9ef868b423fd77282839f619239f92789e202fc25cb2ee409ecc43424f89bd5d31314a6aba183ef36a61b427cb24a0ca1f62f53235b5bc60f574c5469a1b Use-SSLv3-by-default.patch
|
||||
bd1bc43bed6d6829ea8d15ff8b278807815de776c8f4fe1a86a1c3695dd3c8cadc155e5bcaf7f030ca8d0fac10ad3ad48a52a29cde15832511ae52fcc307edb6 openssl-1.1.patch"
|
||||
|
||||
80
main/partimage/Use-SSLv3-by-default.patch
Normal file
80
main/partimage/Use-SSLv3-by-default.patch
Normal file
@ -0,0 +1,80 @@
|
||||
From 8b05af027723ff3a64040275d4050ff0e992d629 Mon Sep 17 00:00:00 2001
|
||||
From: Marko Kohtala <marko.kohtala@gmail.com>
|
||||
Date: Sun, 9 Feb 2014 22:54:11 +0200
|
||||
Subject: [PATCH] Use SSLv3 by default
|
||||
|
||||
SSLv2_client_method may be hidden. Use the SSLv23_client_method instead.
|
||||
|
||||
This is a fix from Debian package partimage-0.6.8-2.2.
|
||||
|
||||
Signed-off-by: Marko Kohtala <marko.kohtala@gmail.com>
|
||||
---
|
||||
src/client/netclient.cpp | 3 +--
|
||||
src/client/netclient.h | 6 ------
|
||||
src/server/netserver.cpp | 3 +--
|
||||
src/server/netserver.h | 6 ------
|
||||
4 files changed, 2 insertions(+), 16 deletions(-)
|
||||
|
||||
diff --git a/src/client/netclient.cpp b/src/client/netclient.cpp
|
||||
index 30b8d5c..43b2672 100644
|
||||
--- a/src/client/netclient.cpp
|
||||
+++ b/src/client/netclient.cpp
|
||||
@@ -43,9 +43,8 @@ CNetClient::CNetClient(bool bMustLogin, bool bUseSSL):CNet()
|
||||
{
|
||||
showDebug(3, "initializing client ssl\n");
|
||||
SSLeay_add_ssl_algorithms();
|
||||
- meth = SSLv2_client_method();
|
||||
SSL_load_error_strings();
|
||||
- ctx = SSL_CTX_new(meth);
|
||||
+ ctx = SSL_CTX_new(SSLv23_client_method());
|
||||
if (!ctx)
|
||||
THROW(ERR_SSL_CTX);
|
||||
m_bUseSSL = (ctx != NULL);
|
||||
diff --git a/src/client/netclient.h b/src/client/netclient.h
|
||||
index 8423798..9d98b39 100644
|
||||
--- a/src/client/netclient.h
|
||||
+++ b/src/client/netclient.h
|
||||
@@ -35,12 +35,6 @@ class CNetClient : public CNet
|
||||
#ifdef HAVE_SSL
|
||||
SSL_CTX * ctx;
|
||||
X509 * server_cert;
|
||||
-#if OPENSSL_VERSION_NUMBER >= 0x10000000L
|
||||
- SSL_METHOD const * meth;
|
||||
-#else
|
||||
- SSL_METHOD * meth;
|
||||
-#endif // OPENSSL_VERSION_NUMBER
|
||||
-
|
||||
#endif
|
||||
bool m_bUseSSL;
|
||||
bool m_bMustLogin;
|
||||
diff --git a/src/server/netserver.cpp b/src/server/netserver.cpp
|
||||
index a542760..28c43cc 100644
|
||||
--- a/src/server/netserver.cpp
|
||||
+++ b/src/server/netserver.cpp
|
||||
@@ -39,8 +39,7 @@ CNetServer::CNetServer( uint32_t ip4_addr, unsigned short int port):CNet()
|
||||
{
|
||||
SSL_load_error_strings();
|
||||
SSLeay_add_ssl_algorithms();
|
||||
- meth = SSLv23_server_method();
|
||||
- ctx = SSL_CTX_new(meth);
|
||||
+ ctx = SSL_CTX_new(SSLv23_server_method());
|
||||
if (!ctx)
|
||||
{
|
||||
ERR_print_errors_fp(stderr);
|
||||
diff --git a/src/server/netserver.h b/src/server/netserver.h
|
||||
index 01f6b6c..29d2a32 100644
|
||||
--- a/src/server/netserver.h
|
||||
+++ b/src/server/netserver.h
|
||||
@@ -41,12 +41,6 @@ class CNetServer : public CNet
|
||||
#ifdef HAVE_SSL
|
||||
SSL_CTX * ctx;
|
||||
X509 * client_cert;
|
||||
-#if OPENSSL_VERSION_NUMBER >= 0x10000000L
|
||||
- SSL_METHOD const * meth;
|
||||
-#else
|
||||
- SSL_METHOD * meth;
|
||||
-#endif // OPENSSL_VERSION_NUMBER
|
||||
-
|
||||
int err;
|
||||
#endif
|
||||
|
||||
13
main/partimage/openssl-1.1.patch
Normal file
13
main/partimage/openssl-1.1.patch
Normal file
@ -0,0 +1,13 @@
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index bb2ff61..cd3cc9a 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -240,7 +240,7 @@ if test "$SSL" = "yes"; then
|
||||
AC_CHECKING([ for SSL Library and Header files ... ])
|
||||
AC_SEARCH_HEADERS(rsa.h crypto.h x509.h pem.h ssl.h err.h,
|
||||
$SSL_HDR_DIR /usr/include/ssl /usr/include/openssl /usr/include,
|
||||
- [ AC_CHECK_LIB(crypto, CRYPTO_lock, [LIBS="$LIBS -lcrypto"],
|
||||
+ [ AC_CHECK_LIB(crypto, X509_new, [LIBS="$LIBS -lcrypto"],
|
||||
AC_MSG_ERROR([ Required for SSL Crypto Library not found. ])
|
||||
)
|
||||
AC_CHECK_LIB(ssl, SSL_CTX_new,
|
||||
Loading…
x
Reference in New Issue
Block a user