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

	* chmlib: rebuilt
	* cpio: added patch from Vine Linux 6
	* lm-sensors, rrdtool: updated
	


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

c/chmlib/chmlib-vl.spec

@@ -2,7 +2,7 @@ Summary:          Library for dealing with Microsoft ITSS/CHM format files
 Summary(ja):      Microsoft ITSS/CHM 形式を扱うライブラリ
 Name:             chmlib
 Version:          0.40
-Release:          2%{?_dist_release}
+Release:          3%{?_dist_release}
 License:          LGPL
 Group:            System Environment/Libraries
 URL:              http://www.jedrea.com/chmlib/
@@ -71,6 +71,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/*.h
 
 %changelog
+* Sun Jan  4 2015 Ryoichi INAGAKI <ryo1@toki.waseda.jp> 0.40-3
+- rebuilt on current VineSeed
+
 * Mon Oct 12 2009 MATSUBAYASHI Kohji <shaolin@vinelinux.org> - 0.40-2
 - import Patch0 from Fedora: Better fix for multi-arch issues
 

c/cpio/cpio-vl.spec

@@ -7,7 +7,7 @@ Summary: A GNU archiving program.
 Summary(ja): GNU アーカイブプログラム
 Name: cpio
 Version: 2.11
-Release: 2%{?_dist_release}
+Release: 3%{?_dist_release}
 
 License: GPLv3
 Group: Applications/Archiving
@@ -20,6 +20,8 @@ Patch2: cpio-2.9-rh.patch
 Patch4: cpio-2.9-exitCode.patch
 Patch6: cpio-2.9-dev_number.patch
 Patch7:	cpio-2.11-gets.patch
+#security
+Patch100: cpio-2.11-CVE-2014-9112.patch
 
 %ifnos linux
 Requires(post): /sbin/rmt
@@ -71,6 +73,8 @@ GNU cpio がサポートしているアーカイブ形式は以下の通りで
 %patch4  -p1 -b .exitCode
 %patch6  -p1 -b .dev_number
 %patch7  -p1 -b .gets
+# security
+%patch100 -p1 -b .CVE-2014-9112
 
 autoheader
 
@@ -121,6 +125,12 @@ fi
 %{_datadir}/locale/*
 
 %changelog
+* Sun Jan  4 2015 Ryoichi INAGAKI <ryo1@toki.waseda.jp> 2.11-3
+- reflected security fix based on Vine Linux/6.2
+  * Tue Dec 23 2014 Satoshi IWAMOTO <satoshi.iwamoto@nifty.ne.jp> 2.11-2
+  - add patch100 for fix CVE-2014-9112 (cpio's list_file())
+    this patch is from fc21, thanks.
+
 * Sun Dec 29 2013 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.11-2
 - rebuild with VineSeed environment
 - add Patch7 (cpio-2.11-gets.patch)

l/lm-sensors/lm-sensors-vl.spec

@@ -1,65 +1,99 @@
-Summary: Linux hardware monitoring
-Summary(ja): Linux ハードウェア監視ソフト
+Summary: Hardware monitoring tools
+Summary(ja): ハードウェア監視ツール集
 Name: lm-sensors
-Version: 3.3.0
+Version: 3.3.5
 Release: 1%{?_dist_release}
-License: GPL
+
 Group: Applications/System
+License: LGPLv2+ and GPLv3+ and GPLv2+ and Verbatim and Public Domain
 URL: http://www.lm-sensors.org/
+
 Source0: http://dl.lm-sensors.org/lm-sensors/releases/lm_sensors-%{version}.tar.bz2
-BuildRequires: sysfsutils-devel
-BuildRequires: bison, flex
+Source1: lm_sensors.sysconfig
+
+BuildRoot: %{_tmppath}/%{name}-%{version}-root
+BuildRequires: bison
+BuildRequires: flex
+BuildRequires: gawk
+BuildRequires: kernel-headers >= 2.2.16
+BuildRequires: libsysfs-devel
+BuildRequires: rrdtool-devel
+
 Requires: perl
 Requires: initscripts
-BuildRoot: %{_tmppath}/%{name}-%{version}-root
+Requires(post): /sbin/chkconfig
+Requires(preun): /sbin/chkconfig
+
 Vendor: Project Vine
 Distribution: Vine Linux
 Packager: shaolin, owa
 
 %description
-The lm-sensors package, version 3, provides user-space support for the
-hardware monitoring drivers in Linux 2.6.5 and later. For older kernel
-versions, you have to use lm-sensors version 2.
+The lm-sensors package includes a collection of modules for general SMBus
+access and hardware monitoring.
 
-Lm-sensors is a hardware health monitoring package for Linux. 
-It allows you to access information from temperature, voltage, 
-and fan speed sensors. It works with most newer systems.
+%package libs
+Summary: Lm_sensors core libraries
+Summary(ja): Lm_sensors コアライブラリ
+Group: System Environment/Libraries
+
+%description libs
+Core libraries for lm_sensors applications
 
 
 %package devel
-Summary: Development libraries and headers for %{name}
+Summary: Development files for programs which will use lm_sensors
+Summary(ja): lm_sensors を使用するプログラムのための開発用ファイル
 Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
+Requires: %{name}-libs = %{version}-%{release}
 
 %description devel
-Development libraries and headers for %{name}.
+The %{name}-devel package includes a header files and libraries for use
+when building applications that make use of sensor data.
+
+
+%package sensord
+Summary: Daemon that periodically logs sensor readings
+Summary(ja): センサーの読み取り値を定期的に記録するデーモン
+Group: System Environment/Daemons
+Requires: %{name} = %{version}-%{release}
+
+%description sensord
+Daemon that periodically logs sensor readings to syslog or a round-robin
+database, and warns of sensor alarms.
 
 %prep
 %setup -q -n lm_sensors-%{version}
 
 %build
-make all
+export CFLAGS="%{optflags}"
+make PREFIX=%{_prefix} LIBDIR=%{_libdir} MANDIR=%{_mandir} EXLDFLAGS=  user
 
 %install
-rm -rf %{buildroot}
-make install \
-	PREFIX=%{buildroot}%{_prefix} \
-	LIBDIR=%{buildroot}%{_libdir} \
-	ETCDIR=%{buildroot}%{_sysconfdir} \
-	MANDIR=%{buildroot}%{_mandir}
+rm -rf $RPM_BUILD_ROOT
+make user_install \
+     DESTDIR=$RPM_BUILD_ROOT \
+     PREFIX=%{_prefix} \
+     LIBDIR=%{_libdir} \
+     ETCDIR=%{_sysconfdir} \
+     MANDIR=%{_mandir} 
+
+ln -s sensors.conf.5.gz $RPM_BUILD_ROOT%{_mandir}/man5/sensors3.conf.5.gz
 
 # add initscript from proc/init
-mkdir -p %{buildroot}%{_initdir}
-install -m755 prog/init/lm_sensors.init %{buildroot}%{_initdir}/lm_sensors
+mkdir -p $RPM_BUILD_ROOT%{_initdir}
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/sensors.d
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig
+install -m755 prog/init/lm_sensors.init $RPM_BUILD_ROOT%{_initdir}/lm_sensors
+install -pm 644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/lm_sensors
 
 # remove unuse files
-rm -f %{buildroot}/%{_libdir}/*.a
+rm -f $RPM_BUILD_ROOT/%{_libdir}/*.a
 
 %clean
-rm -rf %{buildroot}
+rm -rf $RPM_BUILD_ROOT
 
 %post
-/sbin/ldconfig
 if [ "$1" = 1 ] ; then
 	/sbin/chkconfig --add lm_sensors
 fi
@@ -71,8 +105,9 @@ if [ "$1" = 0 ] ; then
     /sbin/chkconfig --del lm_sensors
 fi
 
-%postun
-/sbin/ldconfig
+%post libs -p /sbin/ldconfig
+
+%postun libs -p /sbin/ldconfig
 
 
 %files
@@ -80,6 +115,7 @@ fi
 %doc CHANGES CONTRIBUTORS COPYING INSTALL README doc
 %dir %{_sysconfdir}/sensors.d
 %config(noreplace) %{_sysconfdir}/sensors3.conf
+%config(noreplace) %{_sysconfdir}/sysconfig/lm_sensors
 %config %{_initdir}/lm_sensors
 %{_bindir}/sensors
 %{_bindir}/sensors-conf-convert
@@ -90,13 +126,25 @@ fi
 %endif
 %{_sbindir}/pwmconfig
 %{_sbindir}/sensors-detect
-%{_libdir}/libsensors.so*
-%{_mandir}/*/*
+%{_mandir}/man1/*
+%{_mandir}/man5/*
+%{_mandir}/man8/*
+
+%files libs
+%{_libdir}/lib*.so.*
 
 %files devel
 %{_includedir}/sensors
+%{_libdir}/lib*.so
+%{_mandir}/man3/*
+
 
 %changelog
+* Mon Jan  5 2015 Ryoichi INAGAKI <ryo1@toki.waseda.jp> 3.3.5-1
+- updated to 3.3.5
+- built on current VineSeed
+- split libraries to libs subpackage
+
 * Tue Apr 12 2011 Satoshi IWAMOTO <satoshi.iwamoto@nifty.ne.jp> 3.3.0-1
 - new upstrem release 3.3.0
 

r/rrdtool/rrdtool-vl.spec

@@ -1,29 +1,36 @@
 
 # Basic Information
 Name:		rrdtool
-Version:	1.4.8
+Version:	1.4.9
 Release:	1%{?_dist_release}
-License:	GPLv2
-Group:		Applications/System
+License:	GPLv2+ with exceptions
+Group:		Applications/Databases
 URL:		http://oss.oetiker.ch/rrdtool/
-Source0:	http://oss.oetiker.ch/%{name}/pub/%{name}-%{version}.tar.gz
-BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 
-Vendor:		Project Vine
-Distribution:	Vine Linux
-Packager:	yasumichi
+Source0:	http://oss.oetiker.ch/%{name}/pub/%{name}-%{version}.tar.gz
+Patch3:		rrdtool-1.4.7-ruby-2-fix.patch
 
 Summary:	RRDtool - Round Robin Database tool
 Summary(ja):	RRDtool - ラウンドロビンデータベースツール
 
+BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 # Dependency
 BuildRequires:	glib2-devel
 BuildRequires:	glibc-devel
+BuildRequires:	libdbi-devel
 BuildRequires:	libxml2-devel
 BuildRequires:	lua-devel
 BuildRequires:	pango-devel
+BuildRequires:	perl(ExtUtils::MakeMaker)
+BuildRequires:	python-devel
+BuildRequires:	ruby-devel
 BuildRequires:	tcl
 
+Vendor:		Project Vine
+Distribution:	Vine Linux
+Packager:	yasumichi
+
+
 %description
 It is pretty easy to gather status information from all sorts of things,
 ranging from the temperature in your office to the number of octets which
@@ -38,72 +45,132 @@ values collected over a definable time period.
 
 %package devel
 Summary:	Libraries and include files of RRDtool
-Requires:	%{name} = %{version}
+Group:		Development/Libraries
+Requires:	%{name} = %{version}-%{release}
 
 %description devel
 Libraries and include files of RRDtool
 
+
+%package doc
+Summary: RRDtool documentation
+Summary(ja): RRDtool のドキュメント
+Group: Applications/Documentation
+BuildArch: noarch
+
+%description doc
+RRD is the Acronym for Round Robin Database. RRD is a system to store and
+display time-series data (i.e. network bandwidth, machine-room temperature,
+server load average). This package contains documentation on using RRD.
+
+
 %package tcl
 Summary:	RRDTool modules for tcl
-Requires:	%{name} = %{version}
+Group:		Development/Libraries
+Requires:	%{name} = %{version}-%{release}
 
 %description tcl
-RRDTool modules for tcl
+RRDTool bindings for Tcl.
+
 
 %package -n perl-rrdtool
-Summary:	RRDTool module for perl
-Requires:	%{name} = %{version}
+Summary:	Perl RRDtool bindings
+Summary(ja):	RRDTool の perl バインディング
+Group:		Development/Libraries
+Requires:	%{name} = %{version}-%{release}
+Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description -n perl-rrdtool
-RRDTool module for perl
+The Perl RRDTool bindings.
+
 
 %package -n python-rrdtool
-Summary:	RRDTool module for python
-Requires:	%{name} = %{version}
-BuildRequires:	python-devel
+Summary:	Python RRDTool bindings
+Summary(ja):	RRDTool の Python バインディング
+Group:		Development/Libraries
+Requires:	%{name} = %{version}-%{release}
 
 %description -n python-rrdtool
-RDTool module for python
+RDTool bindings for python.
+
+
+%package -n ruby-rrdtool
+Summary:	Ruby RRDTool bindings
+Summary(ja):	RRDTool の ruby バインディング
+Group:		Development/Libraries
+Requires:	%{name} = %{version}-%{release}
+
+%description -n ruby-rrdtool
+RRDtool bindings for Ruby.
+
 
 %prep
 %setup -q
+%patch3 -p1 -b .ruby-2-fix
 
 %build
 %configure \
-	--disable-ruby \
-	--enable-perl-site-install \
-	--with-perl-options="INSTALLDIRS=vendor"
+    --disable-rpath \
+    --disable-static \
+    --enable-perl-site-install \
+    --with-perl-options="INSTALLDIRS=vendor" \
+    --enable-ruby \
+    --with-pic
+
+# Fix another rpath issue
+%{__perl} -pi.orig -e 's|-Wl,--rpath -Wl,\$rp||g' \
+    bindings/perl-shared/Makefile.PL
+
+# Remove Rpath from Ruby
+%{__perl} -pi.orig -e 's|-Wl,--rpath -Wl,\$\(EPREFIX\)/lib||g' \
+    bindings/ruby/extconf.rb
+sed -i 's| extconf.rb| extconf.rb --vendor |' bindings/Makefile
 
 perl -pi -e 's/(rrdcached_LDADD =)/$1 \$(ALL_LIBS) /' src/Makefile
 %{__make} %{?_smp_mflags}
 
+
 %install
 %{__rm} -rf ${RPM_BUILD_ROOT}
 %{__make} install DESTDIR=${RPM_BUILD_ROOT}
 
-%{__rm} -f ${RPM_BUILD_ROOT}%{_prefix}/lib/lua/*/rrd.a
+# Install ruby module by force
+mkdir -p $RPM_BUILD_ROOT/%{ruby_vendorarchdir}
+make -C bindings/ruby install DESTDIR=$RPM_BUILD_ROOT
+
+# We only want .txt and .html files for the main documentation
+rm -rf docs_to_be_included
+mkdir -p docs_to_be_included/html docs_to_be_included/txt
+mv $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/html/* docs_to_be_included/html/
+mv $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/txt/* docs_to_be_included/txt/
+
+# Put perl docs in perl package
+rm -rf docs_perl
+mkdir -p docs_perl/html
+mv docs_to_be_included/html/RRD*.html docs_perl/html/
+
+# Clean up
+%{__rm} -rf $RPM_BUILD_ROOT%{_docdir}/%{name}-*
 %{__rm} -f ${RPM_BUILD_ROOT}%{_prefix}/lib/lua/*/rrd.la
