Browse Source

new upstream release or rebuild

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@8191 ec354946-7b23-47d6-9f5a-488ba84defc7
Takemikaduchi 9 years ago
parent
commit
759179fbb0

+ 4 - 1
M/MAKEDEV/MAKEDEV-vl.spec

@@ -2,7 +2,7 @@ Summary: A script for creating the device files in /dev.
 Summary(ja): /dev 以下のデバイスファイルを作成するスクリプト
 Name: MAKEDEV
 Version: 3.24
-Release: 3%{?_dist_release}
+Release: 4%{?_dist_release}
 License: GPLv2
 Group: System Environment/Base
 URL: http://www.lanana.org/docs/device-list/
@@ -90,6 +90,9 @@ fi
 %config(noreplace) %{_sysconfdir}/makedev.d
 
 %changelog
+* Wed Jan 15 2014 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.24-4
+- rebuild with VineSeed environment
+
 * Sun Apr 17 2011 Daisuke SUZUKI <daisuke@linux.or.jp> 3.24-3
 - rebuild for Vine 6
 

+ 7 - 1
a/aalib/aalib-vl.spec

@@ -2,7 +2,7 @@ Summary: An ASCII art library.
 Summary(ja): ASCII アートライブラリ
 Name: aalib
 Version: 1.4
-Release: 0.rc5.5%{?_dist_release}
+Release: 0.rc5.6%{?_dist_release}
 Group: System Environment/Libraries
 License: LGPL
 URL: http://aa-project.sourceforge.net/aalib/
@@ -17,6 +17,9 @@ BuildRequires: slang-devel
 BuildRequires: libX11-devel
 BuildRequires: ncurses-devel
 
+Vendor: Project Vine
+Distribution: Vine Linux
+
 %description
 AA-lib is a low level gfx library just as many other libraries are. The
 main difference is that AA-lib does not require graphics device. In
