This commit is contained in:
OBS User unknown
Git OBS Bridge
parent
c0c8d4a94b
commit
a8a786efde
@ -1,9 +1,7 @@
|
||||
# create gpg-agent socket in TMPDIR
|
||||
Index: agent/gpg-agent.c
|
||||
===================================================================
|
||||
--- agent/gpg-agent.c.orig
|
||||
+++ agent/gpg-agent.c
|
||||
@@ -874,6 +874,10 @@ main (int argc, char **argv )
|
||||
--- ./agent/gpg-agent.c.orig 2008-12-18 10:48:44.000000000 +0100
|
||||
+++ ./agent/gpg-agent.c 2009-01-12 13:26:21.000000000 +0100
|
||||
@@ -910,6 +910,10 @@ main (int argc, char **argv )
|
||||
gnupg_fd_t fd_ssh;
|
||||
pid_t pid;
|
||||
|
||||
@ -14,7 +12,7 @@ Index: agent/gpg-agent.c
|
||||
/* 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
|
||||
@@ -885,16 +889,25 @@ main (int argc, char **argv )
|
||||
@@ -921,13 +925,23 @@ main (int argc, char **argv )
|
||||
unsetenv ("DISPLAY");
|
||||
#endif
|
||||
|
||||
@ -27,20 +25,18 @@ Index: agent/gpg-agent.c
|
||||
+ snprintf(tmp, len, "%s%s%s", tmp1, tmp1 && strlen(tmp1) > 0 ? "/" : "", tmp2);
|
||||
|
||||
/* Create the sockets. */
|
||||
socket_name = create_socket_name (use_standard_socket,
|
||||
"S.gpg-agent",
|
||||
- "/tmp/gpg-XXXXXX/S.gpg-agent");
|
||||
socket_name = create_socket_name
|
||||
- ("S.gpg-agent", "/tmp/gpg-XXXXXX/S.gpg-agent");
|
||||
- if (opt.ssh_support)
|
||||
+ tmp);
|
||||
- socket_name_ssh = create_socket_name
|
||||
- ("S.gpg-agent.ssh", "/tmp/gpg-XXXXXX/S.gpg-agent.ssh");
|
||||
+ ("S.gpg-agent", tmp);
|
||||
+ if (opt.ssh_support) {
|
||||
+ snprintf(tmp, len, "%s%s%s.ssh", tmp1, tmp1 && strlen(tmp1) > 0 ? "/" : "", tmp2);
|
||||
socket_name_ssh = create_socket_name (use_standard_socket,
|
||||
"S.gpg-agent.ssh",
|
||||
- "/tmp/gpg-XXXXXX/S.gpg-agent.ssh");
|
||||
-
|
||||
+ tmp);
|
||||
+ socket_name_ssh = create_socket_name
|
||||
+ ("S.gpg-agent.ssh", tmp);
|
||||
+ }
|
||||
+ free(tmp);
|
||||
fd = create_server_socket (use_standard_socket, socket_name, 0,
|
||||
&socket_nonce);
|
||||
|
||||
fd = create_server_socket (socket_name, 0, &socket_nonce);
|
||||
if (opt.ssh_support)
|
||||
3
gnupg-2.0.10.tar.bz2
Normal file
3
gnupg-2.0.10.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:d488b7bcb9a67a8416cdd49e74d3f95912f31aa98b60580bad125ecbde14df23
|
||||
size 3825638
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:2dc124908a1dfa3b79d2b0a82aa1a31817128feb14e84a26226beaab13179686
|
||||
size 3718925
|
||||
33
gpg2.changes
33
gpg2.changes
@ -1,3 +1,36 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue Jan 13 10:38:38 CET 2009 - puzel@suse.cz
|
||||
|
||||
- update to 2.0.10
|
||||
* New keyserver helper gpg2keys_kdns as generic DNS CERT
|
||||
lookup.
|
||||
* New mechanisms "local" and "nodefault" for --auto-key-locate.
|
||||
Fixed a few problems with this option.
|
||||
* New command --locate-keys.
|
||||
* New options --with-sig-list and --with-sig-check.
|
||||
* The option "-sat" is no longer an alias for --clearsign.
|
||||
* The option --fixed-list-mode is now implicitly used and obsolete.
|
||||
* New control statement %ask-passphrase for the unattended key
|
||||
generation.
|
||||
* The algorithm to compute the SIG_ID status has been changed.
|
||||
* [gpgsm] Now uses AES by default.
|
||||
* [gpgsm] Made --output option work with --export-secret-key-p12.
|
||||
* [gpg-agent] Terminate process if the own listening socket is not
|
||||
anymore served by ourself.
|
||||
* [gpg-connect-agent] Accept commands given as command line arguments.
|
||||
* The gpg-preset-passphrase mechanism works again. An arbitrary
|
||||
string may now be used for a custom cache ID.
|
||||
* Admin PINs are cached again (bug in 2.0.9).
|
||||
* Support for version 2 OpenPGP cards.
|
||||
|
||||
- specfile changes:
|
||||
* require libadns
|
||||
* explicit versions for some BuildRequires
|
||||
* BuildRequires libgpg-error
|
||||
* changed license to GPL v3
|
||||
* /etc/gnupg/gnupg.conf is now (noreplace)
|
||||
* documentation is installed with install
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Jun 11 11:06:09 CEST 2008 - puzel@suse.cz
|
||||
|
||||
|
||||
115
gpg2.spec
115
gpg2.spec
@ -1,10 +1,17 @@
|
||||
#
|
||||
# spec file for package gpg2 (Version 2.0.9)
|
||||
# spec file for package gpg2 (Version 2.0.10)
|
||||
#
|
||||
# Copyright (c) 2008 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.
|
||||
# Copyright (c) 2009 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
|
||||
# upon. The license for this file, and modifications and additions to the
|
||||
# file, is the same license as for the pristine package itself (unless the
|
||||
# license for the pristine package is not an Open Source License, in which
|
||||
# case the license is the MIT License). An "Open Source License" is a
|
||||
# license that conforms to the Open Source Definition (Version 1.9)
|
||||
# published by the Open Source Initiative.
|
||||
|
||||
# Please submit bugfixes or comments via http://bugs.opensuse.org/
|
||||
#
|
||||
|
||||
@ -12,14 +19,20 @@
|
||||
|
||||
|
||||
Name: gpg2
|
||||
Version: 2.0.9
|
||||
Release: 25
|
||||
#krb5
|
||||
BuildRequires: expect fdupes libassuan-devel pth
|
||||
BuildRequires: libgcrypt-devel libksba-devel opensc-devel
|
||||
#pcsc-lite
|
||||
BuildRequires: libusb-devel readline-devel zlib-devel
|
||||
BuildRequires: openldap2 openldap2-devel
|
||||
Version: 2.0.10
|
||||
Release: 1
|
||||
BuildRequires: expect fdupes pth
|
||||
BuildRequires: libgpg-error-devel >= 1.4
|
||||
BuildRequires: libgcrypt-devel >= 1.4.0
|
||||
BuildRequires: libksba-devel >= 1.0.2
|
||||
BuildRequires: libassuan-devel >= 1.0.4
|
||||
BuildRequires: opensc-devel
|
||||
BuildRequires: libusb-devel
|
||||
BuildRequires: readline-devel
|
||||
BuildRequires: zlib-devel
|
||||
BuildRequires: libadns-devel
|
||||
BuildRequires: openldap2-devel
|
||||
BuildRequires: openldap2
|
||||
Url: http://www.gnupg.org/aegypten2/
|
||||
License: GPL v2 or later
|
||||
Group: Productivity/Networking/Security
|
||||
@ -29,9 +42,9 @@ Requires: pinentry dirmngr %name-lang = %{version}
|
||||
Provides: newpg gpg = 1.4.9 gnupg = %{version}
|
||||
Obsoletes: newpg gpg <= 1.4.9
|
||||
Summary: GnuPG 2
|
||||
Source: gnupg-2.0.9.tar.bz2
|
||||
Patch5: gnupg-1.9.22-ccid-driver-fix.diff
|
||||
Patch6: gnupg-1.9.18-tmpdir.diff
|
||||
Source: gnupg-%{version}.tar.bz2
|
||||
Patch5: gnupg-2.0.10-tmpdir.diff
|
||||
Patch6: gnupg-1.9.22-ccid-driver-fix.diff
|
||||
Patch7: gnupg-2.0.4-install_tools.diff
|
||||
Patch9: gnupg-2.0.4-default-tty.diff
|
||||
Patch10: gnupg-2.0.9-RSA_ES.patch
|
||||
@ -52,9 +65,8 @@ Authors:
|
||||
%lang_package
|
||||
%prep
|
||||
%setup -q -n gnupg-%version
|
||||
%patch5
|
||||
%patch5 -p1
|
||||
%patch6
|
||||
# Note: this patch only patches Makefile.am files, so it needs automake to run.
|
||||
%patch7
|
||||
%patch9
|
||||
%patch10 -p1
|
||||
@ -64,7 +76,6 @@ Authors:
|
||||
# Required for patch7:
|
||||
autoreconf -fi
|
||||
# build PIEs (position independent executables) for address space randomisation:
|
||||
# en.wikipedia.org/wiki/Position_independent_code#Position-independent_executables
|
||||
%ifarch s390x
|
||||
# s390x needs to use the large PIE model (at least for gpg.c):
|
||||
CFLAGS="%{optflags} -fPIE" LDFLAGS=-pie \
|
||||
@ -76,29 +87,30 @@ CFLAGS="%{optflags} -fpie" LDFLAGS=-pie \
|
||||
--sysconfdir=/etc \
|
||||
--libdir=%{_libdir} \
|
||||
--infodir=%{_infodir} \
|
||||
--mandir=%{_mandir} \
|
||||
--libexecdir=%{_libdir} \
|
||||
--docdir=%{_docdir}/%{name} \
|
||||
--with-agent-pgm=%{_prefix}/bin/gpg-agent \
|
||||
--with-pinentry-pgm=%{_prefix}/bin/pinentry \
|
||||
--with-dirmngr-pgm=%{_prefix}/bin/dirmngr \
|
||||
--with-scdaemon-pgm=%{_prefix}/bin/scdaemon \
|
||||
--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
|
||||
--with-gnu-ld
|
||||
make
|
||||
|
||||
%install
|
||||
make DESTDIR=$RPM_BUILD_ROOT install
|
||||
%makeinstall
|
||||
mkdir -p $RPM_BUILD_ROOT/etc/gnupg/
|
||||
# bnc#391347
|
||||
install -m 644 doc/examples/gpgconf.conf $RPM_BUILD_ROOT/etc/gnupg
|
||||
# delete to prevent fdupes from creating cross-partition hardlink
|
||||
rm -rf $RPM_BUILD_ROOT/usr/share/doc/packages/gpg2/examples/gpgconf.conf
|
||||
rm $RPM_BUILD_ROOT/usr/share/info/dir
|
||||
rm $RPM_BUILD_ROOT/usr/share/gnupg/FAQ
|
||||
rm $RPM_BUILD_ROOT/usr/share/gnupg/faq.html
|
||||
# compat symlinks
|
||||
ln -sf gpg2 $RPM_BUILD_ROOT/usr/bin/gpg
|
||||
ln -sf gpgv2 $RPM_BUILD_ROOT/usr/bin/gpgv
|
||||
@ -106,6 +118,8 @@ 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
|
||||
# fix rpmlint invalid-lc-messages-dir:
|
||||
rm -rf $RPM_BUILD_ROOT/%_datadir/locale/en@{bold,}quot
|
||||
# additional files to documentation directory
|
||||
install -m 644 AUTHORS COPYING ChangeLog NEWS THANKS TODO doc/FAQ doc/faq.html $RPM_BUILD_ROOT/%{_docdir}/%{name}
|
||||
%find_lang gnupg2
|
||||
%if 0%{?suse_version} > 1020
|
||||
%fdupes %buildroot
|
||||
@ -126,18 +140,47 @@ $RPM_BUILD_ROOT/usr/bin/gpgsplit -v -p secsplit- --secret-to-public --uncompress
|
||||
|
||||
%files
|
||||
%defattr(-,root,root)
|
||||
%doc ABOUT-NLS AUTHORS COPYING ChangeLog NEWS README THANKS TODO doc/FAQ doc/faq.html
|
||||
%doc %_infodir/gnupg*
|
||||
%doc %{_infodir}/gnupg*
|
||||
%doc %{_mandir}/*/*.gz
|
||||
/usr/bin/*
|
||||
%doc %{_docdir}/%{name}
|
||||
%{_bindir}/*
|
||||
%{_libdir}/[^d]*
|
||||
/usr/sbin/addgnupghome
|
||||
/usr/sbin/applygnupgdefaults
|
||||
/usr/share/gnupg
|
||||
%dir /etc/gnupg
|
||||
%config /etc/gnupg/gpgconf.conf
|
||||
%{_sbindir}/addgnupghome
|
||||
%{_sbindir}/applygnupgdefaults
|
||||
%{_datadir}/gnupg
|
||||
%dir %{_sysconfdir}/gnupg
|
||||
%config(noreplace) %{_sysconfdir}/gnupg/gpgconf.conf
|
||||
|
||||
%changelog
|
||||
* Tue Jan 13 2009 puzel@suse.cz
|
||||
- update to 2.0.10
|
||||
* New keyserver helper gpg2keys_kdns as generic DNS CERT
|
||||
lookup.
|
||||
* New mechanisms "local" and "nodefault" for --auto-key-locate.
|
||||
Fixed a few problems with this option.
|
||||
* New command --locate-keys.
|
||||
* New options --with-sig-list and --with-sig-check.
|
||||
* The option "-sat" is no longer an alias for --clearsign.
|
||||
* The option --fixed-list-mode is now implicitly used and obsolete.
|
||||
* New control statement %%ask-passphrase for the unattended key
|
||||
generation.
|
||||
* The algorithm to compute the SIG_ID status has been changed.
|
||||
* [gpgsm] Now uses AES by default.
|
||||
* [gpgsm] Made --output option work with --export-secret-key-p12.
|
||||
* [gpg-agent] Terminate process if the own listening socket is not
|
||||
anymore served by ourself.
|
||||
* [gpg-connect-agent] Accept commands given as command line arguments.
|
||||
* The gpg-preset-passphrase mechanism works again. An arbitrary
|
||||
string may now be used for a custom cache ID.
|
||||
* Admin PINs are cached again (bug in 2.0.9).
|
||||
* Support for version 2 OpenPGP cards.
|
||||
- specfile changes:
|
||||
* require libadns
|
||||
* explicit versions for some BuildRequires
|
||||
* BuildRequires libgpg-error
|
||||
* changed license to GPL v3
|
||||
* /etc/gnupg/gnupg.conf is now (noreplace)
|
||||
* documentation is installed with install
|
||||
* Wed Jun 11 2008 puzel@suse.cz
|
||||
- fix [bnc#305725] - UTF-8 problems
|
||||
* non latin characters displayed incorrectly by pinentry-*
|
||||
@ -153,7 +196,7 @@ $RPM_BUILD_ROOT/usr/bin/gpgsplit -v -p secsplit- --secret-to-public --uncompress
|
||||
- patch gnupg-2.0.9-RSA_ES.patch
|
||||
* adding back support for deprecated RSA_E, RSA_S algorithms
|
||||
(bnc#342979)
|
||||
* Thu Mar 27 2008 coolo@suse.de
|
||||
* Wed Mar 26 2008 coolo@suse.de
|
||||
- require the split out lang package
|
||||
* Sun Mar 23 2008 coolo@suse.de
|
||||
- splitting out a third of the package by using a lang subpack
|
||||
@ -169,7 +212,7 @@ $RPM_BUILD_ROOT/usr/bin/gpgsplit -v -p secsplit- --secret-to-public --uncompress
|
||||
- gnupg-2.0.5.fixes-from-svn-20070812.diff commented out,
|
||||
included in upstream 2.0.8
|
||||
- use optflags during build
|
||||
* Thu Sep 13 2007 ltinkl@suse.cz
|
||||
* Wed Sep 12 2007 ltinkl@suse.cz
|
||||
- fix #304749 - gpg2 unable to use old secret key
|
||||
* Mon Sep 10 2007 ltinkl@suse.cz
|
||||
- fix gpg2 crash on accessing key (#307666)
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user