gentoo resync : 28.04.2021

4 files changed, 3 insertions, 82 deletions

diff --git a/dev-games/hdl_dump/Manifest b/dev-games/hdl_dump/Manifest
index 64f7b2cbaeef..4555884a43a5 100644
--- a/dev-games/hdl_dump/Manifest
+++ b/dev-games/hdl_dump/Manifest
@@ -1,7 +1,4 @@
 AUX Makefile.patch 870 BLAKE2B f92f5bcb68beba88ca0b7bee47cb6e89ff91129eb5b074c3b3baf87b935830b73af67ea48a3f28c158196f977941229c58a9d7a84d2a396bf6568aaf6e5e0503 SHA512 cf13b402177d7e13561b4a53adc21f14ccc48fe595bd8b455e7b7850f9e1186820ed4c2fce1eec3a02888a3bce84d148928987778b8b59f930b1855e6a43b1ed
-AUX hdl_dump-0.8.6.20060901-fortify.patch 1443 BLAKE2B 4be87a044e2a7bb55aa3054b9fd11f041e13035c5de36598d9d10877a55f67a7156b82cc0819b299d9f80a8b27d91f09b95b044bdc0d4b09c6b77a5b9f09cfcb SHA512 7af0cd2dfcc0b3535cdfd6d8e3b85e475187e89ef46801f2306032d9c8b7d5bdfaf2b5b1f399d8dc3d54251fc0fb063ee7778f3cf2e70f0c685ae81ceafb17e9
 DIST hdl_dump-0.9.2.20180722.tar.gz 185864 BLAKE2B cf8ff790f418d8905b0e0fbab1bcb52d8f9bb73f2a5d0dd7320c97c38a0b87800bb6ad778ebf3345d71d1f4ea2c6a6fd9a9ed0da73082fd774231568ac9fab45 SHA512 e70ae10425679dd7eab7fae51a3dd2355b2e2ef9a3de83f313bfb437407b47c4482759799a4b81cf0b86ae852eb64ab8b30aeca9443f511e5ff1e34e1fbc30e3
-DIST hdl_dumx-0.8.6-20060901-src.tar.bz2 156322 BLAKE2B f05ce1ccc10e23980ec24d75555bc609b913b0d2c32606b2eb616a7721d7c11ceee6c2a3b8e8bd9020c1747dfb8d514d4924798a512e11e606249c5a8725c45d SHA512 c54c72c3f4d57ca8f3299c0b6044ec5376504f7b7a4c7977d71b996bc8d98577ffa868891e1a599aebbe58b8d3ccf2513c5cf8a47350c0b0f53fd21a0e64bbc8
-EBUILD hdl_dump-0.8.6.20060901.ebuild 699 BLAKE2B f783e29e98f7119afc6b42ea32344908acd496854abe48e6a786fdd5e6768d981bfa2bc0e02c8b7ed0ba49c2bb1aee1bc2032dc6fb59d240f40cd7ec351ffa2f SHA512 e93e9db6acf82a74d6960cc4d52ad670e007c9845eaa85bb92f5359ee56279e52f4c2e4601714ee689f957ff667578c9c769582199467f81f99e400824aa5df0
-EBUILD hdl_dump-0.9.2.20180722.ebuild 836 BLAKE2B 2dba955d6b93de0853bf9c299f21c00cc068ac39a54564c4afd67acd367f503b120a41a5d3d5bced8bc2d222d07c68d9c6990733c25bc103a51294a60d534d2e SHA512 fbc36fa74f9a4c7665879bf636f8e73dc6eaf0c4c15093db53b92e99cea8e1c78935c165afed334e384a9e897a70820bee5cd97c8099ace85c2602b634bf4515
+EBUILD hdl_dump-0.9.2.20180722.ebuild 831 BLAKE2B 5dc989286bc2cef4f8bb71117cad81dcdcdb169a0f1ac3a48700dbe594f3de735ecd44f5e58e2fa277f4469f05573a2edc04b3c1ec9863f1a34fb1046e09484e SHA512 c856b9bac94f54113c3c92b966aa4ab7289ebe6929094c2259566b077b893c2442539efa0730e801b960aee22a5e6c9e9833c491b5f308ba837d3a114de4346d
 MISC metadata.xml 333 BLAKE2B 5b72399ee5394a0718c0be633df3f9a87795358a77214d0a3d64da50bf01fd37bf4e075b71acc8e87ac00f0579cd3f44fa571d12dc051e635170962ae93c1c58 SHA512 2354dc5400c05801412ebb17a2e6b3fd73d09e250acc72b1739205c4d9b7d9c5e40630d42b13da5fe4c729423368d209bde4806ed4416974bce2e92604a4ad59
