[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

xorg-server: Changes to 'debian-experimental'



 debian/changelog                                           |    4 
 debian/patches/02_Add-libgcrypt-as-an-option-for-sha1.diff |   84 +++++++++++++
 debian/patches/Add-libgcrypt-as-an-option-for-sha1.diff    |   82 ------------
 debian/patches/Turn-on-ModeDebug-by-default.patch          |   22 ---
 debian/patches/series                                      |    5 
 hw/xfree86/modes/xf86Crtc.c                                |   12 +
 6 files changed, 98 insertions(+), 111 deletions(-)

New commits:
commit 9cfde453ad79c179d48537392132934ff52b7824
Author: Julien Cristau <jcristau@debian.org>
Date:   Mon Nov 23 23:09:53 2009 +0100

    Number our patches to make it easier to keep track of things.
    
    Requested by the Ubuntu folks.

diff --git a/debian/changelog b/debian/changelog
index ef5e731..7477666 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,8 @@ xorg-server (2:1.7.0-2) UNRELEASED; urgency=low
     tests, and run the tests unless nocheck is in DEB_BUILD_OPTIONS.
   * Cherry-pick upstream commit to turn ModeDebug on during server startup,
     replacing our Turn-on-ModeDebug-by-default.patch.
+  * Number our patches to make it easier to keep track of things.  Requested
+    by the Ubuntu folks.
 
  -- Julien Cristau <jcristau@debian.org>  Sun, 04 Oct 2009 17:39:13 +0200
 
diff --git a/debian/patches/02_Add-libgcrypt-as-an-option-for-sha1.diff b/debian/patches/02_Add-libgcrypt-as-an-option-for-sha1.diff
new file mode 100644
index 0000000..0e91795
--- /dev/null
+++ b/debian/patches/02_Add-libgcrypt-as-an-option-for-sha1.diff
@@ -0,0 +1,84 @@
+From 6c6bbefdcf8a41dc71f9cbeca7ce972e2661fade Mon Sep 17 00:00:00 2001
+From: Julien Cristau <jcristau@debian.org>
+Date: Thu, 2 Apr 2009 02:34:49 +0200
+Subject: [PATCH] Add libgcrypt as an option for sha1
+
+Included upstream in 1.7.99.x in a different way:
+commit a60e676f1fd243c78859440b87652f523d3f2ec1
+---
+ configure.ac            |    6 ++++++
+ include/dix-config.h.in |    3 +++
+ render/glyph.c          |   12 ++++++++++++
+ 3 files changed, 21 insertions(+), 0 deletions(-)
+
+Index: xorg-server/configure.ac
+===================================================================
+--- xorg-server.orig/configure.ac
++++ xorg-server/configure.ac
+@@ -1274,6 +1274,12 @@
+             [Use libmd SHA1 functions instead of OpenSSL libcrypto])])
+ fi
+ 
++if test "x$SHA1_LIB" = "x"; then
++  AC_CHECK_LIB([gcrypt], [gcry_md_open], [SHA1_LIB="-lgcrypt"
++            AC_DEFINE([HAVE_SHA1_IN_LIBGCRYPT], [1],
++            [Use libgcrypt SHA1 functions instead of OpenSSL libcrypto])])
++fi
++
+ if test "x$SHA1_LIB" = "x" ; then
+   PKG_CHECK_EXISTS([OPENSSL], [openssl], [HAVE_OPENSSL_PKC=yes],
+                     [HAVE_OPENSSL_PKC=no])
+Index: xorg-server/include/dix-config.h.in
+===================================================================
+--- xorg-server.orig/include/dix-config.h.in
++++ xorg-server/include/dix-config.h.in
+@@ -163,6 +163,9 @@
+ /* Define to use libmd SHA1 functions instead of OpenSSL libcrypto */
+ #undef HAVE_SHA1_IN_LIBMD
+ 
++/* Define to use libgcrypt SHA1 functions instead of OpenSSL libcrypto */
++#undef HAVE_SHA1_IN_LIBGCRYPT
++
+ /* Define to 1 if you have the `shmctl64' function. */
+ #undef HAVE_SHMCTL64
+ 
+Index: xorg-server/render/glyph.c
+===================================================================
+--- xorg-server.orig/render/glyph.c
++++ xorg-server/render/glyph.c
+@@ -28,6 +28,8 @@
+ 
+ #ifdef HAVE_SHA1_IN_LIBMD /* Use libmd for SHA1 */
+ # include <sha1.h>
++#elif defined(HAVE_SHA1_IN_LIBGCRYPT)
++# include <gcrypt.h>
+ #else /* Use OpenSSL's libcrypto */
+ # include <stddef.h>  /* buggy openssl/sha.h wants size_t */
+ # include <openssl/sha.h>
+@@ -205,6 +207,26 @@
+     SHA1Update (&ctx, gi, sizeof (xGlyphInfo));
+     SHA1Update (&ctx, bits, size);
+     SHA1Final (sha1, &ctx);
++#elif defined(HAVE_SHA1_IN_LIBGCRYPT) /* Use libgcrypt for SHA1 */
++    static int init;
++    gcry_md_hd_t h;
++    gcry_error_t err;
++
++    if (!init) {
++	if (!gcry_check_version(NULL))
++	    return BadAlloc;
++	gcry_control(GCRYCTL_DISABLE_SECMEM, 0);
++	gcry_control(GCRYCTL_INITIALIZATION_FINISHED, 0);
++	init = 1;
++    }
++
++    err = gcry_md_open(&h, GCRY_MD_SHA1, 0);
++    if (err)
++	return BadAlloc;
++    gcry_md_write(h, gi, sizeof (xGlyphInfo));
++    gcry_md_write(h, bits, size);
++    memcpy(sha1, gcry_md_read(h, GCRY_MD_SHA1), 20);
++    gcry_md_close(h);
+ #else /* Use OpenSSL's libcrypto */
+     SHA_CTX ctx;
+     int success;
diff --git a/debian/patches/Add-libgcrypt-as-an-option-for-sha1.diff b/debian/patches/Add-libgcrypt-as-an-option-for-sha1.diff
deleted file mode 100644
index 0e91795..0000000
--- a/debian/patches/Add-libgcrypt-as-an-option-for-sha1.diff
+++ /dev/null
@@ -1,84 +0,0 @@
-From 6c6bbefdcf8a41dc71f9cbeca7ce972e2661fade Mon Sep 17 00:00:00 2001
-From: Julien Cristau <jcristau@debian.org>
-Date: Thu, 2 Apr 2009 02:34:49 +0200
-Subject: [PATCH] Add libgcrypt as an option for sha1
-
-Included upstream in 1.7.99.x in a different way:
-commit a60e676f1fd243c78859440b87652f523d3f2ec1
----
- configure.ac            |    6 ++++++
- include/dix-config.h.in |    3 +++
- render/glyph.c          |   12 ++++++++++++
- 3 files changed, 21 insertions(+), 0 deletions(-)
-
-Index: xorg-server/configure.ac
-===================================================================
---- xorg-server.orig/configure.ac
-+++ xorg-server/configure.ac
-@@ -1274,6 +1274,12 @@
-             [Use libmd SHA1 functions instead of OpenSSL libcrypto])])
- fi
- 
-+if test "x$SHA1_LIB" = "x"; then
-+  AC_CHECK_LIB([gcrypt], [gcry_md_open], [SHA1_LIB="-lgcrypt"
-+            AC_DEFINE([HAVE_SHA1_IN_LIBGCRYPT], [1],
-+            [Use libgcrypt SHA1 functions instead of OpenSSL libcrypto])])
-+fi
-+
- if test "x$SHA1_LIB" = "x" ; then
-   PKG_CHECK_EXISTS([OPENSSL], [openssl], [HAVE_OPENSSL_PKC=yes],
-                     [HAVE_OPENSSL_PKC=no])
-Index: xorg-server/include/dix-config.h.in
-===================================================================
---- xorg-server.orig/include/dix-config.h.in
-+++ xorg-server/include/dix-config.h.in
-@@ -163,6 +163,9 @@
- /* Define to use libmd SHA1 functions instead of OpenSSL libcrypto */
- #undef HAVE_SHA1_IN_LIBMD
- 
-+/* Define to use libgcrypt SHA1 functions instead of OpenSSL libcrypto */
-+#undef HAVE_SHA1_IN_LIBGCRYPT
-+
- /* Define to 1 if you have the `shmctl64' function. */
- #undef HAVE_SHMCTL64
- 
-Index: xorg-server/render/glyph.c
-===================================================================
---- xorg-server.orig/render/glyph.c
-+++ xorg-server/render/glyph.c
-@@ -28,6 +28,8 @@
- 
- #ifdef HAVE_SHA1_IN_LIBMD /* Use libmd for SHA1 */
- # include <sha1.h>
-+#elif defined(HAVE_SHA1_IN_LIBGCRYPT)
-+# include <gcrypt.h>
- #else /* Use OpenSSL's libcrypto */
- # include <stddef.h>  /* buggy openssl/sha.h wants size_t */
- # include <openssl/sha.h>
-@@ -205,6 +207,26 @@
-     SHA1Update (&ctx, gi, sizeof (xGlyphInfo));
-     SHA1Update (&ctx, bits, size);
-     SHA1Final (sha1, &ctx);
-+#elif defined(HAVE_SHA1_IN_LIBGCRYPT) /* Use libgcrypt for SHA1 */
-+    static int init;
-+    gcry_md_hd_t h;
-+    gcry_error_t err;
-+
-+    if (!init) {
-+	if (!gcry_check_version(NULL))
-+	    return BadAlloc;
-+	gcry_control(GCRYCTL_DISABLE_SECMEM, 0);
-+	gcry_control(GCRYCTL_INITIALIZATION_FINISHED, 0);
-+	init = 1;
-+    }
-+
-+    err = gcry_md_open(&h, GCRY_MD_SHA1, 0);
-+    if (err)
-+	return BadAlloc;
-+    gcry_md_write(h, gi, sizeof (xGlyphInfo));
-+    gcry_md_write(h, bits, size);
-+    memcpy(sha1, gcry_md_read(h, GCRY_MD_SHA1), 20);
-+    gcry_md_close(h);
- #else /* Use OpenSSL's libcrypto */
-     SHA_CTX ctx;
-     int success;
diff --git a/debian/patches/series b/debian/patches/series
index c160671..627584d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,5 @@
+## Patches with a number < 100 are applied in debian.
+## Ubuntu patches start with 100.
 001_fedora_extramodes.patch
+02_Add-libgcrypt-as-an-option-for-sha1.diff
 #13_debian_add_xkbpath_env_variable.diff
-Add-libgcrypt-as-an-option-for-sha1.diff

commit 4c893c06fce09151a08f46fba5918ba58b54ffd8
Author: Julien Cristau <jcristau@debian.org>
Date:   Mon Nov 23 23:00:57 2009 +0100

    Mention upstream commit in sha1 patch

diff --git a/debian/patches/Add-libgcrypt-as-an-option-for-sha1.diff b/debian/patches/Add-libgcrypt-as-an-option-for-sha1.diff
index 6f80251..0e91795 100644
--- a/debian/patches/Add-libgcrypt-as-an-option-for-sha1.diff
+++ b/debian/patches/Add-libgcrypt-as-an-option-for-sha1.diff
@@ -3,6 +3,8 @@ From: Julien Cristau <jcristau@debian.org>
 Date: Thu, 2 Apr 2009 02:34:49 +0200
 Subject: [PATCH] Add libgcrypt as an option for sha1
 
+Included upstream in 1.7.99.x in a different way:
+commit a60e676f1fd243c78859440b87652f523d3f2ec1
 ---
  configure.ac            |    6 ++++++
  include/dix-config.h.in |    3 +++

commit 527e132cb606d78465ee7edf30dfedf7716aada9
Author: Julien Cristau <jcristau@debian.org>
Date:   Mon Nov 23 23:07:58 2009 +0100

    Turn-on-ModeDebug-by-default.patch is obsoleted by the previous cherry-pick

diff --git a/debian/changelog b/debian/changelog
index ec60fb9..ef5e731 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,8 @@ xorg-server (2:1.7.0-2) UNRELEASED; urgency=low
     to allow installation of different versions of the various servers.
   * Add build-dep on libglib2.0-dev, xkb-data and x11-xkb-utils for unit
     tests, and run the tests unless nocheck is in DEB_BUILD_OPTIONS.
+  * Cherry-pick upstream commit to turn ModeDebug on during server startup,
+    replacing our Turn-on-ModeDebug-by-default.patch.
 
  -- Julien Cristau <jcristau@debian.org>  Sun, 04 Oct 2009 17:39:13 +0200
 
diff --git a/debian/patches/Turn-on-ModeDebug-by-default.patch b/debian/patches/Turn-on-ModeDebug-by-default.patch
deleted file mode 100644
index c1d0025..0000000
--- a/debian/patches/Turn-on-ModeDebug-by-default.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From cbaf21a87c207300ab5a1e7de234e03baa0edf80 Mon Sep 17 00:00:00 2001
-From: Julien Cristau <jcristau@debian.org>
-Date: Sun, 8 Mar 2009 22:19:10 +0100
-Subject: [PATCH] Turn on ModeDebug by default
-
----
- hw/xfree86/modes/xf86Crtc.c |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-Index: xorg-server/hw/xfree86/modes/xf86Crtc.c
-===================================================================
---- xorg-server.orig/hw/xfree86/modes/xf86Crtc.c
-+++ xorg-server/hw/xfree86/modes/xf86Crtc.c
-@@ -2356,7 +2356,7 @@
- 			scrn->options,
- 			config->options);
-     config->debug_modes = xf86ReturnOptValBool (config->options,
--						OPTION_MODEDEBUG, FALSE);
-+						OPTION_MODEDEBUG, TRUE);
- 
-     if (scrn->display->virtualX)
- 	width = scrn->display->virtualX;
diff --git a/debian/patches/series b/debian/patches/series
index 8716001..c160671 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
 001_fedora_extramodes.patch
 #13_debian_add_xkbpath_env_variable.diff
