diff options
Diffstat (limited to 'dev-util/its4')
-rw-r--r-- | dev-util/its4/Manifest | 4 | ||||
-rw-r--r-- | dev-util/its4/files/its4-1.1.1-r2-cpp-headers-and-opt-flags.patch | 43 | ||||
-rw-r--r-- | dev-util/its4/files/its4-1.1.1-r2-ensure-spaces-in-string-literals.patch | 47 | ||||
-rw-r--r-- | dev-util/its4/its4-1.1.1-r2.ebuild (renamed from dev-util/its4/its4-1.1.1-r1.ebuild) | 20 |
4 files changed, 101 insertions, 13 deletions
diff --git a/dev-util/its4/Manifest b/dev-util/its4/Manifest index c1b49f6fda3c..7d5942bb9dcc 100644 --- a/dev-util/its4/Manifest +++ b/dev-util/its4/Manifest @@ -1,3 +1,5 @@ +AUX its4-1.1.1-r2-cpp-headers-and-opt-flags.patch 1210 BLAKE2B c34e2b08f9a0d7ca7d766d1c8157ceb8275d2041a4787b496a32eac0c82e716adbd145552c484df49a9b320334b3d4f8dafb3780be7d92968228fb6231a8ad7e SHA512 6d31129a05588e0b5ddb4ae445405631707188c1c7bb3ab384074f08ce71064c3363438fbe5013f190ace6d70dfcc8280a35a3e4dd3f2576d595cc4815a4be91 +AUX its4-1.1.1-r2-ensure-spaces-in-string-literals.patch 1993 BLAKE2B 2059573accb25456670be925de7f2b0ea1a211c0cc3ed04fb583404646b13dc060a6b9815d9b1266280d570e5add22b1434feb60f1605494efb29bc5b11220d6 SHA512 411080d78af2099c9718c328801dd7740a61209f6748c521f4be47dd8ff55a1e94411044d257fd903a5d262d67d96f062435eabf116b7d904da0b10b17389d57 DIST its4-1.1.1.tgz 59759 BLAKE2B 87c616dd7e2a5d3519f8827932c4d17d50dc7646097ba3aa6a8ebf29434671e560c0ba9949f370de8b26da9af9855a1fa16117d0a5a64b6098945e4292c8a33f SHA512 c7bfa71eba114ab3aac586dfa5f30c7a935f06d72b78bae3c3d464f591085cf3419a1d23ab951376bd9c2d7e436711a45c9f5047c3125df5d731b746412be0f6 -EBUILD its4-1.1.1-r1.ebuild 1059 BLAKE2B fcf00bd45463b04f86200adbc6556bb7d2c46462a605af74d2473254ec1ce46ce73cdeb61740213bed1b858e8c328141b783337faf91d2b269ee0d8b361492b2 SHA512 1444eb20131d19f99b6a7c58cfd3fa74958a70c293b8e5908be1c23a8dd510132ac9df89d58769f77ea45907a19fe7119e1655bb51ad4fdeee72f744bd245960 +EBUILD its4-1.1.1-r2.ebuild 1053 BLAKE2B 2bcfebea65c1ab4a1eaba51952b5c1170d7d8cae50b8cfa28b4872973faa78bbd91d855c131e517445bffa50982c7bc75879bde47e378e3423bf13ac031e1c08 SHA512 ed1201ab6464bee91ffc153d23f53bba392154d457f4f8b3f11e11a8c84d592ea51be3df77efcd6657177fb417fcc21ed60eacc55eafba0c32d30e3f40a3e986 MISC metadata.xml 571 BLAKE2B 1de520df5e4cac2f9c1c753050955cc1cbe3440ed8bc857f2ebade46e4f9340f62211505f7b8d8dabb86fead495016e75badad37c0c8f4438ab9d75dabe6da20 SHA512 968d71548eb80fcd8063acbdba72e2d7b58805d1ab76338e03b4cc034069e65061dcbb7c3934a4518779888f05e354dbd783c154cef6d96bf0db764dbc0dccc8 diff --git a/dev-util/its4/files/its4-1.1.1-r2-cpp-headers-and-opt-flags.patch b/dev-util/its4/files/its4-1.1.1-r2-cpp-headers-and-opt-flags.patch new file mode 100644 index 000000000000..8329bd12cce1 --- /dev/null +++ b/dev-util/its4/files/its4-1.1.1-r2-cpp-headers-and-opt-flags.patch @@ -0,0 +1,43 @@ +From 71d766c506c62aa0ad88836e3c10443b90f46898 Mon Sep 17 00:00:00 2001 +From: Thomas Bracht Laumann Jespersen <t@laumann.xyz> +Date: Sat, 19 Feb 2022 07:17:17 +0100 +Subject: [PATCH] Adjust configure and Makefile.in + +--- + Makefile.in | 4 ++-- + configure | 2 +- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/Makefile.in b/Makefile.in +index 564e13c..66fbb31 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -4,10 +4,10 @@ OBJECTS=token.o lex.o main.o scanner.o resultsdb.o vulndb.o handlers.o \ + $(EXTRA_OBJS) + + all: $(OBJECTS) +- $(CC) -o $(PROGNAME) $(OBJECTS) ++ $(CC) $(OPTIMIZATION) $(EXTRA_FLAGS) -o $(PROGNAME) $(OBJECTS) + + pure: $(OBJECTS) +- purify $(CC) -o $(PROGNAME) $(OBJECTS) ++ purify $(CC) $(OPTIMIZATION) $(EXTRA_FLAGS) -o $(PROGNAME) $(OBJECTS) + + .C.o: + $(CC) -c -DDATA_DIR=$(INSTALL_DATADIR) $(EXTRA_FLAGS) ${OPTIMIZATION} $< +diff --git a/configure b/configure +index e85410f..12626c4 100755 +--- a/configure ++++ b/configure +@@ -117,7 +117,7 @@ if test -z "${QUIET}"; then exec 5>&1; else exec 5>/dev/null; fi + + ###### Can we invoke the compiler? + cat >tmp.c <<EOF +-#include <iostream.h> ++#include <iostream> + int main(){return 0;} + EOF + if test -n "${CC}"; then +-- +2.34.1 + diff --git a/dev-util/its4/files/its4-1.1.1-r2-ensure-spaces-in-string-literals.patch b/dev-util/its4/files/its4-1.1.1-r2-ensure-spaces-in-string-literals.patch new file mode 100644 index 000000000000..1d65c44bb729 --- /dev/null +++ b/dev-util/its4/files/its4-1.1.1-r2-ensure-spaces-in-string-literals.patch @@ -0,0 +1,47 @@ +From 2f0f98aff51bad9474671e73aa29080c541ca055 Mon Sep 17 00:00:00 2001 +From: Thomas Bracht Laumann Jespersen <t@laumann.xyz> +Date: Sat, 19 Feb 2022 07:19:34 +0100 +Subject: [PATCH] Ensure spaces between string literals + +--- + config.C | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +diff --git a/config.C b/config.C +index 61282e8..c4cf375 100644 +--- a/config.C ++++ b/config.C +@@ -103,8 +103,8 @@ NEWLINE + " Ignore instances of a particular function name." NEWLINE + " This flag can be used as many times as you like." NEWLINE + " -I, --ignore-file=filename" NEWLINE +-" Specify a file to read ignore info from, causing ITS4 to not"NEWLINE +-" report instances of those functions. Each function to ignore"NEWLINE ++" Specify a file to read ignore info from, causing ITS4 to not" NEWLINE ++" report instances of those functions. Each function to ignore" NEWLINE + " should be on its own line." NEWLINE + " -l, --limit=function" NEWLINE + " Tells ITS4 not to scan for any functions, except those" NEWLINE +@@ -112,7 +112,7 @@ NEWLINE + " times as you want." NEWLINE + " -m, --input-mode" + NEWLINE +-" Tells ITS4 to print out all non-argv spots at which input can"NEWLINE ++" Tells ITS4 to print out all non-argv spots at which input can" NEWLINE + " enter. This option causes some other options to be ignored." NEWLINE + " Most importantly, the regular scan does not happen, no" NEWLINE + " severities are visibly reported, and the cutoff is ignored." NEWLINE +@@ -347,8 +347,8 @@ void ParseOptions(int argc, char **argv, int &index) + case 'o': + if(!optarg) + { +- fprintf(stderr, "Warning: option 'o' needs an argument."NEWLINE); +- fprintf(stderr, "Writing to stdout."NEWLINE); ++ fprintf(stderr, "Warning: option 'o' needs an argument." NEWLINE); ++ fprintf(stderr, "Writing to stdout." NEWLINE); + continue; + } + SetOutputFile(optarg); +-- +2.34.1 + diff --git a/dev-util/its4/its4-1.1.1-r1.ebuild b/dev-util/its4/its4-1.1.1-r2.ebuild index 5c14b9f75a2a..4f783ced2c9b 100644 --- a/dev-util/its4/its4-1.1.1-r1.ebuild +++ b/dev-util/its4/its4-1.1.1-r2.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="5" +EAPI=8 inherit toolchain-funcs @@ -11,24 +11,20 @@ SRC_URI="https://dev.gentoo.org/~robbat2/distfiles/${P}.tgz" LICENSE="ITS4" SLOT="0" -KEYWORDS="~amd64 ppc x86" +KEYWORDS="~amd64 ~ppc x86" S="${WORKDIR}/${PN}" -src_prepare() { - sed -i \ - -e 's,iostream.h,iostream,g'\ - "${S}"/configure || die - sed -i \ - -e 's/$(CC) -o/$(CC) $(OPTIMIZATION) $(EXTRA_FLAGS) -o/' \ - "${S}"/Makefile.in || die -} +PATCHES=( + "${FILESDIR}/${PN}-1.1.1-r2-cpp-headers-and-opt-flags.patch" + "${FILESDIR}/${PN}-1.1.1-r2-ensure-spaces-in-string-literals.patch" # bug 738936 +) src_configure() { # WARNING # non-standard configure # do NOT use econf - ./configure --prefix=/usr --mandir=/usr/share/man --datadir=/usr/share/its4 || die "configure failed" + ./configure --with-cpp=$(tc-getCXX) --prefix=/usr --mandir=/usr/share/man --datadir=/usr/share/its4 || die "configure failed" } src_compile() { |