packages: xorg-xserver-server/xorg-xserver-server-builtin-SHA1.patch, xorg-...

arekm arekm at pld-linux.org
Tue Apr 10 09:43:34 CEST 2012


Author: arekm                        Date: Tue Apr 10 07:43:34 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 1.12.0.902; needs to be checked by nvidia users if patch6 is still needed with recent drivers

---- Files affected:
packages/xorg-xserver-server:
   xorg-xserver-server-builtin-SHA1.patch (1.5 -> 1.6) , xorg-xserver-server-xwrapper.patch (1.4 -> 1.5) , xorg-xserver-server.spec (1.306 -> 1.307) , xorg-xserver-server-fb-size.patch (1.1 -> NONE)  (REMOVED)

---- Diffs:

================================================================
Index: packages/xorg-xserver-server/xorg-xserver-server-builtin-SHA1.patch
diff -u packages/xorg-xserver-server/xorg-xserver-server-builtin-SHA1.patch:1.5 packages/xorg-xserver-server/xorg-xserver-server-builtin-SHA1.patch:1.6
--- packages/xorg-xserver-server/xorg-xserver-server-builtin-SHA1.patch:1.5	Tue Dec  7 20:36:27 2010
+++ packages/xorg-xserver-server/xorg-xserver-server-builtin-SHA1.patch	Tue Apr 10 09:43:28 2012
@@ -86,12 +86,9 @@
  	xstrans.c	\
  	xprintf.c	\
  	$(XORG_SRCS)
-diff --git a/os/xsha1.c b/os/xsha1.c
-deleted file mode 100644
-index 355862f..0000000
---- a/os/xsha1.c
-+++ /dev/null
-@@ -1,168 +0,0 @@
+--- a/os/xsha1.c	2012-03-30 04:57:28.000000000 +0200
++++ /dev/null	2011-06-01 08:46:43.490033582 +0200
+@@ -1,195 +0,0 @@
 -#ifdef HAVE_DIX_CONFIG_H
 -#include <dix-config.h>
 -#endif
@@ -100,67 +97,80 @@
 -#include "xsha1.h"
 -
 -#if defined(HAVE_SHA1_IN_LIBMD)  /* Use libmd for SHA1 */ \
--	|| defined(HAVE_SHA1_IN_LIBC) /* Use libc for SHA1 */
+-	|| defined(HAVE_SHA1_IN_LIBC)   /* Use libc for SHA1 */
 -
--# include <sha1.h>
+-#include <sha1.h>
 -
--void *x_sha1_init(void)
+-void *
+-x_sha1_init(void)
 -{
 -    SHA1_CTX *ctx = malloc(sizeof(*ctx));
+-
 -    if (!ctx)
 -        return NULL;
 -    SHA1Init(ctx);
 -    return ctx;
 -}
 -
--int x_sha1_update(void *ctx, void *data, int size)
+-int
+-x_sha1_update(void *ctx, void *data, int size)
 -{
 -    SHA1_CTX *sha1_ctx = ctx;
+-
 -    SHA1Update(sha1_ctx, data, size);
 -    return 1;
 -}
 -
--int x_sha1_final(void *ctx, unsigned char result[20])
+-int
+-x_sha1_final(void *ctx, unsigned char result[20])
 -{
 -    SHA1_CTX *sha1_ctx = ctx;
+-
 -    SHA1Final(result, sha1_ctx);
 -    free(sha1_ctx);
 -    return 1;
 -}
 -
--#elif defined(HAVE_SHA1_IN_COMMONCRYPTO) /* Use CommonCrypto for SHA1 */
+-#elif defined(HAVE_SHA1_IN_COMMONCRYPTO)        /* Use CommonCrypto for SHA1 */
 -
 -#include <CommonCrypto/CommonDigest.h>
 -
--void *x_sha1_init(void)
+-void *
+-x_sha1_init(void)
 -{
 -    CC_SHA1_CTX *ctx = malloc(sizeof(*ctx));
+-
 -    if (!ctx)
 -        return NULL;
 -    CC_SHA1_Init(ctx);
 -    return ctx;
 -}
 -
--int x_sha1_update(void *ctx, void *data, int size)
+-int
+-x_sha1_update(void *ctx, void *data, int size)
 -{
 -    CC_SHA1_CTX *sha1_ctx = ctx;
+-
 -    CC_SHA1_Update(sha1_ctx, data, size);
 -    return 1;
 -}
 -
--int x_sha1_final(void *ctx, unsigned char result[20])
+-int
+-x_sha1_final(void *ctx, unsigned char result[20])
 -{
 -    CC_SHA1_CTX *sha1_ctx = ctx;
+-
 -    CC_SHA1_Final(result, sha1_ctx);
 -    free(sha1_ctx);
 -    return 1;
 -}
 -
--#elif defined(HAVE_SHA1_IN_LIBGCRYPT) /* Use libgcrypt for SHA1 */
+-#elif defined(HAVE_SHA1_IN_LIBGCRYPT)   /* Use libgcrypt for SHA1 */
 -