-Turn-on-ModeDebug-by-default.patch
 Add-libgcrypt-as-an-option-for-sha1.diff

commit cd192850fc73aa43432e1068503699ebdaa2cb83
Author: Adam Jackson <ajax@redhat.com>
Date:   Mon Nov 23 23:03:20 2009 +0100

    randr: Turn on ModeDebug during server setup
    
    Signed-off-by: Adam Jackson <ajax@redhat.com>
    Signed-off-by: Keith Packard <keithp@keithp.com>
    (cherry picked from commit a5e59230de3abafda9cd9d571cea192897155a14)
    
    Conflicts:
    
    	hw/xfree86/modes/xf86Crtc.c

diff --git a/hw/xfree86/modes/xf86Crtc.c b/hw/xfree86/modes/xf86Crtc.c
index 506fbb9..c8626c8 100644
--- a/hw/xfree86/modes/xf86Crtc.c
+++ b/hw/xfree86/modes/xf86Crtc.c
@@ -1556,6 +1556,8 @@ xf86ProbeOutputModes (ScrnInfoPtr scrn, int maxX, int maxY)
 	int		    max_clock = 0;
 	double		    clock;
 	Bool                add_default_modes = TRUE;
+	Bool		    debug_modes = config->debug_modes ||
+					  xf86Initialising;
 	enum { sync_config, sync_edid, sync_default } sync_source = sync_default;
 	
 	while (output->probed_modes != NULL)
@@ -1725,8 +1727,7 @@ xf86ProbeOutputModes (ScrnInfoPtr scrn, int maxX, int maxY)
 	    if (mode->status == MODE_OK)
 		mode->status = (*output->funcs->mode_valid)(output, mode);
 	
-	xf86PruneInvalidModes(scrn, &output->probed_modes,
-			      config->debug_modes);
+	xf86PruneInvalidModes(scrn, &output->probed_modes, debug_modes);
 	
 	output->probed_modes = xf86SortModes (output->probed_modes);
 	
@@ -1758,7 +1759,7 @@ xf86ProbeOutputModes (ScrnInfoPtr scrn, int maxX, int maxY)
 	
 	output->initial_rotation = xf86OutputInitialRotation (output);
 
-	if (config->debug_modes) {
+	if (debug_modes) {
 	    if (output->probed_modes != NULL) {
 		xf86DrvMsg(scrn->scrnIndex, X_INFO,
 			   "Printing probed modes for output %s\n",
@@ -1777,7 +1778,7 @@ xf86ProbeOutputModes (ScrnInfoPtr scrn, int maxX, int maxY)
 	    mode->VRefresh = xf86ModeVRefresh(mode);
 	    xf86SetModeCrtc(mode, INTERLACE_HALVE_V);
 
-	    if (config->debug_modes)
+	    if (debug_modes)
 		xf86PrintModeline(scrn->scrnIndex, mode);
 	}
     }
@@ -2909,6 +2910,7 @@ xf86OutputSetEDID (xf86OutputPtr output, xf86MonPtr edid_mon)
     ScrnInfoPtr		scrn = output->scrn;
     xf86CrtcConfigPtr	config = XF86_CRTC_CONFIG_PTR(scrn);
     int			i;
+    Bool		debug_modes = config->debug_modes || xf86Initialising;
 #ifdef RANDR_12_INTERFACE
     int			size;
 #endif
@@ -2918,7 +2920,7 @@ xf86OutputSetEDID (xf86OutputPtr output, xf86MonPtr edid_mon)
     
     output->MonInfo = edid_mon;
 
-    if (config->debug_modes) {
+    if (debug_modes) {
 	xf86DrvMsg(scrn->scrnIndex, X_INFO, "EDID for output %s\n",
 		   output->name);
 	xf86PrintEDID(edid_mon);


Reply to: