Skip to contentSkip to conversation

man-pages: correct the SRC_URI

PATCH In review Alexander Kanavin 5 participants 35 messages Nov 20, 2019 – Nov 27, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/11 man-pages: correct the SRC_URI

The homepage: https://www.kernel.org/doc/man-pages/download.html
specifies that the latest tarballs are published one level up from where we currently take them.

---
 meta/recipes-extended/man-pages/man-pages_5.01.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-extended/man-pages/man-pages_5.01.bb +1 -1
index 28525f4ba7e..ea1249e4396 100644
@@ -5,7 +5,7 @@ HOMEPAGE = "http://www.kernel.org/pub/linux/docs/man-pages"
 LICENSE = "GPLv2+"
 
 LIC_FILES_CHKSUM = "file://README;md5=794f701617cc03fe50c53257660d8ec4"
-SRC_URI = "${KERNELORG_MIRROR}/linux/docs/${BPN}/Archive/${BP}.tar.gz"
+SRC_URI = "${KERNELORG_MIRROR}/linux/docs/${BPN}/${BP}.tar.gz"
 
 SRC_URI[md5sum] = "38abead776a506109e128ab96bcbbe58"
 SRC_URI[sha256sum] = "070bef794c6826b3fb3965d1a2efdb46c25cb37c06c715987f88a50906cd5b6f"
Signature · 1 line
2.17.1
#1 lore raw

PATCH 2/11 man-pages: update to 5.03

---
 .../man-pages/{man-pages_5.01.bb => man-pages_5.03.bb}        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-extended/man-pages/{man-pages_5.01.bb => man-pages_5.03.bb} (87%)
meta/recipes-extended/man-pages/man-pages_5.03.bb renamed from meta/recipes-extended/man-pages/man-pages_5.01.bb +2 -2
similarity index 87%
rename from meta/recipes-extended/man-pages/man-pages_5.01.bb
rename to meta/recipes-extended/man-pages/man-pages_5.03.bb
index ea1249e4396..2381ba4348b 100644
@@ -7,8 +7,8 @@ LICENSE = "GPLv2+"
 LIC_FILES_CHKSUM = "file://README;md5=794f701617cc03fe50c53257660d8ec4"
 SRC_URI = "${KERNELORG_MIRROR}/linux/docs/${BPN}/${BP}.tar.gz"
 
-SRC_URI[md5sum] = "38abead776a506109e128ab96bcbbe58"
-SRC_URI[sha256sum] = "070bef794c6826b3fb3965d1a2efdb46c25cb37c06c715987f88a50906cd5b6f"
+SRC_URI[md5sum] = "d1da6babb99cbd269233a35de9d8718e"
+SRC_URI[sha256sum] = "e8bab0b10c6fb3a6d69615edb488f8a27020f3625c4cf43b8451ba206acbb1b8"
 
 inherit manpages
 
Signature · 1 line
2.17.1
#2 lore raw

PATCH 3/11 dummy-sdk-package.inc: do not include files into RREPLACES

In reply to Alexander Kanavin

rpm 4.15 no longer allows it, which makes sense.

---
 meta/recipes-core/meta/dummy-sdk-package.inc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
meta/recipes-core/meta/dummy-sdk-package.inc +2 -1
index 4d653706b13..58b0482eca5 100644
@@ -16,11 +16,12 @@ python() {
 ALLOW_EMPTY_${PN} = "1"
 
 PR[vardeps] += "DUMMYPROVIDES"
+PR[vardeps] += "DUMMYPROVIDES_PACKAGES"
 
 python populate_packages_prepend() {
     p = d.getVar("PN")
     d.appendVar("RPROVIDES_%s" % p, "${DUMMYPROVIDES}")
     d.appendVar("RCONFLICTS_%s" % p, "${DUMMYPROVIDES}")
-    d.appendVar("RREPLACES_%s" % p, "${DUMMYPROVIDES}")
+    d.appendVar("RREPLACES_%s" % p, "${DUMMYPROVIDES_PACKAGES}")
 }
 
Signature · 1 line
2.17.1
#3 lore raw

Re: [PATCH 03/11] dummy-sdk-package.inc: do not include files into RREPLACES

Quoted 15 lines · Alexander Kanavin

rpm 4.15 no longer allows it, which makes sense.

---
 meta/recipes-core/meta/dummy-sdk-package.inc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
meta/recipes-core/meta/dummy-sdk-package.inc +0 -0
index 4d653706b13..58b0482eca5 100644
@@ -16,11 +16,12 @@ python() {
 ALLOW_EMPTY_${PN} = "1"
 

meta/recipes-core/meta/dummy-sdk-package.inc python() { · line 26

Quoted 10 lines
meta/recipes-core/meta/dummy-sdk-package.inc +2 -1
 PR[vardeps] += "DUMMYPROVIDES"
+PR[vardeps] += "DUMMYPROVIDES_PACKAGES"
 
 python populate_packages_prepend() {
     p = d.getVar("PN")
     d.appendVar("RPROVIDES_%s" % p, "${DUMMYPROVIDES}")
     d.appendVar("RCONFLICTS_%s" % p, "${DUMMYPROVIDES}")
-    d.appendVar("RREPLACES_%s" % p, "${DUMMYPROVIDES}")
+    d.appendVar("RREPLACES_%s" % p, "${DUMMYPROVIDES_PACKAGES}")
 }

This breaks:

https://autobuilder.yoctoproject.org/typhoon/#/builders/20/builds/1509

Needs something like this (added in -next):

meta/recipes-core/meta/dummy-sdk-package.inc +3 -0
index 58b0482eca..61afab1d76 100644
@@ -18,6 +18,9 @@ ALLOW_EMPTY_${PN} = "1"
 PR[vardeps] += "DUMMYPROVIDES"
 PR[vardeps] += "DUMMYPROVIDES_PACKAGES"
 
+DUMMYPROVIDES_PACKAGES ??= ""
+DUMMYPROVIDES += "${@' '.join([multilib_pkg_extend(d, pkg) for pkg in d.getVar('DUMMYPROVIDES_PACKAGES').split()])}"
+
 python populate_packages_prepend() {
     p = d.getVar("PN")
     d.appendVar("RPROVIDES_%s" % p, "${DUMMYPROVIDES}")
meta/recipes-core/meta/nativesdk-buildtools-perl-dummy.bb +4 -1
index 6a8748acdf..5bc11b9daf 100644
@@ -1,6 +1,6 @@
 DUMMYARCH = "buildtools-dummy-${SDKPKGSUFFIX}"
 
-DUMMYPROVIDES = "\
+DUMMYPROVIDES_PACKAGES = "\
     nativesdk-perl \
     nativesdk-libxml-parser-perl \
     nativesdk-perl-module-bytes \
@@ -21,6 +21,9 @@ DUMMYPROVIDES = "\
     nativesdk-perl-module-posix \
     nativesdk-perl-module-thread-queue \
     nativesdk-perl-module-threads \
+"
+
+DUMMYPROVIDES = "\
     /usr/bin/perl \
     "
 
meta/recipes-core/meta/nativesdk-sdk-provides-dummy.bb +4 -1
index b891efa5ef..29f4dd3633 100644
@@ -1,10 +1,13 @@
 DUMMYARCH = "sdk-provides-dummy-${SDKPKGSUFFIX}"
 
+DUMMYPROVIDES_PACKAGES = "\
+    pkgconfig \
+"
+
 # Add /bin/sh?
 DUMMYPROVIDES = "\
     /bin/bash \
     /usr/bin/env \
-    pkgconfig \
     libGL.so()(64bit) \
     libGL.so \
 "
meta/recipes-core/meta/target-sdk-provides-dummy.bb +0 -1
index 87b8bfab9c..e3beeb796c 100644
@@ -48,7 +48,6 @@ DUMMYPROVIDES_PACKAGES = "\
 "
 
 DUMMYPROVIDES = "\
-    ${@' '.join([multilib_pkg_extend(d, pkg) for pkg in d.getVar('DUMMYPROVIDES_PACKAGES').split()])} \
     /bin/sh \
     /bin/bash \
     /usr/bin/env \
#4 lore raw

PATCH 4/11 gettext-minimal-native: update to 0.20.1

In reply to Alexander Kanavin

Rather than update a tarball, I took m4 files directly from an install of 0.20.1.

The patch is dropped as guile has long been removed from oe-core.

---
 ...H-Disable-the-test-to-convert-euc-jp.patch |  38 -
 .../gettext-minimal-0.19.8.1/aclocal.tgz      | Bin 40014 -> 0 bytes
 .../COPYING                                   |   0
 .../Makefile.in.in                            | 124 +--
 .../gettext-minimal-0.20.1/aclocal/gettext.m4 | 386 +++++++++
 .../aclocal/host-cpu-c-abi.m4                 | 644 +++++++++++++++
 .../gettext-minimal-0.20.1/aclocal/iconv.m4   | 288 +++++++
 .../aclocal/intlmacosx.m4                     |  72 ++
 .../gettext-minimal-0.20.1/aclocal/lib-ld.m4  | 168 ++++
 .../aclocal/lib-link.m4                       | 774 ++++++++++++++++++
 .../aclocal/lib-prefix.m4                     | 249 ++++++
 .../gettext-minimal-0.20.1/aclocal/nls.m4     |  32 +
 .../gettext-minimal-0.20.1/aclocal/po.m4      | 450 ++++++++++
 .../aclocal/progtest.m4                       |  91 ++
 .../config.rpath                              |   2 +-
 .../remove-potcdate.sin                       |   8 +-
 ....1.bb => gettext-minimal-native_0.20.1.bb} |   5 +-
 17 files changed, 3236 insertions(+), 95 deletions(-)
 delete mode 100644 meta/recipes-core/gettext/gettext-minimal-0.19.8.1/0001-PATCH-Disable-the-test-to-convert-euc-jp.patch
 delete mode 100644 meta/recipes-core/gettext/gettext-minimal-0.19.8.1/aclocal.tgz
 rename meta/recipes-core/gettext/{gettext-minimal-0.19.8.1 => gettext-minimal-0.20.1}/COPYING (100%)
 rename meta/recipes-core/gettext/{gettext-minimal-0.19.8.1 => gettext-minimal-0.20.1}/Makefile.in.in (78%)
 create mode 100644 meta/recipes-core/gettext/gettext-minimal-0.20.1/aclocal/gettext.m4
 create mode 100644 meta/recipes-core/gettext/gettext-minimal-0.20.1/aclocal/host-cpu-c-abi.m4
 create mode 100644 meta/recipes-core/gettext/gettext-minimal-0.20.1/aclocal/iconv.m4
 create mode 100644 meta/recipes-core/gettext/gettext-minimal-0.20.1/aclocal/intlmacosx.m4
 create mode 100644 meta/recipes-core/gettext/gettext-minimal-0.20.1/aclocal/lib-ld.m4
 create mode 100644 meta/recipes-core/gettext/gettext-minimal-0.20.1/aclocal/lib-link.m4
 create mode 100644 meta/recipes-core/gettext/gettext-minimal-0.20.1/aclocal/lib-prefix.m4
 create mode 100644 meta/recipes-core/gettext/gettext-minimal-0.20.1/aclocal/nls.m4
 create mode 100644 meta/recipes-core/gettext/gettext-minimal-0.20.1/aclocal/po.m4
 create mode 100644 meta/recipes-core/gettext/gettext-minimal-0.20.1/aclocal/progtest.m4
 rename meta/recipes-core/gettext/{gettext-minimal-0.19.8.1 => gettext-minimal-0.20.1}/config.rpath (99%)
 rename meta/recipes-core/gettext/{gettext-minimal-0.19.8.1 => gettext-minimal-0.20.1}/remove-potcdate.sin (50%)
 rename meta/recipes-core/gettext/{gettext-minimal-native_0.19.8.1.bb => gettext-minimal-native_0.20.1.bb} (86%)
meta/recipes-core/gettext/gettext-minimal-0.19.8.1/0001-PATCH-Disable-the-test-to-convert-euc-jp.patch deleted +0 -38
deleted file mode 100644
index 29ef2a5a63d..00000000000
@@ -1,38 +0,0 @@
-[PATCH] Disable the test to convert euc-jp
-
-Remove the test "Test against HP-UX 11.11 bug:
-No converter from EUC-JP to UTF-8 is provided"
-since we don't support HP-UX and if the euc-jp is not
-installed on the host, the dependence will be built without
-iconv support and will cause guile-native building fail.
-
-Upstream-Status: Inappropriate [OE specific]
-
-Signed-off-by: Roy Li <[email protected]>
----
- iconv.m4 | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/iconv.m4 b/iconv.m4
-index 4e37363..35f54bd 100644
---- a/iconv.m4
-+++ b/iconv.m4
-@@ -165,6 +165,7 @@ AC_DEFUN([AM_ICONV_LINK],
-       }
-   }
- #endif
-+#if 0
-   /* Test against HP-UX 11.11 bug: No converter from EUC-JP to UTF-8 is
-      provided.  */
-   if (/* Try standardized names.  */
-@@ -176,6 +177,7 @@ AC_DEFUN([AM_ICONV_LINK],
-       /* Try HP-UX names.  */
-       && iconv_open ("utf8", "eucJP") == (iconv_t)(-1))
-     result |= 16;
-+#endif
-   return result;
- ]])],
-           [am_cv_func_iconv_works=yes], ,
--- 
-2.0.1
-
meta/recipes-core/gettext/gettext-minimal-0.19.8.1/aclocal.tgz deleted binary +0 -0
deleted file mode 100644
index 9b2d1f561d734df608c9c7a6e29e08131296a5fd..0000000000000000000000000000000000000000
GIT binary patch
meta/recipes-core/gettext/gettext-minimal-0.20.1/COPYING renamed from meta/recipes-core/gettext/gettext-minimal-0.19.8.1/COPYING +0 -0
similarity index 100%
rename from meta/recipes-core/gettext/gettext-minimal-0.19.8.1/COPYING
rename to meta/recipes-core/gettext/gettext-minimal-0.20.1/COPYING
meta/recipes-core/gettext/gettext-minimal-0.20.1/Makefile.in.in renamed from meta/recipes-core/gettext/gettext-minimal-0.19.8.1/Makefile.in.in +72 -52

244 lines not on this page · raw message

meta/recipes-core/gettext/gettext-minimal-0.20.1/aclocal/gettext.m4 new file +386 -0

386 lines not on this page · raw message

meta/recipes-core/gettext/gettext-minimal-0.20.1/aclocal/host-cpu-c-abi.m4 new file +644 -0

644 lines not on this page · raw message

meta/recipes-core/gettext/gettext-minimal-0.20.1/aclocal/iconv.m4 new file +288 -0

288 lines not on this page · raw message

meta/recipes-core/gettext/gettext-minimal-0.20.1/aclocal/intlmacosx.m4 new file +72 -0

72 lines not on this page · raw message

meta/recipes-core/gettext/gettext-minimal-0.20.1/aclocal/lib-ld.m4 new file +168 -0

168 lines not on this page · raw message

meta/recipes-core/gettext/gettext-minimal-0.20.1/aclocal/lib-link.m4 new file +774 -0

774 lines not on this page · raw message

meta/recipes-core/gettext/gettext-minimal-0.20.1/aclocal/lib-prefix.m4 new file +249 -0

249 lines not on this page · raw message

meta/recipes-core/gettext/gettext-minimal-0.20.1/aclocal/nls.m4 new file +32 -0
new file mode 100644
index 00000000000..b62f6148570
@@ -0,0 +1,32 @@
+# nls.m4 serial 5 (gettext-0.18)
+dnl Copyright (C) 1995-2003, 2005-2006, 2008-2014, 2016, 2019 Free Software
+dnl Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+dnl
+dnl This file can be used in projects which are not available under
+dnl the GNU General Public License or the GNU Library General Public
+dnl License but which still want to provide support for the GNU gettext
+dnl functionality.
+dnl Please note that the actual code of the GNU gettext library is covered
+dnl by the GNU Library General Public License, and the rest of the GNU
+dnl gettext package is covered by the GNU General Public License.
+dnl They are *not* in the public domain.
+
+dnl Authors:
+dnl   Ulrich Drepper <[email protected]>, 1995-2000.
+dnl   Bruno Haible <[email protected]>, 2000-2003.
+
+AC_PREREQ([2.50])
+
+AC_DEFUN([AM_NLS],
+[
+  AC_MSG_CHECKING([whether NLS is requested])
+  dnl Default is enabled NLS
+  AC_ARG_ENABLE([nls],
+    [  --disable-nls           do not use Native Language Support],
+    USE_NLS=$enableval, USE_NLS=yes)
+  AC_MSG_RESULT([$USE_NLS])
+  AC_SUBST([USE_NLS])
+])
meta/recipes-core/gettext/gettext-minimal-0.20.1/aclocal/po.m4 new file +450 -0

105 lines not on this page · raw message

meta/recipes-core/gettext/gettext-minimal-0.20.1/aclocal/progtest.m4 new file +91 -0

91 lines not on this page · raw message

meta/recipes-core/gettext/gettext-minimal-0.20.1/config.rpath renamed from meta/recipes-core/gettext/gettext-minimal-0.19.8.1/config.rpath +1 -1
similarity index 99%
rename from meta/recipes-core/gettext/gettext-minimal-0.19.8.1/config.rpath
rename to meta/recipes-core/gettext/gettext-minimal-0.20.1/config.rpath
index 98183ff2f2e..be202c1a9e7 100755

Lines of this file are not shown. View the raw message.

meta/recipes-core/gettext/gettext-minimal-0.20.1/remove-potcdate.sin renamed from meta/recipes-core/gettext/gettext-minimal-0.19.8.1/remove-potcdate.sin +7 -1
similarity index 50%
rename from meta/recipes-core/gettext/gettext-minimal-0.19.8.1/remove-potcdate.sin
rename to meta/recipes-core/gettext/gettext-minimal-0.20.1/remove-potcdate.sin
index 2436c49e786..8c70dfbf148 100644

Lines of this file are not shown. View the raw message.

meta/recipes-core/gettext/gettext-minimal-native_0.20.1.bb renamed from meta/recipes-core/gettext/gettext-minimal-native_0.19.8.1.bb +2 -3
similarity index 86%
rename from meta/recipes-core/gettext/gettext-minimal-native_0.19.8.1.bb
rename to meta/recipes-core/gettext/gettext-minimal-native_0.20.1.bb
index 26ff19975d2..7a4dcbec57b 100644

Lines of this file are not shown. View the raw message.

The rest of this diff is not shown. View the raw message.

Signature · 1 line
2.17.1

Part of the diff is not shown here. View the raw message.

#5 lore raw

PATCH 5/11 gettext: update to 0.20.1

In reply to Alexander Kanavin

License-Update: URLs changed from http to https

---
 .../gettext-0.19.8.1/fix-CVE-2018-18751.patch | 141 ----
 .../gettext/gettext-0.19.8.1/parallel.patch   |  23 -
 .../gettext-0.19.8.1/use-pkgconfig.patch      | 321 --------
 .../add-with-bisonlocaledir.patch             |   0
 ...nt.c-timsort.h-fix-formatting-issues.patch |  30 +-
 .../gettext/gettext-0.20.1/parallel.patch     |  32 +
 .../run-ptest                                 |   0
 .../serial-tests-config.patch                 |  26 +-
 .../gettext-0.20.1/use-pkgconfig.patch        | 713 ++++++++++++++++++
 ...{gettext_0.19.8.1.bb => gettext_0.20.1.bb} |  23 +-
 10 files changed, 775 insertions(+), 534 deletions(-)
 delete mode 100644 meta/recipes-core/gettext/gettext-0.19.8.1/fix-CVE-2018-18751.patch
 delete mode 100644 meta/recipes-core/gettext/gettext-0.19.8.1/parallel.patch
 delete mode 100644 meta/recipes-core/gettext/gettext-0.19.8.1/use-pkgconfig.patch
 rename meta/recipes-core/gettext/{gettext-0.19.8.1 => gettext-0.20.1}/add-with-bisonlocaledir.patch (100%)
 rename meta/recipes-core/gettext/{gettext-0.19.8.1 => gettext-0.20.1}/cr-statement.c-timsort.h-fix-formatting-issues.patch (68%)
 create mode 100644 meta/recipes-core/gettext/gettext-0.20.1/parallel.patch
 rename meta/recipes-core/gettext/{gettext-0.19.8.1 => gettext-0.20.1}/run-ptest (100%)
 rename meta/recipes-core/gettext/{gettext-0.19.8.1 => gettext-0.20.1}/serial-tests-config.patch (75%)
 create mode 100644 meta/recipes-core/gettext/gettext-0.20.1/use-pkgconfig.patch
 rename meta/recipes-core/gettext/{gettext_0.19.8.1.bb => gettext_0.20.1.bb} (94%)
