[PATCH 0/2] Package upgrades

[PATCH 0/2] Package upgrades

[Cristiana Voicu]

Hi,

Tests done:
 * build tested on AB running following nightlies: build-appliance, x86, x86_64, ppc, mips, arm;
 * checked with rpm if the packages were installed and their version; basic functionality for
sudo and crond

Thanks,
Cristiana

The following changes since commit ff10f72abda52315b892c64f711096772d9a4c1c:

  meta-skeleton: Add busybox config fragment example (2013-08-13 23:06:04 +0100)

are available in the git repository at:

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

Cristiana Voicu (2):
  cronie: upgrade to 1.4.11
  sudo: upgrade to 1.8.7

 .../cronie/{cronie_1.4.9.bb => cronie_1.4.11.bb}   |    8 ++--
 meta/recipes-extended/sudo/files/libtool.patch     |   42 --------------------
 meta/recipes-extended/sudo/sudo.inc                |    4 +-
 .../sudo/{sudo_1.8.6p8.bb => sudo_1.8.7.bb}        |    7 +---
 4 files changed, 7 insertions(+), 54 deletions(-)
 rename meta/recipes-extended/cronie/{cronie_1.4.9.bb => cronie_1.4.11.bb} (92%)
 delete mode 100644 meta/recipes-extended/sudo/files/libtool.patch
 rename meta/recipes-extended/sudo/{sudo_1.8.6p8.bb => sudo_1.8.7.bb} (79%)

-- 
1.7.9.5

[PATCH 1/2] cronie: upgrade to 1.4.11

[Cristiana Voicu]

LIC_FILES_CHKSUM changed because cron.h doesn't exist anymore.
Replaced it with cron.c.

Signed-off-by: Cristiana Voicu <cristiana.voicu@intel.com>
---
 .../cronie/{cronie_1.4.9.bb => cronie_1.4.11.bb}   |    8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)
 rename meta/recipes-extended/cronie/{cronie_1.4.9.bb => cronie_1.4.11.bb} (92%)

diff --git a/meta/recipes-extended/cronie/cronie_1.4.9.bb b/meta/recipes-extended/cronie/cronie_1.4.11.bb
similarity index 92%
rename from meta/recipes-extended/cronie/cronie_1.4.9.bb
rename to meta/recipes-extended/cronie/cronie_1.4.11.bb
index b338c37..5b12448 100644
--- a/meta/recipes-extended/cronie/cronie_1.4.9.bb
+++ b/meta/recipes-extended/cronie/cronie_1.4.11.bb
@@ -9,7 +9,7 @@ BUGTRACKER = "mmaslano@redhat.com"
 # Internet Systems Consortium License
 LICENSE = "ISC & BSD"
 LIC_FILES_CHKSUM = "file://COPYING;md5=963ea0772a2adbdcd607a9b2ec320c11 \
-                    file://src/cron.h;endline=20;md5=b425c334265026177128353a142633b4 \
+                    file://src/cron.c;endline=20;md5=b425c334265026177128353a142633b4 \
                     file://src/popen.c;beginline=3;endline=31;md5=edd50742d8def712e9472dba353668a9"
 
 SECTION = "utils"
@@ -18,8 +18,6 @@ DEPENDS += "${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}"
 RDEPENDS_${PN} = "${@base_contains('DISTRO_FEATURES', 'pam', '${PAM_DEPS}', '', d)}"
 PAM_DEPS = "libpam libpam-runtime pam-plugin-access pam-plugin-loginuid"
 
-PR = "r0"
-
 SRC_URI = "https://fedorahosted.org/releases/c/r/cronie/cronie-${PV}.tar.gz \
            file://crond.init \
            file://crontab \
@@ -28,8 +26,8 @@ SRC_URI = "https://fedorahosted.org/releases/c/r/cronie/cronie-${PV}.tar.gz \
 PAM_SRC_URI = "file://crond_pam_config.patch"
 
 
-SRC_URI[md5sum] = "9133195e5e6f824ef460f5ccc533f1b7"
-SRC_URI[sha256sum] = "bd7f6f118460c452bd1217a24b80fd3c000425d3de28731b98354a81a2133e92"
+SRC_URI[md5sum] = "2ba645cf54de17f138ef70312843862f"
+SRC_URI[sha256sum] = "fd08084cedddbb42499f80ddb7f2158195c3555c2ff40ee11d4ece2f9864d7be"
 
 inherit autotools update-rc.d useradd
 
-- 
1.7.9.5

[PATCH 2/2] sudo: upgrade to 1.8.7

[Cristiana Voicu]

Removed a patch because the changes were merged upstream.
Also, the license had some modifications in two files.

Signed-off-by: Cristiana Voicu <cristiana.voicu@intel.com>
---
 meta/recipes-extended/sudo/files/libtool.patch     |   42 --------------------
 meta/recipes-extended/sudo/sudo.inc                |    4 +-
 .../sudo/{sudo_1.8.6p8.bb => sudo_1.8.7.bb}        |    7 +---
 3 files changed, 4 insertions(+), 49 deletions(-)
 delete mode 100644 meta/recipes-extended/sudo/files/libtool.patch
 rename meta/recipes-extended/sudo/{sudo_1.8.6p8.bb => sudo_1.8.7.bb} (79%)

diff --git a/meta/recipes-extended/sudo/files/libtool.patch b/meta/recipes-extended/sudo/files/libtool.patch
deleted file mode 100644
index 10456d2..0000000
--- a/meta/recipes-extended/sudo/files/libtool.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 8f89e456b2c23d78646a938ee5d4c5477c06c28d Mon Sep 17 00:00:00 2001
-From: Andrei Dinu <andrei.adrianx.dinu@intel.com>
-Date: Fri, 25 Jan 2013 16:18:37 +0200
-Subject: [PATCH] Fix path to libtool scripts so autoreconf can succeed.
-
-Upstream-Status: Inappropriate [Other]
-Workaround is specific to our build system.
-
-Signed-off-by: Scott Garman <scott.a.garman@intel.com>
-Signed-off-by: Andrei Dinu <andrei.adrianx.dinu@intel.com>
----
- aclocal.m4 |   14 +++++++-------
- 1 file changed, 7 insertions(+), 7 deletions(-)
-
-diff --git a/aclocal.m4 b/aclocal.m4
-index 481ffeb..0c53eeb 100644
---- a/aclocal.m4
-+++ b/aclocal.m4
-@@ -364,13 +364,13 @@ EOF
- dnl
- dnl Pull in libtool macros
- dnl
--m4_include([libtool.m4])
--m4_include([ltoptions.m4])
--m4_include([ltsugar.m4])
--m4_include([ltversion.m4])
--m4_include([lt~obsolete.m4])
-+m4_include([m4/libtool.m4])
-+m4_include([m4/ltoptions.m4])
-+m4_include([m4/ltsugar.m4])
-+m4_include([m4/ltversion.m4])
-+m4_include([m4/lt~obsolete.m4])
- dnl
- dnl Pull in other non-standard macros
- dnl
--m4_include([ax_check_compile_flag.m4])
--m4_include([ax_check_link_flag.m4])
-+m4_include([m4/ax_check_compile_flag.m4])
-+m4_include([m4/ax_check_link_flag.m4])
--- 
-1.7.9.5
-
diff --git a/meta/recipes-extended/sudo/sudo.inc b/meta/recipes-extended/sudo/sudo.inc
index e77c901..b00f68d 100644
--- a/meta/recipes-extended/sudo/sudo.inc
+++ b/meta/recipes-extended/sudo/sudo.inc
@@ -4,8 +4,8 @@ HOMEPAGE = "http://www.sudo.ws"
 BUGTRACKER = "http://www.sudo.ws/bugs/"
 SECTION = "admin"
 LICENSE = "ISC & BSD & Zlib"
-LIC_FILES_CHKSUM = "file://doc/LICENSE;md5=d25a8240ca6decdecb9990789e593130 \
-                    file://plugins/sudoers/redblack.c;beginline=1;endline=41;md5=fba1c1dca0951819964dfdc618e81724 \
+LIC_FILES_CHKSUM = "file://doc/LICENSE;md5=9b2b7976b2182ee9a146710b32a01c7a \
+                    file://plugins/sudoers/redblack.c;beginline=1;endline=41;md5=e2dbb155fc49beea947515300bab99e0 \
                     file://compat/fnmatch.c;beginline=3;endline=27;md5=67f83ee9bd456557397082f8f1be0efd \
                     file://compat/getcwd.c;beginline=5;endline=27;md5=449af4cc57fc7d46f42090608ba3e681 \
                     file://compat/glob.c;beginline=6;endline=31;md5=5872733146b9eb0deb79e1f664815b85 \
diff --git a/meta/recipes-extended/sudo/sudo_1.8.6p8.bb b/meta/recipes-extended/sudo/sudo_1.8.7.bb
similarity index 79%
rename from meta/recipes-extended/sudo/sudo_1.8.6p8.bb
rename to meta/recipes-extended/sudo/sudo_1.8.7.bb
index 00602c0..c83e95d 100644
--- a/meta/recipes-extended/sudo/sudo_1.8.6p8.bb
+++ b/meta/recipes-extended/sudo/sudo_1.8.7.bb
@@ -1,15 +1,12 @@
 require sudo.inc
 
