rpms/xorg-x11-server/devel .cvsignore, 1.29, 1.30 commitid, 1.2, 1.3 sources, 1.24, 1.25 xorg-x11-server.spec, 1.283, 1.284 xserver-1.4.99-selinux-awareness.patch, 1.2, 1.3 xserver-1.4.99-xaa-evict-pixmaps.patch, 1.1, 1.2 argh-pixman.patch, 1.1, NONE comment-header-modefiles.txt, 1.1, NONE xserver-1.3.0-ignore-extra-entity.patch, 1.1, NONE xserver-1.3.0-randr-fix-set-rotations-xinerama.patch, 1.1, NONE

Adam Jackson (ajax) fedora-extras-commits at redhat.com
Tue Jan 8 20:49:28 UTC 2008 

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-server/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8496/devel

Modified Files:
	.cvsignore commitid sources xorg-x11-server.spec 
	xserver-1.4.99-selinux-awareness.patch 
	xserver-1.4.99-xaa-evict-pixmaps.patch 
Removed Files:
	argh-pixman.patch comment-header-modefiles.txt 
	xserver-1.3.0-ignore-extra-entity.patch 
	xserver-1.3.0-randr-fix-set-rotations-xinerama.patch 
Log Message:
Today's rawhide grenade.  Now with more selinux!



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/.cvsignore,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- .cvsignore	28 Nov 2007 17:48:46 -0000	1.29
+++ .cvsignore	8 Jan 2008 20:48:31 -0000	1.30
@@ -1 +1 @@
-xorg-server-20071127.tar.bz2
+xorg-server-20080107.tar.bz2


Index: commitid
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/commitid,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- commitid	28 Nov 2007 17:48:46 -0000	1.2
+++ commitid	8 Jan 2008 20:48:31 -0000	1.3
@@ -1 +1 @@
-23b8ca8a373d919225de9739af7b064f650eceec
+260505e3c5a18044e97d31ea3bcc0955e46335c8


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- sources	28 Nov 2007 17:48:46 -0000	1.24
+++ sources	8 Jan 2008 20:48:31 -0000	1.25
@@ -1 +1 @@
-43e5d239d6255fb9b8abe4e3bf4eecb9  xorg-server-20071127.tar.bz2
+42ce248a3546e26c5f4a0a1e71d949e8  xorg-server-20080107.tar.bz2


Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.283
retrieving revision 1.284
diff -u -r1.283 -r1.284
--- xorg-x11-server.spec	7 Jan 2008 19:45:03 -0000	1.283
+++ xorg-x11-server.spec	8 Jan 2008 20:48:31 -0000	1.284
@@ -15,12 +15,12 @@
 # RHEL5 bugfix sync
 
 %define pkgname xorg-server
-%define gitdate 20071127
+%define gitdate 20080107
 
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.4.99.1
-Release:   0.14%{?dist}
+Release:   0.15.%{?gitdate}%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -35,7 +35,6 @@
 %else
 Source0:   ftp://ftp.x.org/pub/individual/xserver/%{pkgname}-%{version}.tar.bz2
 %endif
-Source100: comment-header-modefiles.txt
 
 # general bug fixes
 Patch19:   xserver-1.3.0-xnest-exposures.patch
@@ -61,11 +60,9 @@
 #Patch3000:
 
 # Trivial things to maybe merge upstream at next rebase
-Patch4003: argh-pixman.patch
+#Patch4003: argh-pixman.patch #fixme
 Patch4004: xserver-1.4.99-xephyr-dri.patch
 Patch4005: xserver-1.4.99-openchrome.patch
-Patch4006: xserver-1.3.0-randr-fix-set-rotations-xinerama.patch
-Patch4007: xserver-1.3.0-ignore-extra-entity.patch
 
 # Trivial things to never merge upstream ever
 # This should be fixed in the kernel.
@@ -131,7 +128,7 @@
 Requires: libdrm >= 2.4.0
 %endif
 
-BuildRequires: libselinux-devel
+BuildRequires: libselinux-devel audit-libs-devel
 
 # Make sure libXfont has the catalogue FPE
 Conflicts: libXfont < 1.2.9
@@ -286,7 +283,7 @@
 %endif
 
 if [ -z "$GIT_COMMITTER_NAME" ]; then
-    export GIT_COMMITTER_NAME="Fedora X Strike Force"
+    export GIT_COMMITTER_NAME="Fedora X Ninjas"
 fi
 
 
@@ -313,7 +310,7 @@
 	--disable-xorgcfg \
 	--enable-install-libxf86config \
 	--with-mesa-source=%{_datadir}/mesa/source \
-	--enable-dri \
+	--enable-xselinux \
 	--with-dri-driver-path=%{drimoduledir} \
 	${CONFIGURE}
 
@@ -323,18 +320,13 @@
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT moduledir=%{moduledir}
 
-
 %if %{with_hw_servers}
 mkdir -p $RPM_BUILD_ROOT%{_libdir}/xorg/modules/{drivers,input}
 
 # Install the vesamodes and extramodes files to let our install/config tools
 # be able to parse the same modelist as the X server uses (rhpxl).
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/xorg
-for each in vesamodes extramodes ; do
-    install -m 0644 %{SOURCE100} $RPM_BUILD_ROOT%{_datadir}/xorg/$each
-    cat hw/xfree86/common/$each >> $RPM_BUILD_ROOT%{_datadir}/xorg/$each
-    chmod 0444 $RPM_BUILD_ROOT%{_datadir}/xorg/$each
-done
+install -m 0444 hw/xfree86/common/{vesa,extra}modes $RPM_BUILD_ROOT%{_datadir}/xorg/
 %endif
 
 # Make the source package
@@ -342,7 +334,6 @@
 %define inst_srcdir %{buildroot}/%{xserver_source_dir}
 mkdir -p %{inst_srcdir}/{Xext,xkb,GL,hw/xfree86/{common,utils/xorgconfig}}
 cp cpprules.in %{inst_srcdir}
-cp Xext/SecurityPolicy %{inst_srcdir}/Xext
 cp xkb/README.compiled %{inst_srcdir}/xkb
 cp GL/symlink-mesa.sh %{inst_srcdir}/GL
 cp hw/xfree86/{xorgconf.cpp,Options} %{inst_srcdir}/hw/xfree86
