* [gentoo-commits] repo/gentoo:master commit in: dev-util/rats/files/, dev-util/rats/
@ 2017-12-28 12:03 David Seifert
0 siblings, 0 replies; 2+ messages in thread
From: David Seifert @ 2017-12-28 12:03 UTC (permalink / raw
To: gentoo-commits
commit: bf88281ae027f19d01768e7502bbdfdff24a8f21
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 28 10:30:09 2017 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Thu Dec 28 12:02:50 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bf88281a
dev-util/rats: Remove old
Package-Manager: Portage-2.3.19, Repoman-2.3.6
dev-util/rats/Manifest | 1 -
.../files/rats-2.1-add-getopt-trailing-null.patch | 11 --
.../rats/files/rats-2.1-fix-null-pointers.patch | 128 ---------------------
dev-util/rats/rats-2.1-r2.ebuild | 36 ------
4 files changed, 176 deletions(-)
diff --git a/dev-util/rats/Manifest b/dev-util/rats/Manifest
index 6ce3ff73646..3202b2edd52 100644
--- a/dev-util/rats/Manifest
+++ b/dev-util/rats/Manifest
@@ -1,2 +1 @@
-DIST rats-2.1.tar.gz 326930 BLAKE2B 4fa47cf69ab1b04ccf42b300fc55da386a9b5ac783517ec2efcfb545aba2cf27cc1b2a11d5d0d003cc8a0a5112a0cd1183f263c77a62f280268d214bc9ce7634 SHA512 2fdb670dc9559c453a6c69ee2d411e2626c0ee4cca4b59ceda878142008e136dfd11f8265c0719383212b38b0358a9cab1a29f1cc92a986fc800dd0c46bdf0d3
DIST rats-2.4.tgz 393114 BLAKE2B 73dfefc42cd99420edba9ac28d56b51e058b144d9deaf9f1e322e7fe4331e16d05cff049efccd344723fe1634c3691f911dd71001671058c5912f84cfdc0bdbb SHA512 f402717fc935a2f9c2464e1623807575044258fd998cabc8f115c063141004b5978bad739021f109cbbd1abd84231155eb59671ae202aefb40e1fd6733d8ac6d
diff --git a/dev-util/rats/files/rats-2.1-add-getopt-trailing-null.patch b/dev-util/rats/files/rats-2.1-add-getopt-trailing-null.patch
deleted file mode 100644
index 65ea6df1f45..00000000000
--- a/dev-util/rats/files/rats-2.1-add-getopt-trailing-null.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Nuar --exclude '*~' rats-2.1.orig/main.c rats-2.1/main.c
---- rats-2.1.orig/main.c 2002-09-16 21:05:43.000000000 -0700
-+++ rats-2.1/main.c 2006-05-21 21:56:29.578601459 -0700
-@@ -278,6 +278,7 @@
- {"columns", 0,0,0},
- {"context", 0,0,0},
- {"all-static", 0,0,0},
-+ {NULL,0,0,0}
- };
- progname = argv[0];
- flags|=RECURSIVE_FILE_SCAN;
diff --git a/dev-util/rats/files/rats-2.1-fix-null-pointers.patch b/dev-util/rats/files/rats-2.1-fix-null-pointers.patch
deleted file mode 100644
index 0d4c701f0bf..00000000000
--- a/dev-util/rats/files/rats-2.1-fix-null-pointers.patch
+++ /dev/null
@@ -1,128 +0,0 @@
-diff -Nuar rats-2.1.orig/report.c rats-2.1/report.c
---- rats-2.1.orig/report.c 2002-09-16 21:05:43.000000000 -0700
-+++ rats-2.1/report.c 2006-05-21 23:16:16.323046789 -0700
-@@ -122,9 +122,15 @@
- return result;
- }
-
--
--
--
-+/* Exclusively for debugging vulnerabilities.
-+ * - robbat2@gentoo.org 21/05/2006 */
-+static void debug_vuln_dump(vulnerability_t *ptr) {
-+ fprintf(stderr,"vuln_dump: this=%x f=%s l=%d c=%d d=%x t=%d s=%d u=%x p=(%x,%x)\n",
-+ ptr,
-+ ptr->filename,ptr->lineno,ptr->column,
-+ ptr->data,ptr->type,ptr->severity,
-+ ptr->uses,ptr->next,ptr->prev);
-+}
-
- static void
- replace_cfname(char *filename)
-@@ -317,6 +323,27 @@
- insert_vulnerability(log);
- }
-
-+/* These are special static vulnerabilities because we don't
-+ * want NULL data elements in the vulnerability_t->data
-+ * field, because the HTML and XML output formats use that
-+ * pointer without checking it for being null first.
-+ * - robbat2@gentoo.org 21/05/2006 */
-+static struct Vuln_t vuln_PerlBacktick = {
-+ .Name = "Perl Backtick"
-+};
-+static struct Vuln_t vuln_PhpBacktick = {
-+ .Name = "PHP Backtick"
-+};
-+static struct Vuln_t vuln_PythonBacktick = {
-+ .Name = "Python Backtick"
-+};
-+static struct Vuln_t vuln_StaticLocalBuffer = {
-+ .Name = "Static Local Buffer"
-+};
-+static struct Vuln_t vuln_StaticGlobalBuffer = {
-+ .Name = "Static Global Buffer"
-+};
-+
- void log_perlbacktick(int lineno, int column, Severity_t severity)
- {
- vulnerability_t * log;
-@@ -325,7 +352,7 @@
- log->filename = current_file;
- log->column = column;
- log->lineno = lineno;
-- log->data = (Vuln_t *)NULL;
-+ log->data = &vuln_PerlBacktick;
- log->type = PerlBacktick;
- log->severity = severity;
- log->uses = (toctou_use_t *)NULL;
-@@ -342,7 +369,7 @@
- log->filename = current_file;
- log->column = column;
- log->lineno = lineno;
-- log->data = (Vuln_t *)NULL;
-+ log->data = &vuln_PhpBacktick;
- log->type = PhpBacktick;
- log->severity = severity;
- log->uses = (toctou_use_t *)NULL;
-@@ -358,7 +385,7 @@
- log->filename = current_file;
- log->column = column;
- log->lineno = lineno;
-- log->data = (Vuln_t *)NULL;
-+ log->data = &vuln_PythonBacktick;
- log->type = PythonBacktick;
- log->severity = severity;
- log->uses = (toctou_use_t *)NULL;
-@@ -374,7 +401,16 @@
- log->filename = current_file;
- log->column = column;
- log->lineno = lineno;
-- log->data = (Vuln_t *)NULL;
-+ switch(type) {
-+ case StaticLocalBuffer:
-+ log->data = &vuln_StaticLocalBuffer;
-+ break;
-+ case StaticGlobalBuffer:
-+ log->data = &vuln_StaticGlobalBuffer;
-+ break;
-+ default:
-+ log->data = (Vuln_t *)NULL;
-+ }
- log->type = type;
- log->severity = severity;
- log->uses = (toctou_use_t *)NULL;
-@@ -432,6 +468,10 @@
- static void build_xml_vulnerability(vulnerability_t *ptr) {
- int i;
-
-+ /* Debugging - robbat2@gentoo.org 21/05/2006 */
-+ if(ptr->data == NULL)
-+ debug_vuln_dump(ptr);
-+
- printf("<vulnerability>\n");
-
- /* Output the severity */
-@@ -593,6 +633,8 @@
- void report_vulnerability(vulnerability_t *ptr)
- {
- int i;
-+ if(ptr->data == NULL)
-+ debug_vuln_dump(ptr);
-
- switch (ptr->type)
- {
-@@ -890,8 +932,10 @@
-
- static void build_html_vulnerability(vulnerability_t *ptr) {
- int i;
--
--
-+
-+ /* Debugging - robbat2@gentoo.org 21/05/2006 */
-+ if(ptr->data == NULL)
-+ debug_vuln_dump(ptr);
-
- /* Output the severity */
- printf(" <b>Severity: %s</b><br/>\n",
diff --git a/dev-util/rats/rats-2.1-r2.ebuild b/dev-util/rats/rats-2.1-r2.ebuild
deleted file mode 100644
index 161aeea514e..00000000000
--- a/dev-util/rats/rats-2.1-r2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=3
-inherit eutils
-
-DESCRIPTION="RATS - Rough Auditing Tool for Security"
-HOMEPAGE="http://www.fortifysoftware.com/security-resources/rats.jsp"
-SRC_URI="http://www.fortifysoftware.com/servlet/downloads/public/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE=""
-
-DEPEND="dev-libs/expat"
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-add-getopt-trailing-null.patch
- epatch "${FILESDIR}"/${P}-fix-null-pointers.patch
-}
-
-src_configure() {
- econf --datadir="${EPREFIX}/usr/share/${PN}/"
-}
-
-src_install () {
- einstall SHAREDIR="${ED}/usr/share/${PN}" MANDIR="${ED}/usr/share/man"
- dodoc README README.win32
-}
-
-pkg_postinst() {
- ewarn "Please be careful when using this program with it's force language"
- ewarn "option, '--language <LANG>' it may take huge amounts of memory when"
- ewarn "it tries to treat binary files as some other type."
-}
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/rats/files/, dev-util/rats/
@ 2017-12-28 12:03 David Seifert
0 siblings, 0 replies; 2+ messages in thread
From: David Seifert @ 2017-12-28 12:03 UTC (permalink / raw
To: gentoo-commits
commit: 6e1fce08ef2312dab94e37973c249e52e686e10f
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 28 10:28:16 2017 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Thu Dec 28 12:02:45 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6e1fce08
dev-util/rats: Port to EAPI 6
Package-Manager: Portage-2.3.19, Repoman-2.3.6
.../rats/files/rats-2.4-fix-build-system.patch | 27 ++++++++++++++++++++++
dev-util/rats/rats-2.4.ebuild | 25 +++++++++++---------
2 files changed, 41 insertions(+), 11 deletions(-)
diff --git a/dev-util/rats/files/rats-2.4-fix-build-system.patch b/dev-util/rats/files/rats-2.4-fix-build-system.patch
new file mode 100644
index 00000000000..42972876a5c
--- /dev/null
+++ b/dev-util/rats/files/rats-2.4-fix-build-system.patch
@@ -0,0 +1,27 @@
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -50,15 +50,15 @@
+ $(LEX) $(LEXFLAGS) -Pyyruby ruby-lex.l
+
+ install: $(BIN)
+- ./mkinstalldirs $(BINDIR) $(LIBDIR) $(MANDIR) $(MANDIR)/man1 $(SHAREDIR)
+- $(INSTALL_PROGRAM) $(BIN) $(BINDIR)
+- $(INSTALL_DATA) rats-python.xml $(SHAREDIR)
+- $(INSTALL_DATA) rats-c.xml $(SHAREDIR)
+- $(INSTALL_DATA) rats-perl.xml $(SHAREDIR)
+- $(INSTALL_DATA) rats-php.xml $(SHAREDIR)
+- $(INSTALL_DATA) rats-ruby.xml $(SHAREDIR)
+- $(INSTALL_DATA) rats-openssl.xml $(SHAREDIR)
+- $(INSTALL_DATA) rats.1 $(MANDIR)/man1
++ ./mkinstalldirs $(DESTDIR)$(BINDIR) $(DESTDIR)$(MANDIR) $(DESTDIR)$(MANDIR)/man1 $(DESTDIR)$(SHAREDIR)
++ $(INSTALL_PROGRAM) $(BIN) $(DESTDIR)$(BINDIR)
++ $(INSTALL_DATA) rats-python.xml $(DESTDIR)$(SHAREDIR)
++ $(INSTALL_DATA) rats-c.xml $(DESTDIR)$(SHAREDIR)
++ $(INSTALL_DATA) rats-perl.xml $(DESTDIR)$(SHAREDIR)
++ $(INSTALL_DATA) rats-php.xml $(DESTDIR)$(SHAREDIR)
++ $(INSTALL_DATA) rats-ruby.xml $(DESTDIR)$(SHAREDIR)
++ $(INSTALL_DATA) rats-openssl.xml $(DESTDIR)$(SHAREDIR)
++ $(INSTALL_DATA) rats.1 $(DESTDIR)$(MANDIR)/man1
+
+ clean:
+ rm -f $(OBJ) *~ $(BIN) core
diff --git a/dev-util/rats/rats-2.4.ebuild b/dev-util/rats/rats-2.4.ebuild
index 1c49b7c4df4..0a41658a990 100644
--- a/dev-util/rats/rats-2.4.ebuild
+++ b/dev-util/rats/rats-2.4.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=3
+EAPI=6
+
inherit eutils
DESCRIPTION="RATS - Rough Auditing Tool for Security"
@@ -13,23 +14,25 @@ SLOT="0"
KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
IUSE=""
-DEPEND="dev-libs/expat"
+RDEPEND="dev-libs/expat:="
+DEPEND="${RDEPEND}"
+
+PATCHES=( "${FILESDIR}"/${PN}-2.4-fix-build-system.patch )
src_prepare() {
- edos2unix $(find "${S}" -name '*.[chl]' -o -name '*.in' -o -name '*.am')
- #epatch "${FILESDIR}"/${PN}-2.1-add-getopt-trailing-null.patch
- #epatch "${FILESDIR}"/${PN}-2.1-fix-null-pointers.patch
+ default
+
+ local f
+ while IFS="" read -d $'\0' -r f; do
+ einfo "Converting ${f} from CRLF to LF"
+ edos2unix "${f}"
+ done < <(find \( -name '*.[chl]' -o -name '*.in' -o -name '*.am' \) -print0)
}
src_configure() {
econf --datadir="${EPREFIX}/usr/share/${PN}/"
}
-src_install () {
- einstall SHAREDIR="${ED}/usr/share/${PN}" MANDIR="${ED}/usr/share/man"
- dodoc README README.win32
-}
-
pkg_postinst() {
ewarn "Please be careful when using this program with it's force language"
ewarn "option, '--language <LANG>' it may take huge amounts of memory when"
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2017-12-28 12:03 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-12-28 12:03 [gentoo-commits] repo/gentoo:master commit in: dev-util/rats/files/, dev-util/rats/ David Seifert
-- strict thread matches above, loose matches on Subject: below --
2017-12-28 12:03 David Seifert
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox