Skip to contentSkip to conversation

ed: upgrade 1.18 -> 1.19

PATCH New [email protected] 1 participant 5 messages Jan 15, 2023

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ed: upgrade 1.18 -> 1.19

From: Wang Mingyu <[email protected]>

Changelog:
==========
* main_loop.c (exec_command): Fix commands 'e', 'E'; they did set the 'modified' flag if file not found. (Reported by Harry Graf). (main_loop): Print script error line to stdout instead of stderr.
* Change long name of option '-s' to '--script'. (Suggested by Andrew L. Moore).
* Assign short name '-q' to options '--quiet' and '--silent'.
* main.c (show_strerror) Use '!quiet' to enable diagnostics.
* Do not process file names for backslash escapes. (Suggested by Andrew L. Moore).
* ed.texi: Document 0 as starting point for searches '0;/RE/'. Document how to achieve the effect of ex style '!' filtering.

License-Update: Copyright year updated to 2023.

---
 meta/recipes-extended/ed/{ed_1.18.bb => ed_1.19.bb} | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
 rename meta/recipes-extended/ed/{ed_1.18.bb => ed_1.19.bb} (80%)
meta/recipes-extended/ed/ed_1.19.bb renamed from meta/recipes-extended/ed/ed_1.18.bb +3 -3
similarity index 80%
rename from meta/recipes-extended/ed/ed_1.18.bb
rename to meta/recipes-extended/ed/ed_1.19.bb
index e1548df15f..d01b7486d9 100644
@@ -4,8 +4,8 @@ DESCRIPTION = "GNU ed is a line-oriented text editor. It is used to create, disp
 
 LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=76d6e300ffd8fb9d18bd9b136a9bba13 \
-                    file://ed.h;endline=20;md5=6e6a818b0593f937fc63ba08d5e314bf \
-                    file://main.c;endline=17;md5=8419a08bb12936f32384a0d1c0f9e74c \
+                    file://ed.h;endline=20;md5=504a90a78b045972e2fd2f3fc418c195 \
+                    file://main.c;endline=17;md5=cf9d322b0ac4445ca2299c61ee175365 \
                     "
 
 SECTION = "base"
@@ -19,7 +19,7 @@ bindir = "${base_bindir}"
 SRC_URI = "${GNU_MIRROR}/ed/${BP}.tar.lz"
 UPSTREAM_CHECK_URI = "${GNU_MIRROR}/ed/"
 
-SRC_URI[sha256sum] = "aca8efad9800c587724a20b97aa8fc47e6b5a47df81606feaba831b074462b4f"
+SRC_URI[sha256sum] = "ce2f2e5c424790aa96d09dacb93d9bbfdc0b7eb6249c9cb7538452e8ec77cd48"
 
 EXTRA_OEMAKE = "-e MAKEFLAGS="
 
Signature · 1 line
2.25.1
#1 lore raw

PATCH 1/1 gi-docgen: upgrade 2022.2 -> 2023.1

From: Wang Mingyu <[email protected]>

---
 .../gi-docgen/{gi-docgen_git.bb => gi-docgen_2023.1.bb}        | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
 rename meta/recipes-gnome/gi-docgen/{gi-docgen_git.bb => gi-docgen_2023.1.bb} (93%)
meta/recipes-gnome/gi-docgen/gi-docgen_2023.1.bb renamed from meta/recipes-gnome/gi-docgen/gi-docgen_git.bb +1 -2
similarity index 93%
rename from meta/recipes-gnome/gi-docgen/gi-docgen_git.bb
rename to meta/recipes-gnome/gi-docgen/gi-docgen_2023.1.bb
index fa41f2ccd2..7722ebda8f 100644
@@ -10,8 +10,7 @@ LIC_FILES_CHKSUM = "file://gi-docgen.py;beginline=1;endline=5;md5=2dc0f1f0120247
 
 SRC_URI = "git://gitlab.gnome.org/GNOME/gi-docgen.git;protocol=https;branch=main"
 
