diff --git a/gdm-selinux.patch b/gdm-selinux.patch new file mode 100644 index 0000000..efe5fc3 --- /dev/null +++ b/gdm-selinux.patch @@ -0,0 +1,22 @@ +--- configure ++++ configure +@@ -32703,7 +32703,7 @@ + #define HAVE_SELINUX 1 + _ACEOF + +- EXTRA_DAEMON_LIBS="$EXTRA_DAEMON_LIBS -lselinux -lattr" ++ EXTRA_DAEMON_LIBS="$EXTRA_DAEMON_LIBS -lselinux" + fi + + # +--- configure.ac ++++ configure.ac +@@ -820,7 +820,7 @@ + AC_CHECK_LIB(selinux,setexeccon,/bin/true) + AC_CHECK_LIB(selinux,is_selinux_enabled,/bin/true) + AC_DEFINE(HAVE_SELINUX) +- EXTRA_DAEMON_LIBS="$EXTRA_DAEMON_LIBS -lselinux -lattr" ++ EXTRA_DAEMON_LIBS="$EXTRA_DAEMON_LIBS -lselinux" + fi + + # diff --git a/gdm.changes b/gdm.changes index 24e40a0..35db080 100644 --- a/gdm.changes +++ b/gdm.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Aug 22 17:04:10 CEST 2008 - prusnak@suse.cz + +- enabled SELinux support [Fate#303662] + ------------------------------------------------------------------- Wed Aug 20 15:16:55 CEST 2008 - sbrabec@suse.cz diff --git a/gdm.spec b/gdm.spec index 3b46c48..952f596 100644 --- a/gdm.spec +++ b/gdm.spec @@ -20,6 +20,7 @@ Name: gdm BuildRequires: PolicyKit-gnome-devel check-devel docbook_4 fdupes gconf2-devel gnome-common gnome-doc-utils-devel gnome-panel-devel gnome-patch-translation intltool libglade2-devel libgnomeprintui-devel libgnomeui-devel libgnutls-devel librsvg-devel libwnck-devel libxklavier-devel pam-devel perl-XML-Parser pwdutils scrollkeeper tcpd-devel update-desktop-files xorg-x11-server xorg-x11-server-extra zenity +BuildRequires: libselinux-devel PreReq: /usr/sbin/groupadd PreReq: /usr/sbin/useradd PreReq: /usr/sbin/usermod @@ -30,7 +31,7 @@ PreReq: %insserv_prereq License: GPL v2 or later Group: System/GUI/GNOME Version: 2.23.2 -Release: 1 +Release: 2 Summary: The GNOME 2.x Display Manager Source: %{name}-%{version}.tar.bz2 Source1: gdm.pamd @@ -44,6 +45,8 @@ Patch4: gdm-2.21.5-vt7-temporary-hack.patch Patch28: gdm-X_SERVER.patch # PATCH-FIX-UPSTREAM gdm-libwrap.patch bgo548676 sbrabec@suse.cz -- Find tcp_wrappers correctly on bi-arch x86_64 Patch29: gdm-libwrap.patch +# PATCH-SUSE: enable SELinux +Patch60: gdm-selinux.patch Url: http://www.gnome.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-build DocDir: %{_defaultdocdir} @@ -101,6 +104,7 @@ Authors: %patch4 -p1 %patch28 %patch29 +%patch60 %build autoreconf -f -i @@ -109,6 +113,7 @@ export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" --libexecdir=%{_prefix}/lib \ --localstatedir=%{_localstatedir} \ --with-atspi-dir=%{_prefix}/lib/at-spi \ + --with-selinux \ --enable-ipv6\ --disable-scrollkeeper\ --enable-secureremote @@ -203,6 +208,8 @@ fi %files lang -f %{name}.lang %changelog +* Fri Aug 22 2008 prusnak@suse.cz +- enabled SELinux support [Fate#303662] * Wed Aug 20 2008 sbrabec@suse.cz - Updated to version 2.23.2: * Requires ConsoleKit 0.3.0