updated: dovecot, fuse, openobex, scim-bridge

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

d/dovecot/dovecot-vl.spec

@@ -1,8 +1,8 @@
 Summary: Dovecot Secure imap server
 Summary(ja): Dovecot セキュア IMAP サーバ
 Name: dovecot
-Version: 1.2.3
-Release: 1%{?_dist_release}
+Version: 1.2.10
+Release: 2%{?_dist_release}
 License: MIT and LGPLv2 and BSD with advertising
 Group: System Environment/Daemons
 
@@ -12,7 +12,7 @@ Group: System Environment/Daemons
 %define build_ldap 1
 
 %define build_sieve 1
-%define sieve_version 1.1.6
+%define sieve_version 1.1.8
 %define sieve_name dovecot-sieve
 
 %define build_drac 1
@@ -44,6 +44,7 @@ Distribution: Vine Linux
 
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: openssl-devel, pam-devel, zlib-devel
+BuildRequires: bzip2-devel, libcap-devel
 BuildRequires: libtool autoconf automake, gettext-devel
 # Package includes an initscript service file, 
 # needs to require initscripts package
@@ -287,7 +288,7 @@ find $RPM_BUILD_ROOT%{_libdir}/%{name}/ -name '*.la' | xargs rm -f
 (
     find ${RPM_BUILD_ROOT}%{_libdir}/%{name} -type d | sed -e "s|^|%dir |";
     find ${RPM_BUILD_ROOT}%{_libdir}/%{name} -! -type d | \
-        grep -v 'dovecot-config\|lib90_cmusieve_plugin\.so\|libdriver_.*\.so\|libauthdb_.*\.so\|libmech_.*\.so';
+        grep -v 'dovecot-config\|lib90_cmusieve_plugin\.so\|libdriver_.*\.so\|libauthdb_.*\.so\|libmech_.*\.so\|drac\.so';
 ) | sed -e "s|$RPM_BUILD_ROOT||" >libs.filelist
 
 
@@ -399,6 +400,20 @@ fi
 
 
 %changelog
+* Mon Jan 25 2010 Satoshi IWAMOTO <satoshi.iwamoto@nifty.ne.jp> 1.2.10-2
+- fix drac.so in libs.files
+
+* Mon Jan 25 2010 Satoshi IWAMOTO <satoshi.iwamoto@nifty.ne.jp> 1.2.10-1
+- new upstream release 
+
+* Fri Jan  8 2010 Satoshi IWAMOTO <satoshi.iwamoto@nifty.ne.jp> 1.2.9-1
+- new upstream release
+- update to dovecot sieve 1.1.8
+
+* Thu Sep 17 2009 Satoshi IWAMOTO <satoshi.iwamoto@nifty.ne.jp> 1.2.3-2
+- update to dovecot sieve 1.1.7 to fix BoF
+- add BR: bzip2-devel, libcap-devel
+
 * Mon Aug 10 2009 Satoshi IWAMOTO <satoshi.iwamoto@nifty.ne.jp> 1.2.3-1
 - new upstream release
 

f/fuse/fuse-vl.spec

@@ -2,7 +2,7 @@ Summary:        File System in Userspace (FUSE) utilities
 Summary(ja):	ユーザスペースファイルシステム(FUSE)用のユーティリティ
 Name:           fuse
 Version:        2.7.4
-Release:        2%{?_dist_release}
+Release:        3%{?_dist_release}
 
 Group:          System Environment/Base
 License:        GPL
@@ -12,6 +12,9 @@ Source0:        http://dl.sourceforge.net/sourceforge/fuse/%{name}-%{version}.ta
 Source1:	fuse-udev.nodes
 Source2:	fuse-makedev.d-fuse
 Patch0:		fuse-udev_rules.patch
+## security fix patch(es)
+# from Debian 5.0 fuse_2.7.4-1.1+lenny1
+Patch10:    	001-CVE-2009-3297.dpatch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-root
 Requires(pre):	shadow-utils
@@ -47,6 +50,7 @@ pgk-config) to develop FUSE based applications/filesystems.
 #disable device creation during build/install
 sed -i 's|mknod|echo Disabled: mknod |g' util/Makefile.in
 %patch0 -b .patch0
+%patch10 -p1 -b .CVE-2009-3297
 
 %build
 %configure \
@@ -111,6 +115,10 @@ fi
 
 
 %changelog
+* Mon Mar  1 2010 IWAI, Masaharu <iwai@alib.jp> 2.7.4-3
+- SECURITY FIX: CVE-2009-3297
+  - patch from Debian 5.0 fuse_2.7.4-1.1+lenny1 (Patch10)
+
 * Mon Jun 15 2009 Daisuke SUZUKI <daisuke@linux.or.jp> 2.7.4-2
 - update Source2 and Patch0
   - change udev rules to create /dev/fuse with mode 0666, group root.

