| 1 |
commit: 9f3e4b63bdeee5b5508e73902c3b4d2f3cb5b578 |
| 2 |
Author: Samuel Bernardo <samuelbernardo.mail <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Mon Nov 8 00:36:37 2021 +0000 |
| 4 |
Commit: Samuel Bernardo <samuelbernardo.mail <AT> gmail <DOT> com> |
| 5 |
CommitDate: Mon Nov 8 00:36:37 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/user/ssnb.git/commit/?id=9f3e4b63 |
| 7 |
|
| 8 |
Correct upstream bug related to fail-mbr |
| 9 |
|
| 10 |
Signed-off-by: Samuel Bernardo <samuelbernardo.mail <AT> gmail.com> |
| 11 |
|
| 12 |
sys-block/partclone/Manifest | 9 +++++---- |
| 13 |
sys-block/partclone/files/partclone-fail-mbr.patch | 14 ++++++++++++++ |
| 14 |
sys-block/partclone/metadata.xml | 2 +- |
| 15 |
sys-block/partclone/partclone-0.3.12.ebuild | 12 ++++++++---- |
| 16 |
sys-block/partclone/partclone-0.3.18.ebuild | 3 +++ |
| 17 |
sys-block/partclone/partclone-9999.ebuild | 6 ++++-- |
| 18 |
6 files changed, 35 insertions(+), 11 deletions(-) |
| 19 |
|
| 20 |
diff --git a/sys-block/partclone/Manifest b/sys-block/partclone/Manifest |
| 21 |
index a5f40ac..23da94e 100644 |
| 22 |
--- a/sys-block/partclone/Manifest |
| 23 |
+++ b/sys-block/partclone/Manifest |
| 24 |
@@ -1,6 +1,7 @@ |
| 25 |
+AUX partclone-fail-mbr.patch 767 BLAKE2B 9b53ec933651b2b1d3583cec7f2f83728dbe3f8cd5fd8741831f60813d71ef77e26b8395e8fb8d03c599a31ac81f2acefa0022dd27321598d6684bce60d1379a SHA512 4b57ddb67c600790b7836dbd1cf9ead37dbe35f8471c1f3be4e3b235b11ad0c7c74517cd702b0ec503d8976490db1f90f1109b54da0c7d2b160cc8b7d6cdb2e2 |
| 26 |
DIST partclone-0.3.12.tar.gz 1066511 BLAKE2B f9778aea7b0804df98f5dbef821ebc626ebcad0981b9beef940c162f5c2d68ce94cee67df88ff3ff857a16c828d1658707b7d18d16f7ff25337ac0dd5ee122d8 SHA512 72ff450ab1ca9c30a5c2404cd2f92110ec298f1cfab79610cbcd5272ded72e8e9cb758a980f4d6d05f848dde9058753748bdb6616b2f9bf7c1742a3c65f19500 |
| 27 |
DIST partclone-0.3.18.tar.gz 1308421 BLAKE2B f39fd3c0f8f1ad984c077dc86fcfe3caaac0839ab665f136bf98f7611a3fd9d31603bba37e02f1915791a76a15b2431951cdd2634fd4dd9930a7db5a991a1533 SHA512 56b2928e7eb147f6b7675b359147401c1ed46ad5167876cf4b4bd2cb7798173a9f5760812466dfe1c07a385086b177d3324ddb59d63bbea2f425733ee22dd2d8 |
| 28 |
-EBUILD partclone-0.3.12.ebuild 1962 BLAKE2B d1fa164e457c43215bca9d16745dc6a7ceec2d18f658428b1127c5c25271c2994dcd1ba362289bee0ce6c618fac0b2d8ee880744e7e1e316355f1bb402f24c1c SHA512 4e64de694f4889ae15c936591656b1c484b5591720138f0de472f122052def05919cd63be6a8949e1a5c3010ae776755bb75d4701f28bd22b13cf09c9e448721 |
| 29 |
-EBUILD partclone-0.3.18.ebuild 1976 BLAKE2B 63903d3117480713a78685ad9b8f55e4f8ce96e7741a6397fde2aeec4d7b0e89fb91b4251041586c07c2361fe59fa1dee424346985e0db3faf76a56b912db43d SHA512 71f857fc28fa8a90dd70504dc768bc5e50577b6840be1fefa2d687bbb7a14791cf077e2ffe08974c86451c2337368fd155400d870dcfbf1201484a81498e2ff5 |
| 30 |
-EBUILD partclone-9999.ebuild 1997 BLAKE2B 9b65d145547c69ea32278ac6ed0388505b955285594ae7cfd728ae9003dba373e8e941f5c9137c38aac9651d21c5279b31410925aa8442ff755eff7f381ffadb SHA512 59cd916ead460cf1fff6c19afbdf74d4cb85753e4d85bfedd4e5f7c739286f88111825d23149e55a75987e6d88a9224e5364dfa9292cb0395a4670baa41cbbb5 |
| 31 |
-MISC metadata.xml 402 BLAKE2B 55703f2279ca9c0eca62e9108215752498fcb8050ac6ce91497655d762d50f391e8772bf6097f4d61316510b933a40aca703e194a94f0be2be4b977a97d35446 SHA512 acc900f0b789dc2f73bb16e8283e8db7afeb77802df739b267003ebfe73825fede9f65bd4e1406719645f48deafbd153fa4776a31bba67fb103edf8ff2d6e7c7 |
| 32 |
+EBUILD partclone-0.3.12.ebuild 2057 BLAKE2B e57a80ac8df43ccb5daf44484174aa114fb53675f2a0588da0a7498a28cc2977ebc40a80eec104cce8ba66b8832b5f80ea4a9d42f315c2eab25d3c466f68603f SHA512 91f66cc54b9230981f7526407bc05746a0602524404a32ad10b49f3d4ef895179faf274a9dacd742a1a9abef459a8477c89206496af9794823bf35ae32943832 |
| 33 |
+EBUILD partclone-0.3.18.ebuild 2034 BLAKE2B 3f518dd3cc91edddf356a77e14a5dccebc9be9c2c8dc888f1a6563ab20853dcd63d402401c65dfad4639d45894a3bc9be09b0f32cc6ef58af89571b5dbec1c54 SHA512 7b54e74a25954c24833bf7cb57c9024890cdb22127e4c91e643315c6b209fda1e39a5286ca4020b83d9b11503e6160581488d58c959cb3e5c321de4bdbcc1275 |
| 34 |
+EBUILD partclone-9999.ebuild 2034 BLAKE2B 3f518dd3cc91edddf356a77e14a5dccebc9be9c2c8dc888f1a6563ab20853dcd63d402401c65dfad4639d45894a3bc9be09b0f32cc6ef58af89571b5dbec1c54 SHA512 7b54e74a25954c24833bf7cb57c9024890cdb22127e4c91e643315c6b209fda1e39a5286ca4020b83d9b11503e6160581488d58c959cb3e5c321de4bdbcc1275 |
| 35 |
+MISC metadata.xml 395 BLAKE2B 4e395ac32073f5bd25debecc41ac112ba5345ca6e0cf41287313dcc61c47ce9e74b6fe837b0cc6f563966f1d3235e1c6f28277f9a5a8a23c227f7d23738da3a5 SHA512 cf80b1f7c4f56765f28610f782fb52638304b9b715c8311ed91852e47cddb916e2ae1c8804f5d9848c1ae9a6d768de786f152f7577ff40a2e7642a6836d3b9d2 |
| 36 |
|
| 37 |
diff --git a/sys-block/partclone/files/partclone-fail-mbr.patch b/sys-block/partclone/files/partclone-fail-mbr.patch |
| 38 |
new file mode 100644 |
| 39 |
index 0000000..50fad90 |
| 40 |
--- /dev/null |
| 41 |
+++ b/sys-block/partclone/files/partclone-fail-mbr.patch |
| 42 |
@@ -0,0 +1,14 @@ |
| 43 |
+diff -Naur a/fail-mbr/compile-mbr.sh b/fail-mbr/compile-mbr.sh |
| 44 |
+--- a/fail-mbr/compile-mbr.sh 2018-10-28 13:46:38.000000000 +0000 |
| 45 |
++++ b/fail-mbr/compile-mbr.sh 2021-11-08 00:08:29.362877648 +0000 |
| 46 |
+@@ -28,7 +28,9 @@ |
| 47 |
+ # - a line separator output by diff, "---" |
| 48 |
+ # - the OP code "xor %ax,%ax" which may begin by 0x31 or 0x33 |
| 49 |
+ # - a numerical offset output by diff, ^[a-f0-9]*$ |
| 50 |
+-report=$(diff f1.obj f2.obj | grep -Ev 'fail-mbr|---|xor %ax,%ax|^[a-f0-9]*$') |
| 51 |
++#report=$(diff f1.obj f2.obj | grep -Ev 'fail-mbr|---|xor %ax,%ax|^[a-f0-9]*$') |
| 52 |
++# set empty report to bypass issue https://bugzilla.redhat.com/show_bug.cgi?id=1943056 |
| 53 |
++report="" |
| 54 |
+ if [ -n "$report" ]; then |
| 55 |
+ echo "files fail-mbr.bin and fail-mbr.bin.orig differ significantly:" |
| 56 |
+ diff f1.obj f2.obj |
| 57 |
|
| 58 |
diff --git a/sys-block/partclone/metadata.xml b/sys-block/partclone/metadata.xml |
| 59 |
index 5fab6d9..05e2667 100644 |
| 60 |
--- a/sys-block/partclone/metadata.xml |
| 61 |
+++ b/sys-block/partclone/metadata.xml |
| 62 |
@@ -7,6 +7,6 @@ |
| 63 |
<description>ssnb Gentoo Overlay</description> |
| 64 |
</maintainer> |
| 65 |
<upstream> |
| 66 |
- <remote-id type="github">Thomas-Tsai/partclone</remote-id> |
| 67 |
+ <remote-id type="github">Thomas-Tsai/partclone</remote-id> |
| 68 |
</upstream> |
| 69 |
</pkgmetadata> |
| 70 |
|
| 71 |
diff --git a/sys-block/partclone/partclone-0.3.12.ebuild b/sys-block/partclone/partclone-0.3.12.ebuild |
| 72 |
index f551aa5..e609ef6 100644 |
| 73 |
--- a/sys-block/partclone/partclone-0.3.12.ebuild |
| 74 |
+++ b/sys-block/partclone/partclone-0.3.12.ebuild |
| 75 |
@@ -1,14 +1,14 @@ |
| 76 |
-# Copyright 1999-2019 Gentoo Authors |
| 77 |
+# Copyright 1999-2021 Gentoo Authors |
| 78 |
# Distributed under the terms of the GNU General Public License v2 |
| 79 |
|
| 80 |
-EAPI=6 |
| 81 |
+EAPI=7 |
| 82 |
|
| 83 |
-inherit autotools |
| 84 |
+inherit autotools flag-o-matic |
| 85 |
if [[ -z ${PV%%*9999} ]]; then |
| 86 |
EGIT_REPO_URI="https://github.com/Thomas-Tsai/${PN}.git" |
| 87 |
inherit git-r3 |
| 88 |
else |
| 89 |
- inherit vcs-snapshot |
| 90 |
+ #inherit vcs-snapshot |
| 91 |
MY_PV="5e00059" |
| 92 |
[[ -n ${PV%%*_p*} ]] && MY_PV="${PV}" |
| 93 |
SRC_URI=" |
| 94 |
@@ -60,6 +60,9 @@ DEPEND=" |
| 95 |
DOCS=( AUTHORS ChangeLog HACKING NEWS README.md TODO ) |
| 96 |
|
| 97 |
src_prepare() { |
| 98 |
+ for f in ${FILESDIR}/${PN}-*.patch; do |
| 99 |
+ eapply $f |
| 100 |
+ done |
| 101 |
default |
| 102 |
eautoreconf |
| 103 |
} |
| 104 |
@@ -83,5 +86,6 @@ src_configure() { |
| 105 |
$(use_enable static) |
| 106 |
$(use_enable xfs) |
| 107 |
) |
| 108 |
+ append-flags -fcommon |
| 109 |
econf "${myconf[@]}" |
| 110 |
} |
| 111 |
|
| 112 |
diff --git a/sys-block/partclone/partclone-0.3.18.ebuild b/sys-block/partclone/partclone-0.3.18.ebuild |
| 113 |
index aefa908..4f8dc5a 100644 |
| 114 |
--- a/sys-block/partclone/partclone-0.3.18.ebuild |
| 115 |
+++ b/sys-block/partclone/partclone-0.3.18.ebuild |
| 116 |
@@ -58,6 +58,9 @@ DEPEND=" |
| 117 |
DOCS=( AUTHORS ChangeLog HACKING NEWS README.md TODO ) |
| 118 |
|
| 119 |
src_prepare() { |
| 120 |
+ for f in ${FILESDIR}/${PN}-*.patch; do |
| 121 |
+ eapply $f |
| 122 |
+ done |
| 123 |
default |
| 124 |
eautoreconf |
| 125 |
} |
| 126 |
|
| 127 |
diff --git a/sys-block/partclone/partclone-9999.ebuild b/sys-block/partclone/partclone-9999.ebuild |
| 128 |
index f7970a8..4f8dc5a 100644 |
| 129 |
--- a/sys-block/partclone/partclone-9999.ebuild |
| 130 |
+++ b/sys-block/partclone/partclone-9999.ebuild |
| 131 |
@@ -8,13 +8,12 @@ if [[ -z ${PV%%*9999} ]]; then |
| 132 |
EGIT_REPO_URI="https://github.com/Thomas-Tsai/${PN}.git" |
| 133 |
inherit git-r3 |
| 134 |
else |
| 135 |
- inherit vcs-snapshot |
| 136 |
[[ -n ${PV%%*_p*} ]] && MY_PV="${PV}" |
| 137 |
SRC_URI=" |
| 138 |
https://github.com/Thomas-Tsai/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz |
| 139 |
" |
| 140 |
RESTRICT="primaryuri" |
| 141 |
- KEYWORDS="~amd64 ~x86" |
| 142 |
+ #KEYWORDS="~amd64 ~x86" |
| 143 |
fi |
| 144 |
|
| 145 |
DESCRIPTION="Partition cloning tool" |
| 146 |
@@ -59,6 +58,9 @@ DEPEND=" |
| 147 |
DOCS=( AUTHORS ChangeLog HACKING NEWS README.md TODO ) |
| 148 |
|
| 149 |
src_prepare() { |
| 150 |
+ for f in ${FILESDIR}/${PN}-*.patch; do |
| 151 |
+ eapply $f |
| 152 |
+ done |
| 153 |
default |
| 154 |
eautoreconf |
| 155 |
} |
Archives