diff options
author | Marcelo Góes <vanquirius@gentoo.org> | 2005-09-17 04:11:28 +0000 |
---|---|---|
committer | Marcelo Góes <vanquirius@gentoo.org> | 2005-09-17 04:11:28 +0000 |
commit | 13511a1f2c897bd71a083e5514125395fac72dbb (patch) | |
tree | c938d20d94f6801b7489cfd295241ed835abbe10 /net-analyzer/snort | |
parent | old (diff) | |
download | gentoo-2-13511a1f2c897bd71a083e5514125395fac72dbb.tar.gz gentoo-2-13511a1f2c897bd71a083e5514125395fac72dbb.tar.bz2 gentoo-2-13511a1f2c897bd71a083e5514125395fac72dbb.zip |
bug 105852
(Portage version: 2.0.51.22-r2)
Diffstat (limited to 'net-analyzer/snort')
-rw-r--r-- | net-analyzer/snort/ChangeLog | 9 | ||||
-rw-r--r-- | net-analyzer/snort/Manifest | 19 | ||||
-rw-r--r-- | net-analyzer/snort/files/digest-snort-2.4.1 (renamed from net-analyzer/snort/files/digest-snort-2.4.0) | 2 | ||||
-rw-r--r-- | net-analyzer/snort/files/snort-2.3.3-log.c.diff | 115 | ||||
-rw-r--r-- | net-analyzer/snort/snort-2.3.3-r1.ebuild | 34 | ||||
-rw-r--r-- | net-analyzer/snort/snort-2.3.3.ebuild | 33 | ||||
-rw-r--r-- | net-analyzer/snort/snort-2.4.1.ebuild (renamed from net-analyzer/snort/snort-2.4.0.ebuild) | 28 |
7 files changed, 185 insertions, 55 deletions
diff --git a/net-analyzer/snort/ChangeLog b/net-analyzer/snort/ChangeLog index e905c2672948..01134a1c0d9d 100644 --- a/net-analyzer/snort/ChangeLog +++ b/net-analyzer/snort/ChangeLog @@ -1,6 +1,13 @@ # 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 diff --git a/net-analyzer/snort/Manifest b/net-analyzer/snort/Manifest index 9ee67e363e8a..afd4f2e995ed 100644 --- a/net-analyzer/snort/Manifest +++ b/net-analyzer/snort/Manifest @@ -1,15 +1,16 @@ -MD5 bc85f4d7b23c0852ca7fe4e97035b67d ChangeLog 15418 -MD5 53edc4328d9adeaf087c65ea94b1594b metadata.xml 246 +MD5 f3cf3d21ac2d315840b035e9a9dc3cfc snort-2.3.3.ebuild 3977 MD5 bca601c10581b168c51558fe0ae04ffb snort-2.3.0-r1.ebuild 4199 +MD5 718685d58f9bebf881c4a218e128bb04 snort-2.4.1.ebuild 4071 +MD5 abfd5b30e9b73488e8312ac8a09ff5cf snort-2.3.3-r1.ebuild 4042 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 bc85f4d7b23c0852ca7fe4e97035b67d ChangeLog 15418 +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 diff --git a/net-analyzer/snort/files/digest-snort-2.4.0 b/net-analyzer/snort/files/digest-snort-2.4.1 index c74a62a90d57..83b034db1b5e 100644 --- a/net-analyzer/snort/files/digest-snort-2.4.0 +++ b/net-analyzer/snort/files/digest-snort-2.4.1 @@ -1,4 +1,4 @@ -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 diff --git a/net-analyzer/snort/files/snort-2.3.3-log.c.diff b/net-analyzer/snort/files/snort-2.3.3-log.c.diff new file mode 100644 index 000000000000..d1286b1dd5ef --- /dev/null +++ b/net-analyzer/snort/files/snort-2.3.3-log.c.diff @@ -0,0 +1,115 @@ +--- 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, " "); diff --git a/net-analyzer/snort/snort-2.3.3-r1.ebuild b/net-analyzer/snort/snort-2.3.3-r1.ebuild index d65ba9e7c2ff..354da74001f8 100644 --- a/net-analyzer/snort/snort-2.3.3-r1.ebuild +++ b/net-analyzer/snort/snort-2.3.3-r1.ebuild @@ -1,6 +1,6 @@ # 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 @@ -42,36 +42,40 @@ pkg_setup() { 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" } @@ -103,7 +107,7 @@ src_install() { keepdir /var/log/snort/ - dodoc COPYING LICENSE doc/* + dodoc LICENSE doc/* docinto schemas ; dodoc schemas/* insinto /etc/snort @@ -115,11 +119,11 @@ src_install() { 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() { diff --git a/net-analyzer/snort/snort-2.3.3.ebuild b/net-analyzer/snort/snort-2.3.3.ebuild index 8f1eba0d7599..d22c53bf11fb 100644 --- a/net-analyzer/snort/snort-2.3.3.ebuild +++ b/net-analyzer/snort/snort-2.3.3.ebuild @@ -1,6 +1,6 @@ # 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 @@ -23,7 +23,7 @@ DEPEND="virtual/libc 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 @@ -37,11 +37,11 @@ RDEPEND="${DEPEND} 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:" \ @@ -54,19 +54,22 @@ src_unpack() { 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" } @@ -103,7 +106,7 @@ src_install() { keepdir /var/log/snort/ - dodoc COPYING LICENSE doc/* + dodoc LICENSE doc/* docinto schemas ; dodoc schemas/* insinto /etc/snort @@ -113,11 +116,11 @@ src_install() { 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() { diff --git a/net-analyzer/snort/snort-2.4.0.ebuild b/net-analyzer/snort/snort-2.4.1.ebuild index a9234e72cb1a..666e651a883f 100644 --- a/net-analyzer/snort/snort-2.4.0.ebuild +++ b/net-analyzer/snort/snort-2.4.1.ebuild @@ -1,6 +1,6 @@ # 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 @@ -42,11 +42,11 @@ pkg_setup() { 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:" \ @@ -58,15 +58,15 @@ src_unpack() { 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" @@ -104,7 +104,7 @@ src_install() { keepdir /var/log/snort/ - dodoc COPYING LICENSE doc/* + dodoc LICENSE doc/* docinto schemas ; dodoc schemas/* insinto /etc/snort @@ -114,15 +114,15 @@ src_install() { # 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() { |