* [gentoo-commits] repo/gentoo:master commit in: dev-libs/xmlsec/files/
@ 2019-04-16 21:53 Alon Bar-Lev
0 siblings, 0 replies; 3+ messages in thread
From: Alon Bar-Lev @ 2019-04-16 21:53 UTC (permalink / raw
To: gentoo-commits
commit: 6ef21c07141f752b13217a0b3f2f9fc34959114b
Author: Alon Bar-Lev <alonbl <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 16 21:52:17 2019 +0000
Commit: Alon Bar-Lev <alonbl <AT> gentoo <DOT> org>
CommitDate: Tue Apr 16 21:52:41 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6ef21c07
dev-libs/xmlsec: simplify test patch
Signed-off-by: Alon Bar-Lev <alonbl <AT> gentoo.org>
Package-Manager: Portage-2.3.62, Repoman-2.3.11
dev-libs/xmlsec/files/xmlsec-1.2.28-test.patch | 96 ++++----------------------
1 file changed, 13 insertions(+), 83 deletions(-)
diff --git a/dev-libs/xmlsec/files/xmlsec-1.2.28-test.patch b/dev-libs/xmlsec/files/xmlsec-1.2.28-test.patch
index fa1fa60a6df..ae80e1fa5f3 100644
--- a/dev-libs/xmlsec/files/xmlsec-1.2.28-test.patch
+++ b/dev-libs/xmlsec/files/xmlsec-1.2.28-test.patch
@@ -1,121 +1,51 @@
-From 9d5f2d172ab91fd9fb2c2eddaee86ba62eab2d67 Mon Sep 17 00:00:00 2001
+From 3d5c9e38d9576aea252ba186dd2913c57a7a8dd8 Mon Sep 17 00:00:00 2001
From: Alon Bar-Lev <alon.barlev@gmail.com>
Date: Tue, 16 Apr 2019 23:07:08 +0300
Subject: [PATCH] tests: workout test --X509-skip-strict-checks
-The --X509-skip-strict-checks parameter is not accepted by all commands,
-result of skipping many tests.
+Apply --X509-skip-strict-checks parameter to verify commands.
-Reduce impact of the --X509-skip-strict-checks to a workaround to gnutls only.
-
-Filter double --X509-skip-strict-checks commands as cli does not accept
-multiple instances.
+[PORT]
Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
---
- tests/testrun.sh | 37 ++++++++++++++++++++++---------------
- 1 file changed, 22 insertions(+), 15 deletions(-)
-
diff --git a/tests/testrun.sh b/tests/testrun.sh
-index ea65802b..35f4a780 100755
+index ea65802b..9950d4fb 100755
--- a/tests/testrun.sh
+++ b/tests/testrun.sh
-@@ -59,7 +59,11 @@ if [ "z$XMLSEC_DEFAULT_CRYPTO" != "z" ] ; then
+@@ -59,7 +59,7 @@ if [ "z$XMLSEC_DEFAULT_CRYPTO" != "z" ] ; then
elif [ "z$crypto" != "z" ] ; then
xmlsec_params="$xmlsec_params --crypto $crypto"
fi
-xmlsec_params="$xmlsec_params --X509-skip-strict-checks --crypto-config $crypto_config"
+xmlsec_params="$xmlsec_params --crypto-config $crypto_config"
-+xmlsec_x509_params=
-+if [ "z${crypto}" = zgnutls ]; then
-+ xmlsec_x509_params="--X509-skip-strict-checks"
-+fi
#
# Setup keys config
-@@ -218,8 +222,8 @@ execKeysTest() {
- if [ -f $keysfile ] ; then
- params="$params --keys-file $keysfile"
- fi
-- echo "$VALGRIND $xmlsec_app keys $params $xmlsec_params $keysfile" >> $curlogfile
-- $VALGRIND $xmlsec_app keys $params $xmlsec_params $keysfile >> $curlogfile 2>> $curlogfile
-+ echo "$VALGRIND $xmlsec_app keys $params $xmlsec_x509_params $xmlsec_params $keysfile" >> $curlogfile
-+ $VALGRIND $xmlsec_app keys $params $xmlsec_x509_params $xmlsec_params $keysfile >> $curlogfile 2>> $curlogfile
- printRes $expected_res $?
- if [ $? != 0 ]; then
- failures=`expr $failures + 1`
-@@ -307,9 +311,10 @@ execDSigTest() {
-
+@@ -308,8 +308,9 @@ execDSigTest() {
# run tests
if [ -n "$params1" ] ; then
-+ echo "$params1" | grep -q -- "$xmlsec_x509_params" && _xmlsec_x509_params= || _xmlsec_x509_params="$xmlsec_x509_params"
printf " Verify existing signature "
- echo "$VALGRIND $xmlsec_app verify $xmlsec_params $params1 $full_file.xml" >> $curlogfile
- $VALGRIND $xmlsec_app verify $xmlsec_params $params1 $full_file.xml >> $curlogfile 2>> $curlogfile
-+ echo "$VALGRIND $xmlsec_app verify $_xmlsec_x509_params $xmlsec_params $params1 $full_file.xml" >> $curlogfile
-+ $VALGRIND $xmlsec_app verify $_xmlsec_x509_params $xmlsec_params $params1 $full_file.xml >> $curlogfile 2>> $curlogfile
++ params1="$(echo $params1 | sed 's/--X509-skip-strict-checks//')"
++ echo "$VALGRIND $xmlsec_app verify --X509-skip-strict-checks $xmlsec_params $params1 $full_file.xml" >> $curlogfile
++ $VALGRIND $xmlsec_app verify --X509-skip-strict-checks $xmlsec_params $params1 $full_file.xml >> $curlogfile 2>> $curlogfile
printRes $expected_res $?
if [ $? != 0 ]; then
failures=`expr $failures + 1`
-@@ -317,9 +322,10 @@ execDSigTest() {
- fi
-
- if [ -n "$params2" -a -z "$PERF_TEST" ] ; then
-+ echo "$params2" | grep -q -- "$xmlsec_x509_params" && _xmlsec_x509_params= || _xmlsec_x509_params="$xmlsec_x509_params"
- printf " Create new signature "
-- echo "$VALGRIND $xmlsec_app sign $xmlsec_params $params2 --output $tmpfile $full_file.tmpl" >> $curlogfile
-- $VALGRIND $xmlsec_app sign $xmlsec_params $params2 --output $tmpfile $full_file.tmpl >> $curlogfile 2>> $curlogfile
-+ echo "$VALGRIND $xmlsec_app sign $_xmlsec_x509_params $_xmlsec_params $params2 --output $tmpfile $full_file.tmpl" >> $curlogfile
-+ $VALGRIND $xmlsec_app sign $_xmlsec_x509_params $_xmlsec_params $params2 --output $tmpfile $full_file.tmpl >> $curlogfile 2>> $curlogfile
- printRes $res_success $?
- if [ $? != 0 ]; then
- failures=`expr $failures + 1`
-@@ -327,9 +333,10 @@ execDSigTest() {
- fi
+@@ -328,8 +328,9 @@ execDSigTest() {
if [ -n "$params3" -a -z "$PERF_TEST" ] ; then
-+ echo "$params3" | grep -q -- "$xmlsec_x509_params" && _xmlsec_x509_params= || _xmlsec_x509_params="$xmlsec_x509_params"
printf " Verify new signature "
- echo "$VALGRIND $xmlsec_app verify $xmlsec_params $params3 $tmpfile" >> $curlogfile
- $VALGRIND $xmlsec_app verify $xmlsec_params $params3 $tmpfile >> $curlogfile 2>> $curlogfile
-+ echo "$VALGRIND $xmlsec_app verify $_xmlsec_x509_params $xmlsec_params $params3 $tmpfile" >> $curlogfile
-+ $VALGRIND $xmlsec_app verify $_xmlsec_x509_params $xmlsec_params $params3 $tmpfile >> $curlogfile 2>> $curlogfile
- printRes $res_success $?
- if [ $? != 0 ]; then
- failures=`expr $failures + 1`
-@@ -406,8 +413,8 @@ execEncTest() {
- if [ -n "$params1" ] ; then
- rm -f $tmpfile
- printf " Decrypt existing document "
-- echo "$VALGRIND $xmlsec_app decrypt $xmlsec_params $params1 $full_file.xml" >> $curlogfile
-- $VALGRIND $xmlsec_app decrypt $xmlsec_params $params1 --output $tmpfile $full_file.xml >> $curlogfile 2>> $curlogfile
-+ echo "$VALGRIND $xmlsec_app decrypt $xmlsec_x509_params $xmlsec_params $params1 $full_file.xml" >> $curlogfile
-+ $VALGRIND $xmlsec_app decrypt $xmlsec_x509_params $xmlsec_params $params1 --output $tmpfile $full_file.xml >> $curlogfile 2>> $curlogfile
- res=$?
- echo "=== TEST RESULT: $res; expected: $expected_res" >> $curlogfile
- if [ $res = 0 -a "$expected_res" = "$res_success" ]; then
-@@ -428,8 +435,8 @@ execEncTest() {
- if [ -n "$params2" -a -z "$PERF_TEST" ] ; then
- rm -f $tmpfile
- printf " Encrypt document "
-- echo "$VALGRIND $xmlsec_app encrypt $xmlsec_params $params2 --output $tmpfile $full_file.tmpl" >> $curlogfile
-- $VALGRIND $xmlsec_app encrypt $xmlsec_params $params2 --output $tmpfile $full_file.tmpl >> $curlogfile 2>> $curlogfile
-+ echo "$VALGRIND $xmlsec_app encrypt $xmlsec_x509_params $xmlsec_params $params2 --output $tmpfile $full_file.tmpl" >> $curlogfile
-+ $VALGRIND $xmlsec_app encrypt $xmlsec_x509_params $xmlsec_params $params2 --output $tmpfile $full_file.tmpl >> $curlogfile 2>> $curlogfile
++ params3="$(echo $params3 | sed 's/--X509-skip-strict-checks//')"
++ echo "$VALGRIND $xmlsec_app verify --X509-skip-strict-checks $xmlsec_params $params3 $tmpfile" >> $curlogfile
++ $VALGRIND $xmlsec_app verify --X509-skip-strict-checks $xmlsec_params $params3 $tmpfile >> $curlogfile 2>> $curlogfile
printRes $res_success $?
if [ $? != 0 ]; then
failures=`expr $failures + 1`
-@@ -439,8 +446,8 @@ execEncTest() {
- if [ -n "$params3" -a -z "$PERF_TEST" ] ; then
- rm -f $tmpfile.2
- printf " Decrypt new document "
-- echo "$VALGRIND $xmlsec_app decrypt $xmlsec_params $params3 --output $tmpfile.2 $tmpfile" >> $curlogfile
-- $VALGRIND $xmlsec_app decrypt $xmlsec_params $params3 --output $tmpfile.2 $tmpfile >> $curlogfile 2>> $curlogfile
-+ echo "$VALGRIND $xmlsec_app decrypt $xmlsec_x509_params $xmlsec_params $params3 --output $tmpfile.2 $tmpfile" >> $curlogfile
-+ $VALGRIND $xmlsec_app decrypt $xmlsec_x509_params $xmlsec_params $params3 --output $tmpfile.2 $tmpfile >> $curlogfile 2>> $curlogfile
- res=$?
- if [ $res = 0 ]; then
- if [ "z$outputTransform" != "z" ] ; then
--
2.21.0
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/xmlsec/files/
@ 2022-02-22 18:29 Joonas Niilola
0 siblings, 0 replies; 3+ messages in thread
From: Joonas Niilola @ 2022-02-22 18:29 UTC (permalink / raw
To: gentoo-commits
commit: 576a6fa98c71d385f4210b3af2cc7646d4650b7f
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Tue Feb 22 16:03:10 2022 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Tue Feb 22 18:29:06 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=576a6fa9
dev-libs/xmlsec: remove unused patch(es)
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/24317
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
.../xmlsec/files/xmlsec-1.2.31-fix-nss-3.59.patch | 29 ----------------------
1 file changed, 29 deletions(-)
diff --git a/dev-libs/xmlsec/files/xmlsec-1.2.31-fix-nss-3.59.patch b/dev-libs/xmlsec/files/xmlsec-1.2.31-fix-nss-3.59.patch
deleted file mode 100644
index b70b8cf2d61b..000000000000
--- a/dev-libs/xmlsec/files/xmlsec-1.2.31-fix-nss-3.59.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-https://bugs.gentoo.org/764437
-https://github.com/lsh123/xmlsec/commit/f3a59c721e38a663405093e2bbb30e2bf45853a2.patch
-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)
-
----
- 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 */
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/xmlsec/files/
@ 2024-05-13 18:42 Joonas Niilola
0 siblings, 0 replies; 3+ messages in thread
From: Joonas Niilola @ 2024-05-13 18:42 UTC (permalink / raw
To: gentoo-commits
commit: 885e8b3941b4617906768a9358979fd5e4da01a7
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Mon May 13 16:52:06 2024 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Mon May 13 18:42:10 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=885e8b39
dev-libs/xmlsec: remove unused patch
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
.../xmlsec-1.3.2-libxml2-2.12.0-includes.patch | 114 ---------------------
1 file changed, 114 deletions(-)
diff --git a/dev-libs/xmlsec/files/xmlsec-1.3.2-libxml2-2.12.0-includes.patch b/dev-libs/xmlsec/files/xmlsec-1.3.2-libxml2-2.12.0-includes.patch
deleted file mode 100644
index e4b7ec4d7f68..000000000000
--- a/dev-libs/xmlsec/files/xmlsec-1.3.2-libxml2-2.12.0-includes.patch
+++ /dev/null
@@ -1,114 +0,0 @@
-https://github.com/lsh123/xmlsec/commit/ffb327376f5bb69e8dfe7f805529e45a40118c2b
-
-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)
-
---- a/apps/crypto.c
-+++ b/apps/crypto.c
-@@ -12,6 +12,7 @@
- #endif
-
- #include <string.h>
-+#include <stdlib.h>
-
- #include <xmlsec/xmlsec.h>
- #include <xmlsec/keys.h>
---- a/apps/xmlsec.c
-+++ b/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 */
---- a/include/xmlsec/xmlsec.h
-+++ b/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>
---- a/src/errors_helpers.h
-+++ b/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, \
---- a/src/mscrypto/certkeys.c
-+++ b/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"
---- a/src/mscrypto/signatures.c
-+++ b/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"
-
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2024-05-13 18:42 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-04-16 21:53 [gentoo-commits] repo/gentoo:master commit in: dev-libs/xmlsec/files/ Alon Bar-Lev
-- strict thread matches above, loose matches on Subject: below --
2022-02-22 18:29 Joonas Niilola
2024-05-13 18:42 Joonas Niilola
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox