From 896d6a8a88861c42b5d531a2f147c8a29a149bd8 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 1 Dec 2022 20:53:45 +0000 Subject: gentoo auto-resync : 01:12:2022 - 20:53:45 --- sys-libs/libvpd/Manifest | 6 +-- sys-libs/libvpd/files/2.2.8-gcc11.patch | 84 ------------------------------ sys-libs/libvpd/files/2.2.8-warnings.patch | 52 ------------------ sys-libs/libvpd/libvpd-2.2.8-r1.ebuild | 48 ----------------- sys-libs/libvpd/libvpd-2.2.9.ebuild | 2 +- 5 files changed, 2 insertions(+), 190 deletions(-) delete mode 100644 sys-libs/libvpd/files/2.2.8-gcc11.patch delete mode 100644 sys-libs/libvpd/files/2.2.8-warnings.patch delete mode 100644 sys-libs/libvpd/libvpd-2.2.8-r1.ebuild (limited to 'sys-libs/libvpd') diff --git a/sys-libs/libvpd/Manifest b/sys-libs/libvpd/Manifest index 5a670719c1d1..e1f00af800f9 100644 --- a/sys-libs/libvpd/Manifest +++ b/sys-libs/libvpd/Manifest @@ -1,7 +1,3 @@ -AUX 2.2.8-gcc11.patch 3279 BLAKE2B 50816aa628d6c9b3f9c9d27b1a4550a10c83fafc9a95dd5a9f499a68534fa96b4ce6fd73d7b28777e09dfe45580b7928a7370e51f1784f59c6ee7e78dd45d2a2 SHA512 817d00ffb794b685f5c20625dba50950ea67baae8cd7d4120e907d789bd93d5ea306681dd384296782d6037560b72aefd5db9c004a8a711a4e3df0aa639746e2 -AUX 2.2.8-warnings.patch 2326 BLAKE2B 71a480bedc290a447ae988ed96d4ec3b8f68fc74773c39c0b813b0083c69f5bb659fbbee078b741c496c46f1906e6e6c47bf5acbb29c2b8064b8eefa79851828 SHA512 b095be3e4d9cfe03d8b01d0d1861df2934a7695cc1585af556702dee9c6692fbbe68ea1266181250f72ff74d97694516329de0fde00cd574d60eff004d7083e1 -DIST libvpd-2.2.8.tar.gz 52725 BLAKE2B 76bdc6ddf80236a6848185273c2cac181d44214f0c609d7c5af6fa4d09a7cd816324af35745617ce3daa7268311e2ed754335600df1d4970a324eb327015d051 SHA512 d0b7d1760c6ae54717c538405c651317b7318dec5780961f5386c09b7d245e35a84c2fc47d89c47c3cd2168d73d7186f5819981d52c3ba962514639833dc62aa DIST libvpd-2.2.9.tar.gz 53747 BLAKE2B c8898e2f604431b74bf5e10fc99e7a9b5540b825f2a996776109a2b2b636f732ff8d9f7956ffea1231e5b023e285eee641a873a68fcd8a2d6a6d9e64c5ab3b18 SHA512 e32a80e0f3aaedbaaac64dbdedfee7eeb2e7a7b6d2d737bca4678d26caadab77032a7c26211a5fc3caed3724488bc8fa99620ceac05f8d156ca90f4452cfaf0a -EBUILD libvpd-2.2.8-r1.ebuild 991 BLAKE2B 8e3145531b1e1dbae7eeba2e0df7c7810d6045f93c97c83567bdd786c33b2913662f54be950e9677e2ff6b34dd8a904a738ad2ed4863e1497de5418a6114e4e3 SHA512 716bb2e1d385ec53f99281f7f1bc8c466c266461570f65b8e700263bf8ab9a484c3efeb1ec81f0816efd77a765038f7e41a23df533f1ced7dcd5571853564003 -EBUILD libvpd-2.2.9.ebuild 912 BLAKE2B c2e2e9f6dc3423896d75f13ef5b2be7c47fe3ea0afc11c368fcee9b59d969bab531e6b9761da12bbc3c2c811c41b0794744220e1e2115c7229f76fdd9144b2e3 SHA512 5de6d7ac16274ed5f289004d12353627491a4772b375f7a6c652191f83132713e926372382c68f3bb456e26950fbae97f01ed90f1874dccfb55022e17e3b90e2 +EBUILD libvpd-2.2.9.ebuild 911 BLAKE2B a0c5d8e7742ae4316ca50e9b6a17c093aa001f54510ca8ee591a296ff09e3b44a627f39c8438eccd6cfe03198548d0de0b951a648378827cedac16a9d0535a19 SHA512 cd4f2000a6b28f02da1d99f2a1913f5ec52a9181223498f30353ce778b4c70fe291483a885ea21a9c911f6008f990aa97c8735a695c20f2567471ed907c0ac48 MISC metadata.xml 421 BLAKE2B c57e915b83891c6778ae1700b183bf7a45612bf8b5af05f02dd877308867827f51db4d9065c02f28a1df547141fc3b29928e0fbbac3be6747bb6a893927da05e SHA512 0740622c3abeac4e6bbe3334b7aed72647496c8a843971be6ba891b91cd0e96395ba6801f45b617aa6e3be28e6c54e62d5033a8faf8d1340656f4b81039b9360 diff --git a/sys-libs/libvpd/files/2.2.8-gcc11.patch b/sys-libs/libvpd/files/2.2.8-gcc11.patch deleted file mode 100644 index 7e09f8329bba..000000000000 --- a/sys-libs/libvpd/files/2.2.8-gcc11.patch +++ /dev/null @@ -1,84 +0,0 @@ -From 83ccb994e30364c0703d7b8c15817d56b42da2e6 Mon Sep 17 00:00:00 2001 -From: Kamalesh Babulal -Date: Wed, 7 Apr 2021 14:11:41 +0530 -Subject: [PATCH] Remove dynamic exception specification -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Tomasz Kłoczko reported that the build fails, while compiling -with GCC 11: - -In file included from src/vpdretriever.cpp:25: -./src/libvpd-2/vpdretriever.hpp:62:33: error: ISO C++17 does not allow dynamic exception specifications - 62 | throw( VpdException& ); - | ^~~~~ -./src/libvpd-2/vpdretriever.hpp:74:33: error: ISO C++17 does not allow dynamic exception specifications - 74 | throw( VpdException& ); - | ^~~~~ -src/vpdretriever.cpp:50:37: error: ISO C++17 does not allow dynamic exception specifications - 50 | string dbFileName ) throw( VpdException& ) - | ^~~~~ -src/vpdretriever.cpp:62:39: error: ISO C++17 does not allow dynamic exception specifications - 62 | VpdRetriever::VpdRetriever( ) throw( VpdException& ) - | ^~~~~ -make: *** [Makefile:660: src/vpdretriever.lo] Error 1 - -As part of -http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2016/p0003r5.html, -the dynamic exception specification have been removed. Remove the -throw specifier, to specify that the function might throw an exception. - -Signed-off-by: Kamalesh Babulal -Signed-off-by: Vasant Hegde ---- - src/libvpd-2/vpdretriever.hpp | 6 ++---- - src/vpdretriever.cpp | 4 ++-- - 2 files changed, 4 insertions(+), 6 deletions(-) - -diff --git a/src/libvpd-2/vpdretriever.hpp b/src/libvpd-2/vpdretriever.hpp -index 0d91ac4..1be2664 100644 ---- a/src/libvpd-2/vpdretriever.hpp -+++ b/src/libvpd-2/vpdretriever.hpp -@@ -58,8 +58,7 @@ namespace lsvpd - * @param dbFileName - * The file name for the VPD database. - */ -- VpdRetriever( string envDir, string dbFileName ) -- throw( VpdException& ); -+ VpdRetriever( string envDir, string dbFileName ); - - /** - * Builds A VpdRetriever object that can be used for reading the -@@ -70,8 +69,7 @@ namespace lsvpd - * this constructor, there were serious underlying issues that - * are not recoverable. Uses the default dir and filename - */ -- VpdRetriever( ) -- throw( VpdException& ); -+ VpdRetriever( ); - ~VpdRetriever( ); - - /** -diff --git a/src/vpdretriever.cpp b/src/vpdretriever.cpp -index 9f7e7a0..470047e 100644 ---- a/src/vpdretriever.cpp -+++ b/src/vpdretriever.cpp -@@ -47,7 +47,7 @@ namespace lsvpd - const string VpdRetriever::UDEV_NOTIFY_FILE ( "/run/run.vpdupdate" ); - - VpdRetriever::VpdRetriever( string envDir, -- string dbFileName ) throw( VpdException& ) -+ string dbFileName ) - { - try { - db = new VpdDbEnv( envDir, dbFileName, true ); -@@ -59,7 +59,7 @@ namespace lsvpd - } - } - -- VpdRetriever::VpdRetriever( ) throw( VpdException& ) -+ VpdRetriever::VpdRetriever( ) - { - struct stat vpd_stat,udev_stat; - const string vpddb = VpdRetriever::DEFAULT_DIR + VpdRetriever::DEFAULT_FILE; diff --git a/sys-libs/libvpd/files/2.2.8-warnings.patch b/sys-libs/libvpd/files/2.2.8-warnings.patch deleted file mode 100644 index 1419de3dda49..000000000000 --- a/sys-libs/libvpd/files/2.2.8-warnings.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 72b75e1976b50372f07271a5235ee8e9c75bdac4 Mon Sep 17 00:00:00 2001 -From: Kamalesh Babulal -Date: Mon, 21 Jun 2021 11:42:02 +0530 -Subject: [PATCH] vpddbenv_c: fix compile warnings - -src/vpddbenv_c.c: In function 'new_vpddbenv': -src/vpddbenv_c.c:56:17: warning: 'strncat' specified bound 1 equals source length [-Wstringop-overflow=] - 56 | strncat( ret->fullPath, "/" , 1 ); - | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -src/vpddbenv_c.c:58:17: warning: 'strncat' accessing between 258 and 9223372036854775804 bytes at offsets 514 and 257 may overlap 1 byte at offset 514 [-Wrestrict] - 58 | strncat( ret->fullPath, ret->dbFileName, strlen(ret->dbFileName) ); - | - ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -While compiling the code with GCC-11 (Fedora 34), the GCC complains -about src string length and N bytes mentioned in the strncat() are of -same length. It gets suspicious, when strncat() mimics strcat(), the -strcat() was replaced using strncat() by the commit 38de4e65205 -("libvpd: Convert strcat to strncat") as part of secure coding. - -refactor the code using snprintf(), making the code lean and keep the -GCC happy as well. - -Signed-off-by: Kamalesh Babulal -Signed-off-by: Vasant Hegde ---- - src/vpddbenv_c.c | 12 ++++-------- - 1 file changed, 4 insertions(+), 8 deletions(-) - -diff --git a/src/vpddbenv_c.c b/src/vpddbenv_c.c -index 96aecd3..bae36e9 100644 ---- a/src/vpddbenv_c.c -+++ b/src/vpddbenv_c.c -@@ -50,14 +50,10 @@ struct vpddbenv * new_vpddbenv( const char *dir, const char *file ) - ret->dbFileName[MAX_NAME_LENGTH] = '\0'; - } - -- strncpy( ret->fullPath, ret->envDir , FULL_PATH_SIZE - 1); -- -- if (strlen(ret->fullPath) + 1 < FULL_PATH_SIZE) -- strncat( ret->fullPath, "/" , 1 ); -- if (strlen(ret->fullPath) + strlen(ret->dbFileName) < FULL_PATH_SIZE) -- strncat( ret->fullPath, ret->dbFileName, strlen (ret->dbFileName) ); -- -- ret->fullPath[FULL_PATH_SIZE - 1] = '\0'; -+ if ( ( strlen( ret->envDir ) + strlen( ret->dbFileName ) + 1 ) < -+ FULL_PATH_SIZE ) -+ snprintf( ret->fullPath, FULL_PATH_SIZE, -+ "%s/%s", ret->envDir, ret->dbFileName ); - - rc = sqlite3_open( ret->fullPath, &(ret->db) ); - if( rc != SQLITE_OK ) diff --git a/sys-libs/libvpd/libvpd-2.2.8-r1.ebuild b/sys-libs/libvpd/libvpd-2.2.8-r1.ebuild deleted file mode 100644 index 3b69e327edd6..000000000000 --- a/sys-libs/libvpd/libvpd-2.2.8-r1.ebuild +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit autotools udev - -DESCRIPTION="Library implementation for listing Vital Product Data" -HOMEPAGE="https://github.com/power-ras/libvpd" -SRC_URI="https://github.com/power-ras/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="LGPL-2.1+" -SLOT="0" -KEYWORDS="ppc ppc64" - -DEPEND=" - dev-db/sqlite:3 - sys-libs/zlib:= -" -RDEPEND="${DEPEND}" - -PATCHES=( - "${FILESDIR}/2.2.8-gcc11.patch" - "${FILESDIR}/2.2.8-warnings.patch" -) - -src_prepare() { - default - eautoreconf -} - -src_configure() { - # sysconfdir is used only to establish where the udev rules file should go - # unfortunately it also adds the subdirs on its own so we strip it down to - # dirname - local myconf=( - --disable-static - --localstatedir="${EPREFIX}/var" - --sysconfdir="$( dirname $(get_udevdir) )" - ) - - econf "${myconf[@]}" -} - -src_install() { - default - keepdir /var/lib/lsvpd - find "${D}" -name '*.la' -delete || die -} diff --git a/sys-libs/libvpd/libvpd-2.2.9.ebuild b/sys-libs/libvpd/libvpd-2.2.9.ebuild index 1fb2f63eef03..8d0128e92307 100644 --- a/sys-libs/libvpd/libvpd-2.2.9.ebuild +++ b/sys-libs/libvpd/libvpd-2.2.9.ebuild @@ -10,7 +10,7 @@ SRC_URI="https://github.com/power-ras/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz LICENSE="LGPL-2.1+" SLOT="0/3" -KEYWORDS="~ppc ppc64" +KEYWORDS="ppc ppc64" DEPEND=" dev-db/sqlite:3 -- cgit v1.2.3