Skip to Content.
Sympa Menu

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

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, sm-commit AT lists.sourcemage.org
  • Subject: [[SM-Commit] ] GIT changes to master grimoire by Ismael Luceno (8c929c34b4a4424785fc008119355a60d8ba87d8)
  • Date: Wed, 4 Jun 2025 12:27:35 +0000

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

doc/docbook2x/DETAILS
| 2
doc/docbook2x/HISTORY
| 5 +

doc/docbook2x/patches/docbook2X-0.8.8-stop-redeclaring-predefined-entity-lt.patch
| 42 ++++++++++
perl-cpan/module-install/DETAILS
| 6 -
perl-cpan/module-install/HISTORY
| 4
perl-cpan/www-opensearch/DEPENDS
| 3
perl-cpan/www-opensearch/HISTORY
| 3
utils/lshw/BUILD
| 4
utils/lshw/HISTORY
| 4
9 files changed, 67 insertions(+), 6 deletions(-)

New commits:
commit 8c929c34b4a4424785fc008119355a60d8ba87d8
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

docbook2x: Fix invalid XML entity redeclaration

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

www-opensearch: Added missing dep on module-install

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

module-install 1.21

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

lshw: Fixed version detection & disabled dial-home check

diff --git a/doc/docbook2x/DETAILS b/doc/docbook2x/DETAILS
index c31284a..b349a7c 100755
--- a/doc/docbook2x/DETAILS
+++ b/doc/docbook2x/DETAILS
@@ -1,7 +1,7 @@
SPELL=docbook2x
SPELLX=docbook2X
VERSION=0.8.8
- PATCHLEVEL=1
+ PATCHLEVEL=2
SOURCE=$SPELLX-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION
SOURCE_URL[0]=http://downloads.sourceforge.net/sourceforge/$SPELL/$SOURCE
diff --git a/doc/docbook2x/HISTORY b/doc/docbook2x/HISTORY
index 51dc059..1c720e4 100644
--- a/doc/docbook2x/HISTORY
+++ b/doc/docbook2x/HISTORY
@@ -1,3 +1,8 @@
+2025-06-04 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: PATCHLEVEL++
+ * patches/docbook2X-0.8.8-stop-redeclaring-predefined-entity-lt.patch:
+ fixed invalid redeclaration
+
2019-05-25 Ismael Luceno <ismael AT sourcemage.org>
* DEPENDS: Added dependency on libiconv for non-glibc systems

diff --git
a/doc/docbook2x/patches/docbook2X-0.8.8-stop-redeclaring-predefined-entity-lt.patch

