helium-3rd-party/meta-openembedded
1
0
Fork 0
mirror of git://git.openembedded.org/meta-openembedded synced 2026-09-29 20:23:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

libidn: upgrade 1.35 -> 1.36

Browse Source 
-License-Update: Copyright year updated to 2020.

Refresh the following patch:
0001-idn-format-security-warnings.patch

Signed-off-by: Zang Ruochen <zangrc.fnst@cn.fujitsu.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Zang Ruochen 2020-08-27 21:17:04 +08:00 committed by Khem Raj
parent 8340965ac6
commit 33a1714050
2 changed files with 26 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,6 +1,3 @@
From 82f98dcbc429bbe89a9837c533cbcbc02e77c790 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <adraszik@tycoint.com>
Date: Tue, 28 Jun 2016 12:43:31 +0100
Subject: [PATCH] idn: fix printf() format security warnings Subject: [PATCH] idn: fix printf() format security warnings
MIME-Version: 1.0 MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8 Content-Type: text/plain; charset=UTF-8
@ -48,35 +45,37 @@ Content-Transfer-Encoding: 8bit
| ^ | ^
Signed-off-by: André Draszik <adraszik@tycoint.com> Signed-off-by: André Draszik <adraszik@tycoint.com>
--- Signed-off-by: Zang Ruochen <zangrc.fnst@cn.fujitsu.com>
Upstream-Status: Pending Upstream-Status: Pending
---
src/idn.c | 27 ++++++++++++++------------- src/idn.c | 27 ++++++++++++++-------------
1 file changed, 14 insertions(+), 13 deletions(-) 1 file changed, 14 insertions(+), 13 deletions(-)
diff --git a/src/idn.c b/src/idn.c diff --git a/src/idn.c b/src/idn.c
index be1c7d1..68e4291 100644 index f2fee11..c6e5caa 100644
--- a/src/idn.c --- a/src/idn.c
+++ b/src/idn.c +++ b/src/idn.c
@@ -170,7 +170,7 @@ main (int argc, char *argv[]) @@ -169,7 +169,7 @@ main (int argc, char *argv[])
(args_info.idna_to_unicode_given ? 1 : 0) + (args_info.idna_to_unicode_given ? 1 : 0) +
(args_info.nfkc_given ? 1 : 0) != 1) (args_info.nfkc_given ? 1 : 0) != 1)
{ {
- error (0, 0, _("only one of -s, -e, -d, -a, -u or -n can be specified")); - error (0, 0,
+ error (0, 0, "%s", _("only one of -s, -e, -d, -a, -u or -n can be specified")); + error (0, 0, "%s",
_("only one of -s, -e, -d, -a, -u or -n can be specified"));
usage (EXIT_FAILURE); usage (EXIT_FAILURE);
} }
@@ -183,7 +183,7 @@ main (int argc, char *argv[])
@@ -185,7 +185,7 @@ main (int argc, char *argv[])
if (!args_info.quiet_given if (!args_info.quiet_given
&& args_info.inputs_num == 0 && args_info.inputs_num == 0 && isatty (fileno (stdin)))
&& isatty (fileno (stdin)))
- fprintf (stderr, _("Type each input string on a line by itself, " - fprintf (stderr, _("Type each input string on a line by itself, "
+ fprintf (stderr, "%s", _("Type each input string on a line by itself, " + fprintf (stderr, "%s", _("Type each input string on a line by itself, "
"terminated by a newline character.\n")); "terminated by a newline character.\n"));
do do
@@ -197,7 +197,7 @@ main (int argc, char *argv[]) @@ -195,7 +195,7 @@ main (int argc, char *argv[])
if (feof (stdin)) if (feof (stdin))
break; break;
@ -85,7 +84,7 @@ index be1c7d1..68e4291 100644
} }
if (strlen (line) > 0) if (strlen (line) > 0)
@@ -215,7 +215,7 @@ main (int argc, char *argv[]) @@ -213,7 +213,7 @@ main (int argc, char *argv[])
if (!q) if (!q)
{ {
free (p); free (p);
@ -94,7 +93,7 @@ index be1c7d1..68e4291 100644
_("could not convert from UTF-8 to UCS-4")); _("could not convert from UTF-8 to UCS-4"));
} }
@@ -240,7 +240,7 @@ main (int argc, char *argv[]) @@ -238,7 +238,7 @@ main (int argc, char *argv[])
if (!q) if (!q)
{ {
free (r); free (r);
@ -103,7 +102,7 @@ index be1c7d1..68e4291 100644
_("could not convert from UTF-8 to UCS-4")); _("could not convert from UTF-8 to UCS-4"));
} }
@@ -277,7 +277,7 @@ main (int argc, char *argv[]) @@ -275,7 +275,7 @@ main (int argc, char *argv[])
q = stringprep_utf8_to_ucs4 (p, -1, &len); q = stringprep_utf8_to_ucs4 (p, -1, &len);
free (p); free (p);
if (!q) if (!q)
@ -112,7 +111,7 @@ index be1c7d1..68e4291 100644
_("could not convert from UTF-8 to UCS-4")); _("could not convert from UTF-8 to UCS-4"));
if (args_info.debug_given) if (args_info.debug_given)
@@ -336,7 +336,7 @@ main (int argc, char *argv[]) @@ -334,7 +334,7 @@ main (int argc, char *argv[])
r = stringprep_ucs4_to_utf8 (q, -1, NULL, NULL); r = stringprep_ucs4_to_utf8 (q, -1, NULL, NULL);
free (q); free (q);
if (!r) if (!r)
@ -121,7 +120,7 @@ index be1c7d1..68e4291 100644
_("could not convert from UCS-4 to UTF-8")); _("could not convert from UCS-4 to UTF-8"));
p = stringprep_utf8_to_locale (r); p = stringprep_utf8_to_locale (r);
@@ -360,7 +360,7 @@ main (int argc, char *argv[]) @@ -358,7 +358,7 @@ main (int argc, char *argv[])
q = stringprep_utf8_to_ucs4 (p, -1, NULL); q = stringprep_utf8_to_ucs4 (p, -1, NULL);
free (p); free (p);
if (!q) if (!q)
@ -130,7 +129,7 @@ index be1c7d1..68e4291 100644
_("could not convert from UCS-4 to UTF-8")); _("could not convert from UCS-4 to UTF-8"));
if (args_info.debug_given) if (args_info.debug_given)
@@ -438,7 +438,7 @@ main (int argc, char *argv[]) @@ -436,7 +436,7 @@ main (int argc, char *argv[])
if (!q) if (!q)
{ {
free (p); free (p);
@ -139,7 +138,7 @@ index be1c7d1..68e4291 100644
_("could not convert from UCS-4 to UTF-8")); _("could not convert from UCS-4 to UTF-8"));
} }
@@ -494,7 +494,7 @@ main (int argc, char *argv[]) @@ -492,7 +492,7 @@ main (int argc, char *argv[])
r = stringprep_ucs4_to_utf8 (q, -1, NULL, NULL); r = stringprep_ucs4_to_utf8 (q, -1, NULL, NULL);
free (q); free (q);
if (!r) if (!r)
@ -148,7 +147,7 @@ index be1c7d1..68e4291 100644
_("could not convert from UTF-8 to UCS-4")); _("could not convert from UTF-8 to UCS-4"));
p = stringprep_utf8_to_locale (r); p = stringprep_utf8_to_locale (r);
@@ -523,7 +523,7 @@ main (int argc, char *argv[]) @@ -521,7 +521,7 @@ main (int argc, char *argv[])
if (!q) if (!q)
{ {
free (p); free (p);
@ -157,7 +156,7 @@ index be1c7d1..68e4291 100644
_("could not convert from UTF-8 to UCS-4")); _("could not convert from UTF-8 to UCS-4"));
} }
@@ -537,7 +537,8 @@ main (int argc, char *argv[]) @@ -535,7 +535,8 @@ main (int argc, char *argv[])
r = stringprep_utf8_nfkc_normalize (p, -1); r = stringprep_utf8_nfkc_normalize (p, -1);
free (p); free (p);
if (!r) if (!r)
@ -167,7 +166,7 @@ index be1c7d1..68e4291 100644
if (args_info.debug_given) if (args_info.debug_given)
{ {
@@ -547,7 +548,7 @@ main (int argc, char *argv[]) @@ -545,7 +546,7 @@ main (int argc, char *argv[])
if (!q) if (!q)
{ {
free (r); free (r);
@ -177,5 +176,5 @@ index be1c7d1..68e4291 100644
} }
-- --
2.8.1 2.25.1

8
meta-oe/recipes-extended/libidn/libidn_1.35.bb → meta-oe/recipes-extended/libidn/libidn_1.36.bb
View File

@ -8,8 +8,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=df4be47940a91ee69556f5f71eed4aec \
file://COPYING.LESSERv3;md5=e6a600fd5e1d9cbde2d983680233ad02 \ file://COPYING.LESSERv3;md5=e6a600fd5e1d9cbde2d983680233ad02 \
file://COPYINGv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ file://COPYINGv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
file://COPYINGv3;md5=d32239bcb673463ab874e80d47fae504 \ file://COPYINGv3;md5=d32239bcb673463ab874e80d47fae504 \
file://lib/idna.h;endline=21;md5=37cffad24807f446a24de3e7371f20b9 \ file://lib/idna.h;endline=21;md5=c381d797e2d7fbdace7c147b1285d076 \
file://src/idn.c;endline=20;md5=09e97034a8877b3451cb65065fc2c06e" file://src/idn.c;endline=20;md5=7d88aa87b0494d690bdf7748fe08d536"
DEPENDS = "virtual/libiconv autoconf-archive" DEPENDS = "virtual/libiconv autoconf-archive"
inherit pkgconfig autotools gettext texinfo gtk-doc inherit pkgconfig autotools gettext texinfo gtk-doc
@ -19,8 +19,8 @@ SRC_URI = "${GNU_MIRROR}/libidn/${BPN}-${PV}.tar.gz \
file://0001-idn-format-security-warnings.patch \ file://0001-idn-format-security-warnings.patch \
" "
SRC_URI[md5sum] = "bef634141fe39326cb354b75e891fead" SRC_URI[md5sum] = "813c7b268d1051ca02c3610986126f38"
SRC_URI[sha256sum] = "f11af1005b46b7b15d057d7f107315a1ad46935c7fcdf243c16e46ec14f0fe1e" SRC_URI[sha256sum] = "14b67108344d81ba844631640df77c9071d9fb0659b080326ff5424e86b14038"
# command tool is under GPLv3+, while libidn itself is under LGPLv2.1+ or LGPLv3 # command tool is under GPLv3+, while libidn itself is under LGPLv2.1+ or LGPLv3
# so package command into a separate package # so package command into a separate package