Skip to contentSkip to conversation

ed: upgrade 1.17 -> 1.18

PATCH In review Wang Mingyu 2 participants 7 messages Feb 8, 2022 – Feb 10, 2022

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ed: upgrade 1.17 -> 1.18

License-Update:
year updated to 2022.
license changed from GNU3 to GNU2.

Changelog:
=========
* main_loop.c (get_shell_command): Flush stdout after printing cmd.
* signal.c (sighup_handler): Fix a memory leak just before exiting.
* carg_parser.c (ap_init): Likewise.
* io.c (read_file, write_file): Check ptr returned by strip_escapes.
* main_loop.c (get_shell_command, exec_command): Likewise.
* main_loop.c (get_shell_command): Remove backslash from escaped '%'.
* main_loop.c, regex.c: Implement case-insensitive REs.
* regex.c (compile_regex): Don't overwrite previous regex if error.
* main.c: New option '--strip-trailing-cr'.
* buffer.c (push_undo_atom): Fail if stack grows larger than INT_MAX. (too_many_lines): Fail if buffer grows larger than INT_MAX lines.
* global.c (set_active_node): Fail if list grows larger than INT_MAX.
* signal.c (resize_buffer): Fail if a line grows longer than INT_MAX.
* io.c (read_file): Return -2 for fatal errors.
* main_loop.c (main_loop): Set error status if fatal error from main.
* main.c [restricted_]: New message "Directory access restricted".
* ed.texi: New chapter "The 's' Command".
* COPYING: Restored.

---
 meta/recipes-extended/ed/{ed_1.17.bb => ed_1.18.bb} | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
 rename meta/recipes-extended/ed/{ed_1.17.bb => ed_1.18.bb} (74%)
meta/recipes-extended/ed/ed_1.18.bb renamed from meta/recipes-extended/ed/ed_1.17.bb +4 -4
similarity index 74%
rename from meta/recipes-extended/ed/ed_1.17.bb
rename to meta/recipes-extended/ed/ed_1.18.bb
index addf652d52..57e883d342 100644
@@ -3,9 +3,9 @@ HOMEPAGE = "http://www.gnu.org/software/ed/"
 DESCRIPTION = "GNU ed is a line-oriented text editor. It is used to create, display, modify and otherwise manipulate text files, both interactively and via shell scripts. A restricted version of ed, red, can only edit files in the current directory and cannot execute shell commands."
 
 LICENSE = "GPLv3+"
-LIC_FILES_CHKSUM = "file://COPYING;md5=0c7051aef9219dc7237f206c5c4179a7 \
-                    file://ed.h;endline=20;md5=b72aa5eaafef318c6bfc37f858469113 \
-                    file://main.c;endline=17;md5=2c93e24f4db3528a00a24c7df5618e41 \
+LIC_FILES_CHKSUM = "file://COPYING;md5=76d6e300ffd8fb9d18bd9b136a9bba13 \
+                    file://ed.h;endline=20;md5=6e6a818b0593f937fc63ba08d5e314bf \
+                    file://main.c;endline=17;md5=8419a08bb12936f32384a0d1c0f9e74c \
                     "
 
 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] = "71de39883c25b6fab44add80635382a10c9bf154515b94729f4a6529ddcc5e54"
+SRC_URI[sha256sum] = "aca8efad9800c587724a20b97aa8fc47e6b5a47df81606feaba831b074462b4f"
 
 EXTRA_OEMAKE = "-e MAKEFLAGS="
 
Signature · 1 line
2.25.1
#1 lore raw

PATCH 1/1 findutils: upgrade 4.8.0 -> 4.9.0

---
 .../findutils/{findutils_4.8.0.bb => findutils_4.9.0.bb}        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-extended/findutils/{findutils_4.8.0.bb => findutils_4.9.0.bb} (88%)
meta/recipes-extended/findutils/findutils_4.9.0.bb renamed from meta/recipes-extended/findutils/findutils_4.8.0.bb +1 -1
similarity index 88%
rename from meta/recipes-extended/findutils/findutils_4.8.0.bb
rename to meta/recipes-extended/findutils/findutils_4.9.0.bb
index b0e56da159..cd9a1691e3 100644
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=1ebbd3e34237af26da5dc08a4e440464"
 
 DEPENDS = "bison-native"
 
-SRC_URI[sha256sum] = "57127b7e97d91282c6ace556378d5455a9509898297e46e10443016ea1387164"
+SRC_URI[sha256sum] = "a2bfb8c09d436770edc59f50fa483e785b161a3b7b9d547573cb08065fd462fe"
 
 PACKAGECONFIG[selinux] = "--with-selinux,--without-selinux,libselinux"
 # http://savannah.gnu.org/bugs/?27299
Signature · 1 line
2.25.1
#2 lore raw

PATCH 1/1 gdbm: upgrade 1.22 -> 1.23

In reply to Wang Mingyu

refresh ptest.patch

---
 meta/recipes-support/gdbm/files/ptest.patch      | 16 ++++++++++------
 .../gdbm/{gdbm_1.22.bb => gdbm_1.23.bb}          |  2 +-
 2 files changed, 11 insertions(+), 7 deletions(-)
 rename meta/recipes-support/gdbm/{gdbm_1.22.bb => gdbm_1.23.bb} (94%)
meta/recipes-support/gdbm/files/ptest.patch +10 -6
index 187f09655d..25fb6bb2f4 100644
@@ -9,11 +9,11 @@ Upstream-Status: Pending
 
 ---
  Makefile.am       |  5 +++++
- tests/Makefile.am | 11 +++++++++++
- 2 files changed, 16 insertions(+)
+ tests/Makefile.am | 12 ++++++++++++
+ 2 files changed, 17 insertions(+)
 
 diff --git a/Makefile.am b/Makefile.am
-index 25e200d..03d5ef0 100644
+index 59e2643..5f3ceb0 100644
 --- a/Makefile.am
 +++ b/Makefile.am
 @@ -64,3 +64,8 @@ ChangeLog:
@@ -26,13 +26,14 @@ index 25e200d..03d5ef0 100644
 +		$(MAKE) -C $$subdir DESTDIR=$(DESTDIR)/$$subdir $@; \
 +	done
 diff --git a/tests/Makefile.am b/tests/Makefile.am
-index 337cbed..92ec3be 100644
+index fac6826..5dc2091 100644
 --- a/tests/Makefile.am
 +++ b/tests/Makefile.am
-@@ -139,3 +139,14 @@ d_creat_ce_LDADD = ../src/libgdbm.la ../compat/libgdbm_compat.la
+@@ -143,3 +143,15 @@ d_creat_ce_LDADD = ../src/libgdbm.la ../compat/libgdbm_compat.la
+ t_wordwrap_LDADD = ../tools/libgdbmapp.a
  
  SUBDIRS = gdbmtool
- 
++
 +buildtests: $(check_PROGRAMS) $(TESTSUITE)
 +
 +install-ptest: $(check_PROGRAMS) $(TESTSUITE)
@@ -44,3 +45,6 @@ index 337cbed..92ec3be 100644
 +			$(INSTALL_PROGRAM) $$file $(DESTDIR) ; \
 +		fi \
 +	done
+-- 
+2.25.1
+
meta/recipes-support/gdbm/gdbm_1.23.bb renamed from meta/recipes-support/gdbm/gdbm_1.22.bb +1 -1
similarity index 94%
rename from meta/recipes-support/gdbm/gdbm_1.22.bb
rename to meta/recipes-support/gdbm/gdbm_1.23.bb
index 5cb12cd57c..4ec80b5b7e 100644
@@ -13,7 +13,7 @@ SRC_URI = "${GNU_MIRROR}/gdbm/gdbm-${PV}.tar.gz \
            file://ptest.patch \
           "
 
-SRC_URI[sha256sum] = "f366c823a6724af313b6bbe975b2809f9a157e5f6a43612a72949138d161d762"
+SRC_URI[sha256sum] = "74b1081d21fff13ae4bd7c16e5d6e504a4c26f7cde1dca0d963a484174bbcacd"
 
 inherit autotools gettext texinfo lib_package ptest
 
Signature · 1 line
2.25.1
#3 lore raw

PATCH 1/1 harfbuzz: upgrade 3.3.1 -> 3.3.2

In reply to Wang Mingyu

Changelog:
=========
Revert splitting of pair positioning values introduced in 3.3.0 as it proved problematic

---
 .../harfbuzz/{harfbuzz_3.3.1.bb => harfbuzz_3.3.2.bb}           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-graphics/harfbuzz/{harfbuzz_3.3.1.bb => harfbuzz_3.3.2.bb} (95%)
meta/recipes-graphics/harfbuzz/harfbuzz_3.3.2.bb renamed from meta/recipes-graphics/harfbuzz/harfbuzz_3.3.1.bb +1 -1
similarity index 95%
rename from meta/recipes-graphics/harfbuzz/harfbuzz_3.3.1.bb
rename to meta/recipes-graphics/harfbuzz/harfbuzz_3.3.2.bb
index 656b556d29..9eaa14c56f 100644
@@ -12,7 +12,7 @@ UPSTREAM_CHECK_URI = "https://github.com/${BPN}/${BPN}/releases"
 UPSTREAM_CHECK_REGEX = "harfbuzz-(?P<pver>\d+(\.\d+)+).tar"
 
 SRC_URI = "https://github.com/${BPN}/${BPN}/releases/download/${PV}/${BPN}-${PV}.tar.xz"
-SRC_URI[sha256sum] = "8c083384838f39f4a4856a6584def595b10cc071754a08d5e999293462b34296"
+SRC_URI[sha256sum] = "1c13bca136c4f66658059853e2c1253f34c88f4b5c5aba6050aba7b5e0ce2503"
 
 inherit meson pkgconfig lib_package gtk-doc gobject-introspection
 
Signature · 1 line
2.25.1
#4 lore raw
In reply to Wang Mingyu

meta/recipes-extended/ed/ed_1.18.bb HOMEPAGE = "http://www.gnu.org/software/ed/" · line 8

Quoted 10 lines · wangmy

License-Update:
year updated to 2022.
license changed from GNU3 to GNU2.
LICENSE = "GPLv3+"

meta/recipes-extended/ed/ed_1.18.bb renamed from meta/recipes-extended/ed/ed_1.17.bb +3 -3
-LIC_FILES_CHKSUM = "file://COPYING;md5=0c7051aef9219dc7237f206c5c4179a7 \
-                    file://ed.h;endline=20;md5=b72aa5eaafef318c6bfc37f858469113 \
-                    file://main.c;endline=17;md5=2c93e24f4db3528a00a24c7df5618e41 \
+LIC_FILES_CHKSUM = "file://COPYING;md5=76d6e300ffd8fb9d18bd9b136a9bba13 \
+                    file://ed.h;endline=20;md5=6e6a818b0593f937fc63ba08d5e314bf \
+                    file://main.c;endline=17;md5=8419a08bb12936f32384a0d1c0f9e74c \

If the license changed, you need to update the LICENSE field. Also a bit more research would be appreciated: can you find and link the commit where the change occurred?

Alex

#5 lore raw

As you can see the ChangeLog shown below, in version 1.5 the maintainer mistakenly changed the copyright holder from Andrew Moore to the FSF. In versions 1.6 and 1.11 he tried to fix the mistake, but he forgot to restore the original COPYING, which he have done now in 1.18.

Therefore, in addition to changing the LICENSE field from GPLv3 + to GPLv2 , should I add relevant information in the commit?

2010-08-30 Antonio Diaz Diaz <[email protected]>
* Version 1.5 released.
* Change copyright holder from Andrew, Antonio to the FSF. (This change was later discovered to be wrong. See 1.6 and 1.11).

2012-01-01 Antonio Diaz Diaz <[email protected]>

* Version 1.6 released.
* Restore copyright notices of Andrew L. Moore. It seems Andrew granted some permissions but never assigned copyright to the FSF.

2015-03-30 Antonio Diaz Diaz <[email protected]>

* Version 1.11 released.
* Restore original copyright and license notices in the code. I assigned to the FSF the copyright on changes made to the part of ed already copyrighted by the FSF, which seems to be just the manual.

2022-02-04 Antonio Diaz Diaz <[email protected]>
* Version 1.18 released.
* COPYING: Restored. (I forgot to do it in 1.11).

Quoted 32 lines

