rpms/snort/devel snort-2.4.3-configure64.patch, NONE, 1.1 snort.spec, 1.4, 1.5

Dennis Gilmore (ausil) fedora-extras-commits at redhat.com
Fri Feb 17 02:06:16 UTC 2006


Author: ausil

Update of /cvs/extras/rpms/snort/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4307

Modified Files:
	snort.spec 
Added Files:
	snort-2.4.3-configure64.patch 
Log Message:
update to 2.4.3


snort-2.4.3-configure64.patch:

--- NEW FILE snort-2.4.3-configure64.patch ---
--- snort-2.4.3-orig/configure	2005-10-17 08:50:23.000000000 -0500
+++ snort-2.4.3/configure	2006-02-16 13:05:52.000000000 -0600
@@ -6854,7 +6854,7 @@
     fi
   else
 
-    for i in lib lib/mysql; do
+    for i in lib lib/mysql lib64 lib64/mysql; do
       str="$MYSQL_DIR/$i/libmysqlclient.*"
       for j in `echo $str`; do
         if test -r $j; then


Index: snort.spec
===================================================================
RCS file: /cvs/extras/rpms/snort/devel/snort.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- snort.spec	5 Mar 2005 19:28:28 -0000	1.4
+++ snort.spec	17 Feb 2006 02:06:16 -0000	1.5
@@ -1,24 +1,26 @@
 Summary:        Intrusion detection system
 Name:           snort
-Version:        2.0.0
-Release:        1
+Version:        2.4.3
+Release:        1%{?dist}
 License:        GPL
 Group:          Applications/Internet
-Source0:        http://www.snort.org/dl/snort-2.0.0.tar.gz
+Source0:        http://www.snort.org/dl/current/snort-%{version}.tar.gz
 Source1:        snortd
+Patch:		snort-2.4.3-configure64.patch
 Url:            http://www.snort.org
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 Prefix:         /usr
 Requires:       libpcap >= 0.4
 BuildRequires:  libpcap >= 0.4
 BuildRequires:  perl
+BuildRequires:  pcre-devel
 
 %package        plain+flexresp
 Summary:        Snort with Flexible Response
 Group:          Applications/Internet
 Requires:       %{name} = %{version}-%{release}
-Requires:       libnet
-BuildRequires:  libnet
+Requires:       libnet10
+BuildRequires:  libnet10
 
 %package        mysql
 Summary:        Snort with Flexible Response
@@ -30,8 +32,8 @@
 Summary:        Snort with Flexible Response
 Group:          Applications/Internet
 Requires:       %{name} = %{version}-%{release}
-Requires:       libnet
-BuildRequires:  libnet
+Requires:       libnet10
+BuildRequires:  libnet10
 BuildRequires:  mysql-devel
 
 %package        postgresql
@@ -44,8 +46,8 @@
 Summary:        Snort with Flexible Response
 Group:          Applications/Internet
 Requires:       %{name} = %{version}-%{release}
-Requires:       libnet
-BuildRequires:  libnet
+Requires:       libnet10
+BuildRequires:  libnet10
 BuildRequires:  postgresql-devel
 
 %package        snmp
@@ -59,8 +61,8 @@
 Summary:        Snort with Flexible Response
 Group:          Applications/Internet
 Requires:       %{name} = %{version}-%{release}
-Requires:       libnet
-BuildRequires:  libnet
+Requires:       libnet10
+BuildRequires:  libnet10
 BuildRequires:  net-snmp-devel
 BuildRequires:  openssl-devel
 
@@ -68,8 +70,8 @@
 Summary:        Snort with Flexible Response
 Group:          Applications/Internet
 Requires:       %{name} = %{version}-%{release}
-Requires:       libnet
-BuildRequires:  libnet
+Requires:       libnet10
+BuildRequires:  libnet10
 BuildRequires:  net-snmp-devel
 BuildRequires:  postgresql-devel
 BuildRequires:  mysql-devel
@@ -143,171 +145,140 @@
 
 
 %prep
