diff options
author | Khem Raj <raj.khem@gmail.com> | 2012-08-17 21:56:41 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-08-19 10:48:21 +0100 |
commit | 973512c32c361824358dea6eb87fdc2d9afa6b81 (patch) | |
tree | 1a5201c5f3e758a7eb9247ea6216f7c3609b8440 /meta | |
parent | dbda8b5f486b397f29666fb740b00d9a10875915 (diff) | |
download | poky-973512c32c361824358dea6eb87fdc2d9afa6b81.tar.gz |
libpam: Update recipes from 1.1.5 -> 1.1.6
Drop include-sys-resource.patch already fixed upstream
LIC_FILE_CHKSUM change is due to deletion of space in
COPYING file see
http://git.fedorahosted.org/cgit/linux-pam.git/commit/COPYING?id=1814aec611a5f9e03eceee81237ad3a3f51c954a
(From OE-Core rev: 619092b699bfd79e060755fa41645cac7ac4fd0d)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-extended/pam/libpam/include-sys-resource.patch | 12 | ||||
-rw-r--r-- | meta/recipes-extended/pam/libpam_1.1.6.bb (renamed from meta/recipes-extended/pam/libpam_1.1.5.bb) | 12 |
2 files changed, 4 insertions, 20 deletions
diff --git a/meta/recipes-extended/pam/libpam/include-sys-resource.patch b/meta/recipes-extended/pam/libpam/include-sys-resource.patch deleted file mode 100644 index 0108a889a9..0000000000 --- a/meta/recipes-extended/pam/libpam/include-sys-resource.patch +++ /dev/null | |||
@@ -1,12 +0,0 @@ | |||
1 | Index: Linux-PAM-1.1.5/modules/pam_unix/pam_unix_acct.c | ||
2 | =================================================================== | ||
3 | --- Linux-PAM-1.1.5.orig/modules/pam_unix/pam_unix_acct.c 2012-07-04 12:37:44.881136025 -0700 | ||
4 | +++ Linux-PAM-1.1.5/modules/pam_unix/pam_unix_acct.c 2012-07-04 12:38:00.601136785 -0700 | ||
5 | @@ -47,6 +47,7 @@ | ||
6 | #include <time.h> /* for time() */ | ||
7 | #include <errno.h> | ||
8 | #include <sys/wait.h> | ||
9 | +#include <sys/resource.h> | ||
10 | |||
11 | #include <security/_pam_macros.h> | ||
12 | |||
diff --git a/meta/recipes-extended/pam/libpam_1.1.5.bb b/meta/recipes-extended/pam/libpam_1.1.6.bb index f776e76da8..dd03df106d 100644 --- a/meta/recipes-extended/pam/libpam_1.1.5.bb +++ b/meta/recipes-extended/pam/libpam_1.1.6.bb | |||
@@ -7,22 +7,18 @@ SECTION = "base" | |||
7 | # /etc/pam.d comes from Debian libpam-runtime in 2009-11 (at that time | 7 | # /etc/pam.d comes from Debian libpam-runtime in 2009-11 (at that time |
8 | # libpam-runtime-1.0.1 is GPLv2+), by openembedded | 8 | # libpam-runtime-1.0.1 is GPLv2+), by openembedded |
9 | LICENSE = "GPLv2+ | BSD" | 9 | LICENSE = "GPLv2+ | BSD" |
10 | LIC_FILES_CHKSUM = "file://COPYING;md5=ca0395de9a86191a078b8b79302e3083" | 10 | LIC_FILES_CHKSUM = "file://COPYING;md5=7eb5c1bf854e8881005d673599ee74d3" |
11 | 11 | ||
12 | PR = "r6" | 12 | SRC_URI = "http://linux-pam.org/library/Linux-PAM-${PV}.tar.bz2 \ |
13 | |||
14 | SRC_URI = "https://fedorahosted.org/releases/l/i/linux-pam/Linux-PAM-${PV}.tar.bz2 \ | ||
15 | file://99_pam \ | 13 | file://99_pam \ |
16 | file://pam.d/* \ | 14 | file://pam.d/* \ |
17 | file://libpam-xtests.patch \ | 15 | file://libpam-xtests.patch \ |
18 | file://include-sys-resource.patch \ | ||
19 | " | 16 | " |
17 | SRC_URI[md5sum] = "7b73e58b7ce79ffa321d408de06db2c4" | ||
18 | SRC_URI[sha256sum] = "bab887d6280f47fc3963df3b95735a27a16f0f663636163ddf3acab5f1149fc2" | ||
20 | 19 | ||
21 | SRC_URI_append_libc-uclibc = " file://pam-no-innetgr.patch" | 20 | SRC_URI_append_libc-uclibc = " file://pam-no-innetgr.patch" |
22 | 21 | ||
23 | SRC_URI[md5sum] = "927ee5585bdec5256c75117e9348aa47" | ||
24 | SRC_URI[sha256sum] = "65def4df04254dc4c5156859d36c34ad6d7afbcf3adbf2780530ebc4dbf2a116" | ||
25 | |||
26 | DEPENDS = "bison flex flex-native cracklib" | 22 | DEPENDS = "bison flex flex-native cracklib" |
27 | 23 | ||
28 | EXTRA_OECONF = "--with-db-uniquename=_pam \ | 24 | EXTRA_OECONF = "--with-db-uniquename=_pam \ |