gentoo resync : 15.12.2019

4 files changed, 183 insertions, 0 deletions

diff --git a/app-forensics/magicrescue/Manifest b/app-forensics/magicrescue/Manifest
index 6c7365d73251..306d415cfb65 100644
--- a/app-forensics/magicrescue/Manifest
+++ b/app-forensics/magicrescue/Manifest
@@ -1,5 +1,9 @@
+AUX magicrescue-1.1.10-ldflags.patch 1140 BLAKE2B 98deed569c8809e0e7a31c86cd29f1e79eaa2a2da986f2dcbce3591a1eba0e0aff43caf48db008a1c7c09e27d602e8c10a41889c7a89ad3696e9a5514449eec5 SHA512 abcb734fc4381408d8c4072e637a326a1b619defc244f70fb68608485a4a36ff4b4a206c296bb7dec0ae19fbe8030b88c9a6b528ca0f1934a0308f167ddd966d
+AUX magicrescue-1.1.10-remove_toolsdir.patch 4087 BLAKE2B ce13561cac085ca3c558d02fd9538ce9c3973a022fb3e51048ede5643e258d2a352425f5c3e1a164d209d2ecbb46a6c3c73da997c08a2d61f23fa764d8c526be SHA512 4b2a627475d3fff6b3a8c30dd883b3358043a429d05772bc4e1f658273a7c2a7beb29bc69978ac817074ba25827e4954a948076d77de73832eaf479e4bc1b8c8
 AUX magicrescue-1.1.9-ldflags.patch 1759 BLAKE2B ae84881d1c0e6ff97e23184f97eb5e3c0029908630944fa519a51a2a0cb35cfe5329c02a35cd36443163e4c7484eef0bd78559f397467cd1c3fbea6e09866a6b SHA512 989630cfe2a6b9fcf94c39f648bf0ee2babf804f0f13f099491e282c971c312ee9e7533064f16366a71e97d9c7a5e3ffdce9294417380f73860f1e4876ffc0b6
 AUX magicrescue-1.1.9-makefile.patch 1809 BLAKE2B 2e57b1275efd928b07e6d887b7d2756957dd58f1cb19a80c75c6cdc23c678656ba4d4ecdc70824ff207d6106aa0fb4c8a0afe83aebf51cf6afaa2ddd90854226 SHA512 2bad3112e0c46cb0d5767ebbd32848b718bb07224f800e13715ed671e03a108a041876f599e921c7c02f81467e878146162f64d99138c1194317c82b740c1dc9
+DIST magicrescue-1.1.10.tar.gz 227237 BLAKE2B a1584f4e6f4b6771783c565901775e181ba2e952e780565831e5d46245a4dd4670657cec7fb57b18d7dfc09954faec410da2dfe1b35130c23d22d8a6ccf0ab07 SHA512 54fc943a1f521563a3416040eb6b140e3ef79966b615ae0223be0558b810f9202c2d1e5ba0165c43a614caf78dbce1b0992775bef39e9611d2dc290e4582c29d
 DIST magicrescue-1.1.9.tar.gz 92621 BLAKE2B a0a3644729c8af3fab9294b211cfbba0a823186219a585923203236aee27954d2337f81fc4d9559b6dde43581c5ce2d6bae5c2961248e2c4f5dd1ab8e31d5b60 SHA512 3c0b97357f0d354dcf53045bbdf2ce81c451ae20c451d2d72dc8b2dbcc480cf48ab436494c0cca20c99f32c938c525074a561cbc779a580a648c674c150a7cc2
+EBUILD magicrescue-1.1.10.ebuild 951 BLAKE2B 5dc6eef2497fd83eb2517b6307fc26a0883bb27b44782c81bf8ec2f23cf3f5f8d43b02bef472aa3c12dad7bb7e25bf5aac7f3f93148b39ca04fae7b762639348 SHA512 7edf061bf8fe4738ba8a9166e9931da02bdd6c690028011518f422d3df98523d67ac32330ad53da913bf87acdcf617a01eb65e4d2ce4c5e0ae33b8fe07ba718e
 EBUILD magicrescue-1.1.9.ebuild 665 BLAKE2B ab1e4339c4b0c7146fefb18857ce5a41e180768859c2a355eaa2ff5b07bb951ed6436d592a434b2632c781b6732929b2f0d5e4bd2215d15cc196c2e118d043a5 SHA512 d73c4c655201f6746092ac776c45d7e06bf3b73c92e7706e270dd2e89d529411045a26e1037d978a142032b6d3c40f1f7cffcdef330116e93d78d0f441c72606
 MISC metadata.xml 749 BLAKE2B fe0e5e13992d5174ca97174dec1b0c8a73d79ad733887c218af123b548b4e4db0f6b3b894ae87dbdd2b6717e1e88a4c259d17167b3dec03f7ae250f0dfc516e5 SHA512 6aed4f9d6a8cb9e5b3d5998eac7770a8bd8e806af2bff41016a6d9cc3d1a1dbbd38c9d7518be3f5e930a41b562417c479725f572880e77eb75603ac152f67dc3
