commit 1b44327d3e5fa239eb14922c0c802ea809cf2aa09418f9b59a4ef13c9f0aa479 Author: OBS User unknown Date: Mon Jan 15 23:15:33 2007 +0000 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gpg2?expand=0&rev=1 diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..9b03811 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,23 @@ +## Default LFS +*.7z filter=lfs diff=lfs merge=lfs -text +*.bsp filter=lfs diff=lfs merge=lfs -text +*.bz2 filter=lfs diff=lfs merge=lfs -text +*.gem filter=lfs diff=lfs merge=lfs -text +*.gz filter=lfs diff=lfs merge=lfs -text +*.jar filter=lfs diff=lfs merge=lfs -text +*.lz filter=lfs diff=lfs merge=lfs -text +*.lzma filter=lfs diff=lfs merge=lfs -text +*.obscpio filter=lfs diff=lfs merge=lfs -text +*.oxt filter=lfs diff=lfs merge=lfs -text +*.pdf filter=lfs diff=lfs merge=lfs -text +*.png filter=lfs diff=lfs merge=lfs -text +*.rpm filter=lfs diff=lfs merge=lfs -text +*.tbz filter=lfs diff=lfs merge=lfs -text +*.tbz2 filter=lfs diff=lfs merge=lfs -text +*.tgz filter=lfs diff=lfs merge=lfs -text +*.ttf filter=lfs diff=lfs merge=lfs -text +*.txz filter=lfs diff=lfs merge=lfs -text +*.whl filter=lfs diff=lfs merge=lfs -text +*.xz filter=lfs diff=lfs merge=lfs -text +*.zip filter=lfs diff=lfs merge=lfs -text +*.zst filter=lfs diff=lfs merge=lfs -text diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..57affb6 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +.osc diff --git a/gnupg-1.9.18-tmpdir.diff b/gnupg-1.9.18-tmpdir.diff new file mode 100644 index 0000000..6f22e0b --- /dev/null +++ b/gnupg-1.9.18-tmpdir.diff @@ -0,0 +1,43 @@ +--- agent/gpg-agent.c ++++ agent/gpg-agent.c +@@ -789,6 +789,10 @@ + int fd_ssh; + pid_t pid; + ++ char *tmp1, *tmp; ++ char *tmp2 = "gpg-XXXXXX/S.gpg-agent"; ++ size_t len; ++ + /* Remove the DISPLAY variable so that a pinentry does not + default to a specific display. There is still a default + display when gpg-agent was started using --display or a +@@ -800,16 +804,26 @@ + unsetenv ("DISPLAY"); + #endif + ++ if ((tmp1 = getenv("TMPDIR")) == NULL) ++ tmp1 = "/tmp"; ++ ++ len = strlen(tmp1) + strlen(tmp2) + 10; ++ tmp = malloc(len); ++ ++ snprintf(tmp, len, "%s%s%s", tmp1, tmp1 && strlen(tmp1) > 0 ? "/" : "", tmp2); + + /* Create the sockets. */ + socket_name = create_socket_name (standard_socket, + "S.gpg-agent", +- "/tmp/gpg-XXXXXX/S.gpg-agent"); +- if (opt.ssh_support) ++ tmp); ++ if (opt.ssh_support) { ++ snprintf(tmp, len, "%s%s%s.ssh", tmp1, tmp1 && strlen(tmp1) > 0 ? "/" : "", tmp2); + socket_name_ssh = create_socket_name (standard_socket, + "S.gpg-agent.ssh", +- "/tmp/gpg-XXXXXX/S.gpg-agent.ssh"); ++ tmp); ++ } + ++ free(tmp); + fd = create_server_socket (standard_socket, socket_name); + if (opt.ssh_support) + fd_ssh = create_server_socket (standard_socket, socket_name_ssh); diff --git a/gnupg-1.9.22-ccid-driver-fix.diff b/gnupg-1.9.22-ccid-driver-fix.diff new file mode 100644 index 0000000..83a8e77 --- /dev/null +++ b/gnupg-1.9.22-ccid-driver-fix.diff @@ -0,0 +1,42 @@ +Index: scd/ccid-driver.c +=================================================================== +--- scd/ccid-driver.c.orig ++++ scd/ccid-driver.c +@@ -75,8 +75,6 @@ + # include + #endif + +-#if defined(HAVE_LIBUSB) || defined(TEST) +- + #include + #include + #include +@@ -91,7 +89,14 @@ + #include "ccid-driver.h" + + #define DRVNAME "ccid-driver: " +- ++static int debug_level; /* Flag to control the debug output. ++ 0 = No debugging ++ 1 = USB I/O info ++ 2 = T=1 protocol tracing ++ */ ++ ++#if defined(HAVE_LIBUSB) || defined(TEST) ++#include + + /* Depending on how this source is used we either define our error + output to go to stderr or to the jnlib based logging functions. We +@@ -250,11 +255,7 @@ struct ccid_driver_s + + + static int initialized_usb; /* Tracks whether USB has been initialized. */ +-static int debug_level; /* Flag to control the debug output. +- 0 = No debugging +- 1 = USB I/O info +- 2 = T=1 protocol tracing +- */ ++ + + + static unsigned int compute_edc (const unsigned char *data, size_t datalen, diff --git a/gnupg-1.9.22-warnings-fix.diff b/gnupg-1.9.22-warnings-fix.diff new file mode 100644 index 0000000..6ad5a7c --- /dev/null +++ b/gnupg-1.9.22-warnings-fix.diff @@ -0,0 +1,66 @@ +Index: agent/gpg-agent.c +=================================================================== +--- agent/gpg-agent.c.orig ++++ agent/gpg-agent.c +@@ -1621,7 +1621,7 @@ check_for_running_agent (int mode) + int rc; + char *infostr, *p; + assuan_context_t ctx; +- int prot, pid; ++ int prot=0, pid=0; + + if (!mode) + { +Index: g10/pubkey-enc.c +=================================================================== +--- g10/pubkey-enc.c.orig ++++ g10/pubkey-enc.c +@@ -154,7 +154,7 @@ get_it( PKT_pubkey_enc *enc, DEK *dek, P + int rc; + gcry_mpi_t plain_dek = NULL; + byte *frame = NULL; +- unsigned n, nframe; ++ size_t n, nframe; + u16 csum, csum2; + + int card = 0; +@@ -166,7 +166,7 @@ get_it( PKT_pubkey_enc *enc, DEK *dek, P + size_t rbuflen; + char *snbuf; + unsigned char *indata = NULL; +- unsigned int indatalen; ++ size_t int indatalen; + + snbuf = serialno_and_fpr_from_sk (sk->protect.iv, sk->protect.ivlen, sk); + +Index: g10/seckey-cert.c +=================================================================== +--- g10/seckey-cert.c.orig ++++ g10/seckey-cert.c +@@ -107,7 +107,7 @@ do_check( PKT_secret_key *sk, const char + + csum = 0; + if( sk->version >= 4 ) { +- int ndata; ++ size_t ndata; + unsigned int ndatabits; + byte *p, *data; + u16 csumc = 0; +@@ -337,7 +337,7 @@ protect_secret_key( PKT_secret_key *sk, + { + int i,j, rc = 0; + byte *buffer; +- unsigned nbytes; ++ size_t nbytes; + u16 csum; + + if( !dek ) +@@ -370,7 +370,7 @@ protect_secret_key( PKT_secret_key *sk, + gcry_cipher_setiv (cipher_hd, sk->protect.iv, sk->protect.ivlen); + if( sk->version >= 4 ) { + byte *bufarr[PUBKEY_MAX_NSKEY]; +- unsigned narr[PUBKEY_MAX_NSKEY]; ++ size_t narr[PUBKEY_MAX_NSKEY]; + unsigned nbits[PUBKEY_MAX_NSKEY]; + int ndata=0; + byte *p, *data; diff --git a/gnupg-1.9.22.tar.bz2 b/gnupg-1.9.22.tar.bz2 new file mode 100644 index 0000000..a96a6fd --- /dev/null +++ b/gnupg-1.9.22.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2e4472e00c14c881ee1f93deddbe91d3c520311839f30d336ca48a51939e45cf +size 1908546 diff --git a/gpg2-1.9.22-CVE-2006-6169.diff b/gpg2-1.9.22-CVE-2006-6169.diff new file mode 100644 index 0000000..80311f2 --- /dev/null +++ b/gpg2-1.9.22-CVE-2006-6169.diff @@ -0,0 +1,13 @@ +--- g10/openfile.c ++++ g10/openfile.c +@@ -144,8 +144,8 @@ + + s = _("Enter new filename"); + +- n = strlen(s) + namelen + 10; + defname = name && namelen? make_printable_string( name, namelen, 0): NULL; ++ n = strlen(s) + (defname?strlen (defname):0) + 10; + prompt = xmalloc(n); + if( defname ) + sprintf(prompt, "%s [%s]: ", s, defname ); + diff --git a/gpg2.changes b/gpg2.changes new file mode 100644 index 0000000..e75054f --- /dev/null +++ b/gpg2.changes @@ -0,0 +1,171 @@ +------------------------------------------------------------------- +Thu Nov 30 16:59:25 CET 2006 - anicka@suse.cz + +- fix overflow in openfile.c (CVE-2006-6169, #224108) + +------------------------------------------------------------------- +Mon Sep 11 13:44:21 CEST 2006 - pnemec@suse.cz + +- updated gnupg to new version 1.9.22 + Enhanced pkcs#12 support + Support for the CardMan 4040 PCMCIA + Collected bug fixes +- updated pth library to 2.0.7 +- changed using pinetry-qt to pinentry +- removed -cfb.diff -signature.patch -cap_large_uid.patch patches + they are no longer needed +- change patch -warnings-fix.diff -ccid-driver-fix.diff + +------------------------------------------------------------------- +Thu Aug 17 11:55:09 CEST 2006 - pnemec@suse.de + +- remove unused package in build requires + +------------------------------------------------------------------- +Wed Aug 9 09:32:56 CEST 2006 - pnemec@suse.cz + +- fix spec file to build with new gettext 0.15 + +------------------------------------------------------------------- +Mon Aug 7 11:06:19 CEST 2006 - pnemec@suse.cz + +- fixed security fix with large uid CVE-2006-3746 [#195569] + +------------------------------------------------------------------- +Thu Feb 23 17:07:18 CET 2006 - pnemec@suse.cz + +- fixed signature security problem CVE-2006-0455 (bugzilla#150742) + +------------------------------------------------------------------- +Thu Feb 2 15:37:22 CET 2006 - pnemec@suse.cz + +- fixed install info in spec file + +------------------------------------------------------------------- +Thu Jan 26 15:52:26 CET 2006 - sbrabec@suse.cz + +- Added missing %install_info. + +------------------------------------------------------------------- +Wed Jan 25 21:36:18 CET 2006 - mls@suse.de + +- converted neededforbuild to BuildRequires + +------------------------------------------------------------------- +Fri Aug 5 12:52:44 CEST 2005 - postadal@suse.cz + +- updated to version to 1.9.18 +- removed obsoleted gcc patch +- added patch tmpdir.diff for using $TMPDIR by gpg-agent [#bug95732] + +------------------------------------------------------------------- +Tue Jul 12 14:17:11 CEST 2005 - postadal@suse.cz + +- updated to version to 1.9.17 +- updated pth to version 2.0.4 +- removed obsoleted patch agent-cache-fix.diff +- fixed ccid-driver.c +- fixed gcc4 +- explicitly enabled gpg building in configure + +------------------------------------------------------------------- +Thu Mar 24 13:55:34 CET 2005 - postadal@suse.cz + +- fixed caching passphrase in gpg-agent [#71975] + +------------------------------------------------------------------- +Tue Mar 22 18:11:12 CET 2005 - postadal@suse.cz + +- fixed on 64bit archs [#72440] + +------------------------------------------------------------------- +Wed Feb 23 15:16:55 CET 2005 - postadal@suse.cz + +- security fix for cfb-cipher issue [#65862] + +------------------------------------------------------------------- +Wed Jan 12 16:02:00 CET 2005 - postadal@suse.cz + +- update to version 1.9.14 +- removed obsoleted patch automake-fixes.diff + +------------------------------------------------------------------- +Tue Sep 28 08:52:32 CEST 2004 - adrian@suse.de + +- link against libpth staticaly to make S/MIME support in kmail + usable. Hopefully we can convert this to a native thread implementation + later. (#46260) + +------------------------------------------------------------------- +Sat Jul 31 15:07:26 CEST 2004 - adrian@suse.de + +- update to version 1.9.10 + +------------------------------------------------------------------- +Tue Jul 20 09:01:50 CEST 2004 - adrian@suse.de + +- remove openct and opensc packages from nfb + (we will need thread support, when enabling card reader support, + but it isn't anyway implemented yet in gpg2) + +------------------------------------------------------------------- +Mon Jul 12 17:55:32 CEST 2004 - adrian@suse.de + +- use GnuPG 2 sources version 1.9.9 +- opensc support misses some functions atm, support disabled for now +- threading is disabled, since we do not have a pth package for now +- prepare for nld + +------------------------------------------------------------------- +Thu Feb 26 13:27:08 CET 2004 - postadal@suse.cz + +- adapted some functions to the libgcrypt version 1.1.91 [#34987] +- added libgpg-error to needforbuild flag + +------------------------------------------------------------------- +Wed Feb 18 14:02:47 CET 2004 - kukuk@suse.de + +- Don't build against libpth. + +------------------------------------------------------------------- +Tue Feb 10 16:00:08 CET 2004 - postadal@suse.cz + +- fixed code that broke strict aliasing + +------------------------------------------------------------------- +Fri Dec 5 14:35:32 CET 2003 - garloff@suse.de + +- disable core dumpe in child after forking. [#33499] + +------------------------------------------------------------------- +Mon Aug 11 14:48:50 CEST 2003 - adrian@suse.de + +- cleanup #neededforbuild and requires + +------------------------------------------------------------------- +Mon Aug 4 15:28:41 CEST 2003 - ro@suse.de + +- added openct to neededforbuild + +------------------------------------------------------------------- +Fri Jul 18 14:23:15 CEST 2003 - mc@suse.de + +- build against opensc + +------------------------------------------------------------------- +Thu Jun 19 19:04:45 CEST 2003 - schwab@suse.de + +- Add %install_info. + +------------------------------------------------------------------- +Mon Mar 17 15:25:30 CET 2003 - adrian@suse.de + +- add signal handler to check if the parent is still alive and + exit if not +- use pinentry-qt by default (/usr/bin/pinentry do not exist) + +------------------------------------------------------------------- +Tue Feb 11 15:38:30 CET 2003 - mc@suse.de + +- initial release + diff --git a/gpg2.spec b/gpg2.spec new file mode 100644 index 0000000..1f576a7 --- /dev/null +++ b/gpg2.spec @@ -0,0 +1,199 @@ +# +# spec file for package gpg2 (Version 1.9.22) +# +# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. +# This file and all modifications and additions to the pristine +# package are under the same license as the package itself. +# +# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# + +# norootforbuild + +Name: gpg2 +BuildRequires: expect krb5 libassuan libgcrypt-devel libksba-devel pcsc-lite +URL: http://www.gnupg.org/aegypten2/ +License: GNU General Public License (GPL) +Group: Productivity/Networking/Security +PreReq: %install_info_prereq +Autoreqprov: on +Requires: pinentry, dirmngr, gpg +Provides: newpg +Obsoletes: newpg +Summary: GnuPG 2 +Version: 1.9.22 +Release: 20 +%define pthversion 2.0.7 +Source: gnupg-%{version}.tar.bz2 +Source1: pth-%{pthversion}.tar.bz2 +%define nld_build 0 +Patch2: nld-build.diff +Patch4: gnupg-1.9.22-warnings-fix.diff +Patch5: gnupg-1.9.22-ccid-driver-fix.diff +Patch6: gnupg-1.9.18-tmpdir.diff +Patch7: %{name}-%{version}-CVE-2006-6169.diff +BuildRoot: %{_tmppath}/%{name}-%{version}-build + +%description +GnuPG 2 is the successor of "GnuPG" or GPG. It provides: GPGSM, +gpg-agent, and a keybox library. + + + +Authors: +-------- + Werner Koch + Neal H. Walfield + +%prep +%setup -q -n gnupg-%{version} -b 1 +%if %nld_build +%patch2 +%endif +%patch4 +%patch5 +%patch6 +%patch7 + +%build +export CFLAGS="$RPM_OPT_FLAGS" +cd ../pth-%pthversion +./configure --disable-shared +make +make test +cd - +# opensc should be added to neededforbuild, but the support +# in gpg2 is broken atm. +export CFLAGS="$RPM_OPT_FLAGS -I$PWD/../pth-%pthversion" +export LDFLAGS="-L$PWD/../pth-%pthversion/.libs" +export PATH="$PWD/../pth-%pthversion/:$PATH" +autoreconf -fi +./configure \ + --prefix=%{_prefix} \ + --sysconfdir=/etc \ + --libdir=%{_libdir} \ + --infodir=%{_infodir} \ + --with-agent-pgm=%{_prefix}/bin/gpg-agent \ + --with-pinentry-pgm=%{_prefix}/bin/pinentry \ + --with-dirmngr-pgm=%{_prefix}/bin/dirmngr \ + --enable-ldap \ + --enable-external-hkp \ + --enable-shared \ + --enable-gpgsm=yes \ + --enable-gpg \ + --enable-static-rnd=linux \ + --with-gnu-ld \ + --mandir=%{_mandir} \ + --libexecdir=%{_libdir} \ + --program-prefix="" %{_target_cpu}-suse-linux \ + --with-scdaemon-pgm=%{_prefix}/bin/scdaemon + +make + +%install +make DESTDIR=$RPM_BUILD_ROOT install +rm $RPM_BUILD_ROOT/usr/share/info/dir + +%post +%install_info --info-dir=%{_infodir} %{_infodir}/gnupg.info.gz + +%postun +%install_info_delete --info-dir=%{_infodir} %{_infodir}/gnupg.info.gz + +%files +%defattr(-,root,root) +%doc ABOUT-NLS AUTHORS COPYING ChangeLog INSTALL NEWS README THANKS TODO VERSION +%doc %_infodir/gnupg* +/usr/bin/* +%{_libdir}/gnupg +%{_libdir}/gpg-protect-tool +%{_libdir}/gpg-preset-passphrase +/usr/sbin/addgnupghome +/usr/share/locale/de/LC_MESSAGES/gnupg2.mo +/usr/share/gnupg + +%changelog -n gpg2 +* Thu Nov 30 2006 - anicka@suse.cz +- fix overflow in openfile.c (CVE-2006-6169, #224108) +* Mon Sep 11 2006 - pnemec@suse.cz +- updated gnupg to new version 1.9.22 + Enhanced pkcs#12 support + Support for the CardMan 4040 PCMCIA + Collected bug fixes +- updated pth library to 2.0.7 +- changed using pinetry-qt to pinentry +- removed -cfb.diff -signature.patch -cap_large_uid.patch patches + they are no longer needed +- change patch -warnings-fix.diff -ccid-driver-fix.diff +* Thu Aug 17 2006 - pnemec@suse.de +- remove unused package in build requires +* Wed Aug 09 2006 - pnemec@suse.cz +- fix spec file to build with new gettext 0.15 +* Mon Aug 07 2006 - pnemec@suse.cz +- fixed security fix with large uid CVE-2006-3746 [#195569] +* Thu Feb 23 2006 - pnemec@suse.cz +- fixed signature security problem CVE-2006-0455 (bugzilla#150742) +* Thu Feb 02 2006 - pnemec@suse.cz +- fixed install info in spec file +* Thu Jan 26 2006 - sbrabec@suse.cz +- Added missing %%install_info. +* Wed Jan 25 2006 - mls@suse.de +- converted neededforbuild to BuildRequires +* Fri Aug 05 2005 - postadal@suse.cz +- updated to version to 1.9.18 +- removed obsoleted gcc patch +- added patch tmpdir.diff for using $TMPDIR by gpg-agent [#bug95732] +* Tue Jul 12 2005 - postadal@suse.cz +- updated to version to 1.9.17 +- updated pth to version 2.0.4 +- removed obsoleted patch agent-cache-fix.diff +- fixed ccid-driver.c +- fixed gcc4 +- explicitly enabled gpg building in configure +* Thu Mar 24 2005 - postadal@suse.cz +- fixed caching passphrase in gpg-agent [#71975] +* Tue Mar 22 2005 - postadal@suse.cz +- fixed on 64bit archs [#72440] +* Wed Feb 23 2005 - postadal@suse.cz +- security fix for cfb-cipher issue [#65862] +* Wed Jan 12 2005 - postadal@suse.cz +- update to version 1.9.14 +- removed obsoleted patch automake-fixes.diff +* Tue Sep 28 2004 - adrian@suse.de +- link against libpth staticaly to make S/MIME support in kmail + usable. Hopefully we can convert this to a native thread implementation + later. (#46260) +* Sat Jul 31 2004 - adrian@suse.de +- update to version 1.9.10 +* Tue Jul 20 2004 - adrian@suse.de +- remove openct and opensc packages from nfb + (we will need thread support, when enabling card reader support, + but it isn't anyway implemented yet in gpg2) +* Mon Jul 12 2004 - adrian@suse.de +- use GnuPG 2 sources version 1.9.9 +- opensc support misses some functions atm, support disabled for now +- threading is disabled, since we do not have a pth package for now +- prepare for nld +* Thu Feb 26 2004 - postadal@suse.cz +- adapted some functions to the libgcrypt version 1.1.91 [#34987] +- added libgpg-error to needforbuild flag +* Wed Feb 18 2004 - kukuk@suse.de +- Don't build against libpth. +* Tue Feb 10 2004 - postadal@suse.cz +- fixed code that broke strict aliasing +* Fri Dec 05 2003 - garloff@suse.de +- disable core dumpe in child after forking. [#33499] +* Mon Aug 11 2003 - adrian@suse.de +- cleanup #neededforbuild and requires +* Mon Aug 04 2003 - ro@suse.de +- added openct to neededforbuild +* Fri Jul 18 2003 - mc@suse.de +- build against opensc +* Thu Jun 19 2003 - schwab@suse.de +- Add %%install_info. +* Mon Mar 17 2003 - adrian@suse.de +- add signal handler to check if the parent is still alive and + exit if not +- use pinentry-qt by default (/usr/bin/pinentry do not exist) +* Tue Feb 11 2003 - mc@suse.de +- initial release diff --git a/nld-build.diff b/nld-build.diff new file mode 100644 index 0000000..4702d50 --- /dev/null +++ b/nld-build.diff @@ -0,0 +1,82 @@ +--- agent/Makefile.am ++++ agent/Makefile.am +@@ -46,7 +46,7 @@ + + gpg_agent_LDADD = ../jnlib/libjnlib.a ../common/libcommon.a \ + $(LIBGCRYPT_LIBS) $(PTH_LIBS) $(LIBASSUAN_LIBS) \ +- -lgpg-error @LIBINTL@ ++ -lgpg-error-nld @LIBINTL@ + + gpg_protect_tool_SOURCES = \ + protect-tool.c \ +@@ -55,7 +55,7 @@ + + gpg_protect_tool_LDADD = ../common/libsimple-pwquery.a \ + ../jnlib/libjnlib.a ../common/libcommon.a \ +- $(LIBGCRYPT_LIBS) -lgpg-error @LIBINTL@ ++ $(LIBGCRYPT_LIBS) -lgpg-error-nld @LIBINTL@ + if HAVE_W32_SYSTEM + gpg_protect_tool_LDADD += -lwsock32 + endif +@@ -65,7 +65,7 @@ + + gpg_preset_passphrase_LDADD = ../common/libsimple-pwquery.a \ + ../jnlib/libjnlib.a ../common/libcommon.a \ +- $(LIBGCRYPT_LIBS) -lgpg-error @LIBINTL@ ++ $(LIBGCRYPT_LIBS) -lgpg-error-nld @LIBINTL@ + if HAVE_W32_SYSTEM + gpg_preset_passphrase_LDADD += -lwsock32 + endif +--- g10/Makefile.am ++++ g10/Makefile.am +@@ -109,8 +109,8 @@ + # $(common_source) + + LDADD = $(needed_libs) @LIBINTL@ @CAPLIBS@ @W32LIBS@ +-gpg2_LDADD = $(LIBGCRYPT_LIBS) $(LDADD) -lassuan -lgpg-error +-gpgv2_LDADD = $(LIBGCRYPT_LIBS) $(LDADD) -lassuan -lgpg-error ++gpg2_LDADD = $(LIBGCRYPT_LIBS) $(LDADD) -lassuan -lgpg-error-nld ++gpgv2_LDADD = $(LIBGCRYPT_LIBS) $(LDADD) -lassuan -lgpg-error-nld + + $(PROGRAMS): $(needed_libs) + +--- kbx/Makefile.am ++++ kbx/Makefile.am +@@ -46,5 +46,5 @@ + # Note that libcommon is only required to resolve the LIBOBJS. + kbxutil_SOURCES = kbxutil.c $(common_sources) + kbxutil_LDADD = ../jnlib/libjnlib.a $(KSBA_LIBS) $(LIBGCRYPT_LIBS) \ +- -lgpg-error $(LIBINTL) ../common/libcommon.a ++ -lgpg-error-nld $(LIBINTL) ../common/libcommon.a + +--- scd/Makefile.am ++++ scd/Makefile.am +@@ -54,7 +54,7 @@ + + scdaemon_LDADD = ../jnlib/libjnlib.a ../common/libcommon.a \ + $(LIBGCRYPT_LIBS) $(KSBA_LIBS) $(pth_libs) $(LIBASSUAN_LIBS) \ +- $(LIBUSB_LIBS) $(OPENSC_LIBS) -lgpg-error $(LIBINTL) $(DL_LIBS) ++ $(LIBUSB_LIBS) $(OPENSC_LIBS) -lgpg-error-nld $(LIBINTL) $(DL_LIBS) + + sc_copykeys_SOURCES = \ + sc-copykeys.c scdaemon.h \ +@@ -70,7 +70,7 @@ + ../common/libsimple-pwquery.a \ + $(LIBGCRYPT_LIBS) $(pth_libs) $(KSBA_LIBS) $(LIBASSUAN_LIBS) \ + $(LIBUSB_LIBS) $(OPENSC_LIBS) \ +- -lgpg-error @LIBINTL@ @DL_LIBS@ ++ -lgpg-error-nld @LIBINTL@ @DL_LIBS@ + + pcsc_wrapper_SOURCES = pcsc-wrapper.c + pcsc_wrapper_LDADD = $(DL_LIBS) +--- sm/Makefile.am ++++ sm/Makefile.am +@@ -53,7 +53,7 @@ + + gpgsm_LDADD = ../jnlib/libjnlib.a ../kbx/libkeybox.a \ + ../common/libcommon.a \ +- $(LIBGCRYPT_LIBS) $(KSBA_LIBS) $(LIBASSUAN_LIBS) -lgpg-error \ ++ $(LIBGCRYPT_LIBS) $(KSBA_LIBS) $(LIBASSUAN_LIBS) -lgpg-error-nld \ + $(LIBINTL) + + diff --git a/pth-2.0.7.tar.bz2 b/pth-2.0.7.tar.bz2 new file mode 100644 index 0000000..c2a072b --- /dev/null +++ b/pth-2.0.7.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:075705004ec9a6b19fe8b00af4f2c45ec2a0008d78cedea571265d0b544c7a90 +size 507473 diff --git a/ready b/ready new file mode 100644 index 0000000..473a0f4