libxml++: rebuild vine5 package, others: rebuild with openssl-1.0.0d

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

O/OpenIPMI/OpenIPMI-vl.spec

@@ -5,7 +5,7 @@ Summary: IPMI (Intelligent Platform Management Interface) library and tools
 Summary(ja): IPMI (Intelligent Platform Management Interface) ライブラリおよびツール
 Name: OpenIPMI
 Version: 2.0.18
-Release: 1%{?_dist_release}
+Release: 2%{?_dist_release}
 License: LGPLv2+ and GPLv2+ or BSD
 Group: System Environment/Base
 URL: http://sourceforge.net/projects/openipmi/
@@ -178,6 +178,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/applications/fedora-openipmigui.desktop
 
 %changelog
+* Sun Mar 20 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.0.18-2
+- rebuild with openssl-1.0.0d
+
 * Sat Jul 10 2010 Daisuke SUZUKI <daisuke@linux.or.jp> 2.0.18-1
 - initial build for Vine Linux
 

a/apache/apache-vl.spec

@@ -10,7 +10,7 @@ Summary: The most widely used Web server on the Internet.
 Summary(ja): インターネットで最も広く利用されているウェブサーバ
 Name: apache
 Version: 1.3.41
-Release: 3%{?_dist_release}
+Release: 4%{?_dist_release}
 
 Group: System Environment/Daemons
 License: Apache License, Version 2.0
@@ -212,7 +212,7 @@ pushd mod_ssl-%{mod_ssl_ver}-%{apache_ver}
 %configure --with-apache=`cd ..;pwd` --with-mm=$EAPI_MM
 popd
 
-OPTIM="$RPM_OPT_FLAGS" \
+OPTIM="$RPM_OPT_FLAGS -DSTACK=_STACK" \
 	./configure --prefix=%{_prefix} \
 	--libexecdir=%{_libdir}/apache \
 	--mandir=%{_mandir} \