diff --git a/app-forensics/magicrescue/files/magicrescue-1.1.10-ldflags.patch b/app-forensics/magicrescue/files/magicrescue-1.1.10-ldflags.patch
new file mode 100644
index 000000000000..773bab4ff19c
--- /dev/null
+++ b/app-forensics/magicrescue/files/magicrescue-1.1.10-ldflags.patch
@@ -0,0 +1,38 @@
+--- magicrescue-1.1.9/config.d/50dbm	2008-06-27 00:24:05.000000000 +0400
++++ magicrescue-1.1.9.new//config.d/50dbm	2012-05-13 07:56:16.000000000 +0400
+@@ -14,18 +14,14 @@
+ 	    flag="`echo $flag|sed 's/./-l&/'`"
+ 	    echo "trying to link with flags [$flag]" >&5
+ 	    
+-	    bak_LDFLAGS="$LDFLAGS"
+-	    LDFLAGS="$LDFLAGS $flag"
++            LIBS="$flag"
+ 	    if conftest_link; then
+ 		# we found it!
+-		LDFLAGS="$bak_LDFLAGS"
+ 		DBM_LDFLAGS="$flag"
+ 		env_vars="$env_vars DBM_LDFLAGS"
+ 		echo "#define $dbmdef" >> config.h
+ 		echo "#define HAVE_NDBM" >> config.h
+ 		return 0
+-	    else
+-		LDFLAGS="$bak_LDFLAGS"
+ 	    fi
+ 	done
+ 	
+Common subdirectories: a/config.d and b/config.d
+diff -u a/configure b/configure
+--- a/configure	2018-11-24 20:21:20.000000000 +0100
++++ b/configure	2019-11-12 22:13:03.744338398 +0100
+@@ -63,9 +63,9 @@
+ }
+ 
+ conftest_link() {
+-    echo "$CC -o conftest conftest.o $LDFLAGS" >&5
++    echo "$CC -o conftest conftest.o $LDFLAGS $LIBS" >&5
+     echo >&5
+-    $CC -o conftest conftest.o $LDFLAGS >&5 2>&5 \
++    $CC -o conftest conftest.o $LDFLAGS $LIBS >&5 2>&5 \
+ 	&& [ -x conftest ] && ./conftest 2>&5
+ }
+ 
diff --git a/app-forensics/magicrescue/files/magicrescue-1.1.10-remove_toolsdir.patch b/app-forensics/magicrescue/files/magicrescue-1.1.10-remove_toolsdir.patch
new file mode 100644
index 000000000000..b3a238b1bbea
--- /dev/null
+++ b/app-forensics/magicrescue/files/magicrescue-1.1.10-remove_toolsdir.patch
@@ -0,0 +1,106 @@
+diff -Naur a/config.d/80magicrescue_defs b/config.d/80magicrescue_defs
+--- a/config.d/80magicrescue_defs	2018-11-24 20:21:20.000000000 +0100
++++ b/config.d/80magicrescue_defs	2019-11-14 09:41:34.030848527 +0100
+@@ -1,7 +1,7 @@
+ #!/bin/sh
+ 
+ cat >> config.h << EOF
+-#define COMMAND_PATH "$prefix/share/magicrescue/tools"
++#define COMMAND_PATH "$prefix/bin"
+ #define RECIPE_PATH  "$prefix/share/magicrescue/recipes"
+ #include "largefile.h"
+ EOF
+diff -Naur a/doc/magicrescue.1 b/doc/magicrescue.1
+--- a/doc/magicrescue.1	2018-11-24 20:21:20.000000000 +0100
++++ b/doc/magicrescue.1	2019-11-14 09:41:34.030848527 +0100
+@@ -358,7 +358,7 @@
+ This means that you may have to write your own tool or wrap an existing program
+ in some scripts that make it behave better.  For example, this could be to
+ extract the first 10MB into a temporary file and let the program work on that.
+-Or perhaps you can use \fItools/safecat\fR if the file may be very large.
++Or perhaps you can use \fIsafecat\fR if the file may be very large.
+ .SS "Recipe format reference"
+ .IX Subsection "Recipe format reference"
+ Empty lines and lines starting with \f(CW\*(C`#\*(C'\fR will be skipped.  A recipe contains a
+@@ -424,7 +424,7 @@
+ should be set to 512.
+ .PP
+ To test whether your recipe actually works, either just run it on your hard
+-disk or use the \fItools/checkrecipe\fR script to pick out files that should match
++disk or use the \fIcheckrecipe\fR script to pick out files that should match
+ but don't.
+ .PP
+ If you have created a recipe that works, please mail it to me at jbj@knef.dk so
+diff -Naur a/doc/magicrescue.pod b/doc/magicrescue.pod
+--- a/doc/magicrescue.pod	2018-11-24 20:21:20.000000000 +0100
++++ b/doc/magicrescue.pod	2019-11-14 09:41:34.030848527 +0100
+@@ -239,7 +239,7 @@
+ This means that you may have to write your own tool or wrap an existing program
+ in some scripts that make it behave better.  For example, this could be to
+ extract the first 10MB into a temporary file and let the program work on that.
+-Or perhaps you can use F<tools/safecat> if the file may be very large.
++Or perhaps you can use F<safecat> if the file may be very large.
+ 
+ =head2 Recipe format reference
+ 
+@@ -322,7 +322,7 @@
+ =back
+ 
+ To test whether your recipe actually works, either just run it on your hard
+-disk or use the F<tools/checkrecipe> script to pick out files that should match
++disk or use the F<checkrecipe> script to pick out files that should match
+ but don't.
+ 
+ If you have created a recipe that works, please mail it to me at jbj@knef.dk so
+diff -Naur a/src/magicrescue.c b/src/magicrescue.c
+--- a/src/magicrescue.c	2018-11-24 20:21:20.000000000 +0100
++++ b/src/magicrescue.c	2019-11-14 09:41:34.030848527 +0100
+@@ -552,7 +552,7 @@
+ 
+     buf = malloc(bufsize);
+ 
+-    sprintf(buf, "PATH=%s%s%s:%s", "tools",
++    sprintf(buf, "PATH=%s%s%s:%s",
+ #ifdef COMMAND_PATH
+ 	":", COMMAND_PATH,
+ #else
+diff -Naur a/tools/checkrecipe b/tools/checkrecipe
+--- a/tools/checkrecipe	2018-11-24 20:21:20.000000000 +0100
++++ b/tools/checkrecipe	2019-11-14 09:41:34.030848527 +0100
+@@ -8,7 +8,7 @@
+ a recipe.
+ 
+ Usage:
+-./magicrescue -Mio OPTIONS FILES|tools/checkrecipe [OPTIONS]
++./magicrescue -Mio OPTIONS FILES|checkrecipe [OPTIONS]
+ 
+ Options:
+   -s VALUE  Size tolerance, in percent. Specifies when checkrecipe should
+@@ -18,13 +18,13 @@
+ 
+ find / -name \*.png -print0 \
+ |xargs -0 ./magicrescue -Mio -r png -d /tmp/test-output 2>/dev/null \
+-|tools/checkrecipe
++|checkrecipe
+ 
+   or
+ 
+ slocate \*.png|sed "s/['\"\\\\[:blank:]]/\\\\\\\\&/g" \
+ |xargs ./magicrescue -Mio -r png -d /tmp/test-output 2>/dev/null \
+-|tools/checkrecipe
++|checkrecipe
+ );
+     exit;
+ }
+diff -Naur a/tools/ole_rename.pl b/tools/ole_rename.pl
+--- a/tools/ole_rename.pl	2018-11-24 20:21:20.000000000 +0100
++++ b/tools/ole_rename.pl	2019-11-14 09:41:34.030848527 +0100
+@@ -32,7 +32,7 @@
+ my %extensions = @extensions; # for quick lookup
+ 
+ # When invoked by magicrescue, laola.pl should be in the PATH
+-push @INC, grep /tools/, split /:/, $ENV{PATH};
++push @INC, split /:/, $ENV{PATH};
+ require 'laola.pl';
+ 
+ my $file = $ARGV[0];
diff --git a/app-forensics/magicrescue/magicrescue-1.1.10.ebuild b/app-forensics/magicrescue/magicrescue-1.1.10.ebuild
new file mode 100644
index 000000000000..732ae17c8280
--- /dev/null
+++ b/app-forensics/magicrescue/magicrescue-1.1.10.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="Find deleted files in block devices"
+HOMEPAGE="https://github.com/jbj/magicrescue"
+SRC_URI="https://github.com/jbj/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+DEPEND="|| ( sys-libs/gdbm sys-libs/db:* )"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/${P}-ldflags.patch"
+		  "${FILESDIR}/${P}-remove_toolsdir.patch" )
+
+src_prepare() {
+	tc-export CC
+	sed -i -e "\
+			s:\$(INSTALLDIR)/share/magicrescue/recipes:\$(INSTALLDIR)/share/doc/${P}/recipes:;\
+			s:\$(INSTALLDIR)/man/man1:\$(INSTALLDIR)/share/man/man1:;\
+			s:\$(INSTALLDIR)/share/magicrescue/tools:\$(INSTALLDIR)/bin:" Makefile.in || die "could not mangle Makefile.in"
+	default
+}
+
+src_configure() {
+	# Not autotools, just looks like it sometimes
+	./configure --prefix=/usr || die
+}