b/doc/docbook2x/patches/docbook2X-0.8.8-stop-redeclaring-predefined-entity-lt.patch
new file mode 100644
index 0000000..76463be
--- /dev/null
+++
b/doc/docbook2x/patches/docbook2X-0.8.8-stop-redeclaring-predefined-entity-lt.patch
@@ -0,0 +1,42 @@
+From 040f468fcfae3fe67818023ebc54f3f48fc1bfd9 Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping <sebastian AT pipping.org>
+Date: Mon, 24 Feb 2025 23:25:40 +0100
+Subject: [PATCH] Fix invalid redeclaration of predefined XML entity "&lt;"
+
+Section "4.6 Predefined Entities" of XML 1.0r4 is clear that:
+
+> If the entities lt or amp are declared, they MUST be declared
+> as internal entities whose replacement text is a character reference
+> to the respective character (less-than sign or ampersand) being escaped[.]
+
+Source:
+https://www.w3.org/TR/2006/REC-xml-20060816/#sec-predefined-ent
+---
+ xslt/common/text/l10n-set.xml | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/xslt/common/text/l10n-set.xml b/xslt/common/text/l10n-set.xml
+index 0ed7454..b2c334b 100644
+--- a/xslt/common/text/l10n-set.xml
++++ b/xslt/common/text/l10n-set.xml
+@@ -21,7 +21,7 @@
+ <!ENTITY it SYSTEM "it.xml">
+ <!ENTITY ja SYSTEM "ja.xml">
+ <!ENTITY ko SYSTEM "ko.xml">
+-<!ENTITY lt SYSTEM "lt.xml">
++<!ENTITY lt_ SYSTEM "lt.xml">
+ <!ENTITY nl SYSTEM "nl.xml">
+ <!ENTITY nn SYSTEM "nn.xml">
+ <!ENTITY no SYSTEM "no.xml">
+@@ -65,7 +65,7 @@
+ &it;
+ &ja;
+ &ko;
+-&lt;
++&lt_;
+ &nl;
+ &nn;
+ &no;
+--
+2.48.1
+
diff --git a/perl-cpan/module-install/DETAILS
b/perl-cpan/module-install/DETAILS
index bab6c98..cdd26c8 100755
--- a/perl-cpan/module-install/DETAILS
+++ b/perl-cpan/module-install/DETAILS
@@ -1,9 +1,9 @@
SPELL=module-install
- VERSION=0.36
+ VERSION=1.21
SOURCE=Module-Install-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/Module-Install-$VERSION
- SOURCE_URL[0]=http://www.cpan.org/authors/id/A/AU/AUTRIJUS//$SOURCE
-
SOURCE_HASH=sha512:5784573e29b16e149f6b4674e390240f533531f90d06c379f2727b28ad6ba84de6f9179d2fbdac966db5354020289879e23dd12dd00546a8ccb4ee929d260ed2
+ SOURCE_URL[0]="https://cpan.metacpan.org/authors/id/E/ET/ETHER/$SOURCE";
+
SOURCE_HASH=sha512:f3dd1dfcae81704f1aa9ac409abd22c9e0d5d66c048adac13da19ab88559d717427b5471b7a065db8312d4d44e829afea52567cd0993e4016df0e10c760ada85
WEB_SITE="http://search.cpan.org/search?module=Module::Install";
ENTERED=20050417
LICENSE[0]=ART
diff --git a/perl-cpan/module-install/HISTORY
b/perl-cpan/module-install/HISTORY
index 48373e5..d553e4d 100644
--- a/perl-cpan/module-install/HISTORY
+++ b/perl-cpan/module-install/HISTORY
@@ -1,3 +1,7 @@
+2025-06-04 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: Fixed SOURCE_URL[0]
+ updated spell to 1.21
+
2011-10-15 Bor Kraljič <pyrobor AT ver.si>
* DEPENDS: module-build was merged into perl (fixes #290)

diff --git a/perl-cpan/www-opensearch/DEPENDS
b/perl-cpan/www-opensearch/DEPENDS
index c1a1bc6..5572069 100755
--- a/perl-cpan/www-opensearch/DEPENDS
+++ b/perl-cpan/www-opensearch/DEPENDS
@@ -1 +1,2 @@
-depends perl
+depends perl &&
+depends module-install
diff --git a/perl-cpan/www-opensearch/HISTORY
b/perl-cpan/www-opensearch/HISTORY
index a03442e..841968e 100644
--- a/perl-cpan/www-opensearch/HISTORY
+++ b/perl-cpan/www-opensearch/HISTORY
@@ -1,3 +1,6 @@
+2025-06-04 Ismael Luceno <ismael AT sourcemage.org>
+ * DEPENDS: added module-install
+
2011-05-17 Florian Franzmann <bwlf AT bandrate.org>
* BUILD, DEPENDS, DETAILS: spell created

diff --git a/utils/lshw/BUILD b/utils/lshw/BUILD
index 7bcaf7d..b701e45 100755
--- a/utils/lshw/BUILD
+++ b/utils/lshw/BUILD
@@ -1 +1,3 @@
-make all $OPTS RPM_OPT_FLAGS="$CXXFLAGS"
+make all $OPTS RPM_OPT_FLAGS="$CXXFLAGS" \
+ VERSION="$VERSION" \
+ NO_VERSION_CHECK=1
diff --git a/utils/lshw/HISTORY b/utils/lshw/HISTORY
index a170911..8c425c3 100644
--- a/utils/lshw/HISTORY
+++ b/utils/lshw/HISTORY
@@ -1,3 +1,7 @@
+2023-03-27 Ismael Luceno <ismael AT sourcemage.org>
+ * BUILD: passed VERSION to make (the buildsystem fails to provide it),
+ added flag to avoid run-time dial-home version check
+
2025-02-23 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version B.02.20
* musl-path_max.patch musl-long_bit.patch: deleted


  • [[SM-Commit] ] GIT changes to master grimoire by Ismael Luceno (8c929c34b4a4424785fc008119355a60d8ba87d8), Ismael Luceno, 06/04/2025

Archive powered by MHonArc 2.6.24.

Top of Page