Skip to content

Commit 910c70a

Browse files
jwslater0823kraj
authored andcommitted
libidn: update to 1.41
Adjust dont-depend-on-help2man patch to apply. Remove unneeded format warnings patch. Cosmetic changes to license files require new checksums. Signed-off-by: Joe Slater <[email protected]> Signed-off-by: Khem Raj <[email protected]>
1 parent 165fae9 commit 910c70a

File tree

3 files changed

+21
-199
lines changed

3 files changed

+21
-199
lines changed

meta-oe/recipes-extended/libidn/libidn/0001-idn-format-security-warnings.patch

Lines changed: 0 additions & 180 deletions
This file was deleted.
Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
11
Upstream-Status: Inappropriate [disable feature]
22

33
Signed-off-by: Marko Lindqvist <[email protected]>
4-
diff -Nurdd libidn-1.26/doc/Makefile.am libidn-1.26/doc/Makefile.am
5-
--- libidn-1.26/doc/Makefile.am 2012-09-18 11:25:45.000000000 +0300
6-
+++ libidn-1.26/doc/Makefile.am 2013-02-08 07:41:24.591431462 +0200
7-
@@ -49,15 +49,9 @@
8-
4+
--- libidn-1.41.orig/doc/Makefile.am
5+
+++ libidn-1.41/doc/Makefile.am
6+
@@ -73,16 +73,9 @@ BUILT_SOURCES = example.txt example2.txt
7+
98
# Man pages.
10-
9+
1110
-dist_man_MANS = idn.1 $(gdoc_MANS)
1211
+dist_man_MANS = $(gdoc_MANS)
1312
MAINTAINERCLEANFILES = $(dist_man_MANS)
14-
15-
-idn.1: $(top_srcdir)/src/idn.c $(top_srcdir)/src/idn.ggo \
16-
- $(top_srcdir)/configure.ac
17-
- $(HELP2MAN) \
13+
14+
-idn.1: $(top_srcdir)/src/idn.c $(top_srcdir)/src/idn.ggo $(top_srcdir)/.version
15+
- $(MAKE) -C ../lib
16+
- $(MAKE) -C ../src
17+
- $(AM_V_GEN)$(HELP2MAN) \
1818
- --name="Internationalized Domain Names command line tool" \
1919
- --output=$@ $(top_builddir)/src/idn$(EXEEXT)
2020
-
2121
# GDOC
22-
23-
GDOC_BIN = $(srcdir)/gdoc
22+
23+
gdoc_TEXINFOS =

meta-oe/recipes-extended/libidn/libidn_1.36.bb renamed to meta-oe/recipes-extended/libidn/libidn_1.41.bb

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,24 +3,26 @@ DESCRIPTION = "Implementation of the Stringprep, Punycode and IDNA specification
33
HOMEPAGE = "http://www.gnu.org/software/libidn/"
44
SECTION = "libs"
55
LICENSE = "(LGPL-2.1-or-later | LGPL-3.0-only) & GPL-3.0-or-later"
6-
LIC_FILES_CHKSUM = "file://COPYING;md5=df4be47940a91ee69556f5f71eed4aec \
6+
LIC_FILES_CHKSUM = "file://COPYING;md5=f95a3dc99fecfa9a0c4e726d4b5d822f \
77
file://COPYING.LESSERv2;md5=4fbd65380cdd255951079008b364516c \
88
file://COPYING.LESSERv3;md5=e6a600fd5e1d9cbde2d983680233ad02 \
99
file://COPYINGv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
10-
file://COPYINGv3;md5=d32239bcb673463ab874e80d47fae504 \
11-
file://lib/idna.h;endline=21;md5=c381d797e2d7fbdace7c147b1285d076 \
12-
file://src/idn.c;endline=20;md5=7d88aa87b0494d690bdf7748fe08d536"
10+
file://COPYINGv3;md5=11cc2d3ee574f9d6b7ee797bdce4d423 \
11+
file://lib/idna.h;endline=21;md5=176de4fe1d98e59d743d3b12a850e4cb \
12+
file://src/idn.c;endline=20;md5=dd17b9093355bf669e2ea108d2defbd0 \
13+
"
14+
1315
DEPENDS = "virtual/libiconv autoconf-archive"
1416

1517
inherit pkgconfig autotools gettext texinfo gtk-doc
1618

1719
SRC_URI = "${GNU_MIRROR}/libidn/${BPN}-${PV}.tar.gz \
1820
file://dont-depend-on-help2man.patch \
19-
file://0001-idn-format-security-warnings.patch \
2021
"
2122

22-
SRC_URI[md5sum] = "813c7b268d1051ca02c3610986126f38"
23-
SRC_URI[sha256sum] = "14b67108344d81ba844631640df77c9071d9fb0659b080326ff5424e86b14038"
23+
#SRC_URI[md5sum] = "813c7b268d1051ca02c3610986126f38"
24+
#SRC_URI[sha256sum] = "14b67108344d81ba844631640df77c9071d9fb0659b080326ff5424e86b14038"
25+
SRC_URI[sha256sum] = "884d706364b81abdd17bee9686d8ff2ae7431c5a14651047c68adf8b31fd8945"
2426

2527
# command tool is under GPLv3+, while libidn itself is under LGPLv2.1+ or LGPLv3
2628
# so package command into a separate package

0 commit comments

Comments
 (0)