Browse Source

2015-01-19 Ryoichi INAGAKI <ryo1@toki.waseda.jp>

	* dirmngr: updated
	* pth: rebuilt
	


git-svn-id: http://trac.vinelinux.org/repos/projects/specs@9282 ec354946-7b23-47d6-9f5a-488ba84defc7
inagaki 9 years ago
parent
commit
2100f4be6d
2 changed files with 36 additions and 11 deletions
  1. 26 9
      d/dirmngr/dirmngr-vl.spec
  2. 10 2
      p/pth/pth-vl.spec

+ 26 - 9
d/dirmngr/dirmngr-vl.spec

@@ -1,25 +1,26 @@
-
-# Fedora Review: http://bugzilla.redhat.com/171289
-
 Name:	 dirmngr 
 Summary: Client for Managing/Downloading CRLs
-Version: 1.1.0
+Version: 1.1.1
 Release: 1%{?_dist_release}
 
-License: GPLv2+
-Group:	 System Environment/Libraries
+License: GPLv3+
+Group:	 Applications/System
 URL:	 http://www.gnupg.org/
 Source0: ftp://ftp.gnupg.org/gcrypt/dirmngr/dirmngr-%{version}.tar.bz2
 Source1: ftp://ftp.gnupg.org/gcrypt/dirmngr/dirmngr-%{version}.tar.bz2.sig
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source10: dirmngr.conf
 Source11: ldapservers.conf
 Source12: dirmngr.logrotate
+Source13: dirmngrtmp.conf
+
+Patch1:  dirmngr-1.1.0-ocsp-crash.patch
+Patch2:  dirmngr-1.1.1-pth-fix.patch
 
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: gawk
 BuildRequires: gettext
-BuildRequires: libassuan-devel
+BuildRequires: libassuan-devel >= 2.0.0
 BuildRequires: libgcrypt-devel >= 1.2.0
 BuildRequires: libksba-devel >= 1.0.0 
 BuildRequires: openldap-devel
@@ -40,6 +41,8 @@ the dirmngr-client tool.
 
 %prep
 %setup -q
+%patch1 -p1 -b .crash
+%patch2 -p0 -b .pth-fix
 
 pushd doc
 iconv -f iso-8859-1 -t utf-8 dirmngr.texi -o dirmngr.texi.NEW && mv dirmngr.texi.NEW dirmngr.texi
@@ -74,6 +77,10 @@ install -p -m644 -D %{SOURCE12} %{buildroot}%{_sysconfdir}/logrotate.d/dirmngr
 # conf files
 install -p -m644 %{SOURCE10} %{SOURCE11} %{buildroot}%{_sysconfdir}/dirmngr/
 
+# autocreate /var/run/dirmngr on boot
+install -p -m644 -D %{SOURCE13} %{buildroot}%{_prefix}/lib/tmpfiles.d/dirmngr.conf
+
+
 %find_lang %{name}
 
 ## unpackaged files
@@ -90,7 +97,7 @@ make check
 
 %postun
 if [ $1 -eq 0 ]; then
-  /sbin/install-info --delete %{_infodir}/dirmngr.info.gz %{_infodir}/dir ||:
+    /sbin/install-info --delete %{_infodir}/dirmngr.info.gz %{_infodir}/dir ||:
 fi
 
 
@@ -112,6 +119,7 @@ rm -rf %{buildroot}
 %dir %{_sysconfdir}/dirmngr
 %config(noreplace) %{_sysconfdir}/dirmngr/*.conf
 %config %{_sysconfdir}/logrotate.d/*
+%{_prefix}/lib/tmpfiles.d/*.conf
 %{_var}/cache/dirmngr/
 %{_var}/lib/dirmngr/
 %{_var}/log/dirmngr/
@@ -119,6 +127,15 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Jan 19 2015 Ryoichi INAGAKI <ryo1@toki.waseda.jp> - 1.1.1-1
+- updated to 1.1.1
+- added Patch0 and Patch1 from Fedora
+  * Mon Dec 15 2014 Tomáš Mráz <tmraz@redhat.com> - 1.1.1-6
+  - fix missing pth initialization with libgcrypt-1.6.x (#1172997)
+  * Wed Dec  1 2010 Tomas Mraz <tmraz@redhat.com> - 1.1.0-4
+  - fix crash on some OCSP responses (patch by Tomas Trnka) (#658230)
+- built with libgrypt 1.6.0
+      
 * Sun Jun 24 2012 Yoji TOYODA <bsymaato@sea.plala.or.jp> - 1.1.0-1
 - update to 1.1.0
 - remove Patch100

+ 10 - 2
p/pth/pth-vl.spec

@@ -1,7 +1,8 @@
 Summary:        The GNU Portable Threads library
+Summary(ja):    GNU ポータブルスレッドライブラリ
 Name:           pth
 Version:        2.0.7
-Release:        7%{?_dist_release}
+Release:        9%{?_dist_release}
 License:        LGPLv2+
 Group:          System Environment/Libraries
 URL:            http://www.gnu.org/software/pth/
@@ -9,7 +10,7 @@ Source:         ftp://ftp.gnu.org/gnu/pth/pth-%{version}.tar.gz
 Source1:        ftp://ftp.gnu.org/gnu/pth/pth-%{version}.tar.gz.sig
 Patch1:         pth-2.0.7-dont-remove-gcc-g.patch
 Patch2:         pth-2.0.7-config-script.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 
 %description
 Pth is a very portable POSIX/ANSI-C based library for Unix platforms
@@ -21,6 +22,7 @@ stack, signal mask and errno variable.
 
 %package devel
 Summary:        Development headers and libraries for GNU Pth
+Summary(ja):    GNU Pth の開発用ヘッダファイル及びライブラリ
 Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
 
@@ -102,6 +104,12 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Jan 19 2015 Ryoichi INAGAKI <ryo1@toki.waseda.jp> - 2.0.7-9
+- rebuilt on current VineSsed
+
+* Sun Jun 17 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> - 2.0.7-8
+- rebuild with Vine6 environment
+
 * Wed Sep 24 2008 MATSUBAYASHI Kohji <shaolin@vinelinux.org> - 2.0.7-7
 - initial build for VineSeed