Skip to Content.
Sympa Menu

sm-commit - [[SM-Commit] ] GIT changes to master grimoire by Treeve Jelbert (3649d30a758825de780b3f40f74b246145f5576f)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Treeve Jelbert <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 Treeve Jelbert (3649d30a758825de780b3f40f74b246145f5576f)
  • Date: Sun, 30 Mar 2025 08:17:50 +0000

GIT changes to master grimoire by Treeve Jelbert <treeve AT sourcemage.org>:

crypto/xmlsec/DETAILS | 4 -
crypto/xmlsec/HISTORY | 3
devel/patch/DETAILS | 4 -
devel/patch/HISTORY | 4 +
devel/patch/PRE_BUILD | 3
devel/patch/patches/ed.patch | 147
-------------------------------------------
disk/partclone/DETAILS | 4 -
disk/partclone/HISTORY | 3
8 files changed, 16 insertions(+), 156 deletions(-)

New commits:
commit 3649d30a758825de780b3f40f74b246145f5576f
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

patch: => 2.8

commit 0bf1341ec3a846d9578170c3772b5ec39ed94d23
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

xmlsec: => 1.3.7

commit 94a970f1ae329833b1bfc44991f2ccc94d5a740b
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

partclone: => 0.3.36

diff --git a/crypto/xmlsec/DETAILS b/crypto/xmlsec/DETAILS
index cdc9a4c..648b54d 100755
--- a/crypto/xmlsec/DETAILS
+++ b/crypto/xmlsec/DETAILS
@@ -1,6 +1,6 @@
SPELL=xmlsec
- VERSION=1.3.5
-
SOURCE_HASH=sha512:69e9f18e2bc6b1b9acaf475a534a666965a561eec6a5a152185d264a4110d97d233af302153577a414e232a8880c6afc66b563118d889e670204d93819fcfdb5
+ VERSION=1.3.7
+
SOURCE_HASH=sha512:0813ad0f7821f765947a7d81d276ba479bf54430279a7b9da31988d1ec76c60b81d3d57f1088a69a2cc0d8d27fa932ce1cb051457d1c0c5a6f071a2df4395cb8
SECURITY_PATCH=1
SOURCE=$SPELL${VERSION%%\.*}-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL${VERSION%%\.*}-$VERSION
diff --git a/crypto/xmlsec/HISTORY b/crypto/xmlsec/HISTORY
index a43d635..7f022fd 100644
--- a/crypto/xmlsec/HISTORY
+++ b/crypto/xmlsec/HISTORY
@@ -1,3 +1,6 @@
+2025-03-29 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.3.7
+
2024-07-26 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.3.5

diff --git a/devel/patch/DETAILS b/devel/patch/DETAILS
index 542be75..af3f74c 100755
--- a/devel/patch/DETAILS
+++ b/devel/patch/DETAILS
@@ -1,6 +1,6 @@
# Watch: https://ftp.gnu.org/gnu/patch
SPELL=patch
- VERSION=2.7.6
+ VERSION=2.8
SECURITY_PATCH=3
SOURCE=$SPELL-$VERSION.tar.xz
SOURCE2=$SOURCE.sig
@@ -11,7 +11,7 @@ SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_GPG=gnu.gpg:$SOURCE.sig:UPSTREAM_KEY
SOURCE2_IGNORE=signature
LICENSE[0]=GPL
- WEB_SITE=http://www.gnu.org/software/patch/patch.html
+ WEB_SITE=https://www.gnu.org/software/patch/patch.html
ENTERED=20010922
KEYWORDS="devel"
SHORT="patch applies a patch to a file"
diff --git a/devel/patch/HISTORY b/devel/patch/HISTORY
index ccd7676..18bb97c 100644
--- a/devel/patch/HISTORY
+++ b/devel/patch/HISTORY
@@ -1,3 +1,7 @@
+2025-03-30 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 2.8
+ * PRE_BUILD patches/ed.patch: deleted
+
2019-01-19 Treeve Jelbert <treeve AT sourcemage.org>
* DEPENDS: delete gnupg

diff --git a/devel/patch/PRE_BUILD b/devel/patch/PRE_BUILD
deleted file mode 100755
index 0cab101..0000000
--- a/devel/patch/PRE_BUILD
+++ /dev/null
@@ -1,3 +0,0 @@
-default_pre_build &&
-cd "${SOURCE_DIRECTORY}" &&
-apply_patch_dir patches
diff --git a/devel/patch/patches/ed.patch b/devel/patch/patches/ed.patch
deleted file mode 100644
index 552821c..0000000
--- a/devel/patch/patches/ed.patch
+++ /dev/null
@@ -1,147 +0,0 @@
-From 123eaff0d5d1aebe128295959435b9ca5909c26d Mon Sep 17 00:00:00 2001
-From: Andreas Gruenbacher <agruen AT gnu.org>
-Date: Fri, 6 Apr 2018 12:14:49 +0200
-Subject: Fix arbitrary command execution in ed-style patches
- (CVE-2018-1000156)
-
-* src/pch.c (do_ed_script): Write ed script to a temporary file instead
-of piping it to ed: this will cause ed to abort on invalid commands
-instead of rejecting them and carrying on.
-* tests/ed-style: New test case.
-* tests/Makefile.am (TESTS): Add test case.
----
- src/pch.c | 91
++++++++++++++++++++++++++++++++++++++++---------------
- tests/Makefile.am | 1 +
- tests/ed-style | 41 +++++++++++++++++++++++++
- 3 files changed, 108 insertions(+), 25 deletions(-)
- create mode 100644 tests/ed-style
-
-diff --git a/src/pch.c b/src/pch.c
-index 0c5cc26..4fd5a05 100644
---- a/src/pch.c
-+++ b/src/pch.c
-@@ -33,6 +33,7 @@
- # include <io.h>
- #endif
- #include <safe.h>
-+#include <sys/wait.h>
-
- #define INITHUNKMAX 125 /* initial dynamic allocation
size */
-
-@@ -2388,22 +2389,28 @@
- static char const editor_program[] = EDITOR_PROGRAM;
-
- file_offset beginning_of_this_line;
-- FILE *pipefp = 0;
- size_t chars_read;
-+ FILE *tmpfp = 0;
-+ char const *tmpname;
-+ int tmpfd;
-+ pid_t pid;
-+
-+ if (! dry_run && ! skip_rest_of_patch)
-+ {
-+ /* Write ed script to a temporary file. This causes ed to abort on
-+ invalid commands such as when line numbers or ranges exceed the
-+ number of available lines. When ed reads from a pipe, it rejects
-+ invalid commands and treats the next line as a new command, which
-+ can lead to arbitrary command execution. */
-+
-+ tmpfd = make_tempfile (&tmpname, 'e', NULL, O_RDWR | O_BINARY, 0);
-+ if (tmpfd == -1)
-+ pfatal ("Can't create temporary file %s", quotearg (tmpname));
-+ tmpfp = fdopen (tmpfd, "w+b");
-+ if (! tmpfp)
-+ pfatal ("Can't open stream for file %s", quotearg (tmpname));
-+ }
-
-- if (! dry_run && ! skip_rest_of_patch) {
-- int exclusive = *outname_needs_removal ? 0 : O_EXCL;
-- assert (! inerrno);
-- *outname_needs_removal = true;
-- copy_file (inname, outname, 0, exclusive, instat.st_mode, true);
-- sprintf (buf, "%s %s%s", editor_program,
-- verbosity == VERBOSE ? "" : "- ",
-- outname);
-- fflush (stdout);
-- pipefp = popen(buf, binary_transput ? "wb" : "w");
-- if (!pipefp)
-- pfatal ("Can't open pipe to %s", quotearg (buf));
-- }
- for (;;) {
- char ed_command_letter;
- beginning_of_this_line = file_tell (pfp);
-@@ -2414,14 +2421,14 @@
- }
- ed_command_letter = get_ed_command_letter (buf);
- if (ed_command_letter) {
-- if (pipefp)
-- if (! fwrite (buf, sizeof *buf, chars_read, pipefp))
-+ if (tmpfp)
-+ if (! fwrite (buf, sizeof *buf, chars_read, tmpfp))
- write_fatal ();
- if (ed_command_letter != 'd' && ed_command_letter != 's') {
- p_pass_comments_through = true;
- while ((chars_read = get_line ()) != 0) {
-- if (pipefp)
-- if (! fwrite (buf, sizeof *buf, chars_read, pipefp))
-+ if (tmpfp)
-+ if (! fwrite (buf, sizeof *buf, chars_read, tmpfp))
- write_fatal ();
- if (chars_read == 2 && strEQ (buf, ".\n"))
- break;
-@@ -2434,13 +2441,49 @@
- break;
- }
- }
-- if (!pipefp)
-+ if (!tmpfp)
- return;
-- if (fwrite ("w\nq\n", sizeof (char), (size_t) 4, pipefp) == 0
-- || fflush (pipefp) != 0)
-+ if (fwrite ("w\nq\n", sizeof (char), (size_t) 4, tmpfp) == 0
-+ || fflush (tmpfp) != 0)
- write_fatal ();
-- if (pclose (pipefp) != 0)
-- fatal ("%s FAILED", editor_program);
-+
-+ if (lseek (tmpfd, 0, SEEK_SET) == -1)
-+ pfatal ("Can't rewind to the beginning of file %s", quotearg
(tmpname));
-+
-+ if (! dry_run && ! skip_rest_of_patch) {
-+ int exclusive = *outname_needs_removal ? 0 : O_EXCL;
-+ *outname_needs_removal = true;
-+ if (inerrno != ENOENT)
-+ {
-+ *outname_needs_removal = true;
-+ copy_file (inname, outname, 0, exclusive, instat.st_mode, true);
-+ }
-+ sprintf (buf, "%s %s%s", editor_program,
-+ verbosity == VERBOSE ? "" : "- ",
-+ outname);
-+ fflush (stdout);
-+
-+ pid = fork();
-+ if (pid == -1)
-+ pfatal ("Can't fork");
-+ else if (pid == 0)
-+ {
-+ dup2 (tmpfd, 0);
-+ execl ("/bin/sh", "sh", "-c", buf, (char *) 0);
-+ _exit (2);
-+ }
-+ else
-+ {
-+ int wstatus;
-+ if (waitpid (pid, &wstatus, 0) == -1
-+ || ! WIFEXITED (wstatus)
-+ || WEXITSTATUS (wstatus) != 0)
-+ fatal ("%s FAILED", editor_program);
-+ }
-+ }
-+
-+ fclose (tmpfp);
-+ safe_unlink (tmpname);
-
- if (ofp)
- {
diff --git a/disk/partclone/DETAILS b/disk/partclone/DETAILS
index 857a840..b4d0d45 100755
--- a/disk/partclone/DETAILS
+++ b/disk/partclone/DETAILS
@@ -1,6 +1,6 @@
SPELL=partclone
- VERSION=0.3.33
-
SOURCE_HASH=sha512:21b783e50dca290acc70a2afb305f886c9032d3cc04636fa0e678efeac787398a5a2f8e260f9969be51500ee14d005fdf2dd33b9198ad96ef55311a8a9954c62
+ VERSION=0.3.36
+
SOURCE_HASH=sha512:22c5ee876536d9da71a93d238ef18a6b4b26f2b2c98f4c16f2d04f14ecab1d9b7374c92e7da0f7694797123a840a97e80f246eb99b47a38304f753d8313b5d8d
SOURCE=$SPELL-$VERSION
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION

SOURCE_URL[0]=https://github.com/Thomas-Tsai/partclone/archive/refs/tags/$VERSION.tar.gz
diff --git a/disk/partclone/HISTORY b/disk/partclone/HISTORY
index de4212e..c0fcd79 100644
--- a/disk/partclone/HISTORY
+++ b/disk/partclone/HISTORY
@@ -1,3 +1,6 @@
+2025-03-29 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.3.36
+
2024-12-23 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.3.33



  • [[SM-Commit] ] GIT changes to master grimoire by Treeve Jelbert (3649d30a758825de780b3f40f74b246145f5576f), Treeve Jelbert, 03/30/2025

Archive powered by MHonArc 2.6.24.

Top of Page