aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMilan P. Stanić <mps@arvanta.net>2021-04-24 09:02:58 +0000
committerMilan P. Stanić <mps@arvanta.net>2021-04-24 09:02:58 +0000
commitceae5145650349d85dd8ecf7c329db973cfab52f (patch)
tree9a265381e0e5aac7f19b2d3b1820c0d6e1d66a8a
parenta0c2b6ad90f93c98cabf428182a2594d6940cb32 (diff)
downloadaports-ceae5145650349d85dd8ecf7c329db973cfab52f.tar.gz
aports-ceae5145650349d85dd8ecf7c329db973cfab52f.tar.bz2
aports-ceae5145650349d85dd8ecf7c329db973cfab52f.tar.xz
community/xmlsec: upgrade to 1.2.32
remove remove-md5-for-nss.patch, fixed upstream
-rw-r--r--community/xmlsec/APKBUILD8
-rw-r--r--community/xmlsec/remove-md5-for-nss.patch28
2 files changed, 3 insertions, 33 deletions
diff --git a/community/xmlsec/APKBUILD b/community/xmlsec/APKBUILD
index e335cd5164..d9aca9667e 100644
--- a/community/xmlsec/APKBUILD
+++ b/community/xmlsec/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Sander Maijers <S.N.Maijers+Alpine@gmail.com>
# Maintainer: Sander Maijers <S.N.Maijers+Alpine@gmail.com>
pkgname=xmlsec
-pkgver=1.2.31
+pkgver=1.2.32
pkgrel=0
pkgdesc="C based implementation for XML Signature Syntax and Processing and XML Encryption Syntax and Processing"
url="https://github.com/lsh123/xmlsec/"
@@ -12,8 +12,7 @@ makedepends="libxml2-dev libxslt-dev openssl-dev nss-dev
checkdepends="nss-tools"
options="libtool !check" # disable tests til https://github.com/lsh123/xmlsec/issues/308 is fixed
subpackages="$pkgname-nss $pkgname-dev $pkgname-doc"
-source="https://github.com/lsh123/xmlsec/archive/xmlsec-${pkgver//./_}.tar.gz
- remove-md5-for-nss.patch"
+source="https://github.com/lsh123/xmlsec/archive/xmlsec-${pkgver//./_}.tar.gz"
builddir="$srcdir/$pkgname-$pkgname-${pkgver//./_}"
prepare() {
@@ -50,5 +49,4 @@ nss() {
mv "$pkgdir"/usr/lib/libxmlsec1-nss.so* "$subpkgdir"/usr/lib/
}
-sha512sums="00c67bdfed208c23cbdbcdecd0648c19b66e6036a8dd27145d3c3f2150cba92cbdf5bf976f8561273e752ed3b5c188fa56ab84677e894194c6f1269a07caf04d xmlsec-1_2_31.tar.gz
-ee9a8b672248db7eb005588c64f48536376085d309983bb9ac1ebc4ab53cbff7ef68b6ed0bea64b560fbdeaefd15b463147c7190286cf67430378732df69893a remove-md5-for-nss.patch"
+sha512sums="45e2efc6bdf6ec09db6ff01b521c3fbcf44aa9804d5692bea5296e80d7fc2f05fac322868f82840a7b67e0abd4233222098aa94a29ec9a6a7d049180cf131c57 xmlsec-1_2_32.tar.gz"
diff --git a/community/xmlsec/remove-md5-for-nss.patch b/community/xmlsec/remove-md5-for-nss.patch
deleted file mode 100644
index cd2b8c2a07..0000000000
--- a/community/xmlsec/remove-md5-for-nss.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From f3a59c721e38a663405093e2bbb30e2bf45853a2 Mon Sep 17 00:00:00 2001
-From: lsh123 <aleksey@aleksey.com>
-Date: Fri, 18 Dec 2020 16:22:40 -0800
-Subject: [PATCH] Remove MD5 for NSS 3.59 and above; enable nss test on osx and
- mingw (issue #305) (#306)
-
----
- .github/workflows/make-check.yml | 7 ++++---
- include/xmlsec/nss/crypto.h | 6 ++++++
- 2 files changed, 10 insertions(+), 3 deletions(-)
-
-diff --git a/include/xmlsec/nss/crypto.h b/include/xmlsec/nss/crypto.h
-index 223c1d85..614ac931 100644
---- a/include/xmlsec/nss/crypto.h
-+++ b/include/xmlsec/nss/crypto.h
-@@ -19,6 +19,12 @@
- #include <xmlsec/transforms.h>
- #include <xmlsec/dl.h>
-
-+
-+/* MD5 was removed from NSS */
-+#if (NSS_VMAJOR > 3) || ((NSS_VMAJOR == 3) && (NSS_VMINOR > 58))
-+#define XMLSEC_NO_MD5 1
-+#endif /* (NSS_VMAJOR > 3) || ((NSS_VMAJOR == 3) && (NSS_VMINOR > 58)) */
-+
- #ifdef __cplusplus
- extern "C" {
- #endif /* __cplusplus */