@@ -468,6 +468,10 @@ fi
 %{_sysconfdir}/httpd/conf/ssl.*/*
 
 %changelog
+* Sun Mar 20 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.3.41-4
+- rebuild with openssl-1.0.0d
+- fix OPTIM
+
 * Thu Jul 29 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 1.3.41-3
 - added Patch330 for CVE-2010-0010
 - added Patch40 for building currnet toolchain

c/cluster-glue/cluster-glue-vl.spec

@@ -15,7 +15,7 @@ Name:		cluster-glue
 Summary:	Reusable cluster components
 Summary(ja):	再利用可能なクラスタコンポーネント
 Version:	1.0.2
-Release:        2%{?_dist_release}
+Release:        3%{?_dist_release}
 License:	GPLv2+ and LGPLv2+
 Url:		http://linux-ha.org/wiki/Cluster_Glue
 Group:		System Environment/Base
@@ -34,6 +34,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires: perl-TimeDate
 BuildRequires: automake autoconf libtool pkgconfig chrpath libtool-ltdl-devel
 BuildRequires: bzip2-devel glib2-devel python-devel libxml2-devel
+BuildRequires: libuuid-devel
 
 # For documentation
 BuildRequires: libxslt docbook-style-xsl
@@ -196,6 +197,10 @@ such as Pacemaker.
 %doc COPYING.LIB
 
 %changelog
+* Sun Mar 20 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.0.2-3
+- rebuild with openssl-1.0.0d
+- add BuildRequires: libuuid-devel
+
 * Mon Jul 12 2010 Daisuke SUZUKI <daisuke@linux.or.jp> 	1.0.2-2
 - Obsoletes/Provides: stonith, pils
 

h/heartbeat/heartbeat-vl.spec

@@ -8,7 +8,7 @@ Summary:          Heartbeat subsystem for High-Availability Linux
 Summary(ja):	  高可用性 Linux のための HeartBeat サブシステム
 Name:             heartbeat
 Version:          2.0.8
-Release:          5%{_dist_release}
+Release:          6%{_dist_release}
 
 Group:            System Environment/Daemons
 License:          GPL/LGPL
@@ -32,6 +32,8 @@ BuildRequires:    pam-devel
 BuildRequires:    python-devel
 BuildRequires:    swig
 BuildRequires:    curl-devel 
+BuildRequires:    libuuid-devel 
+BuildRequires:    libxml2-devel 
 %endif
 Requires:         stonith = %{version}-%{release}
 Requires:         pils = %{version}-%{release}
@@ -307,6 +309,10 @@ test "$1" != 0 || /usr/sbin/groupdel %{gname} &>/dev/null || :
 %{_libdir}/*.so
 
 %changelog
+* Sun Mar 20 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.0.8-6
+- rebuild with openssl-1.0.0d
+- add BuildRequires: libuuid-devel, libxml2-devel
+
 * Sun Oct  3 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 2.0.8-5
 - rebuilt with new toolchain
 

lib/libe/libesmtp/libesmtp-vl.spec

@@ -4,7 +4,7 @@ Summary:        SMTP client library
 SUmmary(ja):	SMTPクライアントライブラリ
 Name:           libesmtp
 Version:        1.0.4
-Release:        2%{?_dist_release}
+Release:        3%{?_dist_release}
 License:        LGPLv2+
 Group:          System Environment/Libraries
 Source:         http://www.stafford.uklinux.net/libesmtp/%{name}-%{version}.tar.bz2
@@ -103,6 +103,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/libesmtp.pc
 
 %changelog
+* Sun Mar 20 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.0.4-3
+- rebuild with openssl-1.0.0d
+
 * Sun Sep 26 2010 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.0.4-2
 - rebuild with rpm-4.8.1 for pkg-config file
 

lib/libw/libwvstreams/libwvstreams-vl.spec

@@ -1,10 +1,20 @@
 Summary: WvStreams is a network programming library written in C++
 Summary: WvStreams - C++ で記述されたネットワークプログラミングライブラリ
 Name: libwvstreams
-Version: 4.4
+Version: 4.6.1
 Release: 1%{?_dist_release}
 Source: http://wvstreams.googlecode.com/files/wvstreams-%{version}.tar.gz
+#fixed multilib issue (bug #192717)
 Patch1: wvstreams-4.2.2-multilib.patch
+#install-xplc target was missing
+Patch2: wvstreams-4.5-noxplctarget.patch
+#Fix parallel build (#226061)
+Patch3: wvstreams-4.6.1-make.patch
+#sys/stat.h is missing some files in rawhide build
+Patch4: wvstreams-4.6.1-statinclude.patch
+#const X509V3_EXT_METHOD * -> X509V3_EXT_METHOD * conversion not allowed
+#by rawhide gcc
+Patch5: wvstreams-4.6.1-gcc.patch
 URL: http://alumnit.ca/wiki/index.php?page=WvStreams
 Group: System Environment/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -28,6 +38,10 @@ needed for developing applications which use WvStreams.
 %prep
 %setup -q -n wvstreams-%{version}
 %patch1 -p1 -b .multilib
+%patch2 -p1 -b .xplctarget
+%patch3 -p1 -b .make
+%patch4 -p1 -b .statinclude
+%patch5 -p1 -b .gcc
 
 %build
 #  --with-fam              FAM
@@ -88,6 +102,14 @@ rm -rf $RPM_BUILD_ROOT
 %postun -p /sbin/ldconfig
 
 %changelog
+* Sun Mar 20 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 4.6.1-1
+- update to 4.6.1
+- fix Patch1 (wvstreams-4.2.2-multilib.patch)
+- add Patch2 (wvstreams-4.5-noxplctarget.patch) from FC package
+- add Patch3 (wvstreams-4.6.1-make.patch) from FC package
+- add Patch4 (wvstreams-4.6.1-statinclude.patch) from FC package
+- add Patch5 (wvstreams-4.6.1-gcc.patch) from FC package
+
 * Fri Oct 03 2008 Shu KONNO <owa@bg.wakwak.com> 4.4-1vl5
 - applied new versioning policy, spec in utf-8
 

lib/libx/libxml++/libxml++-vl.spec

@@ -1,16 +1,17 @@
 %global 	apiver 2.6
 Name:           libxml++
-Version:        2.30.0
-Release:        3%{?_dist_release}
+Version:        2.32.0
+Release:        1%{?_dist_release}
 Summary:        C++ wrapper for the libxml2 XML parser library
+Summary(ja):    libxml2 XML 解析ライブラリの C++ ラッパー
 
 Group:          System Environment/Libraries
 License:        LGPLv2+
 URL:            http://libxmlplusplus.sourceforge.net/
 
-Source:         http://ftp.gnome.org/pub/GNOME/sources/libxml++/2.26/libxml++-%{version}.tar.bz2
+Source:         http://ftp.gnome.org/pub/GNOME/sources/libxml++/2.32/libxml++-%{version}.tar.bz2
 
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRoot:      %{_tmppath}/%{name}-%{version}-root
 BuildRequires:  libxml2-devel >= 2.6.1
 BuildRequires:  glibmm-devel >= 2.4.0
 BuildRequires:  doxygen, graphviz
@@ -23,9 +24,12 @@ and Murray Cumming.
 
 %package devel
 Summary:        Development files for %{name}
+Summary(ja):    %{name} の開発用ファイル
 Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
-Requires:       pkgconfig, libxml2-devel, glibmm-devel
+Requires:       pkgconfig
+Requires:       libxml2-devel
+Requires:       glibmm-devel
 
 %description devel
 This package contains the headers and libraries for libxml++ development.
@@ -37,7 +41,11 @@ This package contains the headers and libraries for libxml++ development.
 sed -i s'#\r##' examples/dom_parser/example_with_namespace.xml
 
 %build
-%configure --disable-static
+%configure \
+%if %{?_dist_release} == "vl5"
+    --disable-documentation \
+%endif
+    --disable-static
 make %{?_smp_mflags}
 
 
@@ -45,33 +53,36 @@ make %{?_smp_mflags}
 rm -rf $RPM_BUILD_ROOT
 %makeinstall
 find $RPM_BUILD_ROOT -name "*.la" -o -name '*.a' | xargs rm -f
+
 # Modify temporary working directories for files section.
 rm -rf _reference _examples _manual
 mkdir -m 755 _reference _examples _manual
+
+%if %{?_dist_release} != "vl5"
 cp -a $RPM_BUILD_ROOT%{_docdir}/%{name}-%{apiver}/reference/html _reference/reference
-#cp -a $RPM_BUILD_ROOT%{_docdir}/%{name}-%{apiver}/manual _manual/manual
-mv docs/manual/html _manual/manual
-rm -rf $RPM_BUILD_ROOT%{_docdir}
+%endif
+cp -a docs/manual/html _manual/manual
 cp -a examples _examples/examples
+rm -rf $RPM_BUILD_ROOT%{_docdir}
 
 # Delete non-working makefiles, object files, prebuilt binaries and
 # empty files.
 find _examples -type f -a \( -name Makefile\* -o -name \*.o \
     -o \( -name example -a -perm +0111 \) -o -empty \) | xargs rm -f
 find _examples -type d -name '*.libs' -o -name '.deps' | xargs rm -rf
+
+%if %{?_dist_release} != "vl5"
 # fix devhelp index file 
 sed -i "s#"$RPM_BUILD_ROOT"##g" \
 	$RPM_BUILD_ROOT%{_datadir}/devhelp/books/%{name}-%{apiver}/%{name}-%{apiver}.devhelp2
 sed -i "s#"/%{name}-%{apiver}/reference/html"#"/%{name}-devel-%{version}/reference"#" \
         $RPM_BUILD_ROOT%{_datadir}/devhelp/books/%{name}-%{apiver}/%{name}-%{apiver}.devhelp2
-
+%endif
 
 %post -p /sbin/ldconfig
 
-
 %postun -p /sbin/ldconfig
 
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -81,19 +92,26 @@ rm -rf $RPM_BUILD_ROOT
 %doc AUTHORS COPYING NEWS README ChangeLog
 %{_libdir}/*.so.*
 
-
 %files devel
 %defattr (-,root,root,-)
-%doc _examples/examples _reference/reference _manual/manual
+%doc _examples/examples _manual/manual
 %{_includedir}/*
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/*
 %dir %{_libdir}/%{name}-%{apiver}
 %dir %{_libdir}/%{name}-%{apiver}/include
 %{_libdir}/%{name}-%{apiver}/include/*.h
+%if %{?_dist_release} != "vl5"
+%doc _reference/reference
 %{_datadir}/devhelp/books/%{name}-%{apiver}/%{name}-%{apiver}.devhelp2
+%endif
 
 %changelog
+* Thu Jan 27 2011 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 2.32.0-1
+- new upstream release
+- fixed spec file for Vine Linux 5
+- added Japanese summary
+
 * Sun Sep 26 2010 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.30.0-3
 - rebuild with rpm-4.8.1 for pkg-config file
 

m/monit/monit-vl.spec

@@ -1,6 +1,6 @@
 Name:           monit
-Version:        4.10.1
-Release:        8%{?_dist_release}
+Version:        5.2.4
+Release:        1%{?_dist_release}
 Summary:        Manages and monitors processes, files, directories and devices
 Summary(ja):    プロセス/ファイル/ディレクトリ/デバイスを監視するツール
 
@@ -82,6 +82,9 @@ fi
 
 
 %changelog
+* Sun Mar 20 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 5.2.4-1
+- new upstream release
+
 * Mon Nov 10 2008 MATSUBAYASHI Kohji <shaolin@vinelinux.org> - 4.10.1-8
 - initial build for Vine Linux
 

o/openconnect/openconnect-vl.spec

@@ -1,5 +1,5 @@
 Name:		openconnect
-Version:	1.10
+Version:	2.26
 Release:        1%{?_dist_release}
 Summary:	Open client for Cisco AnyConnect VPN
 Summary(ja):	Cisco AnyConnect VPM 用のオープンクライアント
@@ -11,6 +11,7 @@ Source0:	ftp://ftp.infradead.org/pub/openconnect/openconnect-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
 BuildRequires:	openssl-devel libxml2-devel gtk2-devel GConf2-devel dbus-devel
+BuildRequires:	libproxy-devel
 Requires:	vpnc
 
 %description
@@ -44,6 +45,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun May 20 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.26-1
+- new upstream release
+
 * Tue May 26 2009 Daisuke SUZUKI <daisuke@linux.or.jp> 	1.10-1
 - initial build for Vine Linux
 

o/openhpi/openhpi-vl.spec

@@ -2,7 +2,7 @@ Summary: Hardware Platform Interface library and tools
 Summary(ja): ハードウエアプラットフォームインタフェースライブラリおよびツール
 Name: openhpi
 Version: 2.14.1
-Release: 1%{?_dist_release}
+Release: 2%{?_dist_release}
 License: BSD
 Group: System Environment/Base
 URL: http://www.openhpi.org
@@ -149,6 +149,9 @@ fi
 
 
 %changelog
+* Sun Mar 20 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.14.1-2
+- rebuild with openssl-1.0.0d
+
 * Sat Jul 10 2010 Daisuke SUZUKI <daisuke@linux.or.jp> 2.14.1-1
 - initial build for Vine Linux
 

p/pacemaker/pacemaker-vl.spec

@@ -33,7 +33,7 @@ Name:		pacemaker
 Summary:	Scalable High-Availability cluster resource manager
 Summary(ja):	スケーラブル高可用クラスタリソースマネージャ
 Version:	1.1.2
-Release:        1%{?_dist_release}
+Release:        2%{?_dist_release}
 License:	GPLv2+ and LGPLv2+
 Url:		http://www.clusterlabs.org
 Group:		System Environment/Daemons
@@ -306,6 +306,9 @@ rm -rf %{buildroot}
 %doc AUTHORS
 
 %changelog
+* Sun Mar 20 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.1.2-2
+- rebuild with openssl-1.0.0d
+
 * Sat Jul 10 2010 Daisuke SUZUKI <daisuke@linux.or.jp> 	1.1.2-1
 - initial build for Vine Linux
 

q/qpopper/qpopper-vl.spec

@@ -3,8 +3,8 @@
 Summary: POP3 daemon from Qualcomm
 Summary(ja): POP3 デーモン
 Name: qpopper
-Version: 4.0.18
-Release: 3%{?_dist_release}
+Version: 4.0.19
+Release: 1%{?_dist_release}
 License: BSD
 Group: System Environment/Daemons
 URL: http://www.eudora.com/qpopper/
@@ -16,21 +16,23 @@ Source11: qpopper.pamd
 %if %{_dist_release}=="vl4"
 # for Vine 4.x
 Requires: pam >= 0.59
-BuildPreReq: pam-devel >= 0.59
+BuildRequires: pam-devel >= 0.59
 %else
 Requires: pam >= 1.0
-BuildPreReq: pam-devel >= 1.0
+BuildRequires: pam-devel >= 1.0
 %endif
 
 Requires: gdbm, openssl
-BuildPreReq: gdbm-devel, openssl-devel
+BuildRequires: gdbm-devel, openssl-devel
 
 %if %{USE_DRACD}
 Requires: dracd
-BuildPreReq: dracd
+BuildRequires: dracd
 %endif
 
-PreReq: gawk grep shadow-utils
+BuildRequires: sendmail
+
+Requires(pre): gawk grep shadow-utils
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 Distribution: Vine Linux
 Vendor: Project Vine
@@ -200,6 +202,10 @@ rm -rf $RPM_BUILD_ROOT
 %config %{_sysconfdir}/pam.d/qpopper
 
 %changelog 
+* Sun Mar 20 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 4.0.19-1
+- update to 4.0.19
+- add BuildRequires: sendmail
+
 * Thu Aug 20 2009 Satoshi IWAMOTO <satoshi.iwamoto@nifty.ne.jp> 4.0.18-3
 - merge spec for Vine4.x and Vine5.x
 - disable smp flag

s/squid/squid-vl.spec

@@ -1,8 +1,8 @@
 %define __perl_requires %{SOURCE98}
 
 Name:     squid
-Version:  3.0.STABLE23
-Release:  1%{_dist_release}
+Version:  3.0.STABLE25
+Release:  2%{_dist_release}
 Summary:  The Squid proxy caching server
 Summary(ja): Squid ウェブプロキシキャッシュ
 Epoch:    7
@@ -19,6 +19,7 @@ Source98: perl-requires-squid.sh
 
 # Upstream patches
 #Patch001: http://www.squid-cache.org/Versions/v3/3.0/changesets/bXXXX.patch
+Patch002: http://www.squid-cache.org/Versions/v3/3.0/changesets/squid-3.0-9189.patch
 
 # External patches
 
@@ -73,6 +74,8 @@ Squid は、メインのサーバプログラム squid と、 Domain Name System
 %prep
 %setup -q
 
+%patch002 -p0 -b .CVE-2010-3072
+
 %patch201 -p1 -b .config
 %patch202 -p1 -b .location
 %patch203 -p1 -b .build
@@ -354,6 +357,18 @@ fi
     chgrp squid /var/cache/samba/winbindd_privileged >/dev/null 2>&1 || :
 
 %changelog
+* Mon Sep 20 2010 Satoshi IWAMOTO <satoshi.iwamoto@nifty.ne.jp>
+- 7:3.0.STABLE25-2
+- add patch001 for fix CVE-2010-3072
+
+* Tue Mar 16 2010 Satoshi IWAMOTO <satoshi.iwamoto@nifty.ne.jp>
+- 7:3.0.STABLE25-1 
+- new upstream release
+
+* Tue Mar  9 2010 Satoshi IWAMOTO <satoshi.iwamoto@nifty.ne.jp>
+- 7:3.0.STABLE24-1 
+- new upstream release
+
 * Wed Feb  3 2010 Satoshi IWAMOTO <satoshi.iwamoto@nifty.ne.jp>
 - 7:3.0.STABLE23-1 
 - new upstream release with security fix (Handle DNS header-only packet)