From 2047e497501597f095b7652a3fc0adf2bd4c5bac Mon Sep 17 00:00:00 2001 From: Yi Zhao Date: Sun, 30 Mar 2025 17:27:54 +0800 Subject: [PATCH] libidn: upgrade 1.42 -> 1.43 ChangeLog: https://git.savannah.gnu.org/cgit/libidn.git/tree/NEWS?h=v1.43 License-Update: Move COPYINGv3 to COPYING[1] Updated copyright years for idn.c and idna.h[2] [1] https://git.savannah.gnu.org/cgit/libidn.git/commit/?id=799b11bdbcca9109c812c700e082cebc9295be5c [2] https://git.savannah.gnu.org/cgit/libidn.git/commit/?id=27314c5af11763598ce5b20fc32690a48fe782c5 Signed-off-by: Yi Zhao Signed-off-by: Khem Raj --- .../libidn/libidn/dont-depend-on-help2man.patch | 11 +++++++---- .../libidn/{libidn_1.42.bb => libidn_1.43.bb} | 9 ++++----- 2 files changed, 11 insertions(+), 9 deletions(-) rename meta-oe/recipes-extended/libidn/{libidn_1.42.bb => libidn_1.43.bb} (74%) diff --git a/meta-oe/recipes-extended/libidn/libidn/dont-depend-on-help2man.patch b/meta-oe/recipes-extended/libidn/libidn/dont-depend-on-help2man.patch index bb45c87246..a066b100c3 100644 --- a/meta-oe/recipes-extended/libidn/libidn/dont-depend-on-help2man.patch +++ b/meta-oe/recipes-extended/libidn/libidn/dont-depend-on-help2man.patch @@ -1,4 +1,4 @@ -From e75f27cb1d70052fe2bb6cae5846b68f8ea7fa65 Mon Sep 17 00:00:00 2001 +From 62d8c09422148c56b7b1011a5b3ccd553631e3c5 Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Sun, 29 Sep 2024 18:38:05 +0800 Subject: [PATCH] dont depend on help2man @@ -11,10 +11,10 @@ Signed-off-by: Marko Lindqvist 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/doc/Makefile.am b/doc/Makefile.am -index d63cafa..ba9aab4 100644 +index ff62009..dba833f 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am -@@ -70,16 +70,9 @@ BUILT_SOURCES = example.txt example2.txt example3.txt example4.txt example5.txt +@@ -87,16 +87,9 @@ BUILT_SOURCES = example.txt example2.txt example3.txt example4.txt example5.txt # Man pages. @@ -25,10 +25,13 @@ index d63cafa..ba9aab4 100644 -idn.1: $(top_srcdir)/src/idn.c $(top_srcdir)/src/idn.ggo $(top_srcdir)/.version - $(MAKE) -C ../lib - $(MAKE) -C ../src -- $(AM_V_GEN)$(HELP2MAN) \ +- $(AM_V_GEN)env SOURCE_DATE_EPOCH=0 $(HELP2MAN) \ - --name="Internationalized Domain Names command line tool" \ - --output=$@ $(top_builddir)/src/idn$(EXEEXT) - # GDOC gdoc_TEXINFOS = +-- +2.34.1 + diff --git a/meta-oe/recipes-extended/libidn/libidn_1.42.bb b/meta-oe/recipes-extended/libidn/libidn_1.43.bb similarity index 74% rename from meta-oe/recipes-extended/libidn/libidn_1.42.bb rename to meta-oe/recipes-extended/libidn/libidn_1.43.bb index 453a21f574..7c478a1495 100644 --- a/meta-oe/recipes-extended/libidn/libidn_1.42.bb +++ b/meta-oe/recipes-extended/libidn/libidn_1.43.bb @@ -3,13 +3,12 @@ DESCRIPTION = "Implementation of the Stringprep, Punycode and IDNA specification HOMEPAGE = "http://www.gnu.org/software/libidn/" SECTION = "libs" LICENSE = "(LGPL-2.1-or-later | LGPL-3.0-only) & GPL-3.0-or-later" -LIC_FILES_CHKSUM = "file://COPYING;md5=f95a3dc99fecfa9a0c4e726d4b5d822f \ +LIC_FILES_CHKSUM = "file://COPYING;md5=11cc2d3ee574f9d6b7ee797bdce4d423\ file://COPYING.LESSERv2;md5=4fbd65380cdd255951079008b364516c \ file://COPYING.LESSERv3;md5=e6a600fd5e1d9cbde2d983680233ad02 \ file://COPYINGv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ - file://COPYINGv3;md5=11cc2d3ee574f9d6b7ee797bdce4d423 \ - file://lib/idna.h;endline=28;md5=bff92cd5c90908728225a065d6908289 \ - file://src/idn.c;endline=19;md5=dc51ec9ffae14c4f96fb7db4a3d96b2d \ + file://lib/idna.h;endline=28;md5=82ce5c462ff87f37c7c0d3a92f8d2f6b \ + file://src/idn.c;endline=19;md5=21b4efac8525241da4d38dc1c2e3a461 \ " DEPENDS = "virtual/libiconv autoconf-archive" @@ -20,7 +19,7 @@ SRC_URI = "${GNU_MIRROR}/libidn/${BPN}-${PV}.tar.gz \ file://dont-depend-on-help2man.patch \ " -SRC_URI[sha256sum] = "d6c199dcd806e4fe279360cb4b08349a0d39560ed548ffd1ccadda8cdecb4723" +SRC_URI[sha256sum] = "bdc662c12d041b2539d0e638f3a6e741130cdb33a644ef3496963a443482d164" # command tool is under GPLv3+, while libidn itself is under LGPLv2.1+ or LGPLv3 # so package command into a separate package