Patchwork [2/2] sudo: upgrade to 1.8.7

login
register
mail settings
Submitter Cristiana Voicu
Date Aug. 16, 2013, 8:30 a.m.
Message ID <62aeb7c8b74f56c0b8c04956847505fe7d3db0e0.1376641437.git.cristiana.voicu@intel.com>
Download mbox | patch
Permalink /patch/55913/
State Accepted
Commit 660601bd9710a37c544131201eb9fa10a08a9de3
Headers show

Comments

Cristiana Voicu - Aug. 16, 2013, 8:30 a.m.
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%)
Khem Raj - Aug. 16, 2013, 3:56 p.m.
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.
Cristiana Voicu - Aug. 20, 2013, 10:18 a.m.
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.
Khem Raj - Aug. 21, 2013, 3:16 p.m.
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.
>
>

Patch

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)}"