# ChangeLog for net-analyzer/snort
# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/snort/ChangeLog,v 1.80 2005/09/04 02:23:45 soulse Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/snort/ChangeLog,v 1.81 2005/09/17 04:11:28 vanquirius Exp $
+
+*snort-2.4.1 (17 Sep 2005)
+
+ 17 Sep 2005; Marcelo Goes <vanquirius@gentoo.org>
+ +files/snort-2.3.3-log.c.diff, snort-2.3.3.ebuild, snort-2.3.3-r1.ebuild,
+ -snort-2.4.0.ebuild, +snort-2.4.1.ebuild:
+ Add patch and 2.4.1 version bump for bug 105852.
03 Sep 2005; <soulse@gentoo.org> snort-2.4.0.ebuild:
Fixed ebuild as per bug #103482 thanks to yoann@prelude-ids.org
-MD5 bc85f4d7b23c0852ca7fe4e97035b67d ChangeLog 15418
-MD5 53edc4328d9adeaf087c65ea94b1594b metadata.xml 246
+MD5 3b3b84a44f68c6a615cfb86d7abb2700 snort-2.3.3.ebuild 3980
MD5 bca601c10581b168c51558fe0ae04ffb snort-2.3.0-r1.ebuild 4199
+MD5 ba226a5dc5b2cea5d0df8f36fd265ab3 snort-2.4.1.ebuild 4075
+MD5 71813a2f35fde73dae622dac926c50ab snort-2.3.3-r1.ebuild 4045
MD5 8cca347231e9fe3363163759a3518c0b snort-2.3.2.ebuild 4205
-MD5 3472932670976df4f4c9f147ee35b5fd snort-2.3.3-r1.ebuild 3974
-MD5 ed632830d73e468735c73dc4acaa0cc2 snort-2.3.3.ebuild 3903
-MD5 50f08774be8ad4a68f96b596791c6cb8 snort-2.4.0.ebuild 4053
+MD5 4591ac584f54082e0e2a6e858fdd9b0a ChangeLog 15674
+MD5 53edc4328d9adeaf087c65ea94b1594b metadata.xml 246
+MD5 04f9ed946469f7954b6bd27f8f1aca39 files/digest-snort-2.3.3-r1 284
+MD5 919058894f4983c35900bc8bb98a96d4 files/snort.rc6 764
MD5 564bfdf90fe29f5924c68885ccfcddb8 files/2.3.0-libnet-1.0.patch 5424
-MD5 a9fc70d50c4512c835aa428f4b198fae files/digest-snort-2.3.0-r1 287
MD5 5d26c971694357c500d666e68622a120 files/digest-snort-2.3.2 287
MD5 24851ef65be2d80a70ba4bebe3e8c0ff files/digest-snort-2.3.3 287
-MD5 04f9ed946469f7954b6bd27f8f1aca39 files/digest-snort-2.3.3-r1 284
-MD5 aa391777096e34289f4f134153224986 files/digest-snort-2.4.0 271
+MD5 3ff2d04cb5adac55b4f35c28326f0fb0 files/digest-snort-2.4.1 271
MD5 446f8d2b3435b8a6be738da978670605 files/snort.confd 423
-MD5 919058894f4983c35900bc8bb98a96d4 files/snort.rc6 764
+MD5 d212aff92317ccfae4c2228de5f9e5cb files/snort-2.3.3-log.c.diff 4781
+MD5 a9fc70d50c4512c835aa428f4b198fae files/digest-snort-2.3.0-r1 287
-MD5 033e21190c5308fe69857908285feed1 snort-2.4.0.tar.gz 2126176
+MD5 7b7d36e063a674fd9cc324969012f32a snort-2.4.1.tar.gz 2695304
MD5 316f28cf52efeddfd899552f3b26cd8d snort-2.4.0-genpatches.tar.bz2 6475
MD5 39d8250f47a33aaec4712e29c0dcd1d0 Community-Rules.tar.gz 11678
MD5 2eeef1a7a040d67c3afaf9d749905e47 snortsam-20050110.tar.gz 29395
--- /dev/null
+--- snort-2.3.3.orig/src/log.c 2005-09-17 00:34:21.000000000 -0300
++++ snort-2.3.3/src/log.c 2005-09-17 00:47:50.000000000 -0300
+@@ -1478,7 +1478,10 @@
+ {
+ for(j = 0; j < p->ip_options[i].len; j++)
+ {
+- fprintf(fp, "%02X", p->ip_options[i].data[j]);
++ if (p->ip_options[i].data)
++ fprintf(fp, "%02X", p->ip_options[i].data[j]);
++ else
++ fprintf(fp, "%02X", 0);
+
+ if((j % 2) == 0)
+ fprintf(fp, " ");
+@@ -1522,7 +1525,8 @@
+ case TCPOPT_MAXSEG:
+ bzero((char *) tmp, 5);
+ fwrite("MSS: ", 5, 1, fp);
+- memcpy(tmp, p->tcp_options[i].data, 2);
++ if (p->tcp_options[i].data)
++ memcpy(tmp, p->tcp_options[i].data, 2);
+ fprintf(fp, "%u ", EXTRACT_16BITS(tmp));
+ break;
+
+@@ -1535,15 +1539,20 @@
+ break;
+
+ case TCPOPT_WSCALE:
+- fprintf(fp, "WS: %u ", p->tcp_options[i].data[0]);
++ if (p->tcp_options[i].data)
++ fprintf(fp, "WS: %u ", p->tcp_options[i].data[0]);
++ else
++ fprintf(fp, "WS: %u ", 0);
+ break;
+
+ case TCPOPT_SACK:
+ bzero((char *) tmp, 5);
+- memcpy(tmp, p->tcp_options[i].data, 2);
++ if (p->tcp_options[i].data)
++ memcpy(tmp, p->tcp_options[i].data, 2);
+ fprintf(fp, "Sack: %u@", EXTRACT_16BITS(tmp));
+ bzero((char *) tmp, 5);
+- memcpy(tmp, (p->tcp_options[i].data) + 2, 2);
++ if (p->tcp_options[i].data)
++ memcpy(tmp, (p->tcp_options[i].data) + 2, 2);
+ fprintf(fp, "%u ", EXTRACT_16BITS(tmp));
+ break;
+
+@@ -1553,40 +1562,47 @@
+
+ case TCPOPT_ECHO:
+ bzero((char *) tmp, 5);
+- memcpy(tmp, p->tcp_options[i].data, 4);
++ if (p->tcp_options[i].data)
++ memcpy(tmp, p->tcp_options[i].data, 4);
+ fprintf(fp, "Echo: %u ", EXTRACT_32BITS(tmp));
+ break;
+
+ case TCPOPT_ECHOREPLY:
+ bzero((char *) tmp, 5);
+- memcpy(tmp, p->tcp_options[i].data, 4);
++ if (p->tcp_options[i].data)
++ memcpy(tmp, p->tcp_options[i].data, 4);
+ fprintf(fp, "Echo Rep: %u ", EXTRACT_32BITS(tmp));
+ break;
+
+ case TCPOPT_TIMESTAMP:
+ bzero((char *) tmp, 5);
+- memcpy(tmp, p->tcp_options[i].data, 4);
++ if (p->tcp_options[i].data)
++ memcpy(tmp, p->tcp_options[i].data, 4);
+ fprintf(fp, "TS: %u ", EXTRACT_32BITS(tmp));
+ bzero((char *) tmp, 5);
+- memcpy(tmp, (p->tcp_options[i].data) + 4, 4);
++ if (p->tcp_options[i].data)
++ memcpy(tmp, (p->tcp_options[i].data) + 4, 4);
+ fprintf(fp, "%u ", EXTRACT_32BITS(tmp));
+ break;
+
+ case TCPOPT_CC:
+ bzero((char *) tmp, 5);
+- memcpy(tmp, p->tcp_options[i].data, 4);
++ if (p->tcp_options[i].data)
++ memcpy(tmp, p->tcp_options[i].data, 4);
+ fprintf(fp, "CC %u ", EXTRACT_32BITS(tmp));
+ break;
+
+ case TCPOPT_CCNEW:
+ bzero((char *) tmp, 5);
+- memcpy(tmp, p->tcp_options[i].data, 4);
++ if (p->tcp_options[i].data)
++ memcpy(tmp, p->tcp_options[i].data, 4);
+ fprintf(fp, "CCNEW: %u ", EXTRACT_32BITS(tmp));
+ break;
+
+ case TCPOPT_CCECHO:
+ bzero((char *) tmp, 5);
+- memcpy(tmp, p->tcp_options[i].data, 4);
++ if (p->tcp_options[i].data)
++ memcpy(tmp, p->tcp_options[i].data, 4);
+ fprintf(fp, "CCECHO: %u ", EXTRACT_32BITS(tmp));
+ break;
+
+@@ -1598,7 +1614,10 @@
+
+ for(j = 0; j < p->tcp_options[i].len; j++)
+ {
+- fprintf(fp, "%02X", p->tcp_options[i].data[j]);
++ if (p->tcp_options[i].data)
++ fprintf(fp, "%02X", p->tcp_options[i].data[j]);
++ else
++ fprintf(fp, "%02X", 0);
+
+ if((j % 2) == 0)
+ fprintf(fp, " ");
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/snort/snort-2.3.3-r1.ebuild,v 1.8 2005/08/23 13:50:11 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/snort/snort-2.3.3-r1.ebuild,v 1.9 2005/09/17 04:11:28 vanquirius Exp $
inherit eutils gnuconfig flag-o-matic
src_unpack() {
unpack ${A}
- cd ${S}
+ cd "${S}"
gnuconfig_update
if use flexresp || use inline ; then
- epatch ${FILESDIR}/2.3.0-libnet-1.0.patch
+ epatch "${FILESDIR}/2.3.0-libnet-1.0.patch"
fi
sed -i "s:var RULE_PATH ../rules:var RULE_PATH /etc/snort/rules:" \
etc/snort.conf || die "sed snort.conf failed"
if use prelude ; then
- epatch ${DISTDIR}/${P}-prelude-0.9.0_rc1.diff.bz2
+ epatch "${WORKDIR}/${P}-prelude-0.9.0_rc1.diff"
sed -i -e "s:AC_PROG_RANLIB:AC_PROG_LIBTOOL:" configure.in \
|| die "sed configure.in failed"
fi
if use sguil ; then
- cd ${S}/src/preprocessors
- epatch ${WORKDIR}/sguil-0.5.3/sensor/snort_mods/2_1/spp_portscan_sguil.patch
- epatch ${WORKDIR}/sguil-0.5.3/sensor/snort_mods/2_1/spp_stream4_sguil.patch
- cd ${S}
+ cd "${S}/src/preprocessors"
+ epatch "${WORKDIR}/sguil-0.5.3/sensor/snort_mods/2_1/spp_portscan_sguil.patch"
+ epatch "${WORKDIR}/sguil-0.5.3/sensor/snort_mods/2_1/spp_stream4_sguil.patch"
+ cd "${S}"
fi
if use snortsam ; then
cd ..
einfo "Applying snortsam patch"
- ./patchsnort.sh ${S} || die "snortsam patch failed"
- cd ${S}
+ ./patchsnort.sh "${S}" || die "snortsam patch failed"
+ cd "${S}"
fi
+ # bug 105852
+ epatch "${FILESDIR}/${P}-log.c.diff"
+
+
einfo "Regenerating autoconf/automake files"
autoreconf -f -i || die "autoreconf failed"
}
keepdir /var/log/snort/
- dodoc COPYING LICENSE doc/*
+ dodoc LICENSE doc/*
docinto schemas ; dodoc schemas/*
insinto /etc/snort
use prelude && doins etc/prelude-classification.config
- newinitd ${FILESDIR}/snort.rc6 snort
- newconfd ${FILESDIR}/snort.confd snort
+ newinitd "${FILESDIR}/snort.rc6" snort
+ newconfd "${FILESDIR}/snort.confd" snort
- chown snort:snort ${D}/var/log/snort
- chmod 0770 ${D}/var/log/snort
+ chown snort:snort "${D}/var/log/snort"
+ chmod 0770 "${D}/var/log/snort"
}
pkg_postinst() {
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/snort/snort-2.3.3.ebuild,v 1.4 2005/08/23 13:50:11 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/snort/snort-2.3.3.ebuild,v 1.5 2005/09/17 04:11:28 vanquirius Exp $
inherit eutils gnuconfig flag-o-matic
postgres? ( >=dev-db/postgresql-7.2 )
mysql? ( >=dev-db/mysql-3.23.26 )
ssl? ( >=dev-libs/openssl-0.9.6b )
- prelude? ( >=dev-libs/libprelude-0.8 )
+ prelude? ( <dev-libs/libprelude-0.9.0_rc1 )
odbc? ( dev-db/unixODBC )
inline? (
~net-libs/libnet-1.0.2a
src_unpack() {
unpack ${A}
- cd ${S}
+ cd "${S}"
gnuconfig_update
if use flexresp || use inline ; then
- epatch ${FILESDIR}/2.3.0-libnet-1.0.patch
+ epatch "${FILESDIR}/2.3.0-libnet-1.0.patch"
fi
sed -i "s:var RULE_PATH ../rules:var RULE_PATH /etc/snort:" \
fi
if use sguil ; then
- cd ${S}/src/preprocessors
- epatch ${WORKDIR}/sguil-0.5.3/sensor/snort_mods/2_1/spp_portscan_sguil.patch
- epatch ${WORKDIR}/sguil-0.5.3/sensor/snort_mods/2_1/spp_stream4_sguil.patch
- cd ${S}
+ cd "${S}/src/preprocessors"
+ epatch "${WORKDIR}/sguil-0.5.3/sensor/snort_mods/2_1/spp_portscan_sguil.patch"
+ epatch "${WORKDIR}/sguil-0.5.3/sensor/snort_mods/2_1/spp_stream4_sguil.patch"
+ cd "${S}"
fi
if use snortsam ; then
cd ..
einfo "Applying snortsam patch"
- ./patchsnort.sh ${S} || die "snortsam patch failed"
- cd ${S}
+ ./patchsnort.sh "${S}" || die "snortsam patch failed"
+ cd "${S}"
fi
+ # bug 105852
+ epatch "${FILESDIR}/${P}-log.c.diff"
+
einfo "Regenerating autoconf/automake files"
autoreconf -f -i || die "autoreconf failed"
}
keepdir /var/log/snort/
- dodoc COPYING LICENSE doc/*
+ dodoc LICENSE doc/*
docinto schemas ; dodoc schemas/*
insinto /etc/snort
use prelude && doins etc/prelude-classification.config
- newinitd ${FILESDIR}/snort.rc6 snort
- newconfd ${FILESDIR}/snort.confd snort
+ newinitd "${FILESDIR}/snort.rc6" snort
+ newconfd "${FILESDIR}/snort.confd" snort
- chown snort:snort ${D}/var/log/snort
- chmod 0770 ${D}/var/log/snort
+ chown snort:snort "${D}/var/log/snort"
+ chmod 0770 "${D}/var/log/snort"
}
pkg_postinst() {
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/snort/snort-2.4.0.ebuild,v 1.7 2005/09/04 02:14:27 soulse Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/snort/snort-2.4.1.ebuild,v 1.1 2005/09/17 04:11:28 vanquirius Exp $
inherit eutils gnuconfig flag-o-matic
src_unpack() {
unpack ${A}
- cd ${S}
+ cd "${S}"
gnuconfig_update
if use flexresp || use inline ; then
- epatch ${WORKDIR}/2.4.0-libnet-1.0.patch
+ epatch "${WORKDIR}/2.4.0-libnet-1.0.patch"
fi
sed -i "s:var RULE_PATH ../rules:var RULE_PATH /etc/snort/rules:" \
fi
if use sguil ; then
- epatch ${WORKDIR}/2.4.0-spp_portscan_sguil.patch
- epatch ${WORKDIR}/2.4.0-spp_stream4_sguil.patch
+ epatch "${WORKDIR}/2.4.0-spp_portscan_sguil.patch"
+ epatch "${WORKDIR}/2.4.0-spp_stream4_sguil.patch"
fi
if use snortsam ; then
cd ..
einfo "Applying snortsam patch"
- ./patchsnort.sh ${S} || die "snortsam patch failed"
- cd ${S}
+ ./patchsnort.sh "${S}" || die "snortsam patch failed"
+ cd "${S}"
fi
einfo "Regenerating autoconf/automake files"
keepdir /var/log/snort/
- dodoc COPYING LICENSE doc/*
+ dodoc LICENSE doc/*
docinto schemas ; dodoc schemas/*
insinto /etc/snort
# use prelude && doins etc/prelude-classification.config
- newinitd ${FILESDIR}/snort.rc6 snort
- newconfd ${FILESDIR}/snort.confd snort
+ newinitd "${FILESDIR}/snort.rc6" snort
+ newconfd "${FILESDIR}/snort.confd" snort
- chown snort:snort ${D}/var/log/snort
- chmod 0770 ${D}/var/log/snort
+ chown snort:snort "${D}/var/log/snort"
+ chmod 0770 "${D}/var/log/snort"
# install community rules
- mkdir ${D}/etc/snort/rules
- mv ${WORKDIR}/rules/* ${D}/etc/snort/rules/
+ mkdir "${D}/etc/snort/rules"
+ mv "${WORKDIR}/rules/*" "${D}/etc/snort/rules/"
}
pkg_postinst() {
projects / gentoo.git / commitdiff