2014-12-15 Ryoichi INAGAKI <ryo1@toki.waseda.jp>

	* cyrus-sasl, rpm2html: rebuilt with new libdb
	* libserf: updated and rebuilt with new libdb
	


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

c/cyrus-sasl/cyrus-sasl-vl.spec

@@ -3,24 +3,38 @@
 %define _plugindir2 %{_libdir}/sasl2
 
 Summary: The Cyrus SASL library.
+Summary(ja): Cyrus SASL ライブラリ
 Name: cyrus-sasl
 Version: 2.1.26
-Release: 3%{_dist_release}
+Release: 4%{?_dist_release}
 License: BSD with advertising
 Group: System Environment/Libraries
+URL: http://cyrusimap.org/
+
 Source0: ftp://ftp.cyrusimap.org/cyrus-sasl/cyrus-sasl-%{version}.tar.gz
 Source4: saslauthd.init
 Source5: README.RPM
 Source9: saslauthd.sysconfig
-URL: http://cyrusimap.org/
 #
 Patch10: cyrus-sasl-2.1.22-db_bundle.patch
 Patch11: cyrus-sasl-2.1.25-no_rpath.patch
 Patch15: cyrus-sasl-2.1.20-saslauthd.conf-path.patch
 Patch24: cyrus-sasl-2.1.21-sizes.patch
-Patch28: cyrus-sasl-2.1.26-keytab.patch
+Patch44: cyrus-sasl-2.1.26-release-server_creds.patch
+# AM_CONFIG_HEADER is obsolete, use AC_CONFIG_HEADERS instead
+Patch45: cyrus-sasl-2.1.26-obsolete-macro.patch
 # missing size_t declaration in sasl.h
 Patch46: cyrus-sasl-2.1.26-size_t.patch
+# detect gsskrb5_register_acceptor_identity macro (#976538)
+Patch48: cyrus-sasl-2.1.26-keytab.patch
+Patch49: cyrus-sasl-2.1.26-md5global.patch
+# revert upstream commit 080e51c7fa0421eb2f0210d34cf0ac48a228b1e9 (#984079)
+# https://bugzilla.cyrusimap.org/show_bug.cgi?id=3480
+Patch50: cyrus-sasl-2.1.26-revert-upstream-080e51c7fa0421eb2f0210d34cf0ac48a228b1e9.patch
+# improve configuration error message
+Patch52: cyrus-sasl-2.1.26-config-error.patch
+# Treat SCRAM-SHA-1/DIGEST-MD5 as more secure than PLAIN (#970718)
+Patch53: cyrus-sasl-2.1.26-prefer-SCRAM-SHA-1-over-PLAIN.patch
 
 Patch102: cyrus-sasl-2.1.26-configure.patch
 
@@ -31,7 +45,7 @@ Patch200: cyrus-sasl-2.1.26-CVE-2013-4122.patch
 Buildroot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: autoconf, automake, libtool
 # Note: berkeley db for sasl2, gdbm for sasl1.
-BuildRequires: db4-devel
+BuildRequires: libdb-devel
 BuildRequires: openssl-devel
 BuildRequires: pam-devel
 BuildRequires: libmysqlclient-devel
@@ -53,18 +67,20 @@ SASL is the Simple Authentication and Security Layer, a method for
 adding authentication support to connection-based protocols.
 
 %package devel
-Requires: %{name} = %{version}-%{release}
-Group: Development/Libraries
 Summary: Files needed for developing applications with Cyrus SASL.
+Summary(ja): Cyrus SASL を用いるアプリケーションの開発に必要なファイル
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}
 
 %description devel
 The %{name}-devel package contains files needed for developing and
 compiling applications which use the Cyrus SASL library.
 
 %package gssapi
-Requires: %{name} = %{version}-%{release}
-Group: System Environment/Libraries
 Summary: GSSAPI support for Cyrus SASL.
+Summary(ja): Cyrus SASL の GSSAPI 認証サポート
+Group: System Environment/Libraries
+Requires: %{name} = %{version}-%{release}
 
 %description gssapi
 The %{name}-gssapi package contains the Cyrus SASL plugins which
