commit: 6cbf0437eefb46dce268f5f759b2064503fc2e34 Author: Jakov Smolić <jsmolic <AT> gentoo <DOT> org> AuthorDate: Fri Nov 19 17:57:06 2021 +0000 Commit: Jakov Smolić <jsmolic <AT> gentoo <DOT> org> CommitDate: Fri Nov 19 17:57:06 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6cbf0437
net-analyzer/quidscor: treeclean Closes: https://bugs.gentoo.org/819366 Closes: https://bugs.gentoo.org/724936 Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org> net-analyzer/quidscor/Manifest | 1 - .../files/quidscor-1.2.48-curl-types.h.patch | 10 ----- .../quidscor/files/quidscor-1.2.48-paths.patch | 37 ----------------- .../quidscor/files/quidscor-1.2.48-strip.patch | 10 ----- net-analyzer/quidscor/metadata.xml | 11 ------ net-analyzer/quidscor/quidscor-1.2.48-r1.ebuild | 46 ---------------------- profiles/package.mask | 5 --- 7 files changed, 120 deletions(-) diff --git a/net-analyzer/quidscor/Manifest b/net-analyzer/quidscor/Manifest deleted file mode 100644 index 10c96375f852..000000000000 --- a/net-analyzer/quidscor/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST quidscor-1.2.48-src.tar.gz 77843 BLAKE2B 4f9feffb67acc8f32c4f922ce882a0799549ecce8e439dffeee5d0e4ec967739646a0ee4912a189e99c9f39743a74ae1f5528050daa82689f35ba498b2bad87f SHA512 8272a1a4ed406d3429f0438dabddd15092be0a33a8fce3c5b0af0ae13422c8918f1a5971b2c2ea639fb87ffdeb1bc89085f07f89856e732f0b270b57eabb7010 diff --git a/net-analyzer/quidscor/files/quidscor-1.2.48-curl-types.h.patch b/net-analyzer/quidscor/files/quidscor-1.2.48-curl-types.h.patch deleted file mode 100644 index 5f1e035c81d6..000000000000 --- a/net-analyzer/quidscor/files/quidscor-1.2.48-curl-types.h.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/libqg/libqg.h -+++ b/libqg/libqg.h -@@ -38,7 +38,6 @@ - #include <arpa/inet.h> - #include <dirent.h> - #include <curl/curl.h> --#include <curl/types.h> - #include <string.h> - #include <strings.h> - #include <libxml/xmlmemory.h> diff --git a/net-analyzer/quidscor/files/quidscor-1.2.48-paths.patch b/net-analyzer/quidscor/files/quidscor-1.2.48-paths.patch deleted file mode 100644 index 6168720cbdf4..000000000000 --- a/net-analyzer/quidscor/files/quidscor-1.2.48-paths.patch +++ /dev/null @@ -1,37 +0,0 @@ ---- a/quidscor.conf -+++ b/quidscor.conf -@@ -15,9 +15,9 @@ - # Logdir: directory - LOGDIR /var/log/quidscor/ - # Cachedir: directory --CACHEDIR /var/run/quidscor/cache/ -+CACHEDIR /var/lib/quidscor - # Rulesdir: directory where .rules (for snort) live (.lib for dragon) --RULESDIR /usr/local/etc/snort-rules -+RULESDIR /etc/snort/rules - # Expiretime: time_in_seconds - EXPIRETIME 86400 - # File for custom mapping (must be absolute path) ---- a/quidscor.h -+++ b/quidscor.h -@@ -85,7 +85,7 @@ - #define AL_UNVER "alerts_unknown.log" - - // Directories --#define CACHE_DIR "run/quidscor/cache/" -+#define CACHE_DIR "/lib/quidscor" - #define LOG_DIR "log/quidscor/" - #define CREATE_MOD 0700 - #define MOD_PID 0640 ---- a/Makefile -+++ b/Makefile -@@ -84,8 +84,7 @@ - - install: - install -d -m 0700 $(IVARPREFIX)/log/$(PNAME)/ -- install -d -m 0700 $(IVARPREFIX)/run/$(PNAME)/ -- install -d -m 0700 $(IVARPREFIX)/run/$(PNAME)/cache/ -+ install -d -m 0700 $(IVARPREFIX)/lib/$(PNAME)/ - install -d -m 0755 $(IPREFIX)/sbin/ - install -m 0755 $(PNAME) $(IPREFIX)/sbin/$(PNAME) - install -d -m 0755 $(IPREFIX)/etc/ diff --git a/net-analyzer/quidscor/files/quidscor-1.2.48-strip.patch b/net-analyzer/quidscor/files/quidscor-1.2.48-strip.patch deleted file mode 100644 index 9d169e619c0b..000000000000 --- a/net-analyzer/quidscor/files/quidscor-1.2.48-strip.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/Makefile -+++ b/Makefile -@@ -69,7 +69,6 @@ - - $(PNAME): $(PNAME).debug - $(CP) $(PNAME).debug $@ -- $(STRIP) $@ - - $(PNAME).debug: libqg/libqg.a $(OFILES) Makefile - $(CC) $(LDFLAGS) $(CFLAGS) -o $@ $(OFILES) $(LIBS) diff --git a/net-analyzer/quidscor/metadata.xml b/net-analyzer/quidscor/metadata.xml deleted file mode 100644 index 3d6e480239d4..000000000000 --- a/net-analyzer/quidscor/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd";> -<pkgmetadata> - <maintainer type="project"> - <email>[email protected]</email> - <name>Gentoo network monitoring and analysis project</name> - </maintainer> - <upstream> - <remote-id type="sourceforge">quidscor</remote-id> - </upstream> -</pkgmetadata> diff --git a/net-analyzer/quidscor/quidscor-1.2.48-r1.ebuild b/net-analyzer/quidscor/quidscor-1.2.48-r1.ebuild deleted file mode 100644 index 15a6af1294c1..000000000000 --- a/net-analyzer/quidscor/quidscor-1.2.48-r1.ebuild +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit epatch toolchain-funcs - -DESCRIPTION="Qualys IDS Correlation Daemon" -HOMEPAGE="http://quidscor.sourceforge.net/"; -SRC_URI="mirror://sourceforge/quidscor/${P}-src.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~ppc ~x86" - -DEPEND=" - >=dev-libs/libxml2-2.4 - >=net-misc/curl-7.10 - >=net-analyzer/snort-2.0 -" -RDEPEND="${DEPEND}" - -src_prepare() { - epatch \ - "${FILESDIR}"/${P}-curl-types.h.patch \ - "${FILESDIR}"/${P}-paths.patch \ - "${FILESDIR}"/${P}-strip.patch - - #yes, the fix below is as pathetic as it seems - echo "#define FALSE 0" >> libqg/libqg.h || die - echo "#define TRUE 1" >> libqg/libqg.h || die -} - -src_compile() { - emake EXTRA_CFLAGS="${CFLAGS}" CC="$(tc-getCC)" -} - -src_install() { - emake PREFIX=/usr STAGING_PREFIX="${D}" install - dodoc ChangeLog FAQ MANIFEST README TODO - - # fix ugly install - cd "${D}"/usr || die - mv etc .. || die - rm -r doc || die -} diff --git a/profiles/package.mask b/profiles/package.mask index 7d073fb23af4..18c104455d62 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -490,11 +490,6 @@ media-gfx/iscan-plugin-perfection-v370 # Masked for removal on 2021-11-22 net-misc/bwwhois -# Jakov Smolić <[email protected]> (2021-10-21) -# Dead upstream, EAPI 5, broken build system, no revdeps. -# Removal on 2021-11-20. Bug #819366 -net-analyzer/quidscor - # Sam James <[email protected]> (2021-10-10) # Needs upstream build system fixes (currently in progress). # Python toggles don't work correctly right now.
