[gentoo-commits] repo/gentoo:master commit in: dev-util/its4/

[gentoo-commits] repo/gentoo:master commit in: dev-util/its4/

[Robin H. Johnson]

commit:     4d7bcfa241bab041f0b924c534db5fe9b7e53877
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 30 18:01:47 2017 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Thu Mar 30 18:29:49 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4d7bcfa2

dev-util/its4: LDFLAGS, Manifests, license

- LDFLAGS/g++/EAPI/keywords fix from Michael Mair-Keimberger (iamnr3)
  <bu9zilla <AT> gmail.com>, per bug #337724.
- Update Manifests to include WHIRLPOOL & SHA256 per bug 612732.
- License Review: fetch & unmodified mirroring is permitted.

Fixes: https://bugs.gentoo.org/show_bug.cgi?id=337724
Fixes: https://bugs.gentoo.org/show_bug.cgi?id=612732
Package-Manager: portage-2.3.3
Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>

 dev-util/its4/Manifest                             |  2 +-
 .../{its4-1.1.1.ebuild => its4-1.1.1-r1.ebuild}    | 35 ++++++++++++----------
 dev-util/its4/its4-1.1.1.ebuild                    |  8 +----
 3 files changed, 22 insertions(+), 23 deletions(-)

diff --git a/dev-util/its4/Manifest b/dev-util/its4/Manifest
index c42070e059d..47c4c8d9913 100644
--- a/dev-util/its4/Manifest
+++ b/dev-util/its4/Manifest
@@ -1 +1 @@
-DIST its4-1.1.1.tgz 59759 RMD160 7f3fef7b7f5c6cf4f7e203481a44957bcf74e606 SHA1 f95711fad1a10ca127514132db04791a01088d77 SHA256 386ca694c969108863f3e5c0571ea8c5cbdc288dd13e12ba573a592844682df4
+DIST its4-1.1.1.tgz 59759 SHA256 386ca694c969108863f3e5c0571ea8c5cbdc288dd13e12ba573a592844682df4 SHA512 c7bfa71eba114ab3aac586dfa5f30c7a935f06d72b78bae3c3d464f591085cf3419a1d23ab951376bd9c2d7e436711a45c9f5047c3125df5d731b746412be0f6 WHIRLPOOL b734a79abb2eb2a3df330f06852d35aee61c451419fe915fdc0788dbcc9eb51ef282f8bdc9aac2d712fa2bdc21b23a743da9a55dd66fa0a58229036bb1b2e8c8

diff --git a/dev-util/its4/its4-1.1.1.ebuild b/dev-util/its4/its4-1.1.1-r1.ebuild
similarity index 66%
copy from dev-util/its4/its4-1.1.1.ebuild
copy to dev-util/its4/its4-1.1.1-r1.ebuild
index a7e86e1dd3d..e000308a5cb 100644
--- a/dev-util/its4/its4-1.1.1.ebuild
+++ b/dev-util/its4/its4-1.1.1-r1.ebuild
@@ -1,36 +1,41 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI="5"
+
+inherit eutils
+
 DESCRIPTION="ITS4: Software Security Tool"
 HOMEPAGE="http://www.cigital.com/its4/"
 SRC_URI="${P}.tgz"
 LICENSE="ITS4"
 SLOT="0"
-KEYWORDS="x86 ppc"
+KEYWORDS="~x86 ~ppc ~amd64"
 IUSE=""
-DEPEND="sys-devel/gcc"
-RESTRICT="mirror fetch"
-#RDEPEND=""
-S="${WORKDIR}/${PN}"
 
-pkg_nofetch() {
-	einfo "Please visit ${HOMEPAGE} to download the source, and place it in"
-	einfo "${DISTDIR}"
-}
+DEPEND=""
+RDEPEND=""
+
+S="${WORKDIR}/${PN}"
 
-src_unpack() {
-	unpack ${A}
+src_prepare() {
 	sed -i \
 		-e 's,iostream.h,iostream,g'\
-		"${S}"/configure
+		"${S}"/configure || die
+	sed -i \
+		-e 's/$(CC) -o/$(CC) $(OPTIMIZATION) $(EXTRA_FLAGS) -o/' \
+		"${S}"/Makefile.in || die
 }
 
-src_compile() {
+src_configure() {
 	# WARNING
 	# non-standard configure
 	# do NOT use econf
 	./configure --prefix=/usr --mandir=/usr/share/man --datadir=/usr/share/its4 || die "configure failed"
-	emake OPTIMIZATION="${CXXFLAGS}" || die "emake failed"
+}
+
+src_compile() {
+	emake CC="$(tc-getCXX)" OPTIMIZATION="${CXXFLAGS}" EXTRA_FLAGS="${LDFLAGS}"
 }
 
 src_install() {

diff --git a/dev-util/its4/its4-1.1.1.ebuild b/dev-util/its4/its4-1.1.1.ebuild
index a7e86e1dd3d..fab10d76369 100644
--- a/dev-util/its4/its4-1.1.1.ebuild
+++ b/dev-util/its4/its4-1.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 DESCRIPTION="ITS4: Software Security Tool"
@@ -9,15 +9,9 @@ SLOT="0"
 KEYWORDS="x86 ppc"
 IUSE=""
 DEPEND="sys-devel/gcc"
-RESTRICT="mirror fetch"
 #RDEPEND=""
 S="${WORKDIR}/${PN}"
 
-pkg_nofetch() {
-	einfo "Please visit ${HOMEPAGE} to download the source, and place it in"
-	einfo "${DISTDIR}"
-}
-
 src_unpack() {
 	unpack ${A}
 	sed -i \

[gentoo-commits] repo/gentoo:master commit in: dev-util/its4/

[Robin H. Johnson]

commit:     712dde20adc51ecf9070686f4cd02194d293dfcb
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 30 20:24:50 2017 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Thu Mar 30 20:25:07 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=712dde20

dev-util/its4: fix src_uri.

Package-Manager: portage-2.3.3
Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>

 dev-util/its4/its4-1.1.1-r1.ebuild | 2 +-
 dev-util/its4/its4-1.1.1.ebuild    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-util/its4/its4-1.1.1-r1.ebuild b/dev-util/its4/its4-1.1.1-r1.ebuild
index e000308a5cb..0b5017ca8e4 100644
--- a/dev-util/its4/its4-1.1.1-r1.ebuild
+++ b/dev-util/its4/its4-1.1.1-r1.ebuild
@@ -7,7 +7,7 @@ inherit eutils
 
 DESCRIPTION="ITS4: Software Security Tool"
 HOMEPAGE="http://www.cigital.com/its4/"
-SRC_URI="${P}.tgz"
+SRC_URI="https://dev.gentoo.org/~robbat2/distfiles/${P}.tgz"
 LICENSE="ITS4"
 SLOT="0"
 KEYWORDS="~x86 ~ppc ~amd64"

diff --git a/dev-util/its4/its4-1.1.1.ebuild b/dev-util/its4/its4-1.1.1.ebuild
index fab10d76369..fbe508fc838 100644
--- a/dev-util/its4/its4-1.1.1.ebuild
+++ b/dev-util/its4/its4-1.1.1.ebuild
@@ -3,7 +3,7 @@
 
 DESCRIPTION="ITS4: Software Security Tool"
 HOMEPAGE="http://www.cigital.com/its4/"
-SRC_URI="${P}.tgz"
+SRC_URI="https://dev.gentoo.org/~robbat2/distfiles/${P}.tgz"
 LICENSE="ITS4"
 SLOT="0"
 KEYWORDS="x86 ppc"

[gentoo-commits] repo/gentoo:master commit in: dev-util/its4/

[Michał Górny]

commit:     a719d1301f17fadf159ec1792e4b1559dc94941d
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon Oct  7 13:11:24 2019 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Oct  7 13:53:12 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a719d130

dev-util/its4: Drop old (EAPI=0)

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 dev-util/its4/its4-1.1.1.ebuild | 36 ------------------------------------
 1 file changed, 36 deletions(-)

diff --git a/dev-util/its4/its4-1.1.1.ebuild b/dev-util/its4/its4-1.1.1.ebuild
deleted file mode 100644
index 1fb4946a53d..00000000000
--- a/dev-util/its4/its4-1.1.1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-DESCRIPTION="ITS4: Software Security Tool"
-HOMEPAGE="http://www.cigital.com/its4/"
-SRC_URI="https://dev.gentoo.org/~robbat2/distfiles/${P}.tgz"
-LICENSE="ITS4"
-SLOT="0"
-KEYWORDS="ppc x86"
-IUSE=""
-DEPEND="sys-devel/gcc"
-#RDEPEND=""
-S="${WORKDIR}/${PN}"
-
-src_unpack() {
-	unpack ${A}
-	sed -i \
-		-e 's,iostream.h,iostream,g'\
-		"${S}"/configure
-}
-
-src_compile() {
-	# WARNING
-	# non-standard configure
-	# do NOT use econf
-	./configure --prefix=/usr --mandir=/usr/share/man --datadir=/usr/share/its4 || die "configure failed"
-	emake OPTIMIZATION="${CXXFLAGS}" || die "emake failed"
-}
-
-src_install() {
-	# WARNING
-	# non-standard, do NOT use einstall or 'make install DESTDIR=...'
-	make install INSTALL_BINDIR="${D}/usr/bin" INSTALL_MANDIR="${D}/usr/share/man" INSTALL_DATADIR="${D}/usr/share/its4" || die "install failed"
-}

[gentoo-commits] repo/gentoo:master commit in: dev-util/its4/

[Sam James]

commit:     5973f2fdaef90add74d849934d5b96ab48dafa6e
Author:     Thomas Bracht Laumann Jespersen <t <AT> laumann <DOT> xyz>
AuthorDate: Thu Feb  3 21:24:55 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Feb 20 00:29:53 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5973f2fd

dev-util/its4: Fix build for clang/LLVM toolchain

The config.C file has five instances of string literals being
immediately followed by NEWLINE (a macro that expands to another string
literal). C++11 requires a space between string literals.

Signed-off-by: Thomas Bracht Laumann Jespersen <t <AT> laumann.xyz>
Closes: https://bugs.gentoo.org/738936
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-util/its4/its4-1.1.1-r2.ebuild | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/dev-util/its4/its4-1.1.1-r2.ebuild b/dev-util/its4/its4-1.1.1-r2.ebuild
index 5bb0c4ed44fc..86e78a42d315 100644
--- a/dev-util/its4/its4-1.1.1-r2.ebuild
+++ b/dev-util/its4/its4-1.1.1-r2.ebuild
@@ -22,6 +22,11 @@ src_prepare() {
 	sed -i \
 		-e 's/$(CC) -o/$(CC) $(OPTIMIZATION) $(EXTRA_FLAGS) -o/' \
 		"${S}"/Makefile.in || die
+
+	# Bug 738936 fails to compile with clang/LLVM toolchain
+	sed -i \
+		-e 's/"NEWLINE/" NEWLINE/g'\
+		"${S}"/config.C || die
 	eapply_user
 }
 

[gentoo-commits] repo/gentoo:master commit in: dev-util/its4/

[Sam James]

commit:     91d6e8e1eb1da9c52e9023c3889d67a4a687a7b7
Author:     Thomas Bracht Laumann Jespersen <t <AT> laumann <DOT> xyz>
AuthorDate: Thu Feb  3 20:48:44 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Feb 20 00:29:50 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91d6e8e1

dev-util/its4: Avoid calling g++ directly

This revbump accomplishes two things:

 * Bump EAPI=8 from 5. The biggest change is adding eapply_user in
   src_prepare()

 * Use --with-cpp argument for call to ./configure, so the script
   doesn't try to find a compiler

Signed-off-by: Thomas Bracht Laumann Jespersen <t <AT> laumann.xyz>
Closes: https://bugs.gentoo.org/724268
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-util/its4/its4-1.1.1-r2.ebuild | 43 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 43 insertions(+)

diff --git a/dev-util/its4/its4-1.1.1-r2.ebuild b/dev-util/its4/its4-1.1.1-r2.ebuild
new file mode 100644
index 000000000000..5bb0c4ed44fc
--- /dev/null
+++ b/dev-util/its4/its4-1.1.1-r2.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="ITS4: Software Security Tool"
+HOMEPAGE="http://www.cigital.com/its4/"
+SRC_URI="https://dev.gentoo.org/~robbat2/distfiles/${P}.tgz"
+
+LICENSE="ITS4"
+SLOT="0"
+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
+	eapply_user
+}
+
+src_configure() {
+	# WARNING
+	# non-standard configure
+	# do NOT use econf
+	./configure --with-cpp=$(tc-getCXX) --prefix=/usr --mandir=/usr/share/man --datadir=/usr/share/its4 || die "configure failed"
+}
+
+src_compile() {
+	emake CC="$(tc-getCXX)" OPTIMIZATION="${CXXFLAGS}" EXTRA_FLAGS="${LDFLAGS}"
+}
+
+src_install() {
+	# WARNING
+	# non-standard, do NOT use einstall or 'make install DESTDIR=...'
+	make install INSTALL_BINDIR="${D}/usr/bin" INSTALL_MANDIR="${D}/usr/share/man" INSTALL_DATADIR="${D}/usr/share/its4" || die "install failed"
+}

[gentoo-commits] repo/gentoo:master commit in: dev-util/its4/

[Jakov Smolić]

commit:     138155e40637bcaedbfab592542cf0fcc96e2424
Author:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 15 19:43:37 2022 +0000
Commit:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
CommitDate: Tue Mar 15 19:43:37 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=138155e4

dev-util/its4: Stabilize 1.1.1-r2 x86, #834323

Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org>

 dev-util/its4/its4-1.1.1-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/its4/its4-1.1.1-r2.ebuild b/dev-util/its4/its4-1.1.1-r2.ebuild
index 0be321963bb4..4f783ced2c9b 100644
--- a/dev-util/its4/its4-1.1.1-r2.ebuild
+++ b/dev-util/its4/its4-1.1.1-r2.ebuild
@@ -11,7 +11,7 @@ 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}"
 

[gentoo-commits] repo/gentoo:master commit in: dev-util/its4/

[Sam James]

commit:     a4e028de6da392e0266f1de7cbea274a6e7bee94
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 15 19:54:10 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Mar 15 19:54:10 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a4e028de

dev-util/its4: drop 1.1.1-r1

Closes: https://bugs.gentoo.org/834323
Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-util/its4/its4-1.1.1-r1.ebuild | 42 --------------------------------------
 1 file changed, 42 deletions(-)

diff --git a/dev-util/its4/its4-1.1.1-r1.ebuild b/dev-util/its4/its4-1.1.1-r1.ebuild
deleted file mode 100644
index 2bbcd1625bf0..000000000000
--- a/dev-util/its4/its4-1.1.1-r1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit toolchain-funcs
-
-DESCRIPTION="ITS4: Software Security Tool"
-HOMEPAGE="http://www.cigital.com/its4/"
-SRC_URI="https://dev.gentoo.org/~robbat2/distfiles/${P}.tgz"
-
-LICENSE="ITS4"
-SLOT="0"
-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
-}
-
-src_configure() {
-	# WARNING
-	# non-standard configure
-	# do NOT use econf
-	./configure --prefix=/usr --mandir=/usr/share/man --datadir=/usr/share/its4 || die "configure failed"
-}
-
-src_compile() {
-	emake CC="$(tc-getCXX)" OPTIMIZATION="${CXXFLAGS}" EXTRA_FLAGS="${LDFLAGS}"
-}
-
-src_install() {
-	# WARNING
-	# non-standard, do NOT use einstall or 'make install DESTDIR=...'
-	make install INSTALL_BINDIR="${D}/usr/bin" INSTALL_MANDIR="${D}/usr/share/man" INSTALL_DATADIR="${D}/usr/share/its4" || die "install failed"
-}

[gentoo-commits] repo/gentoo:master commit in: dev-util/its4/

[Sam James]

commit:     08083d5ae61b507bc854e6e29e90ff8a0e4ea596
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 20 00:07:23 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Mar 20 00:07:23 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=08083d5a

dev-util/its4: [QA] fix tc-get* quoting

This can cause build problems for e.g. 32-bit (gcc -m32 ...)

Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-util/its4/its4-1.1.1-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/its4/its4-1.1.1-r2.ebuild b/dev-util/its4/its4-1.1.1-r2.ebuild
index 4f783ced2c9b..3fdb157ac1c2 100644
--- a/dev-util/its4/its4-1.1.1-r2.ebuild
+++ b/dev-util/its4/its4-1.1.1-r2.ebuild
@@ -24,7 +24,7 @@ src_configure() {
 	# WARNING
 	# non-standard configure
 	# do NOT use econf
-	./configure --with-cpp=$(tc-getCXX) --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() {