gentoo resync : 29.12.2022

4 files changed, 2 insertions, 181 deletions

diff --git a/sys-block/partimage/Manifest b/sys-block/partimage/Manifest
index 4cd65b446894..e569a2795358 100644
--- a/sys-block/partimage/Manifest
+++ b/sys-block/partimage/Manifest
@@ -3,12 +3,10 @@ AUX partimage-0.6.9-minor-typo.patch 313 BLAKE2B c0d04a86e0d4c27ce8a1b097525c029
 AUX partimage-0.6.9-missing-includes.patch 834 BLAKE2B 713279432e869a35b9db5a68db5a1c9f88248c7d89af2d716d75b9d0382df74d72c1a15b5789377b47dcc1dd75bb26512ea6829826745864d37c250387b3c84b SHA512 c1a8251b2ac48add258136edf54f19660ca5528842eac693e9ae1dc47d9c5446037c39237f8eefbfb6def041c7c06826aab8aed67faa7c1e50f027d649cf9bc9
 AUX partimage-0.6.9-openssl-1.1-compatibility.patch 1445 BLAKE2B 086fa11a2dc3326b86cdfd43abda921fbf7a03c95adf7cba28675ed5c8334582feedd0e1adbe16e7750333fcf730d67fd02f3a9a49a8f4d08881964eff51dadb SHA512 96c398a3d536ed6dc54ef8d6012f1ecefe78fd8a27b74966ba8d6095e593cbcd33213dc485c6dc13ee45a517928de2bce639b5679e91ed2aea2adb1f5b3efba6
 AUX partimage-0.6.9-zlib-1.2.5.2-r1.patch 983 BLAKE2B 6ee4dba05298ea6d38f4d3917385ffcb91b5f39515d00a8cd12e16087b24821f672e20e3d9591c5681709a3e109b9f213b222eaa96f46a4c884b6b3b2106ebce SHA512 dc1e64c0b852b8f24ed604956c0977cca7a246ee66f9c36a901e26396e9a5f4f99ac0cceb2d5b9c165060fa360519d24e77ea5464479019e8c6b20b93e82cb05
-AUX partimage-0.6.9-zlib-1.2.5.2.patch 975 BLAKE2B 0e7e1de1ef590f74b46d94aaaa6eaf2eb62f06c3f33432d0201c820ec4e218d746ee8964e8cdfa1fc31bf31da1fb18fdfe3cb798cbb3111c17194dadbf4d6707 SHA512 8f5310a65e77822f816bedca9281be7627246f111960fc4092c2e3d44fa1bfcea786c130899970ce35da8be536491ae46b0ac1825d85ab6ccb6b1332f2f1b4e2
 AUX partimaged.conf 307 BLAKE2B f1d0bc946a517f4896b55c749c0f244731d413119dfc15c22f5e0834ca87cdb37b278f8907bb18dade3a1ab48cbea3a4d7ef5b836af32260cbf1653627855a2f SHA512 1be320a8dceb3076e6aa2d8b1a8a4d01a380ad1209133997fd0d87cf1d0974fc4877c3c8b41c07fbb99249c8a00132f2c5fa7ffadf26f4e41cc2abfcd6b62116
 AUX partimaged.init.2 628 BLAKE2B 872f72a4407ca0f923220e2c313779a0e52b6179b753567e125edfa983856695a88b49af2dd005b6bce0e9951ad11177611d3029cd2e02d28ab26b1195847660 SHA512 48919e1be73d0aaeeaf0f8b510af05eda613aa7aa6773e0886ca2d46119521326f46d8503f23b2dcb133ec4c8bc5a89f92787275bba869c6990074825515278f
 AUX partimaged.pam.2 249 BLAKE2B e40a15c5fe4dc394cbcf9c478c3c764e67ec317f31c039738c87b90fec79577a191ae85ad0b774e8b415b79bd29460c929f094e4e3210660989a7bdb9939fe8a SHA512 ad55a61e574dc44cdda723bb5a46349d15e50353dcdb99474b9acafd56c93bc6ffdd75f5b0d9e80849d9bebf5c7b9a2f84c7cefc5f0a86f54f9477a0962794cd
 AUX servercert.cnf 980 BLAKE2B 0660f9b92fe422754e36d6ce1889e8b8feb40954b36b3e00e58f5e534b85171ac42e66f74020a55dd1b14d56d7764c94427b8d1d112ca1a878dff388ac3ea787 SHA512 8aa0592ce0be3f08124880b823db59aa167e7d509ea1a9b48d9f895482f96e99a6e4df330c567b9ce331eed43cb4f1a70b1b7727878972a8b074265898b1e557
 DIST partimage-0.6.9.tar.bz2 666522 BLAKE2B d9a240f82a7b6ae73997df46c964fdddf8dddea9e3bd9548252d9409a526358714908316c52864b60bc9fcc1113a5e1c6cf294faff6845a183c7ffe1012475a6 SHA512 252885921b23933fdcdf0bb6efa4b82066b08ca95cc653296912d384ae875b421c1d39f347a90115315139176d4eab4a930c24919c2d38cf00ed29c764cd14d9
