diff options
| author | Timothy Legge <timlegge@gmail.com> | 2020-02-25 23:38:51 +0000 |
|---|---|---|
| committer | Ariadne Conill <ariadne@dereferenced.org> | 2020-02-27 00:03:25 +0000 |
| commit | 30908f1d6644461985adb7fd00517a2dc8a5f1d2 (patch) | |
| tree | 3ae813c64a8ff024287f2307c1ab2700c7fe9fb7 /testing | |
| parent | fd7d2597e2c6d1bf8f205cd07ead4d1ce7bedaba (diff) | |
| download | aports-30908f1d6644461985adb7fd00517a2dc8a5f1d2.tar.bz2 aports-30908f1d6644461985adb7fd00517a2dc8a5f1d2.tar.xz | |
community/perl-crypt-openssl-verifyx509: move from testing
Diffstat (limited to 'testing')
| -rw-r--r-- | testing/perl-crypt-openssl-verifyx509/APKBUILD | 37 | ||||
| -rw-r--r-- | testing/perl-crypt-openssl-verifyx509/fix-bug-121214-compilation-fails-openssl_1.1.0.patch | 90 |
2 files changed, 0 insertions, 127 deletions
diff --git a/testing/perl-crypt-openssl-verifyx509/APKBUILD b/testing/perl-crypt-openssl-verifyx509/APKBUILD deleted file mode 100644 index f290c777b6..0000000000 --- a/testing/perl-crypt-openssl-verifyx509/APKBUILD +++ /dev/null @@ -1,37 +0,0 @@ -# Automatically generated by apkbuild-cpan, template 2 -# Contributor: Timothy Legge <timlegge@gmail.com> -# Maintainer: Timothy Legge <timlegge@gmail.com> -pkgname=perl-crypt-openssl-verifyx509 -_pkgreal=Crypt-OpenSSL-VerifyX509 -pkgver=0.10 -pkgrel=3 -pkgdesc="simple certificate verification" -url="https://metacpan.org/release/Crypt-OpenSSL-VerifyX509/" -arch="all" -license="GPL-1.0-or-later Artistic-1.0-Perl" -cpandepends=" perl-crypt-openssl-x509" -depends="$cpandepends" -makedepends="openssl-dev perl-dev" -subpackages="$pkgname-doc" -source="https://cpan.metacpan.org/authors/id/C/CH/CHRISA/Crypt-OpenSSL-VerifyX509-$pkgver.tar.gz - fix-bug-121214-compilation-fails-openssl_1.1.0.patch" -builddir="$srcdir/$_pkgreal-$pkgver" - -build() { - export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}') - PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL INSTALLDIRS=vendor - make -} - -check() { - export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}') - make test -} - -package() { - make DESTDIR="$pkgdir" install - find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete -} - -sha512sums="c206c455bdd5ae53b29fd595fd650ca756f88d9cc20034aeacdb49eba457188aa1ac380be84830a38e573ad1be958997cded42ad0afedcfc5ca168646ed3d65e Crypt-OpenSSL-VerifyX509-0.10.tar.gz -e341cd03fdde3088519920be00730a06f4cc92c8c2f5e29cda6a22e1fe6f476d155a6c51a6d8c258d649714a624b121636d6f323f42bcbbd379d93e7e08b5b74 fix-bug-121214-compilation-fails-openssl_1.1.0.patch" diff --git a/testing/perl-crypt-openssl-verifyx509/fix-bug-121214-compilation-fails-openssl_1.1.0.patch b/testing/perl-crypt-openssl-verifyx509/fix-bug-121214-compilation-fails-openssl_1.1.0.patch deleted file mode 100644 index 762a5bcb5b..0000000000 --- a/testing/perl-crypt-openssl-verifyx509/fix-bug-121214-compilation-fails-openssl_1.1.0.patch +++ /dev/null @@ -1,90 +0,0 @@ -OPENSSL deprecated several cleanup functions since -[quote] -... the OpenSSL libraries now normally do all thread initialisation and -deinitialisation automatically (see OPENSSL_init_crypto). -[end of quote] - -To hint the appropriate API version exposed by openssl, the opensslconf.h -suggests: -[quote] -/* - * Applications should use -DOPENSSL_API_COMPAT=<version> to suppress the - * declarations of functions deprecated in or before <version>. Otherwise, they - * still won't see them if the library has been built to disable deprecated - * functions. - */ -[end of quote] - -Due to -Werror the deprecation warnings lead to compilation errors so -let's just specify that we want OpenSSL API version >= 1.1.x in the -Makefile (and retain the old, pre OpenSSL-1.0, code for now). - -All tests in Crypt-OpenSSL-VerifyX509-0.10 pass for me. - ---- Crypt-OpenSSL-VerifyX509-0.10.orig/Makefile.PL 2017-05-10 20:08:03.338777954 +0200 -+++ Crypt-OpenSSL-VerifyX509-0.10/Makefile.PL 2017-05-10 19:30:13.250719288 +0200 -@@ -54,7 +54,7 @@ if (-d "/usr/include/openssl") { - } - - cc_lib_links('crypto'); --cc_optimize_flags('-O3 -Wall -Werror'); -+cc_optimize_flags('-O3 -Wall -Werror -DOPENSSL_API_COMPAT=0x10100000L'); - - requires 'Crypt::OpenSSL::X509'; - ---- Crypt-OpenSSL-VerifyX509-0.10.orig/VerifyX509.xs 2017-05-10 15:45:17.838331883 +0200 -+++ Crypt-OpenSSL-VerifyX509-0.10/VerifyX509.xs 2017-05-10 20:06:03.094774846 +0200 -@@ -17,7 +17,7 @@ typedef X509* Crypt__OpenSSL__X509; - - static int verify_cb(int ok, X509_STORE_CTX *ctx) { - if (!ok) -- switch (ctx->error) { -+ switch (X509_STORE_CTX_get_error (ctx)) { - case X509_V_ERR_CERT_HAS_EXPIRED: - /* case X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT: */ - case X509_V_ERR_INVALID_CA: -@@ -37,13 +37,20 @@ static const char *ssl_error(void) { - } - - static const char *ctx_error(X509_STORE_CTX *ctx) { -- return X509_verify_cert_error_string(ctx->error); -+ return X509_verify_cert_error_string(X509_STORE_CTX_get_error (ctx)); - } - - MODULE = Crypt::OpenSSL::VerifyX509 PACKAGE = Crypt::OpenSSL::VerifyX509 - - PROTOTYPES: DISABLE - -+#if OPENSSL_API_COMPAT >= 0x10100000L -+#undef ERR_load_crypto_strings -+#define ERR_load_crypto_strings() /* nothing */ -+#undef OpenSSL_add_all_algorithms -+# define OpenSSL_add_all_algorithms() /* nothing */ -+#endif -+ - BOOT: - ERR_load_crypto_strings(); - ERR_load_ERR_strings(); -@@ -134,6 +141,15 @@ DESTROY(store) - - if (store) X509_STORE_free(store); store = 0; - -+ -+#if OPENSSL_API_COMPAT >= 0x10100000L -+void -+__X509_cleanup(void) -+ PPCODE: -+ -+ /* deinitialisation is done automatically */ -+ -+#else - void - __X509_cleanup(void) - PPCODE: -@@ -142,3 +158,6 @@ __X509_cleanup(void) - ERR_free_strings(); - ERR_remove_state(0); - EVP_cleanup(); -+ -+#endif -+ |
