summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdrian Bunk <bunk@stusta.de>2020-02-24 06:10:25 +0200
committerKhem Raj <raj.khem@gmail.com>2020-02-23 22:31:35 -0800
commit7d06fdd77171c12a0f66b973eb2c3fcae14afa7d (patch)
treef7ed4723dd247155f0f3ca86a92cfe2229d4706f
parent6820d9eceae2907ec12073abd0dee7c4daa29cc7 (diff)
downloadmeta-openembedded-7d06fdd77171c12a0f66b973eb2c3fcae14afa7d.tar.gz
libidn: Moved from OE-core
Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat
-rw-r--r--meta-oe/recipes-extended/libidn/libidn/0001-idn-format-security-warnings.patch181
-rw-r--r--meta-oe/recipes-extended/libidn/libidn/avoid_AM_PROG_MKDIR_P_warning_error_with_automake_1.12.patch34
-rw-r--r--meta-oe/recipes-extended/libidn/libidn/dont-depend-on-help2man.patch23
-rw-r--r--meta-oe/recipes-extended/libidn/libidn/libidn_fix_for_automake-1.12.patch35
-rw-r--r--meta-oe/recipes-extended/libidn/libidn_1.35.bb42
5 files changed, 315 insertions, 0 deletions
diff --git a/meta-oe/recipes-extended/libidn/libidn/0001-idn-format-security-warnings.patch b/meta-oe/recipes-extended/libidn/libidn/0001-idn-format-security-warnings.patch
new file mode 100644
index 0000000000..5adc7d9fd9
--- /dev/null
+++ b/meta-oe/recipes-extended/libidn/libidn/0001-idn-format-security-warnings.patch
@@ -0,0 +1,181 @@
1From 82f98dcbc429bbe89a9837c533cbcbc02e77c790 Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <adraszik@tycoint.com>
3Date: Tue, 28 Jun 2016 12:43:31 +0100
4Subject: [PATCH] idn: fix printf() format security warnings
5MIME-Version: 1.0
6Content-Type: text/plain; charset=UTF-8
7Content-Transfer-Encoding: 8bit
8
9| ../../libidn-1.32/src/idn.c: In function 'main':
10| ../../libidn-1.32/src/idn.c:172:7: error: format not a string literal and no format arguments [-Werror=format-security]
11| error (0, 0, _("only one of -s, -e, -d, -a, -u or -n can be specified"));
12| ^~~~~
13| ../../libidn-1.32/src/idn.c:187:5: error: format not a string literal and no format arguments [-Werror=format-security]
14| fprintf (stderr, _("Type each input string on a line by itself, "
15| ^~~~~~~
16| ../../libidn-1.32/src/idn.c:202:4: error: format not a string literal and no format arguments [-Werror=format-security]
17| error (EXIT_FAILURE, errno, _("input error"));
18| ^~~~~
19| ../../libidn-1.32/src/idn.c:220:8: error: format not a string literal and no format arguments [-Werror=format-security]
20| _("could not convert from UTF-8 to UCS-4"));
21| ^
22| ../../libidn-1.32/src/idn.c:245:8: error: format not a string literal and no format arguments [-Werror=format-security]
23| _("could not convert from UTF-8 to UCS-4"));
24| ^
25| ../../libidn-1.32/src/idn.c:281:6: error: format not a string literal and no format arguments [-Werror=format-security]
26| _("could not convert from UTF-8 to UCS-4"));
27| ^
28| ../../libidn-1.32/src/idn.c:340:6: error: format not a string literal and no format arguments [-Werror=format-security]
29| _("could not convert from UCS-4 to UTF-8"));
30| ^
31| ../../libidn-1.32/src/idn.c:364:6: error: format not a string literal and no format arguments [-Werror=format-security]
32| _("could not convert from UCS-4 to UTF-8"));
33| ^
34| ../../libidn-1.32/src/idn.c:442:8: error: format not a string literal and no format arguments [-Werror=format-security]
35| _("could not convert from UCS-4 to UTF-8"));
36| ^
37| ../../libidn-1.32/src/idn.c:498:6: error: format not a string literal and no format arguments [-Werror=format-security]
38| _("could not convert from UTF-8 to UCS-4"));
39| ^
40| ../../libidn-1.32/src/idn.c:527:5: error: format not a string literal and no format arguments [-Werror=format-security]
41| _("could not convert from UTF-8 to UCS-4"));
42| ^
43| ../../libidn-1.32/src/idn.c:540:6: error: format not a string literal and no format arguments [-Werror=format-security]
44| error (EXIT_FAILURE, 0, _("could not do NFKC normalization"));
45| ^~~~~
46| ../../libidn-1.32/src/idn.c:551:5: error: format not a string literal and no format arguments [-Werror=format-security]
47| _("could not convert from UTF-8 to UCS-4"));
48| ^
49
50Signed-off-by: André Draszik <adraszik@tycoint.com>
51---
52Upstream-Status: Pending
53
54 src/idn.c | 27 ++++++++++++++-------------
55 1 file changed, 14 insertions(+), 13 deletions(-)
56
57diff --git a/src/idn.c b/src/idn.c
58index be1c7d1..68e4291 100644
59--- a/src/idn.c
60+++ b/src/idn.c
61@@ -170,7 +170,7 @@ main (int argc, char *argv[])
62 (args_info.idna_to_unicode_given ? 1 : 0) +
63 (args_info.nfkc_given ? 1 : 0) != 1)
64 {
65- error (0, 0, _("only one of -s, -e, -d, -a, -u or -n can be specified"));
66+ error (0, 0, "%s", _("only one of -s, -e, -d, -a, -u or -n can be specified"));
67 usage (EXIT_FAILURE);
68 }
69
70@@ -185,7 +185,7 @@ main (int argc, char *argv[])
71 if (!args_info.quiet_given
72 && args_info.inputs_num == 0
73 && isatty (fileno (stdin)))
74- fprintf (stderr, _("Type each input string on a line by itself, "
75+ fprintf (stderr, "%s", _("Type each input string on a line by itself, "
76 "terminated by a newline character.\n"));
77
78 do
79@@ -197,7 +197,7 @@ main (int argc, char *argv[])
80 if (feof (stdin))
81 break;
82
83- error (EXIT_FAILURE, errno, _("input error"));
84+ error (EXIT_FAILURE, errno, "%s", _("input error"));
85 }
86
87 if (strlen (line) > 0)
88@@ -215,7 +215,7 @@ main (int argc, char *argv[])
89 if (!q)
90 {
91 free (p);
92- error (EXIT_FAILURE, 0,
93+ error (EXIT_FAILURE, 0, "%s",
94 _("could not convert from UTF-8 to UCS-4"));
95 }
96
97@@ -240,7 +240,7 @@ main (int argc, char *argv[])
98 if (!q)
99 {
100 free (r);
101- error (EXIT_FAILURE, 0,
102+ error (EXIT_FAILURE, 0, "%s",
103 _("could not convert from UTF-8 to UCS-4"));
104 }
105
106@@ -277,7 +277,7 @@ main (int argc, char *argv[])
107 q = stringprep_utf8_to_ucs4 (p, -1, &len);
108 free (p);
109 if (!q)
110- error (EXIT_FAILURE, 0,
111+ error (EXIT_FAILURE, 0, "%s",
112 _("could not convert from UTF-8 to UCS-4"));
113
114 if (args_info.debug_given)
115@@ -336,7 +336,7 @@ main (int argc, char *argv[])
116 r = stringprep_ucs4_to_utf8 (q, -1, NULL, NULL);
117 free (q);
118 if (!r)
119- error (EXIT_FAILURE, 0,
120+ error (EXIT_FAILURE, 0, "%s",
121 _("could not convert from UCS-4 to UTF-8"));
122
123 p = stringprep_utf8_to_locale (r);
124@@ -360,7 +360,7 @@ main (int argc, char *argv[])
125 q = stringprep_utf8_to_ucs4 (p, -1, NULL);
126 free (p);
127 if (!q)
128- error (EXIT_FAILURE, 0,
129+ error (EXIT_FAILURE, 0, "%s",
130 _("could not convert from UCS-4 to UTF-8"));
131
132 if (args_info.debug_given)
133@@ -438,7 +438,7 @@ main (int argc, char *argv[])
134 if (!q)
135 {
136 free (p);
137- error (EXIT_FAILURE, 0,
138+ error (EXIT_FAILURE, 0, "%s",
139 _("could not convert from UCS-4 to UTF-8"));
140 }
141
142@@ -494,7 +494,7 @@ main (int argc, char *argv[])
143 r = stringprep_ucs4_to_utf8 (q, -1, NULL, NULL);
144 free (q);
145 if (!r)
146- error (EXIT_FAILURE, 0,
147+ error (EXIT_FAILURE, 0, "%s",
148 _("could not convert from UTF-8 to UCS-4"));
149
150 p = stringprep_utf8_to_locale (r);
151@@ -523,7 +523,7 @@ main (int argc, char *argv[])
152 if (!q)
153 {
154 free (p);
155- error (EXIT_FAILURE, 0,
156+ error (EXIT_FAILURE, 0, "%s",
157 _("could not convert from UTF-8 to UCS-4"));
158 }
159
160@@ -537,7 +537,8 @@ main (int argc, char *argv[])
161 r = stringprep_utf8_nfkc_normalize (p, -1);
162 free (p);
163 if (!r)
164- error (EXIT_FAILURE, 0, _("could not do NFKC normalization"));
165+ error (EXIT_FAILURE, 0, "%s",
166+ _("could not do NFKC normalization"));
167
168 if (args_info.debug_given)
169 {
170@@ -547,7 +548,7 @@ main (int argc, char *argv[])
171 if (!q)
172 {
173 free (r);
174- error (EXIT_FAILURE, 0,
175+ error (EXIT_FAILURE, 0, "%s",
176 _("could not convert from UTF-8 to UCS-4"));
177 }
178
179--
1802.8.1
181
diff --git a/meta-oe/recipes-extended/libidn/libidn/avoid_AM_PROG_MKDIR_P_warning_error_with_automake_1.12.patch b/meta-oe/recipes-extended/libidn/libidn/avoid_AM_PROG_MKDIR_P_warning_error_with_automake_1.12.patch
new file mode 100644
index 0000000000..43bd232944
--- /dev/null
+++ b/meta-oe/recipes-extended/libidn/libidn/avoid_AM_PROG_MKDIR_P_warning_error_with_automake_1.12.patch
@@ -0,0 +1,34 @@
1From cdd9e2e960eeb4eda7b08f0113d0cd03524c1d45 Mon Sep 17 00:00:00 2001
2From: Nitin A Kamble <nitin.a.kamble@intel.com>
3Date: Tue, 10 Jul 2012 02:44:30 -0700
4Subject: [PATCH] libidn: fix build with automake 1.12
5
6Upstream-Status: Inappropriate
7
8automake 1.12.x has deprecated AM_PROG_MKDIR_P , and throws a warning for that,
9and the warnings are treated as errors because of the -Werror parameter.
10
11These AM_PROG_MKDIR_P are coming from gettext, and the latest gettext code has not
12eliminated these deprecated macros yet. So disable the treatment of warnings
13as errors until gettext is updated to remove the deprecated macros.
14
15Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
162012/07/10
17
18---
19 configure.ac | 2 +-
20 1 file changed, 1 insertion(+), 1 deletion(-)
21
22diff --git a/configure.ac b/configure.ac
23index 261dad2..c4f935e 100644
24--- a/configure.ac
25+++ b/configure.ac
26@@ -22,7 +22,7 @@ AC_INIT([GNU Libidn], [1.34], [bug-libidn@gnu.org])
27 AC_CONFIG_AUX_DIR([build-aux])
28 AC_CONFIG_MACRO_DIR([m4])
29 AC_CONFIG_HEADERS(config.h)
30-AM_INIT_AUTOMAKE([1.10 -Wall -Werror -Wno-override])
31+AM_INIT_AUTOMAKE([1.10 -Wall -Wno-override])
32 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
33
34 # Library code modified: REVISION++
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
new file mode 100644
index 0000000000..0863530f29
--- /dev/null
+++ b/meta-oe/recipes-extended/libidn/libidn/dont-depend-on-help2man.patch
@@ -0,0 +1,23 @@
1Upstream-Status: Inappropriate [disable feature]
2
3Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
4diff -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
9 # Man pages.
10
11-dist_man_MANS = idn.1 $(gdoc_MANS)
12+dist_man_MANS = $(gdoc_MANS)
13 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) \
18- --name="Internationalized Domain Names command line tool" \
19- --output=$@ $(top_builddir)/src/idn$(EXEEXT)
20-
21 # GDOC
22
23 GDOC_BIN = $(srcdir)/gdoc
diff --git a/meta-oe/recipes-extended/libidn/libidn/libidn_fix_for_automake-1.12.patch b/meta-oe/recipes-extended/libidn/libidn/libidn_fix_for_automake-1.12.patch
new file mode 100644
index 0000000000..3c0559e34f
--- /dev/null
+++ b/meta-oe/recipes-extended/libidn/libidn/libidn_fix_for_automake-1.12.patch
@@ -0,0 +1,35 @@
1From d4f64b78419139eda3c0e1c6ee116bb5f70ea67c Mon Sep 17 00:00:00 2001
2From: Nitin A Kamble <nitin.a.kamble@intel.com>
3Date: Wed, 2 May 2012 18:05:19 -0700
4Subject: [PATCH] libtasn1: fix build with automake 1.12
5
6Upstream-Status: Pending
7
8This patch fixes following issue with automake 1.12
9
10| automake: warnings are treated as errors
11| /srv/home/nitin/builds/build-gcc47/tmp/sysroots/x86_64-linux/usr/share/automake-1.12/am/ltlibrary.am: warning: 'libidn.la': linking libtool libraries using a non-POSIX
12| /srv/home/nitin/builds/build-gcc47/tmp/sysroots/x86_64-linux/usr/share/automake-1.12/am/ltlibrary.am: archiver requires 'AM_PROG_AR' in 'configure.ac'
13
14Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
152012/05/03
16
17---
18 configure.ac | 4 ++++
19 1 file changed, 4 insertions(+)
20
21diff --git a/configure.ac b/configure.ac
22index 8297649..7b9626e 100644
23--- a/configure.ac
24+++ b/configure.ac
25@@ -33,6 +33,10 @@ AC_SUBST(LT_CURRENT, 18)
26 AC_SUBST(LT_REVISION, 0)
27 AC_SUBST(LT_AGE, 6)
28
29+# automake 1.12 seems to require this, but automake 1.11 doesn't recognize it
30+m4_pattern_allow([AM_PROG_AR])
31+AM_PROG_AR
32+
33 AC_PROG_CC
34 gl_EARLY
35 lgl_EARLY
diff --git a/meta-oe/recipes-extended/libidn/libidn_1.35.bb b/meta-oe/recipes-extended/libidn/libidn_1.35.bb
new file mode 100644
index 0000000000..d5ce5b46bd
--- /dev/null
+++ b/meta-oe/recipes-extended/libidn/libidn_1.35.bb
@@ -0,0 +1,42 @@
1SUMMARY = "Internationalized Domain Name support library"
2DESCRIPTION = "Implementation of the Stringprep, Punycode and IDNA specifications defined by the IETF Internationalized Domain Names (IDN) working group."
3HOMEPAGE = "http://www.gnu.org/software/libidn/"
4SECTION = "libs"
5LICENSE = "(LGPLv2.1+ | LGPLv3) & GPLv3+"
6LIC_FILES_CHKSUM = "file://COPYING;md5=df4be47940a91ee69556f5f71eed4aec \
7 file://COPYING.LESSERv2;md5=4fbd65380cdd255951079008b364516c \
8 file://COPYING.LESSERv3;md5=e6a600fd5e1d9cbde2d983680233ad02 \
9 file://COPYINGv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
10 file://COPYINGv3;md5=d32239bcb673463ab874e80d47fae504 \
11 file://lib/idna.h;endline=21;md5=37cffad24807f446a24de3e7371f20b9 \
12 file://src/idn.c;endline=20;md5=09e97034a8877b3451cb65065fc2c06e"
13DEPENDS = "virtual/libiconv autoconf-archive"
14
15inherit pkgconfig autotools gettext texinfo gtk-doc
16
17SRC_URI = "${GNU_MIRROR}/libidn/${BPN}-${PV}.tar.gz \
18 file://libidn_fix_for_automake-1.12.patch \
19 file://avoid_AM_PROG_MKDIR_P_warning_error_with_automake_1.12.patch \
20 file://dont-depend-on-help2man.patch \
21 file://0001-idn-format-security-warnings.patch \
22 "
23
24SRC_URI[md5sum] = "bef634141fe39326cb354b75e891fead"
25SRC_URI[sha256sum] = "f11af1005b46b7b15d057d7f107315a1ad46935c7fcdf243c16e46ec14f0fe1e"
26
27# command tool is under GPLv3+, while libidn itself is under LGPLv2.1+ or LGPLv3
28# so package command into a separate package
29PACKAGES =+ "idn"
30FILES_idn = "${bindir}/*"
31
32LICENSE_${PN} = "LGPLv2.1+ | LGPLv3"
33LICENSE_idn = "GPLv3+"
34
35EXTRA_OECONF = "--disable-csharp"
36
37do_install_append() {
38 rm -rf ${D}${datadir}/emacs
39}
40
41BBCLASSEXTEND = "native nativesdk"
42
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2026-07-15 23:53:28 +0000