Patchwork [13/14] libpam: Fix build with eglibc 2.16

login
register
mail settings
Submitter Khem Raj
Date July 5, 2012, 2:35 p.m.
Message ID <0413ecda2ffd71f9deaf296591b8744d29a30099.1341498745.git.raj.khem@gmail.com>
Download mbox | patch
Permalink /patch/31245/
State Accepted
Commit e59a0bac95ce025a6b826be28ccc9e42ca4b5a29
Headers show

Comments

Khem Raj - July 5, 2012, 2:35 p.m.
pam_unix_acct.c: In function '_unix_run_verify_binary':
pam_unix_acct.c:97:19: error: storage size of 'rlim' isn't known
pam_unix_acct.c:106:19: error: 'RLIMIT_NOFILE' undeclared (first use in
this function)
pam_unix_acct.c:106:19: note: each undeclared identifier is reported
only once for each function it appears in

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 .../pam/libpam/include-sys-resource.patch          |   12 ++++++++++++
 meta/recipes-extended/pam/libpam_1.1.5.bb          |    6 ++++--
 2 files changed, 16 insertions(+), 2 deletions(-)
 create mode 100644 meta/recipes-extended/pam/libpam/include-sys-resource.patch
Saul Wold - July 17, 2012, 5:40 p.m.
On 07/05/2012 07:35 AM, Khem Raj wrote:
> pam_unix_acct.c: In function '_unix_run_verify_binary':
> pam_unix_acct.c:97:19: error: storage size of 'rlim' isn't known
> pam_unix_acct.c:106:19: error: 'RLIMIT_NOFILE' undeclared (first use in
> this function)
> pam_unix_acct.c:106:19: note: each undeclared identifier is reported
> only once for each function it appears in
>
> Signed-off-by: Khem Raj <raj.khem@gmail.com>
> ---
>   .../pam/libpam/include-sys-resource.patch          |   12 ++++++++++++
>   meta/recipes-extended/pam/libpam_1.1.5.bb          |    6 ++++--
>   2 files changed, 16 insertions(+), 2 deletions(-)
>   create mode 100644 meta/recipes-extended/pam/libpam/include-sys-resource.patch
>
> diff --git a/meta/recipes-extended/pam/libpam/include-sys-resource.patch b/meta/recipes-extended/pam/libpam/include-sys-resource.patch
> new file mode 100644
> index 0000000..0108a88
> --- /dev/null
> +++ b/meta/recipes-extended/pam/libpam/include-sys-resource.patch
> @@ -0,0 +1,12 @@

Missed that this needs an Upstream-Status and Signed-off-by along with 
any more describive info needed

Please fix

Thanks
	Sau!

> +Index: Linux-PAM-1.1.5/modules/pam_unix/pam_unix_acct.c
> +===================================================================
> +--- Linux-PAM-1.1.5.orig/modules/pam_unix/pam_unix_acct.c	2012-07-04 12:37:44.881136025 -0700
> ++++ Linux-PAM-1.1.5/modules/pam_unix/pam_unix_acct.c	2012-07-04 12:38:00.601136785 -0700
> +@@ -47,6 +47,7 @@
> + #include <time.h>		/* for time() */
> + #include <errno.h>
> + #include <sys/wait.h>
> ++#include <sys/resource.h>
> +
> + #include <security/_pam_macros.h>
> +
> diff --git a/meta/recipes-extended/pam/libpam_1.1.5.bb b/meta/recipes-extended/pam/libpam_1.1.5.bb
> index 08ce1d1..275e5d8 100644
> --- a/meta/recipes-extended/pam/libpam_1.1.5.bb
> +++ b/meta/recipes-extended/pam/libpam_1.1.5.bb
> @@ -9,12 +9,14 @@ SECTION = "base"
>   LICENSE = "GPLv2+ | BSD"
>   LIC_FILES_CHKSUM = "file://COPYING;md5=ca0395de9a86191a078b8b79302e3083"
>
> -PR = "r3"
> +PR = "r4"
>
>   SRC_URI = "https://fedorahosted.org/releases/l/i/linux-pam/Linux-PAM-${PV}.tar.bz2 \
>              file://99_pam \
>              file://pam.d/* \
> -           file://libpam-xtests.patch"
> +           file://libpam-xtests.patch \
> +           file://include-sys-resource.patch \
> +          "
>
>   SRC_URI_append_libc-uclibc = " file://pam-no-innetgr.patch"
>
>

Patch

diff --git a/meta/recipes-extended/pam/libpam/include-sys-resource.patch b/meta/recipes-extended/pam/libpam/include-sys-resource.patch
new file mode 100644
index 0000000..0108a88
--- /dev/null
+++ b/meta/recipes-extended/pam/libpam/include-sys-resource.patch
@@ -0,0 +1,12 @@ 
+Index: Linux-PAM-1.1.5/modules/pam_unix/pam_unix_acct.c
+===================================================================
+--- Linux-PAM-1.1.5.orig/modules/pam_unix/pam_unix_acct.c	2012-07-04 12:37:44.881136025 -0700
++++ Linux-PAM-1.1.5/modules/pam_unix/pam_unix_acct.c	2012-07-04 12:38:00.601136785 -0700
+@@ -47,6 +47,7 @@
+ #include <time.h>		/* for time() */
+ #include <errno.h>
+ #include <sys/wait.h>
++#include <sys/resource.h>
+ 
+ #include <security/_pam_macros.h>
+ 
diff --git a/meta/recipes-extended/pam/libpam_1.1.5.bb b/meta/recipes-extended/pam/libpam_1.1.5.bb
index 08ce1d1..275e5d8 100644
--- a/meta/recipes-extended/pam/libpam_1.1.5.bb
+++ b/meta/recipes-extended/pam/libpam_1.1.5.bb
@@ -9,12 +9,14 @@  SECTION = "base"
 LICENSE = "GPLv2+ | BSD"
 LIC_FILES_CHKSUM = "file://COPYING;md5=ca0395de9a86191a078b8b79302e3083"
 
-PR = "r3"
+PR = "r4"
 
 SRC_URI = "https://fedorahosted.org/releases/l/i/linux-pam/Linux-PAM-${PV}.tar.bz2 \
            file://99_pam \
            file://pam.d/* \
-           file://libpam-xtests.patch"
+           file://libpam-xtests.patch \
+           file://include-sys-resource.patch \
+          "
 
 SRC_URI_append_libc-uclibc = " file://pam-no-innetgr.patch"