X Strike Force X.Org X11 SVN commit: r1828 - in trunk/xserver/xorg-server-1.0.2: . debian/patches
Author: dnusinow
Date: 2006-04-17 02:00:14 -0400 (Mon, 17 Apr 2006)
New Revision: 1828
Added:
trunk/xserver/xorg-server-1.0.2/debian/patches/12_security_policy_in_etc.diff
trunk/xserver/xorg-server-1.0.2/mkinstalldirs
Log:
Actually add patch as well as build system script installed by autoreconf from last commit
Added: trunk/xserver/xorg-server-1.0.2/debian/patches/12_security_policy_in_etc.diff
===================================================================
--- trunk/xserver/xorg-server-1.0.2/debian/patches/12_security_policy_in_etc.diff 2006-04-17 05:51:43 UTC (rev 1827)
+++ trunk/xserver/xorg-server-1.0.2/debian/patches/12_security_policy_in_etc.diff 2006-04-17 06:00:14 UTC (rev 1828)
@@ -0,0 +1,34 @@
+Index: xorg-server-1.0.2/configure.ac
+===================================================================
+--- xorg-server-1.0.2.orig/configure.ac 2006-03-21 08:42:38.000000000 +0700
++++ xorg-server-1.0.2/configure.ac 2006-04-16 21:59:53.000000000 +0800
+@@ -352,6 +352,9 @@
+ AC_ARG_WITH(rgb-path, AS_HELP_STRING([--with-rgb-path=PATH], [Path to RGB database (default: ${datadir}/X11/rgb)]),
+ [ RGBPATH="$withval" ],
+ [ RGBPATH="${datadir}/X11/rgb" ])
++AC_ARG_WITH(serverconfig-path, AS_HELP_STRING([--with-serverconfig-path=PATH], [Path to server config (default: ${libdir}/xserver)]),
++ [ SERVERCONFIG="$withval" ],
++ [ SERVERCONFIG="${libdir}/xserver" ])
+ AC_ARG_ENABLE(builddocs, AS_HELP_STRING([--enable-builddocs], [Build docs (default: disabled)]),
+ [BUILDDOCS=$enableval],
+ [BUILDDOCS=no])
+@@ -719,6 +722,7 @@
+
+ AC_DEFINE_DIR(COMPILEDDEFAULTFONTPATH, FONTPATH, [Default font path])
+ AC_DEFINE_DIR(RGB_DB, RGBPATH, [Default RGB path])
++AC_DEFINE_DIR(SERVERCONFIGdir, SERVERCONFIG, [Server config path])
+ AC_DEFINE_UNQUOTED(XVENDORNAME, ["$VENDOR_STRING"], [Vendor name])
+ AC_DEFINE_UNQUOTED(XVENDORNAMESHORT, ["$VENDOR_STRING_SHORT"], [Short vendor name])
+ AC_DEFINE_UNQUOTED(XORG_RELEASE, ["$VENDOR_RELEASE_STRING"], [Vendor release])
+Index: xorg-server-1.0.2/Xext/Makefile.am
+===================================================================
+--- xorg-server-1.0.2.orig/Xext/Makefile.am 2006-03-21 08:42:38.000000000 +0700
++++ xorg-server-1.0.2/Xext/Makefile.am 2006-04-16 21:59:13.000000000 +0800
+@@ -70,7 +70,6 @@
+ if XCSECURITY
+ BUILTIN_SRCS += $(XCSECURITY_SRCS)
+
+-SERVERCONFIGdir = $(libdir)/xserver
+ SERVERCONFIG_DATA = SecurityPolicy
+ AM_CFLAGS += -DDEFAULTPOLICYFILE=\"$(SERVERCONFIGdir)/SecurityPolicy\"
+ endif
Added: trunk/xserver/xorg-server-1.0.2/mkinstalldirs
===================================================================
--- trunk/xserver/xorg-server-1.0.2/mkinstalldirs 2006-04-17 05:51:43 UTC (rev 1827)
+++ trunk/xserver/xorg-server-1.0.2/mkinstalldirs 2006-04-17 06:00:14 UTC (rev 1828)
@@ -0,0 +1,111 @@
+#! /bin/sh
+# mkinstalldirs --- make directory hierarchy
+# Author: Noah Friedman <friedman@prep.ai.mit.edu>
+# Created: 1993-05-16
+# Public domain
+
+errstatus=0
+dirmode=""
+
+usage="\
+Usage: mkinstalldirs [-h] [--help] [-m mode] dir ..."
+
+# process command line arguments
+while test $# -gt 0 ; do
+ case $1 in
+ -h | --help | --h*) # -h for help
+ echo "$usage" 1>&2
+ exit 0
+ ;;
+ -m) # -m PERM arg
+ shift
+ test $# -eq 0 && { echo "$usage" 1>&2; exit 1; }
+ dirmode=$1
+ shift
+ ;;
+ --) # stop option processing
+ shift
+ break
+ ;;
+ -*) # unknown option
+ echo "$usage" 1>&2
+ exit 1
+ ;;
+ *) # first non-opt arg
+ break
+ ;;
+ esac
+done
+
+for file
+do
+ if test -d "$file"; then
+ shift
+ else
+ break
+ fi
+done
+
+case $# in
+ 0) exit 0 ;;
+esac
+
+case $dirmode in
+ '')
+ if mkdir -p -- . 2>/dev/null; then
+ echo "mkdir -p -- $*"
+ exec mkdir -p -- "$@"
+ fi
+ ;;
+ *)
+ if mkdir -m "$dirmode" -p -- . 2>/dev/null; then
+ echo "mkdir -m $dirmode -p -- $*"
+ exec mkdir -m "$dirmode" -p -- "$@"
+ fi
+ ;;
+esac
+
+for file
+do
+ set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'`
+ shift
+
+ pathcomp=
+ for d
+ do
+ pathcomp="$pathcomp$d"
+ case $pathcomp in
+ -*) pathcomp=./$pathcomp ;;
+ esac
+
+ if test ! -d "$pathcomp"; then
+ echo "mkdir $pathcomp"
+
+ mkdir "$pathcomp" || lasterr=$?
+
+ if test ! -d "$pathcomp"; then
+ errstatus=$lasterr
+ else
+ if test ! -z "$dirmode"; then
+ echo "chmod $dirmode $pathcomp"
+ lasterr=""
+ chmod "$dirmode" "$pathcomp" || lasterr=$?
+
+ if test ! -z "$lasterr"; then
+ errstatus=$lasterr
+ fi
+ fi
+ fi
+ fi
+
+ pathcomp="$pathcomp/"
+ done
+done
+
+exit $errstatus
+
+# Local Variables:
+# mode: shell-script
+# sh-indentation: 2
+# End:
+# mkinstalldirs ends here
Property changes on: trunk/xserver/xorg-server-1.0.2/mkinstalldirs
___________________________________________________________________
Name: svn:executable
+ *
Reply to: