rpm/gpg2
SHA256
1
0
Fork 0
forked from pool/gpg2
Code Pull Requests Activity

OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gpg2?expand=0&rev=14

Browse Source
This commit is contained in:
OBS User unknown 2007-10-25 23:46:05 +00:00 committed by Git OBS Bridge
parent 8db3f4a850
commit ca710c27a2
8 changed files with 111 additions and 227 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

83
gnupg-2.0.4-install_tools.diff
View File

@ -9,17 +9,6 @@
common_sources = \ common_sources = \
common-defs.h \ common-defs.h \
--- common/Makefile.in
+++ common/Makefile.in
@@ -409,7 +409,7 @@
noinst_LIBRARIES = libcommon.a libcommonpth.a libsimple-pwquery.a libgpgrl.a
TESTS = $(module_tests)
AM_CPPFLAGS = -I$(top_srcdir)/gl -I$(top_srcdir)/intl
-AM_CFLAGS = $(LIBGCRYPT_CFLAGS) $(KSBA_CFLAGS)
+AM_CFLAGS = $(LIBGCRYPT_CFLAGS) $(KSBA_CFLAGS) -fPIC
common_sources = \
common-defs.h \
util.h i18n.h \
--- gl/Makefile.am --- gl/Makefile.am
+++ gl/Makefile.am +++ gl/Makefile.am
@@ -13,6 +13,8 @@ @@ -13,6 +13,8 @@
@ -31,16 +20,6 @@
noinst_LIBRARIES = libgnu.a noinst_LIBRARIES = libgnu.a
libgnu_a_SOURCES = libgnu_a_SOURCES =
--- gl/Makefile.in
+++ gl/Makefile.in
@@ -339,6 +339,7 @@
target_os = @target_os@
target_vendor = @target_vendor@
AUTOMAKE_OPTIONS = 1.5 gnits no-dependencies
+AM_CFLAGS = -fPIC
noinst_LIBRARIES = libgnu.a
libgnu_a_SOURCES = allocsa.h allocsa.c mkdtemp.h setenv.h \
printf-args.h printf-parse.h vasnprintf.h vasprintf.h xsize.h
--- jnlib/Makefile.am --- jnlib/Makefile.am
+++ jnlib/Makefile.am +++ jnlib/Makefile.am
@@ -27,7 +27,7 @@ @@ -27,7 +27,7 @@
@ -52,17 +31,6 @@
noinst_LIBRARIES = libjnlib.a noinst_LIBRARIES = libjnlib.a
--- jnlib/Makefile.in
+++ jnlib/Makefile.in
@@ -353,7 +353,7 @@
AM_CPPFLAGS = -I$(top_srcdir)/intl
# We need libgcrypt because libjnlib-config includes gcrypt.h
-AM_CFLAGS = $(LIBGCRYPT_CFLAGS)
+AM_CFLAGS = $(LIBGCRYPT_CFLAGS) -fPIC
noinst_LIBRARIES = libjnlib.a
#libjnlib_a_LDFLAGS =
--- tools/Makefile.am --- tools/Makefile.am
+++ tools/Makefile.am +++ tools/Makefile.am
@@ -27,14 +27,14 @@ @@ -27,14 +27,14 @@
@ -84,60 +52,21 @@
if BUILD_SYMCRYPTRUN if BUILD_SYMCRYPTRUN
@@ -44,19 +44,19 @@ @@ -44,19 +44,19 @@
endif
bin_PROGRAMS = gpgconf gpg-connect-agent gpgkey2ssh ${symcryptrun} \ bin_PROGRAMS = gpgconf gpg-connect-agent gpgkey2ssh ${symcryptrun}
- gpgparsemail
+ gpgparsemail gpgsplit
if !HAVE_W32_SYSTEM if !HAVE_W32_SYSTEM
bin_PROGRAMS += watchgnupg -bin_PROGRAMS += watchgnupg gpgparsemail
+bin_PROGRAMS += watchgnupg gpgparsemail gpgsplit
endif endif
-noinst_PROGRAMS = clean-sat mk-tdata make-dns-cert gpgsplit -noinst_PROGRAMS = clean-sat mk-tdata make-dns-cert gpgsplit
+noinst_PROGRAMS = clean-sat mk-tdata make-dns-cert +noinst_PROGRAMS = clean-sat mk-tdata make-dns-cert
common_libs = ../jnlib/libjnlib.a ../common/libcommon.a ../gl/libgnu.a common_libs = $(libcommon) ../jnlib/libjnlib.a ../gl/libgnu.a
pwquery_libs = ../common/libsimple-pwquery.a pwquery_libs = ../common/libsimple-pwquery.a
gpgsplit_LDADD = $(common_libs) $(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) \ gpgsplit_LDADD = $(common_libs) \
$(ZLIBS) $(LIBINTL) $(LIBICONV) $(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) \
-
+gpgsplit_LDFLAGS = -pie
gpgconf_SOURCES = gpgconf.c gpgconf.h gpgconf-comp.c no-libgcrypt.c
# jnlib/common sucks in gpg-error, will they, nil they (some compilers
--- tools/Makefile.in
+++ tools/Makefile.in
@@ -93,10 +93,10 @@
@GNUPG_PROTECT_TOOL_PGM_TRUE@am__append_6 = -DGNUPG_DEFAULT_PROTECT_TOOL="\"@GNUPG_PROTECT_TOOL_PGM@\""
bin_PROGRAMS = gpgconf$(EXEEXT) gpg-connect-agent$(EXEEXT) \
gpgkey2ssh$(EXEEXT) $(am__EXEEXT_1) gpgparsemail$(EXEEXT) \
- $(am__EXEEXT_2)
+ $(am__EXEEXT_2) gpgsplit$(EXEEXT)
@HAVE_W32_SYSTEM_FALSE@am__append_7 = watchgnupg
noinst_PROGRAMS = clean-sat$(EXEEXT) mk-tdata$(EXEEXT) \
- make-dns-cert$(EXEEXT) gpgsplit$(EXEEXT)
+ make-dns-cert$(EXEEXT)
subdir = tools
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/gl/m4/alloca.m4 \
@@ -447,18 +447,18 @@
-I$(top_srcdir)/common -DLOCALEDIR=\"$(localedir)\" \
$(am__append_1) $(am__append_2) $(am__append_3) \
$(am__append_4) $(am__append_5) $(am__append_6)
-AM_CFLAGS = $(LIBGCRYPT_CFLAGS) $(GPG_ERROR_CFLAGS) $(LIBASSUAN_CFLAGS)
+AM_CFLAGS = $(LIBGCRYPT_CFLAGS) $(GPG_ERROR_CFLAGS) $(LIBASSUAN_CFLAGS) -fPIE
sbin_SCRIPTS = addgnupghome applygnupgdefaults
bin_SCRIPTS = gpgsm-gencert.sh
-# bin_SCRIPTS += gpg-zip
-@HAVE_USTAR_TRUE@noinst_SCRIPTS = gpg-zip
+@HAVE_USTAR_TRUE@bin_SCRIPTS = gpg-zip
+# noinst_SCRIPTS = gpg-zip
@BUILD_SYMCRYPTRUN_FALSE@symcryptrun =
@BUILD_SYMCRYPTRUN_TRUE@symcryptrun = symcryptrun
common_libs = ../jnlib/libjnlib.a ../common/libcommon.a ../gl/libgnu.a
pwquery_libs = ../common/libsimple-pwquery.a
gpgsplit_LDADD = $(common_libs) $(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) \
$(ZLIBS) $(LIBINTL) $(LIBICONV) $(ZLIBS) $(LIBINTL) $(LIBICONV)
- -
+gpgsplit_LDFLAGS = -pie +gpgsplit_LDFLAGS = -pie

40
gnupg-2.0.4-sig-check.diff
View File

@ -1,40 +0,0 @@
--- g10/sig-check.c 2006/08/01 12:23:34 4216
+++ g10/sig-check.c 2007/05/16 11:10:07 4504
@@ -438,22 +438,25 @@
gcry_md_hd_t md;
int rc;
+ /* Always check whether the algorithm is available. Although
+ gcry_md_open woyuld throw an error, some libgcrypt versions will
+ print a debug message in that case too. */
+ if ((rc=openpgp_md_test_algo (backsig->digest_algo)))
+ return rc;
+
if(!opt.no_sig_cache && backsig->flags.checked)
- {
- if((rc=openpgp_md_test_algo (backsig->digest_algo)))
- return rc;
+ return backsig->flags.valid? 0 : gpg_error (GPG_ERR_BAD_SIGNATURE);
- return backsig->flags.valid? 0 : gpg_error (GPG_ERR_BAD_SIGNATURE);
+ rc = gcry_md_open (&md, backsig->digest_algo,0);
+ if (!rc)
+ {
+ hash_public_key(md,main_pk);
+ hash_public_key(md,sub_pk);
+ rc=do_check(sub_pk,backsig,md,NULL,NULL,NULL);
+ cache_sig_result(backsig,rc);
+ gcry_md_close(md);
}
- if (gcry_md_open (&md, backsig->digest_algo,0))
- BUG ();
- hash_public_key(md,main_pk);
- hash_public_key(md,sub_pk);
- rc=do_check(sub_pk,backsig,md,NULL,NULL,NULL);
- cache_sig_result(backsig,rc);
- gcry_md_close(md);
-
return rc;
}

3
gnupg-2.0.4-svn4472.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:4fdcba0d8df14e4ab0d963a9314858974fff43d223ecc42e1cfc339fd23884e4
size 3530028

44
gnupg-2.0.5.fixes-from-svn-20070812.diff Normal file
View File

@ -0,0 +1,44 @@
# This fixes the t-gettime testcase:
--- gnupg-2.0.5/common/ChangeLog 2007-07-05 11:57:28.000000000 +0200
+++ gnupg/common/ChangeLog
@@ -1,3 +1,7 @@
+2007-07-09 Werner Koch <wk@g10code.com>
+
+ * t-gettime.c (test_isotime2epoch): Use time_t and not u32.
+
2007-07-05 Werner Koch <wk@g10code.com>
* t-gettime.c: New.
--- gnupg-2.0.5/common/t-gettime.c 2007-07-05 12:05:01.000000000 +0200
+++ gnupg/common/t-gettime.c 2007-08-12 18:32:51.000000000 +0200
@@ -57,7 +57,7 @@
{ NULL, 0 }
};
int idx;
- u32 val;
+ time_t val;
gnupg_isotime_t tbuf;
for (idx=0; array[idx].string; idx++)
# Looks right....:
--- gnupg-2.0.5/tools/ChangeLog 2007-07-05 18:56:24.000000000 +0200
+++ gnupg/tools/ChangeLog
@@ -1,3 +1,7 @@
+2007-07-16 Marcus Brinkmann <marcus@g10code.de>
+
+ * gpg-connect-agent.c (main): Bail out if write fails.
+
2007-07-05 Marcus Brinkmann <marcus@g10code.de>
* symcryptrun.c (confucius_get_pass): Define orig_codeset if
--- gnupg-2.0.5/tools/gpg-connect-agent.c 2007-07-04 15:06:00.000000000 +0200
+++ gnupg/tools/gpg-connect-agent.c
@@ -464,7 +463,7 @@
if (rc)
{
log_info (_("sending line failed: %s\n"), gpg_strerror (rc) );
- continue;
+ break;
}
if (*line == '#' || !*line)
continue; /* Don't expect a response for a comment line. */

3
gnupg-2.0.5.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:9c5133eb8bee56013c851f9c7da2c4823ac4de8f6b00bd9f9b97a75c8494ad69
size 3513529

17
gpg2.changes
View File