-echo "
---------------------------------------------------------------
-Unmaintained since rh9.
-Has not been rebuilt or updated since rh9.
---------------------------------------------------------------" > /dev/null
-exit 1
 %setup -q
-
+%patch0 -p1 -b .config
 
 %build
 
-touch -r . *
-aclocal
-automake
-rm -rf building && mkdir -p building && cd building
+#touch -r . *
+#aclocal
+#automake
+#rm -rf building && mkdir -p building && cd building
 
-export AM_CFLAGS="-g -O2"
+#export AM_CFLAGS="-g -O2"
 SNORT_BASE_CONFIG="--prefix=%{_prefix} \
                    --sysconfdir=%{_sysconfdir} \
                    --with-libpcap-includes=/usr/include/pcap"
-
+export LDFLAGS=-L/usr/lib64/mysql
 # there are some strange configure errors
 # when not doing a distclean between major builds.
 
 # plain
 {
-mkdir plain
-cd plain
-../../configure $SNORT_BASE_CONFIG --with-mysql=no \
+#mkdir plain
+#cd plain
+%configure $SNORT_BASE_CONFIG --with-mysql=no \
                                    --with-postgresql=no \
                                    --with-oracle=no \
-                                   --with-odbc=no
-make -j3
-mv src/snort ../snort-plain
+                                   --with-odbc=no 
+make %{?_smp_mflags}
+mv src/snort snort-plain
+
 # make distclean
-cd ..
+#cd ..
 }
 
 # plain+flexresp
 {
-mkdir plain+flexresp
-cd plain+flexresp
-../../configure $SNORT_BASE_CONFIG --with-mysql=no \
+%configure $SNORT_BASE_CONFIG --with-mysql=no \
                                    --with-postgresql=no \
                                    --with-oracle=no \
                                    --with-odbc=no \
                                    --enable-flexresp
-make -j3
-mv src/snort ../snort-plain+flexresp
+make %{?_smp_mflags}
+mv src/snort snort-plain+flexresp
 # make distclean
-
-cd ..
 }
 
 # mysql+flexresp
 {
-mkdir mysql+flexresp
-cd mysql+flexresp
-../../configure $SNORT_BASE_CONFIG --with-mysql=yes \
+%configure $SNORT_BASE_CONFIG --with-mysql=yes \
                                    --with-postgresql=no \
                                    --with-oracle=no \
                                    --with-odbc=no \
                                    --enable-flexresp
-make -j3
-mv src/snort ../snort-mysql+flexresp
+make %{?_smp_mflags}
+mv src/snort snort-mysql+flexresp
 # make distclean
-cd ..
 }
 
 # mysql
 {
-mkdir mysql
-cd mysql
-../../configure $SNORT_BASE_CONFIG --with-mysql=yes \
-                                   --with-postgresql=no \
-                                   --with-oracle=no \
-                                   --with-odbc=no
-make -j3
-mv src/snort ../snort-mysql
+%configure $SNORT_BASE_CONFIG --with-mysql=yes \
+                              --with-postgresql=no \
+                              --with-oracle=no \
+                              --with-odbc=no
+make %{?_smp_mflags}
+mv src/snort snort-mysql
 # make distclean
-
-cd ..
 }
 
 
 
 # postgresql+flexresp
 {
-mkdir postgresql+flexresp
-cd postgresql+flexresp
-../../configure $SNORT_BASE_CONFIG --with-mysql=no \
+%configure $SNORT_BASE_CONFIG --with-mysql=no \
                                    --with-postgresql=yes \
                                    --with-oracle=no \
                                    --with-odbc=no \
                                    --enable-flexresp
-make -j3
-mv src/snort ../snort-postgresql+flexresp
+make %{?_smp_mflags}
+mv src/snort snort-postgresql+flexresp
 # make distclean
-cd ..
 }
 
 # postgresql
 {
-mkdir postgresql
-cd postgresql
-../../configure $SNORT_BASE_CONFIG --with-mysql=no \
+%configure $SNORT_BASE_CONFIG --with-mysql=no \
                                    --with-postgresql=yes \
                                    --with-oracle=no \
                                    --with-odbc=no
-make -j3
-mv src/snort ../snort-postgresql
+make %{?_smp_mflags}
+mv src/snort snort-postgresql
 # make distclean
-cd ..
 }
 
 # snmp
 {
-mkdir snmp
-cd snmp
-../../configure $SNORT_BASE_CONFIG --with-mysql=no \
+%configure $SNORT_BASE_CONFIG --with-mysql=no \
                                    --with-postgresql=no \
                                    --with-oracle=no \
                                    --with-odbc=no \
                                     --with-snmp=/usr \
                                    --with-openssl
 
-make -j3
-mv src/snort ../snort-snmp
+make %{?_smp_mflags}
+mv src/snort snort-snmp
 # make distclean
-cd ..
 }
 
 
 # snmp+flexresp
 {
-mkdir snmp+flexresp
-cd snmp+flexresp
-../../configure $SNORT_BASE_CONFIG --with-mysql=no \
+%configure $SNORT_BASE_CONFIG --with-mysql=no \
                                    --with-postgresql=no \
                                    --with-oracle=no \
                                    --with-odbc=no \
                                    --with-snmp \
                                    --enable-flexresp \
                                    --with-openssl
-make -j3
-mv src/snort ../snort-snmp+flexresp
+make %{?_smp_mflags}
+mv src/snort snort-snmp+flexresp
 # make distclean
-cd ..
 }
 
 # bloat
 {
-mkdir bloat
-cd bloat
-../../configure $SNORT_BASE_CONFIG --with-mysql=yes \
+%configure $SNORT_BASE_CONFIG --with-mysql=yes \
                                    --with-postgresql=yes \
                                    --with-oracle=no \
                                    --with-odbc=no \
                                    --with-snmp \
                                    --enable-flexresp \
                                    --with-openssl
-make -j3
-mv src/snort ../snort-bloat
+make %{?_smp_mflags}
+mv src/snort snort-bloat
 # make distclean
-cd ..
 }
 
 