@@ -110,6 +113,9 @@ fi
 %{_mandir}/man3/*
 
 %changelog
+* Wed Jan 15 2014 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.4-0.rc5.6
+- rebuild with VineSeed environment
+
 * Tue Mar 22 2011 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 1.4-0.rc5.5
 - rebuilt with new toolchains
 

+ 8 - 2
a/anacron/anacron-vl.spec

@@ -1,7 +1,7 @@
 Summary: A cron-like program that can run jobs lost during downtime.
 Name: anacron
 Version: 2.3
-Release: 31%{?_dist_release}
+Release: 32%{?_dist_release}
 License: GPL
 Group: System Environment/Base
 Source: ftp://ftp.debian.org/debian/pool/main/a/anacron/%{name}_%{version}.orig.tar.gz
@@ -19,6 +19,9 @@ Requires(preun): chkconfig
 Requires(preun): initscripts
 Requires(postun): initscripts
 
+Vendor: Project Vine
+Distribution: Vine Linux
+
 %description
 Anacron (like `anac(h)ronistic') is a periodic command scheduler.  It
 executes commands at intervals specified in days.  Unlike cron, it
@@ -112,6 +115,9 @@ fi
 %config /etc/cron.weekly/0anacron
 
 %changelog
+* Wed Jan 15 2014 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.3-32
+- rebuild with VineSeed environment
+
 * Wed Apr 13 2011 Daisuke SUZUKI <daisuke@linux.or.jp> 2.3-31
 - fix typo..
 
@@ -222,7 +228,7 @@ fi
 * Mon Jun 26 2000 Preston Brown <pbrown@redhat.com>
 - move initscript to /etc/init.d, fix up post/preun/postun scripts.
 
-* Sun Jun 26 2000 Bernhard Rosenkraenzer <bero@redhat.com>
+* Mon Jun 26 2000 Bernhard Rosenkraenzer <bero@redhat.com>
 - 2.3
 
 * Sun Jun 18 2000 Matt Wilson <msw@redhat.com>

+ 9 - 4
c/crontabs/crontabs-vl.spec

@@ -2,7 +2,7 @@ Summary: Root crontab files used to schedule the execution of programs.
 Summary(ja): root のプログラム実行を予約する crontab ファイル
 Name: crontabs
 Version: 1.10
-Release: 3%{?_dist_release}
+Release: 4%{?_dist_release}
 License: public domain
 Group: System Environment/Base
 Source0: crontab
@@ -12,6 +12,8 @@ Source3: config
 BuildArch: noarch
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
+Vendor: Project Vine
+Distribution: Vine Linux
 
 %description
 The crontabs package contains root crontab files.  Crontab is the
@@ -60,12 +62,15 @@ rm -rf $RPM_BUILD_ROOT
 %dir /etc/cron.daily
 %dir /etc/cron.weekly
 %dir /etc/cron.monthly
-%dir /etc/cron.daily/000-delay.cron
-%dir /etc/cron.weekly/000-delay.cron
-%dir /etc/cron.monthly/000-delay.cron
+/etc/cron.daily/000-delay.cron
+/etc/cron.weekly/000-delay.cron
+/etc/cron.monthly/000-delay.cron
 %config(noreplace) /etc/sysconfig/crontab
 
 %changelog
+* Wed Jan 15 2014 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.10-4
+- rebuild with VineSeed environment
+
 * Wed Apr 13 2011 Daisuke SUZUKI <daisuke@linux.or.jp> 1.10-3
 - rebuild for Vine 6
 

+ 8 - 2
d/daq/daq-vl.spec

@@ -1,4 +1,4 @@
-%define version 0.6.2
+%define version 2.0.1
 
 Summary: Data Acquisition Library
 License: GPLv2
@@ -6,7 +6,7 @@ Group: Libraries/Network
 Name: daq
 Prefix: %{_prefix}
 Provides: daq
-Release: 2%{?_dist_release}
+Release: 1%{?_dist_release}
 Source: daq-%{version}.tar.gz
 URL: http://www.snort.org/
 Version: %{version}
@@ -18,6 +18,9 @@ BuildRequires: libdnet-devel
 BuildRequires: libpcap-devel >= 1.0.0
 BuildRequires: iptables-devel
 
+Vendor: Project Vine
+Distribution: Vine Linux
+
 %description
 Snort 2.9 introduces the DAQ, or Data Acquisition library, for packet I/O.  The
 DAQ replaces direct calls to PCAP functions with an abstraction layer that
@@ -67,6 +70,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed Jan 15 2014 Yoji TOYODA <bsyamato@sea.plala.or.jp> - 2.0.1-1
+- new upstream release
+
 * Sun Mar 18 2012 MATSUBAYASHI Kohji <shaolin@vinelinux.org> - 0.6.2-2
 - fix post and postun scripts
 

+ 9 - 4
d/dia/dia-vl.spec

@@ -11,12 +11,14 @@ Summary: A gtk+ based diagram creation program.
 Summary(ja): Gtk+ ベースのダイアグラム作成プログラム
 Name: dia
 Version: 0.97.2
-Release: 1%{?_dist_release}
+Release: 2%{?_dist_release}
 License: GPL
 Group: Applications/Graphics
 
 Source: http://ftp.gnome.org/pub/GNOME/sources/dia/%{version}/dia-%{version}%{?extraver:-%extraver}.tar.xz
 
+Patch0:	dia-0.97.2-freetype-2.5.x.patch
+
 URL: http://www.gnome.org/projects/dia/
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 Requires(post): desktop-file-utils, scrollkeeper
@@ -52,6 +54,7 @@ Dia は Windows にある 'Visio' に似せて設計されたプログラムで
 
 %prep
 %setup -q -n %{name}-%{version}%{?extraver:-%extraver}
+%patch0 -p1 -b .ft
 
 %build
 %configure --enable-gnome --enable-db2html --with-cairo
@@ -97,11 +100,13 @@ fi
 %{_datadir}/applications/*
 %{_datadir}/mime-info/*
 %{_datadir}/icons/hicolor/*
-%dir %{_datadir}/omf/dia
-%{_datadir}/omf/dia/*
 %{_datadir}/gnome/help/dia
 
 %changelog
+* Wed Jan 15 2014 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.97.2-2
+- rebuild with VineSeed environment
+- add Patch0 (dia-0.97.2-freetype-2.5.x.patch)
+
 * Fri Dec 23 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.97.2-1
 - new upstream release
 
@@ -216,7 +221,7 @@ fi
 * Fri Mar 31 2000  Yasuyuki Furukawa <furukawa@vinelinux.org>
 - updated to 0.84
 
-* Fri Feb 21 2000  Yasuyuki Furukawa <furukawa@vinelinux.org>
+* Mon Feb 21 2000  Yasuyuki Furukawa <furukawa@vinelinux.org>
 - updated Japanese patch
 
 * Fri Feb 18 2000  Yasuyuki Furukawa <furukawa@vinelinux.org>

+ 7 - 1
e/ed/ed-vl.spec

@@ -1,7 +1,7 @@
 Summary: The GNU line editor.
 Summary(ja): GNU ラインエディタ
 Name: ed
-Version: 1.5
+Version: 1.9
 Release: 1%{?_dist_release}
 
 License: GPLv3+
@@ -14,6 +14,9 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-root
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
 
+Vendor: Project Vine
+Distribution: Vine Linux
+
 %description
 Ed is a line-oriented text editor, used to create, display, and modify
 text files (both interactively and via shell scripts).  For most
@@ -75,6 +78,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Jan 15 2014 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.9-1
+- update to 1.9
+
 * Sat Apr 16 2011 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 1.5-1
 - new upstream release
 

+ 7 - 8
g/gftp/gftp-vl.spec

@@ -3,7 +3,7 @@ Summary: A multi-threaded FTP client for the X Window System.
 Summary(ja): X ウィンドウ用マルチスレッド FTP クライアント
 Name: gftp
 Version: 2.0.19
-Release: 3%{?_dist_release}
+Release: 4%{?_dist_release}
 License: GPL
 Group: Applications/Internet
 URL: http://www.gftp.org/
@@ -12,7 +12,6 @@ Source: http://www.gftp.org/%{name}-%{version}.tar.bz2
 Source1: gftp-vine-bookmarks
 Source2: gftp-2.0.19.ja.po
 
-Patch0: gftp-2.0.18-config.patch
 Patch1: gftp-2.0.18-user-dirs.patch
 Patch2: gftp-2.0.19-stropts.patch
 
@@ -45,9 +44,6 @@ gFTP は Gtk+ を用いた X ウィンドウシステム用マルチスレッド
 
 %prep
 %setup -q
-#pushd lib
-#%patch0 -b .config
-#popd
 %patch1 -p1 -b .user-dirs
 %patch2 -p0 -b .stropts
 
@@ -59,7 +55,7 @@ make
 
 %install
 [ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
-%makeinstall
+make install DESTDIR=$RPM_BUILD_ROOT
 %find_lang %name
 
 %clean
@@ -75,6 +71,9 @@ make
 %{_mandir}/man1/gftp.1*
 
 %changelog
+* Wed Jan 15 2014 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.0.19-4
+- rebuild with VineSeed environment
+
 * Tue Jan 11 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.0.19-3
 - add BuildRequires: openssl-devel, ncurses-devel, readline-devel
 
@@ -92,7 +91,7 @@ make
 * Fri Aug 15 2008 Shu KONNO <owa@bg.wakwak.com> 2.0.18-1vl5
 - applied new versioning policy, spec in utf-8
 
-* Fri Feb  9 2008 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 2.0.18-0vl6
+* Sat Feb  9 2008 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 2.0.18-0vl6
 - added Patches from Vine 4.x/updates
   * Wed Jan 23 2008 Satoshi IWAMOTO <satoshi.iwamoto@nifty.ne.jp> 2.0.18-0vl3.1
   - add patch 100 for fix CVE-2007-3961, 3962
@@ -116,7 +115,7 @@ make
 - new upstream release
 - updated ja.po
 
-* Sun Apr  3 2004 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 2.0.17-0vl1
+* Sat Apr  3 2004 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 2.0.17-0vl1
 - new upstream release
 - rebuild with openssl-0.9.7d
 - updated ja.po from http://developer.gnome.org/projects/gtp/status/index.html

+ 7 - 1
lib/liba/libasyncns/libasyncns-vl.spec

@@ -5,13 +5,16 @@ Summary(ja): 非同期ネームサービスライブラリ
 
 Name: libasyncns
 Version: 0.8
-Release: 1%{?_dist_release}
+Release: 2%{?_dist_release}
 Group: System Environment/Libraries
 Source0: http://0pointer.de/lennart/projects/libasyncns/libasyncns-%{version}.tar.gz
 License: LGPLv2+
 Url: http://0pointer.de/lennart/projects/libasyncns/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
+Vendor: Project Vine
+Distribution: Vine Linux
+
 %description
 A small and lightweight library that implements easy to use asynchronous
 wrappers around the libc NSS functions getaddrinfo(), res_query() and related.
@@ -96,6 +99,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Jan 15 2014 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.8-2
+- rebuild with VineSeed environment
+
 * Wed Dec 15 2010 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.8-1
 - new upstream release
 - create compat32-libasyncns sub package

+ 4 - 1
lib/libp/libpcap/libpcap-vl.spec

@@ -1,7 +1,7 @@
 Name: libpcap
 Summary: A system-independent interface for user-level packet capture.
 Summary(ja): ユーザレベルでパケットをキャプチャするインターフェイス
-Version: 1.3.0
+Version: 1.5.3
 Release: 1%{?_dist_release}
 Epoch: 1
 
@@ -105,6 +105,9 @@ rm -rf %{buildroot}
 %{_mandir}/man7/*
 
 %changelog
+* Wed Jan 15 2014 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1:1.5.3-1
+- new upstream release
+
 * Fri Jun 22 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1:1.3.0-1
 - new upstream release
 

+ 4 - 1
nonfree/self-build-mikutter/mikutter-vl.spec

@@ -1,7 +1,7 @@
 Summary:	Simple, powerful and moeful twitter client
 Summary(ja):	至高の Twitter Client
 Name:		mikutter
-Version:	0.2.2.1430
+Version:	0.2.2.1476
 Release:	1%{?_dist_release}
 License:	GPLv3
 Group:		System Environment/Libraries
@@ -83,6 +83,9 @@ update-desktop-database -q &> /dev/null || :
 
 
 %changelog
+* Wed Jan 15 2014 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.2.2.1476-1
+- new upstream release
+
 * Tue Dec 24 2013 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.2.2.1430-1
 - new upstream release
 

+ 4 - 1
nonfree/self-build-mikutter/self-build-mikutter-vl.spec

@@ -5,7 +5,7 @@
 Summary:	Package to automatically build %{pkgname} rpm package
 Summary(ja): 	%{pkgname} の rpm パッケージを自動作成するパッケージ
 Name:		self-build-%{pkgname}
-Version:	0.2.2.1430
+Version:	0.2.2.1476
 Release: 	1%{?_dist_release}
 Source0:	%{pkgname}-vl.spec
 License:	GPLv3
@@ -107,6 +107,9 @@ Client を目指す Twitter Client。
 %{_datadir}/%{name}
 
 %changelog
+* Wed Jan 15 2014 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.2.2.1476-1
+- new upstream release
+
 * Tue Dec 24 2013 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.2.2.1430-1
 - new upstream release
 

+ 5 - 2
p/parted/parted-vl.spec

@@ -4,7 +4,7 @@ Summary: The GNU disk partition manipulation program.
 Summary(ja): ディスクパーティション操作ツール
 Name: parted
 Version: 3.1
-Release: 1%{?_dist_release}
+Release: 2%{?_dist_release}
 License: GPL
 Group: Applications/Administration
 URL: http://www.gnu.org/software/parted/
@@ -112,6 +112,9 @@ fi
 %{_libdir}/pkgconfig/libparted.pc
 
 %changelog
+* Wed Jan 15 2014 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.1-2
+- rebuild with VineSeed environment
+
 * Sun Jul 15 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.1-1
 - new upstream release
 - remove Patch1
@@ -175,7 +178,7 @@ fi
 * Thu Nov 18 2004 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 1.6.16-0vl1
 - new upstream release
 
-* Sat Sep 26 2004 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 1.6.15-0vl1
+* Sun Sep 26 2004 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 1.6.15-0vl1
 - new upstream release
 - added BuildRequires: automake autoconf gettext
 - patches from Fedora development

+ 5 - 2
p/pidgin/pidgin-vl.spec

@@ -17,7 +17,7 @@ Summary:	A GTK+ based multi-protocol instant messaging client
 Summary(ja):	マルチプロトコル対応のインスタントメッセンジャー
 Name:		pidgin
 Version:	2.10.7
-Release:	1%{?_dist_release}
+Release:	2%{?_dist_release}
 License:	GPL
 Group:		Applications/Internet
 URL:		http://pidgin.im/
@@ -332,6 +332,9 @@ fi
 %{_libdir}/pkgconfig/gnt.pc
 
 %changelog
+* Wed Jan 15 2014 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.10.7-2
+- rebuild with VineSeed environment
+
 * Sun Mar 03 2013 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.10.7-1
 - new upstream release
 - update Patch1
@@ -675,7 +678,7 @@ fi
 - upstream release
 - update jp patch, ja.po
 
-* Sun Aug 28 2004 KAUZKI SHIMURA <kazuki@ma.ccnw.ne.jp> 0.82.1-0vl1
+* Sat Aug 28 2004 KAUZKI SHIMURA <kazuki@ma.ccnw.ne.jp> 0.82.1-0vl1
 - upstream release
 - update jp patch, ja.po
 

+ 7 - 1
p/pkgconfig/pkgconfig-vl.spec

@@ -4,7 +4,7 @@ Summary: A tool for determining compilation options.
 Summary(ja): コンパイルオプションを決定するためのツール
 Name: pkgconfig
 Version: 0.28
-Release: 1%{?_dist_release}
+Release: 2%{?_dist_release}
 Epoch: 1
 
 Group: Development/Tools
@@ -15,6 +15,9 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: glib2-devel
 BuildRequires: popt-devel
 
+Vendor: Project Vine
+Distribution: Vine Linux
+
 %description
 The pkgconfig tool determines compilation options. For each required
 library, it reads the configuration file and outputs the necessary
@@ -84,6 +87,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Jan 15 2014 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1:0.28-2
+- new upstream release
+
 * Sun Mar 24 2013 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1:0.28-1
 - new upstream release
 

+ 7 - 1
p/popt/popt-vl.spec

@@ -3,7 +3,7 @@ Summary:	C library for parsing command line parameters
 Summary(ja):    コマンドラインパラメータを文法解析するためのCライブラリ
 Name:		popt
 Version:	1.16
-Release:	1%{?_dist_release}
+Release:	2%{?_dist_release}
 License:	MIT
 Group:		System Environment/Libraries
 URL:		http://www.rpm5.org/
@@ -11,6 +11,9 @@ Source0:	http://www.rpm5.org/files/%{name}/%{name}-%{version}.tar.gz
 BuildRequires:	gettext, doxygen, graphviz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root
 
+Vendor: Project Vine
+Distribution: Vine Linux
+
 %description
 Popt is a C library for parsing command line parameters. Popt was
 heavily influenced by the getopt() and getopt_long() functions, but
@@ -163,6 +166,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Jan 15 2014 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.16-2
+- rebuild with VineSeed environment
+
 * Sat Nov 03 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.16-1
 - update to 1.16
 - create %{name}-static sub package

+ 7 - 1
s/shared-mime-info/shared-mime-info-vl.spec

@@ -2,7 +2,7 @@ Summary: Shared MIME information database
 Summary(ja): 共有 MIME 情報データベース
 Name: shared-mime-info
 Version: 1.2
-Release: 1%{?_dist_release}
+Release: 2%{?_dist_release}
 License: GPL
 Group: User Interface/Desktops
 URL: http://freedesktop.org/wiki/Software/shared-mime-info
@@ -19,6 +19,9 @@ BuildRequires: perl-XML-Parser >= 2.31-16
 Requires: libxml2
 Requires: glib2 >= 2.6.0
 
+Vendor: Project Vine
+Distribution: Vine Linux
+
 %description
 This is the freedesktop.org shared MIME info database.
 
@@ -61,6 +64,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man*/*
 
 %changelog
+* Wed Jan 15 2014 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.2-2
+- rebuild with VineSeed environment
+
 * Sun Oct 27 2013 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.2-1
 - new upstream release
 

+ 539 - 193
s/snort/snort-vl.spec

@@ -1,223 +1,569 @@
-Summary: packet-sniffer/logger
-Name: snort
-Version: 1.7
-Release: 0vl2
+################################################################
+# rpmbuild Package Options
+# ========================
+#
+# See README.build_rpms for more details.
+#
+# 	--with flexresp
+# 		Add flexresp capability to whatever package(s) you are
+# 		building.
+#
+#	--with inline
+#		Add inline capability to whatever package(s) you are
+#		building. This will create its own inline package.
+# 
+# 	--with mysql
+# 		Builds a binary/package with support for MySQL.
+# 
+# 	--with postgresql
+# 		Builds a binary/package with support for PostgreSQL.
+# 
+#	--with unixODBC
+#		Build a binary/package with support for unixODBC
+# 
+# 	--with oracle
+# 		Builds a binary/package with support for Oracle.
+#
+# See pg 399 of _Red_Hat_RPM_Guide_ for rpmbuild --with and --without options.
+################################################################
+
+# Other useful bits
+%define OracleHome /opt/oracle/OraHome1
+%define SnortRulesDir %{_sysconfdir}/snort/rules
+%define noShell /bin/false
+
+# Handle the options noted above.
+# Default of no flexresp, but --with flexresp will enable it
+%define flexresp 1
+%{?_with_flexresp:%define flexresp 1}
+%{?_without_flexresp:%define flexresp 0}
+
+# Default of no MySQL, but --with mysql will enable it
+%define mysql 0
+%{?_with_mysql:%define mysql 1}
+%{?_without_mysql:%define mysql 0}
+
+# Default of no PostgreSQL, but --with postgresql will enable it
+%define postgresql 0
+%{?_with_postgresql:%define postgresql 1}
+%{?_without_postgresql:%define postgresql 0}
+
+# Default of no unixODBC, but --with unixODBC will enable it
+%define unixODBC 0
+%{?_with_unixODBC:%define unixODBC 1}
+%{?_without_unixODBC:%define unixODBC 0}
+
+# Default of no Oracle, but --with oracle will enable it
+%define oracle 0
+%{?_with_oracle:%define oracle 1}
+
+# If not inline then we'll conflict with it
+%define conflicts snort-inline 
+
+# Default of no Inline, but --with inline will enable it
+%define inline 0
+%define inlinetext %{nil}
+%{?_with_inline:%define inline 1}
+%{?_with_inline:%define inlinetext -inline }
+%{?_with_inline:%define conflicts snort }
+
+%define vendor Snort.org
+%define for_distro RPMs
+%define release 1
+%define realname snort
+
+# Look for a directory to see if we're building under cAos 
+# Exit status is usually 0 if the dir exists, 1 if not, so
+# we reverse that with the '!'
+%define caos %([ ! -d /usr/lib/rpm/caos ]; echo $?)
+
+%if %{caos}
+  # We are building for cAos (www.caosity.org) and the autobuilder doesn't
+  # have command line options so we have to fake the options for whatever
+  # packages we actually want here, in addition to tweaking the package
+  # info.
+  %define vendor cAos Linux 
+  %define for_distro RPMs for cAos Linux
+  %define mysql 1
+  %define postgresql 1
+  %define release 1.caos
+%endif
+
+
+Name: %{realname}%{inlinetext}
+%{?_with_inline:%define Name: %{realname}-inline }
+Version: 2.9.5.6
+Epoch: 1
+Release: 1%{?_dist_release}
+Summary: An open source Network Intrusion Detection System (NIDS)
+Group: Applications/Internet
 License: GPL