@@ -72,27 +88,30 @@ support GSSAPI authentication. GSSAPI is commonly used for Kerberos
 authentication.
 
 %package plain
-Requires: %{name} = %{version}-%{release}
-Group: System Environment/Libraries
 Summary: PLAIN and LOGIN support for Cyrus SASL.
+Summary(ja): Cyrus SASL の PLAIN, LOGIN 認証サポート
+Group: System Environment/Libraries
+Requires: %{name} = %{version}-%{release}
 
 %description plain
 The %{name}-plain package contains the Cyrus SASL plugins which support
 PLAIN and LOGIN authentication schemes.
 
 %package md5
-Requires: %{name} = %{version}-%{release}
-Group: System Environment/Libraries
 Summary: CRAM-MD5 and DIGEST-MD5 support for Cyrus SASL.
+Summary(ja): Cyrus SASL の CRAM-MD5, DIGEST-MD5 認証サポート
+Group: System Environment/Libraries
+Requires: %{name} = %{version}-%{release}
 
 %description md5
 The %{name}-md5 package contains the Cyrus SASL plugins which support
 CRAM-MD5 and DIGEST-MD5 authentication schemes.
 
 %package ntlm
-Requires: %{name} = %{version}-%{release}
-Group: System Environment/Libraries
 Summary: NTLM support for Cyrus SASL.
+Summary(ja): Cyrus SASL の NTLM 認証サポート
+Group: System Environment/Libraries
+Requires: %{name} = %{version}-%{release}
 
 %description ntlm
 The %{name}-ntlm package contains the Cyrus SASL plugin which supports
@@ -100,10 +119,10 @@ the NTLM authentication schemes.
 
 # This would more appropriately be named cyrus-sasl-auxprop-sql.
 %package sql
-#Requires: %{name}-lib = %{version}-%{release}
-Requires: %{name} = %{version}-%{release}
-Group: System Environment/Libraries
 Summary: SQL auxprop support for Cyrus SASL
+Summary(ja): Cyrus SASL の SQL auxprop サポート
+Group: System Environment/Libraries
+Requires: %{name} = %{version}-%{release}
 
 %description sql
 The %{name}-sql package contains the Cyrus SASL plugin which supports
@@ -111,28 +130,30 @@ using a RDBMS for storing shared secrets.
 
 # This was *almost* named cyrus-sasl-auxprop-ldapdb, but that's a lot of typing.
 %package ldap
-#Requires: %{name}-lib = %{version}-%{release}
-Requires: %{name} = %{version}-%{release}
-Group: System Environment/Libraries
 Summary: LDAP auxprop support for Cyrus SASL
+Summary(ja): Cyrus SASL の LDAP auxprop サポート
+Group: System Environment/Libraries
+Requires: %{name} = %{version}-%{release}
 
 %description ldap
 The %{name}-ldap package contains the Cyrus SASL plugin which supports using
 a directory server, accessed using LDAP, for storing shared secrets.
 
 %package scram
-Requires: %{name} = %{version}-%{release}
-Group: System Environment/Libraries
 Summary: SCRAM auxprop support for Cyrus SASL
+Summary(ja): Cyrus SASL の SCRAM auxprop サポート
+Group: System Environment/Libraries
+Requires: %{name} = %{version}-%{release}
 
 %description scram
 The %{name}-scram package contains the Cyrus SASL plugin which supports
 the SCRAM authentication scheme.
 
 %package gs2
-Requires: %{name} = %{version}-%{release}
-Group: System Environment/Libraries
 Summary: GS2 support for Cyrus SASL
+Summary(ja): Cyrus SASL の GS2 認証サポート
+Group: System Environment/Libraries
+Requires: %{name} = %{version}-%{release}
 
 %description gs2
 The %{name}-gs2 package contains the Cyrus SASL plugin which supports
@@ -141,6 +162,7 @@ the GS2 authentication scheme.
 ## to build compat32 for x86_64 architecture support
 %package -n compat32-%{name}
 Summary: The Cyrus SASL library.
+Summary(ja): Cyrus SASL ライブラリ
 Group: System Environment/Libraries
 
 %description -n compat32-%{name}
