pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/security/xmlsec1
Module Name: pkgsrc
Committed By: wiz
Date: Fri Apr 25 07:18:10 UTC 2025
Modified Files:
pkgsrc/security/xmlsec1: distinfo
Added Files:
pkgsrc/security/xmlsec1/patches: patch-src_gcrypt_app.c
patch-src_gcrypt_asymkeys.c patch-src_gcrypt_signatures.c
patch-src_gcrypt_symkeys.c
Log Message:
xmlsec1: fix build with libxml2 2.14
To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 pkgsrc/security/xmlsec1/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/security/xmlsec1/patches/patch-src_gcrypt_app.c \
pkgsrc/security/xmlsec1/patches/patch-src_gcrypt_asymkeys.c \
pkgsrc/security/xmlsec1/patches/patch-src_gcrypt_signatures.c \
pkgsrc/security/xmlsec1/patches/patch-src_gcrypt_symkeys.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/security/xmlsec1/distinfo
diff -u pkgsrc/security/xmlsec1/distinfo:1.21 pkgsrc/security/xmlsec1/distinfo:1.22
--- pkgsrc/security/xmlsec1/distinfo:1.21 Fri Mar 4 13:55:13 2022
+++ pkgsrc/security/xmlsec1/distinfo Fri Apr 25 07:18:10 2025
@@ -1,7 +1,11 @@
-$NetBSD: distinfo,v 1.21 2022/03/04 13:55:13 ryoon Exp $
+$NetBSD: distinfo,v 1.22 2025/04/25 07:18:10 wiz Exp $
BLAKE2s (xmlsec1-1.2.33.tar.gz) = 1257ba28b777cd23b4e30dab85739ffb0e1e221169526ad82f3eae8a1c0c1043
SHA512 (xmlsec1-1.2.33.tar.gz) = 6354554b5cdc0a1389f6991efeac919bea912330b36d3be3d3496d61331e9edd2771786d50d2571a439f62ccfc3bd32be0a50bb5a037c4993aac076ad94b46e8
Size (xmlsec1-1.2.33.tar.gz) = 1991955 bytes
SHA1 (patch-ab) = bf40dafa893b5d6d73bdd2af5c8c4d1d1143e061
SHA1 (patch-ac) = db0e4e2f38358fc2e347f0117899f127c94861a7
+SHA1 (patch-src_gcrypt_app.c) = 2f24890fbf401f86d1d73550f50bfb9ba660e360
+SHA1 (patch-src_gcrypt_asymkeys.c) = 418cd5a07049ab91e6b2577acf01d02cc496056a
+SHA1 (patch-src_gcrypt_signatures.c) = 668204f79bd303d0dbbdb3b5faa41c9640ac2f9c
+SHA1 (patch-src_gcrypt_symkeys.c) = 7a6b99269267fb46eb2bf4c437f57259796ab37c
Added files:
Index: pkgsrc/security/xmlsec1/patches/patch-src_gcrypt_app.c
diff -u /dev/null pkgsrc/security/xmlsec1/patches/patch-src_gcrypt_app.c:1.1
--- /dev/null Fri Apr 25 07:18:10 2025
+++ pkgsrc/security/xmlsec1/patches/patch-src_gcrypt_app.c Fri Apr 25 07:18:10 2025
@@ -0,0 +1,72 @@
+$NetBSD: patch-src_gcrypt_app.c,v 1.1 2025/04/25 07:18:10 wiz Exp $
+
+libxml2 2.14 compatibility.
+
+--- src/gcrypt/app.c.orig 2025-04-25 07:16:07.004790752 +0000
++++ src/gcrypt/app.c
+@@ -40,7 +40,7 @@
+ * Returns: 0 on success or a negative value otherwise.
+ */
+ int
+-xmlSecGCryptAppInit(const char* config ATTRIBUTE_UNUSED) {
++xmlSecGCryptAppInit(const char* config) {
+ gcry_error_t err;
+ /* Secure memory initialisation based on documentation from:
+ http://www.gnupg.org/documentation/manuals/gcrypt/Initializing-the-library.html
+@@ -212,9 +212,9 @@ xmlSecGCryptAppKeyLoad(const char *filen
+ xmlSecKeyPtr
+ xmlSecGCryptAppKeyLoadMemory(const xmlSecByte* data, xmlSecSize dataSize,
+ xmlSecKeyDataFormat format,
+- const char *pwd ATTRIBUTE_UNUSED,
+- void* pwdCallback ATTRIBUTE_UNUSED,
+- void* pwdCallbackCtx ATTRIBUTE_UNUSED)
++ const char *pwd,
++ void* pwdCallback,
++ void* pwdCallbackCtx)
+ {
+ xmlSecKeyPtr key = NULL;
+ xmlSecKeyDataPtr key_data = NULL;
+@@ -335,9 +335,9 @@ xmlSecGCryptAppKeyCertLoadMemory(xmlSecK
+ */
+ xmlSecKeyPtr
+ xmlSecGCryptAppPkcs12Load(const char *filename,
+- const char *pwd ATTRIBUTE_UNUSED,
+- void* pwdCallback ATTRIBUTE_UNUSED,
+- void* pwdCallbackCtx ATTRIBUTE_UNUSED) {
++ const char *pwd,
++ void* pwdCallback,
++ void* pwdCallbackCtx) {
+ xmlSecAssert2(filename != NULL, NULL);
+
+ /* TODO */
+@@ -361,9 +361,9 @@ xmlSecGCryptAppPkcs12Load(const char *fi
+ */
+ xmlSecKeyPtr
+ xmlSecGCryptAppPkcs12LoadMemory(const xmlSecByte* data, xmlSecSize dataSize,
+- const char *pwd ATTRIBUTE_UNUSED,
+- void* pwdCallback ATTRIBUTE_UNUSED,
+- void* pwdCallbackCtx ATTRIBUTE_UNUSED) {
++ const char *pwd,
++ void* pwdCallback,
++ void* pwdCallbackCtx) {
+ xmlSecAssert2(data != NULL, NULL);
+ xmlSecAssert2(dataSize > 0, NULL);
+
+@@ -389,7 +389,7 @@ int
+ xmlSecGCryptAppKeysMngrCertLoad(xmlSecKeysMngrPtr mngr,
+ const char *filename,
+ xmlSecKeyDataFormat format,
+- xmlSecKeyDataType type ATTRIBUTE_UNUSED) {
++ xmlSecKeyDataType type) {
+ xmlSecAssert2(mngr != NULL, -1);
+ xmlSecAssert2(filename != NULL, -1);
+ xmlSecAssert2(format != xmlSecKeyDataFormatUnknown, -1);
+@@ -417,7 +417,7 @@ xmlSecGCryptAppKeysMngrCertLoadMemory(xm
+ const xmlSecByte* data,
+ xmlSecSize dataSize,
+ xmlSecKeyDataFormat format,
+- xmlSecKeyDataType type ATTRIBUTE_UNUSED) {
++ xmlSecKeyDataType type) {
+ xmlSecAssert2(mngr != NULL, -1);
+ xmlSecAssert2(data != NULL, -1);
+ xmlSecAssert2(dataSize > 0, -1);
Index: pkgsrc/security/xmlsec1/patches/patch-src_gcrypt_asymkeys.c
diff -u /dev/null pkgsrc/security/xmlsec1/patches/patch-src_gcrypt_asymkeys.c:1.1
--- /dev/null Fri Apr 25 07:18:10 2025
+++ pkgsrc/security/xmlsec1/patches/patch-src_gcrypt_asymkeys.c Fri Apr 25 07:18:10 2025
@@ -0,0 +1,24 @@
+$NetBSD: patch-src_gcrypt_asymkeys.c,v 1.1 2025/04/25 07:18:10 wiz Exp $
+
+libxml2 2.14 compatibility.
+
+--- src/gcrypt/asymkeys.c.orig 2025-04-25 07:15:25.968184022 +0000
++++ src/gcrypt/asymkeys.c
+@@ -810,7 +810,7 @@ xmlSecGCryptKeyDataDsaFinalize(xmlSecKey
+ }
+
+ static int
+-xmlSecGCryptKeyDataDsaGenerate(xmlSecKeyDataPtr data, xmlSecSize sizeBits, xmlSecKeyDataType type ATTRIBUTE_UNUSED) {
++xmlSecGCryptKeyDataDsaGenerate(xmlSecKeyDataPtr data, xmlSecSize sizeBits, xmlSecKeyDataType type) {
+ xmlSecAssert2(xmlSecKeyDataCheckId(data, xmlSecGCryptKeyDataDsaId), -1);
+ xmlSecAssert2(sizeBits > 0, -1);
+
+@@ -1387,7 +1387,7 @@ xmlSecGCryptKeyDataRsaFinalize(xmlSecKey
+ }
+
+ static int
+-xmlSecGCryptKeyDataRsaGenerate(xmlSecKeyDataPtr data, xmlSecSize sizeBits, xmlSecKeyDataType type ATTRIBUTE_UNUSED) {
++xmlSecGCryptKeyDataRsaGenerate(xmlSecKeyDataPtr data, xmlSecSize sizeBits, xmlSecKeyDataType type) {
+ xmlSecAssert2(xmlSecKeyDataCheckId(data, xmlSecGCryptKeyDataRsaId), -1);
+ xmlSecAssert2(sizeBits > 0, -1);
+
Index: pkgsrc/security/xmlsec1/patches/patch-src_gcrypt_signatures.c
diff -u /dev/null pkgsrc/security/xmlsec1/patches/patch-src_gcrypt_signatures.c:1.1
--- /dev/null Fri Apr 25 07:18:10 2025
+++ pkgsrc/security/xmlsec1/patches/patch-src_gcrypt_signatures.c Fri Apr 25 07:18:10 2025
@@ -0,0 +1,24 @@
+$NetBSD: patch-src_gcrypt_signatures.c,v 1.1 2025/04/25 07:18:10 wiz Exp $
+
+libxml2 2.14 compatibility.
+
+--- src/gcrypt/signatures.c.orig 2025-04-25 07:15:42.654086302 +0000
++++ src/gcrypt/signatures.c
+@@ -595,7 +595,7 @@ xmlSecGCryptAppendMpi(gcry_mpi_t a, xmlS
+ *
+ ***************************************************************************/
+ static int
+-xmlSecGCryptDsaPkSign(int digest ATTRIBUTE_UNUSED, xmlSecKeyDataPtr key_data,
++xmlSecGCryptDsaPkSign(int digest, xmlSecKeyDataPtr key_data,
+ const xmlSecByte* dgst, xmlSecSize dgstSize,
+ xmlSecBufferPtr out) {
+ gcry_mpi_t m_hash = NULL;
+@@ -732,7 +732,7 @@ done:
+ }
+
+ static int
+-xmlSecGCryptDsaPkVerify(int digest ATTRIBUTE_UNUSED, xmlSecKeyDataPtr key_data,
++xmlSecGCryptDsaPkVerify(int digest, xmlSecKeyDataPtr key_data,
+ const xmlSecByte* dgst, xmlSecSize dgstSize,
+ const xmlSecByte* data, xmlSecSize dataSize) {
+ gcry_mpi_t m_hash = NULL;
Index: pkgsrc/security/xmlsec1/patches/patch-src_gcrypt_symkeys.c
diff -u /dev/null pkgsrc/security/xmlsec1/patches/patch-src_gcrypt_symkeys.c:1.1
--- /dev/null Fri Apr 25 07:18:10 2025
+++ pkgsrc/security/xmlsec1/patches/patch-src_gcrypt_symkeys.c Fri Apr 25 07:18:10 2025
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_gcrypt_symkeys.c,v 1.1 2025/04/25 07:18:10 wiz Exp $
+
+libxml2 2.14 compatibility.
+
+--- src/gcrypt/symkeys.c.orig 2025-04-25 07:15:55.924534537 +0000
++++ src/gcrypt/symkeys.c
+@@ -131,7 +131,7 @@ xmlSecGCryptSymKeyDataBinWrite(xmlSecKey
+ }
+
+ static int
+-xmlSecGCryptSymKeyDataGenerate(xmlSecKeyDataPtr data, xmlSecSize sizeBits, xmlSecKeyDataType type ATTRIBUTE_UNUSED) {
++xmlSecGCryptSymKeyDataGenerate(xmlSecKeyDataPtr data, xmlSecSize sizeBits, xmlSecKeyDataType type) {
+ xmlSecBufferPtr buffer;
+
+ xmlSecAssert2(xmlSecGCryptSymKeyDataCheckId(data), -1);
Home |
Main Index |
Thread Index |
Old Index