meta/recipes-core/gettext/gettext-0.19.8.1/fix-CVE-2018-18751.patch deleted +0 -141
deleted file mode 100644
index 6dfe200d654..00000000000
@@ -1,141 +0,0 @@
-Upstream-Status: Backport [https://git.savannah.gnu.org/gitweb/?p=gettext.git;a=commit;h=dce3a16]
-CVE: CVE-2018-18751
-
-Signed-off-by: Kai Kang <[email protected]>
-
-From dce3a16e5e9368245735e29bf498dcd5e3e474a4 Mon Sep 17 00:00:00 2001
-From: Daiki Ueno <[email protected]>
-Date: Thu, 15 Sep 2016 13:57:24 +0200
-Subject: [PATCH] xgettext: Fix crash with *.po file input
-
-When xgettext was given two *.po files with the same msgid_plural, it
-crashed with double-free.  Problem reported by Davlet Panech in:
-http://lists.gnu.org/archive/html/bug-gettext/2016-09/msg00001.html
-* gettext-tools/src/po-gram-gen.y: Don't free msgid_pluralform after
-calling do_callback_message, assuming that it takes ownership.
-* gettext-tools/src/read-catalog.c (default_add_message): Free
-msgid_plural after calling message_alloc.
-* gettext-tools/tests/xgettext-po-2: New file.
-* gettext-tools/tests/Makefile.am (TESTS): Add new test.
----
- gettext-tools/src/po-gram-gen.y   | 13 ++++-----
- gettext-tools/src/read-catalog.c  |  2 ++
- gettext-tools/tests/Makefile.am   |  2 +-
- gettext-tools/tests/xgettext-po-2 | 55 +++++++++++++++++++++++++++++++++++++++
- 4 files changed, 63 insertions(+), 9 deletions(-)
- create mode 100755 gettext-tools/tests/xgettext-po-2
-
-diff --git a/gettext-tools/src/po-gram-gen.y b/gettext-tools/src/po-gram-gen.y
-index becf5e6..4428e77 100644
---- a/gettext-tools/src/po-gram-gen.y
-+++ b/gettext-tools/src/po-gram-gen.y
-@@ -221,14 +221,11 @@ message
-                   check_obsolete ($1, $3);
-                   check_obsolete ($1, $4);
-                   if (!$1.obsolete || pass_obsolete_entries)
--                    {
--                      do_callback_message ($1.ctxt, string2, &$1.pos, $3.string,
--                                           $4.rhs.msgstr, $4.rhs.msgstr_len, &$4.pos,
--                                           $1.prev_ctxt,
--                                           $1.prev_id, $1.prev_id_plural,
--                                           $1.obsolete);
--                      free ($3.string);
--                    }
-+                    do_callback_message ($1.ctxt, string2, &$1.pos, $3.string,
-+                                         $4.rhs.msgstr, $4.rhs.msgstr_len, &$4.pos,
-+                                         $1.prev_ctxt,
-+                                         $1.prev_id, $1.prev_id_plural,
-+                                         $1.obsolete);
-                   else
-                     {
-                       free_message_intro ($1);
-diff --git a/gettext-tools/src/read-catalog.c b/gettext-tools/src/read-catalog.c
-index 571d18e..6af6d20 100644
---- a/gettext-tools/src/read-catalog.c
-+++ b/gettext-tools/src/read-catalog.c
-@@ -397,6 +397,8 @@ default_add_message (default_catalog_reader_ty *this,
-          appropriate.  */
-       mp = message_alloc (msgctxt, msgid, msgid_plural, msgstr, msgstr_len,
-                           msgstr_pos);
-+      if (msgid_plural != NULL)
-+        free (msgid_plural);
-       mp->prev_msgctxt = prev_msgctxt;
-       mp->prev_msgid = prev_msgid;
-       mp->prev_msgid_plural = prev_msgid_plural;
-diff --git a/gettext-tools/tests/Makefile.am b/gettext-tools/tests/Makefile.am
-index 23b09b1..0dfb4d8 100644
---- a/gettext-tools/tests/Makefile.am
-+++ b/gettext-tools/tests/Makefile.am
-@@ -95,7 +95,7 @@ TESTS = gettext-1 gettext-2 gettext-3 gettext-4 gettext-5 gettext-6 gettext-7 \
- 	xgettext-perl-1 xgettext-perl-2 xgettext-perl-3 xgettext-perl-4 \
- 	xgettext-perl-5 xgettext-perl-6 xgettext-perl-7 xgettext-perl-8 \
- 	xgettext-php-1 xgettext-php-2 xgettext-php-3 xgettext-php-4 \
--	xgettext-po-1 \
-+	xgettext-po-1 xgettext-po-2 \
- 	xgettext-properties-1 \
- 	xgettext-python-1 xgettext-python-2 xgettext-python-3 \
- 	xgettext-python-4 \
-diff --git a/gettext-tools/tests/xgettext-po-2 b/gettext-tools/tests/xgettext-po-2
-new file mode 100755
-index 0000000..c4bd9d0
---- /dev/null
-+++ b/gettext-tools/tests/xgettext-po-2
-@@ -0,0 +1,55 @@
-+#! /bin/sh
-+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
-+
-+# Test PO extractors with multiple input files.
-+
-+cat <<EOF > xg-po-2-1.po
-+msgid "first msgid"
-+msgid_plural "first msgid (plural)"
-+msgstr[0] ""
-+msgstr[1] ""
-+
-+msgid "second msgid"
-+msgid_plural "second msgid (plural)"
-+msgstr[0] ""
-+msgstr[1] ""
-+EOF
-+
-+cat <<EOF > xg-po-2-2.po
-+msgid "third msgid"
-+msgid_plural "third msgid (plural)"
-+msgstr[0] ""
-+msgstr[1] ""
-+
-+msgid "second msgid"
-+msgid_plural "second msgid (plural)"
-+msgstr[0] ""
-+msgstr[1] ""
-+EOF
-+
-+: ${XGETTEXT=xgettext}
-+${XGETTEXT} --omit-header xg-po-2-1.po xg-po-2-2.po -o xg-po-2.tmp.po || Exit 1
-+LC_ALL=C tr -d '\r' < xg-po-2.tmp.po > xg-po-2.po || Exit 1
-+
-+cat <<EOF > xg-po-2.ok
-+msgid "first msgid"
-+msgid_plural "first msgid (plural)"
-+msgstr[0] ""
-+msgstr[1] ""
-+
-+msgid "second msgid"
-+msgid_plural "second msgid (plural)"
-+msgstr[0] ""
-+msgstr[1] ""
-+
-+msgid "third msgid"
-+msgid_plural "third msgid (plural)"
-+msgstr[0] ""
-+msgstr[1] ""
-+EOF
-+
-+: ${DIFF=diff}
-+${DIFF} xg-po-2.ok xg-po-2.po
-+result=$?
-+
-+exit $result
--- 
-1.9.1
-
meta/recipes-core/gettext/gettext-0.19.8.1/parallel.patch deleted +0 -23
deleted file mode 100644
index c8e2c94af0e..00000000000
@@ -1,23 +0,0 @@
-instal libgettextlib.a before removing it
-
-In a multiple job build, Makefile can simultaneously
-be installing and removing libgettextlib.a.  We serialize
-the operations.
-
-Upstream-Status: Pending
-
-Signed-off-by: Joe Slater <[email protected]>
-
---- a/gettext-tools/gnulib-lib/Makefile.am
-+++ b/gettext-tools/gnulib-lib/Makefile.am
-@@ -57,6 +57,10 @@ endif
- # Rules generated and collected by gnulib-tool.
- include Makefile.gnulib
- 
-+# defined in Makefile.gnulib but missing this dependency
-+#
-+install-exec-clean: install-libLTLIBRARIES
-+
- # Which classes to export from the shared library.
- MOOPPFLAGS += --dllexport=styled_ostream
- 
meta/recipes-core/gettext/gettext-0.19.8.1/use-pkgconfig.patch deleted +0 -321

321 lines not on this page · raw message

meta/recipes-core/gettext/gettext-0.20.1/add-with-bisonlocaledir.patch renamed from meta/recipes-core/gettext/gettext-0.19.8.1/add-with-bisonlocaledir.patch +0 -0
similarity index 100%
rename from meta/recipes-core/gettext/gettext-0.19.8.1/add-with-bisonlocaledir.patch
rename to meta/recipes-core/gettext/gettext-0.20.1/add-with-bisonlocaledir.patch
meta/recipes-core/gettext/gettext-0.20.1/cr-statement.c-timsort.h-fix-formatting-issues.patch renamed from meta/recipes-core/gettext/gettext-0.19.8.1/cr-statement.c-timsort.h-fix-formatting-issues.patch +7 -23
similarity index 68%
rename from meta/recipes-core/gettext/gettext-0.19.8.1/cr-statement.c-timsort.h-fix-formatting-issues.patch
rename to meta/recipes-core/gettext/gettext-0.20.1/cr-statement.c-timsort.h-fix-formatting-issues.patch
index 6af16041987..0561ed7d32c 100644
@@ -1,4 +1,4 @@
-From e546de65a333789e83f5485757967cee29ee3681 Mon Sep 17 00:00:00 2001
+From f6245ef5530fc37a6243e798df34162fbbeab6f0 Mon Sep 17 00:00:00 2001
 From: Robert Yang <[email protected]>
 Date: Sun, 19 Feb 2017 23:32:46 -0800
 Subject: [PATCH] cr-statement.c/timsort.h: fix formatting issues
@@ -15,15 +15,15 @@ gettext-tools/gnulib-lib/libxml/timsort.h:326:80: warning: format '%lu' expects
 Upstream-Status: Pending
 
 Signed-off-by: Robert Yang <[email protected]>
+
 ---
- gettext-tools/gnulib-lib/libcroco/cr-statement.c | 10 +++++-----
- gettext-tools/gnulib-lib/libxml/timsort.h        |  2 +-
- 2 files changed, 6 insertions(+), 6 deletions(-)
+ libtextstyle/lib/libcroco/cr-statement.c | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
 
-diff --git a/gettext-tools/gnulib-lib/libcroco/cr-statement.c b/gettext-tools/gnulib-lib/libcroco/cr-statement.c
+diff --git a/libtextstyle/lib/libcroco/cr-statement.c b/libtextstyle/lib/libcroco/cr-statement.c
 index 617520f..100104b 100644
---- a/gettext-tools/gnulib-lib/libcroco/cr-statement.c
-+++ b/gettext-tools/gnulib-lib/libcroco/cr-statement.c
+--- a/libtextstyle/lib/libcroco/cr-statement.c
++++ b/libtextstyle/lib/libcroco/cr-statement.c
 @@ -2607,7 +2607,7 @@ cr_statement_dump_ruleset (CRStatement * a_this, FILE * a_fp, glong a_indent)
          g_return_if_fail (a_fp && a_this);
          str = cr_statement_ruleset_to_string (a_this, a_indent);
@@ -69,19 +69,3 @@ index 617520f..100104b 100644
                  g_free (str) ;
                  str = NULL ;
          }
-diff --git a/gettext-tools/gnulib-lib/libxml/timsort.h b/gettext-tools/gnulib-lib/libxml/timsort.h
-index 795f272..443918a 100644
---- a/gettext-tools/gnulib-lib/libxml/timsort.h
-+++ b/gettext-tools/gnulib-lib/libxml/timsort.h
-@@ -323,7 +323,7 @@ static void TIM_SORT_RESIZE(TEMP_STORAGE_T *store, const size_t new_size)
-     SORT_TYPE *tempstore = (SORT_TYPE *)realloc(store->storage, new_size * sizeof(SORT_TYPE));
-     if (tempstore == NULL)
-     {
--      fprintf(stderr, "Error allocating temporary storage for tim sort: need %lu bytes", sizeof(SORT_TYPE) * new_size);
-+      fprintf(stderr, "Error allocating temporary storage for tim sort: need %zu bytes", sizeof(SORT_TYPE) * new_size);
-       exit(1);
-     }
-     store->storage = tempstore;
--- 
-2.10.2
-
meta/recipes-core/gettext/gettext-0.20.1/parallel.patch new file +32 -0
new file mode 100644
index 00000000000..d96a376b7d1
@@ -0,0 +1,32 @@
+From 4a2a0a93b469093b60ffd0bec55d33d1e03d4713 Mon Sep 17 00:00:00 2001
+From: Joe Slater <[email protected]>
+Date: Thu, 7 Jun 2012 16:37:01 -0700
+Subject: [PATCH] instal libgettextlib.a before removing it
+
+In a multiple job build, Makefile can simultaneously
+be installing and removing libgettextlib.a.  We serialize
+the operations.
+
+Upstream-Status: Pending
+
+Signed-off-by: Joe Slater <[email protected]>
+
+---
+ gettext-tools/gnulib-lib/Makefile.am | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/gettext-tools/gnulib-lib/Makefile.am b/gettext-tools/gnulib-lib/Makefile.am
+index 2126699..d2dd7e4 100644
+--- a/gettext-tools/gnulib-lib/Makefile.am
++++ b/gettext-tools/gnulib-lib/Makefile.am
+@@ -58,6 +58,10 @@ endif
+ # Rules generated and collected by gnulib-tool.
+ include Makefile.gnulib
+ 
++# defined in Makefile.gnulib but missing this dependency
++#
++install-exec-clean: install-libLTLIBRARIES
++
+ # OS/2 does not support a DLL name longer than 8 characters.
+ if OS2
+ libgettextlib_la_LDFLAGS += -os2dllname gtlib
meta/recipes-core/gettext/gettext-0.20.1/run-ptest renamed from meta/recipes-core/gettext/gettext-0.19.8.1/run-ptest +0 -0
similarity index 100%
rename from meta/recipes-core/gettext/gettext-0.19.8.1/run-ptest
rename to meta/recipes-core/gettext/gettext-0.20.1/run-ptest
meta/recipes-core/gettext/gettext-0.20.1/serial-tests-config.patch renamed from meta/recipes-core/gettext/gettext-0.19.8.1/serial-tests-config.patch +12 -14
similarity index 75%
rename from meta/recipes-core/gettext/gettext-0.19.8.1/serial-tests-config.patch
rename to meta/recipes-core/gettext/gettext-0.20.1/serial-tests-config.patch
index 31ff9138a91..93f7c03334a 100644
@@ -1,4 +1,4 @@
-From c4b1f3a0c7b7c40b343be9b95deb84e0485643be Mon Sep 17 00:00:00 2001
+From ed64a5724ef7d6eb4e9a876f817ea266a536e195 Mon Sep 17 00:00:00 2001
 From: "Hongjun.Yang" <[email protected]>
 Date: Thu, 28 Jul 2016 12:36:15 +0800
 Subject: [PATCH] fix for ptest
@@ -8,6 +8,7 @@ Add serial-tests support, ptest need it
 Upstream-Status: Inappropriate [oe specific]
 
 Signed-off-by: Changqing Li <[email protected]>
+
 ---
  configure.ac                 | 2 +-
  gettext-runtime/configure.ac | 2 +-
@@ -15,24 +16,24 @@ Signed-off-by: Changqing Li <[email protected]>
  3 files changed, 3 insertions(+), 3 deletions(-)
 
 diff --git a/configure.ac b/configure.ac
-index 5e996fa..880581f 100644
+index 38db6fd..f019ae0 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -23,7 +23,7 @@ AC_INIT([gettext],
- 	[[email protected]])
+@@ -22,7 +22,7 @@ AC_INIT([gettext],
+ 	[[email protected]])
  AC_CONFIG_SRCDIR([gettext-tools/src/msgfmt.c])
  AC_CONFIG_AUX_DIR([build-aux])
--AM_INIT_AUTOMAKE([1.13 silent-rules parallel-tests dist-xz dist-lzip])
-+AM_INIT_AUTOMAKE([1.13 silent-rules serial-tests dist-xz dist-lzip])
+-AM_INIT_AUTOMAKE([1.13 silent-rules parallel-tests tar-ustar])
++AM_INIT_AUTOMAKE([1.13 silent-rules serial-tests tar-ustar])
  
  dnl Override automake's tar command used for creating distributions.
- am__tar='${AMTAR} chof - --owner=root --group=root "$$tardir"'
+ am__tar='${AMTAR} chf - --format=ustar --owner=root --group=root "$$tardir"'
 diff --git a/gettext-runtime/configure.ac b/gettext-runtime/configure.ac
-index e9299b6..d4f5528 100644
+index de203e7..138a07f 100644
 --- a/gettext-runtime/configure.ac
 +++ b/gettext-runtime/configure.ac
 @@ -22,7 +22,7 @@ AC_INIT([gettext-runtime],
- 	[[email protected]])
+ 	[[email protected]])
  AC_CONFIG_SRCDIR([intl/dcigettext.c])
  AC_CONFIG_AUX_DIR([../build-aux])
 -AM_INIT_AUTOMAKE([1.11.1 silent-rules parallel-tests])
@@ -41,11 +42,11 @@ index e9299b6..d4f5528 100644
  
  dnl Installation directories.
 diff --git a/gettext-tools/configure.ac b/gettext-tools/configure.ac
-index 920eeb6..c507434 100644
+index cf1dd73..b544d6d 100644
 --- a/gettext-tools/configure.ac
 +++ b/gettext-tools/configure.ac
 @@ -22,7 +22,7 @@ AC_INIT([gettext-tools],
- 	[[email protected]])
+ 	[[email protected]])
  AC_CONFIG_SRCDIR([src/msgfmt.c])
  AC_CONFIG_AUX_DIR([../build-aux])
 -AM_INIT_AUTOMAKE([1.11.1 silent-rules parallel-tests])
@@ -53,6 +54,3 @@ index 920eeb6..c507434 100644
  AC_CONFIG_HEADERS([config.h])
  
  dnl Installation directories.
--- 
-2.1.4
-
meta/recipes-core/gettext/gettext-0.20.1/use-pkgconfig.patch new file +713 -0

713 lines not on this page · raw message