-EBUILD partimage-0.6.9-r2.ebuild 3562 BLAKE2B 80cca8ac3f798ea30706d000de2c705f6bb1788e85368e3ea3decaa6797508088e2f6a23972e422fc0c3ad09c568a3d0bebddb9a915ecef1c951b608b1e1e0b6 SHA512 362ea71a94a9e11e02596a9a5baf9bfb9070292f632b5b373ad2b45a4ba08cb859478b5c0cfb060236e247d5767e5bcea1ad26239e36cd9e84091504b272d5f6
-EBUILD partimage-0.6.9-r3.ebuild 3448 BLAKE2B 83c6ee6fabc66553b8bb3c160944b039ff89923d59646f17b6afdbb106d6c15ca1a94df63c01c189f3724ee7339bd1b9ecbe416ee5bd8e8d2cdcd36456415dd5 SHA512 095a059e0756c3fad49e102d6b2639735af651485808af21c5926637e7c93dfbe73eb41cfe57bbf8cc590e85eb874a768cf032389f22d300ab38800b5d149dcb
+EBUILD partimage-0.6.9-r3.ebuild 3452 BLAKE2B fd4613278a34e0b5c1275a10b1898fe8d4c343df19aac6ed90a2ec056eec380a61660873219a212029ff025be3712d8a1e5e8c763fa7e86fb179ee4736a2dd14 SHA512 0c71b580820caebb21b5c18f09e5751c3d60c7c845673fa076f224aa196dd908536930c9ef1ec9a0e41121b08555ccae4879538e6b0d66d85faa88340befab3a
 MISC metadata.xml 428 BLAKE2B 61e6517a2ee09ecc1093f4a90bae9cd7a1228cad3672bfaefba6a3d0785f34d3dfe35689c0798f0db3319441d31777b8f2bc2ca93ccef89780d280c6f0b26130 SHA512 2d0d8f33b9952b027e292899d5c046bed94a56b126d9a3a446ee9e5dc4f48e2a4cd5970cef576b8e72c2926b10ec15e6af2031347a7209a84470fafe3d92a89e
