Gentoo Archives: gentoo-commits

From: "Jakov Smolić" <jsmolic@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-analyzer/snortsam/files/, profiles/, net-analyzer/snortsam/
Date: Sat, 31 Dec 2022 18:32:52
Message-Id: 1672511452.0543ca771f5413c1952933b386bc86135e806c18.jsmolic@gentoo
1 commit: 0543ca771f5413c1952933b386bc86135e806c18
2 Author: Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
3 AuthorDate: Sat Dec 31 18:15:49 2022 +0000
4 Commit: Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
5 CommitDate: Sat Dec 31 18:30:52 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0543ca77
7
8 net-analyzer/snortsam: treeclean
9
10 Closes: https://bugs.gentoo.org/805296
11 Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org>
12
13 net-analyzer/snortsam/Manifest | 1 -
14 .../snortsam/files/snortsam-2.70-gentoo.patch | 140 ---------------------
15 net-analyzer/snortsam/metadata.xml | 8 --
16 net-analyzer/snortsam/snortsam-2.70-r1.ebuild | 45 -------
17 profiles/package.mask | 5 -
18 5 files changed, 199 deletions(-)
19
20 diff --git a/net-analyzer/snortsam/Manifest b/net-analyzer/snortsam/Manifest
21 deleted file mode 100644
22 index e341252bae98..000000000000
23 --- a/net-analyzer/snortsam/Manifest
24 +++ /dev/null
25 @@ -1 +0,0 @@
26 -DIST snortsam-src-2.70.tar.gz 1971624 BLAKE2B 10f26afb8addffb52db099e0c376a9adb884b625503233b72203070cadc79a688c7a6950014759d6fb58c8844899482057d9701e9eaa5e9d12066f10e88d6421 SHA512 e0b6d53dfc0963e5a0012e25c1cd15f76263cc0d0158f6a50eab3876f1ae40c47eeafb7309113d27f1ca92d5491a19e32748c3bf51754be9320346ebbf26e5b1
27
28 diff --git a/net-analyzer/snortsam/files/snortsam-2.70-gentoo.patch b/net-analyzer/snortsam/files/snortsam-2.70-gentoo.patch
29 deleted file mode 100644
30 index f2d8fd330d33..000000000000
31 --- a/net-analyzer/snortsam/files/snortsam-2.70-gentoo.patch
32 +++ /dev/null
33 @@ -1,140 +0,0 @@
34 - makesnortsam.sh | 66 +++++++++++++++++++++------------------------------------
35 - 1 file changed, 24 insertions(+), 42 deletions(-)
36 -
37 -diff --git a/makesnortsam.sh b/makesnortsam.sh
38 -index 64c6eb6..37f66c9 100644
39 ---- a/makesnortsam.sh
40 -+++ b/makesnortsam.sh
41 -@@ -36,8 +36,7 @@ SSP_OBSD_SRC="ssp_pf.c ssp_pf2.c"
42 - SSP_BSD_SRC="ssp_ipf.c ssp_ipfw2.c ssp_pf2.c"
43 - SSP_SUNOS_SRC="ssp_ipf.c"
44 -
45 --CFLAGS="-O2 -D${systype}"
46 --LDFLAGS=
47 -+CFLAGS=" ${CFLAGS} -D${systype}"
48 -
49 - # OS specific flags
50 - LINUX_CFLAGS=
51 -@@ -72,23 +71,23 @@ case "$1" in
52 -
53 - case "${systype}" in
54 - Linux*)
55 -- gcc ${CFLAGS} ${LINUX_CFLAGS} ${OPSEC_CFLAGS} ${LDFLAGS} ${LINUX_LDFLAGS} ${OPSEC_LDFLAGS} ${OPSEC_LIBS} \
56 -- ${SSP_GENERIC_SRC} ${SSP_LINUX_SRC} -o ${SNORTSAM}
57 -+ ${CC} ${CFLAGS} ${LINUX_CFLAGS} ${OPSEC_CFLAGS} ${LDFLAGS} \
58 -+ ${SSP_GENERIC_SRC} ${SSP_LINUX_SRC} -o ${SNORTSAM} ${LINUX_LDFLAGS} ${OPSEC_LDFLAGS} ${OPSEC_LIBS}
59 - ;;
60 -
61 - OpenBSD*)
62 -- #gcc ${CFLAGS} ${OBSD_CFLAGS} ${OPSEC_CFLAGS} ${LDFLAGS} ${OBSD_LDFLAGS} ${OPSEC_LIBS} /usr/lib/libnsl.a -o ${SNORTSAM}
63 -- gcc ${CFLAGS} ${OBSD_CFLAGS} ${OPSEC_CFLAGS} ${LDFLAGS} ${OBSD_LDFLAGS} ${OPSEC_LDFLAGS} ${OPSEC_LIBS} \
64 -+ #${CC} ${CFLAGS} ${OBSD_CFLAGS} ${OPSEC_CFLAGS} ${LDFLAGS} ${OBSD_LDFLAGS} ${OPSEC_LIBS} /usr/lib/libnsl.a -o ${SNORTSAM}
65 -+ ${CC} ${CFLAGS} ${OBSD_CFLAGS} ${OPSEC_CFLAGS} ${LDFLAGS} ${OBSD_LDFLAGS} ${OPSEC_LDFLAGS} ${OPSEC_LIBS} \
66 - ${SSP_GENERIC_SRC} ${SSP_OBSD_SRC} -o ${SNORTSAM}
67 - ;;
68 -
69 - *BSD*)
70 -- gcc ${CFLAGS} ${BSD_CFLAGS} ${OPSEC_CFLAGS} ${LDFLAGS} ${BSD_LDFLAGS} ${OPSEC_LDFLAGS} ${OPSEC_LIBS} \
71 -+ ${CC} ${CFLAGS} ${BSD_CFLAGS} ${OPSEC_CFLAGS} ${LDFLAGS} ${BSD_LDFLAGS} ${OPSEC_LDFLAGS} ${OPSEC_LIBS} \
72 - ${SSP_GENERIC_SRC} ${SSP_BSD_SRC} -o ${SNORTSAM}
73 - ;;
74 -
75 - SunOS*)
76 -- gcc ${CFLAGS} ${SUNOS_CFLAGS} ${OPSEC_SUNOS_CFLAGS} ${LDFLAGS} ${SUNOS_LDFLAGS} ${OPSEC_SUNOS_LDFLAGS} \
77 -+ ${CC} ${CFLAGS} ${SUNOS_CFLAGS} ${OPSEC_SUNOS_CFLAGS} ${LDFLAGS} ${SUNOS_LDFLAGS} ${OPSEC_SUNOS_LDFLAGS} \
78 - ${SSP_GENERIC_SRC} ${SSP_SUNOS_SRC} -o ${SNORTSAM}
79 - ;;
80 - esac
81 -@@ -104,23 +103,23 @@ case "$1" in
82 -
83 - case "${systype}" in
84 - Linux*)
85 -- gcc ${CFLAGS} ${LINUX_CFLAGS} ${OPSEC_CFLAGS} ${LDFLAGS} ${LINUX_LDFLAGS} ${OPSEC_LDFLAGS} ${OPSEC_LIBS} \
86 -+ ${CC} ${CFLAGS} ${LINUX_CFLAGS} ${OPSEC_CFLAGS} ${LDFLAGS} ${LINUX_LDFLAGS} ${OPSEC_LDFLAGS} ${OPSEC_LIBS} \
87 - ${SSP_GENERIC_SRC} ${SSP_LINUX_SRC} -o ${SNORTSAM}
88 - ;;
89 -
90 - OpenBSD*)
91 -- #gcc ${CFLAGS} ${OBSD_CFLAGS} ${OPSEC_CFLAGS} ${LDFLAGS} ${OBSD_LDFLAGS} ${OPSEC_LIBS} /usr/lib/libnsl.a -o ${SNORTSAM}
92 -- gcc ${CFLAGS} ${OBSD_CFLAGS} ${OPSEC_CFLAGS} ${LDFLAGS} ${OBSD_LDFLAGS} ${OPSEC_LDFLAGS} ${OPSEC_LIBS} \
93 -+ #${CC} ${CFLAGS} ${OBSD_CFLAGS} ${OPSEC_CFLAGS} ${LDFLAGS} ${OBSD_LDFLAGS} ${OPSEC_LIBS} /usr/lib/libnsl.a -o ${SNORTSAM}
94 -+ ${CC} ${CFLAGS} ${OBSD_CFLAGS} ${OPSEC_CFLAGS} ${LDFLAGS} ${OBSD_LDFLAGS} ${OPSEC_LDFLAGS} ${OPSEC_LIBS} \
95 - ${SSP_GENERIC_SRC} ${SSP_OBSD_SRC} -o ${SNORTSAM}
96 - ;;
97 -
98 - *BSD*)
99 -- gcc ${CFLAGS} ${BSD_CFLAGS} ${OPSEC_CFLAGS} ${LDFLAGS} ${BSD_LDFLAGS} ${OPSEC_LDFLAGS} ${OPSEC_LIBS} \
100 -+ ${CC} ${CFLAGS} ${BSD_CFLAGS} ${OPSEC_CFLAGS} ${LDFLAGS} ${BSD_LDFLAGS} ${OPSEC_LDFLAGS} ${OPSEC_LIBS} \
101 - ${SSP_GENERIC_SRC} ${SSP_BSD_SRC} -o ${SNORTSAM}
102 - ;;
103 -
104 - SunOS*)
105 -- gcc ${CFLAGS} ${SUNOS_CFLAGS} ${OPSEC_SUNOS_CFLAGS} ${LDFLAGS} ${SUNOS_LDFLAGS} ${OPSEC_SUNOS_LDFLAGS} \
106 -+ ${CC} ${CFLAGS} ${SUNOS_CFLAGS} ${OPSEC_SUNOS_CFLAGS} ${LDFLAGS} ${SUNOS_LDFLAGS} ${OPSEC_SUNOS_LDFLAGS} \
107 - ${SSP_GENERIC_SRC} ${SSP_SUNOS_SRC} -o ${SNORTSAM}
108 - ;;
109 - esac
110 -@@ -152,10 +151,10 @@ case "$1" in
111 - rm -f ${SAMTOOL}-debug
112 -
113 - case "${systype}" in
114 -- Linux*) gcc ${CFLAGS} ${LINUX_CFLAGS} ${LDFLAGS} ${LINUX_LDFLAGS} ${SAMTOOL_SRC} -o ${SAMTOOL} ;;
115 -- OpenBSD*) gcc ${CFLAGS} ${OBSD_CFLAGS} ${LDFLAGS} ${OBSD_LDFLAGS} ${SAMTOOL_SRC} -o ${SAMTOOL} ;;
116 -- *BSD*) gcc ${CFLAGS} ${BSD_CFLAGS} ${LDFLAGS} ${BSD_LDFLAGS} ${SAMTOOL_SRC} -o ${SAMTOOL} ;;
117 -- SunOS) gcc ${CFLAGS} ${SUNOS_CFLAGS} ${LDFLAGS} ${SUNOS_LDFLAGS} ${SAMTOOL_SRC} -o ${SAMTOOL} ;;
118 -+ Linux*) echo ${CC} ${CFLAGS} ${LINUX_CFLAGS} ${LDFLAGS} ${LINUX_LDFLAGS} ${SAMTOOL_SRC} -o ${SAMTOOL} ; ${CC} ${CFLAGS} ${LINUX_CFLAGS} ${LINUX_LDFLAGS} ${SAMTOOL_SRC} -o ${SAMTOOL} ; [ $? = 0 ] || exit 1;;
119 -+ OpenBSD*) echo ${CC} ${CFLAGS} ${OBSD_CFLAGS} ${LDFLAGS} ${OBSD_LDFLAGS} ${SAMTOOL_SRC} -o ${SAMTOOL} ; ${CC} ${CFLAGS} ${OBSD_CFLAGS} ${OBSD_LDFLAGS} ${SAMTOOL_SRC} -o ${SAMTOOL} ; [ $? = 0 ] || exit 1;;
120 -+ *BSD*) echo ${CC} ${CFLAGS} ${BSD_CFLAGS} ${LDFLAGS} ${BSD_LDFLAGS} ${SAMTOOL_SRC} -o ${SAMTOOL} ; ${CC} ${CFLAGS} ${BSD_CFLAGS} ${BSD_LDFLAGS} ${SAMTOOL_SRC} -o ${SAMTOOL} ; [ $? = 0 ] || exit 1;;
121 -+ SunOS) echo ${CC} ${CFLAGS} ${SUNOS_CFLAGS} ${LDFLAGS} ${SUNOS_LDFLAGS} ${SAMTOOL_SRC} -o ${SAMTOOL} ; ${CC} ${CFLAGS} ${SUNOS_CFLAGS} $${SUNOS_LDFLAGS} ${SAMTOOL_SRC} -o ${SAMTOOL} ; [ $? = 0 ] || exit 1;;
122 - esac
123 -
124 - echo "-------------------------------------------------------------------------------"
125 -@@ -167,10 +166,10 @@ case "$1" in
126 - SAMTOOL="${SAMTOOL}-debug"
127 -
128 - case "${systype}" in
129 -- Linux*) gcc ${CFLAGS} ${LINUX_CFLAGS} ${LDFLAGS} ${LINUX_LDFLAGS} ${SAMTOOL_SRC} -o ${SAMTOOL} ;;
130 -- OpenBSD*) gcc ${CFLAGS} ${OBSD_CFLAGS} ${LDFLAGS} ${OBSD_LDFLAGS} ${SAMTOOL_SRC} -o ${SAMTOOL} ;;
131 -- *BSD*) gcc ${CFLAGS} ${BSD_CFLAGS} ${LDFLAGS} ${BSD_LDFLAGS} ${SAMTOOL_SRC} -o ${SAMTOOL} ;;
132 -- SunOS) gcc ${CFLAGS} ${SUNOS_CFLAGS} ${LDFLAGS} ${SUNOS_LDFLAGS} ${SAMTOOL_SRC} -o ${SAMTOOL} ;;
133 -+ Linux*) echo ${CC} ${CFLAGS} ${LINUX_CFLAGS} ${LDFLAGS} ${SAMTOOL_SRC} -o ${SAMTOOL} ${LINUX_LDFLAGS}; ${CC} ${CFLAGS} ${LINUX_CFLAGS} ${LINUX_LDFLAGS} ${SAMTOOL_SRC} -o ${SAMTOOL} ${LINUX_LDFLAGS}; [ $? = 0 ] || exit 1;;
134 -+ OpenBSD*) echo ${CC} ${CFLAGS} ${OBSD_CFLAGS} ${LDFLAGS} ${OBSD_LDFLAGS} ${SAMTOOL_SRC} -o ${SAMTOOL} ; ${CC} ${CFLAGS} ${OBSD_CFLAGS} ${OBSD_LDFLAGS} ${SAMTOOL_SRC} -o ${SAMTOOL} ; [ $? = 0 ] || exit 1;;
135 -+ *BSD*) echo ${CC} ${CFLAGS} ${BSD_CFLAGS} ${LDFLAGS} ${BSD_LDFLAGS} ${SAMTOOL_SRC} -o ${SAMTOOL} ; ${CC} ${CFLAGS} ${BSD_CFLAGS} ${BSD_LDFLAGS} ${SAMTOOL_SRC} -o ${SAMTOOL} ; [ $? = 0 ] || exit 1;;
136 -+ SunOS) echo ${CC} ${CFLAGS} ${SUNOS_CFLAGS} ${LDFLAGS} ${SUNOS_LDFLAGS} ${SAMTOOL_SRC} -o ${SAMTOOL} ; ${CC} ${CFLAGS} ${SUNOS_CFLAGS} ${SUNOS_LDFLAGS} ${SAMTOOL_SRC} -o ${SAMTOOL} ; [ $? = 0 ] || exit 1;;
137 - esac
138 - cd ..
139 - ;;
140 -@@ -186,29 +185,12 @@ case "$1" in
141 - rm -f ${SNORTSAM}-debug
142 -
143 - case "${systype}" in
144 -- Linux*) gcc ${CFLAGS} ${LINUX_CFLAGS} ${LDFLAGS} ${LINUX_LDFLAGS} ${SSP_GENERIC_SRC} ${SSP_LINUX_SRC} -o ${SNORTSAM} ;;
145 -- OpenBSD*) gcc ${CFLAGS} ${OBSD_CFLAGS} ${LDFLAGS} ${OBSD_LDFLAGS} ${SSP_GENERIC_SRC} ${SSP_OBSD_SRC} -o ${SNORTSAM} ;;
146 -- *BSD*) gcc ${CFLAGS} ${BSD_CFLAGS} ${LDFLAGS} ${BSD_LDFLAGS} ${SSP_GENERIC_SRC} ${SSP_BSD_SRC} -o ${SNORTSAM} ;;
147 -- SunOS*) gcc ${CFLAGS} ${SUNOS_CFLAGS} ${LDFLAGS} ${SUNOS_LDFLAGS} ${SSP_GENERIC_SRC} ${SSP_SUNOS_SRC} -o ${SNORTSAM} ;;
148 -+ Linux*) echo ${CC} ${CFLAGS} ${LINUX_CFLAGS} ${LDFLAGS} ${SSP_GENERIC_SRC} ${SSP_LINUX_SRC} ${LDFLAGS} -o ${SNORTSAM} ${LINUX_LDFLAGS}; ${CC} ${CFLAGS} ${LINUX_CFLAGS} ${LDFLAGS} ${SSP_GENERIC_SRC} ${SSP_LINUX_SRC} -o ${SNORTSAM} ${LINUX_LDFLAGS}; [ $? = 0 ] || exit 1;;
149 -+ OpenBSD*) echo ${CC} ${CFLAGS} ${OBSD_CFLAGS} ${LDFLAGS} ${OBSD_LDFLAGS} ${SSP_GENERIC_SRC} ${SSP_OBSD_SRC} ${LDFLAGS} -o ${SNORTSAM} ; ${CC} ${CFLAGS} ${LDFLAGS} ${OBSD_CFLAGS} ${OBSD_LDFLAGS} ${SSP_GENERIC_SRC} ${SSP_OBSD_SRC} -o ${SNORTSAM} ; [ $? = 0 ] || exit 1;;
150 -+ *BSD*) echo ${CC} ${CFLAGS} ${BSD_CFLAGS} ${LDFLAGS} ${BSD_LDFLAGS} ${SSP_GENERIC_SRC} ${SSP_BSD_SRC} -o ${SNORTSAM} ; ${CC} ${CFLAGS} ${LDFLAGS} ${BSD_CFLAGS} ${BSD_LDFLAGS} ${SSP_GENERIC_SRC} ${SSP_BSD_SRC} -o ${SNORTSAM} ; [ $? = 0 ] || exit 1;;
151 -+ SunOS*) echo ${CC} ${CFLAGS} ${SUNOS_CFLAGS} ${LDFLAGS} ${SUNOS_LDFLAGS} ${SSP_GENERIC_SRC} ${SSP_SUNOS_SRC}-o ${SNORTSAM} ; ${CC} ${CFLAGS} ${LDFLAGS} ${SUNOS_CFLAGS} ${SUNOS_LDFLAGS} ${SSP_GENERIC_SRC} ${SSP_SUNOS_SRC} -o ${SNORTSAM} ; [ $? = 0 ] || exit 1;;
152 - esac
153 -
154 --
155 -- echo "-------------------------------------------------------------------------------"
156 -- echo "Building SnortSam (debug)"
157 -- echo "-------------------------------------------------------------------------------"
158 --
159 -- rm -f *.o
160 -- CFLAGS="${CFLAGS} -DFWSAMDEBUG"
161 -- SNORTSAM="${SNORTSAM}-debug"
162 --
163 -- case "${systype}" in
164 -- Linux*) gcc ${CFLAGS} ${LINUX_CFLAGS} ${LDFLAGS} ${LINUX_LDFLAGS} ${SSP_GENERIC_SRC} ${SSP_LINUX_SRC} -o ${SNORTSAM} ;;
165 -- OpenBSD*) gcc ${CFLAGS} ${OBSD_CFLAGS} ${LDFLAGS} ${OBSD_LDFLAGS} ${SSP_GENERIC_SRC} ${SSP_OBSD_SRC} -o ${SNORTSAM} ;;
166 -- *BSD*) gcc ${CFLAGS} ${BSD_CFLAGS} ${LDFLAGS} ${BSD_LDFLAGS} ${SSP_GENERIC_SRC} ${SSP_BSD_SRC} -o ${SNORTSAM} ;;
167 -- SunOS*) gcc ${CFLAGS} ${SUNOS_CFLAGS} ${LDFLAGS} ${SUNOS_LDFLAGS} ${SSP_GENERIC_SRC} ${SSP_SUNOS_SRC} -o ${SNORTSAM} ;;
168 --
169 -- esac
170 -- cd ..
171 - ;;
172 - esac
173 -
174
175 diff --git a/net-analyzer/snortsam/metadata.xml b/net-analyzer/snortsam/metadata.xml
176 deleted file mode 100644
177 index 211445353661..000000000000
178 --- a/net-analyzer/snortsam/metadata.xml
179 +++ /dev/null
180 @@ -1,8 +0,0 @@
181 -<?xml version="1.0" encoding="UTF-8"?>
182 -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
183 -<pkgmetadata>
184 - <maintainer type="project">
185 - <email>netmon@g.o</email>
186 - <name>Gentoo network monitoring and analysis project</name>
187 - </maintainer>
188 -</pkgmetadata>
189
190 diff --git a/net-analyzer/snortsam/snortsam-2.70-r1.ebuild b/net-analyzer/snortsam/snortsam-2.70-r1.ebuild
191 deleted file mode 100644
192 index d900b52d06f6..000000000000
193 --- a/net-analyzer/snortsam/snortsam-2.70-r1.ebuild
194 +++ /dev/null
195 @@ -1,45 +0,0 @@
196 -# Copyright 1999-2022 Gentoo Authors
197 -# Distributed under the terms of the GNU General Public License v2
198 -
199 -EAPI=7
200 -
201 -inherit flag-o-matic toolchain-funcs vcs-clean
202 -
203 -DESCRIPTION="Snort plugin that allows automated blocking of IP addresses on several firewalls"
204 -HOMEPAGE="http://www.snortsam.net/"
205 -SRC_URI="http://www.snortsam.net/files/snortsam/${PN}-src-${PV}.tar.gz"
206 -S="${WORKDIR}"/${PN}
207 -
208 -LICENSE="BSD-2"
209 -SLOT="0"
210 -KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
211 -IUSE="debug"
212 -
213 -PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
214 -
215 -src_prepare() {
216 - default
217 - ecvs_clean
218 -}
219 -
220 -src_configure() {
221 - use debug && append-cflags -DFWSAMDEBUG
222 - tc-export CC
223 -}
224 -
225 -src_compile() {
226 - sh makesnortsam.sh || die
227 -}
228 -
229 -src_install() {
230 - dobin snortsam
231 -
232 - find . -depth -type f -name '*.asc' -delete || die
233 - dodoc -r docs/. conf/.
234 -}
235 -
236 -pkg_postinst() {
237 - elog "To use snortsam with snort, you'll have to compile snort with USE=snortsam."
238 - elog "Read the INSTALL file to configure snort for snortsam, and configure"
239 - elog "snortsam for your particular firewall."
240 -}
241
242 diff --git a/profiles/package.mask b/profiles/package.mask
243 index 37c4b79b6e21..c031f7edea41 100644
244 --- a/profiles/package.mask
245 +++ b/profiles/package.mask
246 @@ -1111,11 +1111,6 @@ x11-misc/unclutter
247 # Removal on 2022-12-27. Bug #880927.
248 x11-misc/vnc2swf
249
250 -# Michael Mair-Keimberger <mmk@×××××××××.at> (2022-11-25)
251 -# Unmaintained, last release a decade ago, upstream declared it EOL
252 -# Removal in 30 days.
253 -net-analyzer/snortsam
254 -
255 # Matt Turner <mattst88@g.o> (2022-11-16)
256 # Packages or their dependencies have not been ported to libsoup:3.0, while
257 # other non-slotted dependencies have been.