From 70a94ea907003e8a29ecab3129997d84fd3c5d45 Mon Sep 17 00:00:00 2001 From: Michael Schwendt Date: Tue, 1 Feb 2005 22:40:35 +0000 Subject: [PATCH] auto-import gnupg2-1.9.14-1 on branch devel from gnupg2-1.9.14-1.src.rpm --- .cvsignore | 1 + gnupg-1.9.14.tar.bz2.sig | Bin 0 -> 65 bytes gnupg-1.9.4-gpg-error.patch | 11 +++ gnupg2.spec | 148 ++++++++++++++++++++++++++++++++++++ sources | 1 + 5 files changed, 161 insertions(+) create mode 100644 gnupg-1.9.14.tar.bz2.sig create mode 100644 gnupg-1.9.4-gpg-error.patch create mode 100644 gnupg2.spec diff --git a/.cvsignore b/.cvsignore index e69de29..84b822d 100644 --- a/.cvsignore +++ b/.cvsignore @@ -0,0 +1 @@ +gnupg-1.9.14.tar.bz2 diff --git a/gnupg-1.9.14.tar.bz2.sig b/gnupg-1.9.14.tar.bz2.sig new file mode 100644 index 0000000000000000000000000000000000000000..2cb22ba8f4f1ac8a740cae6e1869be63a23165ae GIT binary patch literal 65 zcmV-H0KWf-KLZ5-LCL?YXt%40S5%G75dtc~0G~?cd3J#9%rL0~m?HIh@Wkz*zXkxH Xf_U4(YHrr6Kqk$hKEp){_JGMn-=iPZ literal 0 HcmV?d00001 diff --git a/gnupg-1.9.4-gpg-error.patch b/gnupg-1.9.4-gpg-error.patch new file mode 100644 index 0000000..9542eec --- /dev/null +++ b/gnupg-1.9.4-gpg-error.patch @@ -0,0 +1,11 @@ +--- gnupg-1.9.14/agent/preset-passphrase.c.gpg-err 2004-12-21 12:56:09.000000000 -0600 ++++ gnupg-1.9.14/agent/preset-passphrase.c 2005-01-06 14:27:28.000000000 -0600 +@@ -137,7 +137,7 @@ + case SPWQ_IO_ERROR: + return gpg_error_from_errno (EIO); + case SPWQ_PROTOCOL_ERROR: +- return gpg_error (GPG_ERR_PROTOCOL_VIOLATION); ++ return gpg_error (GPG_ERR_UNSUPPORTED_PROTOCOL); + case SPWQ_ERR_RESPONSE: + return gpg_error (GPG_ERR_INV_RESPONSE); + case SPWQ_NO_AGENT: diff --git a/gnupg2.spec b/gnupg2.spec new file mode 100644 index 0000000..a28968d --- /dev/null +++ b/gnupg2.spec @@ -0,0 +1,148 @@ +# $Id: gnupg.spec,v 1.7 2003/12/11 14:17:11 rexdieter Exp $ + +Summary: GNU utility for secure communication and data storage +Name: gnupg2 +Epoch: 0 +Version: 1.9.14 +Release: 1%{?dist_tag} +License: GPL +Group: Applications/System +Source0: ftp://ftp.gnupg.org/gcrypt/alpha/gnupg/gnupg-1.9.14.tar.bz2 +Source1: ftp://ftp.gnupg.org/gcrypt/alpha/gnupg/gnupg-1.9.14.tar.bz2.sig +URL: http://www.gnupg.org/ +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root + +Patch1: gnupg-1.9.4-gpg-error.patch + +Obsoletes: newpg < 0:0.9.5 + +Requires(post): /sbin/install-info +Requires(postun): /sbin/install-info + +## gcc version in use? +BuildRequires: gcc +%define gcc_ver %(rpm -q --qf '%%{version}' gcc ) +%if "%{gcc_ver}" >= "3.2.3" +%define pie 1 +%endif + +BuildRequires: openldap-devel, zlib-devel, gettext +BuildRequires: libgcrypt-devel => 0:1.2.0 +BuildRequires: libgpg-error-devel => 0:0.7 +BuildRequires: libassuan-devel >= 0.6.9 +BuildRequires: libksba-devel >= 0:0.9.7 +# to build without opensc support: --without opensc +%{!?_without_opensc:BuildRequires: opensc-devel >= 0.9} +%{?_without_opensc:BuildConflicts: opensc-devel } + +BuildRequires: libusb-devel +BuildRequires: pth-devel +BuildRequires: zlib-devel, bzip2-devel +Buildrequires: libusb-devel +BuildRequires: docbook-utils + +Requires: pinentry >= 0:0.7.1 + +# Should these be versioned? -- Rex +Provides: gpg +Provides: openpgp + +%description +GnuPG 1.9 is the future version of GnuPG; it is based on the gnupg-1.3 +code and the previous newpg package. It will eventually lead to a +GnuPG 2.0 release. Note that GnuPG 1.3 and 1.9 are not always in sync +and thus features and bug fixes done in 1.3 are not necessary +available in 1.9. + +You should use this GnuPG version if you want to use the gpg-agent or +gpgsm (the S/MIME variant of gpg). Note that the gpg-agent is also +helpful when using the standard gpg versions (1.2.x or 1.3.x). + + +%prep +%setup -q -n gnupg-%{version} + +%patch1 -p1 -b .gpg-error + + +%build + +%{?pie:CFLAGS="$RPM_OPT_FLAGS -fPIE" ; export CFLAGS} +%{?pie:LDFLAGS="$RPM_OPT_FLAGS -pie" ; export LDFLAG} + +%configure \ + --program-prefix="%{?_program_prefix}" \ + --disable-rpath + +make %{?_smp_mflags} +make check + + +%clean +rm -rf $RPM_BUILD_ROOT + + +%install +rm -rf $RPM_BUILD_ROOT + +make install DESTDIR=$RPM_BUILD_ROOT + +%find_lang %{name} + +rm -f $RPM_BUILD_ROOT%{_infodir}/dir + + +%post +/sbin/install-info %{_infodir}/gnupg.info.gz %{_infodir}/dir 2>/dev/null ||: + +%preun +if [ $1 -eq 0 ]; then + /sbin/install-info --delete %{_infodir}/gnupg.info.gz %{_infodir}/dir \ + 2>/dev/null ||: +fi + + +%files -f %{name}.lang +%defattr(-,root,root) +%doc AUTHORS COPYING ChangeLog NEWS README THANKS TODO +#attr(4755,root,root) %{_bindir}/gpg2 +%{_bindir}/gpg2 +%{_bindir}/gpg-agent +%{_bindir}/gpgconf +%{_bindir}/gpgsm* +%{_bindir}/gpgv2 +%{_bindir}/kbxutil +%{_bindir}/sc-copykeys +%{_bindir}/scdaemon +%{_bindir}/watchgnupg +%{_sbindir}/* +%{_datadir}/gnupg +%{_libdir}/gnupg +%{_libexecdir}/* +%{_infodir}/* + + +%changelog +* Tue Feb 1 2005 Michael Schwendt - 0:1.9.14-1 +- Make install-info in scriptlets less noisy. + +* Thu Jan 06 2005 Rex Dieter 1.9.14-0.fdr.1 +- 1.9.14 +- enable opensc support +- BR: libassuan-devel >= 0.6.9 + +* Thu Oct 21 2004 Rex Dieter 1.9.11-0.fdr.4 +- remove suid. + +* Thu Oct 21 2004 Rex Dieter 1.9.11-0.fdr.3 +- remove Provides: newpg + +* Wed Oct 20 2004 Rex Dieter 1.9.11-0.fdr.2 +- Requires: pinentry +- gpg2 suid +- update description + +* Tue Oct 19 2004 Rex Dieter 1.9.11-0.fdr.1 +- first try +- leave out opensc support (for now), enable --with-opensc + diff --git a/sources b/sources index e69de29..ec03914 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +fd121b7d368cf27928bfa4ef4e4cc982 gnupg-1.9.14.tar.bz2