Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Ismael Luceno (9aa76042eb5238682daa83ea5d240dd4676f9e29)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Ismael Luceno <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Ismael Luceno (9aa76042eb5238682daa83ea5d240dd4676f9e29)
  • Date: Mon, 27 Mar 2023 15:07:31 +0000

GIT changes to master grimoire by Ismael Luceno <ismael AT sourcemage.org>:

telephony/libosip2/DETAILS | 2 +-
telephony/libosip2/HISTORY | 3 +++
utils/lshw/DETAILS | 4 ++--
utils/lshw/HISTORY | 7 +++++++
utils/lshw/patches/fix-array-bounds.patch | 15 ---------------
utils/lshw/patches/fix-lshw_sgml.patch | 10 ++++++++++
utils/lshw/patches/musl-basename.patch | 15 +--------------
utils/lshw/patches/musl-long_bit.patch | 17 ++++++++++++-----
utils/lshw/patches/musl-path_max.patch | 2 +-
9 files changed, 37 insertions(+), 38 deletions(-)

New commits:
commit 9aa76042eb5238682daa83ea5d240dd4676f9e29
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

libosip2 5.3.1

commit b208c204da44cd340748d43ae2fbc4886aab7516
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

lshw B.02.19.2

diff --git a/telephony/libosip2/DETAILS b/telephony/libosip2/DETAILS
index f0d838a..a3f4bc8 100755
--- a/telephony/libosip2/DETAILS
+++ b/telephony/libosip2/DETAILS
@@ -1,6 +1,6 @@
# Watch: https://ftpmirror.gnu.org/osip
SPELL=libosip2
- VERSION=5.1.1
+ VERSION=5.3.1
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=$GNU_URL/osip/$SOURCE
diff --git a/telephony/libosip2/HISTORY b/telephony/libosip2/HISTORY
index f506653..c2f84e7 100644
--- a/telephony/libosip2/HISTORY
+++ b/telephony/libosip2/HISTORY
@@ -1,3 +1,6 @@
+2023-03-27 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: updated spell to 5.3.1
+
2021-01-23 Ismael Luceno <ismael AT sourcemage.org>
* DETAILS: updated spell to 5.1.1

diff --git a/utils/lshw/DETAILS b/utils/lshw/DETAILS
index ba29392..4344781 100755
--- a/utils/lshw/DETAILS
+++ b/utils/lshw/DETAILS
@@ -1,6 +1,6 @@
SPELL=lshw
- VERSION=B.02.18
-
SOURCE_HASH=sha512:4385db86101178b8bd33a80e991718e14f83277c66b3d63ae97cb4339196873b6e9b31a174024bf43d16fe66e1d7f8cf5cea56076697878087880c8821b11e47
+ VERSION=B.02.19.2
+
SOURCE_HASH=sha512:f3abc6241fe7912740f11b5b97a1f7778cb7cc69f5209b83063cbc1d3aa7b082dedb3aac4119ce100391547400ed6bb2d413ca47de50794e1066f31961be41a5
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]="http://www.ezix.org/software/files/$SOURCE";
diff --git a/utils/lshw/HISTORY b/utils/lshw/HISTORY
index ae73714..f927f33 100644
--- a/utils/lshw/HISTORY
+++ b/utils/lshw/HISTORY
@@ -1,3 +1,10 @@
+2023-03-27 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: updated spell to B.02.19.2
+ * patches/fix-array-bounds.patch: removed, no longer needed
+ * patches/fix-lshw_sgml.patch: patch added, fixes lshw.sgml's DTD
+ * patches/musl-basename.patch, patches/musl-long_bit.patch,
+ patches/musl-path_max.patch: updated
+
2020-07-30 Ismael Luceno <ismael AT sourcemage.org>
* BUILD: removed edit of src/Makefile, not needed anymore
* DEPENDS, BUILD: merged building of gui and cli
diff --git a/utils/lshw/patches/fix-array-bounds.patch
b/utils/lshw/patches/fix-array-bounds.patch
deleted file mode 100644
index 5592e8e..0000000
--- a/utils/lshw/patches/fix-array-bounds.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-From:
https://github.com/void-linux/void-packages/tree/7bfdb7ab051fbb43309c764ed4613d39ee590679/srcpkgs/lshw/patches/
-
-Fix GCC warning "array subscript is above array bounds [-Warray-bounds]"
-
---- a/src/core/dmi.cc
-+++ b/src/core/dmi.cc
-@@ -511,7 +511,7 @@
- if (num <= 0x0A)
- return _(memory_array_location[num]);
- if (num >= 0xA0 && num < 0xA4)
-- return _(jp_memory_array_location[num]);
-+ return _(jp_memory_array_location[num - 0xA0]);
- return "";
- }
-
diff --git a/utils/lshw/patches/fix-lshw_sgml.patch
b/utils/lshw/patches/fix-lshw_sgml.patch
new file mode 100644
index 0000000..592c843
--- /dev/null
+++ b/utils/lshw/patches/fix-lshw_sgml.patch
@@ -0,0 +1,10 @@
+Origin: Void Linux
+
+--- a/src/lshw.sgml 2016-04-22 21:49:30.000000000 +0200
++++ b/src/lshw.sgml 2016-05-07 05:54:39.106562357 +0200
+@@ -1,4 +1,4 @@
+-<!DOCTYPE RefEntry PUBLIC "-//OASIS//DTD DocBook V4.1//EN">
++<!DOCTYPE RefEntry PUBLIC "-//OASIS//DTD DocBook V4.1//EN"
"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd";>
+ <refentry id="lshw">
+
+ <refmeta>
diff --git a/utils/lshw/patches/musl-basename.patch
b/utils/lshw/patches/musl-basename.patch
index 07e5788..28b0f33 100644
--- a/utils/lshw/patches/musl-basename.patch
+++ b/utils/lshw/patches/musl-basename.patch
@@ -1,20 +1,7 @@
-From:
https://github.com/void-linux/void-packages/tree/7bfdb7ab051fbb43309c764ed4613d39ee590679/srcpkgs/lshw/patches/
+Origin: Void Linux

