[PATCH 0/3] Package Updates

[PATCH 0/3] Package Updates

[Radu Moisan]

This patchset updates dbus, mtd-utils and foomatic-filters.

The following changes since commit 0f795f81fe5ad3ef78c21a177eca90fbc8810f81:

  qemu: disable vnc-jpeg compression (2012-05-24 08:53:40 +0100)

are available in the git repository at:

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

Radu Moisan (3):
  foomatic-filters: update to version 4.0.15
  mtd-utils: Update to version 1.5.0
  dbus: Update to version 1.5.12

 .../dbus/{dbus-1.4.16 => dbus-1.5.12}/dbus-1.init  |    0
 .../dbus/{dbus-1.4.16 => dbus-1.5.12}/tmpdir.patch |    0
 meta/recipes-core/dbus/dbus_1.4.16.bb              |    7 -------
 meta/recipes-core/dbus/dbus_1.5.12.bb              |    7 +++++++
 .../add-exclusion-to-mkfs-jffs2-git-2.patch        |    0
 .../mtd/{mtd-utils_1.4.9.bb => mtd-utils_1.5.0.bb} |    2 +-
 ...filters_4.0.7.bb => foomatic-filters_4.0.15.bb} |    6 +++---
 7 files changed, 11 insertions(+), 11 deletions(-)
 rename meta/recipes-core/dbus/{dbus-1.4.16 => dbus-1.5.12}/dbus-1.init (100%)
 rename meta/recipes-core/dbus/{dbus-1.4.16 => dbus-1.5.12}/tmpdir.patch (100%)
 delete mode 100644 meta/recipes-core/dbus/dbus_1.4.16.bb
 create mode 100644 meta/recipes-core/dbus/dbus_1.5.12.bb
 rename meta/recipes-devtools/mtd/{mtd-utils-1.4.9 => mtd-utils-1.5.0}/add-exclusion-to-mkfs-jffs2-git-2.patch (100%)
 rename meta/recipes-devtools/mtd/{mtd-utils_1.4.9.bb => mtd-utils_1.5.0.bb} (98%)
 rename meta/recipes-extended/foomatic/{foomatic-filters_4.0.7.bb => foomatic-filters_4.0.15.bb} (90%)

-- 
1.7.9.5

Re: [PATCH 0/3] Package Updates

[Koen Kooi]

Op 25 mei 2012, om 10:50 heeft Radu Moisan het volgende geschreven:

> This patchset updates dbus, mtd-utils and foomatic-filters.
> 
> The following changes since commit 0f795f81fe5ad3ef78c21a177eca90fbc8810f81:
> 
>  qemu: disable vnc-jpeg compression (2012-05-24 08:53:40 +0100)
> 
> are available in the git repository at:
> 
>  git://git.yoctoproject.org/poky-contrib rmoisan/updates
>  http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=rmoisan/updates
> 
> Radu Moisan (3):
>  foomatic-filters: update to version 4.0.15
>  mtd-utils: Update to version 1.5.0
>  dbus: Update to version 1.5.12

First: how was this tested?
Second: From the dbus website:

	The current stable branch is D-Bus 1.4.x. This is the recommended version for most purposes.
	The current development branch is D-Bus 1.5.x, which will lead to a 1.6.x stable branch in future.

Why are you deleting the stable branch based recipe and add one from the development branch?

Re: [PATCH 0/3] Package Updates

[Burton, Ross]

Hi,

First, sorry for the thread breaking, I've just joined this list and I
didn't get this mail.

Koen Kooi wrote:
>>  dbus: Update to version 1.5.12
>
> First: how was this tested?
> Second: From the dbus website:
>
>        The current stable branch is D-Bus 1.4.x. This is the recommended
> version for most purposes.
>        The current development branch is D-Bus 1.5.x, which will lead to a
> 1.6.x stable branch in future.
>
> Why are you deleting the stable branch based recipe and add one from
> the development branch?

The definition of stable and unstable in DBus isn't as hard and fast
as you'd really like -- the 1.5.x cycle is very slow and mostly stable
from a crashy point of view.

