Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package libksba for openSUSE:Factory checked in at 2023-06-21 22:37:26 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libksba (Old) and /work/SRC/openSUSE:Factory/.libksba.new.15902 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libksba" Wed Jun 21 22:37:26 2023 rev:45 rq:1093889 version:1.6.4 Changes: -------- --- /work/SRC/openSUSE:Factory/libksba/libksba.changes 2023-01-04 18:10:00.052334457 +0100 +++ /work/SRC/openSUSE:Factory/.libksba.new.15902/libksba.changes 2023-06-21 22:37:41.321587432 +0200 @@ -1,0 +2,7 @@ +Tue Jun 20 07:10:20 UTC 2023 - Pedro Monreal <pmonr...@suse.com> + +- Update to 1.6.4: + * Correctly detect CMS write errors. [rK9ced7706f2] + * Release-info: https://dev.gnupg.org/T6543 + +------------------------------------------------------------------- Old: ---- libksba-1.6.3.tar.bz2 libksba-1.6.3.tar.bz2.sig New: ---- libksba-1.6.4.tar.bz2 libksba-1.6.4.tar.bz2.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libksba.spec ++++++ --- /var/tmp/diff_new_pack.Mr8eCL/_old 2023-06-21 22:37:41.873590754 +0200 +++ /var/tmp/diff_new_pack.Mr8eCL/_new 2023-06-21 22:37:41.877590778 +0200 @@ -1,7 +1,7 @@ # # spec file for package libksba # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,7 +18,7 @@ %define soname 8 Name: libksba -Version: 1.6.3 +Version: 1.6.4 Release: 0 Summary: A X.509 Library License: (GPL-2.0-or-later OR LGPL-3.0-or-later) AND GPL-3.0-or-later AND MIT ++++++ libksba-1.6.3.tar.bz2 -> libksba-1.6.4.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libksba-1.6.3/AUTHORS new/libksba-1.6.4/AUTHORS --- old/libksba-1.6.3/AUTHORS 2021-04-06 12:01:42.000000000 +0200 +++ new/libksba-1.6.4/AUTHORS 2023-06-19 11:38:30.000000000 +0200 @@ -8,6 +8,17 @@ License (tools, manual): GPLv3+ +Libksba is free software. See the files COPYING.* for detailed +copying conditions, and this file for notices about a few +contributions that require these additional notices to be distributed. +License copyright years may be listed using range notation, e.g., +2000-2013, indicating that every year in the range, inclusive, is a +copyrightable year that would otherwise be listed individually. + + +List of Authors +=============== + g10 Code GmbH Design and most stuff. @@ -23,72 +34,71 @@ Copyright ========= - | Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2010, 2011 - | 2012, 2013, 2014, 2015, 2018, 2019, 2020, 2021 g10 Code GmbH - | Copyright (C) 2001, 2002, 2003, 2007 Free Software Foundation, Inc. - | Copyright (C) 2000, 2001 Fabio Fiorina + Copyright (C) 2001-2006, 2010-2015, 2018-2023 g10 Code GmbH + Copyright (C) 2001-2003, 2007 Free Software Foundation, Inc. + Copyright (C) 2000, 2001 Fabio Fiorina The library and the header files are distributed under the following terms (LGPLv3+/GPLv2+): - | KSBA is free software; you can redistribute it and/or modify - | it under the terms of either - | - | - the GNU Lesser General Public License as published by the Free - | Software Foundation; either version 3 of the License, or (at - | your option) any later version. - | - | or - | - | - the GNU General Public License as published by the Free - | Software Foundation; either version 2 of the License, or (at - | your option) any later version. - | - | or both in parallel, as here. - | - | KSBA is distributed in the hope that it will be useful, but WITHOUT - | ANY WARRANTY; without even the implied warranty of MERCHANTABILITY - | or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public - | License for more details. + KSBA is free software; you can redistribute it and/or modify + it under the terms of either + + - the GNU Lesser General Public License as published by the Free + Software Foundation; either version 3 of the License, or (at + your option) any later version. + + or + + - the GNU General Public License as published by the Free + Software Foundation; either version 2 of the License, or (at + your option) any later version. + + or both in parallel, as here. + + KSBA is distributed in the hope that it will be useful, but WITHOUT + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public + License for more details. The other parts (e.g. manual, build system, tests) are distributed under the following terms (GPLv3): - | KSBA is free software; you can redistribute it and/or modify - | it under the terms of the GNU General Public License as published by - | the Free Software Foundation; either version 3 of the License, or - | (at your option) any later version. - | - | KSBA is distributed in the hope that it will be useful, - | but WITHOUT ANY WARRANTY; without even the implied warranty of - | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - | GNU General Public License for more details. + KSBA is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + KSBA is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. The ASN.1 definition for CMS is based on a specification published under the following terms (see src/cms.asn): - | Copyright (C) The Internet Society (1999). All Rights Reserved. - | - | This document and translations of it may be copied and furnished to - | others, and derivative works that comment on or otherwise explain it - | or assist in its implementation may be prepared, copied, published - | and distributed, in whole or in part, without restriction of any - | kind, provided that the above copyright notice and this paragraph are - | included on all such copies and derivative works. However, this - | document itself may not be modified in any way, such as by removing - | the copyright notice or references to the Internet Society or other - | Internet organizations, except as needed for the purpose of - | developing Internet standards in which case the procedures for - | copyrights defined in the Internet Standards process must be - | followed, or as required to translate it into languages other than - | English. - | - | The limited permissions granted above are perpetual and will not be - | revoked by the Internet Society or its successors or assigns. - | - | This document and the information contained herein is provided on an - | "AS IS" basis and THE INTERNET SOCIETY AND THE INTERNET ENGINEERING - | TASK FORCE DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING - | BUT NOT LIMITED TO ANY WARRANTY THAT THE USE OF THE INFORMATION - | HEREIN WILL NOT INFRINGE ANY RIGHTS OR ANY IMPLIED WARRANTIES OF - | MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. + Copyright (C) The Internet Society (1999). All Rights Reserved. + + This document and translations of it may be copied and furnished to + others, and derivative works that comment on or otherwise explain it + or assist in its implementation may be prepared, copied, published + and distributed, in whole or in part, without restriction of any + kind, provided that the above copyright notice and this paragraph are + included on all such copies and derivative works. However, this + document itself may not be modified in any way, such as by removing + the copyright notice or references to the Internet Society or other + Internet organizations, except as needed for the purpose of + developing Internet standards in which case the procedures for + copyrights defined in the Internet Standards process must be + followed, or as required to translate it into languages other than + English. + + The limited permissions granted above are perpetual and will not be + revoked by the Internet Society or its successors or assigns. + + This document and the information contained herein is provided on an + "AS IS" basis and THE INTERNET SOCIETY AND THE INTERNET ENGINEERING + TASK FORCE DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING + BUT NOT LIMITED TO ANY WARRANTY THAT THE USE OF THE INFORMATION + HEREIN WILL NOT INFRINGE ANY RIGHTS OR ANY IMPLIED WARRANTIES OF + MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libksba-1.6.3/ChangeLog new/libksba-1.6.4/ChangeLog --- old/libksba-1.6.3/ChangeLog 2022-12-06 14:33:38.000000000 +0100 +++ new/libksba-1.6.4/ChangeLog 2023-06-19 11:42:46.000000000 +0200 @@ -1,3 +1,31 @@ +2023-06-19 Werner Koch <w...@gnupg.org> + + Release 1.6.4. + + commit 557999424ebd13e70d6fc17e648a5dd2a06f440b + + + Correctly detect write errors while creating CMS objects. + + commit 9ced7706f2738128aa5068727ea348c44f42e16e + * src/cms.c (write_encrypted_cont): Take care of write errors. + +2023-05-16 NIIBE Yutaka <gni...@fsij.org> + + build: Sync libtool from libgpg-error for 64-bit Windows. + + commit a920c2ff1a723031e8c6b8b61632bad46a740c83 + * build-aux/ltmain.hs: Update from libgpg-error. + +2023-05-12 NIIBE Yutaka <gni...@fsij.org> + + tests: Use -no-fast-install LDFLAGS for Windows. + + commit 74fb95dbaf70d97b67793b29497b1e7b29a5e2f1 + * tests/Makefile.am [HAVE_W32_SYSTEM] (AM_LDFLAGS): Conditionalize. + +2023-04-05 NIIBE Yutaka <gni...@fsij.org> + + build: Update gpg-error.m4. + + commit 53b9fa1d58ba522ca0eea4fe460719722e6e1ef5 + * m4/gpg-error.m4: Update from libgpg-error master. + 2022-12-06 Werner Koch <w...@gnupg.org> Release 1.6.3. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libksba-1.6.3/NEWS new/libksba-1.6.4/NEWS --- old/libksba-1.6.3/NEWS 2022-12-06 14:30:27.000000000 +0100 +++ new/libksba-1.6.4/NEWS 2023-06-19 11:26:26.000000000 +0200 @@ -1,3 +1,11 @@ +Noteworthy changes in version 1.6.4 (2023-06-19) [C22/A14/R4] +------------------------------------------------ + + * Correctly detect CMS write errors. [rK9ced7706f2] + + Release-info: https://dev.gnupg.org/T6543 + + Noteworthy changes in version 1.6.3 (2022-12-06) [C22/A14/R3] ------------------------------------------------ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libksba-1.6.3/README new/libksba-1.6.4/README --- old/libksba-1.6.3/README 2015-04-10 17:36:03.000000000 +0200 +++ new/libksba-1.6.4/README 2023-06-19 11:35:23.000000000 +0200 @@ -1,8 +1,7 @@ LIBKSBA --------- - Copyright 2001, 2006, 2007, 2008, 2009, 2010, 2011, - 2012, 2013, 2014, 2015 g10 Code GmbH + Copyright (C) 2001-2006, 2010-2015, 2018-2023 g10 Code GmbH This file is free software; as a special exception the author gives unlimited permission to copy and/or distribute it, with or without diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libksba-1.6.3/build-aux/ltmain.sh new/libksba-1.6.4/build-aux/ltmain.sh --- old/libksba-1.6.3/build-aux/ltmain.sh 2014-01-10 13:41:35.000000000 +0100 +++ new/libksba-1.6.4/build-aux/ltmain.sh 2023-06-19 11:23:19.000000000 +0200 @@ -6766,6 +6766,11 @@ elif test -n "$soname_spec"; then # bleh windows case $host in + x86_64-*mingw32*) + func_arith $current - $age + major=$func_arith_result + versuffix="6-$major" + ;; *cygwin* | mingw* | *cegcc*) func_arith $current - $age major=$func_arith_result @@ -7499,6 +7504,14 @@ func_arith $current - $age major=$func_arith_result versuffix="-$major" + case $host in + x86_64-*mingw32*) + versuffix="6-$major" + ;; + *) + versuffix="-$major" + ;; + esac ;; *) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libksba-1.6.3/configure new/libksba-1.6.4/configure --- old/libksba-1.6.3/configure 2022-12-06 14:33:27.000000000 +0100 +++ new/libksba-1.6.4/configure 2023-06-19 11:42:35.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for libksba 1.6.3. +# Generated by GNU Autoconf 2.69 for libksba 1.6.4. # # Report bugs to <https://bugs.gnupg.org>. # @@ -590,8 +590,8 @@ # Identity of this package. PACKAGE_NAME='libksba' PACKAGE_TARNAME='libksba' -PACKAGE_VERSION='1.6.3' -PACKAGE_STRING='libksba 1.6.3' +PACKAGE_VERSION='1.6.4' +PACKAGE_STRING='libksba 1.6.4' PACKAGE_BUGREPORT='https://bugs.gnupg.org' PACKAGE_URL='' @@ -1384,7 +1384,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures libksba 1.6.3 to adapt to many kinds of systems. +\`configure' configures libksba 1.6.4 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1455,7 +1455,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of libksba 1.6.3:";; + short | recursive ) echo "Configuration of libksba 1.6.4:";; esac cat <<\_ACEOF @@ -1584,7 +1584,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -libksba configure 1.6.3 +libksba configure 1.6.4 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2190,7 +2190,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by libksba $as_me 1.6.3, which was +It was created by libksba $as_me 1.6.4, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2546,7 +2546,7 @@ # Please remember to document interface changes in the NEWS file. LIBKSBA_LT_CURRENT=22 LIBKSBA_LT_AGE=14 -LIBKSBA_LT_REVISION=3 +LIBKSBA_LT_REVISION=4 #------------------- # If the API is changed in an incompatible way: increment the next counter. KSBA_CONFIG_API_VERSION=1 @@ -3066,7 +3066,7 @@ # Define the identity of the package. PACKAGE='libksba' - VERSION='1.6.3' + VERSION='1.6.4' cat >>confdefs.h <<_ACEOF @@ -12475,7 +12475,7 @@ -VERSION_NUMBER=0x010603 +VERSION_NUMBER=0x010604 @@ -14222,7 +14222,6 @@ # # Checks for libraries. # - gpg_error_config_prefix="" # Check whether --with-libgpg-error-prefix was given. @@ -14299,8 +14298,6 @@ fi - min_gpg_error_version="$NEED_GPG_ERROR_VERSION" - ok=no # Extract the first word of "gpgrt-config", so it can be a program name with args. set dummy gpgrt-config; ac_word=$2 @@ -14398,12 +14395,9 @@ fi if test -n "$gpgrt_libdir"; then break; fi done - if test -z "$libdir_candidates"; then - # No valid pkgconfig dir in any of the system directories, fallback - gpgrt_libdir=${possible_libdir1} - fi - else - # When we cannot determine system libdir-format, use this: + fi + if test -z "$gpgrt_libdir"; then + # No valid pkgconfig dir in any of the system directories, fallback gpgrt_libdir=${possible_libdir1} fi else @@ -14418,12 +14412,16 @@ $as_echo "$as_me: Use gpgrt-config with $gpgrt_libdir as gpg-error-config" >&6;} gpg_error_config_version=`$GPG_ERROR_CONFIG --modversion` else + gpg_error_config_version=`$GPG_ERROR_CONFIG --version` unset GPGRT_CONFIG fi elif test "$GPG_ERROR_CONFIG" != "no"; then gpg_error_config_version=`$GPG_ERROR_CONFIG --version` unset GPGRT_CONFIG fi + + min_gpg_error_version="$NEED_GPG_ERROR_VERSION" + ok=no if test "$GPG_ERROR_CONFIG" != "no"; then req_major=`echo $min_gpg_error_version | \ sed 's/\([0-9]*\)\.\([0-9]*\)/\1/'` @@ -15261,11 +15259,11 @@ # Generate extended version information for W32. if test "$have_w32_system" = yes; then BUILD_FILEVERSION=`echo "$VERSION" | sed 's/\([0-9.]*\).*/\1./;s/\./,/g'` - BUILD_FILEVERSION="${BUILD_FILEVERSION}49146" + BUILD_FILEVERSION="${BUILD_FILEVERSION}21881" fi -BUILD_REVISION="bffa9b3" +BUILD_REVISION="5579994" cat >>confdefs.h <<_ACEOF @@ -15882,7 +15880,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by libksba $as_me 1.6.3, which was +This file was extended by libksba $as_me 1.6.4, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -15948,7 +15946,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -libksba config.status 1.6.3 +libksba config.status 1.6.4 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" @@ -17961,7 +17959,7 @@ echo " Libksba v${VERSION} has been configured as follows: - Revision: bffa9b3 (49146) + Revision: 5579994 (21881) Platform: $host " diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libksba-1.6.3/configure.ac new/libksba-1.6.4/configure.ac --- old/libksba-1.6.3/configure.ac 2022-12-06 14:30:27.000000000 +0100 +++ new/libksba-1.6.4/configure.ac 2023-06-19 11:40:39.000000000 +0200 @@ -30,7 +30,7 @@ m4_define([mym4_package],[libksba]) m4_define([mym4_major], [1]) m4_define([mym4_minor], [6]) -m4_define([mym4_micro], [3]) +m4_define([mym4_micro], [4]) # Below is m4 magic to extract and compute the git revision number, # the decimalized short revision number, a beta version string and a @@ -52,7 +52,7 @@ # Please remember to document interface changes in the NEWS file. LIBKSBA_LT_CURRENT=22 LIBKSBA_LT_AGE=14 -LIBKSBA_LT_REVISION=3 +LIBKSBA_LT_REVISION=4 #------------------- # If the API is changed in an incompatible way: increment the next counter. KSBA_CONFIG_API_VERSION=1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libksba-1.6.3/doc/ksba.info new/libksba-1.6.4/doc/ksba.info --- old/libksba-1.6.3/doc/ksba.info 2022-12-06 14:33:38.000000000 +0100 +++ new/libksba-1.6.4/doc/ksba.info 2023-06-19 11:42:45.000000000 +0200 @@ -8,8 +8,8 @@ This file documents the KSBA library to access X.509 and CMS data structures. - This is edition 1.6.3, last updated 22 November 2022, of 'The KSBA -Reference Manual', for Version 1.6.3. + This is edition 1.6.4, last updated 22 November 2022, of 'The KSBA +Reference Manual', for Version 1.6.4. Copyright (C) 2002, 2003, 2004 g10 Code GmbH @@ -25,8 +25,8 @@ Main Menu ********* -This is edition 1.6.3, last updated 22 November 2022, of 'The KSBA -Reference Manual', for Version 1.6.3 of the KSBA library. +This is edition 1.6.4, last updated 22 November 2022, of 'The KSBA +Reference Manual', for Version 1.6.4 of the KSBA library. Copyright (C) 2002, 2003, 2004 g10 Code GmbH diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libksba-1.6.3/doc/stamp-vti new/libksba-1.6.4/doc/stamp-vti --- old/libksba-1.6.3/doc/stamp-vti 2022-12-06 14:33:38.000000000 +0100 +++ new/libksba-1.6.4/doc/stamp-vti 2023-06-19 11:42:45.000000000 +0200 @@ -1,4 +1,4 @@ @set UPDATED 22 November 2022 @set UPDATED-MONTH November 2022 -@set EDITION 1.6.3 -@set VERSION 1.6.3 +@set EDITION 1.6.4 +@set VERSION 1.6.4 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libksba-1.6.3/doc/version.texi new/libksba-1.6.4/doc/version.texi --- old/libksba-1.6.3/doc/version.texi 2022-12-06 14:33:38.000000000 +0100 +++ new/libksba-1.6.4/doc/version.texi 2023-06-19 11:42:45.000000000 +0200 @@ -1,4 +1,4 @@ @set UPDATED 22 November 2022 @set UPDATED-MONTH November 2022 -@set EDITION 1.6.3 -@set VERSION 1.6.3 +@set EDITION 1.6.4 +@set VERSION 1.6.4 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libksba-1.6.3/m4/gpg-error.m4 new/libksba-1.6.4/m4/gpg-error.m4 --- old/libksba-1.6.3/m4/gpg-error.m4 2022-11-22 16:19:20.000000000 +0100 +++ new/libksba-1.6.4/m4/gpg-error.m4 2023-06-19 11:23:19.000000000 +0200 @@ -1,5 +1,5 @@ # gpg-error.m4 - autoconf macro to detect libgpg-error. -# Copyright (C) 2002, 2003, 2004, 2011, 2014, 2018, 2020, 2021 +# Copyright (C) 2002, 2003, 2004, 2011, 2014, 2018, 2020, 2021, 2022 # g10 Code GmbH # # This file is free software; as a special exception the author gives @@ -10,23 +10,13 @@ # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. # -# Last-changed: 2022-09-21 +# Last-changed: 2023-04-01 - -dnl AM_PATH_GPG_ERROR([MINIMUM-VERSION, -dnl [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]]) -dnl -dnl Test for libgpg-error and define GPG_ERROR_CFLAGS, GPG_ERROR_LIBS, -dnl GPG_ERROR_MT_CFLAGS, and GPG_ERROR_MT_LIBS. The _MT_ variants are -dnl used for programs requireing real multi thread support. dnl -dnl If a prefix option is not used, the config script is first -dnl searched in $SYSROOT/bin and then along $PATH. If the used -dnl config script does not match the host specification the script -dnl is added to the gpg_config_script_warn variable. +dnl Find gpg-error-config, for backward compatibility dnl -AC_DEFUN([AM_PATH_GPG_ERROR], -[ AC_REQUIRE([AC_CANONICAL_HOST]) +dnl _AM_PATH_POSSIBLE_GPG_ERROR_CONFIG +AC_DEFUN([_AM_PATH_POSSIBLE_GPG_ERROR_CONFIG],[dnl gpg_error_config_prefix="" dnl --with-libgpg-error-prefix=PFX is the preferred name for this option, dnl since that is consistent with how our three siblings use the directory/ @@ -62,9 +52,14 @@ fi AC_PATH_PROG(GPG_ERROR_CONFIG, gpg-error-config, no) - min_gpg_error_version=ifelse([$1], ,1.33,$1) - ok=no +]) +dnl +dnl Find gpgrt-config, which uses .pc file +dnl (minimum pkg-config functionality, supporting cross build) +dnl +dnl _AM_PATH_GPGRT_CONFIG +AC_DEFUN([_AM_PATH_GPGRT_CONFIG],[dnl AC_PATH_PROG(GPGRT_CONFIG, gpgrt-config, no, [$prefix/bin:$PATH]) if test "$GPGRT_CONFIG" != "no"; then # Determine gpgrt_libdir @@ -120,12 +115,9 @@ fi if test -n "$gpgrt_libdir"; then break; fi done - if test -z "$libdir_candidates"; then - # No valid pkgconfig dir in any of the system directories, fallback - gpgrt_libdir=${possible_libdir1} - fi - else - # When we cannot determine system libdir-format, use this: + fi + if test -z "$gpgrt_libdir"; then + # No valid pkgconfig dir in any of the system directories, fallback gpgrt_libdir=${possible_libdir1} fi else @@ -139,12 +131,33 @@ AC_MSG_NOTICE([Use gpgrt-config with $gpgrt_libdir as gpg-error-config]) gpg_error_config_version=`$GPG_ERROR_CONFIG --modversion` else + gpg_error_config_version=`$GPG_ERROR_CONFIG --version` unset GPGRT_CONFIG fi elif test "$GPG_ERROR_CONFIG" != "no"; then gpg_error_config_version=`$GPG_ERROR_CONFIG --version` unset GPGRT_CONFIG fi +]) + +dnl AM_PATH_GPG_ERROR([MINIMUM-VERSION, +dnl [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]]) +dnl +dnl Test for libgpg-error and define GPG_ERROR_CFLAGS, GPG_ERROR_LIBS, +dnl GPG_ERROR_MT_CFLAGS, and GPG_ERROR_MT_LIBS. The _MT_ variants are +dnl used for programs requireing real multi thread support. +dnl +dnl If a prefix option is not used, the config script is first +dnl searched in $SYSROOT/bin and then along $PATH. If the used +dnl config script does not match the host specification the script +dnl is added to the gpg_config_script_warn variable. +dnl +AC_DEFUN([AM_PATH_GPG_ERROR],[dnl +AC_REQUIRE([AC_CANONICAL_HOST])dnl +AC_REQUIRE([_AM_PATH_POSSIBLE_GPG_ERROR_CONFIG])dnl +AC_REQUIRE([_AM_PATH_GPGRT_CONFIG])dnl + min_gpg_error_version=ifelse([$1], ,1.33,$1) + ok=no if test "$GPG_ERROR_CONFIG" != "no"; then req_major=`echo $min_gpg_error_version | \ sed 's/\([[0-9]]*\)\.\([[0-9]]*\)/\1/'` diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libksba-1.6.3/src/cms.c new/libksba-1.6.4/src/cms.c --- old/libksba-1.6.3/src/cms.c 2022-10-07 09:56:23.000000000 +0200 +++ new/libksba-1.6.4/src/cms.c 2023-06-19 11:23:19.000000000 +0200 @@ -429,8 +429,8 @@ Fixme: We should write the tag here, and write a definite length header if everything fits into our local buffer. Actually pretty simple to do, but I am too lazy right now. */ - while (!(err = ksba_reader_read (cms->reader, buffer, - sizeof buffer, &nread)) ) + while (!err && !(err = ksba_reader_read (cms->reader, buffer, + sizeof buffer, &nread)) ) { err = _ksba_ber_write_tl (cms->writer, TYPE_OCTET_STRING, CLASS_UNIVERSAL, 0, nread); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libksba-1.6.3/src/der-builder.c new/libksba-1.6.4/src/der-builder.c --- old/libksba-1.6.3/src/der-builder.c 2020-05-18 19:15:09.000000000 +0200 +++ new/libksba-1.6.4/src/der-builder.c 2023-06-19 11:23:19.000000000 +0200 @@ -594,17 +594,20 @@ * ASN.1 object. */ bufsize = d->items[0].hdrlen + d->items[0].valuelen; - /* for (idx=0; idx < d->nitems; idx++) */ - /* gpgrt_log_debug ("DERB[%2d]: c=%d t=%2d %s p=%p h=%u l=%zu\n", */ - /* idx, */ - /* d->items[idx].class, */ - /* d->items[idx].tag, */ - /* d->items[idx].verbatim? "verbatim": */ - /* d->items[idx].is_stop? "stop": */ - /* d->items[idx].is_constructed? "cons":"prim", */ - /* d->items[idx].value, */ - /* d->items[idx].hdrlen, */ - /* d->items[idx].valuelen); */ + /* if (getenv ("KSBA_DEBUG_DER_BUILDER")) */ + /* { */ + /* for (idx=0; idx < d->nitems; idx++) */ + /* gpgrt_log_debug ("DERB[%2d]: c=%d t=%2d %s p=%p h=%u l=%zu\n", */ + /* idx, */ + /* d->items[idx].class, */ + /* d->items[idx].tag, */ + /* d->items[idx].verbatim? "verbatim": */ + /* d->items[idx].is_stop? "stop": */ + /* d->items[idx].is_constructed? "cons":"prim", */ + /* d->items[idx].value, */ + /* d->items[idx].hdrlen, */ + /* d->items[idx].valuelen); */ + /* } */ buffer = xtrymalloc (bufsize); if (!buffer) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libksba-1.6.3/src/ksba.h new/libksba-1.6.4/src/ksba.h --- old/libksba-1.6.3/src/ksba.h 2022-12-06 14:33:35.000000000 +0100 +++ new/libksba-1.6.4/src/ksba.h 2023-06-19 11:42:43.000000000 +0200 @@ -1,6 +1,5 @@ /* ksba.h - X.509 library used by GnuPG - * Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2010, 2011 - * 2012, 2013, 2104, 2015, 2019, 2020, 2021 g10 Code GmbH + * Copyright (C) 2001-2006, 2010-2015, 2018-2023 g10 Code GmbH * * This file is part of KSBA. * @@ -46,11 +45,11 @@ /* The version of this header should match the one of the library. Do * not use this symbol in your application; use assuan_check_version * instead. */ -#define KSBA_VERSION "1.6.3" +#define KSBA_VERSION "1.6.4" /* The version number of this header. It may be used to handle minor * API incompatibilities. */ -#define KSBA_VERSION_NUMBER 0x010603 +#define KSBA_VERSION_NUMBER 0x010604 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libksba-1.6.3/src/ksba.h.in new/libksba-1.6.4/src/ksba.h.in --- old/libksba-1.6.3/src/ksba.h.in 2022-10-07 09:56:23.000000000 +0200 +++ new/libksba-1.6.4/src/ksba.h.in 2023-06-19 11:35:07.000000000 +0200 @@ -1,6 +1,5 @@ /* ksba.h - X.509 library used by GnuPG - * Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2010, 2011 - * 2012, 2013, 2104, 2015, 2019, 2020, 2021 g10 Code GmbH + * Copyright (C) 2001-2006, 2010-2015, 2018-2023 g10 Code GmbH * * This file is part of KSBA. * diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libksba-1.6.3/src/versioninfo.rc.in new/libksba-1.6.4/src/versioninfo.rc.in --- old/libksba-1.6.3/src/versioninfo.rc.in 2020-11-18 16:17:11.000000000 +0100 +++ new/libksba-1.6.4/src/versioninfo.rc.in 2023-06-19 11:27:06.000000000 +0200 @@ -40,7 +40,7 @@ VALUE "FileDescription", "Libksba - X.509 and CMS Library\0" VALUE "FileVersion", "@LIBKSBA_LT_CURRENT@.@LIBKSBA_LT_AGE@.@LIBKSBA_LT_REVISION@.@BUILD_REVISION@\0" VALUE "InternalName", "libksba\0" - VALUE "LegalCopyright", "Copyright © 2020 g10 Code GmbH\0" + VALUE "LegalCopyright", "Copyright © 2023 g10 Code GmbH\0" VALUE "LegalTrademarks", "\0" VALUE "OriginalFilename", "libksba.dll\0" VALUE "PrivateBuild", "\0" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libksba-1.6.3/tests/Makefile.am new/libksba-1.6.4/tests/Makefile.am --- old/libksba-1.6.3/tests/Makefile.am 2020-11-18 15:59:10.000000000 +0100 +++ new/libksba-1.6.4/tests/Makefile.am 2023-06-19 11:23:19.000000000 +0200 @@ -58,7 +58,11 @@ t-der-builder AM_CFLAGS = $(GPG_ERROR_CFLAGS) $(COVERAGE_CFLAGS) +if HAVE_W32_SYSTEM +AM_LDFLAGS = -no-fast-install $(COVERAGE_LDFLAGS) +else AM_LDFLAGS = -no-install $(COVERAGE_LDFLAGS) +endif noinst_HEADERS = t-common.h noinst_PROGRAMS = $(TESTS) t-ocsp diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libksba-1.6.3/tests/Makefile.in new/libksba-1.6.4/tests/Makefile.in --- old/libksba-1.6.3/tests/Makefile.in 2022-12-06 14:33:26.000000000 +0100 +++ new/libksba-1.6.4/tests/Makefile.in 2023-06-19 11:42:34.000000000 +0200 @@ -448,7 +448,8 @@ BUILT_SOURCES = oidtranstbl.h CLEANFILES = oidtranstbl.h AM_CFLAGS = $(GPG_ERROR_CFLAGS) $(COVERAGE_CFLAGS) -AM_LDFLAGS = -no-install $(COVERAGE_LDFLAGS) +@HAVE_W32_SYSTEM_FALSE@AM_LDFLAGS = -no-install $(COVERAGE_LDFLAGS) +@HAVE_W32_SYSTEM_TRUE@AM_LDFLAGS = -no-fast-install $(COVERAGE_LDFLAGS) noinst_HEADERS = t-common.h LDADD = ../src/libksba.la $(GPG_ERROR_LIBS) @LDADD_FOR_TESTS_KLUDGE@ t_ocsp_SOURCES = t-ocsp.c sha1.c