-PR = "r0"
-
 SRC_URI = "http://ftp.sudo.ws/sudo/dist/sudo-${PV}.tar.gz \
-           file://libtool.patch \
            ${@base_contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)}"
 
 PAM_SRC_URI = "file://sudo.pam"
 
-SRC_URI[md5sum] = "6dac48c73c8e0932980efcddafa569af"
-SRC_URI[sha256sum] = "c0baaa87f59153967b650a0dde2f7d4147d358fa15f3fdabb47e84d0282fe625"
+SRC_URI[md5sum] = "a02367090e1dac8d0c1747de1127b6bf"
+SRC_URI[sha256sum] = "39626cf3d48c4fd5a9139a2627d42bfefac7ce47f470bdba3aeb4e3d7c49566a"
 
 DEPENDS += " ${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}"
 RDEPENDS_${PN} += " ${@base_contains('DISTRO_FEATURES', 'pam', 'pam-plugin-limits pam-plugin-keyinit', '', d)}"
-- 
1.7.9.5

Re: [PATCH 2/2] sudo: upgrade to 1.8.7

[Khem Raj]

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

On Fri, Aug 16, 2013 at 1:30 AM, Cristiana Voicu
<cristiana.voicu@intel.com>wrote:

> Also, the license had some modifications in two files.
>


​would be nice if you mentioned what the changed were.​

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

Re: [PATCH 1/2] cronie: upgrade to 1.4.11

[Paul Eggleton]

Hi Cristiana,

On Friday 16 August 2013 11:30:49 Cristiana Voicu wrote:
> LIC_FILES_CHKSUM changed because cron.h doesn't exist anymore.
> Replaced it with cron.c.
>...

A couple of people have reported this doesn't build, and I've confirmed it this morning:

| mips-poky-linux-gcc  -meb -mabi=32 -mhard-float -march=mips32 --sysroot=/media/large/tmp/sysroots/qemumips -DHAVE_CONFIG_H -I. -I/media/large/tmp/work/mips32-poky-linux/cronie/1.4.11-r0/cronie-1.4.11/src -I..     -O2 -pipe -g -feliminate-unused-debug-types -c /media/large/tmp/work/mips32-poky-linux/cronie/1.4.11-r0/cronie-1.4.11/src/database.c
| /media/large/tmp/work/mips32-poky-linux/cronie/1.4.11-r0/cronie-1.4.11/src/security.c:32:27: fatal error: cronie_common.h: No such file or directory
|  #include "cronie_common.h"
|                            ^
| compilation terminated.
| /media/large/tmp/work/mips32-poky-linux/cronie/1.4.11-r0/cronie-1.4.11/src/crontab.c:59:27: fatal error: cronie_common.h: No such file or directory
|  #include "cronie_common.h"
|                            ^
| compilation terminated.
| make[3]: *** [security.o] Error 1
| make[3]: *** Waiting for unfinished jobs....
| make[3]: *** [crontab.o] Error 1
| /media/large/tmp/work/mips32-poky-linux/cronie/1.4.11-r0/cronie-1.4.11/src/cron.c:52:27: fatal error: cronie_common.h: No such file or directory
|  #include "cronie_common.h"
|                            ^
| compilation terminated.
| make[3]: *** [cron.o] Error 1
| make[3]: Leaving directory `/media/large/tmp/work/mips32-poky-linux/cronie/1.4.11-r0/build/src'
| make[2]: *** [all] Error 2
| make[2]: Leaving directory `/media/large/tmp/work/mips32-poky-linux/cronie/1.4.11-r0/build/src'
| make[1]: *** [all-recursive] Error 1
| make[1]: Leaving directory `/media/large/tmp/work/mips32-poky-linux/cronie/1.4.11-r0/build'
| make: *** [all] Error 2
| ERROR: oe_runmake failed
| ERROR: Function failed: do_compile (log file is located at /media/large/tmp/work/mips32-poky-linux/cronie/1.4.11-r0/temp/log.do_compile.22142)

Cheers,
Paul

-- 

Paul Eggleton
Intel Open Source Technology Centre

Re: [PATCH 1/2] cronie: upgrade to 1.4.11

[Paul Eggleton]

On Monday 19 August 2013 09:24:54 Paul Eggleton wrote:
> Hi Cristiana,
> 
> On Friday 16 August 2013 11:30:49 Cristiana Voicu wrote:
> > LIC_FILES_CHKSUM changed because cron.h doesn't exist anymore.
> > Replaced it with cron.c.
> >
> >...
> 
> A couple of people have reported this doesn't build, and I've confirmed it
> this morning:

Ah, I see Saul already sent a patch for this, sorry I didn't see it before.

Cheers,
Paul

-- 

Paul Eggleton
Intel Open Source Technology Centre

Re: [PATCH 1/2] cronie: upgrade to 1.4.11

[Voicu, Cristiana]

Hi Paul,

I saw the error today, yesterday I was ooo. Sorry for the mistake.
Cristiana

-----Original Message-----
From: Paul Eggleton [mailto:paul.eggleton@linux.intel.com] 
Sent: Monday, August 19, 2013 11:31 AM
To: Voicu, Cristiana
Cc: openembedded-core@lists.openembedded.org
Subject: Re: [OE-core] [PATCH 1/2] cronie: upgrade to 1.4.11

On Monday 19 August 2013 09:24:54 Paul Eggleton wrote:
> Hi Cristiana,
> 
> On Friday 16 August 2013 11:30:49 Cristiana Voicu wrote:
> > LIC_FILES_CHKSUM changed because cron.h doesn't exist anymore.
> > Replaced it with cron.c.
> >
> >...
> 
> A couple of people have reported this doesn't build, and I've 
> confirmed it this morning:

Ah, I see Saul already sent a patch for this, sorry I didn't see it before.

Cheers,
Paul

-- 

Paul Eggleton
Intel Open Source Technology Centre

Re: [PATCH 2/2] sudo: upgrade to 1.8.7

[Voicu, Cristiana]

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

Hi,

There were some minor changes:
diff sudo-1.8.6p8/doc/LICENSE sudo-1.8.7/doc/LICENSE
3c3
<    Copyright (c) 1994-1996, 1998-2012
---
>    Copyright (c) 1994-1996, 1998-2013

diff sudo-1.8.6p8/plugins/sudoers/redblack.c sudo-1.8.7/plugins/sudoers/redblack.c
2c2
<  * Copyright (c) 2004-2005, 2007, 2009-2011
---
>  * Copyright (c) 2004-2005, 2007, 2009-2013


For the next upgrades, I will mention them in the commit message.
Thanks,
Cristiana

From: Khem Raj [mailto:raj.khem@gmail.com]
Sent: Friday, August 16, 2013 6:57 PM
To: Voicu, Cristiana
Cc: Patches and discussions about the oe-core layer
Subject: Re: [OE-core] [PATCH 2/2] sudo: upgrade to 1.8.7


On Fri, Aug 16, 2013 at 1:30 AM, Cristiana Voicu <cristiana.voicu@intel.com<mailto:cristiana.voicu@intel.com>> wrote:
Also, the license had some modifications in two files.

​would be nice if you mentioned what the changed were.​


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

Re: [PATCH 2/2] sudo: upgrade to 1.8.7

[Khem Raj]

On Tue, Aug 20, 2013 at 3:18 AM, Voicu, Cristiana
<cristiana.voicu@intel.com> wrote:
> Hi,
>
>
>
> There were some minor changes:
>
> diff sudo-1.8.6p8/doc/LICENSE sudo-1.8.7/doc/LICENSE
> 3c3
> <    Copyright (c) 1994-1996, 1998-2012
> ---
>>    Copyright (c) 1994-1996, 1998-2013
>
>


thanks, we have to be very careful when license checksums change


>
> diff sudo-1.8.6p8/plugins/sudoers/redblack.c
> sudo-1.8.7/plugins/sudoers/redblack.c
> 2c2
> <  * Copyright (c) 2004-2005, 2007, 2009-2011
> ---
>>  * Copyright (c) 2004-2005, 2007, 2009-2013
>
>
>
>
>
> For the next upgrades, I will mention them in the commit message.
>
> Thanks,
>
> Cristiana
>
>
>
> From: Khem Raj [mailto:raj.khem@gmail.com]
> Sent: Friday, August 16, 2013 6:57 PM
> To: Voicu, Cristiana
> Cc: Patches and discussions about the oe-core layer
> Subject: Re: [OE-core] [PATCH 2/2] sudo: upgrade to 1.8.7
>
>
>
>
>
> On Fri, Aug 16, 2013 at 1:30 AM, Cristiana Voicu <cristiana.voicu@intel.com>
> wrote:
>
> Also, the license had some modifications in two files.
>
>
>
> would be nice if you mentioned what the changed were.
>
>