@@ -149,16 +171,20 @@ SASL is the Simple Authentication and Security Layer, a method for
 adding authentication support to connection-based protocols.
 
 %package -n compat32-%{name}-devel
-Group: Development/Libraries
 Summary: Files needed for developing applications with Cyrus SASL.
+Summary(ja): Cyrus SASL を用いるアプリケーションの開発に必要なファイル
+Group: Development/Libraries
+Requires: compat32-%{name} = %{version}-%{release}
 
 %description -n compat32-%{name}-devel
 The %{name}-devel package contains files needed for developing and
 compiling applications which use the Cyrus SASL library.
 
 %package -n compat32-%{name}-gssapi
-Group: System Environment/Libraries
 Summary: GSSAPI support for Cyrus SASL.
+Summary(ja): Cyrus SASL の GSSAPI 認証サポート
+Group: System Environment/Libraries
+Requires: compat32-%{name} = %{version}-%{release}
 
 %description -n compat32-%{name}-gssapi
 The %{name}-gssapi package contains the Cyrus SASL plugins which
@@ -166,24 +192,30 @@ support GSSAPI authentication. GSSAPI is commonly used for Kerberos
 authentication.
 
 %package -n compat32-%{name}-plain
-Group: System Environment/Libraries
 Summary: PLAIN and LOGIN support for Cyrus SASL.
+Summary(ja): Cyrus SASL の PLAIN, LOGIN 認証サポート
+Group: System Environment/Libraries
+Requires: compat32-%{name} = %{version}-%{release}
 
 %description -n compat32-%{name}-plain
 The %{name}-plain package contains the Cyrus SASL plugins which support
 PLAIN and LOGIN authentication schemes.
 
 %package -n compat32-%{name}-md5
-Group: System Environment/Libraries
 Summary: CRAM-MD5 and DIGEST-MD5 support for Cyrus SASL.
+Summary(ja): Cyrus SASL の CRAM-MD5, DIGEST-MD5 認証サポート
+Group: System Environment/Libraries
+Requires: compat32-%{name} = %{version}-%{release}
 
 %description -n compat32-%{name}-md5
 The %{name}-md5 package contains the Cyrus SASL plugins which support
 CRAM-MD5 and DIGEST-MD5 authentication schemes.
 
 %package -n compat32-%{name}-ntlm
-Group: System Environment/Libraries
 Summary: NTLM support for Cyrus SASL.
+Summary(ja): Cyrus SASL の NTLM 認証サポート
+Group: System Environment/Libraries
+Requires: compat32-%{name} = %{version}-%{release}
 
 %description -n compat32-%{name}-ntlm
 The %{name}-ntlm package contains the Cyrus SASL plugin which supports
@@ -198,26 +230,30 @@ the NTLM authentication schemes.
 # using a RDBMS for storing shared secrets.
 
 %package -n compat32-%{name}-ldap
-Group: System Environment/Libraries
 Summary: LDAP auxprop support for Cyrus SASL
+Summary(ja): Cyrus SASL の LDAP auxprop サポート
+Group: System Environment/Libraries
+Requires: compat32-%{name} = %{version}-%{release}
 
 %description -n compat32-%{name}-ldap
 The %{name}-ldap package contains the Cyrus SASL plugin which supports using
 a directory server, accessed using LDAP, for storing shared secrets.
 
 %package -n compat32-%{name}-scram
-Requires: %{name}-lib%{?_isa} = %{version}-%{release}
-Group: System Environment/Libraries
 Summary: SCRAM auxprop support for Cyrus SASL
+Summary(ja): Cyrus SASL の SCRAM auxprop サポート
+Group: System Environment/Libraries
+Requires: compat32-%{name} = %{version}-%{release}
 
 %description -n compat32-%{name}-scram
 The %{name}-scram package contains the Cyrus SASL plugin which supports
 the SCRAM authentication scheme.
 
 %package -n compat32-%{name}-gs2
-Requires: %{name}-lib%{?_isa} = %{version}-%{release}
-Group: System Environment/Libraries
 Summary: GS2 support for Cyrus SASL
