[PATCH 0/5] 5 fixes

[PATCH 0/5] 5 fixes

[Robert Yang]

The following changes since commit ddd3ccd63949f9a24040eb39c136ef9730f2662a:

  ntp: fix perl path (2015-01-23 07:45:20 -0500)

are available in the git repository at:

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

Robert Yang (5):
  openldap: fix for new libtool
  dnssec-conf: depends libxslt-native
  nuttcp: fix HOMEPAGE and SRC_URI
  wireshark: add PACKAGECONFIG for geoip
  cherokee: add PACKAGECONFIG for geoip

 .../dnssec-conf/dnssec-conf_2.02.bb                |    3 ++-
 .../recipes-support/nuttcp/nuttcp_7.2.1.bb         |    6 +++---
 .../recipes-support/wireshark/wireshark_1.12.2.bb  |    1 +
 .../recipes-support/openldap/openldap_2.4.39.bb    |    2 +-
 .../recipes-httpd/cherokee/cherokee_1.2.98.bb      |    1 +
 5 files changed, 8 insertions(+), 5 deletions(-)

-- 
1.7.9.5

[meta-oe] [PATCH 1/5] openldap: fix for new libtool

[Robert Yang]

The new libtool's ltmain.sh is in build-aux.

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
 .../recipes-support/openldap/openldap_2.4.39.bb    |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-oe/recipes-support/openldap/openldap_2.4.39.bb b/meta-oe/recipes-support/openldap/openldap_2.4.39.bb
index 8752395..5f5de5e 100644
--- a/meta-oe/recipes-support/openldap/openldap_2.4.39.bb
+++ b/meta-oe/recipes-support/openldap/openldap_2.4.39.bb
@@ -147,7 +147,7 @@ PACKAGES += "${PN}-overlay-proxycache"
 CPPFLAGS_append = " -D_GNU_SOURCE -DURANDOM_DEVICE=\'/dev/urandom\'"
 
 do_configure() {
-    cp ${STAGING_DATADIR_NATIVE}/libtool/config/ltmain.sh ${S}/build
+    cp ${STAGING_DATADIR_NATIVE}/libtool/build-aux/ltmain.sh ${S}/build
     rm -f ${S}/libtool
     aclocal
     libtoolize --force --copy
-- 
1.7.9.5

[meta-networking] [PATCH 2/5] dnssec-conf: depends libxslt-native

[Robert Yang]

Fixed:
xmlto: Can't continue, xsltproc tool not found or not executable.
Makefile:20: recipe for target 'dnssec-configure.8' failed
make: *** [dnssec-configure.8] Error 3

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
 .../dnssec-conf/dnssec-conf_2.02.bb                |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/meta-networking/recipes-support/dnssec-conf/dnssec-conf_2.02.bb b/meta-networking/recipes-support/dnssec-conf/dnssec-conf_2.02.bb
index d366abd..6a50971 100644
--- a/meta-networking/recipes-support/dnssec-conf/dnssec-conf_2.02.bb
+++ b/meta-networking/recipes-support/dnssec-conf/dnssec-conf_2.02.bb
@@ -12,7 +12,8 @@ HOMEPAGE = "https://github.com/xelerance/dnssec-conf"
 SECTION = "System Environment/Daemons"
 LICENSE = "GPLv2+"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=0636e73ff0215e8d672dc4c32c317bb3"
-DEPENDS += " xmlto-native docbook-xml-dtd4-native docbook-xsl-stylesheets-native"
+DEPENDS += "xmlto-native docbook-xml-dtd4-native \
+            docbook-xsl-stylesheets-native libxslt-native"
 
 SRC_URI = "git://github.com/xelerance/dnssec-conf.git"
 SRCREV = "8e799683736b4a7b5e5e78f98fba0a6f48393537"
-- 
1.7.9.5

[meta-networking] [PATCH 3/5] nuttcp: fix HOMEPAGE and SRC_URI

[Robert Yang]

The old ones are invalid.

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
 .../recipes-support/nuttcp/nuttcp_7.2.1.bb         |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/meta-networking/recipes-support/nuttcp/nuttcp_7.2.1.bb b/meta-networking/recipes-support/nuttcp/nuttcp_7.2.1.bb
index b931d04..a275238 100644
--- a/meta-networking/recipes-support/nuttcp/nuttcp_7.2.1.bb
+++ b/meta-networking/recipes-support/nuttcp/nuttcp_7.2.1.bb
@@ -8,12 +8,12 @@ network layer throughput by transferring memory buffers from a source system \
 across an interconnecting network to a destination system, either transferring \
 data for a specified time interval, or alternatively transferring a specified \
 number of bytes."
-HOMEPAGE = "http://www.nuttcp.net/nuttcp/Welcome%20Page.html"
+HOMEPAGE = "http://www.nuttcp.net/Welcome%20Page.html"
 LICENSE = "GPL-2.0"
 SECTION = "net"
-LIC_FILES_CHKSUM = "file://nuttcp-${PV}.c;beginline=4;endline=30;md5=ae7045c3c3616092e07d87f04ba0d960"
+LIC_FILES_CHKSUM = "file://${BP}.c;beginline=4;endline=30;md5=ae7045c3c3616092e07d87f04ba0d960"
 
-SRC_URI = "http://lcp.nrl.navy.mil/nuttcp/beta/nuttcp-${PV}.c"
+SRC_URI = "http://nuttcp.net/${BPN}/beta/${BP}.c"
 SRC_URI[md5sum] = "1ebf4a08bad2a295a8155f02995e8754"
 SRC_URI[sha256sum] = "c6e33810ccce67260f8d5d627f60e429d44f532365c58ed5673d035e2a59c4db"
 
-- 
1.7.9.5

[meta-networking] [PATCH 4/5] wireshark: add PACKAGECONFIG for geoip

[Robert Yang]

Fixed:
epan/dissectors/packet-ip.c:56:19: fatal error: GeoIP.h: No such file or directory

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
 .../recipes-support/wireshark/wireshark_1.12.2.bb  |    1 +
 1 file changed, 1 insertion(+)

diff --git a/meta-networking/recipes-support/wireshark/wireshark_1.12.2.bb b/meta-networking/recipes-support/wireshark/wireshark_1.12.2.bb
index 5740730..4fd519e 100644
--- a/meta-networking/recipes-support/wireshark/wireshark_1.12.2.bb
+++ b/meta-networking/recipes-support/wireshark/wireshark_1.12.2.bb
@@ -36,6 +36,7 @@ PACKAGECONFIG[ipv6] = "--enable-ipv6, --disable-ipv6,"
 PACKAGECONFIG[gnutls] = "--with-gnutls=yes, --with-gnutls=no, gnutls"
 PACKAGECONFIG[gcrypt] = "--with-gcrypt=yes, --with-gcrypt=no, libgcrypt"
 PACKAGECONFIG[krb5] = "--with-krb5=yes, --with-krb5=no, krb5"
+PACKAGECONFIG[geoip] = "--with-geoip, --without-geoip, geoip"
 
 EXTRA_OECONF = "--with-qt=no --enable-usr-local=no --enable-tshark --with-c-ares=no"
 
-- 
1.7.9.5

[meta-webserver] [PATCH 5/5] cherokee: add PACKAGECONFIG for geoip

[Robert Yang]

Fixed:
cherokee/rule_geoip.h:34:19: fatal error: GeoIP.h: No such file or directory

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
 .../recipes-httpd/cherokee/cherokee_1.2.98.bb      |    1 +
 1 file changed, 1 insertion(+)

diff --git a/meta-webserver/recipes-httpd/cherokee/cherokee_1.2.98.bb b/meta-webserver/recipes-httpd/cherokee/cherokee_1.2.98.bb
index 054858e..451e97c 100644
--- a/meta-webserver/recipes-httpd/cherokee/cherokee_1.2.98.bb
+++ b/meta-webserver/recipes-httpd/cherokee/cherokee_1.2.98.bb
@@ -22,6 +22,7 @@ inherit autotools pkgconfig binconfig update-rc.d systemd
 PACKAGECONFIG ??= ""
 PACKAGECONFIG[ffmpeg] = "--with-ffmpeg,--without-ffmpeg,libav"
 PACKAGECONFIG[ldap] = "--with-ldap,--without-ldap,openldap"
+PACKAGECONFIG[geoip] = "--with-geoip,--without-geoip,geoip"
 
 EXTRA_OECONF = "--disable-static \
                 --disable-nls \
-- 
1.7.9.5

Re: [meta-networking] [PATCH 4/5] wireshark: add PACKAGECONFIG for geoip

[akuster808]

Robert,

thanks.

I think there is a fix for this sitting in the patch queue.

also there is an update pending in master-next for 1.12.3

- armin

On 01/25/2015 05:45 PM, Robert Yang wrote:
> Fixed:
> epan/dissectors/packet-ip.c:56:19: fatal error: GeoIP.h: No such file or directory
>
> Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
> ---
>   .../recipes-support/wireshark/wireshark_1.12.2.bb  |    1 +
>   1 file changed, 1 insertion(+)
>
> diff --git a/meta-networking/recipes-support/wireshark/wireshark_1.12.2.bb b/meta-networking/recipes-support/wireshark/wireshark_1.12.2.bb
> index 5740730..4fd519e 100644
> --- a/meta-networking/recipes-support/wireshark/wireshark_1.12.2.bb
> +++ b/meta-networking/recipes-support/wireshark/wireshark_1.12.2.bb
> @@ -36,6 +36,7 @@ PACKAGECONFIG[ipv6] = "--enable-ipv6, --disable-ipv6,"
>   PACKAGECONFIG[gnutls] = "--with-gnutls=yes, --with-gnutls=no, gnutls"
>   PACKAGECONFIG[gcrypt] = "--with-gcrypt=yes, --with-gcrypt=no, libgcrypt"
>   PACKAGECONFIG[krb5] = "--with-krb5=yes, --with-krb5=no, krb5"
> +PACKAGECONFIG[geoip] = "--with-geoip, --without-geoip, geoip"
>
>   EXTRA_OECONF = "--with-qt=no --enable-usr-local=no --enable-tshark --with-c-ares=no"
>
>

Re: [meta-networking] [PATCH 4/5] wireshark: add PACKAGECONFIG for geoip

[Robert Yang]

On 01/26/2015 10:21 AM, akuster808 wrote:
>
> Robert,
>
> thanks.
>
> I think there is a fix for this sitting in the patch queue.
>
> also there is an update pending in master-next for 1.12.3

Thanks, we can drop this patch, then.

// Robert

>
> - armin
>
> On 01/25/2015 05:45 PM, Robert Yang wrote:
>> Fixed:
>> epan/dissectors/packet-ip.c:56:19: fatal error: GeoIP.h: No such file or
>> directory
>>
>> Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
>> ---
>>   .../recipes-support/wireshark/wireshark_1.12.2.bb  |    1 +
>>   1 file changed, 1 insertion(+)
>>
>> diff --git a/meta-networking/recipes-support/wireshark/wireshark_1.12.2.bb
>> b/meta-networking/recipes-support/wireshark/wireshark_1.12.2.bb
>> index 5740730..4fd519e 100644
>> --- a/meta-networking/recipes-support/wireshark/wireshark_1.12.2.bb
>> +++ b/meta-networking/recipes-support/wireshark/wireshark_1.12.2.bb
>> @@ -36,6 +36,7 @@ PACKAGECONFIG[ipv6] = "--enable-ipv6, --disable-ipv6,"
>>   PACKAGECONFIG[gnutls] = "--with-gnutls=yes, --with-gnutls=no, gnutls"
>>   PACKAGECONFIG[gcrypt] = "--with-gcrypt=yes, --with-gcrypt=no, libgcrypt"
>>   PACKAGECONFIG[krb5] = "--with-krb5=yes, --with-krb5=no, krb5"
>> +PACKAGECONFIG[geoip] = "--with-geoip, --without-geoip, geoip"
>>
>>   EXTRA_OECONF = "--with-qt=no --enable-usr-local=no --enable-tshark
>> --with-c-ares=no"
>>
>>

Re: [meta-networking] [PATCH 4/5] wireshark: add PACKAGECONFIG for geoip

[Joe MacDonald]

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

[Re: [oe] [meta-networking] [PATCH 4/5] wireshark: add PACKAGECONFIG for geoip] On 15.01.26 (Mon 10:48) Robert Yang wrote:

> 
> 
> On 01/26/2015 10:21 AM, akuster808 wrote:
> >
> >Robert,
> >
> >thanks.
> >
> >I think there is a fix for this sitting in the patch queue.
> >
> >also there is an update pending in master-next for 1.12.3
> 
> Thanks, we can drop this patch, then.

Yeah, I'm working through the queue right now and the updated version in
master-next is the one I was looking at.

-J.

> 
> // Robert
> 
> >
> >- armin
> >
> >On 01/25/2015 05:45 PM, Robert Yang wrote:
> >>Fixed:
> >>epan/dissectors/packet-ip.c:56:19: fatal error: GeoIP.h: No such file or
> >>directory
> >>
> >>Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
> >>---
> >>  .../recipes-support/wireshark/wireshark_1.12.2.bb  |    1 +
> >>  1 file changed, 1 insertion(+)
> >>
> >>diff --git a/meta-networking/recipes-support/wireshark/wireshark_1.12.2.bb
> >>b/meta-networking/recipes-support/wireshark/wireshark_1.12.2.bb
> >>index 5740730..4fd519e 100644
> >>--- a/meta-networking/recipes-support/wireshark/wireshark_1.12.2.bb
> >>+++ b/meta-networking/recipes-support/wireshark/wireshark_1.12.2.bb
> >>@@ -36,6 +36,7 @@ PACKAGECONFIG[ipv6] = "--enable-ipv6, --disable-ipv6,"
> >>  PACKAGECONFIG[gnutls] = "--with-gnutls=yes, --with-gnutls=no, gnutls"
> >>  PACKAGECONFIG[gcrypt] = "--with-gcrypt=yes, --with-gcrypt=no, libgcrypt"
> >>  PACKAGECONFIG[krb5] = "--with-krb5=yes, --with-krb5=no, krb5"
> >>+PACKAGECONFIG[geoip] = "--with-geoip, --without-geoip, geoip"
> >>
> >>  EXTRA_OECONF = "--with-qt=no --enable-usr-local=no --enable-tshark
> >>--with-c-ares=no"
> >>
> >>
-- 
-Joe MacDonald.
:wq

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

Re: [PATCH 0/5] 5 fixes

[Joe MacDonald]

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

Merged patches 2 and 3, dropped 4 as discussed.

-J.

[[oe] [PATCH 0/5] 5 fixes] On 15.01.25 (Sun 17:45) Robert Yang wrote:

> The following changes since commit ddd3ccd63949f9a24040eb39c136ef9730f2662a:
> 
>   ntp: fix perl path (2015-01-23 07:45:20 -0500)
> 
> are available in the git repository at:
> 
>   git://git.openembedded.org/meta-openembedded-contrib rbt/5fixes
>   http://cgit.openembedded.org/cgit.cgi/meta-openembedded-contrib/log/?h=rbt/5fixes
> 
> Robert Yang (5):
>   openldap: fix for new libtool
>   dnssec-conf: depends libxslt-native
>   nuttcp: fix HOMEPAGE and SRC_URI
>   wireshark: add PACKAGECONFIG for geoip
>   cherokee: add PACKAGECONFIG for geoip
> 
>  .../dnssec-conf/dnssec-conf_2.02.bb                |    3 ++-
>  .../recipes-support/nuttcp/nuttcp_7.2.1.bb         |    6 +++---
>  .../recipes-support/wireshark/wireshark_1.12.2.bb  |    1 +
>  .../recipes-support/openldap/openldap_2.4.39.bb    |    2 +-
>  .../recipes-httpd/cherokee/cherokee_1.2.98.bb      |    1 +
>  5 files changed, 8 insertions(+), 5 deletions(-)
> 
> -- 
> 1.7.9.5
> 
-- 
-Joe MacDonald.
:wq

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