From 0d4d9bd61bcc1a451c226044f2ffee3236f56550 Mon Sep 17 00:00:00 2001 From: Nitin A Kamble Date: Wed, 2 May 2012 17:53:08 -0700 Subject: shadow shadow-native: fix build with automake 1.12 (From OE-Core rev: dec7696b737e5921fcac0dbb346851e31a81537b) Signed-off-by: Nitin A Kamble Signed-off-by: Richard Purdie --- .../files/shadow_fix_for_automake-1.12.patch | 23 ++++++++++++++++++++++ .../shadow/shadow-native_4.1.4.3.bb | 6 ++++-- meta/recipes-extended/shadow/shadow_4.1.4.3.bb | 6 ++++-- 3 files changed, 31 insertions(+), 4 deletions(-) create mode 100644 meta/recipes-extended/shadow/files/shadow_fix_for_automake-1.12.patch (limited to 'meta/recipes-extended') diff --git a/meta/recipes-extended/shadow/files/shadow_fix_for_automake-1.12.patch b/meta/recipes-extended/shadow/files/shadow_fix_for_automake-1.12.patch new file mode 100644 index 0000000000..6a27ed387d --- /dev/null +++ b/meta/recipes-extended/shadow/files/shadow_fix_for_automake-1.12.patch @@ -0,0 +1,23 @@ +Upstream-Status: pending + +Automake 1.12 has deprecated automatic de-ANSI-fication support + +This patch avoids this issue with automake 1.12: + +| configure.in:22: error: automatic de-ANSI-fication support has been removed + +Signed-Off-By: Nitin A Kamble +2012/05/02 + +Index: shadow-4.1.4.3/configure.in +=================================================================== +--- shadow-4.1.4.3.orig/configure.in ++++ shadow-4.1.4.3/configure.in +@@ -19,7 +19,6 @@ AC_PROG_CC + AC_ISC_POSIX + AC_PROG_LN_S + AC_PROG_YACC +-AM_C_PROTOTYPES + AM_PROG_LIBTOOL + + dnl Checks for libraries. diff --git a/meta/recipes-extended/shadow/shadow-native_4.1.4.3.bb b/meta/recipes-extended/shadow/shadow-native_4.1.4.3.bb index 38bb922282..61fccbac26 100644 --- a/meta/recipes-extended/shadow/shadow-native_4.1.4.3.bb +++ b/meta/recipes-extended/shadow/shadow-native_4.1.4.3.bb @@ -7,7 +7,7 @@ LICENSE = "BSD | Artistic-1.0" LIC_FILES_CHKSUM = "file://COPYING;md5=08c553a87d4e51bbed50b20e0adcaede \ file://src/passwd.c;firstline=8;endline=30;md5=2899a045e90511d0e043b85a7db7e2fe" -PR = "r4" +PR = "r5" SRC_URI = "http://pkg-shadow.alioth.debian.org/releases/${BPN}-${PV}.tar.bz2 \ file://shadow.automake-1.11.patch \ @@ -15,7 +15,9 @@ SRC_URI = "http://pkg-shadow.alioth.debian.org/releases/${BPN}-${PV}.tar.bz2 \ file://shadow-4.1.4.2-env-reset-keep-locale.patch \ file://add_root_cmd_options.patch \ file://disable-syslog.patch \ - file://useradd.patch" + file://useradd.patch \ + file://shadow_fix_for_automake-1.12.patch \ + " SRC_URI[md5sum] = "b8608d8294ac88974f27b20f991c0e79" SRC_URI[sha256sum] = "633f5bb4ea0c88c55f3642c97f9d25cbef74f82e0b4cf8d54e7ad6f9f9caa778" diff --git a/meta/recipes-extended/shadow/shadow_4.1.4.3.bb b/meta/recipes-extended/shadow/shadow_4.1.4.3.bb index 60fb78b37c..098b0b0584 100644 --- a/meta/recipes-extended/shadow/shadow_4.1.4.3.bb +++ b/meta/recipes-extended/shadow/shadow_4.1.4.3.bb @@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=08c553a87d4e51bbed50b20e0adcaede \ DEPENDS = "${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" RDEPENDS_${PN} = "shadow-securetty ${@base_contains('DISTRO_FEATURES', 'pam', '${PAM_PLUGINS}', '', d)}" -PR = "r9" +PR = "r10" SRC_URI = "http://pkg-shadow.alioth.debian.org/releases/${BPN}-${PV}.tar.bz2 \ file://login_defs_pam.sed \ @@ -19,7 +19,9 @@ SRC_URI = "http://pkg-shadow.alioth.debian.org/releases/${BPN}-${PV}.tar.bz2 \ file://shadow-4.1.4.2-env-reset-keep-locale.patch \ file://shadow-4.1.4.2-groupmod-pam-check.patch \ file://shadow-4.1.4.2-su_no_sanitize_env.patch \ - file://shadow-update-pam-conf.patch" + file://shadow-update-pam-conf.patch \ + file://shadow_fix_for_automake-1.12.patch \ + " SRC_URI[md5sum] = "b8608d8294ac88974f27b20f991c0e79" SRC_URI[sha256sum] = "633f5bb4ea0c88c55f3642c97f9d25cbef74f82e0b4cf8d54e7ad6f9f9caa778" -- cgit v1.2.3-54-g00ecf