Hello community,
here is the log from the commit of package snort
checked in at Fri Feb 9 01:22:40 CET 2007.
--------
--- snort/snort.changes 2006-09-30 15:18:16.000000000 +0200
+++ /mounts/work_src_done/STABLE/snort/snort.changes 2007-02-08 17:50:26.000000000 +0100
@@ -1,0 +2,7 @@
+Thu Feb 8 17:49:20 CET 2007 - dmueller@suse.de
+
+- update to 2.6.1.2:
+ * lots of new stream handlers
+ * build against libdnet now
+
+-------------------------------------------------------------------
Old:
----
libnet-1.0.2a.tar.bz2
libnet-IPPROTO_OSPF_LSA-checksum.patch
libnet-multiline-string-fix.diff
libnet-strict-aliasing.diff
libnet-version-dep.patch
snort-2.4.5.tar.bz2
New:
----
add-includes.diff
snort-2.6.1.2.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ snort.spec ++++++
--- /var/tmp/diff_new_pack.L32764/_old 2007-02-09 01:22:19.000000000 +0100
+++ /var/tmp/diff_new_pack.L32764/_new 2007-02-09 01:22:19.000000000 +0100
@@ -1,7 +1,7 @@
#
-# spec file for package snort (Version 2.4.5)
+# spec file for package snort (Version 2.6.1.2)
#
-# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
@@ -11,16 +11,16 @@
# norootforbuild
Name: snort
-BuildRequires: krb5-devel libpcap libxml2-devel mysql-devel openssl-devel pcre-devel postgresql-devel unixODBC-devel
+BuildRequires: krb5-devel libpcap libxml2-devel mysql-devel openssl-devel pcre-devel postgresql-devel
+BuildRequires: libdnet-devel unixODBC-devel
%define with_mysql 1
%define with_pgsql 1
%define with_odbc 1
-%define libnet_version 1.0.2a
Summary: A Packet Sniffer and Logger
-Version: 2.4.5
-Release: 3
+Version: 2.6.1.2
+Release: 1
Group: Productivity/Networking/Diagnostic
-License: GPL
+License: GNU General Public License (GPL)
Requires: logrotate
Source0: http://www.snort.org/dl/%{name}-%{version}.tar.bz2
Source1: %{name}-update
@@ -31,15 +31,11 @@
Source7: http://www.snort.org/dl/contrib/data_analysis/snort_stat.pl
Source8: http://www.snort.org/dl/contrib/data_analysis/snortlog3.pl
Source9: Community-Rules.tar.bz2
-Source100: http://www.packetfactory.net/libnet/dist/deprecated/libnet-%{libnet_version}.tar.bz2
Patch1: %{name}-2.2.0-config.patch
Patch2: %{name}-2.4.3-lib64_configure.patch
Patch3: %{name}-2.1.1-logrotate.patch
-Patch4: snort.strncat-overflow.patch
-Patch100: libnet-multiline-string-fix.diff
-Patch101: libnet-strict-aliasing.diff
-Patch102: libnet-version-dep.patch
-Patch103: libnet-IPPROTO_OSPF_LSA-checksum.patch
+Patch4: %{name}.strncat-overflow.patch
+Patch5: add-includes.diff
URL: http://www.snort.org/
#%if %{with_pgsql}
#Buildrequires: postgresql-devel, postgresql-lib
@@ -73,39 +69,18 @@
Michel Kaempf (5n0r7)
%prep
-%setup -q -a 6 -a 100
+%setup -q -a 6
%patch1 -p1 -b .config
#%ifarch x86_64 ia64 ppc64 s390x
%patch2
#%endif
%patch3 -p2 -b .logrotate
-%patch4 -p1
-cd Libnet-%{libnet_version}
-%patch100
-%patch101
-%patch102 -p1
-%patch103 -p1
-cd ..
+%patch4
+%patch5
%build
-# -----------------------------------------------------------------
-# build libnet-1.0.2a first (currently only working version)
-cd Libnet-%{libnet_version}
-%{?suse_update_config:%{suse_update_config}}
-#autoreconf -fi
-./configure --prefix=%{_prefix} --with-pf_packet=yes --libdir=%{_libdir} --disable-shared --enable-static
-make CFLAGS="$RPM_OPT_FLAGS" %{?jobs:-j %jobs}
-make test CFLAGS="$RPM_OPT_FLAGS"
-mkdir -p $RPM_BUILD_DIR/Libnet-build
-make DESTDIR=$RPM_BUILD_DIR/Libnet-build install
-export LIBNET=$RPM_BUILD_DIR/Libnet-build/%{_prefix}
-cd ..
-#-----------------------------------------------------------------
-#...and now build snort
-# autoreconf -fi
autoconf
-CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing $($LIBNET/bin/libnet-config --defines)" \
-PATH="$LIBNET/bin:$PATH" \
+CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
%configure \
--with-openssl=%{_prefix} \
--with-snmp \
@@ -119,15 +94,16 @@
%if %{with_odbc}
--with-odbc \
%endif
+ --disable-static \
--enable-perfmonitor \
- --enable-flexresp \
- --with-libnet-includes=$LIBNET/include \
- --with-libnet-libraries=$LIBNET/%_lib \
+ --disable--dynamicplugin \
+ --enable-flexresp2 \
--enable-linux-smp-stats \
--sysconfdir=%{_sysconfdir}/%{name} \
--with-libxml2-includes=%{_includedir} \
--localstatedir=%{_localstatedir}/lib
-make %{?jobs:-j %jobs}
+make
+#make %{?jobs:-j %jobs}
%install
make DESTDIR=$RPM_BUILD_ROOT install
@@ -162,15 +138,16 @@
mv README README.contrib
cp -p %{SOURCE7} .
cp -p %{SOURCE8} .
-for i in snortdb-extra snortnet.tar snortwatch-0.7.tar Guardian.tar Net-SnortLog-0.1.tar ACID-0.9.6b21.tar Spade-092200.1.tar ; do
- zcat "$i".gz | bzip2 -9 > "$i".bz2
-done
+#for i in snortdb-extra snortnet.tar snortwatch-0.7.tar Guardian.tar Net-SnortLog-0.1.tar ACID-0.9.6b21.tar Spade-092200.1.tar ; do
+# zcat "$i".gz | bzip2 -9 > "$i".bz2
+#done
cd ..
tar xf %{SOURCE9} -C $RPM_BUILD_ROOT/etc/snort rules
tar xf %{SOURCE9} -C doc/signatures docs
mv doc/signatures/docs/* doc/signatures
rmdir doc/signatures/docs
bzip2 -9 doc/signatures/*
+rm -rf $RPM_BUILD_ROOT//usr/src
%clean
rm -rf $RPM_BUILD_ROOT
@@ -206,6 +183,8 @@
%config(noreplace) /etc/logrotate.d/snort
%{_bindir}/*
%{_sbindir}/*
+%_libdir/snort_dynamicengine
+%_libdir/snort_dynamicpreprocessor
%attr(750,snort,snort) %dir %{_localstatedir}/log/snort
%attr(750,snort,snort) %dir %{_localstatedir}/log/snort/archive
%attr(750,snort,snort) %dir %{_localstatedir}/lib/%{name}
@@ -213,18 +192,21 @@
%{_localstatedir}/adm/fillup-templates/sysconfig.snort
%doc COPYING ChangeLog LICENSE
%doc doc/AUTHORS doc/BUGS doc/CREDITS doc/INSTALL doc/NEWS
-%doc doc/PROBLEMS doc/README* doc/RULES.todo doc/TODO doc/USAGE
+%doc doc/PROBLEMS doc/README* doc/TODO doc/USAGE
%doc doc/WISHLIST doc/faq.pdf doc/faq.tex doc/signatures
%doc doc/snort_manual.pdf doc/snort_manual.tex doc/snort_schema_v106.pdf
-%doc contrib/ACID-0.9.6b21.tar.bz2 contrib/Guardian.tar.bz2
-%doc contrib/Net-SnortLog-0.1.tar.bz2 contrib/README.contrib
-%doc contrib/Spade-092200.1.tar.bz2
-%doc contrib/snortdb-extra.bz2 contrib/snortnet.tar.bz2
-%doc contrib/snortwatch-0.7.tar.bz2
-%doc contrib/snort_stat.pl contrib/snortlog3.pl
+#%doc contrib/Net-SnortLog-0.1.tar.bz2 contrib/README.contrib
+#%doc contrib/Spade-092200.1.tar.bz2
+#%doc contrib/snortdb-extra.bz2 contrib/snortnet.tar.bz2
+#%doc contrib/snortwatch-0.7.tar.bz2
+#%doc contrib/snort_stat.pl contrib/snortlog3.pl
%doc schemas
%changelog -n snort
+* Thu Feb 08 2007 - dmueller@suse.de
+- update to 2.6.1.2:
+ * lots of new stream handlers
+ * build against libdnet now
* Sat Sep 30 2006 - olh@suse.de
- src/libnet_version.o depends on version.h
- fix unsigned char usage in libnet
++++++ add-includes.diff ++++++
--- src/dynamic-preprocessors/dcerpc/dcerpc.c
+++ src/dynamic-preprocessors/dcerpc/dcerpc.c
@@ -20,6 +20,7 @@
*
*/
+#include
#include
#include
--- src/dynamic-preprocessors/dcerpc/snort_dcerpc.c
+++ src/dynamic-preprocessors/dcerpc/snort_dcerpc.c
@@ -32,6 +32,8 @@
*
*/
+#include
+
#include "debug.h"
#include "snort_dcerpc.h"
#include "smb_structs.h"
++++++ Community-Rules.tar.bz2 ++++++
++++ 5205 lines of diff (skipped)
++++++ snort-2.4.5.tar.bz2 -> snort-2.6.1.2.tar.bz2 ++++++
++++ 159639 lines of diff (skipped)
++++++ snort.strncat-overflow.patch ++++++
--- /var/tmp/diff_new_pack.L32764/_old 2007-02-09 01:22:24.000000000 +0100
+++ /var/tmp/diff_new_pack.L32764/_new 2007-02-09 01:22:24.000000000 +0100
@@ -1,16 +1,5 @@
-spo_database.c:2568: warning: call to __builtin___strncat_chk might overflow destination buffer
-spp_portscan2.c:247: warning: call to __builtin___strncat_chk might overflow destination buffer
-spp_portscan2.c:361: warning: call to __builtin___strncat_chk might overflow destination buffer
-
----
- src/output-plugins/spo_database.c | 2 +-
- src/preprocessors/spp_portscan2.c | 12 ++++++------
- 2 files changed, 7 insertions(+), 7 deletions(-)
-
-Index: snort-2.4.5/src/output-plugins/spo_database.c
-===================================================================
---- snort-2.4.5.orig/src/output-plugins/spo_database.c
-+++ snort-2.4.5/src/output-plugins/spo_database.c
+--- src/output-plugins/spo_database.c
++++ src/output-plugins/spo_database.c
@@ -2565,7 +2565,7 @@ void Connect(DatabaseData * data)
if( nativeError!=5701 && nativeError!=5703 )
{
@@ -20,33 +9,3 @@
}
errorIndex++;
}
-Index: snort-2.4.5/src/preprocessors/spp_portscan2.c
-===================================================================
---- snort-2.4.5.orig/src/preprocessors/spp_portscan2.c
-+++ snort-2.4.5/src/preprocessors/spp_portscan2.c
-@@ -242,9 +242,9 @@ void ParseScanmungeArgs(u_char *args)
- char logpath[STD_BUF], tmp[STD_BUF];
-
- /* setup the defaults */
-- strncpy(logpath, pv.log_dir, STD_BUF);
-- strncpy(tmp, "/scan.log", STD_BUF);
-- strncat(logpath, tmp, STD_BUF);
-+ i = snprintf(logpath, STD_BUF, "%s/scan.log", pv.log_dir);
-+ if (i < 0 || i >= STD_BUF)
-+ logpath[0] = '\0';
-
- /* way too low of defaults */
- ps2data.scanner_count = DEFAULT_MAX_SCANNER;
-@@ -356,9 +356,9 @@ void ParseScanmungeArgs(u_char *args)
- strncpy (logpath, stoks[1], STD_BUF);
- else
- {
-- strncpy(logpath, pv.log_dir, STD_BUF);
-- strncat(logpath, "/", STD_BUF);
-- strncat(logpath, stoks[1], STD_BUF);
-+ i = snprintf(logpath, STD_BUF, "%s/%s", pv.log_dir, stoks[1]);
-+ if (i < 0 || i >= STD_BUF)
-+ logpath[0] = '\0';
- }
- i++;
- }
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org
