X Strike Force X.Org X11 SVN commit: r386 - in trunk/debian: . patches
Author: dnusinow
Date: 2005-07-21 11:04:14 -0500 (Thu, 21 Jul 2005)
New Revision: 386
Modified:
trunk/debian/changelog
trunk/debian/patches/099s_selinux_support.diff
Log:
Changes by Eugene Konev:
- Do not impose selinux on the whole world out there: move selinux
specific changes from config/cf/Imake.tmpl to programs/xdm/Imakefile,
as xdm is the only program affected by this patch. Closes: #319121
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2005-07-20 18:39:31 UTC (rev 385)
+++ trunk/debian/changelog 2005-07-21 16:04:14 UTC (rev 386)
@@ -2,6 +2,11 @@
Changes by David Nusinow:
+ Changes by Eugene Konev:
+ - Do not impose selinux on the whole world out there: move selinux
+ specific changes from config/cf/Imake.tmpl to programs/xdm/Imakefile,
+ as xdm is the only program affected by this patch. Closes: #319121
+
-- David Nusinow <dnusinow@debian.org> Wed, 20 Jul 2005 14:38:43 -0400
xorg-x11 (6.8.2.dfsg.1-4) unstable; urgency=low
Modified: trunk/debian/patches/099s_selinux_support.diff
===================================================================
--- trunk/debian/patches/099s_selinux_support.diff 2005-07-20 18:39:31 UTC (rev 385)
+++ trunk/debian/patches/099s_selinux_support.diff 2005-07-21 16:04:14 UTC (rev 386)
@@ -27,40 +27,17 @@
done for Debian, the source package will need to add a build-dependency on
the libselinux1-dev package.
+Changes by Eugene Konev:
+ Do not impose selinux on the whole world out there: move selinux
+ specific changes from config/cf/Imake.tmpl to programs/xdm/Imakefile,
+ as xdm is the only program affected by this patch.
+
Not submitted upstream to XFree86 or X.Org.
-diff -ruN xc-old/config/cf/Imake.tmpl xc/config/cf/Imake.tmpl
---- xc-old/config/cf/Imake.tmpl 2005-07-12 11:31:34.000000000 -0400
-+++ xc/config/cf/Imake.tmpl 2005-07-12 11:38:04.000000000 -0400
-@@ -2134,17 +2134,21 @@
- * EXTRA_INCLUDES contains project-specific includes set in project incfiles
- * INCLUDES contains client-specific includes set in Imakefile
- * LOCAL_LDFLAGS contains client-specific ld flags flags set in Imakefile
-+ * SELINUX_INCLUDES contains SELinux-specific includes set in the appropriate .cf file
-+ * SELINUX_LDFLAGS contains SELinux-specific ld flags set in the appropriate . cf file
-+ * SELINUX_CFLAGS contains SELinux-specific compiler flags set in the .cf file
-+ * SELINUX_LIBS contains SELinux-specific libraries to link with set in the . cf file
- */
-- ALLINCLUDES = $(INCLUDES) $(EXTRA_INCLUDES) $(TOP_INCLUDES) $(INSTALLED_INCLUDES) $(STD_INCLUDES)
-+ ALLINCLUDES = $(INCLUDES) $(EXTRA_INCLUDES) $(TOP_INCLUDES) $(INSTALLED_INCLUDES) $(STD_INCLUDES) $(SELINUX_INCLUDES)
- ALLDEFINES = $(ALLINCLUDES) $(STD_DEFINES) $(PROTO_DEFINES) $(THREADS_DEFINES) $(MODULE_DEFINES) $(DEFINES) $(EXTRA_DEFINES)
-- CFLAGS = $(CDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(MODULE_CFLAGS) $(ALLDEFINES)
-+ CFLAGS = $(CDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(SELINUX_CFLAGS) $(MODULE_CFLAGS) $(ALLDEFINES)
- LINTFLAGS = $(LINTOPTS) -DLINT $(ALLDEFINES) $(DEPEND_DEFINES)
- LDPRELIB = LdPreLib $(INSTALLED_LIBS)
- LDPOSTLIB = LdPostLib
-- LDOPTIONS = $(CDEBUGFLAGS) $(CCOPTIONS) $(EXTRA_LDOPTIONS) $(THREADS_LDFLAGS) $(LOCAL_LDFLAGS) $(LDPRELIBS)
-+ LDOPTIONS = $(CDEBUGFLAGS) $(CCOPTIONS) $(EXTRA_LDOPTIONS) $(THREADS_LDFLAGS) $(SELINUX_LDFLAGS) $(LOCAL_LDFLAGS) $(LDPRELIBS)
- CXXLDOPTIONS = $(CXXDEBUGFLAGS) $(CXXOPTIONS) $(EXTRA_LDOPTIONS) $(THREADS_CXXLDFLAGS) $(LOCAL_LDFLAGS) $(LDPRELIBS)
-
-- LDLIBS = $(LDPOSTLIBS) $(THREADS_LIBS) $(SYS_LIBRARIES) $(EXTRA_LIBRARIES)
-+ LDLIBS = $(LDPOSTLIBS) $(THREADS_LIBS) $(SELINUX_LIBS) $(SYS_LIBRARIES) $(EXTRA_LIBRARIES)
- #if HasBrokenCCForLink
- CCLINK = LdCmd
- #else
-diff -ruN xc-old/config/cf/linux.cf xc/config/cf/linux.cf
---- xc-old/config/cf/linux.cf 2005-07-12 11:31:41.000000000 -0400
-+++ xc/config/cf/linux.cf 2005-07-12 11:38:04.000000000 -0400
+Index: xc/config/cf/linux.cf
+===================================================================
+--- xc-old/config/cf/linux.cf 2005-07-21 03:33:06.000000000 +0800
++++ xc/config/cf/linux.cf 2005-07-21 03:34:00.000000000 +0800
@@ -1114,3 +1114,57 @@
#ifndef XFree86ServerOSDefines
# define XFree86ServerOSDefines
@@ -119,9 +96,10 @@
+ SELINUX_LIBS = SELinuxLibraries
+# endif
+#endif
-diff -ruN xc-old/programs/xdm/session.c xc/programs/xdm/session.c
---- xc-old/programs/xdm/session.c 2005-07-12 11:31:38.000000000 -0400
-+++ xc/programs/xdm/session.c 2005-07-12 11:38:04.000000000 -0400
+Index: xc/programs/xdm/session.c
+===================================================================
+--- xc-old/programs/xdm/session.c 2005-07-21 03:33:06.000000000 +0800
++++ xc/programs/xdm/session.c 2005-07-21 03:34:00.000000000 +0800
@@ -61,6 +61,11 @@
# include <krb5/krb5.h>
#endif
@@ -187,3 +165,31 @@
home = getEnv (verify->userEnviron, "HOME");
if (home)
if (chdir (home) == -1) {
+Index: xc/programs/xdm/Imakefile
+===================================================================
+--- xc-old/programs/xdm/Imakefile 2005-07-21 03:33:06.000000000 +0800
++++ xc/programs/xdm/Imakefile 2005-07-21 03:34:00.000000000 +0800
+@@ -200,12 +200,13 @@
+ XDMCONFIGDIR = XdmConfigurationSubdirectory
+ SUBDIRS = $(GREET_DIR) $(XDMCONFIGDIR)
+
+-INCLUDES = $(KRB5_INCLUDE)
++INCLUDES = $(KRB5_INCLUDE) $(SELINUX_INCLUDES)
+ DEPLIBS = $(DEPXMULIB) $(DEPXTOOLLIB) $(DEPXLIB) $(DEPXAUTHLIB) \
+ $(DEPXDMCPLIB) $(XINDEPLIBS)
++LOCAL_LDFLAGS = $(SELINUX_LDFLAGS)
+ LOCAL_LIBRARIES = $(GREETLIBS) $(XMULIB) $(XTOOLLIB) $(XLIB) $(XAUTHLIB) \
+ $(XDMCPLIB) $(RPCLIB) $(PAM_LIBRARIES) $(DLLIBRARY) \
+- $(CRYPT_LIBRARIES) $(KRBIVLIB) $(XINLIBS)
++ $(CRYPT_LIBRARIES) $(KRBIVLIB) $(XINLIBS) $(SELINUX_LIBS)
+
+ SRCS1 = auth.c daemon.c server.c dpylist.c dm.c error.c file.c \
+ netaddr.c reset.c resource.c protodpy.c policy.c \
+@@ -330,6 +331,7 @@
+ SpecialCObjectRule(socket,$(ICONFIGFILES),$(SOCK_DEFINES))
+ SpecialCObjectRule(xdmcp,$(ICONFIGFILES),$(SOCK_DEFINES))
+ SpecialCObjectRule(xdmshell,$(ICONFIGFILES),$(VFORK_DEFINES))
++SpecialCObjectRule(session,,$(SELINUX_CFLAGS))
+
+ #if !SharedLibXdmGreet
+ LinkSourceFile(greet.c,greeter)
Reply to: