-# TODO:
-# - separate keys plugins (see gnupg.spec)
-# - update pl.po (just a note for myself --q)
#
# Conditional build:
%bcond_without pth # without pth-based based version of gnupg
-%bcond_with tests # run testsuite ( currently it smashes stack on x86-64 and SEGVs )
+%bcond_without tests # testsuite on build
#
-Summary: GNU Privacy Guard - tool for secure communication and data storage - development version
-Summary(pl): GnuPG - narzêdzie do bezpiecznej komunikacji i bezpiecznego przechowywania danych - wersja rozwojowa
+Summary: GNU Privacy Guard - tool for secure communication and data storage - enhanced version
+Summary(pl.UTF-8): GnuPG - narzędzie do bezpiecznej komunikacji i bezpiecznego przechowywania danych - wersja rozszerzona
Name: gnupg2
-Version: 1.9.94
-Release: 1
-License: GPL
+Version: 2.0.16
+Release: 2
+License: GPL v3+
Group: Applications/File
-Source0: ftp://ftp.gnupg.org/gcrypt/alpha/gnupg/gnupg-%{version}.tar.bz2
-# Source0-md5: 1da8c928948800efa2a13d4aecb8d013
+Source0: ftp://ftp.gnupg.org/gcrypt/gnupg/gnupg-%{version}.tar.bz2
+# Source0-md5: 88a4d46deca63d2eca29b2b611304afb
Source1: gnupg-agent.sh
Patch0: %{name}-info.patch
Patch1: %{name}-pth.patch
-Patch2: %{name}-ac.patch
+# send it upstream after updating!
+Patch2: %{name}-pl.po-update.patch
Patch3: %{name}-disable_tests.patch
+Patch4: CVE-2010-2547.patch
URL: http://www.gnupg.org/
-BuildRequires: autoconf >= 2.52
-BuildRequires: automake >= 1:1.9.3
+BuildRequires: adns-devel
+BuildRequires: autoconf >= 2.61
+BuildRequires: automake >= 1:1.10
BuildRequires: bzip2-devel
-BuildRequires: curl-devel
-BuildRequires: gettext-devel >= 0.14.1
-BuildRequires: libassuan-devel >= 1:0.9.3
-BuildRequires: libgcrypt-devel >= 1.2.0
-BuildRequires: libgpg-error-devel >= 1.4
-BuildRequires: libksba-devel >= 1.0.0
-BuildRequires: libusb-devel
+BuildRequires: curl-devel >= 7.10
+BuildRequires: gettext-devel >= 0.17
+BuildRequires: libassuan-devel >= 1:2.0.0
+BuildRequires: libgcrypt-devel >= 1.4.0
+BuildRequires: libgpg-error-devel >= 1.7
+BuildRequires: libksba-devel >= 1.0.7
+BuildRequires: libusb-compat-devel
BuildRequires: openldap-devel
BuildRequires: pcsc-lite-devel
%{?with_pth:BuildRequires: pth-devel >= 2.0.0}
BuildRequires: rpmbuild(macros) >= 1.177
BuildRequires: texinfo
BuildRequires: zlib-devel
+Suggests: gnupg-agent
Requires: gnupg2-common = %{version}-%{release}
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
an advanced key management facility and is compliant with the proposed
OpenPGP Internet standard as described in RFC2440.
-This is development version. Don't use it with production keys.
+This is enhanced version.
-%description -l pl
-GnuPG (GNU Privacy Guard) jest narzêdziem do bezpiecznej komunikacji i
-bezpiecznego przechowywania danych. Mo¿e byæ u¿ywany do szyfrowania
-oraz podpisywania danych. Umo¿liwia zaawansowane zarz±dzanie kluczami
-i spe³nia normy zdefiniowane w standardzie OpenPGP, który jest opisany
+%description -l pl.UTF-8
+GnuPG (GNU Privacy Guard) jest narzędziem do bezpiecznej komunikacji i
+bezpiecznego przechowywania danych. Może być używany do szyfrowania
+oraz podpisywania danych. Umożliwia zaawansowane zarządzanie kluczami
+i spełnia normy zdefiniowane w standardzie OpenPGP, który jest opisany
w RFC2440.
-Wersja rozwojowa. Nie do u¿ytku z kluczami produkcyjnymi.
+To jest wersja rozszerzona.
%package common
Summary: GnuPG - common files
-Summary(pl): GnuPG - pliki wspólne
+Summary(pl.UTF-8): GnuPG - pliki wspólne
Group: Applications/File
-Requires: libassuan >= 1:0.9.3
-Requires: libgpg-error >= 1.4
+Requires: libassuan >= 1:2.0.0
+Requires: libgcrypt >= 1.4.0
+Requires: libgpg-error >= 1.7
+Requires: libksba >= 1.0.7
Conflicts: gnupg-agent < 1.9.14-2
%description common
Common files used by tools from GnuPG project.
-%description common -l pl
-Pliki wspólne u¿ywane przez ró¿ne narzêdzia z projektu GnuPG.
+%description common -l pl.UTF-8
+Pliki wspólne używane przez różne narzędzia z projektu GnuPG.
+
+%package plugin-keys_curl
+Summary: GnuPG 2 plugin for allow talk to a HTTP/FTP keyserver
+Summary(pl.UTF-8): Wtyczka GnuPG 2 pozwalająca komunikować się z serwerem kluczy HTTP/FTP
+Group: Applications/File
+Requires: %{name}-common = %{version}-%{release}
+Requires: curl-libs >= 7.10
+
+%description plugin-keys_curl
+GnuPG 2 plugin for allow talk to a HTTP(S)/FTP(S) keyserver.
+
+%description plugin-keys_curl -l pl.UTF-8
+Wtyczka GnuPG 2 pozwalająca komunikować się z serwerem kluczy
+HTTP(S)/FTP(S).
+
+%package plugin-keys_finger
+Summary: GnuPG 2 plugin for allow talk to a FINGER keyserver
+Summary(pl.UTF-8): Wtyczka GnuPG 2 pozwalająca komunikować się z serwerem kluczy FINGER
+Group: Applications/File
+Requires: %{name}-common = %{version}-%{release}
+
+%description plugin-keys_finger
+GnuPG 2 plugin for allow talk to a FINGER keyserver.
+
+%description plugin-keys_finger -l pl.UTF-8
+Wtyczka 2 GnuPG pozwalająca komunikować się z serwerem kluczy FINGER.
+
+%package plugin-keys_hkp
+Summary: GnuPG 2 plugin for allow talk to a HKP keyserver
+Summary(pl.UTF-8): Wtyczka GnuPG 2 pozwalająca komunikować się z serwerem kluczy HKP
+Group: Applications/File
+Requires: %{name}-common = %{version}-%{release}
+
+%description plugin-keys_hkp
+GnuPG 2 plugin for allow talk to a HKP keyserver.
+
+%description plugin-keys_hkp -l pl.UTF-8
+Wtyczka GnuPG 2 pozwalająca komunikować się z serwerem kluczy HKP.
+
+%package plugin-keys_kdns
+Summary: GnuPG 2 plugin for allow talk to a KDNS keyserver
+Summary(pl.UTF-8): Wtyczka GnuPG 2 pozwalająca komunikować się z serwerem kluczy KDNS
+Group: Applications/File
+Requires: %{name}-common = %{version}-%{release}
+
+%description plugin-keys_kdns
+GnuPG 2 plugin for allow talk to a KDNS keyserver.
+
+%description plugin-keys_kdns -l pl.UTF-8
+Wtyczka GnuPG 2 pozwalająca komunikować się z serwerem kluczy KDNS.
+
+%package plugin-keys_ldap
+Summary: GnuPG 2 plugin for allow talk to a LDAP keyserver
+Summary(pl.UTF-8): Wtyczka GnuPG 2 pozwalająca komunikować się z serwerem kluczy LDAP
+Group: Applications/File
+Requires: %{name}-common = %{version}-%{release}
+
+%description plugin-keys_ldap
+GnuPG 2 plugin for allow talk to a LDAP keyserver.
+
+%description plugin-keys_ldap -l pl.UTF-8
+Wtyczka GnuPG 2 pozwalająca komunikować się z serwerem kluczy LDAP.
%package -n gnupg-agent
Summary: GnuPG extension - agent
-Summary(pl): Rozszerzenie GnuPG - agent
+Summary(pl.UTF-8): Rozszerzenie GnuPG - agent
Group: Applications/File
-Requires: gnupg2-common = %{version}-%{release}
-Requires: pinentry
+Requires: %{name}-common = %{version}-%{release}
+Requires: pinentry >= 0.7.5-2
Obsoletes: newpg
%description -n gnupg-agent
GnuPG extension - agent.
-%description -n gnupg-agent -l pl
+%description -n gnupg-agent -l pl.UTF-8
Rozszerzenie GnuPG - agent.
%package -n gnupg-agent-profile_d
Summary: gnupg-agent start script for text mode
-Summary(pl): Skrypt startowy gnupg-agenta dla trybu tekstowego
+Summary(pl.UTF-8): Skrypt startowy gnupg-agenta dla trybu tekstowego
Group: Applications/File
Requires: gnupg-agent = %{version}-%{release}
%description -n gnupg-agent-profile_d
gnupg-agent start script for text mode.
-%description -n gnupg-agent-profile_d -l pl
+%description -n gnupg-agent-profile_d -l pl.UTF-8
Skrypt startowy gnupg-agenta dla trybu tekstowego.
%package -n gnupg-agent-xinitrc
Summary: gnupg-agent start script for X-Window mode
-Summary(pl): Skrypt startowy gnupg-agenta dla trybu X-Window
+Summary(pl.UTF-8): Skrypt startowy gnupg-agenta dla trybu X-Window
Group: Applications/File
Requires: gnupg-agent = %{version}-%{release}
Requires: xinitrc
%description -n gnupg-agent-xinitrc
gnupg-agent start script for X-Window mode.
-%description -n gnupg-agent-xinitrc -l pl
+%description -n gnupg-agent-xinitrc -l pl.UTF-8
Skrypt startowy gnupg-agenta dla trybu X-Window.
%package -n gnupg-smime
Summary: GnuPG extension - S/MIME support
-Summary(pl): Rozszerzenie GnuPG - obs³uga S/MIME
+Summary(pl.UTF-8): Rozszerzenie GnuPG - obsługa S/MIME
Group: Applications/File
-Requires: gnupg2-common = %{version}-%{release}
+Requires: %{name}-common = %{version}-%{release}
Conflicts: gnupg-agent < 1.9.14-2
%description -n gnupg-smime
GnuPG extension - S/MIME support.
-%description -n gnupg-smime -l pl
-Rozszerzenie GnuPG - obs³uga S/MIME.
+%description -n gnupg-smime -l pl.UTF-8
+Rozszerzenie GnuPG - obsługa S/MIME.
%prep
%setup -q -n gnupg-%{version}
%patch1 -p1
%patch2 -p1
%{!?with_tests:%patch3 -p1}
+%patch4 -p1
+
+rm -f po/stamp-po
%build
%{__gettextize}
%{__autoheader}
%{__automake}
%configure \
- --with-capabilities \
%{!?with_pth:--disable-threads} \
--enable-gpg \
-%ifarch sparc sparc64
- --disable-m-guard \
-%else
- --enable-m-guard \
-%endif
- --without-included-gettext \
- --disable-m-debug \
+ --enable-symcryptrun \
+ --with-capabilities \
+ --with-pinentry-pgm=%{_bindir}/pinentry \
--with-mailprog=/usr/lib/sendmail
%{__make}
install -D %{SOURCE1} $RPM_BUILD_ROOT/etc/X11/xinit/xinitrc.d/gnupg-agent.sh
mv ChangeLog main-ChangeLog || :
-find . -name ChangeLog |awk '{src=$0; dst=$0;sub("^./","",dst);gsub("/","-",dst); print "cp " src " " dst}'|sh
+find -name ChangeLog | awk '{src=$0; dst=$0;sub("^./","",dst);gsub("/","-",dst); print "cp " src " " dst}' | sh
%find_lang gnupg2
rm -f $RPM_BUILD_ROOT%{_datadir}/info/dir
%clean
rm -rf $RPM_BUILD_ROOT
-%post
-[ ! -x /usr/sbin/fix-info-dir ] || /usr/sbin/fix-info-dir %{_infodir} >/dev/null 2>&1
+%post -p /sbin/postshell
+-/usr/sbin/fix-info-dir -c %{_infodir}
-%postun
-[ ! -x /usr/sbin/fix-info-dir ] || /usr/sbin/fix-info-dir %{_infodir} >/dev/null 2>&1
+%postun -p /sbin/postshell
+-/usr/sbin/fix-info-dir -c %{_infodir}
%triggerpostun -n gnupg-agent -- gnupg-agent < 1.9.16-2
%banner gnupg-agent-1.9.16-2 << EOF
%doc g10-ChangeLog g10/options.skel
%attr(755,root,root) %{_bindir}/gpg2
%attr(755,root,root) %{_bindir}/gpgv2
-%attr(755,root,root) %{_libexecdir}/gpg2keys_curl
-%attr(755,root,root) %{_libexecdir}/gpg2keys_finger
-%attr(755,root,root) %{_libexecdir}/gpg2keys_hkp
-%attr(755,root,root) %{_libexecdir}/gpg2keys_ldap
%{_mandir}/man1/gpg2.1*
%{_mandir}/man1/gpgv2.1*
-# conflicts with gnupg 1.4.x
-#%attr(755,root,root) %{_bindir}/gpg-zip
-#%attr(755,root,root) %{_bindir}/gpgsplit
-#%{_mandir}/man7/gnupg.7*
-# program not built by default
-#%{_mandir}/man1/symcryptrun.1*
%files common -f gnupg2.lang
%defattr(644,root,root,755)
%doc AUTHORS main-ChangeLog NEWS README THANKS TODO
-%doc intl-ChangeLog jnlib-ChangeLog m4-ChangeLog po-ChangeLog scripts-ChangeLog common-ChangeLog kbx-ChangeLog tools-ChangeLog doc-ChangeLog
+%doc jnlib-ChangeLog m4-ChangeLog po-ChangeLog scripts-ChangeLog common-ChangeLog kbx-ChangeLog tools-ChangeLog doc-ChangeLog
%attr(755,root,root) %{_bindir}/gpg-connect-agent
%attr(755,root,root) %{_bindir}/gpgconf
%attr(755,root,root) %{_bindir}/gpgkey2ssh
%attr(755,root,root) %{_bindir}/kbxutil
%attr(755,root,root) %{_bindir}/watchgnupg
%attr(755,root,root) %{_sbindir}/addgnupghome
+%attr(755,root,root) %{_sbindir}/applygnupgdefaults
%dir %{_libexecdir}
%{_datadir}/gnupg
%{_mandir}/man1/gpg-connect-agent.1*
%{_mandir}/man1/gpgparsemail.1*
%{_mandir}/man1/watchgnupg.1*
%{_mandir}/man8/addgnupghome.8*
-%{_infodir}/*.info*
+%{_mandir}/man8/applygnupgdefaults.8*
+%{_infodir}/gnupg.info*
+
+%files plugin-keys_curl
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libexecdir}/gpg2keys_curl
+
+%files plugin-keys_finger
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libexecdir}/gpg2keys_finger
+
+%files plugin-keys_hkp
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libexecdir}/gpg2keys_hkp
+
+%files plugin-keys_kdns
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libexecdir}/gpg2keys_kdns
+
+%files plugin-keys_ldap
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libexecdir}/gpg2keys_ldap
%files -n gnupg-smime
%defattr(644,root,root,755)
%doc agent-ChangeLog scd-ChangeLog
%attr(755,root,root) %{_bindir}/gpg-agent
%attr(755,root,root) %{_bindir}/scdaemon
+%attr(755,root,root) %{_bindir}/symcryptrun
+%attr(755,root,root) %{_libexecdir}/gnupg-pcsc-wrapper
+%attr(755,root,root) %{_libexecdir}/gpg-check-pattern
%attr(755,root,root) %{_libexecdir}/gpg-protect-tool
%attr(755,root,root) %{_libexecdir}/gpg-preset-passphrase
-%attr(755,root,root) %{_libexecdir}/pcsc-wrapper
%{_mandir}/man1/gpg-agent.1*
%{_mandir}/man1/gpg-preset-passphrase.1*
%{_mandir}/man1/scdaemon.1*
+%{_mandir}/man1/symcryptrun.1*
%files -n gnupg-agent-profile_d
%defattr(644,root,root,755)
projects / packages / gnupg2.git / blobdiff