-%{__rm} -f ${RPM_BUILD_ROOT}%{_libdir}/librrd*.a
 %{__rm} -f ${RPM_BUILD_ROOT}%{_libdir}/librrd*.la
-%{__rm} -f ${RPM_BUILD_ROOT}%{_mandir}/man3/RRD?.3pm*
 %{__rm} -f ${RPM_BUILD_ROOT}%{perl_archlib}/perllocal.pod
-%{__rm} -f ${RPM_BUILD_ROOT}%{perl_vendorarch}/auto/RRDp/.packlist
-%{__rm} -f ${RPM_BUILD_ROOT}%{perl_vendorarch}/auto/RRDs/.packlist
+%{__rm} -f ${RPM_BUILD_ROOT}%{perl_vendorarch}/auto/*/.packlist
 
 
 %clean
 %{__rm} -rf ${RPM_BUILD_ROOT}
 
+%post -p /sbin/ldconfig
+
+%postun -p /sbin/ldconfig
 
 %files
 %defattr(-,root,root)
-%doc COPYING NEWS README TODO
-#/usr/local/lib64/site_ruby/1.8/x86_64-linux/RRD.so
+#doc COPYING NEWS README TODO
 %{_bindir}/rrd*
 %{_prefix}/lib/lua/*/rrd.so.*
 %{_libdir}/librrd*.so.*
 %{_mandir}/man1/*.1*
-%{_mandir}/man3/librrd.3*
 %{_datadir}/rrdtool/examples/cgi-demo.cgi
 
 %files devel
@@ -113,9 +180,16 @@ perl -pi -e 's/(rrdcached_LDADD =)/$1 \$(ALL_LIBS) /' src/Makefile
 %{_libdir}/librrd.so
 %{_libdir}/librrd_th.so
 %{_libdir}/pkgconfig/librrd.pc
+%{_mandir}/man3/librrd.3*
+
+%files doc
+%defattr(-,root,root,-)
+%doc CONTRIBUTORS COPYING COPYRIGHT README TODO NEWS THREADS
+%doc docs_to_be_included/html docs_to_be_included/txt
 
 %files tcl
 %defattr(-,root,root)
+%doc bindings/tcl/README
 %{_datadir}/rrdtool/ifOctets.tcl
 %{_datadir}/rrdtool/pkgIndex.tcl
 %{_libdir}/tclrrd*.so
@@ -129,13 +203,27 @@ perl -pi -e 's/(rrdcached_LDADD =)/$1 \$(ALL_LIBS) /' src/Makefile
 %{_datadir}/rrdtool/examples/*.pl
 %{_datadir}/rrdtool/examples/rrdcached/RRDCached.pm
 %{_datadir}/rrdtool/examples/rrdcached/rrdcached-size.pl
+%{_mandir}/man3/RRD?.3pm*
 
 %files -n python-rrdtool
 %defattr(-,root,root)
+%doc bindings/python/AUTHORS bindings/python/COPYING bindings/python/README
 %{python_sitearch}/py_rrdtool-*-py*.egg-info
 %{python_sitearch}/rrdtoolmodule.so
 
+%files -n ruby-rrdtool
+%defattr(-,root,root,-)
+%doc bindings/ruby/README
+%{ruby_vendorarchdir}/RRD.so
+
 %changelog
+* Mon Jan  5 2015 Ryoichi INAGAKI <ryo1@toki.waseda.jp> 1.4.9-1
+- new upstream release.
+- added Group tag to subpackages
+- added ruby subpackages
+- split documents into subpackages
+- added %%post and %%postun section
+
 * Tue Jul  1 2014 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.4.8-1
 - new upstream release.