summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'app-forensics/magicrescue')
-rw-r--r--app-forensics/magicrescue/ChangeLog9
-rw-r--r--app-forensics/magicrescue/Manifest19
-rw-r--r--app-forensics/magicrescue/files/magicrescue-1.1.9-ldflags.patch50
-rw-r--r--app-forensics/magicrescue/magicrescue-1.1.9.ebuild5
4 files changed, 62 insertions, 21 deletions
diff --git a/app-forensics/magicrescue/ChangeLog b/app-forensics/magicrescue/ChangeLog
index 9fe6d432d8a2..8c7f5730966d 100644
--- a/app-forensics/magicrescue/ChangeLog
+++ b/app-forensics/magicrescue/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-forensics/magicrescue
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-forensics/magicrescue/ChangeLog,v 1.21 2012/09/08 01:43:35 radhermit Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-forensics/magicrescue/ChangeLog,v 1.22 2013/04/11 06:17:30 patrick Exp $
+
+ 11 Apr 2013; Patrick Lauer <patrick@gentoo.org>
+ +files/magicrescue-1.1.9-ldflags.patch, magicrescue-1.1.9.ebuild:
+ Build fix for dupemap #415685
08 Sep 2012; Tim Harder <radhermit@gentoo.org> metadata.xml:
Remove redundant maintainer from metadata.
@@ -88,4 +92,3 @@
26 Jan 2005; Daniel Black <dragonheart@gentoo.org>
+magicrescue-1.1.4.ebuild, +metadata.xml:
Initial import. Suggested by Michael Zanetta <mzanetta@telsys.ch>.
-
diff --git a/app-forensics/magicrescue/Manifest b/app-forensics/magicrescue/Manifest
index 5fb90aa3abd4..10763d0aee0a 100644
--- a/app-forensics/magicrescue/Manifest
+++ b/app-forensics/magicrescue/Manifest
@@ -1,19 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
+AUX magicrescue-1.1.9-ldflags.patch 1759 SHA256 b9bf83344918530498f4d849c303128c9dc005721ab6bf0b3acc70b62e6f8b31 SHA512 989630cfe2a6b9fcf94c39f648bf0ee2babf804f0f13f099491e282c971c312ee9e7533064f16366a71e97d9c7a5e3ffdce9294417380f73860f1e4876ffc0b6 WHIRLPOOL cda9f8d604d732c6304fe829e71f371c9892febd4fe4f464f2c9c6e252fdbfbdd1a15f941be2f9ba87ef13cc48bb8b475b18ecc37d4467a02f8c5edeba888cbd
AUX magicrescue-1.1.9-makefile.patch 1809 SHA256 15e3012c920be7d40a6b41d480bd144992a56c44a162758d0ea282474b35b7bc SHA512 2bad3112e0c46cb0d5767ebbd32848b718bb07224f800e13715ed671e03a108a041876f599e921c7c02f81467e878146162f64d99138c1194317c82b740c1dc9 WHIRLPOOL 8ede38f7e780882885e8639b92689540d9ca2271af8e55f09458a062666b1f4623a500ed9a085ba0a3e2e6724b6b14026f00799ef9a67e8190f5777724ae0cec
DIST magicrescue-1.1.9.tar.gz 92621 SHA256 a920b174efd664afe9760a43700588c9c5e6182cb13d7421e07ab613bceeb3c7 SHA512 3c0b97357f0d354dcf53045bbdf2ce81c451ae20c451d2d72dc8b2dbcc480cf48ab436494c0cca20c99f32c938c525074a561cbc779a580a648c674c150a7cc2 WHIRLPOOL 3aa09237ac22ab1235d87a271f3b819faab2fa46ef7280676cd35625b1e9e342dee8bf71308c22e3d8cc1ba2e901894ce9919a20687350e079d4b333d188d908
-EBUILD magicrescue-1.1.9.ebuild 752 SHA256 44ef006c8790892a4162853d9b9a9177935554524b5d483aed3d2c1c400cf4a0 SHA512 4f3a4c89f7032537da542f225ba0852d0a8553838292936487e5ce70983302a69e7a1f7f2f7343c703a6d53cc7e0edbe1c74a75815bb5886c02965336156b2f2 WHIRLPOOL 69fb3dbb19a2f89cb94ab551cc2e7a1afab64d479f7cd5513932eac32a7ac72eecc05ec567dd70bf1e48965d2afa885de039bd8b2babdcaa907f236bd471204f
-MISC ChangeLog 3268 SHA256 71d0a01f02abfced660bd14b1c2787d1416590c294096ed7fe9103e55af5b979 SHA512 70f8d33fe910bfdc1c4eb51b0a391c29f189c690a5a2b0dcf3648c058aa7bc52d792b896813abfb1bec75c946c8e6d98b42a3d41ffa6e9cf92355f6f51119bc1 WHIRLPOOL 2e4ec323ca55b87552183c9c1244a69bb5bf5913b8de0d51c38b5c6205aef381859c0c3328f9d1f81ec36384664f86bb78e4820e356a51a6864a7ee45d1bbc93
+EBUILD magicrescue-1.1.9.ebuild 791 SHA256 57e039093af3f6602546abe967e58e2c6f29cbe318eb3371920bd565c9605269 SHA512 b100c902a4d1f59e42eca41dee1469e239617f6015689fe7aca2ea861c154328ce9387dc9e34920d647e3a9b6576a06ac9c47f66d28e1bb549c95c85a25d4507 WHIRLPOOL 7137a1c47d8d55fb7dee691f65086781e2ccb34d746fe44ddadc841a60f196e5b92887548136de3a5c4a88d2fefc9d38aafd982ecbc779d4f24078c6d7e36593
+MISC ChangeLog 3416 SHA256 c4b58be26360dcc6266f3d7255038088f037031ec72c0b452ce8143ba3d4b3cb SHA512 721dc34617dc8b7327a1238cde4bddc70595b37885b69d83f54d9eb21f6abed598fc20e14b16eb2f9e73a31878f986d88305664551c67727d716e7d721c50995 WHIRLPOOL 50fefd66afc208256051a0a7f4360847c37ffafd791673e7f475b55f44dc0af7ce6520028a1ab835bad7c477dbcaa81c9143ee9de0d46f6a8406b33a156b2ba7
MISC metadata.xml 745 SHA256 7f0c18cc504d727f631b9574977a3b74b99381d2bf3a10f430baee9c40bdb305 SHA512 2c42c28275293243959da2c8e22553ad2479b156e02a8636343bc9b671d3c765631e9764a0186df2d017d094f7c5625c6782d8563a0e87a3b13eb4bbeb6df941 WHIRLPOOL 4c1b188c0bfd1a24e8cf4b5eb15ae8b06ce402bff4702b416bb02886e5d2198e04a584e1b7287f2cc437a0dd47840783169cf7b352413671d73065aae33a92c8
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-
-iQEcBAEBCAAGBQJQSqLNAAoJEEqz6FtPBkyj/kkIAJbQ0QemDJy7M+FsoexPTWC5
-hiPp8zyA1nqOQOYGGSVxC1z/+ZUd0TlC7vQPHn+HwwuhOW0XcU3WsMXHVmBUwj+0
-/Ysp4qtMtm7rVGCM+72cb5kwAwQsfe1m/fx3omi2G0XiFMzMr6V/ku3l1VwgtfBY
-RdTrIwh57TE1u289vPnvgpxRNCuP0nqDt1BhTQetZmw7HTOJeAAb4W6n/kAQdA0J
-t7Fl0yj3HzSynx/f4seUYVyTNnbR+AU9gMmPcao9/fZz6GHcgM7W4NUXGGUYi8qk
-0a2vAFloME0YHmqSk6DXyL6tn2aVsJnvOvU8V/SUR8Ghv9FTa4kpU2vxNOSTSiE=
-=dJ7o
------END PGP SIGNATURE-----
diff --git a/app-forensics/magicrescue/files/magicrescue-1.1.9-ldflags.patch b/app-forensics/magicrescue/files/magicrescue-1.1.9-ldflags.patch
new file mode 100644
index 000000000000..96818c3d58ed
--- /dev/null
+++ b/app-forensics/magicrescue/files/magicrescue-1.1.9-ldflags.patch
@@ -0,0 +1,50 @@
+diff -Naurd magicrescue-1.1.9/Makefile.in magicrescue-1.1.9.new//Makefile.in
+--- magicrescue-1.1.9/Makefile.in 2008-06-27 00:24:06.000000000 +0400
++++ magicrescue-1.1.9.new//Makefile.in 2012-05-13 07:57:59.000000000 +0400
+@@ -21,7 +21,7 @@
+ $(CC) -o $@ $(LDFLAGS) $(MAGICRESCUE_OBJS)
+
+ dupemap: $(DUPEMAP_OBJS)
+- $(CC) -o $@ $(LDFLAGS) $(DBM_LDFLAGS) $(DUPEMAP_OBJS)
++ $(CC) -o $@ $(LDFLAGS) $(DUPEMAP_OBJS) $(DBM_LDFLAGS)
+
+ tools/inputseek: $(INPUTSEEK_OBJS)
+ $(CC) -o $@ $(LDFLAGS) $(INPUTSEEK_OBJS)
+diff -Naurd magicrescue-1.1.9/config.d/50dbm magicrescue-1.1.9.new//config.d/50dbm
+--- 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
+
+diff -Naurd magicrescue-1.1.9/configure magicrescue-1.1.9.new//configure
+--- magicrescue-1.1.9/configure 2008-06-27 00:24:06.000000000 +0400
++++ magicrescue-1.1.9.new//configure 2012-05-13 07:56:16.000000000 +0400
+@@ -63,9 +63,9 @@
+ }
+
+ conftest_link() {
+- echo "$CC -o conftest $LDFLAGS conftest.o" >&5
++ echo "$CC -o conftest $LDFLAGS conftest.o $LIBS" >&5
+ echo >&5
+- $CC -o conftest $LDFLAGS conftest.o >&5 2>&5 \
++ $CC -o conftest $LDFLAGS conftest.o $LIBS >&5 2>&5 \
+ && [ -x conftest ] && ./conftest 2>&5
+ }
+
diff --git a/app-forensics/magicrescue/magicrescue-1.1.9.ebuild b/app-forensics/magicrescue/magicrescue-1.1.9.ebuild
index d0e04ffddf03..0bfe02be09fd 100644
--- a/app-forensics/magicrescue/magicrescue-1.1.9.ebuild
+++ b/app-forensics/magicrescue/magicrescue-1.1.9.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-forensics/magicrescue/magicrescue-1.1.9.ebuild,v 1.6 2012/03/06 20:34:14 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-forensics/magicrescue/magicrescue-1.1.9.ebuild,v 1.7 2013/04/11 06:17:30 patrick Exp $
EAPI=4
@@ -20,6 +20,7 @@ RDEPEND="${DEPEND}"
src_prepare() {
epatch "${FILESDIR}"/${P}-makefile.patch
+ epatch "${FILESDIR}"/${P}-ldflags.patch
tc-export CC
}