Created
December 29, 2022 10:52
-
-
Save lwhsu/aede47cd4ca3773214854a4bb898a713 to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/security/xmlsec1/Makefile b/security/xmlsec1/Makefile | |
index aca23bcc2800..7d44f009d6f3 100644 | |
--- a/security/xmlsec1/Makefile | |
+++ b/security/xmlsec1/Makefile | |
@@ -1,11 +1,8 @@ | |
PORTNAME= xmlsec1 | |
-PORTVERSION= 1.2.34 | |
-PORTREVISION= 1 | |
+PORTVERSION= 1.2.37 | |
CATEGORIES= security | |
-MASTER_SITES= http://www.aleksey.com/xmlsec/download/ \ | |
- ftp://ftp.aleksey.com/pub/xmlsec/releases/ \ | |
- ftp://ftp.xmlsoft.org/xmlsec/releases/ \ | |
- ftp://ftp.rpmfind.net/pub/XML/xmlsec/releases/ | |
+MASTER_SITES= https://www.aleksey.com/xmlsec/download/ \ | |
+ https://github.com/lsh123/xmlsec/releases/download/xmlsec-${PORTVERSION:S,.,_,g}/ | |
MAINTAINER= hrs@FreeBSD.org | |
COMMENT= XML Security Library | |
diff --git a/security/xmlsec1/distinfo b/security/xmlsec1/distinfo | |
index baa844e7f7ee..a34e2c7e9e2b 100644 | |
--- a/security/xmlsec1/distinfo | |
+++ b/security/xmlsec1/distinfo | |
@@ -1,3 +1,3 @@ | |
-TIMESTAMP = 1651858077 | |
-SHA256 (xmlsec1-1.2.34.tar.gz) = 52ced4943f35bd7d0818a38298c1528ca4ac8a54440fd71134a07d2d1370a262 | |
-SIZE (xmlsec1-1.2.34.tar.gz) = 1991505 | |
+TIMESTAMP = 1672309978 | |
+SHA256 (xmlsec1-1.2.37.tar.gz) = 5f8dfbcb6d1e56bddd0b5ec2e00a3d0ca5342a9f57c24dffde5c796b2be2871c | |
+SIZE (xmlsec1-1.2.37.tar.gz) = 2009175 | |
diff --git a/security/xmlsec1/files/patch-Makefile.in b/security/xmlsec1/files/patch-Makefile.in | |
index 250d09d1d46d..8a547940fa76 100644 | |
--- a/security/xmlsec1/files/patch-Makefile.in | |
+++ b/security/xmlsec1/files/patch-Makefile.in | |
@@ -1,6 +1,6 @@ | |
---- Makefile.in.orig 2022-05-06 17:33:38 UTC | |
+--- Makefile.in.orig 2022-12-29 10:38:07 UTC | |
+++ Makefile.in | |
-@@ -490,7 +490,7 @@ DEFAULT_CRYPTO = @XMLSEC_DEFAULT_CRYPTO@ | |
+@@ -491,7 +491,7 @@ DEFAULT_CRYPTO = @XMLSEC_DEFAULT_CRYPTO@ | |
bin_SCRIPTS = xmlsec1-config | |
pkgconfig_DATA = xmlsec1.pc @XMLSEC_CRYPTO_PC_FILES_LIST@ | |
pkgconfigdir = $(prefix)/libdata/pkgconfig | |
diff --git a/security/xmlsec1/files/patch-apps-xmlsec.c b/security/xmlsec1/files/patch-apps-xmlsec.c | |
deleted file mode 100644 | |
index ce1c62f81e60..000000000000 | |
--- a/security/xmlsec1/files/patch-apps-xmlsec.c | |
+++ /dev/null | |
@@ -1,11 +0,0 @@ | |
---- apps/xmlsec.c.orig 2022-05-03 14:36:17 UTC | |
-+++ apps/xmlsec.c | |
-@@ -1210,7 +1210,7 @@ int main(int argc, const char **argv) { | |
- (xmlSecAppCmdLineParamGetInt(&repeatParam, 1) > 0)) { | |
- | |
- repeats = xmlSecAppCmdLineParamGetInt(&repeatParam, 1); | |
-- fprintf(stderr, "Executed %d tests in %ld msec\n", repeats, (1000 * total_time) / CLOCKS_PER_SEC); | |
-+ fprintf(stderr, "Executed %d tests in %ld msec\n", repeats, (long)(1000 * total_time) / CLOCKS_PER_SEC); | |
- } | |
- | |
- goto success; | |
diff --git a/security/xmlsec1/files/patch-src-openssl-app.c b/security/xmlsec1/files/patch-src-openssl-app.c | |
index c723cad64dad..d661c18dc876 100644 | |
--- a/security/xmlsec1/files/patch-src-openssl-app.c | |
+++ b/security/xmlsec1/files/patch-src-openssl-app.c | |
@@ -1,8 +1,8 @@ | |
---- src/openssl/app.c.orig 2022-05-03 23:36:17.000000000 +0900 | |
-+++ src/openssl/app.c 2022-05-07 05:18:46.065103000 +0900 | |
-@@ -43,6 +43,29 @@ | |
- | |
- #include "openssl_compat.h" | |
+--- src/openssl/app.c.orig 2022-11-28 21:40:24 UTC | |
++++ src/openssl/app.c | |
+@@ -44,6 +44,29 @@ | |
+ #include <openssl/provider.h> | |
+ #endif /* XMLSEC_OPENSSL_API_300 */ | |
+#if defined(XMLSEC_OPENSSL_API_110) && defined(LIBRESSL_VERSION_NUMBER) | |
+static UI_METHOD * | |
@@ -27,10 +27,10 @@ | |
+} | |
+#endif | |
+ | |
- static int xmlSecOpenSSLAppLoadRANDFile (const char *filename); | |
- static int xmlSecOpenSSLAppSaveRANDFile (const char *filename); | |
+ #include "../cast_helpers.h" | |
+ | |
static int xmlSecOpenSSLDefaultPasswordCallback (char *buf, | |
-@@ -415,6 +438,11 @@ | |
+@@ -462,6 +485,11 @@ xmlSecOpenSSLAppEngineKeyLoad(const char *engineName, | |
EVP_PKEY* pKey = NULL; | |
int engineInit = 0; | |
int ret; | |
@@ -40,9 +40,9 @@ | |
+ const UI_METHOD *ui_null = ui_null_create(); | |
+#endif | |
- #ifndef OPENSSL_NO_ENGINE | |
xmlSecAssert2(engineName != NULL, NULL); | |
-@@ -437,7 +465,7 @@ | |
+ xmlSecAssert2(engineKeyId != NULL, NULL); | |
+@@ -487,7 +515,7 @@ xmlSecOpenSSLAppEngineKeyLoad(const char *engineName, | |
} | |
} | |
@@ -51,7 +51,7 @@ | |
xmlSecOpenSSLError("ENGINE_ctrl_cmd_string(SET_USER_INTERFACE)", NULL); | |
goto done; | |
} | |
-@@ -453,7 +481,7 @@ | |
+@@ -503,7 +531,7 @@ xmlSecOpenSSLAppEngineKeyLoad(const char *engineName, | |
/* load private key */ | |
pKey = ENGINE_load_private_key(engine, engineKeyId, | |
@@ -60,7 +60,7 @@ | |
NULL); | |
if(pKey == NULL) { | |
xmlSecOpenSSLError("ENGINE_load_private_key", NULL); | |
-@@ -484,6 +512,7 @@ | |
+@@ -534,6 +562,7 @@ xmlSecOpenSSLAppEngineKeyLoad(const char *engineName, | |
data = NULL; | |
done: |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment