* [PATCH 1/2] libpam: Update recipes from 1.1.5 -> 1.1.6
@ 2012-08-18 4:56 Khem Raj
2012-08-18 4:56 ` [PATCH 2/2] unifdef-native: Correct LICENSE Khem Raj
2012-08-19 12:34 ` [PATCH 1/2] libpam: Update recipes from 1.1.5 -> 1.1.6 Richard Purdie
0 siblings, 2 replies; 6+ messages in thread
From: Khem Raj @ 2012-08-18 4:56 UTC (permalink / raw)
To: openembedded-core
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
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
.../pam/libpam/include-sys-resource.patch | 12 ------------
.../pam/{libpam_1.1.5.bb => libpam_1.1.6.bb} | 12 ++++--------
2 files changed, 4 insertions(+), 20 deletions(-)
delete mode 100644 meta/recipes-extended/pam/libpam/include-sys-resource.patch
rename meta/recipes-extended/pam/{libpam_1.1.5.bb => libpam_1.1.6.bb} (90%)
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 0108a88..0000000
--- a/meta/recipes-extended/pam/libpam/include-sys-resource.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-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.6.bb
similarity index 90%
rename from meta/recipes-extended/pam/libpam_1.1.5.bb
rename to meta/recipes-extended/pam/libpam_1.1.6.bb
index f776e76..dd03df1 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"
# /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"
+LIC_FILES_CHKSUM = "file://COPYING;md5=7eb5c1bf854e8881005d673599ee74d3"
-PR = "r6"
-
-SRC_URI = "https://fedorahosted.org/releases/l/i/linux-pam/Linux-PAM-${PV}.tar.bz2 \
+SRC_URI = "http://linux-pam.org/library/Linux-PAM-${PV}.tar.bz2 \
file://99_pam \
file://pam.d/* \
file://libpam-xtests.patch \
- file://include-sys-resource.patch \
"
+SRC_URI[md5sum] = "7b73e58b7ce79ffa321d408de06db2c4"
+SRC_URI[sha256sum] = "bab887d6280f47fc3963df3b95735a27a16f0f663636163ddf3acab5f1149fc2"
SRC_URI_append_libc-uclibc = " file://pam-no-innetgr.patch"
-SRC_URI[md5sum] = "927ee5585bdec5256c75117e9348aa47"
-SRC_URI[sha256sum] = "65def4df04254dc4c5156859d36c34ad6d7afbcf3adbf2780530ebc4dbf2a116"
-
DEPENDS = "bison flex flex-native cracklib"
EXTRA_OECONF = "--with-db-uniquename=_pam \
--
1.7.9.5
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH 2/2] unifdef-native: Correct LICENSE
2012-08-18 4:56 [PATCH 1/2] libpam: Update recipes from 1.1.5 -> 1.1.6 Khem Raj
@ 2012-08-18 4:56 ` Khem Raj
2012-08-18 11:40 ` Paul Eggleton
2012-08-19 12:34 ` [PATCH 1/2] libpam: Update recipes from 1.1.5 -> 1.1.6 Richard Purdie
1 sibling, 1 reply; 6+ messages in thread
From: Khem Raj @ 2012-08-18 4:56 UTC (permalink / raw)
To: openembedded-core
The header in sourcefile says its BSD licensed
not GPL therefore make the correction
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
.../unifdef/unifdef-native_2.6.18+git.bb | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/meta/recipes-devtools/unifdef/unifdef-native_2.6.18+git.bb b/meta/recipes-devtools/unifdef/unifdef-native_2.6.18+git.bb
index 1b93816..3909e1c 100644
--- a/meta/recipes-devtools/unifdef/unifdef-native_2.6.18+git.bb
+++ b/meta/recipes-devtools/unifdef/unifdef-native_2.6.18+git.bb
@@ -1,6 +1,8 @@
DESCRIPTION = "Kernel header preprocessor"
SECTION = "devel"
-LICENSE = "GPL"
+LICENSE = "BSD"
+
+PR = "r1"
LIC_FILES_CHKSUM = "file://${WORKDIR}/unifdef.c;endline=32;md5=1a33f5c39aa718a89058721df61979bd"
--
1.7.9.5
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH 1/2] libpam: Update recipes from 1.1.5 -> 1.1.6
2012-08-18 4:56 [PATCH 1/2] libpam: Update recipes from 1.1.5 -> 1.1.6 Khem Raj
2012-08-18 4:56 ` [PATCH 2/2] unifdef-native: Correct LICENSE Khem Raj
@ 2012-08-19 12:34 ` Richard Purdie
2012-08-19 16:11 ` Khem Raj
1 sibling, 1 reply; 6+ messages in thread
From: Richard Purdie @ 2012-08-19 12:34 UTC (permalink / raw)
To: Khem Raj; +Cc: openembedded-core
On Fri, 2012-08-17 at 21:56 -0700, Khem Raj wrote:
> 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
>
> Signed-off-by: Khem Raj <raj.khem@gmail.com>
> ---
> .../pam/libpam/include-sys-resource.patch | 12 ------------
> .../pam/{libpam_1.1.5.bb => libpam_1.1.6.bb} | 12 ++++--------
> 2 files changed, 4 insertions(+), 20 deletions(-)
> delete mode 100644 meta/recipes-extended/pam/libpam/include-sys-resource.patch
> rename meta/recipes-extended/pam/{libpam_1.1.5.bb => libpam_1.1.6.bb} (90%)
I merged this, it broke the build, I hopefully fixed it:
http://git.yoctoproject.org/cgit.cgi/poky/commit/?id=91ece5d5668ee1adb5c5e3d757426a0d5187bd84
Cheers,
Richard
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH 1/2] libpam: Update recipes from 1.1.5 -> 1.1.6
2012-08-19 12:34 ` [PATCH 1/2] libpam: Update recipes from 1.1.5 -> 1.1.6 Richard Purdie
@ 2012-08-19 16:11 ` Khem Raj
0 siblings, 0 replies; 6+ messages in thread
From: Khem Raj @ 2012-08-19 16:11 UTC (permalink / raw)
To: Richard Purdie; +Cc: openembedded-core
On Sun, Aug 19, 2012 at 5:34 AM, Richard Purdie
<richard.purdie@linuxfoundation.org> wrote:
> On Fri, 2012-08-17 at 21:56 -0700, Khem Raj wrote:
>> 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
>>
>> Signed-off-by: Khem Raj <raj.khem@gmail.com>
>> ---
>> .../pam/libpam/include-sys-resource.patch | 12 ------------
>> .../pam/{libpam_1.1.5.bb => libpam_1.1.6.bb} | 12 ++++--------
>> 2 files changed, 4 insertions(+), 20 deletions(-)
>> delete mode 100644 meta/recipes-extended/pam/libpam/include-sys-resource.patch
>> rename meta/recipes-extended/pam/{libpam_1.1.5.bb => libpam_1.1.6.bb} (90%)
>
> I merged this, it broke the build, I hopefully fixed it:
>
> http://git.yoctoproject.org/cgit.cgi/poky/commit/?id=91ece5d5668ee1adb5c5e3d757426a0d5187bd84
I did not encounter this in my builds but someone did see
http://git.fedorahosted.org/cgit/linux-pam.git/commit/?id=d7e6b921cd34f7ad8fc4d05065c75d13ba330896
backporting that will help I guess ?
>
> Cheers,
>
> Richard
>
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2012-08-19 16:24 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-08-18 4:56 [PATCH 1/2] libpam: Update recipes from 1.1.5 -> 1.1.6 Khem Raj
2012-08-18 4:56 ` [PATCH 2/2] unifdef-native: Correct LICENSE Khem Raj
2012-08-18 11:40 ` Paul Eggleton
2012-08-18 17:07 ` Khem Raj
2012-08-19 12:34 ` [PATCH 1/2] libpam: Update recipes from 1.1.5 -> 1.1.6 Richard Purdie
2012-08-19 16:11 ` Khem Raj
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.