-PV = "2022.2"
-SRCREV = "bddd024b08650efdd24704c670f586eb12cec9c9"
+SRCREV = "63b4fad4181e793f34b7777a89e5cb58fe8ac7e6"
 
 S = "${WORKDIR}/git"
 
Signature · 1 line
2.25.1
#2 lore raw

PATCH 1/1 python3-alabaster: upgrade 0.7.12 -> 0.7.13

In reply to [email protected]

From: Wang Mingyu <[email protected]>

Changelog:
https://github.com/bitprophet/alabaster/blob/main/docs/changelog.rst

License-Update: Copyright year updated to 2020.

---
 ...ython3-alabaster_0.7.12.bb => python3-alabaster_0.7.13.bb} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-devtools/python/{python3-alabaster_0.7.12.bb => python3-alabaster_0.7.13.bb} (66%)
meta/recipes-devtools/python/python3-alabaster_0.7.13.bb renamed from meta/recipes-devtools/python/python3-alabaster_0.7.12.bb +2 -2
similarity index 66%
rename from meta/recipes-devtools/python/python3-alabaster_0.7.12.bb
rename to meta/recipes-devtools/python/python3-alabaster_0.7.13.bb
index 3381ce9568..9571137fb6 100644
@@ -2,9 +2,9 @@ DESCRIPTION = "Alabaster is a visually (c)lean, responsive, configurable theme f
 HOMEPAGE = "https://alabaster.readthedocs.io/en/latest/"
 SECTION = "devel/python"
 LICENSE = "BSD-3-Clause"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=da053683d66d543813a727e8a30c96ca"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=21860fdb805bf4e0bfaf94b566b747fa"
 
-SRC_URI[sha256sum] = "a661d72d58e6ea8a57f7a86e37d86716863ee5e92788398526d58b26a4e4dc02"
+SRC_URI[sha256sum] = "a27a4a084d5e690e16e01e03ad2b2e552c61a65469419b907243193de1a84ae2"
 
 inherit setuptools3 pypi
 
Signature · 1 line
2.25.1
#3 lore raw

PATCH 1/1 python3-setuptools: upgrade 65.6.3 -> 65.7.0

In reply to [email protected]

From: Wang Mingyu <[email protected]>

Changelog:
=========
* #3594: Added "htmlcov" to FlatLayoutModuleFinder.DEFAULT_EXCLUDE -- by :user:'demianbrecht'
* #3667: Added a human-readable error description when ".egg-info" directory is not writeable -- by :user:'droodev'
* #3713: Fixed incomplete "getattr" statement that caused problems when accessing
undefined attribute.

---
 ...ython3-setuptools_65.6.3.bb => python3-setuptools_65.7.0.bb} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-devtools/python/{python3-setuptools_65.6.3.bb => python3-setuptools_65.7.0.bb} (95%)
meta/recipes-devtools/python/python3-setuptools_65.7.0.bb renamed from meta/recipes-devtools/python/python3-setuptools_65.6.3.bb +1 -1
similarity index 95%
rename from meta/recipes-devtools/python/python3-setuptools_65.6.3.bb
rename to meta/recipes-devtools/python/python3-setuptools_65.7.0.bb
index a8bcb3a602..789d212281 100644
@@ -11,7 +11,7 @@ SRC_URI:append:class-native = " file://0001-conditionally-do-not-fetch-code-by-e
 SRC_URI += "file://0001-change-shebang-to-python3.patch \
             file://0001-_distutils-sysconfig.py-make-it-possible-to-substite.patch"
 
-SRC_URI[sha256sum] = "a7620757bf984b58deaf32fc8a4577a9bbc0850cf92c20e1ce41c38c19e5fb75"
+SRC_URI[sha256sum] = "4d3c92fac8f1118bb77a22181355e29c239cabfe2b9effdaa665c66b711136d7"
 
 DEPENDS += "${PYTHON_PN}"
 
