From 698cef8322e5a5f18e50ce62f6c9d1f1f846677a Mon Sep 17 00:00:00 2001 From: Scott Garman Date: Tue, 23 Nov 2010 16:41:49 -0800 Subject: [PATCH] libpam: upgrade to version 1.1.3 * Removed obsolete crossbinary patch * Added source checksums * Added LIC_FILES_CHKSUM and SUMMARY entries Signed-off-by: Scott Garman --- .../libpam-1.1.1/disable_crossbinary.patch | 34 ------------------- .../pam/{libpam-1.1.1 => libpam}/99_pam | 0 .../pam.d/common-account | 0 .../pam.d/common-auth | 0 .../pam.d/common-password | 0 .../pam.d/common-session | 0 .../pam.d/common-session-noninteractive | 0 .../pam/{libpam-1.1.1 => libpam}/pam.d/other | 0 .../pam/{libpam_1.1.1.bb => libpam_1.1.3.bb} | 14 +++++--- 9 files changed, 9 insertions(+), 39 deletions(-) delete mode 100644 meta/recipes-extended/pam/libpam-1.1.1/disable_crossbinary.patch rename meta/recipes-extended/pam/{libpam-1.1.1 => libpam}/99_pam (100%) rename meta/recipes-extended/pam/{libpam-1.1.1 => libpam}/pam.d/common-account (100%) rename meta/recipes-extended/pam/{libpam-1.1.1 => libpam}/pam.d/common-auth (100%) rename meta/recipes-extended/pam/{libpam-1.1.1 => libpam}/pam.d/common-password (100%) rename meta/recipes-extended/pam/{libpam-1.1.1 => libpam}/pam.d/common-session (100%) rename meta/recipes-extended/pam/{libpam-1.1.1 => libpam}/pam.d/common-session-noninteractive (100%) rename meta/recipes-extended/pam/{libpam-1.1.1 => libpam}/pam.d/other (100%) rename meta/recipes-extended/pam/{libpam_1.1.1.bb => libpam_1.1.3.bb} (91%) diff --git a/meta/recipes-extended/pam/libpam-1.1.1/disable_crossbinary.patch b/meta/recipes-extended/pam/libpam-1.1.1/disable_crossbinary.patch deleted file mode 100644 index 43359b08fe..0000000000 --- a/meta/recipes-extended/pam/libpam-1.1.1/disable_crossbinary.patch +++ /dev/null @@ -1,34 +0,0 @@ -padout should be compiled using the native compiler but isn't. -Disable this piece of documentation for now. - -RP - -Index: Linux-PAM-1.0.2/doc/specs/Makefile.am -=================================================================== ---- Linux-PAM-1.0.2.orig/doc/specs/Makefile.am 2008-11-04 21:06:23.000000000 +0000 -+++ Linux-PAM-1.0.2/doc/specs/Makefile.am 2008-11-04 21:07:06.000000000 +0000 -@@ -2,21 +2,8 @@ - # Copyright (c) 2005, 2006 Thorsten Kukuk - # - --CLEANFILES = draft-morgan-pam-current.txt *~ -+CLEANFILES = *~ - --EXTRA_DIST = draft-morgan-pam.raw std-agent-id.raw rfc86.0.txt -+EXTRA_DIST = std-agent-id.raw rfc86.0.txt - --draft-morgan-pam-current.txt: padout draft-morgan-pam.raw -- ./padout < $(srcdir)/draft-morgan-pam.raw > draft-morgan-pam-current.txt -- --AM_YFLAGS = -d -- --BUILT_SOURCES = parse_y.h -- --noinst_PROGRAMS = padout -- --padout_SOURCES = parse_l.l parse_y.y -- --padout_LDADD = @LEXLIB@ -- --doc_DATA = draft-morgan-pam-current.txt rfc86.0.txt -+doc_DATA = rfc86.0.txt diff --git a/meta/recipes-extended/pam/libpam-1.1.1/99_pam b/meta/recipes-extended/pam/libpam/99_pam similarity index 100% rename from meta/recipes-extended/pam/libpam-1.1.1/99_pam rename to meta/recipes-extended/pam/libpam/99_pam diff --git a/meta/recipes-extended/pam/libpam-1.1.1/pam.d/common-account b/meta/recipes-extended/pam/libpam/pam.d/common-account similarity index 100% rename from meta/recipes-extended/pam/libpam-1.1.1/pam.d/common-account rename to meta/recipes-extended/pam/libpam/pam.d/common-account diff --git a/meta/recipes-extended/pam/libpam-1.1.1/pam.d/common-auth b/meta/recipes-extended/pam/libpam/pam.d/common-auth similarity index 100% rename from meta/recipes-extended/pam/libpam-1.1.1/pam.d/common-auth rename to meta/recipes-extended/pam/libpam/pam.d/common-auth diff --git a/meta/recipes-extended/pam/libpam-1.1.1/pam.d/common-password b/meta/recipes-extended/pam/libpam/pam.d/common-password similarity index 100% rename from meta/recipes-extended/pam/libpam-1.1.1/pam.d/common-password rename to meta/recipes-extended/pam/libpam/pam.d/common-password diff --git a/meta/recipes-extended/pam/libpam-1.1.1/pam.d/common-session b/meta/recipes-extended/pam/libpam/pam.d/common-session similarity index 100% rename from meta/recipes-extended/pam/libpam-1.1.1/pam.d/common-session rename to meta/recipes-extended/pam/libpam/pam.d/common-session diff --git a/meta/recipes-extended/pam/libpam-1.1.1/pam.d/common-session-noninteractive b/meta/recipes-extended/pam/libpam/pam.d/common-session-noninteractive similarity index 100% rename from meta/recipes-extended/pam/libpam-1.1.1/pam.d/common-session-noninteractive rename to meta/recipes-extended/pam/libpam/pam.d/common-session-noninteractive diff --git a/meta/recipes-extended/pam/libpam-1.1.1/pam.d/other b/meta/recipes-extended/pam/libpam/pam.d/other similarity index 100% rename from meta/recipes-extended/pam/libpam-1.1.1/pam.d/other rename to meta/recipes-extended/pam/libpam/pam.d/other diff --git a/meta/recipes-extended/pam/libpam_1.1.1.bb b/meta/recipes-extended/pam/libpam_1.1.3.bb similarity index 91% rename from meta/recipes-extended/pam/libpam_1.1.1.bb rename to meta/recipes-extended/pam/libpam_1.1.3.bb index e6cd172c78..7a8b29a93c 100644 --- a/meta/recipes-extended/pam/libpam_1.1.1.bb +++ b/meta/recipes-extended/pam/libpam_1.1.3.bb @@ -1,23 +1,27 @@ +SUMMARY = "Linux-PAM (Pluggable Authentication Modules)" DESCRIPTION = "Linux-PAM (Pluggable Authentication Modules for Linux), Basically, it is a flexible mechanism for authenticating users" HOMEPAGE = "http://www.kernel.org/pub/linux/libs/pam/" BUGTRACKER = "http://sourceforge.net/projects/pam/support" -# PAM allows dual licensed under GPL and BSD. +SECTION = "base" +# PAM is dual licensed under GPL and BSD. # /etc/pam.d comes from Debian libpam-runtime in 2009-11 (at that time # libpam-runtime-1.0.1 is GPLv2+), by openembedded LICENSE = "GPLv2+ | BSD" -LIC_FILES_CHKSUM = "file://COPYING;md5=ca0395de9a86191a078b8b79302e3083 \ - file://modules/pam_loginuid/pam_loginuid.c;endline=23;md5=db84479f04f9afb6dd4dd022a0143997" -PR = "r1" +LIC_FILES_CHKSUM = "file://COPYING;md5=ca0395de9a86191a078b8b79302e3083" + +PR = "r0" DEPENDS = "bison flex" RDEPENDS_${PN}-runtime = "libpam pam-plugin-deny pam-plugin-permit pam-plugin-warn pam-plugin-unix" RRECOMMENDS_${PN} = "libpam-runtime" SRC_URI = "http://www.kernel.org/pub/linux/libs/pam/library/Linux-PAM-${PV}.tar.bz2 \ - file://disable_crossbinary.patch \ file://99_pam \ file://pam.d/*" +SRC_URI[md5sum] = "6db7fcb5db6253350e3a4648ceac40e7" +SRC_URI[sha256sum] = "17b268789b935a76e736a1150210dd12f156972973e79347668f828d43632652" + EXTRA_OECONF = "--with-db-uniquename=_pam \ --includedir=${includedir}/security \ --libdir=${base_libdir} \ -- 2.40.1