oath-toolkit-help
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Bug#1023038: Acknowledgement (oath-toolkit: FTBFS with xmlsec1 1.2.35)


From: Rene Engelhard
Subject: Bug#1023038: Acknowledgement (oath-toolkit: FTBFS with xmlsec1 1.2.35)
Date: Thu, 3 Nov 2022 20:55:03 +0100
User-agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.4.0

Control: tag -1 + patch

Hi,

> So basically the reference file needs to be updated but then it probably
> breaks with 1.2.34...

diff -Nru oath-toolkit-2.6.7/debian/control oath-toolkit-2.6.7/debian/control
--- oath-toolkit-2.6.7/debian/control    2021-08-20 11:04:06.000000000 +0200
+++ oath-toolkit-2.6.7/debian/control    2022-11-03 20:27:54.000000000 +0100
@@ -9,7 +9,7 @@
                gengetopt,
                libpam0g-dev,
                libxml2-utils,
-               libxmlsec1-dev
+               libxmlsec1-dev (>= 1.2.35)
 Standards-Version: 4.6.0
 Homepage: https://www.nongnu.org/oath-toolkit/
 Vcs-Browser: https://salsa.debian.org/debian/oath-toolkit
diff -Nru oath-toolkit-2.6.7/debian/patches/fix-tests-with-xmlsec1-1.2.35.diff oath-toolkit-2.6.7/debian/patches/fix-tests-with-xmlsec1-1.2.35.diff --- oath-toolkit-2.6.7/debian/patches/fix-tests-with-xmlsec1-1.2.35.diff 1970-01-01 01:00:00.000000000 +0100 +++ oath-toolkit-2.6.7/debian/patches/fix-tests-with-xmlsec1-1.2.35.diff 2022-11-03 20:40:10.000000000 +0100
@@ -0,0 +1,45 @@
+Description: fix tests with xmlsec1 1.2.35
+ Seems the output changed subtly, just adapt
+Author: Rene Engelhard <rene@debian.org>
+
+---
+Origin: vendor
+Bug-Debian: https://bugs.debian.org/1023038
+Forwarded: https://lists.nongnu.org/archive/html/oath-toolkit-help/2022-10/msg00000.html
+Last-Update: 2022-11-03
+
+--- oath-toolkit-2.6.7.orig/libpskc/configure.ac
++++ oath-toolkit-2.6.7/libpskc/configure.ac
+@@ -52,7 +52,7 @@ AC_ARG_WITH(xmlsec-crypto-engine,
+ AC_MSG_NOTICE([xmlsec crypto engine: $xmlsecengine])
+
+ PKG_CHECK_MODULES(XML2, libxml-2.0,, [AC_MSG_ERROR([Cannot find libxml2])])
+-PKG_CHECK_MODULES(XMLSEC, xmlsec1$xmlsecengine, [xmlsec=yes], [xmlsec=no])
++PKG_CHECK_MODULES(XMLSEC, xmlsec1$xmlsecengine >= 1.2.35, [xmlsec=yes], [xmlsec=no])
+ AC_PATH_PROG(XMLCATALOG, xmlcatalog)
+ if test -z "$ac_cv_path_XMLCATALOG"; then
+   xmlsec=no
+--- oath-toolkit-2.6.7.orig/libpskc/examples/pskc-hotp-signed.xml
++++ oath-toolkit-2.6.7/libpskc/examples/pskc-hotp-signed.xml
+@@ -38,7 +38,8 @@ rIXbwqKhnBP943U4Ch31oEbZtbo+XRbiq11wv6dL
+ rMxnil6ChoIBvSSPGHhJuj1bW1EPW92JtIa6byrAj1m4RwSviQy2i65YoIdtrhRt
+ CWekj2zuL/0szv5rZMCCvxioOCA8znqELEPMfs0Aa/cACD2MZcC4gGXehNCvzYJr
+ TmB6lFpxP6f0g6eO7PVcqYN9NCwECxb5Cvx2j2uNlereY35/9oPR6YJx+V7sL+DB
+-n6F0mN8OUAFxDamepKdGRApU8uZ35624o/I4</X509Certificate>
++n6F0mN8OUAFxDamepKdGRApU8uZ35624o/I4
++</X509Certificate>
+ </X509Data>
+ </KeyInfo>
+ </Signature></KeyContainer>
+--- oath-toolkit-2.6.7.orig/pskctool/tests/pskc-all-signed.xml
++++ oath-toolkit-2.6.7/pskctool/tests/pskc-all-signed.xml
+@@ -38,7 +38,8 @@ rIXbwqKhnBP943U4Ch31oEbZtbo+XRbiq11wv6dL
+ rMxnil6ChoIBvSSPGHhJuj1bW1EPW92JtIa6byrAj1m4RwSviQy2i65YoIdtrhRt
+ CWekj2zuL/0szv5rZMCCvxioOCA8znqELEPMfs0Aa/cACD2MZcC4gGXehNCvzYJr
+ TmB6lFpxP6f0g6eO7PVcqYN9NCwECxb5Cvx2j2uNlereY35/9oPR6YJx+V7sL+DB
+-n6F0mN8OUAFxDamepKdGRApU8uZ35624o/I4</X509Certificate>
++n6F0mN8OUAFxDamepKdGRApU8uZ35624o/I4
++</X509Certificate>
+ </X509Data>
+ </KeyInfo>
+ </Signature></KeyContainer>
diff -Nru oath-toolkit-2.6.7/debian/patches/series oath-toolkit-2.6.7/debian/patches/series --- oath-toolkit-2.6.7/debian/patches/series    1970-01-01 01:00:00.000000000 +0100 +++ oath-toolkit-2.6.7/debian/patches/series    2022-11-03 20:39:54.000000000 +0100
@@ -0,0 +1 @@
+fix-tests-with-xmlsec1-1.2.35.diff

is doing exactly this.

If you apply this I can upload xmlsec1 1.2.36 to unstable immediately. (python-xmlsec as the other one has -  unless oath-tookit) no reverse-depends at all so can be AUTORMed if needed).

Regards,


Rene



reply via email to

[Prev in Thread] Current Thread [Next in Thread]