o/openobex/openobex-vl.spec

@@ -2,7 +2,7 @@ Summary: Library for using OBEX
 Summary(ja): OBEXを利用するためのオープンライブラリです
 Name: openobex
 Version: 1.3
-Release: 14%{?_dist_release}
+Release: 15%{?_dist_release}
 License: GPLv2+
 Group: System Environment/Libraries
 URL: http://openobex.sourceforge.net
@@ -16,13 +16,11 @@ Patch4: openobex-1.3-utf.patch
 Patch5: openobex-1.3-ircp.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
-#----------------------------------------------------------------------------
-
-BuildRequires: autoconf >= 2.57
-BuildRequires: bluez-libs-devel
-BuildRequires: sed, libusb-devel
-BuildRequires: automake, autoconf, libtool
-ExcludeArch: s390 s390x
+BuildRequires:	autoconf >= 2.57
+BuildRequires:	bluez-libs-devel
+BuildRequires:	sed, libusb-devel
+BuildRequires:	automake, autoconf, libtool
+ExcludeArch:	s390 s390x
 
 #----------------------------------------------------------------------------
 %description
@@ -44,7 +42,9 @@ Summary: Files for development of applications which will use OBEX
 Summary(ja): OBEX アプリ開発用ライブラリとヘッダーファイル
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release} 
-Requires: bluez-libs-devel libusb-devel pkgconfig
+Requires: bluez-libs-devel
+Requires: libusb-devel
+Requires: pkgconfig
 
 %description devel
 Header files for development of applications which use OpenOBEX.
@@ -58,8 +58,7 @@ Open OBEX を使用するアプリケーションを開発するためのヘッ
 %package apps
 Summary: Applications for using OBEX
 Summary(ja): OBEX を使ったアプリケーション
-Group: System Environment/Libraries
-
+Group: Applications/Accessories
 
 %description apps
 Open OBEX Applications to exchange all kind of objects like files, pictures,
@@ -97,12 +96,10 @@ rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-#----------------------------------------------------------------------------
 %post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
 
-#----------------------------------------------------------------------------
 %files
 %defattr(-, root, root)
 %doc AUTHORS COPYING COPYING.LIB ChangeLog README 
@@ -132,6 +129,11 @@ rm -rf $RPM_BUILD_ROOT
 #
 #----------------------------------------------------------------------------
 %changelog
+* Mon Nov  7 2009 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 1.3-15
+- for <BTS:847>
+  - fixed %postun section
+  - changed apps Group to Applications/Accessories
+
 * Fri Oct 24 2008 Seiichirou Babasaki 1.3-14
 - added "# Maintainers: " comments.
 - changed UTF-8 encode at bluez-gnome.vs.spec

s/scim-bridge/scim-bridge-vl.spec

@@ -1,19 +1,32 @@
 %define name scim-bridge
 %define version 0.4.16
-%define release 7%{?_dist_release}
+%define release 8%{?_dist_release}
 
 # build qt3 immodule ("--without qt3" to disable qt3)
 %bcond_without qt3
-%define qt3ver %(rpm -q --queryformat '%%{version}' qt)
-%define qt3rel %(rpm -q --queryformat '%%{release}' qt)
-%define qt3dir %{_libdir}/qt-%{qt3ver}
+# ugly hack for Qt3 version auto-detection -- inagaki
+%define _qt3_notfound %(eval "rpm -q qt-devel > /dev/null"; echo $?)
+%if %{_qt3_notfound}
+%define _qt3_version 3.3.8
+%else
+%define _qt3_version %(rpm -q --queryformat "%%{version}" qt-devel)
+%endif
+%define _qt3_prefix  %{_libdir}/qt-%{_qt3_version}
+%define _qt3_plugindir %{_qt3_prefix}/plugins
 
 # build qt4 immodule ("--without qt4" to disable qt4)
 %bcond_without qt4
-%define qt4ver %(rpm -q --queryformat '%%{version}' qt4)
-%define qt4rel %(rpm -q --queryformat '%%{release}' qt4)
-%define _qt4_prefix %(pkg-config --variable prefix Qt)
-%define _qt4_plugindir %(pkg-config --variable plugindir Qt)
+# ugly hack for Qt4 version auto-detection -- inagaki
+%define _qt4_notfound %(eval "pkg-config --exists Qt"; echo $?)
+%if %{_qt4_notfound}
+%define _qt4_version 4.6.1
+%define _qt4_prefix  %{_libdir}/qt-%{_qt4_version}
+%define _qt4_plugindir %{_qt4_prefix}/plugins
+%else
+%define _qt4_version %(pkg-config --modversion --silence-errors Qt)
+%define _qt4_prefix %(pkg-config --variable prefix --silence-errors Qt)
+%define _qt4_plugindir %(pkg-config --variable plugindir --silence-errors Qt)
+%endif
 
 Summary: yet another IM client of SCIM
 Summary(ja): もう一つ別の SCIM IM クライアント
@@ -35,13 +48,15 @@ Patch4: scim-bridge-0.4.15-EOF.patch
 
 Patch5: scim-bridge-0.4.15-hotkey-help.patch
 
-Url: http://www.scim-im.org/projects/scim_bridge
+URL: http://www.scim-im.org/projects/scim_bridge
 License: GPL/LGPL
 Group: System Environment/Libraries
-BuildRoot: %{_tmppath}/%{name}-%{version}-buildroot
+BuildRoot: %{_tmppath}/%{name}-%{version}-root
 Prefix: %{_prefix}
 Requires: scim >= 1.4
-BuildRequires: scim-devel >= 1.4 pkgconfig >= 0.9.0, gtk2-devel >= 2.14.0
+BuildRequires: scim-devel >= 1.4
+BuildRequires: pkgconfig >= 0.9.0
+BuildRequires: gtk2-devel >= 2.14.0
 
 %description
 Scim-bridge is yet another IM client of SCIM.
@@ -57,7 +72,8 @@ Summary(ja):    SCIM Bridge GTK IM モジュール
 Group:          System Environment/Libraries
 Requires:       %{name} = %{version}-%{release}
 Requires:       gtk2 >= 2.14.0
-PreReq:         gtk2 >= 2.14.0
+Requires(post): gtk2 >= 2.14.0
+Requires(postun): gtk2 >= 2.14.0
 Obsoletes:      %{name} <= 0.1.7
 
 %description gtk
@@ -72,9 +88,8 @@ Summary:        SCIM Bridge Qt IM Module
 Summary(ja):    SCIM Bridge Qt IM モジュール
 Group:          System Environment/Libraries
 Requires:       %{name} = %{version}-%{release}
-#Requires:       qt = %{qt3ver}-%{qt3rel}
-Requires:       qt = %{qt3ver}
-BuildRequires:  qt-devel >= %{qt3ver}-%{qt3rel}
+Requires:       qt = %{_qt3_version}
+BuildRequires:  qt-devel 
 
 %description qt
 This package provides the SCIM Bridge Qt IM module.
@@ -89,9 +104,8 @@ Summary:        SCIM Bridge Qt4 IM Module
 Summary(ja):    SCIM Bridge Qt4 IM モジュール
 Group:          System Environment/Libraries
 Requires:       %{name} = %{version}-%{release}
-#Requires:       qt4 = %{qt4ver}-%{qt4rel}
-Requires:       qt4 = %{qt4ver}
-BuildRequires:  qt4-devel >= %{qt4ver}-%{qt4rel}
+Requires:       qt4 = %{_qt4_version}
+BuildRequires:  qt4-devel
 
 %description qt4
 This package provides the SCIM Bridge Qt4 IM module.
@@ -111,7 +125,7 @@ This package provides the SCIM Bridge Qt4 IM module.
 
 %build
 %if !%{without qt3}
-export QT3_PREFIX=%{qt3dir}
+export QT3_PREFIX=%{_qt3_prefix}
 %endif
 %if !%{without qt4}
 export QT4_PREFIX=%{_qt4_prefix}
@@ -139,7 +153,7 @@ export QT4_PREFIX=%{_qt4_prefix}
 
 # remove unneeded files
 %__rm -f %{buildroot}%{_libdir}/gtk-2.0/immodules/*.{a,la}
-%__rm -f %{buildroot}%{qt3dir}/plugins/inputmethods/*.{a,la}
+%__rm -f %{buildroot}%{_qt3_plugindir}/inputmethods/*.{a,la}
 %__rm -f %{buildroot}%{_qt4_plugindir}/inputmethods/*.{a,la}
 
 %clean
@@ -163,7 +177,7 @@ export QT4_PREFIX=%{_qt4_prefix}
 %if !%{without qt3}
 %files qt
 %defattr(-,root,root)
-%{qt3dir}/plugins/inputmethods/*.so
+%{_qt3_plugindir}/inputmethods/*.so
 %endif
 
 %if !%{without qt4}
@@ -173,6 +187,9 @@ export QT4_PREFIX=%{_qt4_prefix}
 %endif
 
 %changelog
+* Sun Jan 31 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 0.4.16-8
+- updated Qt version detection macros to build properly
+
 * Fri Jan 22 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 0.4.16-7
 - rebuilt with qt4-4.6.1