Hello community, here is the log from the commit of package dirmngr for openSUSE:Factory checked in at 2014-10-31 18:27:17 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/dirmngr (Old) and /work/SRC/openSUSE:Factory/.dirmngr.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "dirmngr" Changes: -------- --- /work/SRC/openSUSE:Factory/dirmngr/dirmngr.changes 2013-12-19 15:01:57.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.dirmngr.new/dirmngr.changes 2014-10-31 18:27:21.000000000 +0100 @@ -1,0 +2,8 @@ +Mon Oct 20 08:28:48 UTC 2014 - vcizek@suse.com + +- initialize pth with libgcrypt > 1.6.0 (bnc#901845) + * added dirmngr-initialize_pth.patch + * http://bugs.gnupg.org/gnupg/issue1590 +- spec-cleaned .spec + +------------------------------------------------------------------- New: ---- dirmngr-initialize_pth.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dirmngr.spec ++++++ --- /var/tmp/diff_new_pack.gD0vNm/_old 2014-10-31 18:27:22.000000000 +0100 +++ /var/tmp/diff_new_pack.gD0vNm/_new 2014-10-31 18:27:22.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package dirmngr # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,26 +15,28 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: dirmngr -BuildRequires: libassuan-devel >= 2.0.0 -BuildRequires: libgpg-error-devel >= 1.4 -BuildRequires: libgcrypt-devel >= 1.4.0 -BuildRequires: libksba-devel >= 1.0.2 -BuildRequires: libpth-devel >= 1.3.7 -BuildRequires: automake -BuildRequires: openldap2-devel -Url: http://www.gnupg.org/aegypten/ Version: 1.1.1 Release: 0 -Requires: openssl Summary: A Client for Managing and Downloading CRLs License: GPL-3.0+ Group: Productivity/Networking/LDAP/Utilities +Url: http://www.gnupg.org/aegypten/ Source: ftp://ftp.gnupg.org/gcrypt/dirmngr/%{name}-%{version}.tar.bz2 Source1: LICENSE.README -Requires(pre): %install_info_prereq -Recommends: %{name}-lang Patch0: dirmngr-1.0.2-optflags.patch +Patch1: dirmngr-initialize_pth.patch +BuildRequires: automake +BuildRequires: libassuan-devel >= 2.0.0 +BuildRequires: libgcrypt-devel >= 1.4.0 +BuildRequires: libgpg-error-devel >= 1.4 +BuildRequires: libksba-devel >= 1.0.2 +BuildRequires: libpth-devel >= 1.3.7 +BuildRequires: openldap2-devel +Requires: openssl +Requires(pre): %{install_info_prereq} +Recommends: %{name}-lang %description Dirmngr is a client for managing and downloading certificate revocation @@ -44,24 +46,25 @@ %lang_package %prep -%setup -q -n %{name}-%{version} +%setup -q %patch0 -cp %{S:1} . +%patch1 +cp %{SOURCE1} . %build NOCONFIGURE=1 ./autogen.sh #export CFLAGS="$RPM_OPT_FLAGS -DLDAP_DEPRECATED" %configure \ - --libexecdir=%_libexecdir/dirmngr \ + --libexecdir=%{_libexecdir}/dirmngr \ --docdir=%{_defaultdocdir}/%{name} make %{?_smp_mflags} %install -%makeinstall +make DESTDIR=%{buildroot} install %{?_smp_mflags} %find_lang %{name} %post -%install_info --info-dir=%_infodir %_infodir/%name.info.gz +%install_info --info-dir=%{_infodir} %{_infodir}/%{name}.info.gz %postun %install_info_delete --info-dir=%{_infodir} %{_infodir}/%{name}.info.gz @@ -73,8 +76,9 @@ %{_bindir}/* %{_infodir}/dirmngr* %{_mandir}/man1/dirmngr*.1.gz -%_libexecdir/dirmngr +%{_libexecdir}/dirmngr %files lang -f %{name}.lang +%defattr(-,root,root) %changelog ++++++ dirmngr-initialize_pth.patch ++++++ Index: src/dirmngr.c =================================================================== --- src/dirmngr.c (revision 348) +++ src/dirmngr.c (working copy) @@ -665,8 +665,11 @@ the option parsing may need services of the libraries. */ /* Libgcrypt requires us to register the threading model first. - Note that this will also do the pth_init. */ + Note that this will also do the pth_init for libgcrypt < 1.6 */ +#if GCRYPT_VERSION_NUMBER >= 0x010600 + pth_init (); +#endif /* Init Libgcrypt. */ rc = gcry_control (GCRYCTL_SET_THREAD_CBS, &gcry_threads_pth); if (rc) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org