summaryrefslogtreecommitdiff
path: root/metadata/md5-cache/app-forensics
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2019-10-13 22:19:36 +0100
committerV3n3RiX <venerix@redcorelinux.org>2019-10-14 23:22:23 +0100
commit4b19be30aa626b327c885dae62c559ec0e9fb935 (patch)
tree76e74807bc479502e13866b581b6bf86734ec634 /metadata/md5-cache/app-forensics
parent30d6f67c98d149508509d5e86f176d558793acc0 (diff)
gentoo resync : 13.10.2019
Diffstat (limited to 'metadata/md5-cache/app-forensics')
-rw-r--r--metadata/md5-cache/app-forensics/Manifest.gzbin6913 -> 6907 bytes
-rw-r--r--metadata/md5-cache/app-forensics/afl-2.52b2
-rw-r--r--metadata/md5-cache/app-forensics/afl-2.55b6
3 files changed, 2 insertions, 6 deletions
diff --git a/metadata/md5-cache/app-forensics/Manifest.gz b/metadata/md5-cache/app-forensics/Manifest.gz
index e9bf62429ea4..9208d0667dee 100644
--- a/metadata/md5-cache/app-forensics/Manifest.gz
+++ b/metadata/md5-cache/app-forensics/Manifest.gz
Binary files differ
diff --git a/metadata/md5-cache/app-forensics/afl-2.52b b/metadata/md5-cache/app-forensics/afl-2.52b
index e6b4209791be..45cd7777fcf7 100644
--- a/metadata/md5-cache/app-forensics/afl-2.52b
+++ b/metadata/md5-cache/app-forensics/afl-2.52b
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
RDEPEND=sys-devel/gcc:* sys-devel/clang:=
SLOT=0
SRC_URI=http://lcamtuf.coredump.cx/afl/releases/afl-2.52b.tgz
-_eclasses_=eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 multilib 1d91b03d42ab6308b5f4f6b598ed110e toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a
+_eclasses_=eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 8a43b9830f1e64a7a5fc0a276afa0275 multilib 1d91b03d42ab6308b5f4f6b598ed110e toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a
_md5_=b788ba6982822b4f78624c7618f6ba2e
diff --git a/metadata/md5-cache/app-forensics/afl-2.55b b/metadata/md5-cache/app-forensics/afl-2.55b
index c6ee1dfb5ea0..c74285ee76df 100644
--- a/metadata/md5-cache/app-forensics/afl-2.55b
+++ b/metadata/md5-cache/app-forensics/afl-2.55b
@@ -8,9 +8,5 @@ LICENSE=Apache-2.0
RDEPEND=sys-devel/gcc:* sys-devel/clang:=
SLOT=0
SRC_URI=https://github.com/google/AFL/archive/v2.55b.tar.gz -> afl-2.55b.tar.gz
-<<<<<<< HEAD
-_eclasses_=eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca multilib 1d91b03d42ab6308b5f4f6b598ed110e toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a
-=======
-_eclasses_=eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 multilib 1d91b03d42ab6308b5f4f6b598ed110e toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a
->>>>>>> next
+_eclasses_=eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 8a43b9830f1e64a7a5fc0a276afa0275 multilib 1d91b03d42ab6308b5f4f6b598ed110e toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a
_md5_=2bebbcec978f1ae8a73fc1434e93b682