+Url: http://www.snort.org/
+Source0: http://www.snort.org/snort-downloads/2.9.2/%{realname}-%{version}.tar.gz
+
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+#Packager: Official Snort.org %{for_distro}
+#Vendor: %{vendor}
+Vendor:		Project Vine
+Distribution:	Vine Linux
+
+BuildRequires: autoconf, automake, flex, bison
+BuildRequires: pcre-devel
+BuildRequires: libpcap-devel
+BuildRequires: daq
+BuildRequires: libdnet-devel
+BuildRequires: zlib-devel
+BuildRequires: iptables-devel
+BuildRequires: libnfnetlink-devel
+BuildRequires: libnetfilter_queue-devel
+Conflicts: %{conflicts}
+
+%if %{flexresp}
+BuildRequires: libnet
+  %define EnableFlexresp --enable-flexresp
+%endif
+
+# Itables-devel removed from BuildReq as RH does not supply that package.
+# Will replace iptables-devel buildreq with a scripted solution. --jh
+%if %{inline}
+BuildRequires: libnet
+  %define EnableInline --enable-inline
+%endif
+
+%package mysql
+Summary: Snort with MySQL support
 Group: Applications/Internet
-Url: http://www.snort.org
-Source0: http://www.snort.org/Files/%{name}-%{version}.tar.gz
-Source1: snort-stat
-Source2: snortlog
-Source4: snortd
-Source5: snort.conf
-Source6: snortrules.tar.gz
-Source7: README-snort.EUC
-Requires: libpcap >= 0.4
-BuildRequires: libpcap >= 0.4
-Buildroot: %{_tmppath}/%{name}-%{version}-root
+Requires: %{name} = %{epoch}:%{version}-%{release}
+%if %{mysql}
+BuildRequires: mysql-devel
+%endif
+
+%description mysql
+Snort binary compiled with mysql support.
+
+%package postgresql
+Summary: Snort with PostgreSQL support
+Group: Applications/Internet
+Requires: %{name} = %{epoch}:%{version}-%{release}
+%if %{postgresql}
+BuildRequires: postgresql-devel
+%endif
+
+%description postgresql
+Snort binary compiled with postgresql support. 
+
+%package unixODBC
+Summary: Snort with unixODBC support
+Group: Applications/Internet
+Requires: %{name} = %{epoch}:%{version}-%{release}
+%if %{unixODBC}
+BuildRequires: unixODBC-devel
+%endif
+
+%description unixODBC
+Snort binary compiled with unixODBC support.
+
+%package oracle
+Summary: Snort with Oracle support
+Group: Applications/Internet
+Requires: %{name} = %{epoch}:%{version}-%{release}
+
+%description oracle
+Snort binary compiled with Oracle support. 
+
+EXPERIMENTAL!!  I don't have a way to test this, so let me know if it works!
+ORACLE_HOME=%{OracleHome}
+
 
 %description
-Snort is a libpcap-based packet sniffer/logger which 
-can be used as a lightweight network intrusion detection system. 
-It features rules based logging and can perform protocol analysis, 
-content searching/matching and can be used to detect a variety of 
-attacks and probes, such as buffer overflows, stealth port scans, 
-CGI attacks, SMB probes, OS fingerprinting attempts, and much more. 
-Snort has a real-time alerting capabilty, with alerts being sent to syslog, 
-a seperate "alert" file, or as a WinPopup message via Samba's smbclient
-
-%description -l ja
-SnortとはIDSと呼ばれるソフトウェアで、侵入検知システムと言われます。
-ホストに何らかの悪さをしてくる行為を検出して知らせてくれるソフトです。
-いろいろな攻撃と調査(例えばバッファオーバフロー、
-ステルス・ポート・スキャン、CGI攻撃、SMB調査、OS指紋鑑定試み、
-その他たくさん)を見つけるために使うことができる。
+Snort is an open source network intrusion detection system, capable of
+performing real-time traffic analysis and packet logging on IP networks.
+It can perform protocol analysis, content searching/matching and can be
+used to detect a variety of attacks and probes, such as buffer overflows,
+stealth port scans, CGI attacks, SMB probes, OS fingerprinting attempts,
+and much more.
+
+Snort has three primary uses. It can be used as a straight packet sniffer
+like tcpdump(1), a packet logger (useful for network traffic debugging,
+etc), or as a full blown network intrusion detection system. 
+
+You MUST edit /etc/snort/snort.conf to configure snort before it will work!
+
+There are 5 different packages available. All of them require the base
+snort rpm (this one). Additionally, you may need to chose a different
+binary to install if you want database support.
+
+If you install a different binary package %{_sbindir}/snort should end up
+being a symlink to a binary in one of the following configurations:
+
+	plain		Snort (this package, required)
+	mysql		Snort with mysql (optional)
+	postgresql	Snort with postgresql (optional)
+	unixODBC	Snort with unixODBC (optional)
+	oracle		Snort with oracle (optional, not official)
+	inline		Snort with inline support (optional)
+
+Please see the documentation in %{_docdir}/%{realname}-%{version} for more
+information on snort features and configuration.
+
 
 %prep
