eog-plugins,perl-Net_SSLeay,hdf5: new upstream release, others: rebuild with openssl-1.0.0c

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

c/cyrus-imapd/cyrus-imapd-vl.spec

@@ -1,6 +1,6 @@
 Name:			cyrus-imapd
 Version:		2.2.13p1
-Release:		6%{?_dist_release}
+Release:		7%{?_dist_release}
 
 # ********************** BUILD TIME OPTIONS START **********************
 
@@ -753,6 +753,9 @@ fi
 %{_mandir}/man1/*
 
 %changelog
+* Sun Feb 06 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.2.13p1-7
+- rebuild with openssl-1.0.0c
+
 * Tue Sep  7 2010 IWAI, Masaharu <iwai@alib.jp> 2.2.13p1-6
 - fix libdir path in init script for x86_64 arch: <BTS:VineLinux:918>
  - update sed oneliner in install section

d/dar/dar-vl.spec

@@ -2,7 +2,7 @@ Name:           dar
 Summary:        Disk ARchive: Backup directory tree and files
 Summary(ja):    ディスクアーカイブ: ディレクトリツリーとファイルをバックアップ
 Version:        2.3.10
-Release:        1%{?_dist_release}
+Release:        2%{?_dist_release}
 
 Group:          Applications/Archiving
 License:        GPLv2+
@@ -109,6 +109,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Feb 06 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> - 2.3.10-2
+- rebuild with openssl-1.0.0c
+
 * Sun Oct 10 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> - 2.3.10-1
 - Initial build for VineLinux
 

e/eog-plugins/eog-plugins-vl.spec

@@ -1,5 +1,5 @@
-%define pkg_version 2.30.1
-%define pkg_release 2%{?_dist_release}
+%define pkg_version 2.30.2
+%define pkg_release 1%{?_dist_release}
 
 Summary: Plugins for eog
 Summary(ja): eog用のプラグイン
@@ -20,7 +20,7 @@ Requires: pygtk2
 Requires: libexif
 Requires: libchamplain, libchamplain-gtk
 BuildRequires: gtk2-devel
-BuildRequires: eog
+BuildRequires: eog-devel
 BuildRequires: pygobject-devel
 BuildRequires: gnome-python-devel
 BuildRequires: pygtk2-devel
@@ -73,6 +73,10 @@ Eye of GNOME イメージビューア用のプラグイン集
 
 
 %changelog
+* Sun Feb 06 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.30.2-1
+- new upstream release
+- change BuildRequires: eog-devel instead of eog
+
 * Sat Oct 05 2010 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.30.1-2
 - rebuild with libchamplain-0.8
 

h/hdf5/hdf5-vl.spec

@@ -1,11 +1,11 @@
 Name: hdf5
-Version: 1.6.6
-Release: 2%{?_dist_release}
+Version: 1.6.10
+Release: 1%{?_dist_release}
 Summary: A general purpose library and file format for storing scientific data
 License: BSD
 Group: System Environment/Libraries
 URL: http://www.hdfgroup.org/HDF5/
-Source0: ftp://ftp.hdfgroup.org/HDF5/current/src/%{name}-%{version}.tar.gz
+Source0: ftp://ftp.hdfgroup.org/HDF5/current/src/%{name}-%{version}.tar.bz2
 Patch1: hdf5-1.6.4-destdir.patch
 Patch2: hdf5-1.6.4-norpath.patch
 Patch3: hdf5-1.6.6-tail.patch
@@ -14,7 +14,7 @@ Patch7: hdf5-1.6.5-x86_64.patch
 Patch8: hdf5-1.6.5-sort.patch
 Patch10: hdf5-1.6.5-open.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
-BuildRequires: openssl-devel, zlib-devel, gcc-gfortran, time
+BuildRequires: zlib-devel, gcc-gfortran, time
 
 %description
 HDF5 is a general purpose library and file format for storing scientific data.
@@ -35,13 +35,13 @@ HDF5 development headers and libraries.
 
 %prep
 %setup -q
-%patch1 -p1 -b .destdir
+#%patch1 -p1 -b .destdir
 %patch2 -p1 -b .norpath
-%patch3 -p1 -b .tail
+#%patch3 -p1 -b .tail
 %patch5 -p1 -b .ppc
 %patch7 -p1 -b .x86_64
 %patch8 -p1 -b .sort
-%patch10 -p1 -b .open
+#%patch10 -p1 -b .open
 
 
 %build
@@ -103,6 +103,11 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Feb 06 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.6.10-1
+- new upstream release
+- drop Patch1,3,10
+- remove BuildRequires: openssl-devel
+
 * Tue Oct 14 2008 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 1.6.6-2
 - applied new versioning policy
 

h/hostapd/hostapd-vl.spec

@@ -1,5 +1,5 @@
 %define pkg_version 0.5.11
-%define pkg_release 1%{?_dist_release}
+%define pkg_release 2%{?_dist_release}
 
 Summary:     IEEE 802.11 AP, IEEE 802.1X/WPA/WPA2/EAP/RADIUS Authenticator
 Name:        hostapd
@@ -21,7 +21,7 @@ Prism54 drivers) and FreeBSD (net80211).
 
 %prep
 %setup -q -n %{name}-%{version}
-%patch -p1
+%patch0 -p1
 
 %build
 %{__make}
@@ -56,6 +56,9 @@ fi
 %attr(0755, root, root) %{_sysconfdir}/rc.d/init.d/hostapd
 
 %changelog
+* Sun Feb 06 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.5.11-2
+- rebuild with openssl-1.0.0c
+
 * Mon Jan 05 2009 Masahiro INOUE <miyabi.-.inoue@nifty.com> 0.5.11-1
 - new upstream release
 

i/ipsec-tools/ipsec-tools-vl.spec

@@ -1,6 +1,6 @@
 Name: ipsec-tools
 Version: 0.6.7
-Release: 1%{?_dist_release}
+Release: 2%{?_dist_release}
 Summary: Tools for configuring and using IPsec
 Summary(ja): IPsecツール
 License: BSD
@@ -121,6 +121,9 @@ rm -rf $RPM_BUILD_ROOT
 %config(noreplace) %{_sysconfdir}/ipsec.conf
 
 %changelog
+* Sun Feb 06 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.6.7-2
+- rebuild with openssl-1.0.0c
+
 * Sun Sep 28 2008 Shu KONNO <owa@bg.wakwak.com> 0.6.7-1vl5
 - applied new versioning policy, spec in utf-8
 

l/lighttpd/lighttpd-vl.spec

@@ -4,7 +4,7 @@ Summary: Lightning fast webserver with light system requirements
 Summary(ja): 少ないシステムリソースで動く超高速なウェブサーバ
 Name: lighttpd
 Version: 1.4.22
-Release: 1%{?_dist_release}
+Release: 2%{?_dist_release}
 License: BSD
 Group: System Environment/Daemons
 URL: http://www.lighttpd.net/
@@ -182,6 +182,9 @@ fi
 
 
 %changelog
+* Sun Feb 06 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.4.22-2
+- rebuild with openssl-1.0.0c
+
 * Fri Jun 05 2009 Daisuke SUZUKI <daisuke@linux.or.jp> 1.4.22-1
 - new upstream release
 - build with lua, add BR: lua-devel

l/lynx/lynx-vl.spec

@@ -4,7 +4,7 @@ Summary: A text-based Web browser.
 Summary(ja): テキストベースのウェブブラウザ
 Name: lynx
 Version: 2.8.6
-Release: 1%{?_dist_release}
+Release: 2%{?_dist_release}
 License: GPL
 Group: Applications/Internet
 URL: http://lynx.isc.org/
@@ -107,6 +107,9 @@ rm -rf %{buildroot}
 #%lang(ja) %config %{_sysconfdir}/lynx.cfg.ja
 
 %changelog
+* Sun Feb 06 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.8.6-2
+- rebuild with openssl-1.0.0c
+
 * Sat Jul 26 2008 Shu KONNO <owa@bg.wakwak.com> 2.8.6-1vl5
 - applied new versioning policy and spec in utf-8
 

n/netatalk/netatalk-vl.spec

@@ -4,20 +4,16 @@
 Summary:       AppleTalk and AppleShare/IP services for Linux
 Summary(ja):   Linux 用 AppleTalk, AppleShare/IP サービス
 Name:          netatalk
-Version:       2.0.5
-Release:       1%{_dist_release}
-License:       GPL
+Version:       2.1.3
+Release:       3%{_dist_release}
+License:       GPLv2+
 Group:         System Environment/Daemons
 Source0:       %{name}-%{version}.tar.bz2
 URL:           http://netatalk.sourceforge.net/
 Obsoletes:     netatalk-1.4b2+asun
 
-# taken from http://www003.upp.so-net.ne.jp/hat/netatalk/cjk.html
-#Patch10:       netatalk-2.0.3-cjk-6.patch.gz
-
 # patch for default config file
-Patch11:       netatalk-2.0.4-config-eucjp.patch
-Patch12:       netatalk-2.0.4-config-utf8.patch
+Patch10:       netatalk-2.1.3-config-utf8.patch
 
 # other patches
 #Patch13:       netatalk-2.0.3-db43.patch
@@ -27,7 +23,7 @@ Source10:      afpd.service
 
 
 ############################################################## REQUIREMENTS
-PreReq:        chkconfig, /sbin/ldconfig, grep, textutils
+Requires(pre): chkconfig, /sbin/ldconfig, grep, textutils
 Requires:      cracklib, openssl, tcp_wrappers, pam, perl
 BuildRequires: openssl-devel, pam-devel, cups-devel, db4-devel, quota
 
@@ -35,46 +31,34 @@ BuildRoot:     %{_tmppath}/%{name}-%{version}-root
 
 
 %description
-Netatalk is a freely-available, kernel level implementation of the
-AppleTalk Protocol Suite, originally for BSD-derived systems.
-A *NIX/*BSD system running netatalk is capable of serving many macintosh
-clients simultaneously as an AppleTalk router, AppleShare file server (AFP),
-*NIX/*BSD print server, and for accessing AppleTalk printers via Printer
-Access Protocol (PAP).
+Netatalk is a freely-available Open Source AFP fileserver. It also provides a
+kernel level implementation of the AppleTalk Protocol Suite. A *NIX/*BSD system
+running Netatalk is capable of serving many Macintosh clients simultaneously
+as an AppleShare file server (AFP), AppleTalk router, *NIX/*BSD print server,
+and for accessing AppleTalk printers via Printer Access Protocol (PAP).
+Included are a number of minor printing and debugging utilities.
 
 %description -l ja
 このパッケージを使うことで, Linux 上で AppleTalk プロトコルを
 扱うことができ, Macintosh と通信が可能になります.
-Linux 上で EtherTalk や AppleTalk over IP の Mac 向けファイルサーバを
+Linux 上で AppleTalk や AFP over TCP の Mac 向けファイルサーバを
 稼働させることができるデーモンプログラムが収められています.
 
 
 %package devel
 Group:         Development/Libraries
-Summary:       Appletalk and Appleshare/IP services for Linux development files
-Summary(ja):   Linux 用 AppleTalk と Appleshare/IP サービスの開発用ファイル
+Summary:       Headers for AppleTalk development
+Summary(ja):   AppleTalk 開発用ヘッダファイル
 
 %description devel
-Netatalk is a freely-available, kernel level implementation of the
-AppleTalk Protocol Suite, originally for BSD-derived systems.
-A *NIX/*BSD system running netatalk is capable of serving many macintosh
-clients simultaneously as an AppleTalk router, AppleShare file server (AFP),
-*NIX/*BSD print server, and for accessing AppleTalk printers via Printer
-Access Protocol (PAP).
-
-This package is required for developing appletalk-based applications.
+This package contains the header files for building AppleTalk networking
+programs.
 
 
 %prep
 %setup -q
 
-#%patch10 -p1 -b .cjk
-
-%if %{?_dist_release}=="vl4"
-%patch11 -p1 -b .cjk-config
-%else
-%patch12 -p1 -b .cjk-config
-%endif
+%patch10 -p1 -b .cjk-config
 
 #%patch13 -p1 -b .db43
 #%patch14 -p1 -b .newerdb
@@ -108,7 +92,6 @@ CFLAGS="${RPM_OPT_FLAGS} -fomit-frame-pointer -fsigned-char" \
 	--with-uams-path=%{_libdir}/netatalk \
 	--with-spooldir=%{_var}/spool/netatalk \
 	--enable-redhat \
-	--with-flock-locksi \
 	--with-cracklib \
 	--with-pam \
 	--with-shadow \
@@ -128,10 +111,6 @@ make DESTDIR=$RPM_BUILD_ROOT install
 ## netatalk/at.h is now provided by glibc
 rm -f $RPM_BUILD_ROOT%{_prefix}/include/netatalk/at.h
 
-## acleandir.rc requires /usr/bin/rc. move it.
-mv $RPM_BUILD_ROOT%{_bindir}/acleandir.rc .
-chmod 644 acleandir.rc
-
 ## for Bonjour (requires nss-mdns)
 install -d -m 755 ${RPM_BUILD_ROOT}%{_sysconfdir}/avahi/services
 install -m 644 %{SOURCE10} ${RPM_BUILD_ROOT}%{_sysconfdir}/avahi/services/
@@ -150,23 +129,23 @@ exit 0
 %post
 
 ### RUN CHKCONFIG ###
-/sbin/chkconfig --add atalk
+/sbin/chkconfig --add netatalk
 
 /sbin/ldconfig
 
 if test -r /var/lock/atalkd ; then
-	/etc/rc.d/init.d/atalk restart >&2
+	/etc/rc.d/init.d/netatalk restart >&2
 fi
 
 
 %preun
 
 ### RUN CHKCONFIG ###
-/sbin/chkconfig --del atalk
+/sbin/chkconfig --del netatalk
 
 
 %triggerpostun -- netatalk <= 1.4b2+asun2.1.3-7vl6
-/sbin/chkconfig --add atalk
+/sbin/chkconfig --add netatalk
 
 
 %clean
@@ -177,11 +156,11 @@ rm -rf ${RPM_BUILD_ROOT}
 %defattr(-,root,root)
 %doc CONTRIBUTORS COPYING COPYRIGHT
 %doc NEWS README* TODO
-%doc acleandir.rc doc/[A-L,N-Z]*
+%doc doc/[A-L,N-Z]*
 %config(noreplace) /etc/netatalk/Apple*
 %config(noreplace) /etc/netatalk/*.conf
 %config /etc/pam.d/netatalk
-%config /etc/rc.d/init.d/atalk
+%config /etc/rc.d/init.d/netatalk
 %dir %{_sysconfdir}/netatalk
 %dir %{_sysconfdir}/netatalk/msg
 %{_sysconfdir}/avahi/services/afpd.service
@@ -209,6 +188,16 @@ rm -rf ${RPM_BUILD_ROOT}
 
 
 %changelog
+* Sun Feb 06 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> - 2.1.3-3
+- rebuild with openssl-1.0.0c
+
+* Sun Jul 25 2010 MATSUBAYASHI Kohji <shaolin@vinelinux.org> - 2.1.3-2
+- fix Patch10 & update description - upon HAT-san's suggestions
+
+* Sun Jul 25 2010 MATSUBAYASHI Kohji <shaolin@vinelinux.org> - 2.1.3-1
+- new upstream release
+- update Vine patch
+
 * Thu Feb 11 2010 MATSUBAYASHI Kohji <shaolin@vinelinux.org> - 2.0.5-1
 - new upstream release
 

o/openvpn/openvpn-vl.spec

@@ -4,7 +4,7 @@
 
 Name:              openvpn
 Version:           2.1.3
-Release:           1%{?_dist_release}
+Release:           2%{?_dist_release}
 Summary:           A full-featured SSL VPN solution
 Summary(ja):       SSL VPN ソリューション
 License:           GPLv2
@@ -161,6 +161,9 @@ fi
 %config %dir %{_sysconfdir}/%{name}/
 
 %changelog
+* Sun Feb 06 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.1.3-2
+- rebuild with openssl-1.0.0c
+
 * Sun Aug 29 2010 Daisuke SUZUKI <daisuke@linux.or.jp> 2.1.3-1
 - new upstream release
 

p/perl-Net_SSLeay/perl-Net_SSLeay-vl.spec

@@ -3,13 +3,14 @@
 Summary: Perl module for using OpenSSL via Network
 Summary(ja): OpenSSL を Network にて用いる為の perl モジュール
 Name: perl-Net_SSLeay
-Version: 1.35
+Version: 1.36
 Release: 1%{?_dist_release}
 License: BSDish
 Group: Development/Libraries
 Source0: ftp://ftp.cpan.org/pub/CPAN/modules/by-module/Net/%{real_name}-%{version}.tar.gz
 Source1: COPYRIGHT.SSLeay-0.9.0
-BuildPreReq: perl, openssl >= 0.9.6b
+BuildRequires: perl, openssl-devel >= 0.9.6b
+BuildRequires: zlib-devel
 Requires: perl, openssl >= 0.9.6b
 Buildroot: %{_tmppath}/%{name}-%{version}-root
 
@@ -93,6 +94,11 @@ rm -rf %{buildroot}
 #%dir %{perl_vendorarch}/Net/SSLeay
 
 %changelog
+* Sun Feb 06 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.36-1
+- new upstream release
+- change BuildRequires: openssl-devel instead of openssl
+- add BuildRequires: zlib-devel
+
 * Wed Jul  8 2009 Satoshi IWAMOTO <satoshi.iwamoto@nifty.ne.jp> 1.35-1
 - new upstream release
 

p/pysvn/pysvn-vl.spec

@@ -2,7 +2,7 @@
 
 Name:           pysvn
 Version:        1.7.0
-Release:        2%{?_dist_release}
+Release:        3%{?_dist_release}
 Summary:        Pythonic style bindings for Subversion
 Summary(ja):	Subversion 用の python バインディング
 Group:          Development/Languages
@@ -59,6 +59,9 @@ CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py configure --enable-debug --verbose
 %{python_sitearch}/%{name}
 
 %changelog
+* Sun Feb 06 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.7.0-3
+- rebuild with openssl-1.0.0c
+
 * Sun Feb 14 2010 Kazutaka HARADA <kazutaka@vinelinux.org> 1.7.0-2
 - rebuild with python-2.6 (Seed only)
 

s/starttls/starttls-vl.spec

@@ -6,7 +6,7 @@ Summary: The starttls provides STARTTLS extensions for emacs.
 Summary(ja): emacs 用の STARTTLS 拡張パッケージ
 Name: starttls
 Version: 0.9
-Release: 1%{?_dist_release}
+Release: 2%{?_dist_release}
 Source: starttls-%{version}.tar.gz
 URL: ftp://ftp.opaopa.org/pub/elisp/
 License: GPL
@@ -17,7 +17,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-root
 Prefix: %{_prefix}
 
 Requires: emacs, openssl
-BuildPrereq: emacs, openssl-devel
+BuildRequires: emacs, openssl-devel
 
 
 %description
@@ -74,6 +74,9 @@ rm -rf ${RPM_BUILD_ROOT}
 # ----------------------------------------------------------
 
 %changelog
+* Sun Feb 06 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.9-2
+- rebuild with openssl-1.0.0c
+
 * Sat Oct 11 2008 Shu KONNO <owa@bg.wakwak.com> 0.9-1vl5
 - applied new versioning policy, spec in utf-8
 

u/uw-imap/uw-imap-vl.spec

@@ -6,7 +6,7 @@ Summary: UW Server daemons for IMAP and POP network mail protocols
 Summary(ja): IMAP/POP ネットワークメールプロトコル用デーモン
 Name:	 uw-imap 
 Version: 2007e
-Release: 1%{?_dist_release}
+Release: 2%{?_dist_release}
 
 # See LICENSE.txt, http://www.apache.org/licenses/LICENSE-2.0
 License: ASL 2.0
@@ -49,12 +49,10 @@ Patch10: imap-2002e-authmd5.patch
 
 BuildRequires: openssl-devel
 BuildRequires: pam-devel
-%if %{?_dist_release} == "vl5"
 BuildRequires: krb5-devel
-%endif
 
 # Prereq is shorter than separate Requires, Requires(post), Requires(postun)
-Prereq: xinetd
+Requires(pre): xinetd
 Requires(post): openssl
 Requires: %{imap_libs} = %{version}-%{release}
 
@@ -124,11 +122,9 @@ install -p -m644 %{SOURCE21} imap.pam
 
 %build
 # Kerberos setup
-%if %{?_dist_release} == "vl5"
 test -f %{_sysconfdir}/profile.d/krb5-devel.sh && source %{_sysconfdir}/profile.d/krb5-devel.sh
 test -f %{_sysconfdir}/profile.d/krb5.sh && source %{_sysconfdir}/profile.d/krb5.sh
 GSSDIR=$(krb5-config --prefix)
-%endif
 
 # SSL setup, probably legacy-only, but shouldn't hurt -- Rex
 export EXTRACFLAGS="$EXTRACFLAGS $(pkg-config --cflags openssl 2>/dev/null)"
@@ -136,20 +132,14 @@ export EXTRACFLAGS="$EXTRACFLAGS $(pkg-config --cflags openssl 2>/dev/null)"
 export EXTRACFLAGS="$EXTRACFLAGS $RPM_OPT_FLAGS"
 # jorton added these, I'll assume he knows what he's doing. :) -- Rex
 export EXTRACFLAGS="$EXTRACFLAGS -fno-strict-aliasing"
-%if %{?_dist_release} == "vl5"
 export EXTRACFLAGS="$EXTRACFLAGS -Wno-pointer-sign"
-%endif
 
 echo "y" | \
 make %{?_smp_mflags} lnp \
 EXTRACFLAGS="$EXTRACFLAGS" \
 EXTRALDFLAGS="$EXTRALDFLAGS" \
-%if %{?_dist_release} == "vl5"
 EXTRAAUTHENTICATORS=gss \
 SPECIALS="GSSDIR=${GSSDIR} LOCKPGM=%{_sbindir}/mlock SSLCERTS=%{sslcerts} SSLDIR=%{_datadir}/ssl SSLINCLUDE=%{_includedir}/openssl SSLLIB=%{_libdir}" \
-%else
-SPECIALS="LOCKPGM=%{_sbindir}/mlock SSLCERTS=%{sslcerts} SSLDIR=%{_datadir}/ssl SSLINCLUDE=%{_includedir}/openssl SSLLIB=%{_libdir}" \
-%endif
 SSLTYPE=unix \
 CCLIENTLIB=$(pwd)/c-client/%{shlibname} \
 SHLIBBASE=%{soname} \
@@ -285,6 +275,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Feb 06 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2007e-2
+- rebuild with openssl-1.0.0c
+
 * Sat May 16 2009 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 2007e-1
 - new upstream release
 - built with krb5-devel (VineSeed)