--# include <gcrypt.h>
+-#include <gcrypt.h>
 -
--void *x_sha1_init(void)
+-void *
+-x_sha1_init(void)
 -{
 -    static int init;
 -    gcry_md_hd_t h;
@@ -180,56 +190,66 @@
 -    return h;
 -}
 -
--int x_sha1_update(void *ctx, void *data, int size)
+-int
+-x_sha1_update(void *ctx, void *data, int size)
 -{
 -    gcry_md_hd_t h = ctx;
+-
 -    gcry_md_write(h, data, size);
 -    return 1;
 -}
 -
--int x_sha1_final(void *ctx, unsigned char result[20])
+-int
+-x_sha1_final(void *ctx, unsigned char result[20])
 -{
 -    gcry_md_hd_t h = ctx;
+-
 -    memcpy(result, gcry_md_read(h, GCRY_MD_SHA1), 20);
 -    gcry_md_close(h);
 -    return 1;
 -}
 -
--#elif defined(HAVE_SHA1_IN_LIBSHA1) /* Use libsha1 */
+-#elif defined(HAVE_SHA1_IN_LIBSHA1)     /* Use libsha1 */
 -
--# include <libsha1.h>
+-#include <libsha1.h>
 -
--void *x_sha1_init(void)
+-void *
+-x_sha1_init(void)
 -{
 -    sha1_ctx *ctx = malloc(sizeof(*ctx));
--    if(!ctx)
+-
+-    if (!ctx)
 -        return NULL;
 -    sha1_begin(ctx);
 -    return ctx;
 -}
 -
--int x_sha1_update(void *ctx, void *data, int size)
+-int
+-x_sha1_update(void *ctx, void *data, int size)
 -{
 -    sha1_hash(data, size, ctx);
 -    return 1;
 -}
 -
--int x_sha1_final(void *ctx, unsigned char result[20])
+-int
+-x_sha1_final(void *ctx, unsigned char result[20])
 -{
 -    sha1_end(result, ctx);
 -    free(ctx);
 -    return 1;
 -}
 -
--#else /* Use OpenSSL's libcrypto */
+-#else                           /* Use OpenSSL's libcrypto */
 -
--# include <stddef.h>  /* buggy openssl/sha.h wants size_t */
--# include <openssl/sha.h>
+-#include <stddef.h>             /* buggy openssl/sha.h wants size_t */
+-#include <openssl/sha.h>
 -
--void *x_sha1_init(void)
+-void *
+-x_sha1_init(void)
 -{
 -    int ret;
 -    SHA_CTX *ctx = malloc(sizeof(*ctx));
+-
 -    if (!ctx)
 -        return NULL;
 -    ret = SHA1_Init(ctx);
@@ -240,20 +260,24 @@
 -    return ctx;
 -}
 -
--int x_sha1_update(void *ctx, void *data, int size)
+-int
+-x_sha1_update(void *ctx, void *data, int size)
 -{
 -    int ret;
 -    SHA_CTX *sha_ctx = ctx;
+-
 -    ret = SHA1_Update(sha_ctx, data, size);
 -    if (!ret)
 -        free(sha_ctx);
 -    return ret;
 -}
 -
--int x_sha1_final(void *ctx, unsigned char result[20])
+-int
+-x_sha1_final(void *ctx, unsigned char result[20])
 -{
 -    int ret;
 -    SHA_CTX *sha_ctx = ctx;
+-
 -    ret = SHA1_Final(result, sha_ctx);
 -    free(sha_ctx);
 -    return ret;
@@ -290,32 +314,30 @@
  #include "misc.h"
  #include "scrnintstr.h"
  #include "os.h"
-@@ -193,21 +192,13 @@ HashGlyph (xGlyphInfo    *gi,
- 	   unsigned long size,
- 	   unsigned char sha1[20])
+@@ -167,21 +167,13 @@ int
+ HashGlyph(xGlyphInfo * gi,
+           CARD8 *bits, unsigned long size, unsigned char sha1[20])
  {
 -    void *ctx = x_sha1_init();
 -    int success;
--
++    SHA1_CTX ctx;
+ 
 -    if (!ctx)
--	return BadAlloc;
--
+-        return BadAlloc;
++    SHA1Init (&ctx);
++    SHA1Update (&ctx, gi, sizeof (xGlyphInfo));
++    SHA1Update (&ctx, bits, size);
++    SHA1Final (sha1, &ctx);
+ 
 -    success = x_sha1_update(ctx, gi, sizeof(xGlyphInfo));
 -    if (!success)
--	return BadAlloc;
+-        return BadAlloc;
 -    success = x_sha1_update(ctx, bits, size);
 -    if (!success)
--	return BadAlloc;
+-        return BadAlloc;
 -    success = x_sha1_final(ctx, sha1);
 -    if (!success)
--	return BadAlloc;
-+    SHA1_CTX ctx;
-+
-+    SHA1Init (&ctx);
-+    SHA1Update (&ctx, gi, sizeof (xGlyphInfo));
-+    SHA1Update (&ctx, bits, size);
-+    SHA1Final (sha1, &ctx);
-+
+-        return BadAlloc;
      return Success;
  }
  

================================================================
Index: packages/xorg-xserver-server/xorg-xserver-server-xwrapper.patch
diff -u packages/xorg-xserver-server/xorg-xserver-server-xwrapper.patch:1.4 packages/xorg-xserver-server/xorg-xserver-server-xwrapper.patch:1.5
--- packages/xorg-xserver-server/xorg-xserver-server-xwrapper.patch:1.4	Thu May 15 15:22:15 2008
+++ packages/xorg-xserver-server/xorg-xserver-server-xwrapper.patch	Tue Apr 10 09:43:28 2012
@@ -1,18 +1,18 @@
 --- hw/xfree86/os-support/linux/lnx_init.c	2005-08-26 09:35:55.000000000 +0200
 +++ hw/xfree86/os-support/linux/lnx_init.c	2005-12-22 10:52:06.630963000 +0100
-@@ -104,8 +104,10 @@
+@@ -82,8 +82,10 @@
  
- 	/* when KeepTty check if we're run with euid==0 */
- 	if (KeepTty && geteuid() != 0) 
--	    FatalError("xf86OpenConsole:"
--		       " Server must be suid root for option \"KeepTTY\"\n");
-+	    FatalError("xf86OpenConsole: Server must be running with root "
-+			    "permissions\n"
-+			    "You should be using Xwrapper to start the server or xdm.\n"
-+			    "We strongly advise against making the server SUID root!\n");
+         /* when KeepTty check if we're run with euid==0 */
+         if (KeepTty && geteuid() != 0)
+-            FatalError("xf86OpenConsole:"
+-                       " Server must be suid root for option \"KeepTTY\"\n");
++            FatalError("xf86OpenConsole: Server must be running with root "
++                           "permissions\n"
++                           "You should be using Xwrapper to start the server or xdm.\n"
++                           "We strongly advise against making the server SUID root!\n");
  
- 	/*
- 	 * setup the virtual terminal manager
+         /*
+          * setup the virtual terminal manager
 --- os/wrapper.c	1970-01-01 01:00:00.000000000 +0100
 +++ os/wrapper.c	2005-12-22 10:50:53.610963000 +0100
 @@ -0,0 +1,304 @@

================================================================
Index: packages/xorg-xserver-server/xorg-xserver-server.spec
diff -u packages/xorg-xserver-server/xorg-xserver-server.spec:1.306 packages/xorg-xserver-server/xorg-xserver-server.spec:1.307
--- packages/xorg-xserver-server/xorg-xserver-server.spec:1.306	Tue Mar 20 19:21:53 2012
+++ packages/xorg-xserver-server/xorg-xserver-server.spec	Tue Apr 10 09:43:28 2012
@@ -24,19 +24,19 @@
 Summary:	X.org server
 Summary(pl.UTF-8):	Serwer X.org
 Name:		xorg-xserver-server
-Version:	1.12.0
-Release:	2
+Version:	1.12.0.902
+Release:	1
 License:	MIT
 Group:		X11/Servers
 Source0:	http://xorg.freedesktop.org/releases/individual/xserver/xorg-server-%{version}.tar.bz2
-# Source0-md5:	3a3c4281f32c8702749e8f129372a355
+# Source0-md5:	edefadc81ab0af5116740bbf2504f850
 Source1:	10-quirks.conf
 Source2:	xserver.pamd
 Source10:	%{name}-Xvfb.init
 Source11:	%{name}-Xvfb.sysconfig
 Patch0:		%{name}-xwrapper.patch
 Patch1:		%{name}-pic-libxf86config.patch
-Patch2:		%{name}-fb-size.patch
+
 Patch3:		%{name}-less-acpi-brokenness.patch
 Patch4:		%{name}-builtin-SHA1.patch
 Patch5:		%{name}-export-GetMaster.patch
@@ -366,11 +366,14 @@
 %setup -q -n xorg-server-%{version}
 %patch0 -p0
 %patch1 -p1
-%patch2 -p1
+
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
-%patch6 -p1
+
+# is this finnaly solved in nvidia drivers?
+# %patch6 -p1
+
 #unfortunately breaks build
 #patch7 -p1
 
@@ -607,6 +610,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.307  2012/04/10 07:43:28  arekm
+- up to 1.12.0.902; needs to be checked by nvidia users if patch6 is still needed with recent drivers
+
 Revision 1.306  2012/03/20 18:21:53  baggins
 - note on commented out patch
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/packages/xorg-xserver-server/xorg-xserver-server-builtin-SHA1.patch?r1=1.5&r2=1.6
    http://cvs.pld-linux.org/packages/xorg-xserver-server/xorg-xserver-server-xwrapper.patch?r1=1.4&r2=1.5
    http://cvs.pld-linux.org/packages/xorg-xserver-server/xorg-xserver-server.spec?r1=1.306&r2=1.307



More information about the pld-cvs-commit mailing list