Version bumped. Added minimal USE flag.

(Portage version: 2.1.2.7)

7 files changed, 95 insertions, 74 deletions

diff --git a/app-admin/lsat/ChangeLog b/app-admin/lsat/ChangeLog
index 91bb20b8170b..dbf4a8ff2a02 100644
--- a/app-admin/lsat/ChangeLog
+++ b/app-admin/lsat/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-admin/lsat
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/lsat/ChangeLog,v 1.20 2007/05/03 18:58:57 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/lsat/ChangeLog,v 1.21 2007/05/25 10:59:23 matsuu Exp $
+
+*lsat-0.9.6 (25 May 2007)
+
+  25 May 2007; MATSUU Takuto <matsuu@gentoo.org>
+  -files/lsat-0.9.2-gentoo.patch, +files/lsat-0.9.6-gentoo.patch,
+  -lsat-0.9.2.ebuild, +lsat-0.9.6.ebuild:
+  Version bumped.
+  Removed old version.
 
   03 May 2007; Steve Dibb <beandog@gentoo.org> lsat-0.9.5.ebuild:
   amd64 stable, security bug 159542
diff --git a/app-admin/lsat/files/digest-lsat-0.9.2 b/app-admin/lsat/files/digest-lsat-0.9.2
deleted file mode 100644
index 9be26f2c9c47..000000000000
--- a/app-admin/lsat/files/digest-lsat-0.9.2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 0435a69e54e0f18b1a425bfc2c3abb17 lsat-0.9.2.tgz 71565
-RMD160 40356cb4302d8aae0797f1f760f097a18477cbf9 lsat-0.9.2.tgz 71565
-SHA256 d98472458f00e7705dcfa35d3f45c03eebb33499cca69efa670c661a188444a9 lsat-0.9.2.tgz 71565
diff --git a/app-admin/lsat/files/digest-lsat-0.9.6 b/app-admin/lsat/files/digest-lsat-0.9.6
new file mode 100644
index 000000000000..d8e70707c8d2
--- /dev/null
+++ b/app-admin/lsat/files/digest-lsat-0.9.6
@@ -0,0 +1,3 @@
+MD5 6420a32d6d9f8b9da92239bca96d25c5 lsat-0.9.6.tgz 74460
+RMD160 47f7a5840af055b49536e7f98756a898ed100d13 lsat-0.9.6.tgz 74460
+SHA256 b542764857f22094b60b0f686a2f31dcf2a43965de62a871dcd68c5f7a685890 lsat-0.9.6.tgz 74460
diff --git a/app-admin/lsat/files/lsat-0.9.2-gentoo.patch b/app-admin/lsat/files/lsat-0.9.2-gentoo.patch
deleted file mode 100644
index 6bde13268fa5..000000000000
--- a/app-admin/lsat/files/lsat-0.9.2-gentoo.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff -Naur lsat-0.9.2.orig/checkhostsfiles.c lsat-0.9.2/checkhostsfiles.c
---- lsat-0.9.2.orig/checkhostsfiles.c	2004-03-13 10:49:11.000000000 +0900
-+++ lsat-0.9.2/checkhostsfiles.c	2005-06-11 08:20:28.000000000 +0900
-@@ -274,6 +274,8 @@
- 	perror(" Creation of list failed.");
- 	return(-1);
-     }
-+    /* clean up */
-+    fclose(fileptr);
- 
-     } /* end of else, for if hosts.deny exists */
- 
-@@ -294,8 +296,6 @@
-         header = "/etc/hosts.lpd found on this system.\nConsider preventing lpd from listening to the network.\nAt least make sure it contains fully qualified hostnames.";
-         dostuff(0, filename, 0, header, html);
-     }
--    /* clean up */
--    fclose(fileptr);
- 
-     if (verbose > 0)
-     {
-diff -Naur lsat-0.9.2.orig/checkpkgs.c lsat-0.9.2/checkpkgs.c
---- lsat-0.9.2.orig/checkpkgs.c	2004-03-13 10:49:11.000000000 +0900
-+++ lsat-0.9.2/checkpkgs.c	2005-05-12 22:54:16.000000000 +0900
-@@ -122,7 +122,7 @@
-         {
-             printf(" Generating list of pkgs on system.\n");
-         }
--        shellcode = "/usr/lib/portage/bin/pkglist >>/tmp/lsat1.lsat";
-+        shellcode = "/usr/bin/qpkg -I -nc >>/tmp/lsat1.lsat";
-         if ((dostuff(tempfile, 0, shellcode, 0, html)) < 0)
-         {
-             /* rhut-rho...something bad happened */
diff --git a/app-admin/lsat/files/lsat-0.9.6-gentoo.patch b/app-admin/lsat/files/lsat-0.9.6-gentoo.patch
new file mode 100644
index 000000000000..631dcd7322f7
--- /dev/null
+++ b/app-admin/lsat/files/lsat-0.9.6-gentoo.patch
@@ -0,0 +1,42 @@
+diff -Naur lsat-0.9.6.orig/Makefile.in lsat-0.9.6/Makefile.in
+--- lsat-0.9.6.orig/Makefile.in	2007-05-22 11:38:28.000000000 +0900
++++ lsat-0.9.6/Makefile.in	2007-05-25 18:55:25.000000000 +0900
+@@ -12,6 +12,7 @@
+ PROGRAM= lsat
+ INSTALL = /usr/bin/install -c
+ prefix = @prefix@
++exec_prefix = @exec_prefix@
+ BINDIR = @bindir@
+ DATADIR = @datadir@
+ MANDIR = @mandir@
+@@ -38,9 +39,7 @@
+ 	rm -f $(PROGRAM) $(OBJECTS) Makefile config.*  lsat.old lsatmd5.out lsatmd5.old
+ 
+ manpage:
+-	pod2man $(PROGRAM).pod > $(PROGRAM).tmp
+-	sed 's/perl v5.6.1/LSAT/g' $(PROGRAM).tmp| \
+-sed 's/Perl/LSAT/g'\
++	pod2man $(PROGRAM).pod -r LSAT -c 'User Contributed LSAT Documentation' \
+ > $(PROGRAM).1
+ 	rm -f  $(PROGRAM).tmp
+ #	cp -vf $(PROGRAM).1 debian/manpage.1.ex	
+diff -Naur lsat-0.9.6.orig/checkpkgs.c lsat-0.9.6/checkpkgs.c
+--- lsat-0.9.6.orig/checkpkgs.c	2007-04-27 00:48:31.000000000 +0900
++++ lsat-0.9.6/checkpkgs.c	2007-05-25 18:46:00.000000000 +0900
+@@ -113,14 +113,14 @@
+     }
+ 
+ 
+-    /* if distro = gentoo, use pkglist */
++    /* if distro = gentoo, use qpkg */
+     if (distribution == 4)
+     {
+         if (verbose > 0)
+         {
+             printf(" Generating list of pkgs on system.\n");
+         }
+-        shellcode = "/usr/lib/portage/bin/pkglist 2>/dev/null >>/tmp/lsat1.lsat";
++        shellcode = "/usr/bin/qpkg -I -nc 2>/dev/null >>/tmp/lsat1.lsat";
+         if ((dostuff(tempfile, 0, shellcode, 0, html)) < 0)
+         {
+             /* rhut-rho...something bad happened */
diff --git a/app-admin/lsat/lsat-0.9.2.ebuild b/app-admin/lsat/lsat-0.9.2.ebuild
deleted file mode 100644
index 362b7af35662..000000000000
--- a/app-admin/lsat/lsat-0.9.2.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/lsat/lsat-0.9.2.ebuild,v 1.3 2005/06/18 08:31:52 hansmi Exp $
-
-inherit eutils
-
-DESCRIPTION="The Linux Security Auditing Tool"
-HOMEPAGE="http://usat.sourceforge.net/"
-SRC_URI="http://usat.sourceforge.net/code/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-RDEPEND="virtual/libc
-	dev-libs/popt"
-DEPEND="${RDEPEND}
-	dev-lang/perl"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${P}-gentoo.patch
-}
-
-src_compile() {
-	econf || die
-	emake CFLAGS="${CFLAGS}" SLIBS="-lpopt" all manpage || die
-}
-
-src_install() {
-	dobin lsat || die
-	doman lsat.1
-	dodoc INSTALL README* *.txt
-	dohtml modules.html changelog/changelog.html
-}
diff --git a/app-admin/lsat/lsat-0.9.6.ebuild b/app-admin/lsat/lsat-0.9.6.ebuild
new file mode 100644
index 000000000000..e51a415ecbdc
--- /dev/null
+++ b/app-admin/lsat/lsat-0.9.6.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/lsat/lsat-0.9.6.ebuild,v 1.1 2007/05/25 10:59:23 matsuu Exp $
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="The Linux Security Auditing Tool"
+HOMEPAGE="http://usat.sourceforge.net/"
+SRC_URI="http://usat.sourceforge.net/code/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="minimal"
+
+DEPEND="dev-lang/perl" # pod2man
+RDEPEND="!minimal? (
+		app-portage/portage-utils
+		net-analyzer/nmap
+		sys-apps/iproute2
+		sys-apps/which
+		sys-process/lsof
+	)"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-gentoo.patch
+}
+
+src_compile() {
+	tc-export CC
+	econf || die
+	emake CFLAGS="${CFLAGS}" all manpage || die
+}
+
+src_install() {
+	emake DESTDIR="${D}" install installman || die
+	dodoc README* *.txt
+	dohtml modules.html changelog/changelog.html
+}