@@ -323,7 +294,6 @@
 mkdir -p %{buildroot}%{_mandir}/man8
 
 {
-pushd building
 install snort-plain %{buildroot}%{_sbindir}/snort-plain
 install snort-plain+flexresp %{buildroot}%{_sbindir}/snort-plain+flexresp
 install snort-mysql %{buildroot}%{_sbindir}/snort-mysql
@@ -333,11 +303,10 @@
 install snort-snmp %{buildroot}%{_sbindir}/snort-snmp
 install snort-snmp+flexresp %{buildroot}%{_sbindir}/snort-snmp+flexresp
 install snort-bloat %{buildroot}%{_sbindir}/snort-bloat
-popd
 }
 
 install snort.8 %{buildroot}%{_mandir}/man8
-install etc/reference.config etc/classification.config etc/snort.conf rules/*.rules %{buildroot}%{_sysconfdir}
+install etc/reference.config etc/classification.config etc/snort.conf %{buildroot}%{_sysconfdir}
 install %{SOURCE1} %{buildroot}/etc/rc.d/init.d
 
 perl -pi -e 's!var RULE_PATH ../rules!var RULE_PATH %{_sysconfdir}!'  %{buildroot}%{_sysconfdir}/snort.conf
@@ -397,7 +366,7 @@
 
 %files
 %defattr(-,root,root)
-%doc doc/AUTHORS doc/BUGS doc/FAQ doc/README* doc/RULES.todo doc/SnortUsersManual.pdf doc/TODO doc/USAGE
+%doc doc/*
 
 %attr(755,root,root) %{_sbindir}/snort-plain
 # handle compressed man pages.
@@ -432,6 +401,9 @@
 
 
 %changelog
+* Thu Feb 16 2006 Dennis Gilmore <dennis at ausil.us> - 2.4.3-1
+- Updated to 2.4.3
+
 * Tue Apr 01 2003 Phillip Compton <pcompton AT proteinmedia.com> 0:2.0.0-0.fdr.0.1.rc4
 - Updated to 2.0.0rc4
 - Fedorafied spec




More information about the scm-commits mailing list