@ -9,6 +9,23 @@ Mon Sep 10 20:13:07 CEST 2007 - ltinkl@suse.cz
- fix gpg2 crash on accessing key (#307666) - fix gpg2 crash on accessing key (#307666)
- fix gpg doesn't work on the console (#302323) - fix gpg doesn't work on the console (#302323)
-------------------------------------------------------------------
Fri Aug 10 11:50:20 CEST 2007 - bk@suse.de
- update to GnuPG-2.0.5 - requries libassuan-1.0.2!
* Switched license to GPLv3.
* Fixed bug when using the --p12-charset without --armor.
* The command --gen-key may now be used instead of the
gpgsm-gencert.sh script.
* Changed key generation to reveal less information about the
machine. Bug fixes for gpg2's card key generation.
- enable make check to test against build issues in the crypto engine
- cleanup disabled nld patch for linking with -lgpg-error-nld
- use %find_lang to label the locale files properly with %lang
- add opensc-devel to BuildRequrires to enanble smartcard support
- del Makefile.in patches where we patch Makefile.am and run automake
- cleanup the standrd GNU INSTALL and the empty VERSION from %doc
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Jul 26 13:16:22 CEST 2007 - sbrabec@suse.cz Thu Jul 26 13:16:22 CEST 2007 - sbrabec@suse.cz

66
gpg2.spec
View File

@ -1,5 +1,5 @@
# #
# spec file for package gpg2 (Version 2.0.4) # spec file for package gpg2 (Version 2.0.5)
# #
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine # This file and all modifications and additions to the pristine
@ -11,28 +11,27 @@
# norootforbuild # norootforbuild
Name: gpg2 Name: gpg2
BuildRequires: expect krb5 libassuan-devel libgcrypt-devel libksba-devel pcsc-lite BuildRequires: expect krb5 libassuan-devel pth
BuildRequires: libusb-devel pth readline-devel zlib-devel BuildRequires: libgcrypt-devel libksba-devel opensc-devel pcsc-lite
BuildRequires: libusb-devel readline-devel zlib-devel
BuildRequires: openldap2 openldap2-devel BuildRequires: openldap2 openldap2-devel
URL: http://www.gnupg.org/aegypten2/ Url: http://www.gnupg.org/aegypten2/
License: GPL v2 or later License: GPL v2 or later
Group: Productivity/Networking/Security Group: Productivity/Networking/Security
PreReq: %install_info_prereq PreReq: %install_info_prereq
Autoreqprov: on AutoReqProv: on
Requires: pinentry, dirmngr Requires: pinentry, dirmngr
Provides: newpg gpg = 1.4.7 gnupg = %{version} Provides: newpg gpg = 1.4.7 gnupg = %{version}
Obsoletes: newpg gpg <= 1.4.7 Obsoletes: newpg gpg <= 1.4.7
Summary: GnuPG 2 Summary: GnuPG 2
Version: 2.0.4 Version: 2.0.5
Release: 44 Release: 2
Source: gnupg-%{version}-svn4472.tar.bz2 Source: ftp://ftp.gnupg.org/gcrypt/gnupg/gnupg-2.0.5.tar.bz2
%define nld_build 0 Patch1: gnupg-2.0.5.fixes-from-svn-20070812.diff
Patch2: nld-build.diff
Patch3: gnupg-2.0.4-oldkey.diff Patch3: gnupg-2.0.4-oldkey.diff
Patch5: gnupg-1.9.22-ccid-driver-fix.diff Patch5: gnupg-1.9.22-ccid-driver-fix.diff
Patch6: gnupg-1.9.18-tmpdir.diff Patch6: gnupg-1.9.18-tmpdir.diff
Patch7: gnupg-2.0.4-install_tools.diff Patch7: gnupg-2.0.4-install_tools.diff
Patch8: gnupg-2.0.4-sig-check.diff
Patch9: gnupg-2.0.4-default-tty.diff Patch9: gnupg-2.0.4-default-tty.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
@ -48,22 +47,22 @@ Authors:
Neal H. Walfield <neal@g10code.de> Neal H. Walfield <neal@g10code.de>
%prep %prep
%setup -q -n gnupg-%{version}-svn4472 %setup -q -n gnupg-%version
%if %nld_build %patch1 -p1
%patch2
%endif
%patch3 %patch3
%patch5 %patch5
%patch6 %patch6
# Note: this patch only patches Makefile.am files, so it needs automake to run.
%patch7 %patch7
%patch8
%patch9 %patch9
# Allow building GnuPG-2.05 with gettext-0.16, there fix why
# it was added was a small fix in gettext.m4, but gpg builds
# also find with gettext-0.16, and our gettext-0.16 should
# have # the fix also soon:
sed -i '/AM_GNU_GETTEXT_VERSION/s/0.16.1/0.16/' configure.ac
autoreconf -fi
%build %build
gcc_version=`gcc -dumpversion 2>&1 | sed 's/^\([0-9]\+\)\..*/\1/'`
# opensc should be added to neededforbuild, but the support
# in gpg2 is broken atm.
autoreconf -fi
./configure \ ./configure \
--prefix=%{_prefix} \ --prefix=%{_prefix} \
--sysconfdir=/etc \ --sysconfdir=/etc \
@ -83,7 +82,6 @@ autoreconf -fi
--libexecdir=%{_libdir} \ --libexecdir=%{_libdir} \
--program-prefix="" %{_target_cpu}-suse-linux \ --program-prefix="" %{_target_cpu}-suse-linux \
--with-scdaemon-pgm=%{_prefix}/bin/scdaemon --with-scdaemon-pgm=%{_prefix}/bin/scdaemon
make make
%install %install
@ -96,6 +94,12 @@ ln -sf gpg2 $RPM_BUILD_ROOT/usr/bin/gpg
ln -sf gpgv2 $RPM_BUILD_ROOT/usr/bin/gpgv ln -sf gpgv2 $RPM_BUILD_ROOT/usr/bin/gpgv
ln -sf gpg2.1 $RPM_BUILD_ROOT/usr/share/man/man1/gpg.1 ln -sf gpg2.1 $RPM_BUILD_ROOT/usr/share/man/man1/gpg.1
ln -sf gpgv2.1 $RPM_BUILD_ROOT/usr/share/man/man1/gpgv.1 ln -sf gpgv2.1 $RPM_BUILD_ROOT/usr/share/man/man1/gpgv.1
# fix rpmlint invalid-lc-messages-dir:
rm -rf $RPM_BUILD_ROOT/%_datadir/locale/en@{bold,}quot
%find_lang gnupg2
%check
make check
%post %post
%install_info --info-dir=%{_infodir} %{_infodir}/gnupg.info.gz %install_info --info-dir=%{_infodir} %{_infodir}/gnupg.info.gz
@ -103,24 +107,36 @@ ln -sf gpgv2.1 $RPM_BUILD_ROOT/usr/share/man/man1/gpgv.1
%postun %postun
%install_info_delete --info-dir=%{_infodir} %{_infodir}/gnupg.info.gz %install_info_delete --info-dir=%{_infodir} %{_infodir}/gnupg.info.gz
%files %files -f gnupg2.lang
%defattr(-,root,root) %defattr(-,root,root)
%doc ABOUT-NLS AUTHORS COPYING ChangeLog INSTALL NEWS README THANKS TODO VERSION doc/FAQ doc/faq.html %doc ABOUT-NLS AUTHORS COPYING ChangeLog NEWS README THANKS TODO doc/FAQ doc/faq.html
%doc %_infodir/gnupg* %doc %_infodir/gnupg*
%doc %{_mandir}/*/*.gz %doc %{_mandir}/*/*.gz
/usr/bin/* /usr/bin/*
%{_libdir}/[^d]* %{_libdir}/[^d]*
/usr/sbin/addgnupghome /usr/sbin/addgnupghome
/usr/sbin/applygnupgdefaults /usr/sbin/applygnupgdefaults
/usr/share/locale/*/LC_MESSAGES/gnupg2.mo
/usr/share/gnupg /usr/share/gnupg
%changelog %changelog
* Wed Sep 12 2007 - ltinkl@suse.cz * Wed Sep 12 2007 - ltinkl@suse.cz
- fix #304749 - gpg2 unable to use old secret key - fix #304749 - gpg2 unable to use old secret key
* Mon Sep 10 2007 - ltinkl@suse.cz * Mon Sep 10 2007 - ltinkl@suse.cz
- fix gpg2 crash on accessing key (#307666) - fix gpg2 crash on accessing key (#307666)
- fix gpg doesn't work on the console (#302323) - fix gpg doesn't work on the console (#302323)
* Fri Aug 10 2007 - bk@suse.de
- update to GnuPG-2.0.5 - requries libassuan-1.0.2!
* Switched license to GPLv3.
* Fixed bug when using the --p12-charset without --armor.
* The command --gen-key may now be used instead of the
gpgsm-gencert.sh script.
* Changed key generation to reveal less information about the
machine. Bug fixes for gpg2's card key generation.
- enable make check to test against build issues in the crypto engine
- cleanup disabled nld patch for linking with -lgpg-error-nld
- use %%find_lang to label the locale files properly with %%lang
- add opensc-devel to BuildRequrires to enanble smartcard support
- del Makefile.in patches where we patch Makefile.am and run automake
- cleanup the standrd GNU INSTALL and the empty VERSION from %%doc
* Thu Jul 26 2007 - sbrabec@suse.cz * Thu Jul 26 2007 - sbrabec@suse.cz
- Build with libassuan-devel. - Build with libassuan-devel.
* Thu Jun 21 2007 - ro@suse.de * Thu Jun 21 2007 - ro@suse.de

82
nld-build.diff
View File

@ -1,82 +0,0 @@
--- 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)