cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update to xmlsec-1.2.26 (removing fixes for newer libressl, upstream has

Browse Source 
handled this)
This commit is contained in:
sthen 2018-06-06 14:31:11 +00:00
parent 6faa667a49
commit 16c56766f7
8 changed files with 17 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
security/xmlsec/Makefile
View File

@ -1,10 +1,9 @@
# $OpenBSD: Makefile,v 1.48 2018/03/18 13:22:57 sthen Exp $
# $OpenBSD: Makefile,v 1.49 2018/06/06 14:31:11 sthen Exp $
COMMENT-main= XML security library
COMMENT-docs= XML security library documentation
VERSION= 1.2.25
REVISION-main= 0
VERSION= 1.2.26
DISTNAME= xmlsec1-${VERSION}
PKGNAME-main= xmlsec-${VERSION}
PKGNAME-docs= xmlsec-docs-${VERSION}
@ -12,7 +11,7 @@ CATEGORIES= security
SHARED_LIBS= xmlsec1-gnutls 5.0 \
xmlsec1-openssl 4.0 \
xmlsec1-gcrypt 0.0 \
xmlsec1 8.0
xmlsec1 8.1
HOMEPAGE= https://www.aleksey.com/xmlsec/

4
security/xmlsec/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (xmlsec1-1.2.25.tar.gz) = lnyoPt8lzLW0ijxKCa00BaYzZVdlA780KQpC3huS/NI=
SIZE (xmlsec1-1.2.25.tar.gz) = 1839160
SHA256 (xmlsec1-1.2.26.tar.gz) = jYJ2yccgykKjsAI9+LeuQaLWxfmqjSDtFnLYTMiYLVA=
SIZE (xmlsec1-1.2.26.tar.gz) = 1922183

4
security/xmlsec/patches/patch-Makefile_in
View File

@ -1,9 +1,9 @@
$OpenBSD: patch-Makefile_in,v 1.1 2018/01/13 01:11:36 sthen Exp $
$OpenBSD: patch-Makefile_in,v 1.2 2018/06/06 14:31:11 sthen Exp $
Index: Makefile.in
--- Makefile.in.orig
+++ Makefile.in
@@ -1167,7 +1167,7 @@ check: check-all check-info
@@ -1175,7 +1175,7 @@ check: check-all check-info
check-all: $(TEST_APP)
for crypto in $(CHECK_CRYPTO_LIST) ; do \

19
security/xmlsec/patches/patch-include_xmlsec_openssl_crypto_h
View File

@ -1,19 +0,0 @@
$OpenBSD: patch-include_xmlsec_openssl_crypto_h,v 1.2 2018/03/18 13:22:57 sthen Exp $
Index: include/xmlsec/openssl/crypto.h
--- include/xmlsec/openssl/crypto.h.orig
+++ include/xmlsec/openssl/crypto.h
@@ -43,12 +43,7 @@ XMLSEC_CRYPTO_EXPORT const xmlChar* xmlSecOpenSSLG
* What version of the openssl API do we have? (also see configure.ac)
*
*******************************************************************/
-#if OPENSSL_VERSION_NUMBER == 0x20000000L && defined(LIBRESSL_VERSION_NUMBER)
-/* Libressl decided to take over OpenSSL version 2.0.0, likely will create
- * issues down the road...
- */
-#define XMLSEC_OPENSSL_API_100 1
-#elif OPENSSL_VERSION_NUMBER >= 0x10100000L
+#if OPENSSL_VERSION_NUMBER >= 0x10100000L
#define XMLSEC_OPENSSL_API_110 1
#elif OPENSSL_VERSION_NUMBER >= 0x10000000L
#define XMLSEC_OPENSSL_API_100 1

15
security/xmlsec/patches/patch-src_openssl_openssl_compat_h
View File

@ -1,15 +0,0 @@
$OpenBSD: patch-src_openssl_openssl_compat_h,v 1.1 2018/03/18 13:22:57 sthen Exp $
Index: src/openssl/openssl_compat.h
--- src/openssl/openssl_compat.h.orig
+++ src/openssl/openssl_compat.h
@@ -16,6 +16,9 @@
* OpenSSL 1.1.0 compatibility
*
*****************************************************************************/
+#if defined(XMLSEC_OPENSSL_API_110) && defined(LIBRESSL_VERSION_NUMBER)
+#define EVP_CIPHER_CTX_encrypting(x) ((x)->encrypt)
+#endif
#if !defined(XMLSEC_OPENSSL_API_110)
/* EVP_PKEY stuff */

4
security/xmlsec/patches/patch-tests_testrun_sh
View File

@ -1,11 +1,11 @@
$OpenBSD: patch-tests_testrun_sh,v 1.3 2018/01/13 01:11:36 sthen Exp $
$OpenBSD: patch-tests_testrun_sh,v 1.4 2018/06/06 14:31:11 sthen Exp $
Remove bash-ism.
Index: tests/testrun.sh
--- tests/testrun.sh.orig
+++ tests/testrun.sh
@@ -383,7 +383,7 @@ execEncTest() {
@@ -390,7 +390,7 @@ execEncTest() {
rm -rf $tmpfile $tmpfile.2 tmpfile.3
# run tests

8
security/xmlsec/pkg/PLIST-docs
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-docs,v 1.7 2018/01/13 01:11:36 sthen Exp $
@comment $OpenBSD: PLIST-docs,v 1.8 2018/06/06 14:31:11 sthen Exp $
share/doc/xmlsec1/
share/doc/xmlsec1/api/
share/doc/xmlsec1/api/home.png
@ -51,6 +51,12 @@ share/doc/xmlsec1/api/xmlsec-keysdata.html
share/doc/xmlsec1/api/xmlsec-keysmngr.html
share/doc/xmlsec1/api/xmlsec-list.html
share/doc/xmlsec1/api/xmlsec-membuf.html
share/doc/xmlsec1/api/xmlsec-msccng-ref.html
share/doc/xmlsec1/api/xmlsec-mscng-app.html
share/doc/xmlsec1/api/xmlsec-mscng-certkeys.html
share/doc/xmlsec1/api/xmlsec-mscng-crypto.html
share/doc/xmlsec1/api/xmlsec-mscng-keysstore.html
share/doc/xmlsec1/api/xmlsec-mscng-x509.html
share/doc/xmlsec1/api/xmlsec-mscrypto-app.html
share/doc/xmlsec1/api/xmlsec-mscrypto-certkeys.html
share/doc/xmlsec1/api/xmlsec-mscrypto-crypto.html

3
security/xmlsec/pkg/PLIST-main
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-main,v 1.7 2018/01/13 01:11:36 sthen Exp $
@comment $OpenBSD: PLIST-main,v 1.8 2018/06/06 14:31:11 sthen Exp $
@pkgpath security/xmlsec
@bin bin/xmlsec1
bin/xmlsec1-config
@ -68,5 +68,4 @@ lib/pkgconfig/xmlsec1.pc
lib/xmlsec1Conf.sh
@man man/man1/xmlsec1-config.1
@man man/man1/xmlsec1.1
share/aclocal/
share/aclocal/xmlsec1.m4