|
@@ -1,10 +1,12 @@
|
|
|
|
+%bcond_with systemd
|
|
|
|
+
|
|
%global install_as_gpg2 0
|
|
%global install_as_gpg2 0
|
|
|
|
|
|
Summary: Utility for secure communication and data storage
|
|
Summary: Utility for secure communication and data storage
|
|
Summary(ja): GnuPG2 - 安全なデータ交換と保存のためのユーティリティ
|
|
Summary(ja): GnuPG2 - 安全なデータ交換と保存のためのユーティリティ
|
|
Name: gnupg2
|
|
Name: gnupg2
|
|
-Version: 2.4.3
|
|
|
|
-Release: 1%{?_dist_release}
|
|
|
|
|
|
+Version: 2.4.5
|
|
|
|
+Release: 1%{?_dist_release}%{?with_systemd:.systemd}
|
|
Group: security
|
|
Group: security
|
|
Vendor: Project Vine
|
|
Vendor: Project Vine
|
|
Distribution: Vine Linux
|
|
Distribution: Vine Linux
|
|
@@ -32,11 +34,8 @@ Patch22: gnupg-2.2.18-gpg-accept-subkeys-with-a-good-revocation-but-no-self-sig.
|
|
Patch30: gnupg-2.2.21-coverity.patch
|
|
Patch30: gnupg-2.2.21-coverity.patch
|
|
# Revert the introduction of the RFC4880bis draft into defaults
|
|
# Revert the introduction of the RFC4880bis draft into defaults
|
|
Patch31: gnupg2-revert-rfc4880bis.patch
|
|
Patch31: gnupg2-revert-rfc4880bis.patch
|
|
-# fix emacs usage etc (see https://dev.gnupg.org/T6481) via upstream patch
|
|
|
|
-# https://dev.gnupg.org/rG2f872fa68c6576724b9dabee9fb0844266f55d0d
|
|
|
|
-# cherry-picked on top of gnupg 2.4.2 + gnupg-2.4.1-file-is-digest.patch
|
|
|
|
-Patch32: gnupg-2.4.2-gpg-Report-BEGIN_-status-before-examining-the-input.patch
|
|
|
|
-
|
|
|
|
|
|
+# Mostly reverts https://dev.gnupg.org/rGeae28f1bd4a5632e8f8e85b7248d1c4d4a10a5ed
|
|
|
|
+Patch33: gnupg-2.4.3-restore-systemd-sockets.patch
|
|
|
|
|
|
#BuildRequires: automake libtool texinfo transfig
|
|
#BuildRequires: automake libtool texinfo transfig
|
|
BuildRequires: bzip2-devel
|
|
BuildRequires: bzip2-devel
|
|
@@ -52,10 +51,10 @@ BuildRequires: libusb1-devel
|
|
BuildRequires: pcsc-lite-libs
|
|
BuildRequires: pcsc-lite-libs
|
|
BuildRequires: npth-devel
|
|
BuildRequires: npth-devel
|
|
BuildRequires: readline-devel ncurses-devel
|
|
BuildRequires: readline-devel ncurses-devel
|
|
-BuildRequires: zlib-devel
|
|
|
|
|
|
+BuildRequires: pkgconfig(zlib)
|
|
BuildRequires: gnutls-devel
|
|
BuildRequires: gnutls-devel
|
|
-BuildRequires: sqlite-devel
|
|
|
|
-BuildRequires: fuse
|
|
|
|
|
|
+BuildRequires: sqlite3-devel
|
|
|
|
+BuildRequires: fuse fuse3
|
|
Recommends: pinentry
|
|
Recommends: pinentry
|
|
Recommends: gnupg2-smime
|
|
Recommends: gnupg2-smime
|
|
|
|
|
|
@@ -128,7 +127,9 @@ to the base GnuPG package
|
|
|
|
|
|
%patch30 -p1 -b .coverity
|
|
%patch30 -p1 -b .coverity
|
|
%patch31 -p1 -b .revert-rfc4880bis
|
|
%patch31 -p1 -b .revert-rfc4880bis
|
|
-%patch32 -p1 -b .report-begin
|
|
|
|
|
|
+%if %{with systemd}
|
|
|
|
+%patch33 -p1 -b .systemd
|
|
|
|
+%endif
|
|
|
|
|
|
# pcsc-lite library major: 0 in 1.2.0, 1 in 1.2.9+ (dlopen()'d in pcsc-wrapper)
|
|
# pcsc-lite library major: 0 in 1.2.0, 1 in 1.2.9+ (dlopen()'d in pcsc-wrapper)
|
|
# Note: this is just the name of the default shared lib to load in scdaemon,
|
|
# Note: this is just the name of the default shared lib to load in scdaemon,
|
|
@@ -168,6 +169,7 @@ mv %{buildroot}%{_mandir}/man1/gpgv.1 %{buildroot}%{_mandir}/man1/gpgv2.1
|
|
rm -f %{buildroot}%{_bindir}/gpg-zip
|
|
rm -f %{buildroot}%{_bindir}/gpg-zip
|
|
rm -f %{buildroot}%{_bindir}/gpgsplit
|
|
rm -f %{buildroot}%{_bindir}/gpgsplit
|
|
%else
|
|
%else
|
|
|
|
+# compat symlinks
|
|
ln -sf gpg %{buildroot}%{_bindir}/gpg2
|
|
ln -sf gpg %{buildroot}%{_bindir}/gpg2
|
|
ln -sf gpgv %{buildroot}%{_bindir}/gpgv2
|
|
ln -sf gpgv %{buildroot}%{_bindir}/gpgv2
|
|
ln -sf gpg.1 %{buildroot}%{_mandir}/man1/gpg2.1
|
|
ln -sf gpg.1 %{buildroot}%{_mandir}/man1/gpg2.1
|
|
@@ -180,6 +182,9 @@ ln -sf gnupg.7 %{buildroot}%{_mandir}/man7/gnupg2.7
|
|
# gpgconf.conf
|
|
# gpgconf.conf
|
|
mkdir -p %{buildroot}%{_sysconfdir}/gnupg
|
|
mkdir -p %{buildroot}%{_sysconfdir}/gnupg
|
|
touch %{buildroot}%{_sysconfdir}/gnupg/gpgconf.conf
|
|
touch %{buildroot}%{_sysconfdir}/gnupg/gpgconf.conf
|
|
|
|
+mkdir -p %{buildroot}%{_sysconfdir}/profile.d
|
|
|
|
+echo "export GPG_TTY=\$(tty)" > %{buildroot}%{_sysconfdir}/profile.d/gnupg2.sh
|
|
|
|
+echo "setenv GPG_TTY \`tty\`" > %{buildroot}%{_sysconfdir}/profile.d/gnupg2.csh
|
|
|
|
|
|
# more docs
|
|
# more docs
|
|
install -m644 -p AUTHORS NEWS THANKS TODO \
|
|
install -m644 -p AUTHORS NEWS THANKS TODO \
|
|
@@ -188,6 +193,13 @@ install -m644 -p AUTHORS NEWS THANKS TODO \
|
|
# info dir
|
|
# info dir
|
|
rm -f %{buildroot}%{_infodir}/dir
|
|
rm -f %{buildroot}%{_infodir}/dir
|
|
|
|
|
|
|
|
+%if %{with systemd}
|
|
|
|
+# Move the systemd user units to appropriate directory
|
|
|
|
+install -d -m755 %{buildroot}%{_userunitdir}
|
|
|
|
+mv %{buildroot}%{_pkgdocdir}/examples/systemd-user/*.socket %{buildroot}%{_userunitdir}
|
|
|
|
+mv %{buildroot}%{_pkgdocdir}/examples/systemd-user/*.service %{buildroot}%{_userunitdir}
|
|
|
|
+%endif
|
|
|
|
+
|
|
|
|
|
|
%ifarch x86_64
|
|
%ifarch x86_64
|
|
%check
|
|
%check
|
|
@@ -230,6 +242,8 @@ rm -f %{_infodir}/gpgv.info.gz ||:
|
|
%{_pkgdocdir}
|
|
%{_pkgdocdir}
|
|
%dir %{_sysconfdir}/gnupg
|
|
%dir %{_sysconfdir}/gnupg
|
|
%ghost %config(noreplace) %{_sysconfdir}/gnupg/gpgconf.conf
|
|
%ghost %config(noreplace) %{_sysconfdir}/gnupg/gpgconf.conf
|
|
|
|
+%{_sysconfdir}/profile.d/gnupg2.sh
|
|
|
|
+%{_sysconfdir}/profile.d/gnupg2.csh
|
|
## docs say to install suid root, but fedora/rh security folk say not to
|
|
## docs say to install suid root, but fedora/rh security folk say not to
|
|
%if !%{?install_as_gpg2}
|
|
%if !%{?install_as_gpg2}
|
|
%{_bindir}/gpg
|
|
%{_bindir}/gpg
|
|
@@ -256,6 +270,9 @@ rm -f %{_infodir}/gpgv.info.gz ||:
|
|
%{_infodir}/*.info*
|
|
%{_infodir}/*.info*
|
|
%{_mandir}/man?/*
|
|
%{_mandir}/man?/*
|
|
%exclude %{_mandir}/man?/gpgsm*
|
|
%exclude %{_mandir}/man?/gpgsm*
|
|
|
|
+%if %{with systemd}
|
|
|
|
+%{_userunitdir}/*
|
|
|
|
+%endif
|
|
|
|
|
|
%files smime
|
|
%files smime
|
|
%{_bindir}/gpgsm*
|
|
%{_bindir}/gpgsm*
|
|
@@ -264,6 +281,9 @@ rm -f %{_infodir}/gpgv.info.gz ||:
|
|
|
|
|
|
|
|
|
|
%changelog
|
|
%changelog
|
|
|
|
+* Thu Jun 27 2024 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 2.4.5-1
|
|
|
|
+- update to 2.4.5.
|
|
|
|
+
|
|
* Thu Oct 19 2023 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 2.4.3-1
|
|
* Thu Oct 19 2023 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 2.4.3-1
|
|
- update to 2.4.3.
|
|
- update to 2.4.3.
|
|
- re-imported all patches from rawhide.
|
|
- re-imported all patches from rawhide.
|