meta/recipes-core/gettext/gettext_0.20.1.bb renamed from meta/recipes-core/gettext/gettext_0.19.8.1.bb +11 -12
similarity index 94%
rename from meta/recipes-core/gettext/gettext_0.19.8.1.bb
rename to meta/recipes-core/gettext/gettext_0.20.1.bb
index 30121ad23e1..fc05ef2e0a3 100644
@@ -6,7 +6,7 @@ a few stand-alone programs to massage in various ways the sets of translatable a
 HOMEPAGE = "http://www.gnu.org/software/gettext/gettext.html"
 SECTION = "libs"
 LICENSE = "GPLv3+ & LGPL-2.1+"
-LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
+LIC_FILES_CHKSUM = "file://COPYING;md5=c678957b0c8e964aa6c70fd77641a71e"
 
 # Because po-gram-gen.y has been modified by fix-CVE-2018-18751.patch,
 # it requires yacc which provided by bison-native
@@ -17,17 +17,16 @@ PROVIDES = "virtual/libintl virtual/gettext"
 PROVIDES_class-native = "virtual/gettext-native"
 RCONFLICTS_${PN} = "proxy-libintl"
 SRC_URI = "${GNU_MIRROR}/gettext/gettext-${PV}.tar.gz \
-	   file://parallel.patch \
-	   file://add-with-bisonlocaledir.patch \
-	   file://cr-statement.c-timsort.h-fix-formatting-issues.patch \
-	   file://use-pkgconfig.patch \
-	   file://fix-CVE-2018-18751.patch \
-	   file://run-ptest \
-	   file://serial-tests-config.patch \
-"
+           file://parallel.patch \
+           file://add-with-bisonlocaledir.patch \
+           file://cr-statement.c-timsort.h-fix-formatting-issues.patch \
+           file://use-pkgconfig.patch \
+           file://run-ptest \
+           file://serial-tests-config.patch \
+           "
 
-SRC_URI[md5sum] = "97e034cf8ce5ba73a28ff6c3c0638092"
-SRC_URI[sha256sum] = "ff942af0e438ced4a8b0ea4b0b6e0d6d657157c5e2364de57baa279c1c125c43"
+SRC_URI[md5sum] = "bb5b0c0caa028105f3ca1905ddc306e2"
+SRC_URI[sha256sum] = "66415634c6e8c3fa8b71362879ec7575e27da43da562c798a8a2f223e6e47f5c"
 
 inherit autotools texinfo pkgconfig ptest
 
@@ -127,7 +126,7 @@ do_install_append_class-native () {
 	rm ${D}${datadir}/gettext/po/remove-potcdate.sin
 
         create_wrapper ${D}${bindir}/msgfmt \
-                GETTEXTDATADIR="${STAGING_DATADIR_NATIVE}/gettext-0.19.8/"
+                GETTEXTDATADIR="${STAGING_DATADIR_NATIVE}/gettext-0.20/"
 
 }
 
Signature · 1 line
2.17.1
#6 lore raw

PATCH 6/11 e2fsprogs: fix build issues with the latest version of gettext

In reply to Alexander Kanavin
---
 ...-configure.ac-correct-AM_GNU_GETTEXT.patch | 26 ++++++++++++++++++
 ...to-use-gettext-defines-that-no-longe.patch | 27 +++++++++++++++++++
 ...-missing-check-for-permission-denied.patch |  7 ++---
 .../e2fsprogs/e2fsprogs/quiet-debugfs.patch   | 13 +++++++--
 .../e2fsprogs/e2fsprogs_1.45.4.bb             | 12 +++++----
 5 files changed, 73 insertions(+), 12 deletions(-)
 create mode 100644 meta/recipes-devtools/e2fsprogs/e2fsprogs/0001-configure.ac-correct-AM_GNU_GETTEXT.patch
 create mode 100644 meta/recipes-devtools/e2fsprogs/e2fsprogs/0001-intl-do-not-try-to-use-gettext-defines-that-no-longe.patch
meta/recipes-devtools/e2fsprogs/e2fsprogs/0001-configure.ac-correct-AM_GNU_GETTEXT.patch new file +26 -0
new file mode 100644
index 00000000000..2719594c2fa
@@ -0,0 +1,26 @@
+From f907fea9ea053d5433b5199ce74008664141f753 Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin <[email protected]>
+Date: Tue, 19 Nov 2019 17:32:33 +0100
+Subject: [PATCH] configure.ac: correct AM_GNU_GETTEXT
+
+New version of gettext require the 'external' argument.
+
+Upstream-Status: Pending
+Signed-off-by: Alexander Kanavin <[email protected]>
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 654ff43d..4772b97b 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -873,7 +873,7 @@ AC_SUBST(GETTEXT_PACKAGE)
+ AC_SUBST(PACKAGE)
+ AC_SUBST(VERSION)
+ 
+-AM_GNU_GETTEXT
++AM_GNU_GETTEXT([external])
+ dnl @MKDIR_P@ is expanded in AM_GNU_GETTEXT
+ AC_SUBST([mkdir_p],['$(MKDIR_P)'])
+ dnl
meta/recipes-devtools/e2fsprogs/e2fsprogs/0001-intl-do-not-try-to-use-gettext-defines-that-no-longe.patch new file +27 -0
new file mode 100644
index 00000000000..31b585fc9a9
@@ -0,0 +1,27 @@
+From d034239f05cfba849f6ad16eb3f1ea37efbe4f95 Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin <[email protected]>
+Date: Tue, 19 Nov 2019 18:34:00 +0100
+Subject: [PATCH] intl: do not try to use gettext defines that no longer exist
+
+Newer version of gettext no longer define this in m4 files,
+so patch it out until e2fsprogs upstream sorts the situation.
+
+Upstream-Status: Inappropriate [hardcodes a choice]
+Signed-off-by: Alexander Kanavin <[email protected]>
+---
+ intl/Makefile.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/intl/Makefile.in b/intl/Makefile.in
+index e037e23c..89a876b8 100644
+--- a/intl/Makefile.in
++++ b/intl/Makefile.in
+@@ -175,7 +175,7 @@ libgnuintl.h.msvc-static libgnuintl.h.msvc-shared README.woe32 Makefile.msvc
+ DISTFILES.obsolete = xopen-msg.sed linux-msg.sed po2tbl.sed.in cat-compat.c \
+ COPYING.LIB-2 gettext.h libgettext.h plural-eval.c libgnuintl.h
+ 
+-all: all-@USE_INCLUDED_LIBINTL@
++all:
+ all-yes: libintl.$la libintl.h charset.alias ref-add.sed ref-del.sed
+ all-no: all-no-@BUILD_INCLUDED_LIBINTL@
+ all-no-yes: libgnuintl.$la
meta/recipes-devtools/e2fsprogs/e2fsprogs/e2fsprogs-fix-missing-check-for-permission-denied.patch +2 -5
index 69c09bc1d76..4d335af4cf6 100644
@@ -1,4 +1,4 @@
-From c7914309aeee6209ddb6995c084805a911d9cc82 Mon Sep 17 00:00:00 2001
+From e8331a76983e839a3d193446ab8ae9c1b09daa07 Mon Sep 17 00:00:00 2001
 From: Jackie Huang <[email protected]>
 Date: Wed, 10 Aug 2016 11:19:44 +0800
 Subject: [PATCH] Fix missing check for permission denied.
@@ -19,7 +19,7 @@ Signed-off-by: Jackie Huang <[email protected]>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/lib/support/profile.c b/lib/support/profile.c
-index 9e96673b..32d83002 100644
+index 585ed595..810dd66b 100644
 --- a/lib/support/profile.c
 +++ b/lib/support/profile.c
 @@ -335,7 +335,7 @@ profile_init(const char * const *files, profile_t *ret_profile)
@@ -31,6 +31,3 @@ index 9e96673b..32d83002 100644
  			   strcmp(*fs, default_filename))
  			goto errout;
  
--- 
-2.16.1
-
meta/recipes-devtools/e2fsprogs/e2fsprogs/quiet-debugfs.patch +11 -2
index 830e9d57a5c..95e6a7a2d5c 100644
@@ -1,14 +1,23 @@
+From de6d6f0dd010f5b9d917553acb9430278f448f23 Mon Sep 17 00:00:00 2001
+From: Ross Burton <[email protected]>
+Date: Mon, 23 Dec 2013 13:38:34 +0000
+Subject: [PATCH] e2fsprogs: silence debugfs
+
 When executing a script don't echo every command, as we do this for entire
 filesystems at rootfs time.
 
 Upstream-Status: Inappropriate
 Signed-off-by: Ross Burton <[email protected]>
 
+---
+ debugfs/debugfs.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
 diff --git a/debugfs/debugfs.c b/debugfs/debugfs.c
-index 5590295..ac57292 100644
+index 15b01214..15164df2 100644
 --- a/debugfs/debugfs.c
 +++ b/debugfs/debugfs.c
-@@ -2378,7 +2378,7 @@ static int source_file(const char *cmd_file, int ss_idx)
+@@ -2492,7 +2492,7 @@ static int source_file(const char *cmd_file, int ss_idx)
  		cp = strchr(buf, '\r');
  		if (cp)
  			*cp = 0;
meta/recipes-devtools/e2fsprogs/e2fsprogs_1.45.4.bb +7 -5
index 90db71df00f..ab44c28f2a5 100644
@@ -1,11 +1,13 @@
 require e2fsprogs.inc
 
 SRC_URI += "file://remove.ldconfig.call.patch \
-            file://run-ptest \
-            file://ptest.patch \
-            file://mkdir_p.patch \
-            file://0001-misc-create_inode.c-set-dir-s-mode-correctly.patch \
-            "
+           file://run-ptest \
+           file://ptest.patch \
+           file://mkdir_p.patch \
+           file://0001-misc-create_inode.c-set-dir-s-mode-correctly.patch \
+           file://0001-configure.ac-correct-AM_GNU_GETTEXT.patch \
+           file://0001-intl-do-not-try-to-use-gettext-defines-that-no-longe.patch \
+           "
 
 SRC_URI_append_class-native = " file://e2fsprogs-fix-missing-check-for-permission-denied.patch \
                                 file://quiet-debugfs.patch \
Signature · 1 line
2.17.1
#7 lore raw

PATCH 7/11 console-tools: remove the recipe

In reply to Alexander Kanavin

The last release of this was in 2002(!), kbd is the modern, supported alternative.

---
 meta/conf/distro/include/maintainers.inc      |  1 -
 .../0001-Cover-the-else-with-__GLIBC__.patch  | 51 -------------
 ...ix-format-security-compilation-error.patch | 57 --------------
 ...-sys-types.h-for-u_char-and-u_short-.patch | 44 -----------
 .../console-tools-0.3.2/Makevars              | 41 ----------
 .../console-tools-0.3.2/codepage.patch        | 17 -----
 .../console-tools-0.3.2/compile.patch         | 12 ---
 .../console-tools-0.3.2/configure.patch       | 29 -------
 .../fix-libconsole-linking.patch              | 56 --------------
 .../console-tools-0.3.2/kbdrate.patch         | 75 -------------------
 .../console-tools-0.3.2/lcmessage.m4          | 24 ------
 .../console-tools-0.3.2/no-dep-on-libfl.patch | 19 -----
 .../console-tools-0.3.2/nodocs.patch          | 22 ------
 .../console-tools-0.3.2/uclibc-fileno.patch   | 49 ------------
 .../console-tools/console-tools_0.3.2.bb      | 48 ------------
 15 files changed, 545 deletions(-)
 delete mode 100644 meta/recipes-core/console-tools/console-tools-0.3.2/0001-Cover-the-else-with-__GLIBC__.patch
 delete mode 100644 meta/recipes-core/console-tools/console-tools-0.3.2/0001-Fix-format-security-compilation-error.patch
 delete mode 100644 meta/recipes-core/console-tools/console-tools-0.3.2/0001-kbdtools-Include-sys-types.h-for-u_char-and-u_short-.patch
 delete mode 100644 meta/recipes-core/console-tools/console-tools-0.3.2/Makevars
 delete mode 100644 meta/recipes-core/console-tools/console-tools-0.3.2/codepage.patch
 delete mode 100644 meta/recipes-core/console-tools/console-tools-0.3.2/compile.patch
 delete mode 100644 meta/recipes-core/console-tools/console-tools-0.3.2/configure.patch
 delete mode 100644 meta/recipes-core/console-tools/console-tools-0.3.2/fix-libconsole-linking.patch
 delete mode 100644 meta/recipes-core/console-tools/console-tools-0.3.2/kbdrate.patch
 delete mode 100644 meta/recipes-core/console-tools/console-tools-0.3.2/lcmessage.m4
 delete mode 100644 meta/recipes-core/console-tools/console-tools-0.3.2/no-dep-on-libfl.patch
 delete mode 100644 meta/recipes-core/console-tools/console-tools-0.3.2/nodocs.patch
 delete mode 100644 meta/recipes-core/console-tools/console-tools-0.3.2/uclibc-fileno.patch
 delete mode 100644 meta/recipes-core/console-tools/console-tools_0.3.2.bb
meta/conf/distro/include/maintainers.inc +0 -1
index d85e5b697f5..a289008b8c1 100644
@@ -103,7 +103,6 @@ RECIPE_MAINTAINER_pn-cogl-1.0 = "Ross Burton <[email protected]>"
 RECIPE_MAINTAINER_pn-connman = "Changhyeok Bae <[email protected]>"
 RECIPE_MAINTAINER_pn-connman-conf = "Ross Burton <[email protected]>"
 RECIPE_MAINTAINER_pn-connman-gnome = "Ross Burton <[email protected]>"
-RECIPE_MAINTAINER_pn-console-tools = "Chen Qi <[email protected]>"
 RECIPE_MAINTAINER_pn-consolekit = "Chen Qi <[email protected]>"
 RECIPE_MAINTAINER_pn-core-image-base = "Richard Purdie <[email protected]>"
 RECIPE_MAINTAINER_pn-core-image-minimal = "Richard Purdie <[email protected]>"
meta/recipes-core/console-tools/console-tools-0.3.2/0001-Cover-the-else-with-__GLIBC__.patch deleted +0 -51

51 lines not on this page · raw message

meta/recipes-core/console-tools/console-tools-0.3.2/0001-Fix-format-security-compilation-error.patch deleted +0 -57

57 lines not on this page · raw message

meta/recipes-core/console-tools/console-tools-0.3.2/0001-kbdtools-Include-sys-types.h-for-u_char-and-u_short-.patch deleted +0 -44

44 lines not on this page · raw message

meta/recipes-core/console-tools/console-tools-0.3.2/Makevars deleted +0 -41

41 lines not on this page · raw message

meta/recipes-core/console-tools/console-tools-0.3.2/codepage.patch deleted +0 -17
deleted file mode 100644
index c2870147677..00000000000
@@ -1,17 +0,0 @@
-Upstream-Status: Pending
-
-#
-# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
-#
-
---- console-tools-0.3.2/contrib/codepage.c~codepage
-+++ console-tools-0.3.2/contrib/codepage.c
-@@ -229,7 +229,7 @@
- 	  return 0;
- 
-         fprintf(stderr, "\
--Warning: CP format is a hack!\n
-+Warning: CP format is a hack!\n\
-          The files produced may or may not be usable!\n");
- 
- 	sprintf(outfile, "%d.cp", CPEntryHeader.codepage);
meta/recipes-core/console-tools/console-tools-0.3.2/compile.patch deleted +0 -12
deleted file mode 100644
index c93f511950e..00000000000
@@ -1,12 +0,0 @@
-Upstream-Status: Pending
-
---- console-tools-0.3.2/kbdtools/showkey.c~compile	1999-08-25 17:20:08.000000000 -0400
-+++ console-tools-0.3.2/kbdtools/showkey.c	2004-05-09 03:03:23.000000000 -0400
-@@ -264,7 +264,6 @@
- 	  break;
- 	case cmd_keymap:
- 	  printf(")\n");
--	default:
- 	}
-     }
- 
meta/recipes-core/console-tools/console-tools-0.3.2/configure.patch deleted +0 -29
deleted file mode 100644
index 15c100c9088..00000000000
@@ -1,29 +0,0 @@
-Upstream-Status: Pending
-
---- console-tools-0.3.2/configure.in~configure
-+++ console-tools-0.3.2/configure.in
-@@ -2,13 +2,14 @@
- dnl Process this file with autoconf to produce a configure script.
- 
- # Initialize
--AC_INIT(kbdtools/loadkeys.y)
-+AC_INIT
-+AC_CONFIG_SRCDIR([kbdtools/loadkeys.y])
- 
- define(ct_unicodedata_default,/usr/share/unidata/UnicodeData-2.txt)
- ct_localdatadir_default=/usr/local/share     # iff --enable-localdatadir without specific dir
- 
- #AC_CONFIG_AUX_DIR(autoconf)
--AC_CANONICAL_SYSTEM
-+AC_CANONICAL_TARGET([])
- AM_INIT_AUTOMAKE(console-tools, 0.3.2)
- 
- # Defaults
-@@ -25,7 +26,6 @@
- # i18n stuff
- ALL_LINGUAS="cs de ru ga fr"
- AM_GNU_GETTEXT
--AC_OUTPUT_COMMANDS([sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile])
- 
- AC_DEFINE_UNQUOTED(LOCALEDIR, "/usr/share/locale")
- 
meta/recipes-core/console-tools/console-tools-0.3.2/fix-libconsole-linking.patch deleted +0 -56

56 lines not on this page · raw message

meta/recipes-core/console-tools/console-tools-0.3.2/kbdrate.patch deleted +0 -75

75 lines not on this page · raw message