diff --git a/sys-block/partimage/files/partimage-0.6.9-zlib-1.2.5.2.patch b/sys-block/partimage/files/partimage-0.6.9-zlib-1.2.5.2.patch
deleted file mode 100644
index 57f87a5d5225..000000000000
--- a/sys-block/partimage/files/partimage-0.6.9-zlib-1.2.5.2.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-http://bugs.gentoo.org/405323
-
---- src/client/imagefile.cpp
-+++ src/client/imagefile.cpp
-@@ -783,7 +783,7 @@
-   else if (m_options.dwCompression == COMPRESS_GZIP) // Gzip compression
-     {
-       showDebug(1, "open gzip\n");
--      m_gzImageFile = (gzFile *) gzdopen(m_nFdImage, "wb"); //"wb1h");
-+      m_gzImageFile = gzdopen(m_nFdImage, "wb"); //"wb1h");
-       if (m_gzImageFile == NULL)
- 	{
- 	  showDebug(1, "error:%d %s\n", errno, strerror(errno));
-@@ -1098,7 +1098,7 @@
-     }
-   else if (m_options.dwCompression == COMPRESS_GZIP) // Gzip compression
-     {
--      m_gzImageFile = (gzFile *) gzdopen(m_nFdImage, "rb");
-+      m_gzImageFile = gzdopen(m_nFdImage, "rb");
-       if (m_gzImageFile == NULL)
-         THROW(ERR_ERRNO, errno);
-       else
---- src/client/imagefile.h
-+++ src/client/imagefile.h
-@@ -41,7 +41,7 @@
-   COptions m_options;
- 
-   FILE *m_fImageFile;
--  gzFile *m_gzImageFile;
-+  gzFile m_gzImageFile;
-   BZFILE *m_bzImageFile;
- 
-   int m_nFdImage;
diff --git a/sys-block/partimage/partimage-0.6.9-r2.ebuild b/sys-block/partimage/partimage-0.6.9-r2.ebuild
deleted file mode 100644
index 34732ed47292..000000000000
--- a/sys-block/partimage/partimage-0.6.9-r2.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools flag-o-matic pam user
-
-DESCRIPTION="Console-based application to efficiently save raw partition data to image file"
-HOMEPAGE="http://www.partimage.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc ~sparc x86"
-IUSE="nls nologin pam ssl static"
-
-LIBS_DEPEND="app-arch/bzip2
-	>=dev-libs/newt-0.52
-	>=sys-libs/slang-2
-	sys-libs/zlib:=
-	!nologin? ( virtual/libcrypt:= )
-	ssl? ( dev-libs/openssl:0= )"
-PAM_DEPEND="!static? ( pam? ( sys-libs/pam ) )"
-RDEPEND="${PAM_DEPEND}
-	!static? ( ${LIBS_DEPEND} )"
-DEPEND="${PAM_DEPEND}
-	${LIBS_DEPEND}
-	nls? ( sys-devel/gettext )"
-
-pkg_setup() {
-	enewgroup partimag 91
-	enewuser partimag 91 -1 /var/lib/partimage partimag
-}
-
-src_prepare() {
-	eapply -p0 "${FILESDIR}"/${P}-zlib-1.2.5.2.patch #405323
-	eapply "${FILESDIR}"/${P}-minor-typo.patch #580290
-	eapply "${FILESDIR}"/${P}-openssl-1.1-compatibility.patch
-	eapply "${FILESDIR}"/${P}-missing-includes.patch
-
-	eapply_user
-
-	eautoreconf
-}
-
-src_configure() {
-	# XXX: Do we still need these?
-	filter-flags -fno-exceptions
-	use ppc && append-flags -fsigned-char
-
-	local myconf
-
-	use nologin && myconf="${myconf} --disable-login"
-
-	if use pam && ! use static; then
-		myconf="${myconf} --enable-pam"
-	fi
-
-	econf \
-		$(use_enable nls) \
-		$(use_enable ssl) \
-		--disable-pam \
-		$(use_enable static all-static) \
-		--with-log-dir="${EPREFIX}"/var/log/partimage \
-		${myconf}
-}
-
-src_install() {
-	default
-
-	keepdir /var/lib/partimage
-	keepdir /var/log/partimage
-
-	newinitd "${FILESDIR}"/partimaged.init.2 partimaged
-	newconfd "${FILESDIR}"/partimaged.conf partimaged
-
-	if use ssl; then
-		insinto /etc/partimaged
-		doins "${FILESDIR}"/servercert.cnf
-	fi
-
-	if use pam; then
-		newpamd "${FILESDIR}"/partimaged.pam.2 partimaged
-	fi
-}
-
-confdir=${EROOT%/}/etc/partimaged
-privkey=${confdir}/partimaged.key
-cnf=${confdir}/servercert.cnf
-csr=${confdir}/partimaged.csr
-cert=${confdir}/partimaged.cert
-
-pkg_config() {
-	if use ssl; then
-		ewarn "Please customize /etc/partimaged/servercert.cnf before you continue!"
-		ewarn "Press Ctrl-C to break now for it, or press enter to continue."
-		read
-		if [ ! -f ${privkey} ]; then
-			einfo "Generating unencrypted private key: ${privkey}"
-			openssl genrsa -out ${privkey} 1024 || die
-		else
-			einfo "Private key already exists: ${privkey}"
-		fi
-		if [ ! -f ${csr} ]; then
-			einfo "Generating certificate request: ${csr}"
-			openssl req -new -x509 -outform PEM -out ${csr} -key ${privkey} -config ${cnf} || die
-		else
-			einfo "Certificate request already exists: ${csr}"
-		fi
-		if [ ! -f ${cert} ]; then
-			einfo "Generating self-signed certificate: ${cert}"
-			openssl x509 -in ${csr} -out ${cert} -signkey ${privkey} || die
-		else
-			einfo "Self-signed certifcate already exists: ${cert}"
-		fi
-		einfo "Setting permissions"
-		partimagesslperms || die
-		einfo "Done"
-	else
-		einfo "SSL is disabled, not building certificates"
-	fi
-}
-
-partimagesslperms() {
-	local ret=0
-	chmod 600 ${privkey} 2>/dev/null
-	ret=$((${ret}+$?))
-	chown partimag:0 ${privkey} 2>/dev/null
-	ret=$((${ret}+$?))
-	chmod 644 ${cert} ${csr} 2>/dev/null
-	ret=$((${ret}+$?))
-	chown root:0 ${cert} ${csr} 2>/dev/null
-	ret=$((${ret}+$?))
-	return $ret
-}
-
-pkg_postinst() {
-	if use ssl; then
-		einfo "To create the required SSL certificates, please do:"
-		einfo "emerge  --config =${PF}"
-		partimagesslperms
-		return 0
-	fi
-	chown partimag:0 "${EROOT%/}"/etc/partimaged/partimagedusers || die
-}
diff --git a/sys-block/partimage/partimage-0.6.9-r3.ebuild b/sys-block/partimage/partimage-0.6.9-r3.ebuild
index 66b9be9366b3..47a749a03dd3 100644
--- a/sys-block/partimage/partimage-0.6.9-r3.ebuild
+++ b/sys-block/partimage/partimage-0.6.9-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~riscv ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~loong ppc ~riscv ~sparc x86"
 IUSE="nls nologin pam ssl static"
 REQUIRED_USE="static? ( !pam )"