diff options
Diffstat (limited to 'sys-apps/gptfdisk')
| -rw-r--r-- | sys-apps/gptfdisk/Manifest | 8 | ||||
| -rw-r--r-- | sys-apps/gptfdisk/files/gptfdisk-1.0.7-remove_byteswap.patch | 50 | ||||
| -rw-r--r-- | sys-apps/gptfdisk/files/gptfdisk-1.0.9-libuuid.patch | 37 | ||||
| -rw-r--r-- | sys-apps/gptfdisk/gptfdisk-1.0.7-r2.ebuild | 60 | ||||
| -rw-r--r-- | sys-apps/gptfdisk/gptfdisk-1.0.9-r1.ebuild (renamed from sys-apps/gptfdisk/gptfdisk-1.0.9.ebuild) | 6 | ||||
| -rw-r--r-- | sys-apps/gptfdisk/metadata.xml | 5 |
6 files changed, 46 insertions, 120 deletions
diff --git a/sys-apps/gptfdisk/Manifest b/sys-apps/gptfdisk/Manifest index dba836ef1ef9..394f383ca5b2 100644 --- a/sys-apps/gptfdisk/Manifest +++ b/sys-apps/gptfdisk/Manifest @@ -1,8 +1,6 @@ -AUX gptfdisk-1.0.7-remove_byteswap.patch 1836 BLAKE2B 2c16a9eb14c4aef96db2b3b4e5a9b4493032845234cf01b326ad17a12e2ffd2a5e27b5a32b13416dbf11c8224cee1b4a10cf0b0dfd2f95adca7faa88f2d712e8 SHA512 d91ce5ec39ed42cb87ac8a986c12ae79c1fe46340965508edb586a8aaad8e72a4227d88ce8e53d73e17d796ecc547d1c41e626bc6f897ee70badb5d74223a940 -DIST gptfdisk-1.0.7.tar.gz 207723 BLAKE2B cebb0375294b4ff8f8eb522a4ae23259714d07d670a7bfbf8664586c948c1c8bee2674649a181a7c5d22f9dfe177feb7a9648ca9936c388b419faf7b52e789d8 SHA512 8a2067523479e34c76392571692b36e6c9eadcd0aca979f1ba09904930ed92a709bfdcdfa3369230a5ab2b5a751682dc7fb4645fb5f7f1c361ee8d28e104214c +AUX gptfdisk-1.0.9-libuuid.patch 899 BLAKE2B 534038452a7184945486b8435099adf7f1992c4bb8618a0ed5432c7675eb653374b25417b2b21c8fc2ec0b0860303e054fb0dc71f880941712e6230ddb029358 SHA512 590b6e7c5b16762abffe68767f255414a56f7fbd691a47837a93b288bde5210a3ab4addf93725c313134c48e6d6bc69701ad3742455f48de793412616be51df3 DIST gptfdisk-1.0.8.tar.gz 208958 BLAKE2B 03c74c43fead13e90ff6cd42405e15db726f527801a9e3f1d5f6a83d3fa58f0f8e58b35edc1b12b0b2e6c7849b657ce4493ac67204d25309e6f63fe7f57f766b SHA512 0818a238e57cf6de893da7c161e8aaf2d30ad917a47750de09967ce1d83d1ab6666fa043465abaffdc293d058acc3fa87f8bc93a4b03c7c5d9a9ceb8f5b07331 DIST gptfdisk-1.0.9.tar.gz 215065 BLAKE2B 1939ffd75972a4d7f92af2bfab90c7b0223825b5478b6b808dd35af943c687d38ba81663cd7ba5e0f9400656db4dac019c13a9f75d90b7bd716568c676c24dd2 SHA512 c2489ac7e196cb53b9fdb18d0e421571eca43c366de8922c5c7f550aadf192558e7af69b181c30747d6cf607c1670126223465eaa5e231cc589402d94a4e97a2 -EBUILD gptfdisk-1.0.7-r2.ebuild 1290 BLAKE2B 789fed2d6991ebbb1bc8707dd17ed86449e6c2d22db73d8ec7451fa0f9c8d13dac65752295109010ce3332c63f0aab16bbd55cd757c959a8ef57f89543645569 SHA512 0d9b32e690c1e6d477b4009cbf55dc2361f00c6c99b289b8e927b516787770351f751f6226bd6cbd68dda4edd6450d0c55e5db6b9834356830d6e4bb464c4fa3 EBUILD gptfdisk-1.0.8-r1.ebuild 1225 BLAKE2B 2f0960a54787e83b4f4cdef9b33ea0bafac5423f80c4db6e0a6fb2bbcc898b0cb5bdb1054769a92601b7ff2ae7a1974554ce89793242096f29d8596e55d12a0d SHA512 5d24033c201ac8f3fa66c0137e2de032fa2cafdddfa3ea740c04f651b268e59541de831bdd84f191397ca2ed395338bc33ed6fcb2c91430c8f27c9b00d3831b5 -EBUILD gptfdisk-1.0.9.ebuild 1232 BLAKE2B f5e5b583fb8449d46e87be7918e4112fa7d419160140bf4203219b84ef9c92d6fc52d48fe54a3b83dbd3763ae0fb7332a4267b60f13e19c3bba7e6031f462988 SHA512 b6d08bd889289a2a16f2bbe1d01430647c0a9ad246bce6217db91b5fe63d86b171114bc53587ab49017d134481d0633b0999b2489e935c5d1bc0a4d6cd7b7b5d -MISC metadata.xml 340 BLAKE2B 1934da4cf8289a324846642f69ba53d6e0988eb37c4a56019bae8094935efc1ff485f7f6746d58a72efcf81b1a017baca1f48e3a47d321fd8c87fb756b2e5419 SHA512 6074f7a7c0ada7deacf252c2bd7be3b5aacc3402e88b13bfbbf085b7760956a1ec35e52c22d49663d358dd837319815e4b1d5071ea0119f9890d31eca9ef84ed +EBUILD gptfdisk-1.0.9-r1.ebuild 1294 BLAKE2B 9d2e55ba094c6ad72cbebf6dbec62362b7bb52d97fef07630431072612b81eb2f88544c5eff11381414ad5e4eebf6118f80e3f043aee8a401055c991369d613d SHA512 99325ad00459979e59c1451110b50213edbb8ead7fb0c3675a304192273c994dc3e347a78514adb02bdf368307f87946df9c38ab6bc106eb57bef9e69f416c1f +MISC metadata.xml 251 BLAKE2B b8bc44bb2f871b081084b3fb8c2e6e21117ead330c29676827bb826d45336e245550e9cf4641bb82aecb4730dbc7aca2aeaa893d348856be1fec24e33d112564 SHA512 c06acf5ad3f44c17b239560351b5ab60a23e5d834e84ce84be90aa980e1230efe0817df5a821db9091806dcb0d774e472f5c74bf36c014826e6c387c88f485c4 diff --git a/sys-apps/gptfdisk/files/gptfdisk-1.0.7-remove_byteswap.patch b/sys-apps/gptfdisk/files/gptfdisk-1.0.7-remove_byteswap.patch deleted file mode 100644 index c1874d6edd7c..000000000000 --- a/sys-apps/gptfdisk/files/gptfdisk-1.0.7-remove_byteswap.patch +++ /dev/null @@ -1,50 +0,0 @@ -From fded770b55fdb3a201ad515d785c17ac35705652 Mon Sep 17 00:00:00 2001 -From: Erik Larsson <catacombae@gmail.com> -Date: Tue, 8 Jun 2021 16:11:21 +0300 -Subject: [PATCH] gptpart.cc: Remove byteswap commands in - GPTPart::SetName(const string&). - -The byteswapping done in GPTPart::SetName(const string&) was reversed -later when GPTPart::ReversePartBytes() was called. - -The intended design seems to have been to keep the fields in native -endianness until just before the partition is written to disk when all -the GPTPart data is byteswapped all at once with a call to -GPTPart::ReversePartBytes(). -However this was defeated by leaving the original byteswaps in there and -effectively the name was swapped back to the native-endian form. For big -endian systems this meant that a UTF-16BE string was written to disk, -violating the specification and causing interoperability problems. - -Fixed by removing these inline byteswaps in GPTPart::SetName(const -string&). ---- - gptpart.cc | 3 --- - 1 file changed, 3 deletions(-) - -diff --git a/gptpart.cc b/gptpart.cc -index 81bbcf0..841140a 100644 ---- a/gptpart.cc -+++ b/gptpart.cc -@@ -242,7 +242,6 @@ void GPTPart::SetName(const string & theName) { - // then to utf16le - if ( uni < 0x10000 ) { - name[ pos ] = (uint16_t) uni ; -- if ( ! IsLittleEndian() ) ReverseBytes( name + pos , 2 ) ; - pos ++ ; - } // if - else { -@@ -252,10 +251,8 @@ void GPTPart::SetName(const string & theName) { - } // if - uni -= 0x10000 ; - name[ pos ] = (uint16_t)( uni >> 10 ) | 0xd800 ; -- if ( ! IsLittleEndian() ) ReverseBytes( name + pos , 2 ) ; - pos ++ ; - name[ pos ] = (uint16_t)( uni & 0x3ff ) | 0xdc00 ; -- if ( ! IsLittleEndian() ) ReverseBytes( name + pos , 2 ) ; - pos ++ ; - } - } // for --- -2.32.0 - diff --git a/sys-apps/gptfdisk/files/gptfdisk-1.0.9-libuuid.patch b/sys-apps/gptfdisk/files/gptfdisk-1.0.9-libuuid.patch new file mode 100644 index 000000000000..e7a5f68e19ee --- /dev/null +++ b/sys-apps/gptfdisk/files/gptfdisk-1.0.9-libuuid.patch @@ -0,0 +1,37 @@ +From e67faca2c0ca955f56cbd22e90941cdcbdc12597 Mon Sep 17 00:00:00 2001 +From: Rod Smith <rodsmith@rodsbooks.com> +Date: Sat, 16 Apr 2022 09:32:04 -0400 +Subject: [PATCH] Updated guid.cc to deal with minor change in libuuid + +--- + NEWS | 3 +++ + guid.cc | 2 +- + 2 files changed, 4 insertions(+), 1 deletion(-) + +diff --git a/NEWS b/NEWS +index c7add56..3d90d9a 100644 +--- a/NEWS ++++ b/NEWS +@@ -1,3 +1,6 @@ ++ ++- Updated guid.cc to deal with minor change in libuuid. ++ + 1.0.9 (4/14/2022): + ------------------ + +diff --git a/guid.cc b/guid.cc +index 1e73ab7..d3e4fd5 100644 +--- a/guid.cc ++++ b/guid.cc +@@ -141,7 +141,7 @@ void GUIDData::Zero(void) { + void GUIDData::Randomize(void) { + int i, uuidGenerated = 0; + +-#ifdef _UUID_UUID_H ++#if defined (_UUID_UUID_H) || defined (_UL_LIBUUID_UUID_H) + uuid_generate(uuidData); + ReverseBytes(&uuidData[0], 4); + ReverseBytes(&uuidData[4], 2); +-- +2.36.1 + diff --git a/sys-apps/gptfdisk/gptfdisk-1.0.7-r2.ebuild b/sys-apps/gptfdisk/gptfdisk-1.0.7-r2.ebuild deleted file mode 100644 index df490f526b5e..000000000000 --- a/sys-apps/gptfdisk/gptfdisk-1.0.7-r2.ebuild +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit flag-o-matic toolchain-funcs - -DESCRIPTION="GPT partition table manipulator for Linux" -HOMEPAGE="https://www.rodsbooks.com/gdisk/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux" -IUSE="ncurses static" - -# libuuid from util-linux is required. -RDEPEND="!static? ( - dev-libs/popt - ncurses? ( sys-libs/ncurses:=[unicode(+)] ) - kernel_linux? ( sys-apps/util-linux ) - )" -DEPEND=" - ${RDEPEND} - static? ( - dev-libs/popt[static-libs(+)] - ncurses? ( sys-libs/ncurses:=[unicode(+),static-libs(+)] ) - kernel_linux? ( sys-apps/util-linux[static-libs(+)] ) - ) -" -BDEPEND="virtual/pkgconfig" - -PATCHES=( - "${FILESDIR}/${P}-remove_byteswap.patch" #797412 -) - -src_prepare() { - default - - tc-export CXX PKG_CONFIG - - if ! use ncurses ; then - sed -i \ - -e '/^all:/s: cgdisk::' \ - Makefile || die - fi - - sed \ - -e '/g++/s:=:?=:g' \ - -e 's:-lncursesw:$(shell $(PKG_CONFIG) --libs ncursesw):g' \ - -i Makefile || die - - use static && append-ldflags -static -} - -src_install() { - dosbin gdisk sgdisk $(usex ncurses cgdisk '') fixparts - doman *.8 - dodoc NEWS README -} diff --git a/sys-apps/gptfdisk/gptfdisk-1.0.9.ebuild b/sys-apps/gptfdisk/gptfdisk-1.0.9-r1.ebuild index 62367d7e3bbc..6a445a77fe7a 100644 --- a/sys-apps/gptfdisk/gptfdisk-1.0.9.ebuild +++ b/sys-apps/gptfdisk/gptfdisk-1.0.9-r1.ebuild @@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux" IUSE="ncurses static" # libuuid from util-linux is required. @@ -30,6 +30,10 @@ DEPEND=" virtual/pkgconfig " +PATCHES=( + "${FILESDIR}/${P}-libuuid.patch" #844073 +) + src_prepare() { default diff --git a/sys-apps/gptfdisk/metadata.xml b/sys-apps/gptfdisk/metadata.xml index c19d1a32c6d0..2da27ac6ad8d 100644 --- a/sys-apps/gptfdisk/metadata.xml +++ b/sys-apps/gptfdisk/metadata.xml @@ -1,10 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>polynomial-c@gentoo.org</email> - <name>Lars Wendler</name> - </maintainer> + <!-- maintainer-needed --> <upstream> <remote-id type="sourceforge">gptfdisk</remote-id> </upstream> |