For musl libc declare a macro version of basename(3).

---- a/src/core/dasd.cc
-+++ b/src/core/dasd.cc
-@@ -10,6 +10,10 @@
- #include <linux/fs.h>
- #include <map>
-
-+#if !defined(__GLIBC__)
-+#define basename(src) (strrchr(src,'/') ? strrchr(src,'/')+1 : src)
-+#endif
-+
- using namespace std;
-
- /*Read only block devices, not partitions*/
--- a/src/core/sysfs.cc
+++ b/src/core/sysfs.cc
@@ -19,6 +19,10 @@
diff --git a/utils/lshw/patches/musl-long_bit.patch
b/utils/lshw/patches/musl-long_bit.patch
index 20a2c80..6d035e9 100644
--- a/utils/lshw/patches/musl-long_bit.patch
+++ b/utils/lshw/patches/musl-long_bit.patch
@@ -1,15 +1,22 @@
-From: ismael AT sourcemage.org
+Origin: Void Linux

-musl libc does not implement _SC_LONG_BIT, replace with a portable
alternative.
+sysconf(LONG_BIT) isn't correct usage of sysconf(3).

+musl doesn't define _SC_LONG_BIT, so just use LONG_BIT directly. There's
really
+no reason to use sysconf(3) here, word size isn't a runtime property.
+
+diff --git src/core/abi.cc src/core/abi.cc
+index adff7b5..76c664c 100644
--- a/src/core/abi.cc
+++ b/src/core/abi.cc
-@@ -20,7 +20,7 @@ __ID("@(#) $Id: mem.cc 1352 2006-05-27 23:54:13Z ezix $");
+@@ -20,9 +20,7 @@ __ID("@(#) $Id: mem.cc 1352 2006-05-27 23:54:13Z ezix $");
bool scan_abi(hwNode & system)
{
// are we compiled as 32- or 64-bit process ?
-- system.setWidth(sysconf(LONG_BIT));
-+ system.setWidth(sizeof(long) * CHAR_BIT);
+- long sc = sysconf(LONG_BIT);
+- if(sc==-1) sc = sysconf(_SC_LONG_BIT);
+- if(sc!=-1) system.setWidth(sc);
++ system.setWidth(LONG_BIT);

pushd(PROC_SYS);

diff --git a/utils/lshw/patches/musl-path_max.patch
b/utils/lshw/patches/musl-path_max.patch
index a6d4ba5..49e9a9c 100644
--- a/utils/lshw/patches/musl-path_max.patch
+++ b/utils/lshw/patches/musl-path_max.patch
@@ -1,4 +1,4 @@
-From:
https://github.com/void-linux/void-packages/tree/7bfdb7ab051fbb43309c764ed4613d39ee590679/srcpkgs/lshw/patches/
+Origin: Void Linux

Need to include limits.h for the definition of PATH_MAX.




  • [SM-Commit] GIT changes to master grimoire by Ismael Luceno (9aa76042eb5238682daa83ea5d240dd4676f9e29), Ismael Luceno, 03/27/2023

Archive powered by MHonArc 2.6.24.

Top of Page