[meta-networking][PATCH 0/5] Networking fixes and upgrades

[meta-networking][PATCH 0/5] Networking fixes and upgrades

[Paul Eggleton]

Fix a couple of issues in the ntp recipe reported by Philip Balister
(the file locations patch was previously posted separately; this
version is identical). Also upgrade a few recipes.


The following changes since commit 2ea3a19a478c526baa04d6b9a9e8c9f42aae9d34:

  ctapi-common: Add new recipe (2014-12-31 16:38:22 +0100)

are available in the git repository at:

  git://git.openembedded.org/meta-openembedded-contrib paule/networking-fixes
  http://cgit.openembedded.org/cgit.cgi/meta-openembedded-contrib/log/?h=paule/networking-fixes

Paul Eggleton (5):
  ntp: fix file locations
  ntp: add explicit perl dependency to ntp-utils package
  mtr: update to 0.86
  traceroute: update to 2.0.21
  dnsmasq: update to 2.72

 .../recipes-support/dnsmasq/dnsmasq_2.71.bb        | 10 -------
 .../recipes-support/dnsmasq/dnsmasq_2.72.bb        | 10 +++++++
 .../recipes-support/mtr/files/configure.patch      | 12 ---------
 .../recipes-support/mtr/files/no-gtk.patch         | 31 ----------------------
 .../mtr/{mtr_0.82.bb => mtr_0.86.bb}               | 10 +++----
 meta-networking/recipes-support/ntp/ntp_4.2.8.bb   | 22 +++++++--------
 .../{traceroute_2.0.20.bb => traceroute_2.0.21.bb} |  6 ++---
 7 files changed, 28 insertions(+), 73 deletions(-)
 delete mode 100644 meta-networking/recipes-support/dnsmasq/dnsmasq_2.71.bb
 create mode 100644 meta-networking/recipes-support/dnsmasq/dnsmasq_2.72.bb
 delete mode 100644 meta-networking/recipes-support/mtr/files/configure.patch
 delete mode 100644 meta-networking/recipes-support/mtr/files/no-gtk.patch
 rename meta-networking/recipes-support/mtr/{mtr_0.82.bb => mtr_0.86.bb} (51%)
 rename meta-networking/recipes-support/traceroute/{traceroute_2.0.20.bb => traceroute_2.0.21.bb} (89%)

-- 
1.9.3

[meta-networking][PATCH 1/5] ntp: fix file locations

[Paul Eggleton]

After the upgrade to 4.2.8, ntp's configure process now uses a custom
script which looks at the host to determine what install locations it
should use. This resulted in the recipe working on some people's
machines and failing during do_install on others. Force it to use the
"redhat" configuration as this seems closest to what we used to be
using prior to the upgrade (this means that binaries are now back in
sbindir as they used to be).

Thanks to Philip Balister for reporting this.

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
 meta-networking/recipes-support/ntp/ntp_4.2.8.bb | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/meta-networking/recipes-support/ntp/ntp_4.2.8.bb b/meta-networking/recipes-support/ntp/ntp_4.2.8.bb
index 7e1b1c1..e14921a 100644
--- a/meta-networking/recipes-support/ntp/ntp_4.2.8.bb
+++ b/meta-networking/recipes-support/ntp/ntp_4.2.8.bb
@@ -35,6 +35,7 @@ EXTRA_OECONF += "--with-net-snmp-config=no \
                  --without-ntpsnmpd \
                  ac_cv_header_readline_history_h=no \
                  --with-yielding_select=yes \
+                 --with-locfile=redhat \
                  "
 CFLAGS_append = " -DPTYS_ARE_GETPT -DPTYS_ARE_SEARCHED"
 
@@ -71,10 +72,10 @@ do_install_append() {
     sed -i 's!/etc/!${sysconfdir}/!g' ${D}${sysconfdir}/init.d/ntpd ${D}${bindir}/ntpdate-sync
     sed -i 's!/var/!${localstatedir}/!g' ${D}${sysconfdir}/init.d/ntpd ${D}${bindir}/ntpdate-sync
     sed -i 's!^PATH=.*!PATH=${base_sbindir}:${base_bindir}:${sbindir}:${bindir}!' ${D}${bindir}/ntpdate-sync
-    sed -i '1s,#!.*perl -w,#! ${bindir}/env perl,' ${D}${bindir}/ntptrace
-    sed -i '/use/i use warnings;' ${D}${bindir}/ntptrace
-    sed -i '1s,#!.*perl -w,#! ${bindir}/env perl,' ${D}${bindir}/ntp-wait
-    sed -i '/use/i use warnings;' ${D}${bindir}/ntp-wait
+    sed -i '1s,#!.*perl -w,#! ${bindir}/env perl,' ${D}${sbindir}/ntptrace
+    sed -i '/use/i use warnings;' ${D}${sbindir}/ntptrace
+    sed -i '1s,#!.*perl -w,#! ${bindir}/env perl,' ${D}${sbindir}/ntp-wait
+    sed -i '/use/i use warnings;' ${D}${sbindir}/ntp-wait
 
     install -d ${D}/${sysconfdir}/default
     install -m 644 ${WORKDIR}/ntpdate.default ${D}${sysconfdir}/default/ntpdate
@@ -90,8 +91,6 @@ do_install_append() {
 
     install -d ${D}${systemd_unitdir}/ntp-units.d
     install -m 0644 ${WORKDIR}/ntpd.list ${D}${systemd_unitdir}/ntp-units.d/60-ntpd.list
-
-    rmdir ${D}${sbindir}
 }
 
 PACKAGES += "ntpdate sntp ${PN}-tickadj ${PN}-utils"
@@ -120,19 +119,19 @@ RCONFLICTS_ntpdate += "ntpdate-systemd"
 
 RSUGGESTS_${PN} = "iana-etc"
 
-FILES_${PN} = "${bindir}/ntpd ${sysconfdir}/ntp.conf ${sysconfdir}/init.d/ntpd ${libdir} \
+FILES_${PN} = "${sbindir}/ntpd ${sysconfdir}/ntp.conf ${sysconfdir}/init.d/ntpd ${libdir} \
     ${NTP_USER_HOME} \
     ${systemd_unitdir}/ntp-units.d/60-ntpd.list \
 "
-FILES_${PN}-tickadj = "${bindir}/tickadj"
-FILES_${PN}-utils = "${bindir} ${datadir}/ntp/lib"
-FILES_ntpdate = "${bindir}/ntpdate \
+FILES_${PN}-tickadj = "${sbindir}/tickadj"
+FILES_${PN}-utils = "${sbindir} ${datadir}/ntp/lib"
+FILES_ntpdate = "${sbindir}/ntpdate \
     ${sysconfdir}/network/if-up.d/ntpdate-sync \
     ${bindir}/ntpdate-sync \
     ${sysconfdir}/default/ntpdate \
     ${systemd_unitdir}/system/ntpdate.service \
 "
-FILES_sntp = "${bindir}/sntp \
+FILES_sntp = "${sbindir}/sntp \
               ${sysconfdir}/default/sntp \
               ${systemd_unitdir}/system/sntp.service \
              "
-- 
1.9.3

[meta-networking][PATCH 2/5] ntp: add explicit perl dependency to ntp-utils package

[Paul Eggleton]

The ntp-utils package contains at least one perl-using script as well as
a supporting perl module, therefore we need a dependency on perl.

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
 meta-networking/recipes-support/ntp/ntp_4.2.8.bb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/meta-networking/recipes-support/ntp/ntp_4.2.8.bb b/meta-networking/recipes-support/ntp/ntp_4.2.8.bb
index e14921a..9f74f6b 100644
--- a/meta-networking/recipes-support/ntp/ntp_4.2.8.bb
+++ b/meta-networking/recipes-support/ntp/ntp_4.2.8.bb
@@ -125,6 +125,7 @@ FILES_${PN} = "${sbindir}/ntpd ${sysconfdir}/ntp.conf ${sysconfdir}/init.d/ntpd
 "
 FILES_${PN}-tickadj = "${sbindir}/tickadj"
 FILES_${PN}-utils = "${sbindir} ${datadir}/ntp/lib"
+RDEPENDS_${PN}-utils += "perl"
 FILES_ntpdate = "${sbindir}/ntpdate \
     ${sysconfdir}/network/if-up.d/ntpdate-sync \
     ${bindir}/ntpdate-sync \
-- 
1.9.3

[meta-networking][PATCH 3/5] mtr: update to 0.86

[Paul Eggleton]

* Newer automake compatibility fixed upstream, so drop patches.
* LIC_FILES_CHKSUM changed due to a trailing space being removed, no
  actual change to the license text.

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
 .../recipes-support/mtr/files/configure.patch      | 12 ---------
 .../recipes-support/mtr/files/no-gtk.patch         | 31 ----------------------
 .../mtr/{mtr_0.82.bb => mtr_0.86.bb}               | 10 +++----
 3 files changed, 4 insertions(+), 49 deletions(-)
 delete mode 100644 meta-networking/recipes-support/mtr/files/configure.patch
 delete mode 100644 meta-networking/recipes-support/mtr/files/no-gtk.patch
 rename meta-networking/recipes-support/mtr/{mtr_0.82.bb => mtr_0.86.bb} (51%)

diff --git a/meta-networking/recipes-support/mtr/files/configure.patch b/meta-networking/recipes-support/mtr/files/configure.patch
deleted file mode 100644
index c978b87..0000000
--- a/meta-networking/recipes-support/mtr/files/configure.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: mtr-0.82/configure.in
-===================================================================
---- mtr-0.82.orig/configure.in	2014-07-16 19:52:56.306026346 +0000
-+++ mtr-0.82/configure.in	2014-07-17 21:59:03.208587150 +0000
-@@ -1,5 +1,5 @@
--AC_INIT(mtr.c)
--AM_INIT_AUTOMAKE(mtr, 0.82)
-+AC_INIT(mtr.c, 0.82)
-+AM_INIT_AUTOMAKE([foreign])
- 
- 
- AC_SUBST(GTK_OBJ)
diff --git a/meta-networking/recipes-support/mtr/files/no-gtk.patch b/meta-networking/recipes-support/mtr/files/no-gtk.patch
deleted file mode 100644
index 0dbeb7a..0000000
--- a/meta-networking/recipes-support/mtr/files/no-gtk.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-Disable gtk check that breaks with current autotools
-
-Ideally we would have a proper fix for this and send that upstream instead.
-
-Upstream-Status: Pending
-
-Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
-
-diff --git a/configure.in b/configure.in
-index 8474543..5118565 100644
---- a/configure.in
-+++ b/configure.in
-@@ -48,16 +48,8 @@ AC_ARG_ENABLE(ipv6,
- [  --disable-ipv6          Do not enable IPv6],
- WANTS_IPV6=$enableval, WANTS_IPV6=yes)
-    
--if test "x$WANTS_GTK" = "xyes"; then
--        AM_PATH_GTK_2_0(2.6.0, CFLAGS="$CFLAGS $GTK_CFLAGS"
--                           LIBS="$LIBS $GTK_LIBS -lm",
--                           AC_MSG_WARN(Building without GTK2 display support)
--                   AC_DEFINE(NO_GTK, 1, [Define if you don't have the GTK+ libraries available.])
--                           GTK_OBJ="")
--else
--	AC_DEFINE(NO_GTK)
--	GTK_OBJ=""
--fi
-+AC_DEFINE(NO_GTK, 1, [Define if you don't have the GTK+ libraries available.])
-+GTK_OBJ=""
- 
- AC_CHECK_FUNC(socket, , 
-   AC_CHECK_LIB(socket, socket, , AC_MSG_ERROR(No socket library found)))
diff --git a/meta-networking/recipes-support/mtr/mtr_0.82.bb b/meta-networking/recipes-support/mtr/mtr_0.86.bb
similarity index 51%
rename from meta-networking/recipes-support/mtr/mtr_0.82.bb
rename to meta-networking/recipes-support/mtr/mtr_0.86.bb
index b9a1ea2..a60bd34 100644
--- a/meta-networking/recipes-support/mtr/mtr_0.82.bb
+++ b/meta-networking/recipes-support/mtr/mtr_0.86.bb
@@ -5,14 +5,12 @@ DEPENDS = "ncurses"
 
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \
-                    file://mtr.c;beginline=5;endline=16;md5=56e390ced194aff352eefab404883057"
+                    file://mtr.c;beginline=5;endline=16;md5=af1fafbbfa1bfd48af839f4bb3221106"
 
-SRC_URI = "ftp://ftp.bitwizard.nl/mtr/mtr-${PV}.tar.gz \
-           file://configure.patch \
-           file://no-gtk.patch"
+SRC_URI = "ftp://ftp.bitwizard.nl/mtr/mtr-${PV}.tar.gz"
 
-SRC_URI[md5sum] = "10601ea543fda3e51545c4bce195b64c"
-SRC_URI[sha256sum] = "f3b457c9623ae03565688a7ffd49d4843a5e2505ccaf3ba8d9fbd86e3ce9b6a0"
+SRC_URI[md5sum] = "8d63592c9d4579ef20cf491b41843eb2"
+SRC_URI[sha256sum] = "c5d948920b641cc35f8b380fc356ddfe07cce6a9c6474afe242fc58113f28c06"
 
 inherit autotools
 
-- 
1.9.3

[meta-networking][PATCH 4/5] traceroute: update to 2.0.21

[Paul Eggleton]

Also fix LICENSE to be "or any later version" (as specified in the
upstream source headers); both licenses apply so use &.

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
 .../traceroute/{traceroute_2.0.20.bb => traceroute_2.0.21.bb}       | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
 rename meta-networking/recipes-support/traceroute/{traceroute_2.0.20.bb => traceroute_2.0.21.bb} (89%)

diff --git a/meta-networking/recipes-support/traceroute/traceroute_2.0.20.bb b/meta-networking/recipes-support/traceroute/traceroute_2.0.21.bb
similarity index 89%
rename from meta-networking/recipes-support/traceroute/traceroute_2.0.20.bb
rename to meta-networking/recipes-support/traceroute/traceroute_2.0.21.bb
index 4476670..9eb667d 100644
--- a/meta-networking/recipes-support/traceroute/traceroute_2.0.20.bb
+++ b/meta-networking/recipes-support/traceroute/traceroute_2.0.21.bb
@@ -7,7 +7,7 @@ tool.  If you're having network connectivity problems, traceroute will \
 show you where the trouble is coming from along the route."
 SECTION = "console/network"
 HOMEPAGE = "http://traceroute.sourceforge.net/"
-LICENSE = "GPL-2.0 LGPL-2.1"
+LICENSE = "GPL-2.0+ & LGPL-2.1+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
                     file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c"
 
@@ -17,8 +17,8 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/traceroute/traceroute/${BP}/${BP}.tar.gz \
            file://filter-out-the-patches-from-subdirs.patch \
 "
 
-SRC_URI[md5sum] = "559f104e155e0e14ee0c717776a745fa"
-SRC_URI[sha256sum] = "2facba9525c95428d7bff3a313fc6ecfd8c529c678ae666c73015558a0edc271"
+SRC_URI[md5sum] = "79289adabd6f3ebf9160fc0815ab3150"
+SRC_URI[sha256sum] = "f7ac93ef30b13a587292b8d6a7e2538a65bc978a3a576eab238c392b884e96e0"
 
 EXTRA_OEMAKE = "VPATH=${STAGING_LIBDIR}"
 
-- 
1.9.3

[meta-networking][PATCH 5/5] dnsmasq: update to 2.72

[Paul Eggleton]

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
 meta-networking/recipes-support/dnsmasq/dnsmasq_2.71.bb | 10 ----------
 meta-networking/recipes-support/dnsmasq/dnsmasq_2.72.bb | 10 ++++++++++
 2 files changed, 10 insertions(+), 10 deletions(-)
 delete mode 100644 meta-networking/recipes-support/dnsmasq/dnsmasq_2.71.bb
 create mode 100644 meta-networking/recipes-support/dnsmasq/dnsmasq_2.72.bb

diff --git a/meta-networking/recipes-support/dnsmasq/dnsmasq_2.71.bb b/meta-networking/recipes-support/dnsmasq/dnsmasq_2.71.bb
deleted file mode 100644
index ccc567e..0000000
--- a/meta-networking/recipes-support/dnsmasq/dnsmasq_2.71.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require dnsmasq.inc
-
-SRC_URI += "\
-    file://parallel-make.patch \
-    file://lua.patch \
-"
-
-SRC_URI[dnsmasq-2.71.md5sum] = "15a68f7f6cc0119e843f67d2f79598f1"
-SRC_URI[dnsmasq-2.71.sha256sum] = "7d8c64f66a396442e01b639df3ea6b4e02ba88cbe206c80be8de68b6841634c4"
-
diff --git a/meta-networking/recipes-support/dnsmasq/dnsmasq_2.72.bb b/meta-networking/recipes-support/dnsmasq/dnsmasq_2.72.bb
new file mode 100644
index 0000000..bd59194
--- /dev/null
+++ b/meta-networking/recipes-support/dnsmasq/dnsmasq_2.72.bb
@@ -0,0 +1,10 @@
+require dnsmasq.inc
+
+SRC_URI += "\
+    file://parallel-make.patch \
+    file://lua.patch \
+"
+
+SRC_URI[dnsmasq-2.72.md5sum] = "cf82f81cf09ad3d47612985012240483"
+SRC_URI[dnsmasq-2.72.sha256sum] = "635f1b47417d17cf32e45cfcfd0213ac39fd09918479a25373ba9b2ce4adc05d"
+
-- 
1.9.3

Re: [meta-networking][PATCH 0/5] Networking fixes and upgrades

[Joe MacDonald]

[-- Attachment #1: Type: text/plain, Size: 2035 bytes --]

Merged, thanks.
-J.

[[oe] [meta-networking][PATCH 0/5] Networking fixes and upgrades] On 15.01.05 (Mon 10:51) Paul Eggleton wrote:

> Fix a couple of issues in the ntp recipe reported by Philip Balister
> (the file locations patch was previously posted separately; this
> version is identical). Also upgrade a few recipes.
> 
> 
> The following changes since commit 2ea3a19a478c526baa04d6b9a9e8c9f42aae9d34:
> 
>   ctapi-common: Add new recipe (2014-12-31 16:38:22 +0100)
> 
> are available in the git repository at:
> 
>   git://git.openembedded.org/meta-openembedded-contrib paule/networking-fixes
>   http://cgit.openembedded.org/cgit.cgi/meta-openembedded-contrib/log/?h=paule/networking-fixes
> 
> Paul Eggleton (5):
>   ntp: fix file locations
>   ntp: add explicit perl dependency to ntp-utils package
>   mtr: update to 0.86
>   traceroute: update to 2.0.21
>   dnsmasq: update to 2.72
> 
>  .../recipes-support/dnsmasq/dnsmasq_2.71.bb        | 10 -------
>  .../recipes-support/dnsmasq/dnsmasq_2.72.bb        | 10 +++++++
>  .../recipes-support/mtr/files/configure.patch      | 12 ---------
>  .../recipes-support/mtr/files/no-gtk.patch         | 31 ----------------------
>  .../mtr/{mtr_0.82.bb => mtr_0.86.bb}               | 10 +++----
>  meta-networking/recipes-support/ntp/ntp_4.2.8.bb   | 22 +++++++--------
>  .../{traceroute_2.0.20.bb => traceroute_2.0.21.bb} |  6 ++---
>  7 files changed, 28 insertions(+), 73 deletions(-)
>  delete mode 100644 meta-networking/recipes-support/dnsmasq/dnsmasq_2.71.bb
>  create mode 100644 meta-networking/recipes-support/dnsmasq/dnsmasq_2.72.bb
>  delete mode 100644 meta-networking/recipes-support/mtr/files/configure.patch
>  delete mode 100644 meta-networking/recipes-support/mtr/files/no-gtk.patch
>  rename meta-networking/recipes-support/mtr/{mtr_0.82.bb => mtr_0.86.bb} (51%)
>  rename meta-networking/recipes-support/traceroute/{traceroute_2.0.20.bb => traceroute_2.0.21.bb} (89%)
> 
> -- 
> 1.9.3
> 
-- 
-Joe MacDonald.
:wq

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 501 bytes --]