-----Original Message-----
From: Alexander Kanavin <[email protected]>
Sent: Tuesday, February 8, 2022 6:25 PM
To: Wang, Mingyu/王 鸣瑜 <[email protected]>
Cc: OE-core <[email protected]>
Subject: Re: [OE-core] [PATCH] ed: upgrade 1.17 -> 1.18

Quoted 5 lines · wangmy

License-Update:
year updated to 2022.
license changed from GNU3 to GNU2.
LICENSE = "GPLv3+"
-LIC_FILES_CHKSUM =

"file://COPYING;md5=0c7051aef9219dc7237f206c5c4179a7 \

Quoted 1 line

-

file://ed.h;endline=20;md5=b72aa5eaafef318c6bfc37f858469113 \

Quoted 1 line

-

file://main.c;endline=17;md5=2c93e24f4db3528a00a24c7df5618e41 \

Quoted 1 line

+LIC_FILES_CHKSUM =

"file://COPYING;md5=76d6e300ffd8fb9d18bd9b136a9bba13 \

Quoted 1 line

+

file://ed.h;endline=20;md5=6e6a818b0593f937fc63ba08d5e314bf \

Review

Quoted 2 lines
(quoted diff) +2 -0
+
+file://main.c;endline=17;md5=8419a08bb12936f32384a0d1c0f9e74c \

If the license changed, you need to update the LICENSE field. Also a bit more research would be appreciated: can you find and link the commit where the change occurred?

Alex

#6 lore raw

Thanks for the research. Yes, please do add this to commit and resend.

Alex

Quoted 59 lines · On Thu, 10 Feb 2022 at 02:07, [email protected] <[email protected]> wrote:

As you can see the ChangeLog shown below, in version 1.5 the maintainer mistakenly changed the copyright holder from Andrew Moore to the FSF. In versions 1.6 and 1.11 he tried to fix the mistake, but he forgot to restore the original COPYING, which he have done now in 1.18.

Therefore, in addition to changing the LICENSE field from GPLv3 + to GPLv2 , should I add relevant information in the commit?

2010-08-30 Antonio Diaz Diaz <[email protected]>
* Version 1.5 released.
* Change copyright holder from Andrew, Antonio to the FSF. (This change was later discovered to be wrong. See 1.6 and 1.11).

2012-01-01 Antonio Diaz Diaz <[email protected]>

* Version 1.6 released.
* Restore copyright notices of Andrew L. Moore. It seems Andrew granted some permissions but never assigned copyright to the FSF.

2015-03-30 Antonio Diaz Diaz <[email protected]>

* Version 1.11 released.
* Restore original copyright and license notices in the code. I assigned to the FSF the copyright on changes made to the part of ed already copyrighted by the FSF, which seems to be just the manual.

2022-02-04 Antonio Diaz Diaz <[email protected]>
* Version 1.18 released.
* COPYING: Restored. (I forgot to do it in 1.11).

Quoted 32 lines

-----Original Message-----
From: Alexander Kanavin <[email protected]>
Sent: Tuesday, February 8, 2022 6:25 PM
To: Wang, Mingyu/王 鸣瑜 <[email protected]>
Cc: OE-core <[email protected]>
Subject: Re: [OE-core] [PATCH] ed: upgrade 1.17 -> 1.18

Quoted 5 lines · wangmy

License-Update:
year updated to 2022.
license changed from GNU3 to GNU2.
LICENSE = "GPLv3+"
-LIC_FILES_CHKSUM =

"file://COPYING;md5=0c7051aef9219dc7237f206c5c4179a7 \

Quoted 1 line

-

file://ed.h;endline=20;md5=b72aa5eaafef318c6bfc37f858469113 \

Quoted 1 line

-

file://main.c;endline=17;md5=2c93e24f4db3528a00a24c7df5618e41 \

Quoted 1 line

+LIC_FILES_CHKSUM =

"file://COPYING;md5=76d6e300ffd8fb9d18bd9b136a9bba13 \

Quoted 1 line

+

file://ed.h;endline=20;md5=6e6a818b0593f937fc63ba08d5e314bf \

Review

Quoted 2 lines
(quoted diff) +2 -0
+
+file://main.c;endline=17;md5=8419a08bb12936f32384a0d1c0f9e74c \

If the license changed, you need to update the LICENSE field. Also a bit more research would be appreciated: can you find and link the commit where the change occurred?

Alex