@@ -389,25 +380,15 @@
 {
     pushd /etc/X11
 
-    for configfile in XF86Config XF86Config-4 ; do
-	if [ -r $configfile ]; then
-	    if [ -r xorg.conf ]; then
-		mv -f $configfile $configfile.obsoleted
-	    else
-		mv -f $configfile xorg.conf
-	    fi
-	fi
-    done
-
     [ -e xorg.conf ] || return 0
 
-    perl -p -i -e 's/^.*Load.*"(pex5|xie|xtt).*\n$"//gi' xorg.conf
-    perl -p -i -e 's/^\s*Driver(.*)"keyboard"/Driver\1"kbd"/gi' xorg.conf
-    perl -p -i -e 's/^.*Option.*"XkbRules".*"(xfree86|xorg)".*\n$//gi' xorg.conf
-    perl -p -i -e 's#^\s*RgbPath.*$##gi' xorg.conf
+    sed -i 's/^.*Load.*"(pex5|xie|xtt).*\n$"//gi' xorg.conf
+    sed -i 's/^\s*Driver(.*)"keyboard"/Driver\1"kbd"/gi' xorg.conf
+    sed -i 's/^.*Option.*"XkbRules".*"(xfree86|xorg)".*\n$//gi' xorg.conf
+    sed -i 's#^\s*RgbPath.*$##gi' xorg.conf
     # lame, the nvidia driver needs to override this
     if ! grep -q 'ModulePath.*nvidia' xorg.conf ; then
-      perl -p -i -e 's#^\s*ModulePath.*$##gi' xorg.conf
+      sed -i 's#^\s*ModulePath.*$##gi' xorg.conf
     fi
 
     popd
@@ -417,9 +398,7 @@
 %files common
 %defattr(-,root,root,-)
 %{_mandir}/man1/Xserver.1*
-%{_mandir}/man5/SecurityPolicy.5*
-%dir %{_libdir}/xserver
-%{_libdir}/xserver/SecurityPolicy
+%{_libdir}/xorg/protocol.txt
 %dir %{_localstatedir}/lib/xkb
 %{_localstatedir}/lib/xkb/README.compiled
 
@@ -531,6 +510,11 @@
 
 
 %changelog
+* Mon Jan 07 2008 Adam Jackson <ajax at redhat.com> 1.4.99.1-0.15
+- Today's git snapshot.  X-SELinux!
+- Drop the code to migrate from /etc/X11/XF86Config*.
+- s/perl -p -i -e/sed -i/g
+
 * Mon Jan 07 2008 Adam Jackson <ajax at redhat.com> 1.4.99.1-0.14
 - Sync with F8 bugfixes:
   - xorg-x11-server-Red-Hat-extramodes.patch: Don't supply non-CVT-R timings

xserver-1.4.99-selinux-awareness.patch:

Index: xserver-1.4.99-selinux-awareness.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/xserver-1.4.99-selinux-awareness.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xserver-1.4.99-selinux-awareness.patch	28 Nov 2007 17:48:46 -0000	1.2
+++ xserver-1.4.99-selinux-awareness.patch	8 Jan 2008 20:48:31 -0000	1.3
@@ -1,6 +1,6 @@
-From 0706a26b4ddbcd2ca495e05403ffc161e299a2c8 Mon Sep 17 00:00:00 2001
+From d4112defb9ab2b099c67a0a7c2ae7ac772d67751 Mon Sep 17 00:00:00 2001
 From: Adam Jackson <ajax at redhat.com>
-Date: Tue, 27 Nov 2007 13:52:40 -0500
+Date: Mon, 7 Jan 2008 15:41:22 -0500
 Subject: [PATCH] Link GL subsystem against libselinux.
 
 ---
@@ -9,24 +9,24 @@
  2 files changed, 4 insertions(+), 2 deletions(-)
 
 diff --git a/configure.ac b/configure.ac
-index 5150c18..b5c9e48 100644
+index 0742040..ed6d062 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -350,6 +350,8 @@ case $host_cpu in
- 	;;
+@@ -360,6 +360,8 @@ case $host_cpu in
  esac
+ AC_SUBST(GLX_ARCH_DEFINES)
  
 +SYS_LIBS="${SYS_LIBS} -lselinux"
 +
  dnl BSD *_video.c selection
  AM_CONDITIONAL(ALPHA_VIDEO, [test "x$ALPHA_VIDEO" = xyes])
  AM_CONDITIONAL(ARM_VIDEO, [test "x$ARM_VIDEO" = xyes])
-@@ -1181,7 +1183,7 @@ AC_MSG_RESULT([$XNEST])
+@@ -1211,7 +1213,7 @@ AC_MSG_RESULT([$XNEST])
  AM_CONDITIONAL(XNEST, [test "x$XNEST" = xyes])
  
  if test "x$XNEST" = xyes; then
--	XNEST_LIBS="$FB_LIB $FIXES_LIB $MI_LIB $XEXT_LIB $DBE_LIB $XTRAP_LIB $RECORD_LIB $GLX_LIBS $RENDER_LIB $RANDR_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $XPSTUBS_LIB $CWRAP_LIB $DIX_LIB $OS_LIB $CONFIG_LIB"
-+	XNEST_LIBS="$FB_LIB $FIXES_LIB $MI_LIB $XEXT_LIB $DBE_LIB $XTRAP_LIB $RECORD_LIB $GLX_LIBS $RENDER_LIB $RANDR_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $XPSTUBS_LIB $CWRAP_LIB $DIX_LIB $OS_LIB $CONFIG_LIB $XSERVER_LIBS"
+-	XNEST_LIBS="$FB_LIB $FIXES_LIB $MI_LIB $XEXT_LIB $DBE_LIB $XTRAP_LIB $RECORD_LIB $GLX_LIBS $RENDER_LIB $RANDR_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $XPSTUBS_LIB $DIX_LIB $OS_LIB $CONFIG_LIB"
++	XNEST_LIBS="$FB_LIB $FIXES_LIB $MI_LIB $XEXT_LIB $DBE_LIB $XTRAP_LIB $RECORD_LIB $GLX_LIBS $RENDER_LIB $RANDR_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $XPSTUBS_LIB $DIX_LIB $OS_LIB $CONFIG_LIB $XSERVER_LIBS"
  	XNEST_SYS_LIBS="$XNESTMODULES_LIBS"
  	AC_SUBST([XNEST_LIBS])
  	AC_SUBST([XNEST_SYS_LIBS])
@@ -44,5 +44,5 @@
  
  libafb_la_LDFLAGS = -avoid-version
 -- 
-1.5.3.4
+1.5.3.7
 

xserver-1.4.99-xaa-evict-pixmaps.patch:

Index: xserver-1.4.99-xaa-evict-pixmaps.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/xserver-1.4.99-xaa-evict-pixmaps.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xserver-1.4.99-xaa-evict-pixmaps.patch	2 Nov 2007 17:15:11 -0000	1.1
+++ xserver-1.4.99-xaa-evict-pixmaps.patch	8 Jan 2008 20:48:31 -0000	1.2
@@ -16,7 +16,7 @@
 index c0da07b..6c4faed 100644
 --- a/GL/glx/glxdri.c
 +++ b/GL/glx/glxdri.c
-@@ -360,6 +360,22 @@ __glXDRIbindTexImage(__GLXcontext *baseContext,
+@@ -360,6 +360,22 @@
  
      pixmap = (PixmapPtr) glxPixmap->pDraw;
  
@@ -40,10 +40,9 @@
  	__GLXDRIdrawable **texOffsetOverride = screen->texOffsetOverride;
  	int i, firstEmpty = 16;
 diff --git a/hw/xfree86/xaa/xaaInit.c b/hw/xfree86/xaa/xaaInit.c
-index 4222425..602b525 100644
 --- a/hw/xfree86/xaa/xaaInit.c
 +++ b/hw/xfree86/xaa/xaaInit.c
-@@ -88,6 +88,30 @@ XAADestroyInfoRec(XAAInfoRecPtr infoRec)
+@@ -88,6 +88,30 @@
      xfree(infoRec);
  }
  
@@ -61,7 +60,7 @@
 +	pScreen = screenInfo.screens[i];
 +	infoRec = GET_XAAINFORECPTR_FROM_SCREEN(pScreen);
 +
-+	pScreenPriv = pScreen->devPrivates[XAAScreenIndex].ptr;
++	pScreenPriv = dixLookupPrivate(&pScreen->devPrivates, XAAScreenKey);
 +	infoRec = pScreenPriv->AccelInfoRec;
 +
 +	infoRec->offscreenDepths = 0;


--- argh-pixman.patch DELETED ---


--- comment-header-modefiles.txt DELETED ---


--- xserver-1.3.0-ignore-extra-entity.patch DELETED ---


--- xserver-1.3.0-randr-fix-set-rotations-xinerama.patch DELETED ---

More information about the fedora-extras-commits mailing list