rpms/gnome-keyring
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Update the pam module selinux patch

Browse Source
This commit is contained in:
Tomas Bzatek 2011-03-15 17:40:23 +01:00
parent dd74952191
commit 90d4af20f5
2 changed files with 33 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
gnome-keyring-2.91.93-pam-selinux.patch
View File

@ -1,37 +1,33 @@
diff --git a/configure.in b/configure.in diff --git a/configure.in b/configure.in
index a5a434d..8294028 100644 index a5a434d..1d3801e 100644
--- a/configure.in --- a/configure.in
+++ b/configure.in +++ b/configure.in
@@ -572,6 +572,28 @@ AC_SUBST(GCOV) @@ -572,6 +572,24 @@ AC_SUBST(GCOV)
AC_SUBST(GENHTML) AC_SUBST(GENHTML)
# ---------------------------------------------------------------------- # ----------------------------------------------------------------------
+# selinux +# selinux
+
+LIBSELINUX=""
+selinux_status="no"
+AC_ARG_ENABLE([selinux], +AC_ARG_ENABLE([selinux],
+ AC_HELP_STRING([--disable-selinux],[do not use SELinux]), + AC_HELP_STRING([--disable-selinux],[do not use SELinux]))
+ WITH_SELINUX=$enableval, WITH_SELINUX=yes) +if test "x$enable_selinux" != "xno"; then
+if test "$WITH_SELINUX" == "yes" ; then + AC_CHECK_LIB([selinux],[getfilecon],
+ AC_CHECK_LIB([selinux],[getfilecon], LIBSELINUX="-lselinux", LIBSELINUX="") + [AC_CHECK_LIB([selinux],[setexeccon],
+ selinux_status="yes" + [AC_DEFINE([WITH_SELINUX], 1, [Defined if SE Linux support is compiled in])
+else + LIBSELINUX="-lselinux"
+ LIBSELINUX="" + selinux_status="yes"])
+ selinux_status="no" + ])
+fi +fi
+AC_SUBST(LIBSELINUX) +AC_SUBST(LIBSELINUX)
+AM_CONDITIONAL([HAVE_LIBSELINUX], [test ! -z "$LIBSELINUX"]) +AM_CONDITIONAL([HAVE_LIBSELINUX], [test ! -z "$LIBSELINUX"])
+if test ! -z "$LIBSELINUX" ; then
+ AC_DEFINE([WITH_SELINUX], 1, [Defined if SE Linux support is compiled in])
+ BACKUP_LIBS=$LIBS
+ LIBS="$LIBS $LIBSELINUX"
+ AC_CHECK_FUNCS(setexeccon)
+ LIBS=$BACKUP_LIBS
+fi
+ +
+# ---------------------------------------------------------------------- +# ----------------------------------------------------------------------
# Valgrind # Valgrind
AC_ARG_ENABLE(valgrind, AC_ARG_ENABLE(valgrind,
@@ -742,6 +764,7 @@ echo @@ -742,6 +760,7 @@ echo
echo "OPTIONAL DEPENDENCIES" echo "OPTIONAL DEPENDENCIES"
echo " PAM: $pam_status" echo " PAM: $pam_status"
echo " Linux capabilities: $libcapng_status" echo " Linux capabilities: $libcapng_status"
@ -39,8 +35,20 @@ index a5a434d..8294028 100644
echo echo
echo "CONFIGURATION" echo "CONFIGURATION"
echo " SSH Agent: $ssh_status" echo " SSH Agent: $ssh_status"
diff --git a/pam/Makefile.am b/pam/Makefile.am
index 81bda13..2e6362d 100644
--- a/pam/Makefile.am
+++ b/pam/Makefile.am
@@ -16,6 +16,7 @@ pam_gnome_keyring_la_LIBADD = \
$(top_builddir)/egg/libegg-buffer.la \
$(top_builddir)/egg/libegg-creds.la \
$(top_builddir)/egg/libegg-secure.la \
+ $(LIBSELINUX) \
-lpam
pam_gnome_keyring_la_LDFLAGS = \
diff --git a/pam/gkr-pam-module.c b/pam/gkr-pam-module.c diff --git a/pam/gkr-pam-module.c b/pam/gkr-pam-module.c
index e63c917..2e2e765 100644 index e63c917..8ad814c 100644
--- a/pam/gkr-pam-module.c --- a/pam/gkr-pam-module.c
+++ b/pam/gkr-pam-module.c +++ b/pam/gkr-pam-module.c
@@ -317,6 +317,36 @@ cleanup_free_password (pam_handle_t *ph, void *data, int pam_end_status) @@ -317,6 +317,36 @@ cleanup_free_password (pam_handle_t *ph, void *data, int pam_end_status)
@ -63,7 +71,7 @@ index e63c917..2e2e765 100644
+ +
+ ret = getfilecon(command, &fcon); + ret = getfilecon(command, &fcon);
+ if (ret < 0) goto err; + if (ret < 0) goto err;
+ +
+ ret = security_compute_create(execcon, fcon, SECCLASS_PROCESS, &newcon); + ret = security_compute_create(execcon, fcon, SECCLASS_PROCESS, &newcon);
+ if (ret < 0) goto err; + if (ret < 0) goto err;
+ +

7
gnome-keyring.spec
View File

@ -8,7 +8,7 @@
Summary: Framework for managing passwords and other secrets Summary: Framework for managing passwords and other secrets
Name: gnome-keyring Name: gnome-keyring
Version: 2.91.92 Version: 2.91.92
Release: 2%{?dist} Release: 3%{?dist}
License: GPLv2+ and LGPLv2+ License: GPLv2+ and LGPLv2+
Group: System Environment/Libraries Group: System Environment/Libraries
#VCS: git:git://git.gnome.org/gnome-keyring #VCS: git:git://git.gnome.org/gnome-keyring
@ -36,6 +36,7 @@ BuildRequires: libtasn1-tools
BuildRequires: libgnome-keyring-devel >= %{libgnome-keyring_version} BuildRequires: libgnome-keyring-devel >= %{libgnome-keyring_version}
BuildRequires: gtk-doc BuildRequires: gtk-doc
BuildRequires: libcap-ng-devel BuildRequires: libcap-ng-devel
BuildRequires: libselinux-devel
# for smooth transition since the core was split # for smooth transition since the core was split
Requires: libgnome-keyring >= %{libgnome-keyring_version} Requires: libgnome-keyring >= %{libgnome-keyring_version}
@ -80,7 +81,6 @@ autoreconf -i -f
%configure --disable-gtk-doc \ %configure --disable-gtk-doc \
--with-pam-dir=/%{_lib}/security \ --with-pam-dir=/%{_lib}/security \
--disable-acl-prompts \
--enable-pam \ --enable-pam \
--with-gtk=3.0 --with-gtk=3.0
@ -148,6 +148,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas
%changelog %changelog
* Tue Mar 15 2011 Tomas Bzatek <tbzatek@redhat.com> - 2.91.92-3
- Update the pam module selinux patch
* Tue Mar 15 2011 Tomas Bzatek <tbzatek@redhat.com> - 2.91.92-2 * Tue Mar 15 2011 Tomas Bzatek <tbzatek@redhat.com> - 2.91.92-2
- Set correct SELinux context of daemon started from the pam module (#684225) - Set correct SELinux context of daemon started from the pam module (#684225)