+Summary(ja): Cyrus SASL の GS2 認証サポート
+Group: System Environment/Libraries
+Requires: compat32-%{name} = %{version}-%{release}
 
 %description -n compat32-%{name}-gs2
 The %{name}-gs2 package contains the Cyrus SASL plugin which supports
@@ -227,12 +263,18 @@ the GS2 authentication scheme.
 %setup -q
 chmod -x doc/*.html
 chmod -x include/*.h
-%patch10 -p1 -b .db_bundle
+#patch10 -p1 -b .db_bundle
 %patch11 -p1 -b .no_rpath
 %patch15 -p1 -b .path
 %patch24 -p1 -b .sizes
-%patch28 -p1 -b .keytab
+%patch44 -p1 -b .release-server_creds
+%patch45 -p1 -b .obsolete-macro
 %patch46 -p1 -b .size_t
+%patch48 -p1 -b .keytab
+%patch49 -p1 -b .md5global.h
+%patch50 -p1 -b .gssapi
+%patch52 -p1 -b .configerr
+%patch53 -p1 -b .sha1vsplain
 
 %patch102 -p1 -b .configure
 
@@ -299,6 +341,7 @@ LDFLAGS=`echo $LDFLAGS $SQL_LDFLAGS | cleanup_flags`; export LDFLAGS
 	--disable-krb4 \
 	--with-rc4 \
 	--with-dblib=berkeley \
+        --with-bdb=db \
 	--with-saslauthd=/var/run/saslauthd --without-pwcheck \
 	--with-ldap \
 	--with-devrandom=/dev/urandom \
@@ -375,9 +418,14 @@ if [ $1 != 0 ] ; then
 	/sbin/service saslauthd condrestart 2>&1 > /dev/null
 fi
 
+%if %{build_compat32}
+%post -n compat32-%{name} -p /sbin/ldconfig
+%postun -n compat32-%{name} -p /sbin/ldconfig
+%endif
+
 %files
 %defattr(-,root,root)
-%doc AUTHORS,COPYING,NEWS,README,doc/*.html
+%doc AUTHORS COPYING NEWS README doc/*.html
 %doc $RPM_SOURCE_DIR/README.RPM
 %dir %{_sysconfdir}/sasl2
 %{_libdir}/libsasl*.so.*
@@ -431,7 +479,7 @@ fi
 
 %files devel
 %defattr(-,root,root)
-%doc %{name}-%{version}/doc/*.txt
+%doc doc/*.txt
 %defattr(-,root,root)
 %{_bindir}/sasl2-sample-client
 %{_bindir}/sasl2-sample-server
@@ -490,6 +538,14 @@ fi
 
 
 %changelog
+* Sun Dec 14 2014 Ryoichi INAGAKI <ryo1@toki.waseda.jp> 2.1.26-4
+- built with libdb 5.3.28
+- dropt Patch10
+- added Patch44, 45, 49, 50, 52 and 53
+- fixed typo of Require of compat32-cyrus-sasl-{scram, gs2}
+- fixed %%doc of cyrus-sasl and cyrus-sasl-devel
+- added Japanese summary
+
 * Sun Jul 20 2014 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.1.26-3
 - rebuild with VineSeed environment
 - change BuildRequires: libmysqlclient-devel instead of MySQL-devel

lib/libs/libserf/libserf-vl.spec

@@ -1,18 +1,23 @@
 %global oname   serf
 
 Name:           libserf
-Version:        1.3.4
+Version:        1.3.8
-Release:        2%{?dist}
+Release:        1%{?_dist_release}
 Summary:        High-Performance Asynchronous HTTP Client Library
 Summary(ja):    高性能な非同期 HTTP クライアントのライブラリ
 License:        ASL 2.0
 Group:          System Environment/Libraries
-Url:            http://code.google.com/p/serf
+URL:            http://code.google.com/p/serf
 Source0:        https://serf.googlecode.com/files/serf-%{version}.tar.bz2
 
-BuildRequires:  apr-util-devel, apr-devel, krb5-devel,
+BuildRoot:      %{_tmppath}/%{name}-%{version}-root
-BuildRequires:  krb5-devel, openssl-devel, zlib-devel
+BuildRequires:  apr-devel
-BuildRequires:  scons, pkgconfig
+BuildRequires:  apr-util-devel
+BuildRequires:  krb5-devel
+BuildRequires:  openssl-devel
+BuildRequires:  pkgconfig
+BuildRequires:  scons
+BuildRequires:  zlib-devel
 
 %description
 The serf library is a C-based HTTP client library built upon the Apache 
@@ -69,6 +74,9 @@ scons %{?_smp_mflags} check || true
 %{_libdir}/pkgconfig/%{oname}*.pc
 
 %changelog
+* Sat Dec 13 2014 Ryoichi INAGAKI <ryo1@toki.waseda.jp> - 1.3.8-1
+- updated to 1.3.8
+
 * Sun Mar 16 2014 NAKAMURA Kenta <kenta@vinelinux.org> - 1.3.4-2
 - initial build for Vine Linux
 

r/rpm2html/rpm2html-vl.spec

@@ -1,21 +1,23 @@
 Summary: Translates an RPM database and dependency information into HTML.
-Summary(ja): RPM パッケージの解説を HTML および RDF 形式にて生成する
+Summary(ja): RPM パッケージの解説を HTML および RDF 形式にて生成するツール
 Name: rpm2html
 Version: 1.11.1
-Release: 1%{?_dist_release}
+Release: 2%{?_dist_release}
 Group: Applications/System
 License: MIT
 URL: http://www.nongnu.org/rpm2html/
 
 Source: http://download.savannah.gnu.org/releases/rpm2html/%{name}/%{name}-%{version}.tar.gz
-Patch0: rpm2html-1.11.1-db48.patch
+Patch0: rpm2html-1.11.1-db53.patch
+Patch1: rpm-4.9.patch
 Patch2: rpm2html-1.9.2-jp.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
-BuildRequires: rpm-devel, db4-devel
+BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: bzip2-devel
-BuildRequires: popt-devel
+BuildRequires: libdb-devel
 BuildRequires: libxml2-devel
+BuildRequires: popt-devel
+BuildRequires: rpm-devel
 
 Vendor:        Project Vine
 Distribution:  Vine Linux
@@ -35,15 +37,12 @@ Install rpm2html if you want a utility for translating information
 from an RPM database into HTML.
 
 %description -l ja
-RPM パッケージのファイル郡からパッケージの情報を取り出して、
+RPM パッケージのファイル郡からパッケージの情報を取り出して、HTML 形式のページと RDF 形式のデータを生成するツールです。グループやパッケージ名などの索引ページも自動的に生成され、依存情報やリソースなども相互にリンクが張られるため、必要なパッケージの検索などが素早く行えます。
-HTML 形式のページと RDF 形式のデータを生成するツール。
-グループやパッケージ名などの索引ページも自動的に生成され、
-依存情報やリソースなども相互にリンクが張られるため、
-必要なパッケージの検索などが素早く行えます。
 
 %prep
-%setup
+%setup -q
-%patch0 -p1 -b .db48
+%patch0 -p1 -b .db53
+%patch1 -p1 -b .rpm49
 ## %patch2 -p1 -b .jp
 
 #libtoolize --force --copy
@@ -77,7 +76,7 @@ done
 
 %files
 %defattr(-, root, root, 0755)
-%doc BUGS CHANGES PRINCIPLES README README.jp TODO 
+%doc BUGS CHANGES Copyright PRINCIPLES README TODO 
 %doc rpm2html-cdrom.config rpm2html-en.config
 %doc %{_mandir}/man1/*
 %config %{_sysconfdir}/rpm2html.config
@@ -85,6 +84,10 @@ done
 %{_datadir}/rpm2html/
 
 %changelog
+* Sat Dec 13 2014 Ryoichi INAGAKI <ryo1@toki.waseda.jp> 1.11.1-2
+- update Patch0 to built with libdb 5.3.28
+- added Patch1 to built with current rpm
+
 * Thu Oct 28 2010 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.11.1-1
 - new upstream release
 - update Patch0(rpm2html-1.11.1-db48.patch)