-%setup -q 
-cp -p %{SOURCE5} %{SOURCE7} .
+%setup -q -n %{realname}-%{version}
+
+# When building from a Snort.org CVS snapshot tarball, you have to run
+# autojunk before you can build.
+if [ \( ! -s configure \) -a \( -x autojunk.sh \) ]; then
+    ./autojunk.sh
+fi
+
+# Make sure it worked, or die with a useful error message.
+if [ ! -s configure ]; then
+    echo "Can't find ./configure.  ./autojunk.sh not present or not executable?"
+    exit 2
+fi
+
 
 %build
-CFLAGS="$RPM_OPT_FLAGS" \
-%configure --bindir=/usr/sbin --sysconfdir=/etc/snort --enable-smbalerts
-make
+
+BuildSnort() {
+   %__mkdir "$1"
+   cd "$1"
+   %__ln_s ../configure ./configure
+
+   if [ "$1" = "plain" ] ; then
+	./configure $SNORT_BASE_CONFIG \
+	--without-mysql \
+	--without-postgresql \
+	--without-oracle \
+	--without-odbc \
+	%{?EnableFlexresp} %{?EnableFlexresp2} \
+	%{?EnableInline}
+   fi
+
+   if [ "$1" = "mysql" ]; then
+	./configure $SNORT_BASE_CONFIG \
+	--with-mysql \
+	--with-mysql-libraries=%{_libdir} \
+	--without-postgresql \
+	--without-oracle \
+	--without-odbc \
+	%{?EnableFlexresp} %{?EnableFlexresp2} \
+	%{?EnableInline}
+   fi
+
+   if [ "$1" = "postgresql" ]; then
+	./configure $SNORT_BASE_CONFIG \
+	--without-mysql \
+	--with-postgresql \
+	--without-odbc \
+	--without-oracle \
+	%{?EnableFlexresp} %{?EnableFlexresp2} \
+	%{?EnableInline}
+   fi
+
+  if [ "$1" = "unixODBC" ]; then
+	./configure $SNORT_BASE_CONFIG \
+	--without-mysql \
+	--without-postgresql \
+	--with-odbc=%{_libdir} \
+	--without-oracle \
+	%{?EnableFlexresp} %{?EnableFlexresp2} \
+	%{?EnableInline}
+   fi
+
+   if [ "$1" = "oracle" ]; then
+	export ORACLE_HOME=%{OracleHome}
+	./configure $SNORT_BASE_CONFIG \
+	--without-mysql \
+	--without-postgresql \
+	--without-odbc \
+	--with-oracle=$ORACLE_HOME \
+	%{?EnableFlexresp} %{?EnableFlexresp2} \
+	%{?EnableInline}
+   fi
+
+   %__make
+   %__mv src/snort ../%{name}-"$1"
+   cd ..
+}
+
+
+CFLAGS="$RPM_OPT_FLAGS"
+export AM_CFLAGS="-g -O2"
+SNORT_BASE_CONFIG="--prefix=%{_prefix} \
+                   --bindir=%{_sbindir} \
+                   --sysconfdir=%{_sysconfdir}/snort \
+                   --with-libpcap-includes=%{_includedir} \
+                   --enable-decoder-preprocessor-rules --enable-targetbased \
+		   "
+
+# Always build snort-plain
+BuildSnort plain
+
+# Maybe build the others
+%if %{mysql}
+  BuildSnort mysql
+%endif
+
+%if %{postgresql}
+  BuildSnort postgresql
+%endif
+
+%if %{oracle}
+  BuildSnort oracle
+%endif
+
+%if %{unixODBC}
+  BuildSnort unixODBC
+%endif
+
 
 %install
-rm -rf %{buildroot}
-mkdir -p %{buildroot}/usr/{bin,sbin}
-mkdir -p %{buildroot}/etc/snort
-mkdir -p %{buildroot}/etc/rc.d/init.d
-mkdir -p %{buildroot}/var/log/snort/archive
-
-%makeinstall \
-	prefix=%{buildroot}/usr \
-	bindir=%{buildroot}/usr/sbin \
-	sysconfdir=%{buildroot}/etc/snort
-install %{SOURCE1} %{buildroot}/usr/bin
-install %{SOURCE2} %{buildroot}/usr/bin
-install %{SOURCE4} %{buildroot}/etc/rc.d/init.d
-tar zxvf %{SOURCE6} -C %{buildroot}/etc/snort
-
-cat - << EOF >> %{buildroot}/etc/snort/snort.conf
-####################################################################
-# Customize your rule set
-#
-# Up to date snort rules are available at the following web sites:
-#   http://www.snort.org
-#   http://www.whitehats.com
-#
-# The snort web site has documentation about how to 
-# write your own custom snort rules.
-#
-# The rules included with this distribution generate alerts based on
-# on suspicious activity. Depending on your network environment, your
-# security policies, and what you consider to be suspicious, some of
-# these rules may either generate false positives ore may be detecting
-# activity you consider to be acceptable; therefore, you are
-# encouraged to comment out rules that are not applicable in your
-# environment.
-#
-# Note that using all of the rules at the same time may lead to
-# serious packet loss on slower machines. YMMV, use with caution,
-# standard disclaimers apply. :)
-#
-# The following individuals contributed many of rules in this
-# distribution.
-#
-# Credits:
-#   Max Vision <vision@whitehats.com> - www.whitehats.com
-#   Ron Gula <rgula@securitywizards.com> of Network Security Wizards
-#   Martin Markgraf <martin@mail.du.gtn.com>
-#   CyberPsychotic <fygrave@tigerteam.net>
-#   Nick Rogness <nick@rapidnet.com>
-#   Jim Forster <jforster@rapidnet.com>
-#   Scott McIntyre <scott@whoi.edu>
-#   Tom Vandepoel <Tom.Vandepoel@ubizen.com>
-#   Brian Caswell <bmc@mitre.org>
-#
-#===============================================
-# Include all relevant rulesets here 
-# by default virus, policy and info are disabled
-#===============================================
-# Be sure you have created a local.rules file
-# for your includes/ignores, etc.
-#===============================================
-#include /etc/snort/local.rules
-include /etc/snort/exploit.rules
-include /etc/snort/scan.rules
-include /etc/snort/finger.rules
-include /etc/snort/ftp.rules
-include /etc/snort/telnet.rules
-include /etc/snort/smtp.rules
-include /etc/snort/rpc.rules
-include /etc/snort/rservices.rules
-include /etc/snort/backdoor.rules
-include /etc/snort/dos.rules
-include /etc/snort/ddos.rules
-include /etc/snort/dns.rules
-include /etc/snort/netbios.rules
-include /etc/snort/sql.rules
-include /etc/snort/web-cgi.rules
-include /etc/snort/web-coldfusion.rules
-include /etc/snort/web-frontpage.rules
-include /etc/snort/web-misc.rules
-include /etc/snort/web-iis.rules
-include /etc/snort/icmp.rules
-include /etc/snort/misc.rules
-#include /etc/snort/policy.rules
-#include /etc/snort/info.rules
-#include /etc/snort/virus.rules
-
-# Ruleset, available (updated hourly) from:
-#
-#   http://dev.whitehats.com/ids/vision.rules
-# include /etc/snort/vision.rules
-#
-# snort.conf with more options is located in /usr/doc/snort-1.7/snort.conf
 
