version bump

(Portage version: 2.1_pre4-r1)

7 files changed, 69 insertions, 127 deletions

diff --git a/app-forensics/pyflag/ChangeLog b/app-forensics/pyflag/ChangeLog
index 14939929a5ba..f6f86907f25e 100644
--- a/app-forensics/pyflag/ChangeLog
+++ b/app-forensics/pyflag/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-forensics/pyflag
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-forensics/pyflag/ChangeLog,v 1.2 2006/02/04 11:58:19 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-forensics/pyflag/ChangeLog,v 1.3 2006/02/08 21:57:50 dragonheart Exp $
+
+*pyflag-0.80.1 (08 Feb 2006)
+
+  08 Feb 2006; Daniel Black <dragonheart@gentoo.org>
+  +files/pyflag-0.80.1-nodbtool.patch, -files/pyflag-0.80-nodbtool.patch,
+  -pyflag-0.80.ebuild, +pyflag-0.80.1.ebuild:
+  version bump
 
   04 Feb 2006; Daniel Black <dragonheart@gentoo.org> pyflag-0.80.ebuild:
   autoconf abbreviations - thanks Diego
diff --git a/app-forensics/pyflag/Manifest b/app-forensics/pyflag/Manifest
index c96009521ade..7fec85c126f7 100644
--- a/app-forensics/pyflag/Manifest
+++ b/app-forensics/pyflag/Manifest
@@ -1,25 +1,24 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 76cdfd360b2cf7a7ca3b3419818796bb ChangeLog 522
 RMD160 5d555ca3c40f3d8bcca05d8908b8924960eb5380 ChangeLog 522
 SHA256 17972eb1eda43695a3349d7514c22064e0360f856e870a0c12a45645f9c933a0 ChangeLog 522
 MD5 b06edbb4767acef9c6c7f9f66d195e57 files/digest-pyflag-0.80 235
 RMD160 95d051ae1289bda637082b92213867a64d4af5c8 files/digest-pyflag-0.80 235
 SHA256 c593c42e9005303a2bfb190536f4f0e1f5371de0521f32e7b65cbe22a053b7f3 files/digest-pyflag-0.80 235
+MD5 aa000b298cdcda2f5f5ffd6c3ec3eb41 files/digest-pyflag-0.80.1 241
+RMD160 3c6c3a8a27a59721d2487457b98f671e97b4dffd files/digest-pyflag-0.80.1 241
+SHA256 6ed2702fb61afe322efe47f0589fb8248ccf5a095f730ffbdc35cabb672ed167 files/digest-pyflag-0.80.1 241
 MD5 a5c5ecb770c6d3295f58b2c80d768f29 files/pyflag-0.80-nodbtool.patch 4484
 RMD160 c32d1ffe0fd9f57f7a93d89d4b0d1194c2930a89 files/pyflag-0.80-nodbtool.patch 4484
 SHA256 3f24545f3c9d334f1e2b8453d0e718ecfd2d7685404c62fe035afb637c8c5ff0 files/pyflag-0.80-nodbtool.patch 4484
+MD5 479cba6a14da2db524bb887622c779b9 files/pyflag-0.80.1-nodbtool.patch 2128
+RMD160 6961838551bad11e57a00c8ae92ed6ee2b194722 files/pyflag-0.80.1-nodbtool.patch 2128
+SHA256 bc8159511adeb193a1a0ea58a73af8691fa20d2c9c02f5fd25a64aff763b191a files/pyflag-0.80.1-nodbtool.patch 2128
 MD5 337a7b8bb8752ec54a72b7429432af11 metadata.xml 841
 RMD160 83f805589c660b532bc92b4f06ca8c7ab47fa83d metadata.xml 841
 SHA256 1c673beca06d796a808a13e173ede075f61ae13ce499f3f0d56313d30234afa9 metadata.xml 841
