updated 4 packages

gnupg2-2.2.23-1

libgcrypt-1.8.6-1

libgpg-error-1.39-1

libksba-1.4.0-1

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@12489 ec354946-7b23-47d6-9f5a-488ba84defc7

g/gnupg2/gnupg2-vl.spec

@@ -3,30 +3,35 @@
 Summary: Utility for secure communication and data storage
 Summary(ja): GnuPG2 - 安全なデータ交換と保存のためのユーティリティ
 Name:    gnupg2
-Version: 2.2.19
+Version: 2.2.23
 Release: 1%{?_dist_release}
-Group:   Applications/System
+Group: security
 Vendor: Project Vine
 Distribution: Vine Linux
 Packager: iwaim
 
 License: GPLv3+
+URL:     http://www.gnupg.org/
 Source0: https://gnupg.org/ftp/gcrypt/gnupg/gnupg-%{version}.tar.bz2
 Source1: https://gnupg.org/ftp/gcrypt/gnupg/gnupg-%{version}.tar.bz2.sig
 
-# svn export svn://cvs.gnupg.org/gnupg/trunk gnupg2; tar cjf gnupg-<date>svn.tar.bz2 gnupg2
-#Source0: gnupg2-20090809svn.tar.bz2
-Patch1:  gnupg-2.1.21-insttools.patch
+Patch1:  gnupg-2.2.23-insttools.patch
 # needed for compatibility with system FIPS mode
 Patch3:  gnupg-2.1.10-secmem.patch
 # non-upstreamable patch adding file-is-digest option needed for Copr
-Patch4:  gnupg-2.2.0-file-is-digest.patch
-Patch5:  gnupg-2.1.1-ocsp-keyusage.patch
+Patch4:  gnupg-2.2.20-file-is-digest.patch
+# fix handling of missing key usage on ocsp replies - upstream T1333
+Patch5:  gnupg-2.2.16-ocsp-keyusage.patch
 Patch6:  gnupg-2.1.1-fips-algo.patch
 # allow 8192 bit RSA keys in keygen UI with large RSA
-Patch9:  gnupg-2.1.21-large-rsa.patch
-
-URL:     http://www.gnupg.org/
+Patch9:  gnupg-2.2.23-large-rsa.patch
+# fix missing uid on refresh from keys.openpgp.org
+# https://salsa.debian.org/debian/gnupg2/commit/f292beac1171c6c77faf41d1f88c2e0942ed4437
+Patch20: gnupg-2.2.18-tests-add-test-cases-for-import-without-uid.patch
+Patch21: gnupg-2.2.18-gpg-allow-import-of-previously-known-keys-even-without-UI.patch
+Patch22: gnupg-2.2.18-gpg-accept-subkeys-with-a-good-revocation-but-no-self-sig.patch
+# Fixes for issues found in Coverity scan - reported upstream
+Patch30: gnupg-2.2.21-coverity.patch
 
 #BuildRequires: automake libtool texinfo transfig
 BuildRequires: bzip2-devel
@@ -66,13 +71,6 @@ Obsoletes: dirmngr < 1.2.0-1
 
 %{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}}
 
-%package smime
-Summary: CMS encryption and signing tool and smart card support for GnuPG
-Summary(ja): GnuPG2用のCMS暗号化・スマートカード機能
-Requires: gnupg2 = %{version}-%{release}
-Group: Applications/Internet
-
-
 %description
 GnuPG is GNU's tool for secure communication and data storage.  It can
 be used to encrypt data and to create digital signatures.  It includes
@@ -96,6 +94,13 @@ RFC2440として提案され承認されたOpenPGPインターネット標準、
 ています。S/SMIMEやスマートカード機能はgnupg2-smimeパッケージにて
 提供されています。
 
+
+%package smime
+Summary: CMS encryption and signing tool and smart card support for GnuPG
+Summary(ja): GnuPG2用のCMS暗号化・スマートカード機能
+Requires: gnupg2 = %{version}-%{release}
+Group: security
+
 %description smime
 GnuPG is GNU's tool for secure communication and data storage. This
 package adds support for smart cards and S/MIME encryption and signing
@@ -106,6 +111,10 @@ to the base GnuPG package
 ケージはGnuPG2パッケージにスマートカードやS/MIME暗号化・署名機能
 を追加します。
 
+
+%debug_package
+
+
 %prep
 %setup -q -n gnupg-%{version}
 
@@ -116,6 +125,12 @@ to the base GnuPG package
 %patch6 -p1 -b .fips
 %patch9 -p1 -b .large-rsa
 
+%patch20 -p1 -b .test_missing_uid
+%patch21 -p1 -b .prev_known_key
+%patch22 -p1 -b .good_revoc
+
+%patch30 -p1 -b .coverity
+
 # 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,
 # it can use other implementations too (including non-pcsc ones).
@@ -125,16 +140,13 @@ sed -i -e 's/"libpcsclite\.so"/"%{pcsclib}"/' scd/scdaemon.c
 
 
 %build
-
 #  --enable-gpg-is-gpg2=no is still exists but has no effects.
-
 %configure \
   --disable-gpgtar \
   --disable-rpath \
   --enable-g13 \
   --enable-large-secmem
 
-
 # need scratch gpg database for tests
 mkdir -p $HOME/.gnupg
 
@@ -185,6 +197,21 @@ mkdir -p $HOME/.gnupg
 make -k check
 
 
+%if !0%{?install_as_gpg2}
+%pre
+for f in \
+	%{_bindir}/gpg2 \
+	%{_bindir}/gpgv2 \
+	%{_mandir}/man1/gpg2.1* \
+	%{_mandir}/man1/gpgv2.1* \
+	%{_mandir}/man7/gnupg2.7*
+do
+	if [ -e $f -a ! -L $f ];	then
+		rm -f $f
+	fi
+done
+%endif
+
 %post
 /sbin/install-info %{_infodir}/gnupg.info %{_infodir}/dir ||:
 
@@ -239,6 +266,11 @@ fi
 
 
 %changelog
+* Sat Sep 12 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 2.2.23-1
+- update to 2.2.23.
+- re-imported Patch1, 5 and 9 from rawhide.
+- imported Patch20-30 from rawhide.
+
 * Sun Mar 15 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 2.2.19-1
 - update to 2.2.19.
 

lib/libg/libgcrypt/libgcrypt-vl.spec

@@ -2,9 +2,13 @@
 Summary: A cryptographic library based on the code from GnuPG.
 Summary(ja): GnuPG のコードをベースとした暗号化ライブラリ
 Name: libgcrypt
-Version: 1.8.5
+Version: 1.8.6
 Release: 1%{?_dist_release}
-Group: System Environment/Libraries
+Group: system
+Vendor: Project Vine
+Distribution: Vine Linux
+Packager: iwaim
+
 License: GPLv2+
 URL: https://www.gnupg.org/related_software/libgcrypt/index.html
 Source0: https://gnupg.org/ftp/gcrypt/libgcrypt/libgcrypt-%{version}.tar.bz2
@@ -15,10 +19,6 @@ BuildRequires: libgpg-error-devel >= 0.5
 Requires: libgpg-error
 Requires(post,preun): /sbin/install-info
 
-Vendor: Project Vine
-Distribution: Vine Linux
-Packager: iwaim
-
 %description
 This is a general purpose cryptographic library based on the code from
 GnuPG. It provides functions for all cryptograhic building blocks:
@@ -27,20 +27,22 @@ algorithms (MD4, MD5, RIPE-MD160, SHA-1, TIGER-192), MACs (HMAC for
 all hash algorithms), public key algorithms (RSA, ElGamal, DSA), large
 integer functions, random numbers and a lot of supporting functions.
 
+
 %package devel
 Summary: Development files for libgcrypt
 Summary(ja): libgcrypt を使った開発に必要なヘッダやライブラリ
-Group: Development/Libraries
+Group: programming
 Requires: %{name} = %{version}-%{release}
 Requires: libgpg-error-devel
 
 %description devel
 Static libraries and header files from libgcrypt.
 
+
 %package -n compat32-%{name}
 Summary: A cryptographic library based on the code from GnuPG.
 Summary(ja): GnuPG のコードをベースとした暗号化ライブラリ
-Group: System Environment/Libraries
+Group: system
 Requires: %{name} = %{version}-%{release}
 
 %description -n compat32-%{name}
@@ -51,10 +53,11 @@ algorithms (MD4, MD5, RIPE-MD160, SHA-1, TIGER-192), MACs (HMAC for
 all hash algorithms), public key algorithms (RSA, ElGamal, DSA), large
 integer functions, random numbers and a lot of supporting functions.
 
+
 %package -n compat32-%{name}-devel
 Summary: Development files for libgcrypt
 Summary(ja): libgcrypt を使った開発に必要なヘッダやライブラリ
-Group: Development/Libraries
+Group: programming
 Requires: compat32-%{name} = %{version}-%{release}
 Requires: %{name}-devel = %{version}-%{release}
 Requires: compat32-libgpg-error-devel
@@ -62,13 +65,19 @@ Requires: compat32-libgpg-error-devel
 %description -n compat32-%{name}-devel
 Static libraries and header files from libgcrypt.
 
+
+%debug_package
+
+
 %prep
 %setup -q
 
+
 %build
 %configure --disable-static
 make
 
+
 %install
 [ "%{buildroot}" != / ] && rm -rf %{buildroot}
 %makeinstall
@@ -81,8 +90,8 @@ rm -rf $RPM_BUILD_ROOT%{_libdir}/*.la
 %clean
 [ "%{buildroot}" != / ] && rm -rf %{buildroot}
 
-%post -p /sbin/ldconfig
 
+%post -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
 
 %post devel
@@ -94,9 +103,9 @@ if [ $1 = 0 ]; then
 fi
 
 %post -n compat32-%{name} -p /sbin/ldconfig
-
 %postun -n compat32-%{name} -p /sbin/ldconfig
 
+
 %files
 %defattr(-,root,root)
 %{_bindir}/dumpsexp
@@ -127,7 +136,11 @@ fi
 %{_libdir}/pkgconfig/*.pc
 %endif
 
+
 %changelog
+* Sat Sep 12 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 1.8.6-1
+- updated to 1.8.6.
+
 * Sun Mar 15 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 1.8.5-1
 - updated to 1.8.5.
 

lib/libg/libgpg-error/libgpg-error-vl.spec

@@ -2,28 +2,29 @@
 Summary:	common error codes for GnuPG related projects
 Summary(ja):	GnuPG 関連プロジェクトで共通のエラーコード
 Name:		libgpg-error
-Version:	1.37
+Version:	1.39
 Release:	1%{?_dist_release}
-Group:		System Environment/Libraries
+Group:		system
+Vendor:		Project Vine
+Distribution:	Vine Linux
+Packager:	iwaim
+
 License:	LGPL
 URL:		https://www.gnupg.org/related_software/libgpg-error/index.html
 Source0:	https://gnupg.org/ftp/gcrypt/libgpg-error/libgpg-error-%{version}.tar.bz2
 Source1:	https://gnupg.org/ftp/gcrypt/libgpg-error/libgpg-error-%{version}.tar.bz2.sig
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 
-Vendor:		Project Vine
-Distribution:	Vine Linux
-Packager:	iwaim
-
 %description
 This is a library that defines common error values for all GnuPG
 components. Among these are GPG, GPGSM, GPGME, GPG-Agent, libgcrypt,
 pinentry, SmartCard Daemon and possibly more in the future.
 
+
 %package devel
 Summary:	Development files for the %{name} package
 Summary(ja):	%{name} パッケージの開発用ファイル
-Group:		Development/Libraries
+Group:		programming
 Requires:	%{name} = %{version}-%{release}
 
 %description devel
@@ -32,10 +33,11 @@ components.  Among these are GPG, GPGSM, GPGME, GPG-Agent, libgcrypt,
 pinentry, SmartCard Daemon and possibly more in the future. This package
 contains files necessary to develop applications using libgpg-error.
 
+
 %package -n compat32-%{name}
 Summary:	common error codes for GnuPG related projects
 Summary(ja):	GnuPG 関連プロジェクトで共通のエラーコード
-Group:		System Environment/Libraries
+Group:		system
 Requires:	%{name} = %{version}-%{release}
 
 %description -n compat32-%{name}
@@ -43,10 +45,11 @@ This is a library that defines common error values for all GnuPG
 components. Among these are GPG, GPGSM, GPGME, GPG-Agent, libgcrypt,
 pinentry, SmartCard Daemon and possibly more in the future.
 
+
 %package -n compat32-%{name}-devel
 Summary:	Development files for the %{name} package
 Summary(ja):	%{name} パッケージの開発用ファイル
-Group:		Development/Libraries
+Group:		programming
 Requires:	compat32-%{name} = %{version}-%{release}
 Requires:	%{name}-devel = %{version}-%{release}
 
@@ -56,13 +59,19 @@ components.  Among these are GPG, GPGSM, GPGME, GPG-Agent, libgcrypt,
 pinentry, SmartCard Daemon and possibly more in the future. This package
 contains files necessary to develop applications using libgpg-error.
 
+
+%debug_package
+
+
 %prep
 %setup -q
 
+
 %build
 %configure --disable-static
 make %{?_smp_mflags}
 
+
 %install
 rm -rf $RPM_BUILD_ROOT
 %makeinstall
@@ -74,12 +83,12 @@ rm -f $RPM_BUILD_ROOT%{_infodir}/dir
 
 %find_lang %{name}
 
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 
 %post -p /sbin/ldconfig
-
 %postun -p /sbin/ldconfig
 
 %post devel 
@@ -91,9 +100,9 @@ if [ $1 -eq 0 ]; then
 fi
 
 %post -n compat32-%{name} -p /sbin/ldconfig
-
 %postun -n compat32-%{name} -p /sbin/ldconfig
 
+
 %files -f %{name}.lang
 %defattr(-,root,root)
 %license COPYING COPYING.LIB
@@ -129,6 +138,9 @@ fi
 %endif
 
 %changelog
+* Sat Sep 12 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.39-1
+- updated to 1.39.
+
 * Sun Mar 15 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.37-1
 - updated to 1.37.
 

lib/libk/libksba/libksba-vl.spec

@@ -1,17 +1,15 @@
 Summary: A library to access X.509 and CMS data structures.
 Summary(ja): X.509 および CMS データ構造にアクセスするためのライブラリ
 Name:    libksba
-Version: 1.3.5
-Release: 2%{?_dist_release}
-
-License: GPLv3/LGPLv3
-Group:   System Environment/Libraries
-URL:     https://www.gnupg.org/related_software/libksba/index.html
-
+Version: 1.4.0
+Release: 1%{?_dist_release}
+Group: system
 Vendor: Project Vine
 Distribution: Vine Linux
 Packager: iwaim
 
+License: GPLv3/LGPLv3
+URL:     https://www.gnupg.org/related_software/libksba/index.html
 Source0: https://gnupg.org/ftp/gcrypt/libksba/libksba-%{version}.tar.bz2
 Source1: https://gnupg.org/ftp/gcrypt/libksba/libksba-%{version}.tar.bz2.sig
 
@@ -26,10 +24,11 @@ BuildRequires: libgpg-error-devel >= 1.22
 KSBA is a library designed to build software based on the X.509 and
 CMS protocols.
 
+
 %package devel
 Summary: Development headers and libraries for %{name}
 Summary(ja): %{name} 用開発ヘッダ/ライブラリ
-Group: Development/Libraries
+Group: programming
 Requires: %{name} = %{version}-%{release}
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
@@ -38,6 +37,9 @@ Requires(preun): /sbin/install-info
 %{summary}.
 
 
+%debug_package
+
+
 %prep
 %setup -q
 %patch1 -p1 -b .multilib
@@ -58,15 +60,16 @@ make install DESTDIR=$RPM_BUILD_ROOT
 rm -f $RPM_BUILD_ROOT%{_infodir}/dir
 rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.la
 
+
 %check
 make check
 
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 
 %post -p /sbin/ldconfig
-
 %postun -p /sbin/ldconfig
 
 %post devel
@@ -88,12 +91,16 @@ fi
 %defattr(-,root,root,-)
 %{_bindir}/ksba-config
 %{_libdir}/lib*.so
+%{_libdir}/pkgconfig/*.pc
 %{_includedir}/*
 %{_datadir}/aclocal/*
 %{_infodir}/*
 
 
 %changelog
+* Sat Sep 12 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 1.4.0-1
+- new upstream release.
+
 * Sun Mar 15 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 1.3.5-2
 - rebuilt with current environment.