Patchwork [04/10] polkit: Support PAM

login
register
mail settings
Submitter Kang Kai
Date July 21, 2011, 8 a.m.
Message ID <c8db967984b6d29fcf5587ed083c2d6ad4445b1f.1311234759.git.kai.kang@windriver.com>
Download mbox | patch
Permalink /patch/8183/
State New, archived
Headers show

Comments

Kang Kai - July 21, 2011, 8 a.m.
From: Xiaofeng Yan <xiaofeng.yan@windriver.com>

Modify configuration "polkit-1" in /etc/pam.d/ for supporting pam.

Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com>
---
 .../polkit/polkit-0.101/polkit-1_pam.patch         |   23 ++++++++++++++++++++
 meta/recipes-extended/polkit/polkit_0.101.bb       |    6 +++-
 2 files changed, 27 insertions(+), 2 deletions(-)
 create mode 100644 meta/recipes-extended/polkit/polkit-0.101/polkit-1_pam.patch
Koen Kooi - July 21, 2011, 8:59 a.m.
Op 21 jul. 2011, om 10:00 heeft Kang Kai het volgende geschreven:

> From: Xiaofeng Yan <xiaofeng.yan@windriver.com>
> 
> Modify configuration "polkit-1" in /etc/pam.d/ for supporting pam.
> 
> Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com>
> ---
> .../polkit/polkit-0.101/polkit-1_pam.patch         |   23 ++++++++++++++++++++
> meta/recipes-extended/polkit/polkit_0.101.bb       |    6 +++-
> 2 files changed, 27 insertions(+), 2 deletions(-)
> create mode 100644 meta/recipes-extended/polkit/polkit-0.101/polkit-1_pam.patch
> 
> diff --git a/meta/recipes-extended/polkit/polkit-0.101/polkit-1_pam.patch b/meta/recipes-extended/polkit/polkit-0.101/polkit-1_pam.patch
> new file mode 100644
> index 0000000..fa145ac
> --- /dev/null
> +++ b/meta/recipes-extended/polkit/polkit-0.101/polkit-1_pam.patch
> @@ -0,0 +1,23 @@
> +polkit: No system-auth in poky, we can use common-* in place of it.

Poky or oe-core? And can we provide system-auth instead of patching the world?


> +
> +Upstream-Status:Inappropriate [configuration]
> +
> +Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com>
> +
> +--- a/configure.ac	2011-03-04 02:26:20.000000000 +0800
> ++++ b/configure.ac.new	2011-07-18 10:14:12.516818852 +0800
> +@@ -350,10 +350,10 @@
> +     PAM_FILE_INCLUDE_PASSWORD=system
> +     PAM_FILE_INCLUDE_SESSION=system
> + else
> +-   PAM_FILE_INCLUDE_AUTH=system-auth
> +-   PAM_FILE_INCLUDE_ACCOUNT=system-auth
> +-   PAM_FILE_INCLUDE_PASSWORD=system-auth
> +-   PAM_FILE_INCLUDE_SESSION=system-auth
> ++   PAM_FILE_INCLUDE_AUTH=common-auth
> ++   PAM_FILE_INCLUDE_ACCOUNT=common-account
> ++   PAM_FILE_INCLUDE_PASSWORD=common-password
> ++   PAM_FILE_INCLUDE_SESSION=common-session
> + fi
> + 
> + AC_SUBST(PAM_FILE_INCLUDE_AUTH)
> diff --git a/meta/recipes-extended/polkit/polkit_0.101.bb b/meta/recipes-extended/polkit/polkit_0.101.bb
> index 6769914..da1d581 100644
> --- a/meta/recipes-extended/polkit/polkit_0.101.bb
> +++ b/meta/recipes-extended/polkit/polkit_0.101.bb
> @@ -7,8 +7,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=155db86cdbafa7532b41f390409283eb \
>                     file://docs/polkit/html/license.html;md5=07ddbf5f29e44c80c99be19c1690ec1f"
> 
> SRC_URI = "http://hal.freedesktop.org/releases/polkit-${PV}.tar.gz \
> -           file://introspection.patch"
> -PR = "r0"
> +           file://introspection.patch \
> +           file://polkit-1_pam.patch"
> +
> +PR = "r1"
> DEPENDS = "libpam expat dbus-glib eggdbus intltool"
> RDEPENDS_${PN} = "libpam"
> EXTRA_OECONF = "--with-authfw=pam --with-os-type=moblin --disable-man-pages --disable-gtk-doc --disable-introspection"
> -- 
> 1.7.5.1.300.gc565c
> 
> 
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Kang Kai - July 21, 2011, 9:49 a.m.
On 2011?07?21? 16:59, Koen Kooi wrote:
> Op 21 jul. 2011, om 10:00 heeft Kang Kai het volgende geschreven:
>
>> From: Xiaofeng Yan<xiaofeng.yan@windriver.com>
>>
>> Modify configuration "polkit-1" in /etc/pam.d/ for supporting pam.
>>
>> Signed-off-by: Xiaofeng Yan<xiaofeng.yan@windriver.com>
>> ---
>> .../polkit/polkit-0.101/polkit-1_pam.patch         |   23 ++++++++++++++++++++
>> meta/recipes-extended/polkit/polkit_0.101.bb       |    6 +++-
>> 2 files changed, 27 insertions(+), 2 deletions(-)
>> create mode 100644 meta/recipes-extended/polkit/polkit-0.101/polkit-1_pam.patch
>>
>> diff --git a/meta/recipes-extended/polkit/polkit-0.101/polkit-1_pam.patch b/meta/recipes-extended/polkit/polkit-0.101/polkit-1_pam.patch
>> new file mode 100644
>> index 0000000..fa145ac
>> --- /dev/null
>> +++ b/meta/recipes-extended/polkit/polkit-0.101/polkit-1_pam.patch
>> @@ -0,0 +1,23 @@
>> +polkit: No system-auth in poky, we can use common-* in place of it.
> Poky or oe-core? And can we provide system-auth instead of patching the world?

system-auth is the Fedora common pam configure file and auto generated 
by command authconfig. It contains all 4 types(auth, account, password 
and session) default config. But in Yocto we follow Debian/Ubuntu with 
separated files for default config: common-auth, common-account etc.
So that we didn't import the system-auth file .

>
>
>> +
>> +Upstream-Status:Inappropriate [configuration]
>> +
>> +Signed-off-by: Xiaofeng Yan<xiaofeng.yan@windriver.com>
>> +
>> +--- a/configure.ac	2011-03-04 02:26:20.000000000 +0800
>> ++++ b/configure.ac.new	2011-07-18 10:14:12.516818852 +0800
>> +@@ -350,10 +350,10 @@
>> +     PAM_FILE_INCLUDE_PASSWORD=system
>> +     PAM_FILE_INCLUDE_SESSION=system
>> + else
>> +-   PAM_FILE_INCLUDE_AUTH=system-auth
>> +-   PAM_FILE_INCLUDE_ACCOUNT=system-auth
>> +-   PAM_FILE_INCLUDE_PASSWORD=system-auth
>> +-   PAM_FILE_INCLUDE_SESSION=system-auth
>> ++   PAM_FILE_INCLUDE_AUTH=common-auth
>> ++   PAM_FILE_INCLUDE_ACCOUNT=common-account
>> ++   PAM_FILE_INCLUDE_PASSWORD=common-password
>> ++   PAM_FILE_INCLUDE_SESSION=common-session
>> + fi
>> +
>> + AC_SUBST(PAM_FILE_INCLUDE_AUTH)
>> diff --git a/meta/recipes-extended/polkit/polkit_0.101.bb b/meta/recipes-extended/polkit/polkit_0.101.bb
>> index 6769914..da1d581 100644
>> --- a/meta/recipes-extended/polkit/polkit_0.101.bb
>> +++ b/meta/recipes-extended/polkit/polkit_0.101.bb
>> @@ -7,8 +7,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=155db86cdbafa7532b41f390409283eb \
>>                      file://docs/polkit/html/license.html;md5=07ddbf5f29e44c80c99be19c1690ec1f"
>>
>> SRC_URI = "http://hal.freedesktop.org/releases/polkit-${PV}.tar.gz \
>> -           file://introspection.patch"
>> -PR = "r0"
>> +           file://introspection.patch \
>> +           file://polkit-1_pam.patch"
>> +
>> +PR = "r1"
>> DEPENDS = "libpam expat dbus-glib eggdbus intltool"
>> RDEPENDS_${PN} = "libpam"
>> EXTRA_OECONF = "--with-authfw=pam --with-os-type=moblin --disable-man-pages --disable-gtk-doc --disable-introspection"
>> -- 
>> 1.7.5.1.300.gc565c
>>
>>
>> _______________________________________________
>> Openembedded-core mailing list
>> Openembedded-core@lists.openembedded.org
>> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Koen Kooi - July 21, 2011, 9:59 a.m.
Op 21 jul. 2011, om 11:49 heeft Kang Kai het volgende geschreven:

> On 2011?07?21? 16:59, Koen Kooi wrote:
>> Op 21 jul. 2011, om 10:00 heeft Kang Kai het volgende geschreven:
>> 
>>> From: Xiaofeng Yan<xiaofeng.yan@windriver.com>
>>> 
>>> Modify configuration "polkit-1" in /etc/pam.d/ for supporting pam.
>>> 
>>> Signed-off-by: Xiaofeng Yan<xiaofeng.yan@windriver.com>
>>> ---
>>> .../polkit/polkit-0.101/polkit-1_pam.patch         |   23 ++++++++++++++++++++
>>> meta/recipes-extended/polkit/polkit_0.101.bb       |    6 +++-
>>> 2 files changed, 27 insertions(+), 2 deletions(-)
>>> create mode 100644 meta/recipes-extended/polkit/polkit-0.101/polkit-1_pam.patch
>>> 
>>> diff --git a/meta/recipes-extended/polkit/polkit-0.101/polkit-1_pam.patch b/meta/recipes-extended/polkit/polkit-0.101/polkit-1_pam.patch
>>> new file mode 100644
>>> index 0000000..fa145ac
>>> --- /dev/null
>>> +++ b/meta/recipes-extended/polkit/polkit-0.101/polkit-1_pam.patch
>>> @@ -0,0 +1,23 @@
>>> +polkit: No system-auth in poky, we can use common-* in place of it.
>> Poky or oe-core? And can we provide system-auth instead of patching the world?
> 
> system-auth is the Fedora common pam configure file and auto generated by command authconfig. It contains all 4 types(auth, account, password and session) default config. But in Yocto

Hmm, poky, oe-core or yocto? Which is it :)

> we follow Debian/Ubuntu with separated files for default config: common-auth, common-account etc.
> So that we didn't import the system-auth file .
> 
>> 
>> 
>>> +
>>> +Upstream-Status:Inappropriate [configuration]
>>> +
>>> +Signed-off-by: Xiaofeng Yan<xiaofeng.yan@windriver.com>
>>> +
>>> +--- a/configure.ac	2011-03-04 02:26:20.000000000 +0800
>>> ++++ b/configure.ac.new	2011-07-18 10:14:12.516818852 +0800
>>> +@@ -350,10 +350,10 @@
>>> +     PAM_FILE_INCLUDE_PASSWORD=system
>>> +     PAM_FILE_INCLUDE_SESSION=system
>>> + else
>>> +-   PAM_FILE_INCLUDE_AUTH=system-auth
>>> +-   PAM_FILE_INCLUDE_ACCOUNT=system-auth
>>> +-   PAM_FILE_INCLUDE_PASSWORD=system-auth
>>> +-   PAM_FILE_INCLUDE_SESSION=system-auth
>>> ++   PAM_FILE_INCLUDE_AUTH=common-auth
>>> ++   PAM_FILE_INCLUDE_ACCOUNT=common-account
>>> ++   PAM_FILE_INCLUDE_PASSWORD=common-password
>>> ++   PAM_FILE_INCLUDE_SESSION=common-session
>>> + fi
>>> +
>>> + AC_SUBST(PAM_FILE_INCLUDE_AUTH)
>>> diff --git a/meta/recipes-extended/polkit/polkit_0.101.bb b/meta/recipes-extended/polkit/polkit_0.101.bb
>>> index 6769914..da1d581 100644
>>> --- a/meta/recipes-extended/polkit/polkit_0.101.bb
>>> +++ b/meta/recipes-extended/polkit/polkit_0.101.bb
>>> @@ -7,8 +7,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=155db86cdbafa7532b41f390409283eb \
>>>                     file://docs/polkit/html/license.html;md5=07ddbf5f29e44c80c99be19c1690ec1f"
>>> 
>>> SRC_URI = "http://hal.freedesktop.org/releases/polkit-${PV}.tar.gz \
>>> -           file://introspection.patch"
>>> -PR = "r0"
>>> +           file://introspection.patch \
>>> +           file://polkit-1_pam.patch"
>>> +
>>> +PR = "r1"
>>> DEPENDS = "libpam expat dbus-glib eggdbus intltool"
>>> RDEPENDS_${PN} = "libpam"
>>> EXTRA_OECONF = "--with-authfw=pam --with-os-type=moblin --disable-man-pages --disable-gtk-doc --disable-introspection"
>>> -- 
>>> 1.7.5.1.300.gc565c
>>> 
>>> 
>>> _______________________________________________
>>> Openembedded-core mailing list
>>> Openembedded-core@lists.openembedded.org
>>> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
>> 
>> _______________________________________________
>> Openembedded-core mailing list
>> Openembedded-core@lists.openembedded.org
>> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
> 
> 
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Kang Kai - July 22, 2011, 3:21 a.m.
On 2011?07?21? 17:59, Koen Kooi wrote:
> Op 21 jul. 2011, om 11:49 heeft Kang Kai het volgende geschreven:
>
>> On 2011?07?21? 16:59, Koen Kooi wrote:
>>> Op 21 jul. 2011, om 10:00 heeft Kang Kai het volgende geschreven:
>>>
>>>> From: Xiaofeng Yan<xiaofeng.yan@windriver.com>
>>>>
>>>> Modify configuration "polkit-1" in /etc/pam.d/ for supporting pam.
>>>>
>>>> Signed-off-by: Xiaofeng Yan<xiaofeng.yan@windriver.com>
>>>> ---
>>>> .../polkit/polkit-0.101/polkit-1_pam.patch         |   23 ++++++++++++++++++++
>>>> meta/recipes-extended/polkit/polkit_0.101.bb       |    6 +++-
>>>> 2 files changed, 27 insertions(+), 2 deletions(-)
>>>> create mode 100644 meta/recipes-extended/polkit/polkit-0.101/polkit-1_pam.patch
>>>>
>>>> diff --git a/meta/recipes-extended/polkit/polkit-0.101/polkit-1_pam.patch b/meta/recipes-extended/polkit/polkit-0.101/polkit-1_pam.patch
>>>> new file mode 100644
>>>> index 0000000..fa145ac
>>>> --- /dev/null
>>>> +++ b/meta/recipes-extended/polkit/polkit-0.101/polkit-1_pam.patch
>>>> @@ -0,0 +1,23 @@
>>>> +polkit: No system-auth in poky, we can use common-* in place of it.
>>> Poky or oe-core? And can we provide system-auth instead of patching the world?
>> system-auth is the Fedora common pam configure file and auto generated by command authconfig. It contains all 4 types(auth, account, password and session) default config. But in Yocto
> Hmm, poky, oe-core or yocto? Which is it :)

Sorry, I will care that :)

>
>> we follow Debian/Ubuntu with separated files for default config: common-auth, common-account etc.
>> So that we didn't import the system-auth file .
>>
>>>
>>>> +
>>>> +Upstream-Status:Inappropriate [configuration]
>>>> +
>>>> +Signed-off-by: Xiaofeng Yan<xiaofeng.yan@windriver.com>
>>>> +
>>>> +--- a/configure.ac	2011-03-04 02:26:20.000000000 +0800
>>>> ++++ b/configure.ac.new	2011-07-18 10:14:12.516818852 +0800
>>>> +@@ -350,10 +350,10 @@
>>>> +     PAM_FILE_INCLUDE_PASSWORD=system
>>>> +     PAM_FILE_INCLUDE_SESSION=system
>>>> + else
>>>> +-   PAM_FILE_INCLUDE_AUTH=system-auth
>>>> +-   PAM_FILE_INCLUDE_ACCOUNT=system-auth
>>>> +-   PAM_FILE_INCLUDE_PASSWORD=system-auth
>>>> +-   PAM_FILE_INCLUDE_SESSION=system-auth
>>>> ++   PAM_FILE_INCLUDE_AUTH=common-auth
>>>> ++   PAM_FILE_INCLUDE_ACCOUNT=common-account
>>>> ++   PAM_FILE_INCLUDE_PASSWORD=common-password
>>>> ++   PAM_FILE_INCLUDE_SESSION=common-session
>>>> + fi
>>>> +
>>>> + AC_SUBST(PAM_FILE_INCLUDE_AUTH)
>>>> diff --git a/meta/recipes-extended/polkit/polkit_0.101.bb b/meta/recipes-extended/polkit/polkit_0.101.bb
>>>> index 6769914..da1d581 100644
>>>> --- a/meta/recipes-extended/polkit/polkit_0.101.bb
>>>> +++ b/meta/recipes-extended/polkit/polkit_0.101.bb
>>>> @@ -7,8 +7,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=155db86cdbafa7532b41f390409283eb \
>>>>                      file://docs/polkit/html/license.html;md5=07ddbf5f29e44c80c99be19c1690ec1f"
>>>>
>>>> SRC_URI = "http://hal.freedesktop.org/releases/polkit-${PV}.tar.gz \
>>>> -           file://introspection.patch"
>>>> -PR = "r0"
>>>> +           file://introspection.patch \
>>>> +           file://polkit-1_pam.patch"
>>>> +
>>>> +PR = "r1"
>>>> DEPENDS = "libpam expat dbus-glib eggdbus intltool"
>>>> RDEPENDS_${PN} = "libpam"
>>>> EXTRA_OECONF = "--with-authfw=pam --with-os-type=moblin --disable-man-pages --disable-gtk-doc --disable-introspection"
>>>> -- 
>>>> 1.7.5.1.300.gc565c
>>>>
>>>>
>>>> _______________________________________________
>>>> Openembedded-core mailing list
>>>> Openembedded-core@lists.openembedded.org
>>>> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
>>> _______________________________________________
>>> Openembedded-core mailing list
>>> Openembedded-core@lists.openembedded.org
>>> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
>>
>> _______________________________________________
>> Openembedded-core mailing list
>> Openembedded-core@lists.openembedded.org
>> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

Patch

diff --git a/meta/recipes-extended/polkit/polkit-0.101/polkit-1_pam.patch b/meta/recipes-extended/polkit/polkit-0.101/polkit-1_pam.patch
new file mode 100644
index 0000000..fa145ac
--- /dev/null
+++ b/meta/recipes-extended/polkit/polkit-0.101/polkit-1_pam.patch
@@ -0,0 +1,23 @@ 
+polkit: No system-auth in poky, we can use common-* in place of it.
+
+Upstream-Status:Inappropriate [configuration]
+
+Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com>
+
+--- a/configure.ac	2011-03-04 02:26:20.000000000 +0800
++++ b/configure.ac.new	2011-07-18 10:14:12.516818852 +0800
+@@ -350,10 +350,10 @@
+     PAM_FILE_INCLUDE_PASSWORD=system
+     PAM_FILE_INCLUDE_SESSION=system
+ else
+-   PAM_FILE_INCLUDE_AUTH=system-auth
+-   PAM_FILE_INCLUDE_ACCOUNT=system-auth
+-   PAM_FILE_INCLUDE_PASSWORD=system-auth
+-   PAM_FILE_INCLUDE_SESSION=system-auth
++   PAM_FILE_INCLUDE_AUTH=common-auth
++   PAM_FILE_INCLUDE_ACCOUNT=common-account
++   PAM_FILE_INCLUDE_PASSWORD=common-password
++   PAM_FILE_INCLUDE_SESSION=common-session
+ fi
+ 
+ AC_SUBST(PAM_FILE_INCLUDE_AUTH)
diff --git a/meta/recipes-extended/polkit/polkit_0.101.bb b/meta/recipes-extended/polkit/polkit_0.101.bb
index 6769914..da1d581 100644
--- a/meta/recipes-extended/polkit/polkit_0.101.bb
+++ b/meta/recipes-extended/polkit/polkit_0.101.bb
@@ -7,8 +7,10 @@  LIC_FILES_CHKSUM = "file://COPYING;md5=155db86cdbafa7532b41f390409283eb \
                     file://docs/polkit/html/license.html;md5=07ddbf5f29e44c80c99be19c1690ec1f"
 
 SRC_URI = "http://hal.freedesktop.org/releases/polkit-${PV}.tar.gz \
-           file://introspection.patch"
-PR = "r0"
+           file://introspection.patch \
+           file://polkit-1_pam.patch"
+
+PR = "r1"
 DEPENDS = "libpam expat dbus-glib eggdbus intltool"
 RDEPENDS_${PN} = "libpam"
 EXTRA_OECONF = "--with-authfw=pam --with-os-type=moblin --disable-man-pages --disable-gtk-doc --disable-introspection"