openbsd/ports
1
0
Fork 0
mirror of https://github.com/openbsd/ports.git synced 2026-06-18 07:24:23 +02:00
Code Issues Packages Projects Releases Wiki Activity

update to xmlsec-1.3.3

Browse Source
This commit is contained in:
sthen
2024-01-08 08:03:04 +00:00
parent 7d374b2a4c
commit 42e8a5f2b9
10 changed files with 11 additions and 152 deletions
Download Patch File Download Diff File Expand all files Collapse all files
security/xmlsec/Makefile
+5 -5
View File
@@ -1,15 +1,15 @@
COMMENT-main= XML security library
COMMENT-docs= XML security library documentation
VERSION= 1.3.2
VERSION= 1.3.3
DISTNAME= xmlsec1-${VERSION}
PKGNAME-main= xmlsec-${VERSION}
PKGNAME-docs= xmlsec-docs-${VERSION}
CATEGORIES= security
SHARED_LIBS= xmlsec1-gnutls 6.1 \
xmlsec1-openssl 5.0 \
xmlsec1-gcrypt 1.0 \
xmlsec1 9.0
SHARED_LIBS= xmlsec1-gnutls 7.0 \
xmlsec1-openssl 6.0 \
xmlsec1-gcrypt 2.0 \
xmlsec1 10.0
HOMEPAGE= https://www.aleksey.com/xmlsec/
security/xmlsec/distinfo
+2 -2
View File
@@ -1,2 +1,2 @@
SHA256 (xmlsec1-1.3.2.tar.gz) = QAPFaz01bSGx23d1MYVA+ta/7a9fEX6PfAEIESGb488=
SIZE (xmlsec1-1.3.2.tar.gz) = 2437263
SHA256 (xmlsec1-1.3.3.tar.gz) = q1uan/1pYPRvdGbZ2R8XTsN+jDGYkje6a56s3YFkZPI=
SIZE (xmlsec1-1.3.3.tar.gz) = 2435741
security/xmlsec/patches/patch-apps_crypto_c
-16
View File
@@ -1,16 +0,0 @@
From ffb327376f5bb69e8dfe7f805529e45a40118c2b Mon Sep 17 00:00:00 2001
From: lsh123 <aleksey@aleksey.com>
Date: Mon, 20 Nov 2023 11:50:43 -0500
Subject: [PATCH] Fix libxml2 v2.12.0 includes (#729)
Index: apps/crypto.c
--- apps/crypto.c.orig
+++ apps/crypto.c
@@ -12,6 +12,7 @@
#endif
#include <string.h>
+#include <stdlib.h>
#include <xmlsec/xmlsec.h>
#include <xmlsec/keys.h>
security/xmlsec/patches/patch-apps_xmlsec_c
-25
View File
@@ -1,25 +0,0 @@
From ffb327376f5bb69e8dfe7f805529e45a40118c2b Mon Sep 17 00:00:00 2001
From: lsh123 <aleksey@aleksey.com>
Date: Mon, 20 Nov 2023 11:50:43 -0500
Subject: [PATCH] Fix libxml2 v2.12.0 includes (#729)
Index: apps/xmlsec.c
--- apps/xmlsec.c.orig
+++ apps/xmlsec.c
@@ -22,6 +22,7 @@
#include <libxml/xmlmemory.h>
#include <libxml/parser.h>
#include <libxml/xpath.h>
+#include <libxml/xmlsave.h>
#include <libxml/xpathInternals.h>
#ifndef XMLSEC_NO_XSLT
@@ -3030,7 +3031,7 @@ xmlSecAppInit(void) {
/* Init libxml */
xmlInitParser();
LIBXML_TEST_VERSION
- xmlTreeIndentString = "\t";
+ xmlThrDefTreeIndentString("\t");
#ifndef XMLSEC_NO_XSLT
xmlIndentTreeOutput = 1;
#endif /* XMLSEC_NO_XSLT */
security/xmlsec/patches/patch-include_xmlsec_xmlsec_h
-16
View File
@@ -1,16 +0,0 @@
From ffb327376f5bb69e8dfe7f805529e45a40118c2b Mon Sep 17 00:00:00 2001
From: lsh123 <aleksey@aleksey.com>
Date: Mon, 20 Nov 2023 11:50:43 -0500
Subject: [PATCH] Fix libxml2 v2.12.0 includes (#729)
Index: include/xmlsec/xmlsec.h
--- include/xmlsec/xmlsec.h.orig
+++ include/xmlsec/xmlsec.h
@@ -12,6 +12,7 @@
#define __XMLSEC_H__
#include <libxml/tree.h>
+#include <libxml/parser.h>
#include <xmlsec/version.h>
#include <xmlsec/exports.h>
security/xmlsec/patches/patch-src_errors_helpers_h
-53
View File
@@ -1,53 +0,0 @@
From ffb327376f5bb69e8dfe7f805529e45a40118c2b Mon Sep 17 00:00:00 2001
From: lsh123 <aleksey@aleksey.com>
Date: Mon, 20 Nov 2023 11:50:43 -0500
Subject: [PATCH] Fix libxml2 v2.12.0 includes (#729)
Index: src/errors_helpers.h
--- src/errors_helpers.h.orig
+++ src/errors_helpers.h
@@ -136,7 +136,7 @@ extern "C" {
*/
#define xmlSecXmlError(errorFunction, errorObject) \
{ \
- xmlErrorPtr error = xmlGetLastError(); \
+ const xmlError * error = xmlGetLastError(); \
int code = (error != NULL) ? error->code : 0; \
const char* message = (error != NULL) ? error->message : NULL; \
xmlSecError(XMLSEC_ERRORS_HERE, \
@@ -159,7 +159,7 @@ extern "C" {
*/
#define xmlSecXmlError2(errorFunction, errorObject, msg, param) \
{ \
- xmlErrorPtr error = xmlGetLastError(); \
+ const xmlError * error = xmlGetLastError(); \
int code = (error != NULL) ? error->code : 0; \
const char* message = (error != NULL) ? error->message : NULL; \
xmlSecError(XMLSEC_ERRORS_HERE, \
@@ -181,7 +181,7 @@ extern "C" {
*/
#define xmlSecXmlParserError(errorFunction, ctxt, errorObject) \
{ \
- xmlErrorPtr error = xmlCtxtGetLastError(ctxt);\
+ const xmlError * error = xmlCtxtGetLastError(ctxt);\
int code = (error != NULL) ? error->code : 0; \
const char* message = (error != NULL) ? error->message : NULL; \
xmlSecError(XMLSEC_ERRORS_HERE, \
@@ -205,7 +205,7 @@ extern "C" {
*/
#define xmlSecXmlParserError2(errorFunction, ctxt, errorObject, msg, param) \
{ \
- xmlErrorPtr error = xmlCtxtGetLastError(ctxt);\
+ const xmlError * error = xmlCtxtGetLastError(ctxt);\
int code = (error != NULL) ? error->code : 0; \
const char* message = (error != NULL) ? error->message : NULL; \
xmlSecError(XMLSEC_ERRORS_HERE, \
@@ -227,7 +227,7 @@ extern "C" {
*/
#define xmlSecXsltError(errorFunction, ctxt, errorObject) \
{ \
- xmlErrorPtr error = xmlGetLastError(); \
+ const xmlError * error = xmlGetLastError(); \
int code = (error != NULL) ? error->code : 0; \
const char* message = (error != NULL) ? error->message : NULL; \
xmlSecError(XMLSEC_ERRORS_HERE, \
security/xmlsec/patches/patch-src_mscrypto_certkeys_c
-16
View File
@@ -1,16 +0,0 @@
From ffb327376f5bb69e8dfe7f805529e45a40118c2b Mon Sep 17 00:00:00 2001
From: lsh123 <aleksey@aleksey.com>
Date: Mon, 20 Nov 2023 11:50:43 -0500
Subject: [PATCH] Fix libxml2 v2.12.0 includes (#729)
Index: src/mscrypto/certkeys.c
--- src/mscrypto/certkeys.c.orig
+++ src/mscrypto/certkeys.c
@@ -18,6 +18,7 @@
#include "globals.h"
#include <string.h>
+#include <stdlib.h>
#ifndef XMLSEC_NO_GOST
#include "csp_oid.h"
security/xmlsec/patches/patch-src_mscrypto_signatures_c
-16
View File
@@ -1,16 +0,0 @@
From ffb327376f5bb69e8dfe7f805529e45a40118c2b Mon Sep 17 00:00:00 2001
From: lsh123 <aleksey@aleksey.com>
Date: Mon, 20 Nov 2023 11:50:43 -0500
Subject: [PATCH] Fix libxml2 v2.12.0 includes (#729)
Index: src/mscrypto/signatures.c
--- src/mscrypto/signatures.c.orig
+++ src/mscrypto/signatures.c
@@ -17,6 +17,7 @@
#include "globals.h"
#include <string.h>
+#include <stdlib.h>
#ifndef XMLSEC_NO_GOST
#include "csp_calg.h"
security/xmlsec/patches/patch-tests_testrun_sh
+3 -3
View File
@@ -13,7 +13,7 @@ Index: tests/testrun.sh
OS_KERNEL=`uname -s`
#
@@ -705,7 +705,9 @@ execEncTest() {
@@ -712,7 +712,9 @@ execEncTest() {
cat $tmpfile | $outputTransform > $tmpfile.2
mv $tmpfile.2 $tmpfile
fi
@@ -24,7 +24,7 @@ Index: tests/testrun.sh
printRes $expected_res $?
else
printRes $expected_res $res
@@ -737,7 +739,9 @@ execEncTest() {
@@ -744,7 +746,9 @@ execEncTest() {
cat $tmpfile.2 | $outputTransform > $tmpfile
mv $tmpfile $tmpfile.2
fi
@@ -35,7 +35,7 @@ Index: tests/testrun.sh
printRes $res_success $?
else
printRes $res_success $res
@@ -762,7 +766,7 @@ execEncTest() {
@@ -769,7 +773,7 @@ execEncTest() {
rm -rf $tmpfile $tmpfile.2 tmpfile.3
# run tests
security/xmlsec/pkg/PLIST-docs
+1
View File
@@ -131,6 +131,7 @@ share/doc/xmlsec1/api/xmlsec-xmltree.html
share/doc/xmlsec1/authors.html
share/doc/xmlsec1/bugs.html
share/doc/xmlsec1/c14n.html
share/doc/xmlsec1/css/
share/doc/xmlsec1/documentation.html
share/doc/xmlsec1/download.html
share/doc/xmlsec1/faq.html