I'd say there is a good rationale for having both 1.4.x (.20, so that
also needs an upgrade) and 1.5.x in oe-core.  The default should be
1.4 for obvious reasons (it's the stable release), and 1.5 should be
there for people who need the improvements.  In particular there has
been a lot of work on performance, so anyone heavily using dbus (i.e.
anything using Telepathy, which is where the improvements came from)
should look at 1.5 because it will give a noticeable improvement on
slower hardware.

Ross

Re: [PATCH 0/3] Package Updates

[Radu Moisan]

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



On 05/28/2012 01:55 PM, Burton, Ross wrote:
> Hi,
>
> First, sorry for the thread breaking, I've just joined this list and I
> didn't get this mail.
>
> Koen Kooi wrote:
>>>   dbus: Update to version 1.5.12
>> First: how was this tested?
the only testing I've done so far is to ensure it build and then check 
the version with dbus-daemon --version
>> Second: From the dbus website:
>>
>>         The current stable branch is D-Bus 1.4.x. This is the recommended
>> version for most purposes.
>>         The current development branch is D-Bus 1.5.x, which will lead to a
>> 1.6.x stable branch in future.
>>
>> Why are you deleting the stable branch based recipe and add one from
>> the development branch?
> The definition of stable and unstable in DBus isn't as hard and fast
> as you'd really like -- the 1.5.x cycle is very slow and mostly stable
> from a crashy point of view.
>
> I'd say there is a good rationale for having both 1.4.x (.20, so that
> also needs an upgrade) and 1.5.x in oe-core.  The default should be
> 1.4 for obvious reasons (it's the stable release), and 1.5 should be
> there for people who need the improvements.  In particular there has
> been a lot of work on performance, so anyone heavily using dbus (i.e.
> anything using Telepathy, which is where the improvements came from)
> should look at 1.5 because it will give a noticeable improvement on
> slower hardware.
>
> Ross
I suppose, then, I should add another recipe and support both. However, 
can someone point out how can I make one of them default.
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

[-- Attachment #2: Type: text/html, Size: 2916 bytes --]

Re: [PATCH 0/3] Package Updates

[Andrei Gherzan]

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

On 05/28/2012 02:21 PM, Radu Moisan wrote:
>
>
> On 05/28/2012 01:55 PM, Burton, Ross wrote:
>> Hi,
>>
>> First, sorry for the thread breaking, I've just joined this list and I
>> didn't get this mail.
>>
>> Koen Kooi wrote:
>>>>   dbus: Update to version 1.5.12
>>> First: how was this tested?
> the only testing I've done so far is to ensure it build and then check 
> the version with dbus-daemon --version

Dbus comes with a test suite. Running those should be a must.
>>> Second: From the dbus website:
>>>
>>>         The current stable branch is D-Bus 1.4.x. This is the recommended
>>> version for most purposes.
>>>         The current development branch is D-Bus 1.5.x, which will lead to a
>>> 1.6.x stable branch in future.
>>>
>>> Why are you deleting the stable branch based recipe and add one from
>>> the development branch?
>> The definition of stable and unstable in DBus isn't as hard and fast
>> as you'd really like -- the 1.5.x cycle is very slow and mostly stable
>> from a crashy point of view.
>>
>> I'd say there is a good rationale for having both 1.4.x (.20, so that
>> also needs an upgrade) and 1.5.x in oe-core.  The default should be
>> 1.4 for obvious reasons (it's the stable release), and 1.5 should be
>> there for people who need the improvements.  In particular there has
>> been a lot of work on performance, so anyone heavily using dbus (i.e.
>> anything using Telepathy, which is where the improvements came from)
>> should look at 1.5 because it will give a noticeable improvement on
>> slower hardware.
>>
>> Ross
> I suppose, then, I should add another recipe and support both. 
> However, can someone point out how can I make one of them default.

DEFAULT_PREFERENCE

@g

[-- Attachment #2: Type: text/html, Size: 2889 bytes --]

Re: [PATCH 0/3] Package Updates

[Paul Eggleton]

On Monday 28 May 2012 14:21:30 Andrei Gherzan wrote:
> On 05/28/2012 02:21 PM, Radu Moisan wrote:
> > I suppose, then, I should add another recipe and support both.
> > However, can someone point out how can I make one of them default.
> 
> DEFAULT_PREFERENCE

i.e. set DEFAULT_PREFERENCE = "-1" in the newer recipe.

Cheers,
Paul

-- 

Paul Eggleton
Intel Open Source Technology Centre

Re: [PATCH 0/3] Package Updates

[Radu Moisan]

On 05/28/2012 02:21 PM, Andrei Gherzan wrote:
> Dbus comes with a test suite. Running those should be a must.
I could not find how to run the test suite. I've tried dbus-daemon, 
dbus-monitor, and the rest, but non of them have options for some 
runtime checks. Other than that I imagine the test suite you mention 
must come in a separate package. Do we have a recipe for that to? Which 
image should I build to have that package included and be able to test?

Radu

Re: [PATCH 0/3] Package Updates

[Andrei Gherzan]

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

On Mon, May 28, 2012 at 4:24 PM, Radu Moisan <radu.moisan@intel.com> wrote:

> On 05/28/2012 02:21 PM, Andrei Gherzan wrote:
>
>> Dbus comes with a test suite. Running those should be a must.
>>
> I could not find how to run the test suite. I've tried dbus-daemon,
> dbus-monitor, and the rest, but non of them have options for some runtime
> checks. Other than that I imagine the test suite you mention must come in a
> separate package. Do we have a recipe for that to? Which image should I
> build to have that package included and be able to test?
>
>
There is an internal test suite for dbus. You can enable building those
tests in configure:
"--enable-tests"

@g

[-- Attachment #2: Type: text/html, Size: 1181 bytes --]

Re: [PATCH 0/3] Package Updates

[Burton, Ross]

On 28 May 2012 14:26, Andrei Gherzan <andrei@gherzan.ro> wrote:
> There is an internal test suite for dbus. You can enable building those
> tests in configure:
> "--enable-tests"

Is there a good reason why these shouldn't be always ran when building dbus?

Ross

Re: [PATCH 0/3] Package Updates

[Richard Purdie]

On Mon, 2012-05-28 at 14:30 +0100, Burton, Ross wrote:
> On 28 May 2012 14:26, Andrei Gherzan <andrei@gherzan.ro> wrote:
> > There is an internal test suite for dbus. You can enable building those
> > tests in configure:
> > "--enable-tests"
> 
> Is there a good reason why these shouldn't be always ran when building dbus?

Well, we're cross compiling so it depends how they're written and
whether they can run in a cross environment. We've also taken steps to
reduce our build time so if these need something like perl or python,
adding those into the dependency chain is problematic.

I'm open to ideas here but so far they've not been useful so are likely
disabled.

Cheers,

Richard

Re: [PATCH 0/3] Package Updates

[Burton, Ross]

On 28 May 2012 14:44, Richard Purdie <richard.purdie@linuxfoundation.org> wrote:
>> Is there a good reason why these shouldn't be always ran when building dbus?
>
> Well, we're cross compiling so it depends how they're written and
> whether they can run in a cross environment. We've also taken steps to
> reduce our build time so if these need something like perl or python,
> adding those into the dependency chain is problematic.
>
> I'm open to ideas here but so far they've not been useful so are likely
> disabled.

I guess the overhead of setting up a qemu just to run the tests is a
bit excessive. :)

Ross

Re: [PATCH 0/3] Package Updates

[Andrei Gherzan]

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

On Mon, May 28, 2012 at 4:44 PM, Richard Purdie <
richard.purdie@linuxfoundation.org> wrote:

> On Mon, 2012-05-28 at 14:30 +0100, Burton, Ross wrote:
> > On 28 May 2012 14:26, Andrei Gherzan <andrei@gherzan.ro> wrote:
> > > There is an internal test suite for dbus. You can enable building those
> > > tests in configure:
> > > "--enable-tests"
> >
> > Is there a good reason why these shouldn't be always ran when building
> dbus?
>
> Well, we're cross compiling so it depends how they're written and
> whether they can run in a cross environment. We've also taken steps to
> reduce our build time so if these need something like perl or python,
> adding those into the dependency chain is problematic.
>
>
The fact that these tests are not compiled by default it's good. As a
normal user of dbus i don't need those. But while doing an update a compile
with tests i think it's necessary.

@g

[-- Attachment #2: Type: text/html, Size: 1366 bytes --]

Re: [PATCH 0/3] Package Updates

[Radu Moisan]

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



On 05/28/2012 04:26 PM, Andrei Gherzan wrote:
> On Mon, May 28, 2012 at 4:24 PM, Radu Moisan <radu.moisan@intel.com 
> <mailto:radu.moisan@intel.com>> wrote:
>
>     On 05/28/2012 02:21 PM, Andrei Gherzan wrote:
>
>         Dbus comes with a test suite. Running those should be a must.
>
>     I could not find how to run the test suite. I've tried
>     dbus-daemon, dbus-monitor, and the rest, but non of them have
>     options for some runtime checks. Other than that I imagine the
>     test suite you mention must come in a separate package. Do we have
>     a recipe for that to? Which image should I build to have that
>     package included and be able to test?
>
>
> There is an internal test suite for dbus. You can enable building 
> those tests in configure:
> "--enable-tests"
>
> @g
>
So, isn't there a way of specifying build options in some file that 
bitbake will use afterwards to do the build? For instance where from 
./configure is executed (from within bitbake I assume). I tried to take 
a look over configure file of dbus but could not figure out a way of 
hardcoding the --enable-tests option (not that hardcoding would be a 
best choice, but for testing purposes I considered it a choice). Any 
info on this is much appreciated.

Thanks,
Radu

[-- Attachment #2: Type: text/html, Size: 2543 bytes --]

Re: [PATCH 0/3] Package Updates

[Radu Moisan]

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



On 05/29/2012 09:28 AM, Radu Moisan wrote:
>
>
> On 05/28/2012 04:26 PM, Andrei Gherzan wrote:
>> On Mon, May 28, 2012 at 4:24 PM, Radu Moisan <radu.moisan@intel.com 
>> <mailto:radu.moisan@intel.com>> wrote:
>>
>>     On 05/28/2012 02:21 PM, Andrei Gherzan wrote:
>>
>>         Dbus comes with a test suite. Running those should be a must.
>>
>>     I could not find how to run the test suite. I've tried
>>     dbus-daemon, dbus-monitor, and the rest, but non of them have
>>     options for some runtime checks. Other than that I imagine the
>>     test suite you mention must come in a separate package. Do we
>>     have a recipe for that to? Which image should I build to have
>>     that package included and be able to test?
>>
>>
>> There is an internal test suite for dbus. You can enable building 
>> those tests in configure:
>> "--enable-tests"
>>
>> @g
>>
> So, isn't there a way of specifying build options in some file that 
> bitbake will use afterwards to do the build? For instance where from 
> ./configure is executed (from within bitbake I assume). I tried to 
> take a look over configure file of dbus but could not figure out a way 
> of hardcoding the --enable-tests option (not that hardcoding would be 
> a best choice, but for testing purposes I considered it a choice). Any 
> info on this is much appreciated.
>
> Thanks,
> Radu
Found it in oe_runconf(). Will try to build them, see what comes out of 
it :)
Any comments still apreciated.

Radu

[-- Attachment #2: Type: text/html, Size: 2946 bytes --]

Re: [PATCH 0/3] Package Updates

[Sarbu, Florin-Ionut (Florin)]

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

EXTRA_OECONF+="--enable-tests" may be what you are looking for.

-----Original Message-----
From: Radu Moisan [radu.moisan@intel.com<mailto:radu.moisan@intel.com>]
Sent: Monday, May 28, 2012 11:24 PM Pacific Standard Time
To: openembedded-core@lists.openembedded.org
Subject: Re: [OE-core] [PATCH 0/3] Package Updates



On 05/28/2012 04:26 PM, Andrei Gherzan wrote:
On Mon, May 28, 2012 at 4:24 PM, Radu Moisan <radu.moisan@intel.com<mailto:radu.moisan@intel.com>> wrote:
On 05/28/2012 02:21 PM, Andrei Gherzan wrote:
Dbus comes with a test suite. Running those should be a must.
I could not find how to run the test suite. I've tried dbus-daemon, dbus-monitor, and the rest, but non of them have options for some runtime checks. Other than that I imagine the test suite you mention must come in a separate package. Do we have a recipe for that to? Which image should I build to have that package included and be able to test?


There is an internal test suite for dbus. You can enable building those tests in configure:
"--enable-tests"

@g

So, isn't there a way of specifying build options in some file that bitbake will use afterwards to do the build? For instance where from ./configure is executed (from within bitbake I assume). I tried to take a look over configure file of dbus but could not figure out a way of hardcoding the --enable-tests option (not that hardcoding would be a best choice, but for testing purposes I considered it a choice). Any info on this is much appreciated.

Thanks,
Radu

[-- Attachment #2: Type: text/html, Size: 2503 bytes --]

Re: [PATCH 0/3] Package Updates

[Radu Moisan]

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

this is what I was looking for. I'll try it soon as my "hard-codded" 
version finshes buiding. thanks.

Radu

On 05/29/2012 10:01 AM, Sarbu, Florin-Ionut (Florin) wrote:
> EXTRA_OECONF+="--enable-tests" may be what you are looking for.
>
> -----Original Message-----
> *From: *Radu Moisan [radu.moisan@intel.com <mailto:radu.moisan@intel.com>]
> *Sent: *Monday, May 28, 2012 11:24 PM Pacific Standard Time
> *To: *openembedded-core@lists.openembedded.org
> *Subject: *Re: [OE-core] [PATCH 0/3] Package Updates
>
>
>
> On 05/28/2012 04:26 PM, Andrei Gherzan wrote:
>> On Mon, May 28, 2012 at 4:24 PM, Radu Moisan <radu.moisan@intel.com 
>> <mailto:radu.moisan@intel.com>> wrote:
>>
>>     On 05/28/2012 02:21 PM, Andrei Gherzan wrote:
>>
>>         Dbus comes with a test suite. Running those should be a must.
>>
>>     I could not find how to run the test suite. I've tried
>>     dbus-daemon, dbus-monitor, and the rest, but non of them have
>>     options for some runtime checks. Other than that I imagine the
>>     test suite you mention must come in a separate package. Do we
>>     have a recipe for that to? Which image should I build to have
>>     that package included and be able to test?
>>
>>
>> There is an internal test suite for dbus. You can enable building 
>> those tests in configure:
>> "--enable-tests"
>>
>> @g
>>
> So, isn't there a way of specifying build options in some file that 
> bitbake will use afterwards to do the build? For instance where from 
> ./configure is executed (from within bitbake I assume). I tried to 
> take a look over configure file of dbus but could not figure out a way 
> of hardcoding the --enable-tests option (not that hardcoding would be 
> a best choice, but for testing purposes I considered it a choice). Any 
> info on this is much appreciated.
>
> Thanks,
> Radu

[-- Attachment #2: Type: text/html, Size: 3609 bytes --]

Re: [PATCH 0/3] Package Updates

[Philip Balister]

On 05/28/2012 09:58 AM, Andrei Gherzan wrote:
> On Mon, May 28, 2012 at 4:44 PM, Richard Purdie <
> richard.purdie@linuxfoundation.org> wrote:
> 
>> On Mon, 2012-05-28 at 14:30 +0100, Burton, Ross wrote:
>>> On 28 May 2012 14:26, Andrei Gherzan <andrei@gherzan.ro> wrote:
>>>> There is an internal test suite for dbus. You can enable building those
>>>> tests in configure:
>>>> "--enable-tests"
>>>
>>> Is there a good reason why these shouldn't be always ran when building
>> dbus?
>>
>> Well, we're cross compiling so it depends how they're written and
>> whether they can run in a cross environment. We've also taken steps to
>> reduce our build time so if these need something like perl or python,
>> adding those into the dependency chain is problematic.
>>
>>
> The fact that these tests are not compiled by default it's good. As a
> normal user of dbus i don't need those. But while doing an update a compile
> with tests i think it's necessary.

Can you build the tests and package them separately? Then they could be
installed as part of a test image.

Philip

Re: [PATCH 0/3] Package Updates

[Radu Moisan]

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



On 05/29/2012 03:10 PM, Philip Balister wrote:
> On 05/28/2012 09:58 AM, Andrei Gherzan wrote:
>> On Mon, May 28, 2012 at 4:44 PM, Richard Purdie<
>> richard.purdie@linuxfoundation.org>  wrote:
>>
>>> On Mon, 2012-05-28 at 14:30 +0100, Burton, Ross wrote:
>>>> On 28 May 2012 14:26, Andrei Gherzan<andrei@gherzan.ro>  wrote:
>>>>> There is an internal test suite for dbus. You can enable building those
>>>>> tests in configure:
>>>>> "--enable-tests"
>>>> Is there a good reason why these shouldn't be always ran when building
>>> dbus?
>>>
>>> Well, we're cross compiling so it depends how they're written and
>>> whether they can run in a cross environment. We've also taken steps to
>>> reduce our build time so if these need something like perl or python,
>>> adding those into the dependency chain is problematic.
>>>
>>>
>> The fact that these tests are not compiled by default it's good. As a
>> normal user of dbus i don't need those. But while doing an update a compile
>> with tests i think it's necessary.
> Can you build the tests and package them separately? Then they could be
> installed as part of a test image.
>
> Philip
>
That would certainly be an option, but I really don't know where to 
start from :)
Meanwhile, I tried to further debug my scenario with 
--enable-modular-tests and I tried to manually resolve the missing *.h 
files (by copying them from dbus-glib to dbus include folder) just to 
see where is goes. I found out, somehow expected, that further undefined 
reference errors were thrown (to functions from dbus-glib). Thus now I'm 
looking to point somehow dbus tests to link against dbus-glib. Does 
anyone have a clue where should I look?

Radu

[-- Attachment #2: Type: text/html, Size: 2721 bytes --]

[PATCH 0/3] Package Updates

[Saul Wold]

The following changes since commit 8fc6904fe97438478119db6cd23b7b4eb33b50aa:

  curl: add upstream status to patch (2013-07-18 12:21:13 -0700)

are available in the git repository at:

  git://git.openembedded.org/openembedded-core-contrib sgw/updates
  http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=sgw/updates

Saul Wold (3):
  consolekit: Update to 0.4.6
  mklibs-native: Update to 0.1.38
  cups: Update to 1.6.3

 .../mklibs/{mklibs-native_0.1.37.bb => mklibs-native_0.1.38.bb}   | 4 ++--
 meta/recipes-extended/cups/{cups_1.6.2.bb => cups_1.6.3.bb}       | 4 ++--
 .../consolekit/{consolekit_0.4.5.bb => consolekit_0.4.6.bb}       | 8 +++-----
 3 files changed, 7 insertions(+), 9 deletions(-)
 rename meta/recipes-devtools/mklibs/{mklibs-native_0.1.37.bb => mklibs-native_0.1.38.bb} (80%)
 rename meta/recipes-extended/cups/{cups_1.6.2.bb => cups_1.6.3.bb} (80%)
 rename meta/recipes-support/consolekit/{consolekit_0.4.5.bb => consolekit_0.4.6.bb} (90%)

-- 
1.8.1.4

[PATCH 0/3] Package Updates

[Saul Wold]

The following changes since commit bc6258f88705b0e7989089a8666ac5e5d2355823:

  grep: Add patch for texinfo 5.1 (2013-08-02 08:21:17 -0700)

are available in the git repository at:

  git://git.openembedded.org/openembedded-core-contrib sgw/updates
  http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=sgw/updates

Saul Wold (3):
  mc: upgrade to 4.8.10
  util-linux: upgrade to 2.23.2
  man-pages: upgrade to 3.53

 .../util-linux/{util-linux_2.23.1.bb => util-linux_2.23.2.bb}         | 4 ++--
 .../man-pages/{man-pages_3.52.bb => man-pages_3.53.bb}                | 4 ++--
 meta/recipes-extended/mc/{mc_4.8.9.bb => mc_4.8.10.bb}                | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)
 rename meta/recipes-core/util-linux/{util-linux_2.23.1.bb => util-linux_2.23.2.bb} (83%)
 rename meta/recipes-extended/man-pages/{man-pages_3.52.bb => man-pages_3.53.bb} (82%)
 rename meta/recipes-extended/mc/{mc_4.8.9.bb => mc_4.8.10.bb} (93%)

-- 
1.8.1.4

[PATCH 0/3] Package Updates

[Saul Wold]

Did a build with debian packaging and tested dpkg lightly on the target.

Sau!

The following changes since commit 315367ea9526186d5836c64867ce0cd40d9d8412:

  nativesdk.bbclass: support nativesdk to override with the PACKAGES_DYNAMIC statement (2013-12-09 21:36:30 +0000)

are available in the git repository at:

  git://git.openembedded.org/openembedded-core-contrib sgw/updates
  http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=sgw/updates

Saul Wold (3):
  util-macros: upgrade to 1.18.0
  dpkg: upgrade to 1.17.4
  cracklib: upgrade to 2.9.1

 meta/recipes-devtools/dpkg/{dpkg_1.17.1.bb => dpkg_1.17.4.bb}         | 4 ++--
 .../cracklib/{cracklib_2.9.0.bb => cracklib_2.9.1.bb}                 | 4 ++--
 .../xorg-util/{util-macros_1.17.1.bb => util-macros_1.18.0.bb}        | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)
 rename meta/recipes-devtools/dpkg/{dpkg_1.17.1.bb => dpkg_1.17.4.bb} (75%)
 rename meta/recipes-extended/cracklib/{cracklib_2.9.0.bb => cracklib_2.9.1.bb} (84%)
 rename meta/recipes-graphics/xorg-util/{util-macros_1.17.1.bb => util-macros_1.18.0.bb} (75%)

-- 
1.8.3.1

[PATCH 0/3] Package Updates

[Saul Wold]

These are some core packages for larger systems that had updates
that should be included in 1.6.

The bind update provides CVE fixes

Sau!

Saul Wold (3):
  util-linux: Update to 2.24.1
  dhcp: Update to 4.3.0
  bind: Update to 9.9.5

 .../bind-9.8.1-CVE-2012-5166.patch                 |   0
 .../{bind-9.8.1 => bind}/bind-CVE-2011-4313.patch  |   0
 .../{bind-9.8.1 => bind}/bind-CVE-2012-1667.patch  |   0
 .../{bind-9.8.1 => bind}/bind-CVE-2012-3817.patch  |   0
 .../{bind-9.8.1 => bind}/bind-CVE-2013-2266.patch  |   0
 .../bind-Fix-CVE-2012-4244.patch                   |   0
 .../bind/{bind-9.8.1 => bind}/conf.patch           |   0
 .../{bind-9.8.1 => bind}/cross-build-fix.patch     |   0
 .../bind/bind/dont-test-on-host.patch              |  13 ++
 .../make-etc-initd-bind-stop-work.patch            |   0
 .../mips1-not-support-opcode.diff                  |   0
 .../bind/{bind_9.8.1.bb => bind_9.9.5.bb}          |  20 +--
 meta/recipes-connectivity/dhcp/dhcp.inc            |   2 +-
 .../dhcp/dhcp/fix-external-bind.patch              | 115 +++++++-------
 .../dhcp/{dhcp_4.2.5-P1.bb => dhcp_4.3.0.bb}       |   6 +-
 meta/recipes-core/util-linux/util-linux.inc        |  12 +-
 .../util-linux/util-linux/fix-configure.patch      |  20 +--
 .../util-linux/util-linux/util-linux-native.patch  | 173 +++------------------
 .../{util-linux_2.23.2.bb => util-linux_2.24.1.bb} |   6 +-
 19 files changed, 123 insertions(+), 244 deletions(-)
 rename meta/recipes-connectivity/bind/{bind-9.8.1 => bind}/bind-9.8.1-CVE-2012-5166.patch (100%)
 rename meta/recipes-connectivity/bind/{bind-9.8.1 => bind}/bind-CVE-2011-4313.patch (100%)
 rename meta/recipes-connectivity/bind/{bind-9.8.1 => bind}/bind-CVE-2012-1667.patch (100%)
 rename meta/recipes-connectivity/bind/{bind-9.8.1 => bind}/bind-CVE-2012-3817.patch (100%)
 rename meta/recipes-connectivity/bind/{bind-9.8.1 => bind}/bind-CVE-2013-2266.patch (100%)
 rename meta/recipes-connectivity/bind/{bind-9.8.1 => bind}/bind-Fix-CVE-2012-4244.patch (100%)
 rename meta/recipes-connectivity/bind/{bind-9.8.1 => bind}/conf.patch (100%)
 rename meta/recipes-connectivity/bind/{bind-9.8.1 => bind}/cross-build-fix.patch (100%)
 create mode 100644 meta/recipes-connectivity/bind/bind/dont-test-on-host.patch
 rename meta/recipes-connectivity/bind/{bind-9.8.1 => bind}/make-etc-initd-bind-stop-work.patch (100%)
 rename meta/recipes-connectivity/bind/{bind-9.8.1 => bind}/mips1-not-support-opcode.diff (100%)
 rename meta/recipes-connectivity/bind/{bind_9.8.1.bb => bind_9.9.5.bb} (76%)
 rename meta/recipes-connectivity/dhcp/{dhcp_4.2.5-P1.bb => dhcp_4.3.0.bb} (65%)
 rename meta/recipes-core/util-linux/{util-linux_2.23.2.bb => util-linux_2.24.1.bb} (83%)

-- 
1.8.3.1

[PATCH 1/3] util-linux: Update to 2.24.1

[Saul Wold]

rebase native patch to remove sundisklabel as it's deprectated upstream
Update LIC_FILES_CHECKSUM for modified text, no License Changes
remove deprecated elvtune flag
Rebase the fix-configure patch due to change in configure.ac

Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 meta/recipes-core/util-linux/util-linux.inc        |  12 +-
 .../util-linux/util-linux/fix-configure.patch      |  20 +--
 .../util-linux/util-linux/util-linux-native.patch  | 173 +++------------------
 .../{util-linux_2.23.2.bb => util-linux_2.24.1.bb} |   6 +-
 4 files changed, 37 insertions(+), 174 deletions(-)
 rename meta/recipes-core/util-linux/{util-linux_2.23.2.bb => util-linux_2.24.1.bb} (83%)

diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc
index 4c80bf2..51c982a 100644
--- a/meta/recipes-core/util-linux/util-linux.inc
+++ b/meta/recipes-core/util-linux/util-linux.inc
@@ -7,22 +7,22 @@ SECTION = "base"
 
 LICENSE = "GPLv2+ & LGPLv2.1+ & BSD"
 
-LIC_FILES_CHKSUM = "file://README.licensing;md5=679af3e410ee112a5ec94de6501bf5c3 \
+LIC_FILES_CHKSUM = "file://README.licensing;md5=1715f5ee3e01203ca1e1e0b9ee65918c \
                     file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
                     file://Documentation/licenses/COPYING.GPLv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
                     file://Documentation/licenses/COPYING.LGPLv2.1;md5=4fbd65380cdd255951079008b364516c \
                     file://Documentation/licenses/COPYING.BSD-3;md5=58dcd8452651fc8b07d1f65ce07ca8af \
                     file://Documentation/licenses/COPYING.UCB;md5=263860f8968d8bafa5392cab74285262 \
-                    file://libuuid/COPYING;md5=aa3ac5b4a5bcb707f714f78794011b80 \
-                    file://libmount/COPYING;md5=152f98bc301a5ea649769ede7203ac82 \
-                    file://libblkid/COPYING;md5=152f98bc301a5ea649769ede7203ac82"
+                    file://libuuid/COPYING;md5=b442ffb762cf8d3e9df1b99e0bb4af70 \
+                    file://libmount/COPYING;md5=fb93f01d4361069c5616327705373b16 \
+                    file://libblkid/COPYING;md5=fb93f01d4361069c5616327705373b16"
 
 inherit autotools gettext pkgconfig systemd
 DEPENDS = "zlib ncurses"
 DEPENDS_append_class-native = " lzo-native"
 DEPENDS_append_class-nativesdk = " lzo-native"
 
-SRC_URI = "${KERNELORG_MIRROR}/linux/utils/util-linux/v${MAJOR_VERSION}/util-linux-${PV}.tar.bz2 \
+SRC_URI = "${KERNELORG_MIRROR}/linux/utils/util-linux/v${MAJOR_VERSION}/util-linux-${PV}.tar.xz \
            file://MCONFIG \
            file://defines.h \
            file://make_include \
@@ -39,7 +39,7 @@ PACKAGES =+ "util-linux-agetty util-linux-fdisk util-linux-cfdisk util-linux-sfd
              util-linux-partx ${PN}-bash-completion"
 
 SHARED_EXTRA_OECONF = "--disable-use-tty-group \
-                       --disable-makeinstall-chown --enable-elvtune \
+                       --disable-makeinstall-chown \
                        --enable-kill --enable-last --enable-mesg --enable-partx \
                        --enable-raw --enable-reset --disable-login \
                        --disable-vipw --disable-newgrp --disable-chfn-chsh \
diff --git a/meta/recipes-core/util-linux/util-linux/fix-configure.patch b/meta/recipes-core/util-linux/util-linux/fix-configure.patch
index 0ea2318..cefae97 100644
--- a/meta/recipes-core/util-linux/util-linux/fix-configure.patch
+++ b/meta/recipes-core/util-linux/util-linux/fix-configure.patch
@@ -5,16 +5,16 @@ Upstream-Status: Pending
 
 Signed-off-by: Saul Wold <sgw@linux.intel.com>
 
-Index: util-linux-2.22.1/configure.ac
+Index: util-linux-2.24.1/configure.ac
 ===================================================================
---- util-linux-2.22.1.orig/configure.ac
-+++ util-linux-2.22.1/configure.ac
-@@ -79,7 +79,7 @@ fi
+--- util-linux-2.24.1.orig/configure.ac
++++ util-linux-2.24.1/configure.ac
+@@ -76,7 +76,7 @@ fi
  AC_SUBST([usrsbin_execdir])
  
- case $libdir in
-- '${exec_prefix}/'* | '${prefix}/'* | /usr/*)
-+ ${exec_prefix}/* | ${prefix}/* | /usr/*)
-     usrlib_execdir=$libdir ;;
-  *)
-     usrlib_execdir='${exec_prefix}'$libdir ;;
+ AS_CASE([$libdir],
+- ['${exec_prefix}/'* | '${prefix}/'* | /usr/*],
++ [${exec_prefix}/* | ${prefix}/* | /usr/*],
+    [usrlib_execdir=$libdir],
+  [usrlib_execdir='${exec_prefix}'$libdir]
+ )
diff --git a/meta/recipes-core/util-linux/util-linux/util-linux-native.patch b/meta/recipes-core/util-linux/util-linux/util-linux-native.patch
index e8fcd98..afe543c 100644
--- a/meta/recipes-core/util-linux/util-linux/util-linux-native.patch
+++ b/meta/recipes-core/util-linux/util-linux/util-linux-native.patch
@@ -17,10 +17,11 @@ machines.
 
 Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
 
-diff -ur util-linux-2.23/configure.ac /home/lmhatle/util-linux-2.23-fixed/configure.ac
---- util-linux-2.23/configure.ac	2013-05-29 14:44:35.147853585 -0500
-+++ /home/lmhatle/util-linux-2.23-fixed/configure.ac	2013-05-30 14:56:15.050799650 -0500
-@@ -323,6 +323,7 @@
+Index: util-linux-2.24.1/configure.ac
+===================================================================
+--- util-linux-2.24.1.orig/configure.ac
++++ util-linux-2.24.1/configure.ac
+@@ -302,6 +302,7 @@ AC_CHECK_FUNCS([ \
  	llseek \
  	lseek64 \
  	mempcpy \
@@ -28,10 +29,11 @@ diff -ur util-linux-2.23/configure.ac /home/lmhatle/util-linux-2.23-fixed/config
  	nanosleep \
  	personality \
  	posix_fadvise \
-diff -ur util-linux-2.23/include/c.h /home/lmhatle/util-linux-2.23-fixed/include/c.h
---- util-linux-2.23/include/c.h	2013-04-12 04:25:46.852156874 -0500
-+++ /home/lmhatle/util-linux-2.23-fixed/include/c.h	2013-05-30 14:56:11.310799488 -0500
-@@ -236,6 +236,13 @@
+Index: util-linux-2.24.1/include/c.h
+===================================================================
+--- util-linux-2.24.1.orig/include/c.h
++++ util-linux-2.24.1/include/c.h
+@@ -236,6 +236,13 @@ static inline int dirfd(DIR *d)
  #endif
  
  /*
@@ -45,9 +47,10 @@ diff -ur util-linux-2.23/include/c.h /home/lmhatle/util-linux-2.23-fixed/include
   * MAXHOSTNAMELEN replacement
   */
  static inline size_t get_hostname_max(void)
-diff -ur util-linux-2.23/lib/randutils.c /home/lmhatle/util-linux-2.23-fixed/lib/randutils.c
---- util-linux-2.23/lib/randutils.c	2013-04-12 04:25:46.855156901 -0500
-+++ /home/lmhatle/util-linux-2.23-fixed/lib/randutils.c	2013-05-30 14:55:26.622799644 -0500
+Index: util-linux-2.24.1/lib/randutils.c
+===================================================================
+--- util-linux-2.24.1.orig/lib/randutils.c
++++ util-linux-2.24.1/lib/randutils.c
 @@ -16,6 +16,7 @@
  #include <sys/syscall.h>
  
@@ -56,9 +59,10 @@ diff -ur util-linux-2.23/lib/randutils.c /home/lmhatle/util-linux-2.23-fixed/lib
  
  #ifdef HAVE_TLS
  #define THREAD_LOCAL static __thread
-diff -ur util-linux-2.23/lib/wholedisk.c /home/lmhatle/util-linux-2.23-fixed/lib/wholedisk.c
---- util-linux-2.23/lib/wholedisk.c	2013-04-12 04:25:46.855156901 -0500
-+++ /home/lmhatle/util-linux-2.23-fixed/lib/wholedisk.c	2013-05-30 14:55:31.182799350 -0500
+Index: util-linux-2.24.1/lib/wholedisk.c
+===================================================================
+--- util-linux-2.24.1.orig/lib/wholedisk.c
++++ util-linux-2.24.1/lib/wholedisk.c
 @@ -10,6 +10,7 @@
  
  #include "blkdev.h"
@@ -67,144 +71,3 @@ diff -ur util-linux-2.23/lib/wholedisk.c /home/lmhatle/util-linux-2.23-fixed/lib
  
  int is_whole_disk_fd(int fd, const char *name)
  {
-diff -ur util-linux-2.23/fdisks/fdisksunlabel.c /home/lmhatle/util-linux-2.23-fixed/fdisks/fdisksunlabel.c
---- util-linux-2.23/fdisks/fdisksunlabel.c	2013-04-23 09:14:19.229015244 -0500
-+++ /home/lmhatle/util-linux-2.23-fixed/fdisks/fdisksunlabel.c	2013-05-30 14:54:55.978799735 -0500
-@@ -383,10 +383,10 @@
- 	}
- }
- 
--static int verify_sun_cmp(int *a, int *b, void *data)
--{
--    unsigned int *verify_sun_starts = (unsigned int *) data;
-+static unsigned int *verify_sun_starts;
- 
-+static int verify_sun_cmp(int *a, int *b)
-+{
-     if (*a == -1)
- 	    return 1;
-     if (*b == -1)
-@@ -401,7 +401,6 @@
-     uint32_t starts[SUN_MAXPARTITIONS], lens[SUN_MAXPARTITIONS], start, stop;
-     uint32_t i,j,k,starto,endo;
-     int array[SUN_MAXPARTITIONS];
--    unsigned int *verify_sun_starts;
- 
-     assert(cxt);
-     assert(cxt->label);
-@@ -442,16 +441,14 @@
- 	    }
- 	}
-     }
--
-     for (i = 0; i < SUN_MAXPARTITIONS; i++) {
-         if (lens[i])
-             array[i] = i;
-         else
-             array[i] = -1;
-     }
--    qsort_r(array,ARRAY_SIZE(array),sizeof(array[0]),
--	  (int (*)(const void *,const void *,void *)) verify_sun_cmp,
--	  verify_sun_starts);
-+    qsort(array,ARRAY_SIZE(array),sizeof(array[0]),
-+	  (int (*)(const void *,const void *)) verify_sun_cmp);
- 
-     if (array[0] == -1) {
- 	fdisk_info(cxt, _("No partitions defined"));
-@@ -468,6 +465,7 @@
-     start = (starts[array[i]] + lens[array[i]]);
-     if (start < stop)
-         fdisk_warnx(cxt, _("Unused gap - sectors %d-%d"), start, stop);
-+
-     return 0;
- }
- 
-@@ -746,18 +744,12 @@
- 	}
- }
- 
--
- void fdisk_sun_set_alt_cyl(struct fdisk_context *cxt)
- {
- 	struct sun_disklabel *sunlabel = self_disklabel(cxt);
--	uintmax_t res;
--	int rc = fdisk_ask_number(cxt, 0,			/* low */
--			be16_to_cpu(sunlabel->acyl),		/* default */
--			65535,					/* high */
--			_("Number of alternate cylinders"),	/* query */
--			&res);					/* result */
--	if (!rc)
--		sunlabel->acyl = cpu_to_be16(res);
-+	sunlabel->acyl =
-+		cpu_to_be16(read_int(cxt, 0, be16_to_cpu(sunlabel->acyl), 65535, 0,
-+				_("Number of alternate cylinders")));
- }
- 
- void fdisk_sun_set_ncyl(struct fdisk_context *cxt, int cyl)
-@@ -769,54 +761,33 @@
- void fdisk_sun_set_xcyl(struct fdisk_context *cxt)
- {
- 	struct sun_disklabel *sunlabel = self_disklabel(cxt);
--	uintmax_t res;
--	int rc = fdisk_ask_number(cxt, 0,			/* low */
--			be16_to_cpu(sunlabel->apc),		/* default */
--			cxt->geom.sectors,			/* high */
--			_("Extra sectors per cylinder"),	/* query */
--			&res);					/* result */
--	if (!rc)
--		sunlabel->apc = cpu_to_be16(res);
-+	sunlabel->apc =
-+		cpu_to_be16(read_int(cxt, 0, be16_to_cpu(sunlabel->apc), cxt->geom.sectors, 0,
-+				_("Extra sectors per cylinder")));
- }
- 
- void fdisk_sun_set_ilfact(struct fdisk_context *cxt)
- {
- 	struct sun_disklabel *sunlabel = self_disklabel(cxt);
--	uintmax_t res;
--	int rc = fdisk_ask_number(cxt, 1,			/* low */
--			be16_to_cpu(sunlabel->intrlv),		/* default */
--			32,					/* high */
--			_("Interleave factor"),	/* query */
--			&res);					/* result */
--	if (!rc)
--		sunlabel->intrlv = cpu_to_be16(res);
-+	sunlabel->intrlv =
-+		cpu_to_be16(read_int(cxt, 1, be16_to_cpu(sunlabel->intrlv), 32, 0,
-+				_("Interleave factor")));
- }
- 
- void fdisk_sun_set_rspeed(struct fdisk_context *cxt)
- {
- 	struct sun_disklabel *sunlabel = self_disklabel(cxt);
--	uintmax_t res;
--	int rc = fdisk_ask_number(cxt, 1,			/* low */
--			be16_to_cpu(sunlabel->rpm),		/* default */
--			USHRT_MAX,				/* high */
--			_("Rotation speed (rpm)"),		/* query */
--			&res);					/* result */
--	if (!rc)
--		sunlabel->rpm = cpu_to_be16(res);
--
-+	sunlabel->rpm =
-+		 cpu_to_be16(read_int(cxt, 1, be16_to_cpu(sunlabel->rpm), 100000, 0,
-+				_("Rotation speed (rpm)")));
- }
- 
- void fdisk_sun_set_pcylcount(struct fdisk_context *cxt)
- {
- 	struct sun_disklabel *sunlabel = self_disklabel(cxt);
--	uintmax_t res;
--	int rc = fdisk_ask_number(cxt, 0,			/* low */
--			be16_to_cpu(sunlabel->pcyl),		/* default */
--			USHRT_MAX,				/* high */
--			_("Number of physical cylinders"),	/* query */
--			&res);					/* result */
--	if (!rc)
--		sunlabel->pcyl = cpu_to_be16(res);
-+	sunlabel->pcyl =
-+		cpu_to_be16(read_int(cxt, 0, be16_to_cpu(sunlabel->pcyl), 65535, 0,
-+				_("Number of physical cylinders")));
- }
- 
- static int sun_write_disklabel(struct fdisk_context *cxt)
diff --git a/meta/recipes-core/util-linux/util-linux_2.23.2.bb b/meta/recipes-core/util-linux/util-linux_2.24.1.bb
similarity index 83%
rename from meta/recipes-core/util-linux/util-linux_2.23.2.bb
rename to meta/recipes-core/util-linux/util-linux_2.24.1.bb
index f65932c..b08d68d 100644
--- a/meta/recipes-core/util-linux/util-linux_2.23.2.bb
+++ b/meta/recipes-core/util-linux/util-linux_2.24.1.bb
@@ -1,4 +1,4 @@
-MAJOR_VERSION = "2.23"
+MAJOR_VERSION = "2.24"
 require util-linux.inc
 
 # To support older hosts, we need to patch and/or revert
@@ -14,8 +14,8 @@ SRC_URI += "file://util-linux-ng-replace-siginterrupt.patch \
             ${OLDHOST} \
 "
 
-SRC_URI[md5sum] = "39a02ad0b3b37824c394f40930b7aa38"
-SRC_URI[sha256sum] = "6c5be3f7beec91b4893de14bbd722886fa2521be5bfa0fc079b749d0018633b1"
+SRC_URI[md5sum] = "88d46ae23ca599ac5af9cf96b531590f"
+SRC_URI[sha256sum] = "835eb6232cfab0118ef2e4fd649de0ba9f5bd1b8cbf9a7d4d84594541dec8410"
 
 CACHED_CONFIGUREVARS += "scanf_cv_alloc_modifier=as"
 EXTRA_OECONF_class-native = "${SHARED_EXTRA_OECONF} \
-- 
1.8.3.1

[PATCH 2/3] dhcp: Update to 4.3.0

[Saul Wold]

Rebase fix-external-bind patch
LICENSE file has date update to 2014

Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 meta/recipes-connectivity/dhcp/dhcp.inc            |   2 +-
 .../dhcp/dhcp/fix-external-bind.patch              | 115 +++++++++++----------
 .../dhcp/{dhcp_4.2.5-P1.bb => dhcp_4.3.0.bb}       |   6 +-
 3 files changed, 65 insertions(+), 58 deletions(-)
 rename meta/recipes-connectivity/dhcp/{dhcp_4.2.5-P1.bb => dhcp_4.3.0.bb} (65%)

diff --git a/meta/recipes-connectivity/dhcp/dhcp.inc b/meta/recipes-connectivity/dhcp/dhcp.inc
index ad82b57..512127c 100644
--- a/meta/recipes-connectivity/dhcp/dhcp.inc
+++ b/meta/recipes-connectivity/dhcp/dhcp.inc
@@ -8,7 +8,7 @@ easier to administer devices."
 HOMEPAGE = "http://www.isc.org/"
 
 LICENSE = "ISC"
-LIC_FILES_CHKSUM = "file://LICENSE;beginline=4;md5=bb6fd41f5895b67088ebea61ad365e74"
+LIC_FILES_CHKSUM = "file://LICENSE;beginline=4;md5=c5c64d696107f84b56fe337d14da1753"
 
 DEPENDS = "openssl bind"
 
diff --git a/meta/recipes-connectivity/dhcp/dhcp/fix-external-bind.patch b/meta/recipes-connectivity/dhcp/dhcp/fix-external-bind.patch
index 4f11655..a291fda 100644
--- a/meta/recipes-connectivity/dhcp/dhcp/fix-external-bind.patch
+++ b/meta/recipes-connectivity/dhcp/dhcp/fix-external-bind.patch
@@ -6,37 +6,39 @@ this patch is to allow building with external bind
 
 Signed-off-by: Qing He <qing.he@intel.com>
 
-diff --git a/Makefile.am b/Makefile.am
-index 928d926..cd17af8 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -21,7 +21,7 @@ EXTRA_DIST = RELNOTES LICENSE \
- 	     util/bindvar.sh \
- 	     bind/Makefile bind/bind.tar.gz bind/version.tmp 
+Index: dhcp-4.3.0/Makefile.am
+===================================================================
+--- dhcp-4.3.0.orig/Makefile.am
++++ dhcp-4.3.0/Makefile.am
+@@ -25,7 +25,7 @@ EXTRA_DIST = RELNOTES LICENSE \
+ 	     bind/Makefile bind/bind.tar.gz bind/version.tmp \
+ 	     common/tests/Atffile server/tests/Atffile
  
 -SUBDIRS = bind includes tests common dst omapip client dhcpctl relay server
 +SUBDIRS = includes tests common dst omapip client dhcpctl relay server
  
  nobase_include_HEADERS = dhcpctl/dhcpctl.h
  
-diff --git a/client/Makefile.am b/client/Makefile.am
-index 77ed055..5a77f2d 100644
---- a/client/Makefile.am
-+++ b/client/Makefile.am
-@@ -5,7 +5,7 @@ dhclient_SOURCES = clparse.c dhclient.c dhc6.c \
+Index: dhcp-4.3.0/client/Makefile.am
+===================================================================
+--- dhcp-4.3.0.orig/client/Makefile.am
++++ dhcp-4.3.0/client/Makefile.am
+@@ -4,8 +4,8 @@ dhclient_SOURCES = clparse.c dhclient.c
+ 		   scripts/bsdos scripts/freebsd scripts/linux scripts/macos \
  		   scripts/netbsd scripts/nextstep scripts/openbsd \
  		   scripts/solaris scripts/openwrt
- dhclient_LDADD = ../common/libdhcp.a ../omapip/libomapi.a \
--		 ../bind/lib/libdns.a ../bind/lib/libisc.a
-+		 $(libbind)/libdns.a $(libbind)/libisc.a
+-dhclient_LDADD = ../common/libdhcp.a ../omapip/libomapi.a ../bind/lib/libirs.a \
+-		 ../bind/lib/libdns.a ../bind/lib/libisccfg.a ../bind/lib/libisc.a
++dhclient_LDADD = ../common/libdhcp.a ../omapip/libomapi.a $(libbind)/libirs.a \
++		 $(libbind)/libdns.a $(libbind)/libisccfg.a $(libbind)/libisc.a
  man_MANS = dhclient.8 dhclient-script.8 dhclient.conf.5 dhclient.leases.5
  EXTRA_DIST = $(man_MANS)
  
-diff --git a/configure.ac b/configure.ac
-index ff832aa..60d342c 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -500,6 +500,7 @@ no)
+Index: dhcp-4.3.0/configure.ac
+===================================================================
+--- dhcp-4.3.0.orig/configure.ac
++++ dhcp-4.3.0/configure.ac
+@@ -566,6 +566,7 @@ no)
  	libbind="$use_libbind"
  	;;
  esac