diff --git a/dev-games/hdl_dump/files/hdl_dump-0.8.6.20060901-fortify.patch b/dev-games/hdl_dump/files/hdl_dump-0.8.6.20060901-fortify.patch
deleted file mode 100644
index 96f85d4609af..000000000000
--- a/dev-games/hdl_dump/files/hdl_dump-0.8.6.20060901-fortify.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-http://bugs.gentoo.org/340145
-
-fix buffer overflows in path handling.  these defines should only be used
-with host paths, so bumping them up to a larger value should be fine.
-
---- a/common.h
-+++ b/common.h
-@@ -35,7 +35,8 @@
- C_START
- 
- #if !defined (MAX_PATH)
--#  define MAX_PATH 128
-+/* This needs to be at least 256 bytes -- see iin_gi_probe_path */
-+#  define MAX_PATH 1024
- #endif
- 
- 
---- a/osal.h
-+++ b/osal.h
-@@ -62,7 +62,8 @@ typedef struct
- #  define OSAL_HANDLE_INIT { -1 } /* file descriptor */
- #  define OSAL_IS_OPENED(x) ((x).desc != -1)
- 
--#  define MAX_PATH 256
-+/* This needs to be at least 256 bytes -- see iin_gi_probe_path */
-+#  define MAX_PATH 1024
- 
- #endif
- typedef /*@special@*/ /*@only@*/ /*@out@*/ osal_handle_t* osal_handle_p_t;
-
-the magic field is 32 bytes, so strcpy-ing 32 bytes will add a 33rd NUL char.
-this isn't a problem in practice as the 33rd char is "unknown_0x02", but let's
-fix the issue anyways.
-
---- a/apa.c
-+++ b/apa.c
-@@ -1270,7 +1270,7 @@ apa_initialize_ex (hio_t *hio)
-   set_u32 (&header.length, 128 * 1024 * 2);
-   set_u16 (&header.type, 0x0001);
-   set_ps2fs_datetime (&header.created, time (NULL));
--  strcpy (header.mbr.magic, "Sony Computer Entertainment Inc.");
-+  memcpy (header.mbr.magic, "Sony Computer Entertainment Inc.", 32);
-   header.mbr.unknown_0x02 = 0x02;
-   set_ps2fs_datetime (&header.mbr.created, time (NULL));
-   set_u32 (&header.checksum, apa_partition_checksum (&header));
diff --git a/dev-games/hdl_dump/hdl_dump-0.8.6.20060901.ebuild b/dev-games/hdl_dump/hdl_dump-0.8.6.20060901.ebuild
deleted file mode 100644
index 470f81f67c20..000000000000
--- a/dev-games/hdl_dump/hdl_dump-0.8.6.20060901.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils toolchain-funcs versionator
-
-MY_PV=$(replace_version_separator 3 -)
-DESCRIPTION="game installer for playstation 2 HD Loader"
-HOMEPAGE="http://www.psx-scene.com/hdldump/"
-SRC_URI="http://www.psx-scene.com/hdldump/hdl_dumx-${MY_PV}-src.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-S=${WORKDIR}/${PN}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-fortify.patch #340145
-	sed -i \
-		-e "s/-O0 -g/${CFLAGS}/" \
-		-e "s/@\$(CC)/$(tc-getCC)/" \
-		-e '/LDFLAGS =/d' \
-		Makefile || die
-}
-
-src_install() {
-	dobin hdl_dump
-	dodoc AUTHORS CHANGELOG README TODO
-}
diff --git a/dev-games/hdl_dump/hdl_dump-0.9.2.20180722.ebuild b/dev-games/hdl_dump/hdl_dump-0.9.2.20180722.ebuild
index d35f64fad47b..63f210da390d 100644
--- a/dev-games/hdl_dump/hdl_dump-0.9.2.20180722.ebuild
+++ b/dev-games/hdl_dump/hdl_dump-0.9.2.20180722.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/AKuHAK/hdl-dump/archive/${COMMIT}.tar.gz -> ${P}.tar
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="debug"
 
 S="${WORKDIR}/${PN//_/-}-${COMMIT}"