+MD5 83c1f645894996767125ae159919caeb pyflag-0.80.1.ebuild 2686
+RMD160 2cfe2c94635cd91ce745686bf393ed1ff1f69397 pyflag-0.80.1.ebuild 2686
+SHA256 2d11a4b94754302da78eda42869d10bac8251f3f6e96f83ee66515cba860dcab pyflag-0.80.1.ebuild 2686
 MD5 4cc5e826332d7f43425f5d65e627ec70 pyflag-0.80.ebuild 2818
 RMD160 ccabb3aaa0d3436b3cab8a2133513f815239b67a pyflag-0.80.ebuild 2818
 SHA256 22dda773575a926bc0b975bc49bd720e35eb5333d6030632d55740b617eb99af pyflag-0.80.ebuild 2818
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2-ecc0.1.6 (GNU/Linux)
-
-iD8DBQFD5JzgmdTrptrqvGERAvUVAKCEbp/EQaclk9GVpEF9QSlclMqu7wCePdKl
-FeLNOWD99SkrtkCY4E1M+JE=
-=NsIY
------END PGP SIGNATURE-----
diff --git a/app-forensics/pyflag/files/digest-pyflag-0.80 b/app-forensics/pyflag/files/digest-pyflag-0.80
deleted file mode 100644
index 1ea70efb39a7..000000000000
--- a/app-forensics/pyflag/files/digest-pyflag-0.80
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 9cdb3cd401a410fc89e2e30cf5055cea pyflag-0.80.tar.gz 984995
-RMD160 e29247725bcf760b480e196ded1820c37fed0352 pyflag-0.80.tar.gz 984995
-SHA256 1bdc41bb47ed1aa962346fbdba6203bae675798b9e77019a017dc37bcb6c7838 pyflag-0.80.tar.gz 984995
diff --git a/app-forensics/pyflag/files/digest-pyflag-0.80.1 b/app-forensics/pyflag/files/digest-pyflag-0.80.1
new file mode 100644
index 000000000000..4dde40cac94b
--- /dev/null
+++ b/app-forensics/pyflag/files/digest-pyflag-0.80.1
@@ -0,0 +1,3 @@
+MD5 696e866302ce4ffe5a4e2a71104f003a pyflag-0.80.1.tar.gz 964751
+RMD160 748f8fc4915d7deac42953e60ae1bf6a4c321b04 pyflag-0.80.1.tar.gz 964751
+SHA256 d1cd6fbbf541011b7b95ebabb6c9e53095b7d878cfdd2658d48da97940cee5ba pyflag-0.80.1.tar.gz 964751
diff --git a/app-forensics/pyflag/files/pyflag-0.80-nodbtool.patch b/app-forensics/pyflag/files/pyflag-0.80-nodbtool.patch
deleted file mode 100644
index 29c838b84688..000000000000
--- a/app-forensics/pyflag/files/pyflag-0.80-nodbtool.patch
+++ /dev/null
@@ -1,109 +0,0 @@
-diff -ru pyflag-0.80-orig/configure.in pyflag-0.80/configure.in
---- pyflag-0.80-orig/configure.in	2006-01-19 09:43:16.000000000 +1100
-+++ pyflag-0.80/configure.in	2006-01-20 20:03:04.000000000 +1100
-@@ -11,7 +11,14 @@
- AC_CHECK_HEADER(zlib.h,,AC_MSG_ERROR([You Must install zlib-dev to build pyflag]))
- AC_CHECK_HEADER(pcap.h,,AC_MSG_ERROR([You Must install libpcap-dev to build pyflag]))
- AC_CHECK_HEADER(magic.h,,AC_MSG_ERROR([You Must install libmagic-dev to build pyflag this may be part of file the package for some distros]))
-+
-+# if we have dbtool don't need sleuthkit
-+AC_CHECK_PROG([HAVE_DBTOOL],dbtool,"yes", "no")
-+if test "x$HAVE_DBTOOL" = xno
-+then
- AC_CHECK_FILE(src/filesystems/sleuthkit-2.03.tar.gz,,AC_MSG_ERROR([You Must download sleuthkit-2.03.tar.gz and place in src/filesystems ]))
-+fi
-+AM_CONDITIONAL(HAVE_DBTOOL, test x$HAVE_DBTOOL = xyes)
- 
- # python checks 
- # (requires autoconf 1.5+ and the macros in acinclude.m4)
-diff -ru pyflag-0.80-orig/src/Makefile.am pyflag-0.80/src/Makefile.am
---- pyflag-0.80-orig/src/Makefile.am	2006-01-09 12:13:40.000000000 +1100
-+++ pyflag-0.80/src/Makefile.am	2006-01-20 20:03:04.000000000 +1100
-@@ -1,4 +1,10 @@
--SUBDIRS = lib mailtools indextools network regtools virustools filesystems include
-+
-+SUBDIRS = lib mailtools indextools network regtools virustools include
-+
-+if HAVE_DBTOOL
-+else
-+SUBDIRS+=filesystems
-+endif
- 
- # main pyflag (python) application
- # not sure how to do this recursively
-diff -ru pyflag-0.80-slightlypatched/configure.in pyflag-0.80/configure.in
---- pyflag-0.80-slightlypatched/configure.in	2006-01-20 20:42:03.000000000 +1100
-+++ pyflag-0.80/configure.in	2006-01-20 20:42:52.000000000 +1100
-@@ -44,7 +44,7 @@
- fi
- 
- # try to find magic files
--AC_ARG_WITH(magic, AC_HELP_STRING([--with-magic], [specify a colon-separated list of system magic files, default autodetect]),,[magic=$(file -v | tail -1 | awk '{print $4}')])
-+AC_ARG_WITH(magic, AC_HELP_STRING([--with-magic], [specify a colon-separated list of system magic files, default autodetect]),,[magic=$(file -v | tail -n 1 | awk '{print $4}')])
- AC_SUBST(magic)
-             
- 
---- pyflag-0.80-old/src/plugins/Configuration.py	2006-01-19 09:43:16.000000000 +1100
-+++ pyflag-0.80/src/plugins/Configuration.py	2006-01-22 13:00:26.000000000 +1100
-@@ -3,6 +3,7 @@
- config=pyflag.conf.ConfObject()
- import os
- import DB
-+import stat
- 
- class Configure(Reports.report):
-     """ Configures pyflag """
-@@ -38,7 +39,8 @@
-                 result.para("We do not seem to have enough privileges to access %s, or the path (%s) does not exist" %(k,config.__class__.__dict__[k]))
-                 return
- 
--        fd=open(os.environ['HOME'] + '/.pyflagrc', 'a+', S_IRWXU)
-+        fd=open(os.environ['HOME'] + '/.pyflagrc', 'a+') #, os.S_IRWXU)
-+	os.chmod(os.environ['HOME'] + '/.pyflagrc',  stat.S_IRWXU)
- 	## TODO Think append is wrong?
-         result.para("Writing new $HOME/.pyflagrc")
- 
---- pyflag-0.80/Makefile.am	2006-01-19 09:00:50.000000000 +1100
-+++ pyflag-0.80.new/Makefile.am	2006-01-22 13:04:54.000000000 +1100
-@@ -10,7 +10,7 @@
- # perform subs in scripts and config files
- edit = sed \
- 	-e 's,@datadir\@,$(pkgdatadir),g' \
--	-e 's,@sysconf\@,$(sysconfdir),g' \
-+	-e 's,@sysconfdir\@,$(sysconfdir),g' \
- 	-e 's,@pkgpyexec\@,$(pkgpyexecdir),g' \
- 	-e 's,@pythondir\@,$(pythondir),g' \
- 	-e 's,@prefix\@,$(prefix),g' \
-diff -ru pyflag-0.80-orig/pyflag.in pyflag-0.80/pyflag.in
---- pyflag-0.80-orig/pyflag.in	2006-01-10 12:04:31.000000000 +1100
-+++ pyflag-0.80/pyflag.in	2006-01-22 13:19:31.000000000 +1100
-@@ -1,6 +1,6 @@
- #!/bin/bash
- 
--. @sysconf@/pyflagrc
-+. @sysconfdir@/pyflagrc
- 
- ## Try to load personalised configurations
- if [ -e ~/.pyflagrc ] ; then source ~/.pyflagrc; fi
-diff -ru pyflag-0.80-orig/pyflag_launch.in pyflag-0.80/pyflag_launch.in
---- pyflag-0.80-orig/pyflag_launch.in	2006-01-10 12:04:59.000000000 +1100
-+++ pyflag-0.80/pyflag_launch.in	2006-01-22 13:20:30.000000000 +1100
-@@ -1,6 +1,6 @@
- #!/bin/bash
- 
--. @sysconf@/pyflagrc
-+. @sysconfdir@/pyflagrc
- 
- ## Try to load personalised configurations
- if [ -e ~/.pyflagrc ] ; then source ~/.pyflagrc; fi
-diff -ru pyflag-0.80-orig/pyflash.in pyflag-0.80/pyflash.in
---- pyflag-0.80-orig/pyflash.in	2006-01-10 12:04:48.000000000 +1100
-+++ pyflag-0.80/pyflash.in	2006-01-22 13:20:11.000000000 +1100
-@@ -1,6 +1,6 @@
- #!/bin/bash
- 
--. @sysconf@/pyflagrc
-+. @sysconfdir@/pyflagrc
- 
- ## Try to load personalised configurations
- if [ -e ~/.pyflagrc ] ; then source ~/.pyflagrc; fi
diff --git a/app-forensics/pyflag/files/pyflag-0.80.1-nodbtool.patch b/app-forensics/pyflag/files/pyflag-0.80.1-nodbtool.patch
new file mode 100644
index 000000000000..f02c7256970b
--- /dev/null
+++ b/app-forensics/pyflag/files/pyflag-0.80.1-nodbtool.patch
@@ -0,0 +1,47 @@
+Only in pyflag-0.80.1: Makefile.am.rej
+diff -ru pyflag-0.80.1.orig/configure.in pyflag-0.80.1/configure.in
+--- pyflag-0.80.1.orig/configure.in	2006-01-24 08:35:44.000000000 +1100
++++ pyflag-0.80.1/configure.in	2006-02-09 09:29:53.000000000 +1100
+@@ -11,7 +11,14 @@
+ AC_CHECK_HEADER(zlib.h,,AC_MSG_ERROR([You Must install zlib-dev to build pyflag]))
+ AC_CHECK_HEADER(pcap.h,,AC_MSG_ERROR([You Must install libpcap-dev to build pyflag]))
+ AC_CHECK_HEADER(magic.h,,AC_MSG_ERROR([You Must install libmagic-dev to build pyflag this may be part of file the package for some distros]))
++
++# if we have dbtool don't need sleuthkit
++AC_CHECK_PROG([HAVE_DBTOOL],dbtool,"yes", "no")
++if test "x$HAVE_DBTOOL" = xno
++then
+ AC_CHECK_FILE(src/filesystems/sleuthkit-2.03.tar.gz,,AC_MSG_ERROR([You Must download sleuthkit-2.03.tar.gz and place in src/filesystems ]))
++fi
++AM_CONDITIONAL(HAVE_DBTOOL, test x$HAVE_DBTOOL = xyes)
+ 
+ # python checks 
+ # (requires autoconf 1.5+ and the macros in acinclude.m4)
+@@ -37,7 +44,7 @@
+ fi
+ 
+ # try to find magic files
+-AC_ARG_WITH(magic, AC_HELP_STRING([--with-magic], [specify a colon-separated list of system magic files, default autodetect]),,[magic=$(file -v | tail -1 | awk '{print $4}')])
++AC_ARG_WITH(magic, AC_HELP_STRING([--with-magic], [specify a colon-separated list of system magic files, default autodetect]),,[magic=$(file -v | tail -n 1 | awk '{print $4}')])
+ AC_SUBST(magic)
+             
+ 
+Only in pyflag-0.80.1: pyflag.in.rej
+Only in pyflag-0.80.1: pyflag_launch.in.rej
+Only in pyflag-0.80.1: pyflash.in.rej
+diff -ru pyflag-0.80.1.orig/src/Makefile.am pyflag-0.80.1/src/Makefile.am
+--- pyflag-0.80.1.orig/src/Makefile.am	2006-01-09 12:13:40.000000000 +1100
++++ pyflag-0.80.1/src/Makefile.am	2006-02-09 09:29:53.000000000 +1100
+@@ -1,4 +1,10 @@
+-SUBDIRS = lib mailtools indextools network regtools virustools filesystems include
++
++SUBDIRS = lib mailtools indextools network regtools virustools include
++
++if HAVE_DBTOOL
++else
++SUBDIRS+=filesystems
++endif
+ 
+ # main pyflag (python) application
+ # not sure how to do this recursively
+Only in pyflag-0.80.1/src/plugins: Configuration.py.rej
diff --git a/app-forensics/pyflag/pyflag-0.80.ebuild b/app-forensics/pyflag/pyflag-0.80.1.ebuild
index 1cd3ff26492f..ac5a558ad6ad 100644
--- a/app-forensics/pyflag/pyflag-0.80.ebuild
+++ b/app-forensics/pyflag/pyflag-0.80.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-forensics/pyflag/pyflag-0.80.ebuild,v 1.2 2006/02/04 11:58:19 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-forensics/pyflag/pyflag-0.80.1.ebuild,v 1.1 2006/02/08 21:57:50 dragonheart Exp $
 
 inherit eutils autotools
 
@@ -41,10 +41,8 @@ DEPEND=">=dev-lang/swig-1.3
 
 src_unpack() {
 	unpack "${A}"
-	cd "${S}"
 	epatch "${FILESDIR}/${P}-nodbtool.patch"
-	sed -i -e 's/flag_version =.*/flag_version ="$Version: 0.80 Date: Thu Jan 19 00:50:12 EST 2006$"/' \
-		src/pyflag/FlagFramework.py
+	cd "${S}"
 	AT_M4DIR="config" eautoreconf
 }