meta/recipes-core/console-tools/console-tools-0.3.2/lcmessage.m4 deleted +0 -24
deleted file mode 100644
index 18d47a94f7e..00000000000
@@ -1,24 +0,0 @@
-# Check whether LC_MESSAGES is available in <locale.h>.
-# Ulrich Drepper <[email protected]>, 1995.
-#
-# This file can be copied and used freely without restrictions.  It can
-# be used in projects which are not available under the GNU General Public
-# License or the GNU Library General Public License but which still want
-# to provide support for the GNU gettext functionality.
-# Please note that the actual code of the GNU gettext library is covered
-# by the GNU Library General Public License, and the rest of the GNU
-# gettext package package is covered by the GNU General Public License.
-# They are *not* in the public domain.
-
-# serial 2
-
-AC_DEFUN([AM_LC_MESSAGES],
-  [if test $ac_cv_header_locale_h = yes; then
-    AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES,
-      [AC_TRY_LINK([#include <locale.h>], [return LC_MESSAGES],
-       am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)])
-    if test $am_cv_val_LC_MESSAGES = yes; then
-      AC_DEFINE(HAVE_LC_MESSAGES, 1,
-        [Define if your <locale.h> file defines LC_MESSAGES.])
-    fi
-  fi])
meta/recipes-core/console-tools/console-tools-0.3.2/no-dep-on-libfl.patch deleted +0 -19
deleted file mode 100644
index a6735a53ffa..00000000000
@@ -1,19 +0,0 @@
-No reason to link with libfl since 'loadkeys' implements
-its own yywrap()/yylex() functions.
-
-Upstream-Status: Pending
-Signed-off-by: Jacob Kroon <[email protected]>
-
-Index: console-tools-0.3.2/kbdtools/Makefile.am
-===================================================================
---- console-tools-0.3.2.orig/kbdtools/Makefile.am
-+++ console-tools-0.3.2/kbdtools/Makefile.am
-@@ -19,8 +19,6 @@ LDADD = ../lib/ctlocal/libctlocal.a ../l
- 	../lib/cfont/libcfont.la \
- 	../lib/console/libconsole.la ../lib/generic/libctgeneric.la
- 
--loadkeys_LDADD = $(LDADD) @LEXLIB@
--
- bin_SCRIPTS = mk_modmap
- 
- noinst_HEADERS = loadkeys.h
meta/recipes-core/console-tools/console-tools-0.3.2/nodocs.patch deleted +0 -22
deleted file mode 100644
index 2ed609219c1..00000000000
@@ -1,22 +0,0 @@
-The docs need tools we don't have to build so disable them.
-
-Also remove intl since the Makefile doesn't work with 3.82 and we
-don't want to build libintl anyway.
-
-Upstream-Status: Inappropriate [configuration]
-RP 2012/10/17
-
-Index: console-tools-0.3.2/Makefile.am
-===================================================================
---- console-tools-0.3.2.orig/Makefile.am	1999-04-15 01:33:24.000000000 +0000
-+++ console-tools-0.3.2/Makefile.am	2012-10-17 11:48:14.107069145 +0000
-@@ -1,7 +1,7 @@
- # -*- makefile -*-
- AUTOMAKE_OPTIONS = foreign
- 
--SUBDIRS = lib fontfiletools vttools kbdtools screenfonttools contrib doc \
--	compat include examples po intl
-+SUBDIRS = lib fontfiletools vttools kbdtools screenfonttools contrib \
-+	compat include examples po
- 
- EXTRA_DIST = BUGS RELEASE CREDITS COPYING.kbd local-scripts/* debian/* *.lsm
meta/recipes-core/console-tools/console-tools-0.3.2/uclibc-fileno.patch deleted +0 -49

49 lines not on this page · raw message

meta/recipes-core/console-tools/console-tools_0.3.2.bb deleted +0 -48

48 lines not on this page · raw message

Signature · 1 line
2.17.1
#8 lore raw

PATCH 8/11 lrzsz: remove the recipe

In reply to Alexander Kanavin

This is 2019; last release of lrzsz was in 1998.

Using serial lines for console work may have its uses, but for transferring files please set up proper networking.

---
 meta/conf/distro/include/maintainers.inc      |     1 -
 .../lrzsz/lrzsz-0.12.20/acdefine.patch        |    19 -
 .../lrzsz/lrzsz-0.12.20/autotools.patch       |    39 -
 .../lrzsz/lrzsz-0.12.20/cve-2018-10195.patch  |    28 -
 .../lrzsz/lrzsz-0.12.20/gettext.patch         | 21884 ----------------
 .../lrzsz/lrzsz-0.12.20/include.patch         |    25 -
 .../lrzsz-0.12.20/lrzsz-check-locale.h.patch  |    32 -
 .../lrzsz_fix_for_automake-1.12.patch         |    49 -
 .../lrzsz/lrzsz-0.12.20/makefile.patch        |    22 -
 meta/recipes-bsp/lrzsz/lrzsz_0.12.20.bb       |    50 -
 .../packagegroups/packagegroup-base.bb        |     2 +-
 .../recipes-extended/minicom/minicom_2.7.1.bb |     2 -
 12 files changed, 1 insertion(+), 22152 deletions(-)
 delete mode 100644 meta/recipes-bsp/lrzsz/lrzsz-0.12.20/acdefine.patch
 delete mode 100644 meta/recipes-bsp/lrzsz/lrzsz-0.12.20/autotools.patch
 delete mode 100644 meta/recipes-bsp/lrzsz/lrzsz-0.12.20/cve-2018-10195.patch
 delete mode 100644 meta/recipes-bsp/lrzsz/lrzsz-0.12.20/gettext.patch
 delete mode 100644 meta/recipes-bsp/lrzsz/lrzsz-0.12.20/include.patch
 delete mode 100644 meta/recipes-bsp/lrzsz/lrzsz-0.12.20/lrzsz-check-locale.h.patch
 delete mode 100644 meta/recipes-bsp/lrzsz/lrzsz-0.12.20/lrzsz_fix_for_automake-1.12.patch
 delete mode 100644 meta/recipes-bsp/lrzsz/lrzsz-0.12.20/makefile.patch
 delete mode 100644 meta/recipes-bsp/lrzsz/lrzsz_0.12.20.bb
meta/conf/distro/include/maintainers.inc +0 -1
index a289008b8c1..985c91bdfac 100644
@@ -450,7 +450,6 @@ RECIPE_MAINTAINER_pn-linux-yocto-rt = "Bruce Ashfield <[email protected]>
 RECIPE_MAINTAINER_pn-linux-yocto-tiny = "Bruce Ashfield <[email protected]>"
 RECIPE_MAINTAINER_pn-llvm = "Khem Raj <[email protected]>"
 RECIPE_MAINTAINER_pn-logrotate = "Yi Zhao <[email protected]>"
-RECIPE_MAINTAINER_pn-lrzsz = "Anuj Mittal <[email protected]>"
 RECIPE_MAINTAINER_pn-lsb-release = "Hongxu Jia <[email protected]>"
 RECIPE_MAINTAINER_pn-lsof = "Ross Burton <[email protected]>"
 RECIPE_MAINTAINER_pn-ltp = "Yi Zhao <[email protected]>"
meta/recipes-bsp/lrzsz/lrzsz-0.12.20/acdefine.patch deleted +0 -19
deleted file mode 100644
index 682cf416e22..00000000000
@@ -1,19 +0,0 @@
-Add a description to the AC_DEFINE for LOCALEDIR so that it appears in config.h
-and silences a fatal warning.
-
-Upstream-Status:Pending
-Signed-off-by: Ross Burton <[email protected]>
-
-diff --git a/configure.in b/configure.in
-index c10460c..aa20263 100644
---- a/configure.in
-+++ b/configure.in
-@@ -258,7 +258,7 @@ AC_SUBST(LIBS)
- 
- AM_GNU_GETTEXT
- 
--AC_DEFINE_UNQUOTED(LOCALEDIR,"$prefix/$DATADIRNAME")
-+AC_DEFINE_UNQUOTED(LOCALEDIR,"$prefix/$DATADIRNAME",[locale directory])
- 
- AC_OUTPUT([Makefile intl/Makefile lib/Makefile testsuite/Makefile  m4/Makefile \
- man/Makefile po/Makefile.in src/Makefile debian/rules Specfile systype \
meta/recipes-bsp/lrzsz/lrzsz-0.12.20/autotools.patch deleted +0 -39
deleted file mode 100644
index 394519855e1..00000000000
@@ -1,39 +0,0 @@
-Upstream-Status: Inappropriate [configuration]
-
---- lrzsz-0.12.20/acinclude.m4~autotools	1998-12-27 17:08:59.000000000 -0500
-+++ lrzsz-0.12.20/acinclude.m4	2004-05-09 22:26:19.000000000 -0400
-@@ -1,12 +1,11 @@
- dnl AC_REPLACE_GNU_GETOPT
--AC_DEFUN(AC_REPLACE_GNU_GETOPT,
--[AC_CHECK_FUNC(getopt_long, , [LIBOBJS="$LIBOBJS getopt1.o getopt.o"])
--AC_SUBST(LIBOBJS)dnl
--])
-+AC_DEFUN([AC_REPLACE_GNU_GETOPT],
-+[AC_CHECK_FUNC(getopt_long, , [AC_LIBOBJ([getopt1])
-+AC_LIBOBJ([getopt])dnl])])
- 
- dnl
- dnl taken from taylor uucp
--AC_DEFUN(LRZSZ_ERRNO_DECL,[
-+AC_DEFUN([LRZSZ_ERRNO_DECL],[
- AC_MSG_CHECKING(for errno declaration)
- AC_CACHE_VAL(lrzsz_cv_decl_errno,
- [AC_TRY_COMPILE([#include <errno.h>], [int i = errno; errno = 1;],
-@@ -23,7 +21,7 @@
- ])
- 
- dnl LRZSZ_TYPE_SPEED_T
--AC_DEFUN(LRZSZ_TYPE_SPEED_T,[
-+AC_DEFUN([LRZSZ_TYPE_SPEED_T],[
- AC_REQUIRE([AC_HEADER_STDC])dnl
- AC_REQUIRE([LRZSZ_HEADERS_TERM_IO])dnl
- AC_MSG_CHECKING(for speed_t)
-@@ -61,7 +59,7 @@
- fi
- ])
- 
--AC_DEFUN(lrzsz_HEADER_SYS_SELECT,
-+AC_DEFUN([lrzsz_HEADER_SYS_SELECT],
- [AC_CACHE_CHECK([whether sys/time.h and sys/select.h may both be included],
-   lrzsz_cv_header_sys_select,
- [AC_TRY_COMPILE([#include <sys/types.h>
meta/recipes-bsp/lrzsz/lrzsz-0.12.20/cve-2018-10195.patch deleted +0 -28
deleted file mode 100644
index dea298634f0..00000000000
@@ -1,28 +0,0 @@
-Integer overflow in src/zm.c:zsdata() causes crash in sz and can leak information to receiver.
-
-Patch taken from Fedora.
-
-CVE: CVE-2018-10195
-Upstream-Status: Inappropriate (dead upstream)
-Signed-off-by: Ross Burton <[email protected]>
-
-diff -urN lrzsz-0.12.20/src/zm.c lrzsz-0.12.20.new/src/zm.c
---- lrzsz-0.12.20/src/zm.c	Tue Dec 29 09:48:38 1998
-+++ lrzsz-0.12.20.new/src/zm.c	Tue Oct  8 12:46:58 2002
-@@ -431,10 +431,12 @@
- 	VPRINTF(3,("zsdata: %lu %s", (unsigned long) length, 
- 		Zendnames[(frameend-ZCRCE)&3]));
- 	crc = 0;
--	do {
--		zsendline(*buf); crc = updcrc((0377 & *buf), crc);
--		buf++;
--	} while (--length>0);
-+
-+	for( ; length; length--) {
-+	  zsendline(*buf); crc = updcrc((0377 & *buf), crc);
-+	  buf++;
-+	}
-+
- 	xsendline(ZDLE); xsendline(frameend);
- 	crc = updcrc(frameend, crc);
- 
\ No newline at end of file
meta/recipes-bsp/lrzsz/lrzsz-0.12.20/gettext.patch deleted +0 -21884

2,906 lines not on this page · raw message

meta/recipes-bsp/lrzsz/lrzsz-0.12.20/include.patch deleted +0 -25
deleted file mode 100644
index 5fcb3aa92b5..00000000000

Lines of this file are not shown. View the raw message.

meta/recipes-bsp/lrzsz/lrzsz-0.12.20/lrzsz-check-locale.h.patch deleted +0 -32
deleted file mode 100644
index 9e46dfa070f..00000000000

Lines of this file are not shown. View the raw message.

meta/recipes-bsp/lrzsz/lrzsz-0.12.20/lrzsz_fix_for_automake-1.12.patch deleted +0 -49

49 lines not on this page · raw message

meta/recipes-bsp/lrzsz/lrzsz-0.12.20/makefile.patch deleted +0 -22
deleted file mode 100644
index ace592c8f26..00000000000

Lines of this file are not shown. View the raw message.

meta/recipes-bsp/lrzsz/lrzsz_0.12.20.bb deleted +0 -50

50 lines not on this page · raw message

meta/recipes-core/packagegroups/packagegroup-base.bb +1 -1
index 1f802da09b7..610b1e0216e 100644

Lines of this file are not shown. View the raw message.

meta/recipes-extended/minicom/minicom_2.7.1.bb +0 -2
index 1e6f1317ebe..1dbb8c0316b 100644

Lines of this file are not shown. View the raw message.

The rest of this diff is not shown. View the raw message.

Signature · 1 line
2.17.1

Part of the diff is not shown here. View the raw message.

#9 lore raw

Re: [PATCH 08/11] lrzsz: remove the recipe

Quoted 1 line · Alexander Kanavin

This is 2019; last release of lrzsz was in 1998.

The protocols are not changing.

Quoted 3 lines

Using serial lines for console work may have its uses, but for transferring files please set up proper networking.
...

I've had several recent embedded experiences where this was impossible, and lrzsz was extremely useful.

cu
Adrian

#10 lore raw

Re: [PATCH 08/11] lrzsz: remove the recipe

Quoted 7 lines · Adrian Bunk
Quoted 3 lines

Using serial lines for console work may have its uses, but for transferring files please set up proper networking.
...

I've had several recent embedded experiences where this was impossible, and lrzsz was extremely useful.

Do you want to maintain it? Protocols are not changing, but the software that lrzsz depends on is changing.

Your first task would be making it build with the latest version of gettext, the branch containing that is here:

http://git.yoctoproject.org/cgit/cgit.cgi/poky-contrib/log/?h=akanavin/package-version-updates

Alex

#11 lore raw

Re: [PATCH 08/11] lrzsz: remove the recipe

Quoted 6 lines · Alexander Kanavin
Quoted 4 lines · Adrian Bunk
Quoted 3 lines

Using serial lines for console work may have its uses, but for transferring files please set up proper networking.
...

Quoted 6 lines
Quoted 3 lines

I've had several recent embedded experiences where this was impossible, and lrzsz was extremely useful.

Do you want to maintain it?
...

Did you already contact the maintainer whose name your patch removes from maintainers.inc?

Quoted 1 line

Alex

cu
Adrian

#12 lore raw

Re: [PATCH 08/11] lrzsz: remove the recipe

Quoted 5 lines · Adrian Bunk
Quoted 1 line

Do you want to maintain it?

Did you already contact the maintainer whose name your patch removes from maintainers.inc?

Most entries in oe-core's maintainers.inc do not carry any real responsibility or commitment; they're there mostly so that monthly emails from auto upgrade helper end up with someone. Actual maintenance comes from those who use and need the components.

I can certainly ask Anuj, but I bet he has no interest in lrzsz whatsoever.

Alex

#13 lore raw

Re: [PATCH 08/11] lrzsz: remove the recipe

In reply to Alexander Kanavin
Quoted 5 lines · Alexander Kanavin

Do you want to maintain it? Protocols are not changing, but the software that lrzsz depends on is changing.

Your first task would be making it build with the latest version of gettext, the branch containing that is here:

If this is the actual reason for removing lrszsz, the commit message should say so. As it stands, this patch provides no meaningful justification for why the package should be removed, it just contains a statement about the last release having been a long time ago (which may be true, but isn't obviously relevant) and some vague sneering about "proper networking" which doesn't seem to be helpful either.

p.

#14 lore raw

Re: [PATCH 08/11] lrzsz: remove the recipe

Quoted 7 lines · Phil Blundell

If this is the actual reason for removing lrszsz, the commit message should say so. As it stands, this patch provides no meaningful justification for why the package should be removed, it just contains a statement about the last release having been a long time ago (which may be true, but isn't obviously relevant) and some vague sneering about "proper networking" which doesn't seem to be helpful either.

The gettext problem is the immediate reason, but the broader reason is that the code is not maintained, and we should try to avoid burdening the project with unmaintained code. There's already 8 custom patches fixing issues caused by lack of upstream maintenance, and the gettext certainly won't be the last required fix. I have no interest in zmodem transfers, thus I opted for recipe removal.

When the last release was is quite relevant from that perspective.

Alex

#15 lore raw

Re: [PATCH 08/11] lrzsz: remove the recipe

Quoted 6 lines · Alexander Kanavin

The gettext problem is the immediate reason, but the broader reason is that the code is not maintained, and we should try to avoid burdening the project with unmaintained code. There's already 8 custom patches fixing issues caused by lack of upstream maintenance, and the gettext certainly won't be the last required fix. I have no interest in zmodem transfers, thus I opted for recipe removal.

I don't in general buy the line of argument that "I have no interest in X, and I want to make some change that happens to break X, ergo X should be removed", but in this particular case it probably is true that lrzsz has few enough users that it wouldn't qualify for inclusion in oe-core if someone were trying to add it nowadays. So if it represents a net maintenance burden then, although I do still use it myself from time to time, I would be OK with it being removed from oe-core.

However, I think the point still stands that the commit message needs to provide a better description of why the package is being removed. If you think it represents an ongoing maintenance headache that's already bad and only going to get worse, and this now outweighs its usefulness, let's just say that. Not all old software is problematic, and not all problematic software is old; the fact that the last release was 20 years ago is an interesting fact but in isolation that doesn't represent a problem. Indeed, compared to some other packages in oe-core, eight patches in total over a 20-year period doesn't seem like that bad of an average.

p.

#16 lore raw

Re: [PATCH 08/11] lrzsz: remove the recipe

Quoted 10 lines · Phil Blundell

However, I think the point still stands that the commit message needs to provide a better description of why the package is being removed. If you think it represents an ongoing maintenance headache that's already bad and only going to get worse, and this now outweighs its usefulness, let's just say that. Not all old software is problematic, and not all problematic software is old; the fact that the last release was 20 years ago is an interesting fact but in isolation that doesn't represent a problem. Indeed, compared to some other packages in oe-core, eight patches in total over a 20-year period doesn't seem like that bad of an average.

Fair enough, I wrote a hasty commit message. Mistakes happen.

Can I say what my problem is? Here goes: so far, no one in this discussion offered actual help with the actual issue. If you need this or that functionality from Yocto, please try to place help ahead of complaints and criticism.

Alex

#17 lore raw

Re: [PATCH 08/11] lrzsz: remove the recipe

Quoted 13 lines · Alexander Kanavin
Quoted 10 lines · Phil Blundell

However, I think the point still stands that the commit message needs to provide a better description of why the package is being removed. If you think it represents an ongoing maintenance headache that's already bad and only going to get worse, and this now outweighs its usefulness, let's just say that. Not all old software is problematic, and not all problematic software is old; the fact that the last release was 20 years ago is an interesting fact but in isolation that doesn't represent a problem. Indeed, compared to some other packages in oe-core, eight patches in total over a 20-year period doesn't seem like that bad of an average.

Quoted 6 lines

Fair enough, I wrote a hasty commit message. Mistakes happen.

Can I say what my problem is? Here goes: so far, no one in this discussion offered actual help with the actual issue. If you need this or that functionality from Yocto, please try to place help ahead of complaints and criticism.

No, your problem is your way of communication.

It is a very unfriendly way of communication to request help in the form patch aiming at immediate removal.

It comes across as if you were just too lazy to even try to fix something another patch you are submitting is breaking.

You would have received more constructive answers if you would have started with an email describing the non-trivial technical problem where you need assistance.

Quoted 1 line

Alex

cu
Adrian

#18 lore raw

Re: [PATCH 08/11] lrzsz: remove the recipe

Quoted 21 lines · Adrian Bunk
Quoted 13 lines · Alexander Kanavin
Quoted 10 lines · Phil Blundell

However, I think the point still stands that the commit message needs to provide a better description of why the package is being removed. If you think it represents an ongoing maintenance headache that's already bad and only going to get worse, and this now outweighs its usefulness, let's just say that. Not all old software is problematic, and not all problematic software is old; the fact that the last release was 20 years ago is an interesting fact but in isolation that doesn't represent a problem. Indeed, compared to some other packages in oe-core, eight patches in total over a 20-year period doesn't seem like that bad of an average.

Quoted 6 lines

Fair enough, I wrote a hasty commit message. Mistakes happen.

Can I say what my problem is? Here goes: so far, no one in this discussion offered actual help with the actual issue. If you need this or that functionality from Yocto, please try to place help ahead of complaints and criticism.

Quoted 4 lines

No, your problem is your way of communication.

It is a very unfriendly way of communication to request help in the form patch aiming at immediate removal.

Hopefully everyone has calmed down overnight and we can continue this discussion politely?

Yes, Alex's commit message should have spelt out that both:
1) there are doubts anyone is actually using zmodem still (he did this)
2) the source is positively ancient and building it on modern linux is getting harder over time (this was implied by being in a series that upgraded gettext and fixed other recipes, instead of being spelt out).

So, if zmodem is still a useful feature to have in core, then is anyone willing to step up and either:
1) maintain the recipe. I'd love someone who uses lrzsz to put a fork up on github, integrate all of our patches, and start maintaining it. Maybe then other distributions who still ship it will join in too.
2) provide an alternative.

Ross

#19 lore raw

Re: [PATCH 08/11] lrzsz: remove the recipe

Quoted 22 lines · Ross Burton
Quoted 21 lines · Adrian Bunk
Quoted 19 lines · Alexander Kanavin
Quoted 10 lines · Phil Blundell

However, I think the point still stands that the commit message needs to provide a better description of why the package is being removed. If you think it represents an ongoing maintenance headache that's already bad and only going to get worse, and this now outweighs its usefulness, let's just say that. Not all old software is problematic, and not all problematic software is old; the fact that the last release was 20 years ago is an interesting fact but in isolation that doesn't represent a problem. Indeed, compared to some other packages in oe-core, eight patches in total over a 20-year period doesn't seem like that bad of an average.

Fair enough, I wrote a hasty commit message. Mistakes happen.

Can I say what my problem is? Here goes: so far, no one in this discussion offered actual help with the actual issue. If you need this or that functionality from Yocto, please try to place help ahead of complaints and criticism.

Quoted 7 lines
Quoted 4 lines

No, your problem is your way of communication.

It is a very unfriendly way of communication to request help in the form patch aiming at immediate removal.

Hopefully everyone has calmed down overnight and we can continue this discussion politely?

Agreed, lets keep this level headed!

Quoted 6 lines

Yes, Alex's commit message should have spelt out that both:
1) there are doubts anyone is actually using zmodem still (he did this)
2) the source is positively ancient and building it on modern linux is getting harder over time (this was implied by being in a series that upgraded gettext and fixed other recipes, instead of being spelt out).

Quoted 6 lines

So, if zmodem is still a useful feature to have in core, then is anyone willing to step up and either:
1) maintain the recipe. I'd love someone who uses lrzsz to put a fork up on github, integrate all of our patches, and start maintaining it. Maybe then other distributions who still ship it will join in too.
2) provide an alternative.

I just wanted to highlight that the way things are trending, its likely we'll end up with Linux builds alongside RTOS builds with multiconfig. These will likely need to communicate and the mechanism(s) for that remain to be seen. I know I've personally implemented xmodem and then ymodem as a way of dumping data out a microcontroller on a small project before, it makes for a simple/effective way of getting data over into Linux. I therefore have a slight inclination to try and keep this around if we can.

I do take the point about needing work to keep it maintained/working though :(.

Cheers,

Richard

#20 lore raw

Re: [PATCH 08/11] lrzsz: remove the recipe

Quoted 3 lines · Richard Purdie
Quoted 2 lines · Ross Burton

2) the source is positively ancient and building it on modern linux is getting harder over time

Just to put this in perspective, I tried fetching lrzsz-1.20.0.tar.gz from the upstream site, unpacked it on my Debian "buster" host, did "./configure && make" without modifying any files, and it built absolutely fine using gcc-8.3.0. There were a few compiler warnings but nothing worse than that.

Now, I am happy to accept that building it inside oe-core is somewhat more difficult, and regenerating the autotools bits using modern tools does look like it will require some patching, but I don't think we should exaggerate the extent to which "old code" equals "problematic code".

Quoted 4 lines

I just wanted to highlight that the way things are trending, its likely we'll end up with Linux builds alongside RTOS builds with multiconfig. These will likely need to communicate and the mechanism(s) for that remain to be seen.

meta-oe has a recipe for kermit... :-}

Quoted 5 lines

over into Linux. I therefore have a slight inclination to try and keep this around if we can.

I do take the point about needing work to keep it maintained/working though :(.

I also have at least a passing fondness for lrzsz and if a small amount of maintenance now will suffice to keep it working for another 21 years then I think I would consider that a good outcome. I will have a quick look at the code and see if I can fix whatever is apparently problematic about it.

I have no particular opinion as to whether it ought to stay in oe-core or move into some sort of meta-retrocomputing layer.

p.

#21 lore raw

Re: [PATCH 08/11] lrzsz: remove the recipe

Quoted 4 lines · Phil Blundell

Now, I am happy to accept that building it inside oe-core is somewhat more difficult, and regenerating the autotools bits using modern tools does look like it will require some patching, but I don't think we should exaggerate the extent to which "old code" equals "problematic code".

Yes, the pain is entirely in the autoreconf step. It's not a huge job, and it's probably easier to just delete it all and start again from scratch...

Quoted 5 lines

I also have at least a passing fondness for lrzsz and if a small amount of maintenance now will suffice to keep it working for another 21 years then I think I would consider that a good outcome. I will have a quick look at the code and see if I can fix whatever is apparently problematic about it.

Please do!

Debian has a pile of patches too: https://sources.debian.org/patches/lrzsz/0.12.21-10/

All hail the new maintainer of lrzsz. :)

Ross

#22 lore raw

Re: [PATCH 08/11] lrzsz: remove the recipe

In reply to Phil Blundell
Quoted 5 lines · Phil Blundell

I also have at least a passing fondness for lrzsz and if a small amount of maintenance now will suffice to keep it working for another 21 years then I think I would consider that a good outcome. I will have a quick look at the code and see if I can fix whatever is apparently problematic about it.

If you can send a patch sooner rather than later for lrzsz to fix the build with modern gettext then that would be *awesome*, as this recipe is the sole blocker.

Ross

#23 lore raw

Re: [PATCH 08/11] lrzsz: remove the recipe

Quoted 3 lines · Ross Burton

If you can send a patch sooner rather than later for lrzsz to fix the build with modern gettext then that would be *awesome*, as this recipe is the sole blocker.

This works for me and should resolve your immediate issue. We can think about a better long-term solution separately.

p.

From 3e0ebb6f0b5bbea515fea49fdda78b2916f54a39 Mon Sep 17 00:00:00 2001
From: Phil Blundell <[email protected]>
Date: Tue, 26 Nov 2019 11:55:59 +0000
Subject: [PATCH] lrzsz: Update autotools infrastructure and make it work with
new gettext

Run gettextize and autoreconf and fix up the resulting problem so that it builds more-or-less cleanly and "make dist" works. Some of the existing patches that contained particular point fixes are now rolled into a single big patch.

---
 .../lrzsz/lrzsz-0.12.20/acdefine.patch        |    19 -
 .../lrzsz-0.12.20/autotools-update.patch      | 36701 ++++++++++++++++
 .../lrzsz/lrzsz-0.12.20/gettext.patch         | 21884 ---------
 .../lrzsz_fix_for_automake-1.12.patch         |    49 -
 meta/recipes-bsp/lrzsz/lrzsz_0.12.20.bb       |     4 +-
 5 files changed, 36702 insertions(+), 21955 deletions(-)
 delete mode 100644 meta/recipes-bsp/lrzsz/lrzsz-0.12.20/acdefine.patch
 create mode 100644 meta/recipes-bsp/lrzsz/lrzsz-0.12.20/autotools-update.patch
 delete mode 100644 meta/recipes-bsp/lrzsz/lrzsz-0.12.20/gettext.patch
 delete mode 100644 meta/recipes-bsp/lrzsz/lrzsz-0.12.20/lrzsz_fix_for_automake-1.12.patch
meta/recipes-bsp/lrzsz/lrzsz-0.12.20/acdefine.patch deleted +0 -19
deleted file mode 100644
index 682cf416e2..0000000000
@@ -1,19 +0,0 @@
-Add a description to the AC_DEFINE for LOCALEDIR so that it appears in config.h
-and silences a fatal warning.
-
-Upstream-Status:Pending
-Signed-off-by: Ross Burton <[email protected]>
-
-diff --git a/configure.in b/configure.in
-index c10460c..aa20263 100644
---- a/configure.in
-+++ b/configure.in
-@@ -258,7 +258,7 @@ AC_SUBST(LIBS)
- 
- AM_GNU_GETTEXT
- 
--AC_DEFINE_UNQUOTED(LOCALEDIR,"$prefix/$DATADIRNAME")
-+AC_DEFINE_UNQUOTED(LOCALEDIR,"$prefix/$DATADIRNAME",[locale directory])
- 
- AC_OUTPUT([Makefile intl/Makefile lib/Makefile testsuite/Makefile  m4/Makefile \
- man/Makefile po/Makefile.in src/Makefile debian/rules Specfile systype \
meta/recipes-bsp/lrzsz/lrzsz-0.12.20/autotools-update.patch new file +36701 -0

2,981 lines not on this page · raw message

meta/recipes-bsp/lrzsz/lrzsz-0.12.20/gettext.patch deleted +0 -21884

21,884 lines not on this page · raw message

meta/recipes-bsp/lrzsz/lrzsz-0.12.20/lrzsz_fix_for_automake-1.12.patch deleted +0 -49

49 lines not on this page · raw message

meta/recipes-bsp/lrzsz/lrzsz_0.12.20.bb +1 -3
index 34556b2c29..4129237c59 100644

Lines of this file are not shown. View the raw message.

The rest of this diff is not shown. View the raw message.

Signature · 1 line
2.20.1

Part of the diff is not shown here. View the raw message.

#24 lore raw

Re: [PATCH 08/11] lrzsz: remove the recipe

Quoted 7 lines · Phil Blundell
Quoted 3 lines · Ross Burton

If you can send a patch sooner rather than later for lrzsz to fix the build with modern gettext then that would be *awesome*, as this recipe is the sole blocker.

This works for me and should resolve your immediate issue. We can think about a better long-term solution separately.

Incidentally, "gettextize -f" would have taken care of the majority of this. In autotools.bbclass we have:

		elif [ "${BPN}" != "gettext" ] && grep -q "^[[:space:]]*AM_GNU_GETTEXT" $CONFIGURE_AC; then
			# We'd call gettextize here if it wasn't so broken...

and we then proceed to do a slightly half-baked partial version of what gettextize would have done. This results in using the Makefile.in.in from the version of gettext that's in the sysroot, but without any of the other bits that gettextize would have copied and this is arguably the worst of all possible outcomes. Actually running gettextize is indeed problematic because it has a tendency to require you to press RETURN on the terminal (and it reads from /dev/tty to avoid any attempt to subvert this check by redirecting stdin!) but I think one could argue that if we can't/won't run the full gettextize then we oughtn't to be messing around with any of the files that it installs and we should rely on the ones that the upstream package shipped. That may not always work either, but I have at least half a suspicion that the current autotools.bbclass behaviour is creating as many problems as it solves.

p.

#25 lore raw

Re: [PATCH 08/11] lrzsz: remove the recipe

Quoted 15 lines · Phil Blundell
Quoted 7 lines · Phil Blundell
Quoted 3 lines · Ross Burton

If you can send a patch sooner rather than later for lrzsz to fix the build with modern gettext then that would be *awesome*, as this recipe is the sole blocker.

This works for me and should resolve your immediate issue. We can think about a better long-term solution separately.

Incidentally, "gettextize -f" would have taken care of the majority of this. In autotools.bbclass we have:

		elif [ "${BPN}" != "gettext" ] && grep -q "^[[:space:]]*AM_GNU_GETTEXT" $CONFIGURE_AC; then
			# We'd call gettextize here if it wasn't so broken...
Quoted 13 lines

and we then proceed to do a slightly half-baked partial version of what gettextize would have done. This results in using the Makefile.in.in from the version of gettext that's in the sysroot, but without any of the other bits that gettextize would have copied and this is arguably the worst of all possible outcomes. Actually running gettextize is indeed problematic because it has a tendency to require you to press RETURN on the terminal (and it reads from /dev/tty to avoid any attempt to subvert this check by redirecting stdin!) but I think one could argue that if we can't/won't run the full gettextize then we oughtn't to be messing around with any of the files that it installs and we should rely on the ones that the upstream package shipped. That may not always work either, but I have at least half a suspicion that the current autotools.bbclass behaviour is creating as many problems as it solves.

gettextize is dead, autopoint is the glorious future, and I've a branch that is practically complete implementing that (ross/autopoint).

Ross

#26 lore raw

Re: [PATCH 08/11] lrzsz: remove the recipe

In reply to Phil Blundell
Quoted 4 lines · Phil Blundell
Quoted 3 lines · Ross Burton

If you can send a patch sooner rather than later for lrzsz to fix the build with modern gettext then that would be *awesome*, as this recipe is the sole blocker.

We run autoreconf as part of do_configure, so why is this patch shipping replacement aclocal/configure/etc files that are going to be overwritten?

Ross

#27 lore raw

Re: [PATCH 08/11] lrzsz: remove the recipe

Quoted 8 lines · Ross Burton
Quoted 4 lines · Phil Blundell
Quoted 3 lines · Ross Burton

If you can send a patch sooner rather than later for lrzsz to fix the build with modern gettext then that would be *awesome*, as this recipe is the sole blocker.

We run autoreconf as part of do_configure, so why is this patch shipping replacement aclocal/configure/etc files that are going to be overwritten?

Because you said you wanted the patch sooner rather than later, and the easiest way to do that was to update the whole package to use modern autotools, generate a new tarball with "make dist", and then just generate a diff between the old and new tarballs. If what you actually want is a minimal patch, I can do that but it will take longer.

p.

#28 lore raw

Re: [PATCH 08/11] lrzsz: remove the recipe

In reply to Ross Burton
Quoted 7 lines · Ross Burton

...
So, if zmodem is still a useful feature to have in core, then is anyone willing to step up and either:
1) maintain the recipe. I'd love someone who uses lrzsz to put a fork up on github, integrate all of our patches, and start maintaining it. Maybe then other distributions who still ship it will join in too.
...

In embedded development there are some usecases left for this codebase from the 1980s that implements protocols that were widely popular in the 1980s and early 1990s.

Ancient code implementing obsolete ancient stuff is not fun to maintain.

There are also two higher level topics that should be discussed:

1. Removal of maintainers.inc
There is some nitpicking that every recipe needs a maintainer. For the package in question the maintainer is not involved in the discussion, and doesn't seem to have been asked for support or asked regarding the suggested removal.

2. Who is responsible for fixing gettext breakages in meta-oe? Alexander or Khem?

Quoted 1 line

Ross

cu
Adrian

#29 lore raw

Re: [PATCH 08/11] lrzsz: remove the recipe

Quoted 7 lines · Adrian Bunk

There are also two higher level topics that should be discussed:

1. Removal of maintainers.inc
There is some nitpicking that every recipe needs a maintainer. For the package in question the maintainer is not involved in the discussion, and doesn't seem to have been asked for support or asked regarding the suggested removal.

There are pros and cons to having it. Having people who help look after specific recipes is appreciated. Some maintainers are more active than others and people's free time varies. We found one of the corner cases here, the fact there are some surprises no one.

If we remove it does the situation improve? I'd say not.

FWIW the number of recipes up to date has improved recently (or feels to have) and the process does encourage people to send updates.

Reality is there are shades of grey. By that I mean that we are never going to have a 100% definitive/defined process which works all of the time in every case.

We're doing the best we can and I'm not sure this discussion is going to be productive as I don't see a path where this discussion improves things.

Quoted 2 lines

2. Who is responsible for fixing gettext breakages in meta-oe? Alexander or Khem?

or the wider community? They can certainly help.

Cheers,

Richard

#30 lore raw

PATCH 9/11 p11-kit: convert to meson

In reply to Alexander Kanavin
---
 .../p11-kit/p11-kit_0.23.18.1.bb              | 26 +++----------------
 1 file changed, 3 insertions(+), 23 deletions(-)
meta/recipes-support/p11-kit/p11-kit_0.23.18.1.bb +3 -23
index 9193a06ea80..dbf8fa2c468 100644
@@ -2,7 +2,7 @@ SUMMARY = "Provides a way to load and enumerate PKCS#11 modules"
 LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://COPYING;md5=02933887f609807fbb57aa4237d14a50"
 
-inherit autotools gettext pkgconfig gtk-doc
+inherit meson gettext pkgconfig gtk-doc
 
 DEPENDS = "libtasn1 libffi"
 
@@ -10,30 +10,10 @@ SRC_URI = "git://github.com/p11-glue/p11-kit"
 SRCREV = "b0ebe7555c291808db29377ba79cb8326301f0a6"
 S = "${WORKDIR}/git"
 
-AUTOTOOLS_AUXDIR = "${S}/build/litter"
-
 PACKAGECONFIG ??= ""
-PACKAGECONFIG[trust-paths] = "--with-trust-paths=/etc/ssl/certs/ca-certificates.crt,--without-trust-paths,,ca-certificates"
-
-# This recipe does not use the standard gtk-doc m4 macros, and so the ./configure flags
-# that control gtk-doc build are non-standard
-EXTRA_OECONF_prepend_class-target = "${@bb.utils.contains('GTKDOC_ENABLED', 'True', '--enable-doc --enable-doc-html --disable-doc-pdf', \
-                                                                                    '--disable-doc', d)} "
-
-# When building native recipes, disable gtkdoc, as it is not necessary,
-# pulls in additional dependencies, and makes build times longer
-EXTRA_OECONF_prepend_class-native = "--disable-doc "
-EXTRA_OECONF_prepend_class-nativesdk = "--disable-doc "
-
-UNKNOWN_CONFIGURE_WHITELIST_append = " --enable-gtk-doc-html --disable-gtk-doc-pdf --enable-gtk-doc --disable-gtk-doc"
+PACKAGECONFIG[trust-paths] = "-Dtrust_paths=/etc/ssl/certs/ca-certificates.crt,,,ca-certificates"
 
-# p11-kit relies on these two being copied from source tree
-# instead of being regenerated by gtkdoc-scan, but doesn't setup
-# dependencies correctly when there is a parallel build. Let's pre-copy
-# them instead.
-do_compile_prepend () {
-        cp ${S}/doc/manual/p11-kit-overrides.txt ${S}/doc/manual/p11-kit-sections.txt ${B}/doc/manual/
-}
+GTKDOC_MESON_OPTION = 'gtk_doc'
 
 FILES_${PN} += " \
     ${libdir}/p11-kit-proxy.so \
Signature · 1 line
2.17.1
#33 lore raw

PATCH 10/11 mc: backport a patch to fix builds with latest gettext

In reply to Alexander Kanavin
---
 ...29-configure.ac-drop-bundled-gettext.patch | 110 ++++++++++++++++++
 meta/recipes-extended/mc/mc_4.8.23.bb         |   1 +
 2 files changed, 111 insertions(+)
 create mode 100644 meta/recipes-extended/mc/files/0001-Ticket-3629-configure.ac-drop-bundled-gettext.patch
meta/recipes-extended/mc/files/0001-Ticket-3629-configure.ac-drop-bundled-gettext.patch new file +110 -0
new file mode 100644
index 00000000000..8f357378d02
@@ -0,0 +1,110 @@
+From 0d677a014a87b968d79eea2353ac4e342b0fd4ca Mon Sep 17 00:00:00 2001
+From: Sergei Trofimovich <[email protected]>
+Date: Wed, 11 Sep 2019 22:58:18 +0100
+Subject: [PATCH] Ticket #3629: configure.ac: drop bundled gettext
+
+Bundled libintl did not support linking to internal static
+libraries (libmc in our case): directly specified static
+libraries are not pulled by libtool and are not usable for
+dynamic libraries as PIC-related flags are not passed for
+compilation.
+
+This renders bundled libintl library unusable.
+
+The change drops libintl bundling support and always relies
+on external libintl (or falls back to disabled NLS).
+
+On a related note gettext-0.20 drops support for bundling
+or libintl and this change will ease migration to newer version.
+
+The change is tested on x86_64-gentoo-linux-musl: mc builds
+and links all tests successfully. A few tests fail for lack
+of NLS support.
+
+Upstream-Status: Backport [https://github.com/MidnightCommander/mc/commit/f30e6ff283f4bc86177e4360de94dad794678395]
+Signed-off-by: Sergei Trofimovich <[email protected]>
+Signed-off-by: Andrew Borodin <[email protected]>
+Signed-off-by: Alexander Kanavin <[email protected]>
+---
+ Makefile.am           | 2 +-
+ configure.ac          | 5 +++--
+ doc/doxygen.cfg       | 2 +-
+ lib/Makefile.am       | 2 +-
+ m4.include/mc-i18n.m4 | 5 -----
+ 5 files changed, 6 insertions(+), 10 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index ac05a83..f86f6ed 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -1,7 +1,7 @@
+ ## Process this file with automake to create Makefile.in.
+ AUTOMAKE_OPTIONS = 1.5
+ 
+-SUBDIRS = intl po lib src doc contrib misc
++SUBDIRS = po lib src doc contrib misc
+ 
+ if HAVE_TESTS
+     SUBDIRS += tests
+diff --git a/configure.ac b/configure.ac
+index a1948f6..bbc9e71 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -272,7 +272,9 @@ dnl ############################################################################
+ dnl Internationalization
+ dnl ############################################################################
+ 
+-AM_GNU_GETTEXT([no-libtool], [need-ngettext])
++AC_CHECK_FUNCS([setlocale])
++
++AM_GNU_GETTEXT([external], [need-ngettext])
+ AM_GNU_GETTEXT_VERSION([0.18.1])
+ 
+ mc_I18N
+@@ -680,7 +682,6 @@ doc/hlp/pl/Makefile
+ doc/hlp/ru/Makefile
+ doc/hlp/sr/Makefile
+ 
+-intl/Makefile
+ po/Makefile.in
+ ])
+ 
+diff --git a/doc/doxygen.cfg b/doc/doxygen.cfg
+index 07bc973..1118062 100644
+--- a/doc/doxygen.cfg
++++ b/doc/doxygen.cfg
+@@ -91,7 +91,7 @@ FILE_PATTERNS          = *.c \
+ RECURSIVE              = YES
+ EXCLUDE                =
+ EXCLUDE_SYMLINKS       = NO
+-EXCLUDE_PATTERNS       = */intl/* */tests/* */.git/*
++EXCLUDE_PATTERNS       = */tests/* */.git/*
+ EXCLUDE_SYMBOLS        =
+ EXAMPLE_PATH           = $(SRCDIR)
+ EXAMPLE_PATTERNS       =
+diff --git a/lib/Makefile.am b/lib/Makefile.am
+index c448e2d..455f9dd 100644
+--- a/lib/Makefile.am
++++ b/lib/Makefile.am
+@@ -74,4 +74,4 @@ else
+     libmc_la_LIBADD += $(GLIB_LIBS)
+ endif
+ 
+-libmc_la_LIBADD += $(PCRE_LIBS) $(LIBICONV) $(LIBINTL)
++libmc_la_LIBADD += $(PCRE_LIBS)
+diff --git a/m4.include/mc-i18n.m4 b/m4.include/mc-i18n.m4
+index dd10d00..ec08324 100644
+--- a/m4.include/mc-i18n.m4
++++ b/m4.include/mc-i18n.m4
+@@ -8,11 +8,6 @@ dnl @license GPL
+ dnl @copyright Free Software Foundation, Inc.
+ 
+ AC_DEFUN([mc_I18N],[
+-
+-    if test "x$USE_INCLUDED_LIBINTL" = xyes; then
+-        CPPFLAGS="$CPPFLAGS -I\$(top_builddir)/intl -I\$(top_srcdir)/intl"
+-    fi
+-
+     dnl User visible support for charset conversion.
+     AC_ARG_ENABLE([charset],
+         AS_HELP_STRING([--enable-charset], [Support for charset selection and conversion @<:@yes@:>@]))
meta/recipes-extended/mc/mc_4.8.23.bb +1 -0
index 71f61b48485..ac40e561832 100644
@@ -9,6 +9,7 @@ RDEPENDS_${PN} = "ncurses-terminfo"
 SRC_URI = "http://www.midnight-commander.org/downloads/${BPN}-${PV}.tar.bz2 \
            file://0001-mc-replace-perl-w-with-use-warnings.patch \
            file://0001-Add-option-to-control-configure-args.patch \
+           file://0001-Ticket-3629-configure.ac-drop-bundled-gettext.patch \
            "
 SRC_URI[md5sum] = "152927ac29cf0e61d7d019f261bb7d89"
 SRC_URI[sha256sum] = "238c4552545dcf3065359bd50753abbb150c1b22ec5a36eaa02c82808293267d"
Signature · 1 line
2.17.1
#34 lore raw

PATCH 11/11 systemtap: update to 4.2

In reply to Alexander Kanavin
---
 meta/recipes-kernel/systemtap/systemtap_git.inc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
meta/recipes-kernel/systemtap/systemtap_git.inc +2 -2
index abb2b3743b4..116e83fe0ff 100644
@@ -1,7 +1,7 @@
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
-SRCREV = "57c9aca9f1ff32a6add10e02ecd33b7314fad499"
-PV = "4.1+git${SRCPV}"
+SRCREV = "044a0640985ef007c0b2fb6eaf660d9d51800cda"
+PV = "4.2"
 
 SRC_URI = "git://sourceware.org/git/systemtap.git \
            file://0001-Do-not-let-configure-write-a-python-location-into-th.patch \
Signature · 1 line
2.17.1