Signature · 1 line
2.25.1
#4 lore raw

PATCH 1/1 patchelf: upgrade 0.17.0 -> 0.17.2

In reply to [email protected]

From: Wang Mingyu <[email protected]>

8d2cb4f9ab8d564904c292099a022ffb3cccd52d.patch
included in 0.17.2

Changelog:
===========
Also pass STRIP to the tests
Fix Out-of-bounds read in the function modifySoname Split segment size fix

---
 ...b4f9ab8d564904c292099a022ffb3cccd52d.patch | 104 ------------------
 ...{patchelf_0.17.0.bb => patchelf_0.17.2.bb} |   6 +-
 2 files changed, 2 insertions(+), 108 deletions(-)
 delete mode 100644 meta/recipes-devtools/patchelf/patchelf/8d2cb4f9ab8d564904c292099a022ffb3cccd52d.patch
 rename meta/recipes-devtools/patchelf/{patchelf_0.17.0.bb => patchelf_0.17.2.bb} (76%)
meta/recipes-devtools/patchelf/patchelf/8d2cb4f9ab8d564904c292099a022ffb3cccd52d.patch deleted +0 -104
deleted file mode 100644
index 6296f0e44b..0000000000
@@ -1,104 +0,0 @@
-From 8d2cb4f9ab8d564904c292099a022ffb3cccd52d Mon Sep 17 00:00:00 2001
-From: Jason <[email protected]>
-Date: Fri, 2 Dec 2022 10:01:41 -0500
-Subject: [PATCH] Fix bug in file shifting that could cause conflicting PT_LOAD
- segments
-
-When a section in the file needs to be enlarged (e.g. to accommodate
-setting a larger RPATH), shiftFile() is used to shift all content
-following the growing section to a later position in the file.
-
-Commit 109b771f53ee3d37ede8c0f165665605183c0975 introduced logic to
-ensure that, after the segment split, no sections span multiple
-segments. This is done by sliding the portion of the segment after the
-split point later in the file, then adding a new PT_LOAD segment that
-contains the preceding data plus the extra room that is being added. The
-existing implementation does this by simply adding
-`extraPages*getPageSize()` bytes to the number of bytes ahead of the
-split point in the segment.
-
-However, this approach can result in two PT_LOAD segments that overlap
-when page boundaries are taken into account. As an example, this PT_LOAD
-section (taken from a Python 3.10 binary):
-
-LOAD           0x0000000000000000 0x0000000000400000 0x0000000000400000
-               0x0000000000000948 0x0000000000000948  R E    0x200000
-
-is split into the following two sections:
-
-LOAD           0x0000000000000000 0x00000000003ff000 0x00000000003ff000
-               0x0000000000001594 0x0000000000001594  R E    0x1000
-LOAD           0x0000000000001594 0x0000000000400594 0x0000000000400594
-               0x00000000000003b4 0x00000000000003b4  R E    0x1000
-
-Note that the two PT_LOAD sections both contain the memory page at
-address 0x400000. The Linux kernel's ELF loader (at least as of v4.18)
-does not accept this as a valid ELF executable, triggering a segfault
-with si_code=SI_KERNEL immediately when the binary is executed.
-
-The fix here is to set the length of the segment that comes before the
-split point more carefully; instead of adding `extraPages*getPageSize()`
-bytes to the portion of the segment that came before the split, the
-actual number of padding bytes that were needed (before rounding up to
-the next multiple of the page size) are used. This avoids the overlap
-in the PT_LOAD segments and makes the output files executable again.
----
- src/patchelf.cc | 10 ++++++----
- src/patchelf.h  |  2 +-
- 2 files changed, 7 insertions(+), 5 deletions(-)
-
-Upstream-Status: Submitted [https://github.com/NixOS/patchelf/pull/447]
-Signed-off-by: Richard Purdie <[email protected]>
-
-Index: git/src/patchelf.cc
-===================================================================
---- git.orig/src/patchelf.cc
-+++ git/src/patchelf.cc
-@@ -432,7 +432,7 @@ static uint64_t roundUp(uint64_t n, uint
- 
- 
- template<ElfFileParams>
--void ElfFile<ElfFileParamNames>::shiftFile(unsigned int extraPages, size_t startOffset)
-+void ElfFile<ElfFileParamNames>::shiftFile(unsigned int extraPages, size_t startOffset, size_t extraBytes)
- {
-     assert(startOffset >= sizeof(Elf_Ehdr));
- 
-@@ -508,7 +508,7 @@ void ElfFile<ElfFileParamNames>::shiftFi
-     wri(phdr.p_offset, phdrs.at(splitIndex).p_offset - splitShift - shift);
-     wri(phdr.p_paddr, phdrs.at(splitIndex).p_paddr - splitShift - shift);
-     wri(phdr.p_vaddr, phdrs.at(splitIndex).p_vaddr - splitShift - shift);
--    wri(phdr.p_filesz, wri(phdr.p_memsz, splitShift + shift));
-+    wri(phdr.p_filesz, wri(phdr.p_memsz, splitShift + extraBytes));
-     wri(phdr.p_flags, PF_R | PF_W);
-     wri(phdr.p_align, getPageSize());
- }
-@@ -898,12 +898,14 @@ void ElfFile<ElfFileParamNames>::rewrite
-         neededSpace += sizeof(Elf_Phdr);
-         debug("needed space is %d\n", neededSpace);
- 
--        unsigned int neededPages = roundUp(neededSpace - startOffset, getPageSize()) / getPageSize();
-+        /* Calculate how many bytes are needed out of the additional pages. */
-+        size_t extraSpace = neededSpace - startOffset; 
-+        unsigned int neededPages = roundUp(extraSpace, getPageSize()) / getPageSize();
-         debug("needed pages is %d\n", neededPages);
-         if (neededPages * getPageSize() > firstPage)
-             error("virtual address space underrun!");
- 
--        shiftFile(neededPages, startOffset);
-+        shiftFile(neededPages, startOffset, extraSpace);
- 
-         firstPage -= neededPages * getPageSize();
-         startOffset += neededPages * getPageSize();
-Index: git/src/patchelf.h
-===================================================================
---- git.orig/src/patchelf.h
-+++ git/src/patchelf.h
-@@ -77,7 +77,7 @@ private:
- 
-     void sortShdrs();
- 
--    void shiftFile(unsigned int extraPages, size_t sizeOffset);
-+    void shiftFile(unsigned int extraPages, size_t sizeOffset, size_t extraBytes);
- 
-     std::string getSectionName(const Elf_Shdr & shdr) const;
- 
meta/recipes-devtools/patchelf/patchelf_0.17.2.bb renamed from meta/recipes-devtools/patchelf/patchelf_0.17.0.bb +2 -4
similarity index 76%
rename from meta/recipes-devtools/patchelf/patchelf_0.17.0.bb
rename to meta/recipes-devtools/patchelf/patchelf_0.17.2.bb
index b32abc7b87..a9583419e8 100644
@@ -4,10 +4,8 @@ HOMEPAGE = "https://github.com/NixOS/patchelf"
 
 LICENSE = "GPL-3.0-only"
 
-SRC_URI = "git://github.com/NixOS/patchelf;protocol=https;branch=master \
-           file://8d2cb4f9ab8d564904c292099a022ffb3cccd52d.patch \
-           "
-SRCREV = "ad0265668f12eff59027259345fed4b0f315336a"
+SRC_URI = "git://github.com/NixOS/patchelf;protocol=https;branch=master"
+SRCREV = "5908e16cd562bcb1909be4de0409c4912a8afc52"
 
 S = "${WORKDIR}/git"
 
Signature · 1 line
2.25.1