-EOF
+# Remove leftover CVS files in the tarball, if any...
+find . -type 'd' -name "CVS" -print | xargs %{__rm} -rf
+
+InstallSnort() {
+   if [ "$1" = "mysql" ]; then
+	%__install -p -m 0755 %{name}-mysql %{buildroot}%{_sbindir}/%{name}-mysql
+   fi
+
+   if [ "$1" = "postgresql" ]; then
+   	%__install -p -m 0755 %{name}-postgresql %{buildroot}%{_sbindir}/%{name}-postgresql
+   fi
+
+   if [ "$1" = "unixODBC" ]; then
+   	%__install -p -m 0755 %{name}-unixODBC %{buildroot}%{_sbindir}/%{name}-unixODBC
+   fi
+
+   if [ "$1" = "oracle" ]; then
+   	%__install -p -m 0755 %{name}-oracle %{buildroot}%{_sbindir}/%{name}-oracle
+   fi
+
+   if [ "$1" = "plain" ]; then
+	%__rm -rf %{buildroot}
+
+	%__mkdir_p -m 0755 %{buildroot}%{_sbindir}
+	%__mkdir_p -m 0755 %{buildroot}%{SnortRulesDir}
+	%__mkdir_p -m 0755 %{buildroot}%{_sysconfdir}/snort
+	%__mkdir_p -m 0755 %{buildroot}%{_sysconfdir}/sysconfig
+	%__mkdir_p -m 0755 %{buildroot}%{_sysconfdir}/logrotate.d
+	%__mkdir_p -m 0755 %{buildroot}%{_var}/log/snort
+	%__mkdir_p -m 0755 %{buildroot}%{_initrddir}
+	%__mkdir_p -m 0755 %{buildroot}%{_mandir}/man8
+	%__mkdir_p -m 0755 %{buildroot}%{_docdir}/%{realname}-%{version}
+
+	%__install -p -m 0755 %{name}-plain %{buildroot}%{_sbindir}/%{name}-plain
+	%__mkdir_p -m 0755 %{buildroot}%{_libdir}/%{realname}-%{version}_dynamicengine
+	%__mkdir_p -m 0755 %{buildroot}%{_libdir}/%{realname}-%{version}_dynamicpreprocessor
+	%__install -p -m 0755 plain/src/dynamic-plugins/sf_engine/.libs/libsf_engine.so.0 %{buildroot}%{_libdir}/%{realname}-%{version}_dynamicengine
+	%__ln_s -f %{_libdir}/%{realname}-%{version}_dynamicengine/libsf_engine.so.0 %{buildroot}%{_libdir}/%{realname}-%{version}_dynamicengine/libsf_engine.so
+	%__install -p -m 0755 plain/src/dynamic-preprocessors/build/%{_prefix}/lib/snort_dynamicpreprocessor/*.so* %{buildroot}%{_libdir}/%{realname}-%{version}_dynamicpreprocessor
+	
+    for file in %{buildroot}%{_libdir}/%{realname}-%{version}_dynamicpreprocessor/*.so;  do  
+          preprocessor=`basename $file`
+          %__ln_s -f %{_libdir}/%{realname}-%{version}_dynamicpreprocessor/$preprocessor.0 $file     
+    done   
+	
+	%__install -p -m 0644 snort.8 %{buildroot}%{_mandir}/man8
+	%__gzip %{buildroot}%{_mandir}/man8/snort.8
+	%__install -p -m 0755 rpm/snortd %{buildroot}%{_initrddir}
+	%__install -p -m 0644 rpm/snort.sysconfig %{buildroot}/%{_sysconfdir}/sysconfig/%{realname}
+	%__install -p -m 0644 rpm/snort.logrotate %{buildroot}/%{_sysconfdir}/logrotate.d/snort
+	%__install -p -m 0644 etc/reference.config etc/classification.config \
+		etc/unicode.map etc/gen-msg.map \
+		etc/threshold.conf etc/snort.conf \
+		%{buildroot}/%{_sysconfdir}/snort
+	find doc -maxdepth 1 -type f -not -name 'Makefile*' -exec %__install -p -m 0644 {} %{buildroot}%{_docdir}/%{realname}-%{version} \;
+
+	%__rm -f %{buildroot}%{_docdir}/%{realname}-%{version}/Makefile.*
+    fi
+}
+
+# Fix the RULE_PATH
+%__sed -e 's;var RULE_PATH ../rules;var RULE_PATH %{SnortRulesDir};' \
+	< etc/snort.conf > etc/snort.conf.new
+%__rm -f etc/snort.conf
+%__mv etc/snort.conf.new etc/snort.conf
+
+# Fix dynamic-preproc paths
+%__sed -e 's;dynamicpreprocessor directory \/usr\/local/lib\/snort_dynamicpreprocessor;dynamicpreprocessor directory %{_libdir}\/%{realname}-%{version}_dynamicpreprocessor;' < etc/snort.conf > etc/snort.conf.new
+%__rm -f etc/snort.conf
+%__mv etc/snort.conf.new etc/snort.conf
+
+# Fix dynamic-engine paths
+%__sed -e 's;dynamicengine \/usr\/local/lib\/snort_dynamicengine;dynamicengine %{_libdir}\/%{realname}-%{version}_dynamicengine;' < etc/snort.conf > etc/snort.conf.new
+%__rm -f etc/snort.conf
+%__mv etc/snort.conf.new etc/snort.conf
+
+
+# Always install snort-plain
+InstallSnort plain
+
+# Maybe install the others
+%if %{mysql}
+  InstallSnort mysql
+%endif
+
+%if %{postgresql}
+  InstallSnort postgresql
+%endif
+
+%if %{unixODBC}
+  InstallSnort unixODBC
+%endif
+
+%if %{oracle}
+  InstallSnort oracle
+%endif
+
 
 %clean
-rm -rf %{buildroot}
+%__rm -rf %{buildroot}
+
+
+%pre
+# Don't do all this stuff if we are upgrading
+if [ $1 = 1 ] ; then
+	/usr/sbin/groupadd snort 2> /dev/null || true
+	/usr/sbin/useradd -M -d %{_var}/log/snort -s %{noShell} -c "Snort" -g snort snort 2>/dev/null || true
+fi
+
+%post mysql
+if [ -L %{_sbindir}/snort ] || [ ! -e %{_sbindir}/snort ] ; then 
+	%__rm -f %{_sbindir}/snort; %__ln_s -f %{_sbindir}/%{name}-mysql %{_sbindir}/snort
+fi
+
+%post postgresql
+if [ -L %{_sbindir}/snort ] || [ ! -e %{_sbindir}/snort ] ; then 
+	%__rm -f %{_sbindir}/snort; %__ln_s -f %{_sbindir}/%{name}-postgresql %{_sbindir}/snort
+fi
+
+%post unixODBC
+if [ -L %{_sbindir}/snort ] || [ ! -e %{_sbindir}/snort ] ; then 
+	%__rm -f %{_sbindir}/snort; %__ln_s -f %{_sbindir}/%{name}-unixODBC %{_sbindir}/snort
+fi
+
+
+%post oracle
+if [ -L %{_sbindir}/snort ] || [ ! -e %{_sbindir}/snort ] ; then
+	%__rm -f %{_sbindir}/snort; %__ln_s %{_sbindir}/%{name}-oracle %{_sbindir}/snort
+fi
 
 %post
-#don't do all this stuff if we are upgrading
-if [ "$1" = 1 ] ; then
-useradd -M -r -d /var/log/snort -s /bin/false -c "Snort" snort 2> /dev/null || :
-groupadd -r snort 2> /dev/null || :
-/sbin/chkconfig --add snortd
+# Make a symlink if there is no link for snort-plain
+if [ -L %{_sbindir}/snort ] || [ ! -e %{_sbindir}/snort ] ; then \
+	%__rm -f %{_sbindir}/snort; %__ln_s %{_sbindir}/%{name}-plain %{_sbindir}/snort; fi
+
+# We should restart it to activate the new binary if it was upgraded
+%{_initrddir}/snortd condrestart 1>/dev/null 2>/dev/null
+
+# Don't do all this stuff if we are upgrading
+if [ $1 = 1 ] ; then
+	%__chown -R snort.snort %{_var}/log/snort
+	/sbin/chkconfig --add snortd
 fi
-#this only works on redhat ;/
-perl -e 'open(f,"/etc/sysconfig/network-scripts/ifcfg-eth0");
-         while(<f>){if  (/IPADDR=(.*)/) {$internal=$1;}};close(f);
-         open(f,"/etc/resolv.conf");
-         while(<f>){if (/nameserver(.*)/) {$dns=$1;$dns=~s/[ ]+//g;
-	 $dns.="/32,"; push(@dns,$dns);}} close(f);
-	 $dns[$#dns]=~s/,$//g;
-         open(f,">/etc/snort/snort.conf");
-         print f "var HOME_NET $internal/32\nvar EXTERNAL_NET any\nvar SMTP \$HOME_NET\nvar HTTP_SERVERS \$HOME_NET\nvar SQL_SERVERS \$HOME_NET\nvar DNS_SERVERS ";
-	 print f "[";
-         foreach (@dns) {print f "$_";}
-	 print f "]";
-         print f "\n\npreprocessor defrag\npreprocessor http_decode: 80 8080\npreprocessor portscan: \$HOME_NET 4 3 /var/log/snort/portscan.log\npreprocessor portscan-ignorehosts: \$DNS_SERVERS\n\n";
-         close(f);'
-#add the rest of the stuff
-
-chown snort.snort /var/log/snort
-
-%if 0
-echo -e "
-Be sure to fetch the latest snort rules file from the ArachNIDS
-database by Max Vision, or the one available from the snort.org web
-site.
-
-The snortlog and snort-stat perl scripts can be used to generate
-statistics from the snort syslog entries.
-
-Snort is currently configured to listen only on eth0, and uses the
-default rulesets. If this is not correct for your 
-system, edit /etc/rc.d/init.d/snortd and /etc/snort/snort.conf
-
-A \"snort\" user and group have been created for snort to run as instead
-of running as root.  You will likely need to create the /var/log/snort 
-directory, and change ownership to the \"snort\" account.
-
-Built by: Dave Wreski
-dave@linuxsecurity.com
-and Wim Vandersmissen <wim@bofh.be>
-"
-%endif
+
 
 %preun
-/etc/rc.d/init.d/snortd stop
 if [ $1 = 0 ] ; then
+	# We get errors about not running, but we don't care
+	%{_initrddir}/snortd stop 2>/dev/null 1>/dev/null
 	/sbin/chkconfig --del snortd
 fi
-exit 0
 
 %postun
-#only if we are removing, not upgrading..
+# Try and restart, but don't bail if it fails
+if [ $1 -ge 1 ] ; then
+	%{_initrddir}/snortd condrestart  1>/dev/null 2>/dev/null || :
+fi
+
+# Only do this if we are actually removing snort
 if [ $1 = 0 ] ; then
-	userdel snort 2> /dev/null || :
-	groupdel snort 2> /dev/null || :
+	if [ -L %{_sbindir}/snort ]; then
+		%__rm -f %{_sbindir}/snort
+	fi
+
+	/usr/sbin/userdel snort 2>/dev/null
+fi
+
+%postun mysql
+if [ -L %{_sbindir}/snort ]; then 
+	%__rm -f %{_sbindir}/snort
+	%__ln_s -f %{_sbindir}/%{name}-plain %{_sbindir}/snort
+fi
+
+%postun postgresql
+if [ -L %{_sbindir}/snort ]; then 
+	%__rm -f %{_sbindir}/snort
+	%__ln_s -f %{_sbindir}/%{name}-plain %{_sbindir}/snort
+fi
+
+%postun unixODBC
+if [ -L %{_sbindir}/snort ]; then 
+	%__rm -f %{_sbindir}/snort
+	%__ln_s -f %{_sbindir}/%{name}-plain %{_sbindir}/snort
+fi
+
+%postun oracle
+if [ -L %{_sbindir}/snort ]; then 
+	%__rm -f %{_sbindir}/snort
+	%__ln_s -f %{_sbindir}/%{name}-plain %{_sbindir}/snort
 fi
 
 %files
-%defattr(-,root,root)
-%doc AUTHORS BUGS COPYING CREDITS ChangeLog INSTALL NEWS README* USAGE
-%doc snort.conf README-snort.EUC
-%attr(755,root,root)  /usr/sbin/*
-%attr(755,root,root)  /usr/bin/*
-%attr(750,root,wheel)  %dir /var/log/snort
-%attr(750,root,wheel)  %dir /var/log/snort/archive
-%attr(640,root,wheel) %config /etc/snort/*rules
-%attr(640,root,root)  %config /etc/snort/snort.conf
-%attr(755,root,root)  %config /etc/rc.d/init.d/snortd
+%defattr(-,root,root,-)
+%{_sbindir}/%{name}-plain
+%{_mandir}/man8/snort.8.*
+%dir %{SnortRulesDir}
+%config(noreplace) %{_sysconfdir}/snort/classification.config
+%config(noreplace) %{_sysconfdir}/snort/reference.config
+%config(noreplace) %{_sysconfdir}/snort/threshold.conf
+%config(noreplace) %{_sysconfdir}/snort/*.map
+%config(noreplace) %{_sysconfdir}/logrotate.d/snort
+%config(noreplace) %{_sysconfdir}/snort/snort.conf
+%config(noreplace) %{_sysconfdir}/sysconfig/snort
+%config(noreplace) %{_initrddir}/snortd
+%attr(0755,snort,snort) %dir %{_var}/log/snort
+%dir %{_sysconfdir}/snort
+%{_docdir}/%{realname}-%{version}/*
+%dir %{_libdir}/%{realname}-%{version}_dynamicengine
+%{_libdir}/%{realname}-%{version}_dynamicengine/libsf_engine.*
+%dir %{_libdir}/%{realname}-%{version}_dynamicpreprocessor
+%{_libdir}/%{realname}-%{version}_dynamicpreprocessor/libsf_*_preproc.*
+
+%dir %{_docdir}/%{realname}-%{version}
+%docdir %{_docdir}/%{realname}-%{version}
+
+%if %{mysql}
+%files mysql
+%defattr(-,root,root,-)
+%{_sbindir}/%{name}-mysql
+%endif
+
+%if %{postgresql}
+%files postgresql
+%defattr(-,root,root,-)
+%{_sbindir}/%{name}-postgresql
+%endif
+
+%if %{unixODBC}
+%files unixODBC
+%defattr(-,root,root,-)
+%{_sbindir}/%{name}-unixODBC
+%endif
+
+%if %{oracle}
+%files oracle
+%defattr(-,root,root,-)
+%{_sbindir}/%{name}-oracle
+%endif
+
 
 %changelog
-* Thu Sep 06 2001 Toru Sagami <sagami@vinelinux.org>
-- 1.7-0vl2: was ported to VineSeedPlus with many spec fixes
+* Wed Jan 15 2014 Yoji TOYODA <bsyamato@sea.plala.or.jp> - 2.9.5.6-1
+- new upstream release
 
-* Mon Apr 09 2001 net_hal <net_hal@cwa.bai.ne.jp>
-- first buile for Vine2.1
-- original ver 1.7 + 2001/03/28 Rules
+* Fri Mar 16 2012 MATSUBAYASHI Kohji <shaolin@vinelinux.org> - 2.9.2.1-1
+- initial build for Vine Linux (based on official srpm)

+ 8 - 5
t/tcpdump/tcpdump-vl.spec

@@ -1,5 +1,5 @@
-%define	tcpdump_ver	4.3.0
-%define	libpcap_ver	1.3.0
+%define	tcpdump_ver	4.5.1
+%define	libpcap_ver	1.5.3
 
 Summary: A network traffic monitoring tool.
 Summary(ja): ネットワークのトラフィックをモニタするツール
@@ -127,9 +127,9 @@ rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root)
-%doc tcpdump-%{tcpdump_ver}/README
-%doc tcpdump-%{tcpdump_ver}/CHANGES
-%doc tcpdump-%{tcpdump_ver}/LICENSE
+%doc %{name}-%{version}/README.md
+%doc %{name}-%{version}/CHANGES
+%doc %{name}-%{version}/LICENSE
 %{_sbindir}/tcpdump
 %{_sbindir}/tcpslice
 %{_mandir}/man8/tcpslice.8*
@@ -137,6 +137,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed Jan 15 2014 Yoji TOYODA <bsyamato@sea.plala.or.jp> - 1:4.5.1-1
+- new upstream release
+
 * Fri Jun 22 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> - 1:4.3.0-1
 - new upstream release
 

+ 7 - 1
t/time/time-vl.spec

@@ -2,7 +2,7 @@ Name: time
 Summary: A GNU utility for monitoring a program's use of system resources.
 Summary(ja): プログラムのシステムリソース使用をモニタする GNU ユーティリティ
 Version: 1.7
-Release: 23%{?_dist_release}
+Release: 24%{?_dist_release}
 
 Group: Applications/System
 License: GPLv2+
@@ -16,6 +16,9 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-root
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
 
+Vendor: Project Vine
+Distribution: Vine Linux
+
 %description
 The GNU time utility runs another program, collects information about
 the resources used by that program while it is running, and displays
@@ -60,6 +63,9 @@ fi
 %{_infodir}/time.info*
 
 %changelog
+* Wed Jan 15 2014 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.7-24
+- rebuild with VineSeed environment
+
 * Sun Apr 10 2011 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 1.7-23
 - rebuilt with current VineSeed
 

+ 7 - 1
t/tmpwatch/tmpwatch-vl.spec

@@ -1,7 +1,7 @@
 Summary: A utility for removing files based on when they were last accessed.
 Summary(ja): 古いものから順にファイルを削除するユーティリティ
 Name: tmpwatch
-Version: 2.10.1
+Version: 2.11
 Release: 1%{?_dist_release}
 
 Group: System Environment/Base
@@ -14,6 +14,9 @@ Source1: tmpwatch.daily
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 Requires: psmisc
 
+Vendor: Project Vine
+Distribution: Vine Linux
+
 %description
 The tmpwatch utility recursively searches through specified
 directories and removes files which have not been accessed in a
@@ -57,6 +60,9 @@ chmod +x %{buildroot}/etc/cron.daily/tmpwatch
 %config(noreplace) /etc/cron.daily/tmpwatch
 
 %changelog
+* Wed Jan 15 2014 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.11-1
+- new upstream release
+
 * Sat Mar 26 2011 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 2.10.1-1
 - new upstream release
 

+ 7 - 1
w/words/words-vl.spec

@@ -2,7 +2,7 @@ Summary: A dictionary of English words for the %{_datadir}/dict directory.
 Summary(ja): %{_datadir}/dict に格納される英単語辞書
 Name: words
 Version: 3.0
-Release: 11%{?_dist_release}
+Release: 12%{?_dist_release}
 License: public domain
 Group: System Environment/Libraries
 Source: http://www.dcs.shef.ac.uk/research/ilash/Moby/mwords.tar.Z
@@ -12,6 +12,9 @@ BuildArch: noarch
 BuildRoot: %{_tmppath}/words-%{version}-root
 BuildRequires: ncompress nkf coreutils grep
 
+Vendor: Project Vine
+Distribution: Vine Linux
+
 %description
 The words file is a dictionary of English words for the %{_datadir}/dict
 directory.  Programs like ispell use this database of words to check
@@ -80,6 +83,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Jan 15 2014 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.0-12
+- rebuild with VineSeed environment
+
 * Thu Apr 14 2011 Daisuke SUZUKI <daisuke@linux.or.jp> 3.0-11
 - rebuild for Vine 6