* [gentoo-commits] repo/gentoo:master commit in: sys-libs/libvpd/files/, sys-libs/libvpd/
@ 2018-12-01 13:03 Jeroen Roovers
0 siblings, 0 replies; 2+ messages in thread
From: Jeroen Roovers @ 2018-12-01 13:03 UTC (permalink / raw
To: gentoo-commits
commit: 3a2d90d1272deaeeadf83ea5fa71e9c1aa36003e
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 1 12:59:52 2018 +0000
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Sat Dec 1 13:03:28 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3a2d90d1
sys-libs/libvpd: Version 2.2.6
Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org>
sys-libs/libvpd/Manifest | 1 +
.../libvpd/files/libvpd-2.2.6-localstatedir.patch | 21 ++++++++++++
sys-libs/libvpd/libvpd-2.2.6.ebuild | 38 ++++++++++++++++++++++
3 files changed, 60 insertions(+)
diff --git a/sys-libs/libvpd/Manifest b/sys-libs/libvpd/Manifest
index dacb79dde20..cbd99e5e12f 100644
--- a/sys-libs/libvpd/Manifest
+++ b/sys-libs/libvpd/Manifest
@@ -1,3 +1,4 @@
DIST libvpd-2.1.3.tar.gz 116493 BLAKE2B 12647984c54042d77944cdeb4132a2ddeaa51502a919d790d6bd5d479efb09c06a2dde983386d62a206f0b2c7eeeb8713ac53af20cc0f53e9c24bc18073d24fb SHA512 f5aac9253752552674ac6c54dd3e6dbdd7ff79867740076d6e19782940b809e53736a11e668978d8d73bf636d92d1daeb78080e5fd31c4febc2257e5497c373c
DIST libvpd-2.2.4.tar.gz 374665 BLAKE2B d27cdf647c69cae2478b9286f255a9722d46c2817817da8f805f3385ece754df77505bb02e624babff66fc111ba80c26175e276ac35b7796c4a977b538ea81cb SHA512 89f7e235e957393fe33e484b23fce15fbf36274db6115e7245027a17b7535e387f835c048a7063f317f10de2351a78acf2ca72b10adee0020ce62a035bfe787e
DIST libvpd-2.2.5.tar.gz 374311 BLAKE2B 1d0d793b958c46d6795097f5bd2f7bac3f9f9167aee0b21535d3a37114290f39cfdfb10f3789f995267312b898447f230263a0b08916f11490d56c2dd0573b4a SHA512 06969e61d2882a30ebff13b6432397edb0119adc0b0f8ea603973c6ef439320c39c1cbc218fab154d595fadc966bfef07a4a9c4e4ec8fd772cf7d396000864b0
+DIST libvpd-2.2.6.tar.gz 374262 BLAKE2B b7741948aa62ad6221d28a674f765d085e1446c0bb45d7aa7a5f08599471023b2bb794ad5645c3b70af5806cd48cc87f117f9b4021e0f8c872ca48b748cc1e60 SHA512 17046eeb6ccc5372d465848eff7135cf6e9f876a2d82862e1d01a9f674b691958942e119f846bc3220c1e8f7eb549c5c7867d5d5e896072c733f400d202abc1d
diff --git a/sys-libs/libvpd/files/libvpd-2.2.6-localstatedir.patch b/sys-libs/libvpd/files/libvpd-2.2.6-localstatedir.patch
new file mode 100644
index 00000000000..78a44a6351c
--- /dev/null
+++ b/sys-libs/libvpd/files/libvpd-2.2.6-localstatedir.patch
@@ -0,0 +1,21 @@
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -66,6 +66,6 @@
+
+ install-exec-hook:
+ mkdir -p $(DESTDIR)/${sysconfdir}/udev/rules.d/
+- mkdir -p $(DESTDIR)/${localstatedir}/lib/lsvpd/
++ mkdir -p $(DESTDIR)/${localstatedir}/lsvpd/
+ install -D --mode=644 90-vpdupdate.rules \
+ ${DESTDIR}/${sysconfdir}/udev/rules.d/90-vpdupdate.rules
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -1046,7 +1046,7 @@
+
+ install-exec-hook:
+ mkdir -p $(DESTDIR)/${sysconfdir}/udev/rules.d/
+- mkdir -p $(DESTDIR)/${localstatedir}/lib/lsvpd/
++ mkdir -p $(DESTDIR)/${localstatedir}/lsvpd/
+ install -D --mode=644 90-vpdupdate.rules \
+ ${DESTDIR}/${sysconfdir}/udev/rules.d/90-vpdupdate.rules
+
diff --git a/sys-libs/libvpd/libvpd-2.2.6.ebuild b/sys-libs/libvpd/libvpd-2.2.6.ebuild
new file mode 100644
index 00000000000..a85c190bf64
--- /dev/null
+++ b/sys-libs/libvpd/libvpd-2.2.6.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit udev
+
+DESCRIPTION="Library implementation for listing vpds"
+HOMEPAGE="https://sourceforge.net/projects/linux-diag/"
+SRC_URI="https://sourceforge.net/projects/linux-diag/files/libvpd/${PV}/libvpd-${PV}.tar.gz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~ppc ~ppc64"
+IUSE="static-libs"
+
+DEPEND="
+ >=dev-db/sqlite-3.7.8
+ sys-libs/zlib
+"
+RDEPEND="${DEPEND}"
+PATCHES=(
+ "${FILESDIR}"/${PN}-2.2.6-localstatedir.patch
+)
+
+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
+ econf \
+ $(use_enable static-libs static) \
+ --sysconfdir="$( dirname $(get_udevdir) )"
+}
+
+src_install(){
+ default
+ keepdir /var/lib/lsvpd
+ find "${D}" -name '*.la' -delete || die
+}
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-libs/libvpd/files/, sys-libs/libvpd/
@ 2022-11-30 18:00 Georgy Yakovlev
0 siblings, 0 replies; 2+ messages in thread
From: Georgy Yakovlev @ 2022-11-30 18:00 UTC (permalink / raw
To: gentoo-commits
commit: d2357f2fa5f75ec020cdaea0491ef4d584023b1a
Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 30 17:58:02 2022 +0000
Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Wed Nov 30 18:00:09 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d2357f2f
sys-libs/libvpd: drop 2.2.8-r1
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>
sys-libs/libvpd/Manifest | 1 -
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 -----------------
4 files changed, 185 deletions(-)
diff --git a/sys-libs/libvpd/Manifest b/sys-libs/libvpd/Manifest
index 86db8dfddfa6..3e825ef8afde 100644
--- a/sys-libs/libvpd/Manifest
+++ b/sys-libs/libvpd/Manifest
@@ -1,2 +1 @@
-DIST libvpd-2.2.8.tar.gz 52725 BLAKE2B 76bdc6ddf80236a6848185273c2cac181d44214f0c609d7c5af6fa4d09a7cd816324af35745617ce3daa7268311e2ed754335600df1d4970a324eb327015d051 SHA512 d0b7d1760c6ae54717c538405c651317b7318dec5780961f5386c09b7d245e35a84c2fc47d89c47c3cd2168d73d7186f5819981d52c3ba962514639833dc62aa
DIST libvpd-2.2.9.tar.gz 53747 BLAKE2B c8898e2f604431b74bf5e10fc99e7a9b5540b825f2a996776109a2b2b636f732ff8d9f7956ffea1231e5b023e285eee641a873a68fcd8a2d6a6d9e64c5ab3b18 SHA512 e32a80e0f3aaedbaaac64dbdedfee7eeb2e7a7b6d2d737bca4678d26caadab77032a7c26211a5fc3caed3724488bc8fa99620ceac05f8d156ca90f4452cfaf0a
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 <kamalesh@linux.vnet.ibm.com>
-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 <kamalesh@linux.vnet.ibm.com>
-Signed-off-by: Vasant Hegde <hegdevasant@linux.vnet.ibm.com>
----
- 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 <kamalesh@linux.ibm.com>
-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 <kamalesh@linux.ibm.com>
-Signed-off-by: Vasant Hegde <hegdevasant@linux.vnet.ibm.com>
----
- 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
-}
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-11-30 18:00 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-11-30 18:00 [gentoo-commits] repo/gentoo:master commit in: sys-libs/libvpd/files/, sys-libs/libvpd/ Georgy Yakovlev
-- strict thread matches above, loose matches on Subject: below --
2018-12-01 13:03 Jeroen Roovers
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox