← Back to branch summary

~ubuntu-branches/ubuntu/edgy/xorg-server/edgy-updates

« back to all changes in this revision

Viewing changes to debian/patches/12_security_policy_in_etc.diff

  • Committer: Bazaar Package Importer
  • Author(s): Rodrigo Parra Novo
  • Date: 2006-07-25 20:06:28 UTC
  • mfrom: (1.1.4 upstream)
  • Revision ID: james.westby@ubuntu.com-20060725200628-gjmmd9gxfxdc4ejs
Tags: 1:1.1.1-0ubuntu1
* New Upstream version
* Changed Build-Depends from mesa-swrast-source to mesa-swx11-source,
  following Debian package nomenclature
* Re-did 12_security_policy_in_etc.diff for 1.1.1
* Dropped 15_security_allocate_local.diff (applied upstream)
* Dropped 16_SECURITY_setuid.diff (applied upstream)
* Dropped 000_ubuntu_fix_read_kernel_mapping.patch (applied upstream)
* Dropped 002_ubuntu_fix_for_certain_intel_chipsets.patch (applied upstream)
* Updated versioned Build-Depends on mesa-swx11-source to version
  6.5.0.cvs.20060725-0ubuntu1
* Added arrayobj.c, arrayobj.h, bitset.h & rbadaptors.h to
  GL/symlink-mesa.sh (linked from mesa-swx11-source)
* Added arrayobj.c to default build target on GL/mesa/main

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/12_security_policy_in_etc.diff
1
 
Index: xorg-server-1.0.2/configure.ac
2
 
===================================================================
3
 
--- xorg-server-1.0.2.orig/configure.ac 2006-03-21 08:42:38.000000000 +0700
4
 
+++ xorg-server-1.0.2/configure.ac      2006-04-16 21:59:53.000000000 +0800
5
 
@@ -352,6 +352,9 @@
 
1
diff -uNr xorg-server-1.1.1.orig/configure.ac xorg-server-1.1.1/configure.ac
 
2
--- xorg-server-1.1.1.orig/configure.ac 2006-07-07 20:44:45.000000000 -0300
 
3
+++ xorg-server-1.1.1/configure.ac      2006-07-25 10:14:49.000000000 -0300
 
4
@@ -375,6 +375,9 @@
6
5
 AC_ARG_WITH(rgb-path,         AS_HELP_STRING([--with-rgb-path=PATH], [Path to RGB database (default: ${datadir}/X11/rgb)]),
7
6
                                [ RGBPATH="$withval" ],
8
7
                                [ RGBPATH="${datadir}/X11/rgb" ])
9
8
+AC_ARG_WITH(serverconfig-path, AS_HELP_STRING([--with-serverconfig-path=PATH], [Path to server config (default: ${libdir}/xserver)]),
10
9
+                               [ SERVERCONFIG="$withval" ],
11
10
+                               [ SERVERCONFIG="${libdir}/xserver" ])
12
 
 AC_ARG_ENABLE(builddocs,      AS_HELP_STRING([--enable-builddocs], [Build docs (default: disabled)]),
13
 
                                 [BUILDDOCS=$enableval],
14
 
                                 [BUILDDOCS=no])
15
 
@@ -719,6 +722,7 @@
 
11
 AC_ARG_WITH(dri-driver-path,  AS_HELP_STRING([--with-dri-driver-path=PATH], [Path to DRI drivers (default: ${libdir}/dri)]),
 
12
                                [ DRI_DRIVER_PATH="$withval" ],
 
13
                                [ DRI_DRIVER_PATH="${libdir}/dri" ])
 
14
@@ -806,6 +809,7 @@
16
15
 
17
16
 AC_DEFINE_DIR(COMPILEDDEFAULTFONTPATH, FONTPATH, [Default font path])
18
17
 AC_DEFINE_DIR(RGB_DB, RGBPATH, [Default RGB path])
19
18
+AC_DEFINE_DIR(SERVERCONFIGdir, SERVERCONFIG, [Server config path])
 
19
 AC_DEFINE_DIR(DRI_DRIVER_PATH, DRI_DRIVER_PATH, [Default DRI driver path])
20
20
 AC_DEFINE_UNQUOTED(XVENDORNAME, ["$VENDOR_STRING"], [Vendor name])
21
21
 AC_DEFINE_UNQUOTED(XVENDORNAMESHORT, ["$VENDOR_STRING_SHORT"], [Short vendor name])
22
 
 AC_DEFINE_UNQUOTED(XORG_RELEASE, ["$VENDOR_RELEASE_STRING"], [Vendor release])
23
 
Index: xorg-server-1.0.2/Xext/Makefile.am
24
 
===================================================================
25
 
--- xorg-server-1.0.2.orig/Xext/Makefile.am     2006-03-21 08:42:38.000000000 +0700
26
 
+++ xorg-server-1.0.2/Xext/Makefile.am  2006-04-16 21:59:13.000000000 +0800
27
 
@@ -70,7 +70,6 @@
 
22
diff -uNr xorg-server-1.1.1.orig/Xext/Makefile.am xorg-server-1.1.1/Xext/Makefile.am
 
23
--- xorg-server-1.1.1.orig/Xext/Makefile.am     2006-07-05 15:38:46.000000000 -0300
 
24
+++ xorg-server-1.1.1/Xext/Makefile.am  2006-07-25 10:15:20.000000000 -0300
 
25
@@ -73,7 +73,6 @@
28
26
 if XCSECURITY   
29
27
 BUILTIN_SRCS += $(XCSECURITY_SRCS)
30
28