@@ -44,60 +46,67 @@ index ff832aa..60d342c 100644
  
  # OpenLDAP support.
  AC_ARG_WITH(ldap,
-diff --git a/dhcpctl/Makefile.am b/dhcpctl/Makefile.am
-index 61049be..85aefa3 100644
---- a/dhcpctl/Makefile.am
-+++ b/dhcpctl/Makefile.am
-@@ -6,10 +6,10 @@ EXTRA_DIST = $(man_MANS)
+Index: dhcp-4.3.0/dhcpctl/Makefile.am
+===================================================================
+--- dhcp-4.3.0.orig/dhcpctl/Makefile.am
++++ dhcp-4.3.0/dhcpctl/Makefile.am
+@@ -6,12 +6,12 @@ EXTRA_DIST = $(man_MANS)
  
  omshell_SOURCES = omshell.c
  omshell_LDADD = libdhcpctl.a ../common/libdhcp.a ../omapip/libomapi.a \
--	        ../bind/lib/libdns.a ../bind/lib/libisc.a
-+	        $(libbind)/libdns.a $(libbind)/libisc.a
+-	        ../bind/lib/libirs.a ../bind/lib/libdns.a \
+-	        ../bind/lib/libisccfg.a ../bind/lib/libisc.a
++	        $(libbind)/libirs.a $(libbind)/libdns.a \
++	        $(libbind)/libisccfg.a $(libbind)/libisc.a
  
  libdhcpctl_a_SOURCES = dhcpctl.c callback.c remote.c
  
  cltest_SOURCES = cltest.c
  cltest_LDADD = libdhcpctl.a ../common/libdhcp.a ../omapip/libomapi.a \
--	       ../bind/lib/libdns.a ../bind/lib/libisc.a
-\ No newline at end of file
-+	       $(libbind)/libdns.a $(libbind)/libisc.a
-diff --git a/omapip/Makefile.am b/omapip/Makefile.am
-index 595950a..17f2233 100644
---- a/omapip/Makefile.am
-+++ b/omapip/Makefile.am
-@@ -10,5 +10,5 @@ man_MANS = omapi.3
+-	       ../bind/lib/libirs.a ../bind/lib/libdns.a \
+-               ../bind/lib/libisccfg.a ../bind/lib/libisc.a
++	       $(libbind)/libirs.a $(libbind)/libdns.a \
++               $(libbind)/libisccfg.a $(libbind)/libisc.a
+Index: dhcp-4.3.0/omapip/Makefile.am
+===================================================================
+--- dhcp-4.3.0.orig/omapip/Makefile.am
++++ dhcp-4.3.0/omapip/Makefile.am
+@@ -10,6 +10,6 @@ man_MANS = omapi.3
  EXTRA_DIST = $(man_MANS)
  
  svtest_SOURCES = test.c
--svtest_LDADD = libomapi.a ../bind/lib/libdns.a ../bind/lib/libisc.a
-+svtest_LDADD = libomapi.a $(libbind)/libdns.a $(libbind)/libisc.a
+-svtest_LDADD = libomapi.a ../bind/lib/libirs.a ../bind/lib/libdns.a \
+-		../bind/lib/libisccfg.a ../bind/lib/libisc.a
++svtest_LDADD = libomapi.a $(libbind)/libirs.a $(libbind)/libdns.a \
++		$(libbind)/libisccfg.a $(libbind)/libisc.a
  
-diff --git a/relay/Makefile.am b/relay/Makefile.am
-index d8757ca..a7885da 100644
---- a/relay/Makefile.am
-+++ b/relay/Makefile.am
-@@ -3,7 +3,7 @@ AM_CPPFLAGS = -DLOCALSTATEDIR='"@localstatedir@"'
+Index: dhcp-4.3.0/relay/Makefile.am
+===================================================================
+--- dhcp-4.3.0.orig/relay/Makefile.am
++++ dhcp-4.3.0/relay/Makefile.am
+@@ -3,8 +3,8 @@ AM_CPPFLAGS = -DLOCALSTATEDIR='"@localst
  sbin_PROGRAMS = dhcrelay
  dhcrelay_SOURCES = dhcrelay.c
  dhcrelay_LDADD = ../common/libdhcp.a ../omapip/libomapi.a \
--		 ../bind/lib/libdns.a ../bind/lib/libisc.a
-+		 $(libbind)/libdns.a $(libbind)/libisc.a
+-		 ../bind/lib/libirs.a ../bind/lib/libdns.a \
+-		 ../bind/lib/libisccfg.a ../bind/lib/libisc.a
++		 $(libbind)/libirs.a $(libbind)/libdns.a \
++		 $(libbind)/libisccfg.a $(libbind)/libisc.a
  man_MANS = dhcrelay.8
  EXTRA_DIST = $(man_MANS)
  
-diff --git a/server/Makefile.am b/server/Makefile.am
-index cdfaf47..d2c254b 100644
---- a/server/Makefile.am
-+++ b/server/Makefile.am
-@@ -8,8 +8,8 @@ dhcpd_SOURCES = dhcpd.c dhcp.c bootp.c confpars.c db.c class.c failover.c \
+Index: dhcp-4.3.0/server/Makefile.am
+===================================================================
+--- dhcp-4.3.0.orig/server/Makefile.am
++++ dhcp-4.3.0/server/Makefile.am
+@@ -14,8 +14,8 @@ dhcpd_SOURCES = dhcpd.c dhcp.c bootp.c c
  
  dhcpd_CFLAGS = $(LDAP_CFLAGS)
  dhcpd_LDADD = ../common/libdhcp.a ../omapip/libomapi.a \
--	      ../dhcpctl/libdhcpctl.a ../bind/lib/libdns.a \
--	      ../bind/lib/libisc.a
-+	      ../dhcpctl/libdhcpctl.a $(libbind)/libdns.a \
-+	      $(libbind)/libisc.a
+-	      ../dhcpctl/libdhcpctl.a ../bind/lib/libirs.a \
+-	      ../bind/lib/libdns.a ../bind/lib/libisccfg.a ../bind/lib/libisc.a
++	      ../dhcpctl/libdhcpctl.a $(libbind)/libirs.a \
++	      $(libbind)/libdns.a $(libbind)/libisccfg.a $(libbind)/libisc.a
  
  man_MANS = dhcpd.8 dhcpd.conf.5 dhcpd.leases.5
  EXTRA_DIST = $(man_MANS)
diff --git a/meta/recipes-connectivity/dhcp/dhcp_4.2.5-P1.bb b/meta/recipes-connectivity/dhcp/dhcp_4.3.0.bb
similarity index 65%
rename from meta/recipes-connectivity/dhcp/dhcp_4.2.5-P1.bb
rename to meta/recipes-connectivity/dhcp/dhcp_4.3.0.bb
index 77cdb4e..6da28fa 100644
--- a/meta/recipes-connectivity/dhcp/dhcp_4.2.5-P1.bb
+++ b/meta/recipes-connectivity/dhcp/dhcp_4.3.0.bb
@@ -1,7 +1,5 @@
 require dhcp.inc
 
-PR = "r4"
-
 SRC_URI += "file://dhcp-3.0.3-dhclient-dbus.patch;striplevel=0 \
             file://fix-external-bind.patch \
             file://link-with-lcrypto.patch \
@@ -9,5 +7,5 @@ SRC_URI += "file://dhcp-3.0.3-dhclient-dbus.patch;striplevel=0 \
             file://dhclient-script-drop-resolv.conf.dhclient.patch \
            "
 
-SRC_URI[md5sum] = "f68e3c1f00a9af5742bc5e71d567cf93"
-SRC_URI[sha256sum] = "59b06c9f5d775e46999b422c45b9229402c462b114ce1685617bfb2b8b028250"
+SRC_URI[md5sum] = "1020d77e1a4c1f01b76279caff9beb80"
+SRC_URI[sha256sum] = "a7b6517d5cf32c5e49d2323a63de00efe5391df7cb0045dfa0ec8f6ee46ebe8a"
-- 
1.8.3.1

[PATCH 3/3] bind: Update to 9.9.5

[Saul Wold]

Remove CVE patches that are in bind
Updated COPYRIGHT includes date changes the NetBSD Copyright
Modifies the Base BSD License to 3-Clause (removes advertising clause)w
Add patch to disable running tests on host
bind: Add python-core for dnssec

Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 .../bind-9.8.1-CVE-2012-5166.patch                   |  0
 .../{bind-9.8.1 => bind}/bind-CVE-2011-4313.patch    |  0
 .../{bind-9.8.1 => bind}/bind-CVE-2012-1667.patch    |  0
 .../{bind-9.8.1 => bind}/bind-CVE-2012-3817.patch    |  0
 .../{bind-9.8.1 => bind}/bind-CVE-2013-2266.patch    |  0
 .../bind-Fix-CVE-2012-4244.patch                     |  0
 .../bind/{bind-9.8.1 => bind}/conf.patch             |  0
 .../bind/{bind-9.8.1 => bind}/cross-build-fix.patch  |  0
 .../bind/bind/dont-test-on-host.patch                | 13 +++++++++++++
 .../make-etc-initd-bind-stop-work.patch              |  0
 .../mips1-not-support-opcode.diff                    |  0
 .../bind/{bind_9.8.1.bb => bind_9.9.5.bb}            | 20 ++++++++------------
 12 files changed, 21 insertions(+), 12 deletions(-)
 rename meta/recipes-connectivity/bind/{bind-9.8.1 => bind}/bind-9.8.1-CVE-2012-5166.patch (100%)
 rename meta/recipes-connectivity/bind/{bind-9.8.1 => bind}/bind-CVE-2011-4313.patch (100%)
 rename meta/recipes-connectivity/bind/{bind-9.8.1 => bind}/bind-CVE-2012-1667.patch (100%)
 rename meta/recipes-connectivity/bind/{bind-9.8.1 => bind}/bind-CVE-2012-3817.patch (100%)
 rename meta/recipes-connectivity/bind/{bind-9.8.1 => bind}/bind-CVE-2013-2266.patch (100%)
 rename meta/recipes-connectivity/bind/{bind-9.8.1 => bind}/bind-Fix-CVE-2012-4244.patch (100%)
 rename meta/recipes-connectivity/bind/{bind-9.8.1 => bind}/conf.patch (100%)
 rename meta/recipes-connectivity/bind/{bind-9.8.1 => bind}/cross-build-fix.patch (100%)
 create mode 100644 meta/recipes-connectivity/bind/bind/dont-test-on-host.patch
 rename meta/recipes-connectivity/bind/{bind-9.8.1 => bind}/make-etc-initd-bind-stop-work.patch (100%)
 rename meta/recipes-connectivity/bind/{bind-9.8.1 => bind}/mips1-not-support-opcode.diff (100%)
 rename meta/recipes-connectivity/bind/{bind_9.8.1.bb => bind_9.9.5.bb} (76%)

diff --git a/meta/recipes-connectivity/bind/bind-9.8.1/bind-9.8.1-CVE-2012-5166.patch b/meta/recipes-connectivity/bind/bind/bind-9.8.1-CVE-2012-5166.patch
similarity index 100%
rename from meta/recipes-connectivity/bind/bind-9.8.1/bind-9.8.1-CVE-2012-5166.patch
rename to meta/recipes-connectivity/bind/bind/bind-9.8.1-CVE-2012-5166.patch
diff --git a/meta/recipes-connectivity/bind/bind-9.8.1/bind-CVE-2011-4313.patch b/meta/recipes-connectivity/bind/bind/bind-CVE-2011-4313.patch
similarity index 100%
rename from meta/recipes-connectivity/bind/bind-9.8.1/bind-CVE-2011-4313.patch
rename to meta/recipes-connectivity/bind/bind/bind-CVE-2011-4313.patch
diff --git a/meta/recipes-connectivity/bind/bind-9.8.1/bind-CVE-2012-1667.patch b/meta/recipes-connectivity/bind/bind/bind-CVE-2012-1667.patch
similarity index 100%
rename from meta/recipes-connectivity/bind/bind-9.8.1/bind-CVE-2012-1667.patch
rename to meta/recipes-connectivity/bind/bind/bind-CVE-2012-1667.patch
diff --git a/meta/recipes-connectivity/bind/bind-9.8.1/bind-CVE-2012-3817.patch b/meta/recipes-connectivity/bind/bind/bind-CVE-2012-3817.patch
similarity index 100%
rename from meta/recipes-connectivity/bind/bind-9.8.1/bind-CVE-2012-3817.patch
rename to meta/recipes-connectivity/bind/bind/bind-CVE-2012-3817.patch
diff --git a/meta/recipes-connectivity/bind/bind-9.8.1/bind-CVE-2013-2266.patch b/meta/recipes-connectivity/bind/bind/bind-CVE-2013-2266.patch
similarity index 100%
rename from meta/recipes-connectivity/bind/bind-9.8.1/bind-CVE-2013-2266.patch
rename to meta/recipes-connectivity/bind/bind/bind-CVE-2013-2266.patch
diff --git a/meta/recipes-connectivity/bind/bind-9.8.1/bind-Fix-CVE-2012-4244.patch b/meta/recipes-connectivity/bind/bind/bind-Fix-CVE-2012-4244.patch
similarity index 100%
rename from meta/recipes-connectivity/bind/bind-9.8.1/bind-Fix-CVE-2012-4244.patch
rename to meta/recipes-connectivity/bind/bind/bind-Fix-CVE-2012-4244.patch
diff --git a/meta/recipes-connectivity/bind/bind-9.8.1/conf.patch b/meta/recipes-connectivity/bind/bind/conf.patch
similarity index 100%
rename from meta/recipes-connectivity/bind/bind-9.8.1/conf.patch
rename to meta/recipes-connectivity/bind/bind/conf.patch
diff --git a/meta/recipes-connectivity/bind/bind-9.8.1/cross-build-fix.patch b/meta/recipes-connectivity/bind/bind/cross-build-fix.patch
similarity index 100%
rename from meta/recipes-connectivity/bind/bind-9.8.1/cross-build-fix.patch
rename to meta/recipes-connectivity/bind/bind/cross-build-fix.patch
diff --git a/meta/recipes-connectivity/bind/bind/dont-test-on-host.patch b/meta/recipes-connectivity/bind/bind/dont-test-on-host.patch
new file mode 100644
index 0000000..8920740
--- /dev/null
+++ b/meta/recipes-connectivity/bind/bind/dont-test-on-host.patch
@@ -0,0 +1,13 @@
+Index: bind-9.9.5/bin/Makefile.in
+===================================================================
+--- bind-9.9.5.orig/bin/Makefile.in
++++ bind-9.9.5/bin/Makefile.in
+@@ -19,7 +19,7 @@ srcdir =	@srcdir@
+ VPATH =		@srcdir@
+ top_srcdir =	@top_srcdir@
+ 
+-SUBDIRS =	named rndc dig dnssec tools tests nsupdate \
++SUBDIRS =	named rndc dig dnssec tools nsupdate \
+ 		check confgen @PYTHON_TOOLS@ @PKCS11_TOOLS@
+ TARGETS =
+ 
diff --git a/meta/recipes-connectivity/bind/bind-9.8.1/make-etc-initd-bind-stop-work.patch b/meta/recipes-connectivity/bind/bind/make-etc-initd-bind-stop-work.patch
similarity index 100%
rename from meta/recipes-connectivity/bind/bind-9.8.1/make-etc-initd-bind-stop-work.patch
rename to meta/recipes-connectivity/bind/bind/make-etc-initd-bind-stop-work.patch
diff --git a/meta/recipes-connectivity/bind/bind-9.8.1/mips1-not-support-opcode.diff b/meta/recipes-connectivity/bind/bind/mips1-not-support-opcode.diff
similarity index 100%
rename from meta/recipes-connectivity/bind/bind-9.8.1/mips1-not-support-opcode.diff
rename to meta/recipes-connectivity/bind/bind/mips1-not-support-opcode.diff
diff --git a/meta/recipes-connectivity/bind/bind_9.8.1.bb b/meta/recipes-connectivity/bind/bind_9.9.5.bb
similarity index 76%
rename from meta/recipes-connectivity/bind/bind_9.8.1.bb
rename to meta/recipes-connectivity/bind/bind_9.9.5.bb
index d59f7e5..1d70b62 100644
--- a/meta/recipes-connectivity/bind/bind_9.8.1.bb
+++ b/meta/recipes-connectivity/bind/bind_9.9.5.bb
@@ -3,32 +3,26 @@ HOMEPAGE = "http://www.isc.org/sw/bind/"
 SECTION = "console/network"
 
 LICENSE = "ISC & BSD"
-LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=0fbe2a3ab3c68ac3fea3cad13093877c"
+LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=a3df5f651469919a0e6cb42f84fb6ff1"
 
 DEPENDS = "openssl libcap"
-PR = "r6"
 
 SRC_URI = "ftp://ftp.isc.org/isc/bind9/${PV}/${BPN}-${PV}.tar.gz \
            file://conf.patch \
            file://cross-build-fix.patch \
            file://make-etc-initd-bind-stop-work.patch \
-           file://bind-9.8.1-CVE-2012-5166.patch \
-           file://bind-CVE-2011-4313.patch \
-           file://bind-CVE-2012-1667.patch \
-           file://bind-CVE-2012-3817.patch \
-           file://bind-CVE-2013-2266.patch \
-           file://bind-Fix-CVE-2012-4244.patch \
            file://mips1-not-support-opcode.diff \
+           file://dont-test-on-host.patch \
 	   "
 
-SRC_URI[md5sum] = "cf31117c5d35af34d4c0702970ad9fb7"
-SRC_URI[sha256sum] = "02285dc429cb2a6687a1b2446e9ee22c1df27f2577225b05be5092395ee7c92c"
+SRC_URI[md5sum] = "e676c65cad5234617ee22f48e328c24e"
+SRC_URI[sha256sum] = "d4b64c1dde442145a316679acff2df4008aa117ae52dfa3a6bc69efecc7840d1"
 
 # --enable-exportlib is necessary for building dhcp
 ENABLE_IPV6 = "--enable-ipv6=${@base_contains('DISTRO_FEATURES', 'ipv6', 'yes', 'no', d)}"
 EXTRA_OECONF = " ${ENABLE_IPV6} --with-randomdev=/dev/random --disable-threads \
                  --disable-devpoll --disable-epoll --with-gost=no \
-                 --with-gssapi=no \
+                 --with-gssapi=no --with-ecdsa=yes \
                  --sysconfdir=${sysconfdir}/bind \
                  --with-openssl=${STAGING_LIBDIR}/.. --with-libxml2=${STAGING_LIBDIR}/.. \
                  --enable-exportlib --with-export-includedir=${includedir} --with-export-libdir=${libdir} \
@@ -40,7 +34,9 @@ INITSCRIPT_PARAMS = "defaults"
 
 PARALLEL_MAKE = ""
 
-PACKAGES_prepend = "${PN}-utils "
+RDEPENDS_${PN} = "python-core"
+
+PACKAGES_preprend = " ${PN}-utils "
 FILES_${PN}-utils = "${bindir}/host ${bindir}/dig ${bindir}/nslookup"
 FILES_${PN}-dev += "${bindir}/isc-config.h"
 
-- 
1.8.3.1

Re: [PATCH 3/3] bind: Update to 9.9.5

[Richard Purdie]

On Sun, 2014-03-09 at 20:48 -0700, Saul Wold wrote:
> Remove CVE patches that are in bind
> Updated COPYRIGHT includes date changes the NetBSD Copyright
> Modifies the Base BSD License to 3-Clause (removes advertising clause)w
> Add patch to disable running tests on host
> bind: Add python-core for dnssec
> 
> Signed-off-by: Saul Wold <sgw@linux.intel.com>

Judging from the autobuilder failures, this one could still use some
work :/

Cheers,

Richard

Re: [PATCH 3/3] bind: Update to 9.9.5

[Saul Wold]

On 03/09/2014 11:09 PM, Richard Purdie wrote:
> On Sun, 2014-03-09 at 20:48 -0700, Saul Wold wrote:
>> Remove CVE patches that are in bind
>> Updated COPYRIGHT includes date changes the NetBSD Copyright
>> Modifies the Base BSD License to 3-Clause (removes advertising clause)w
>> Add patch to disable running tests on host
>> bind: Add python-core for dnssec
>>
>> Signed-off-by: Saul Wold <sgw@linux.intel.com>
>
> Judging from the autobuilder failures, this one could still use some
> work :/
>
That should have been addressed with the RDEPENDS_${PN} = "python-core" 
since the new dnssec-* scripts are python based.

Sau!

> Cheers,
>
> Richard
>
>
>