packages: xorg-xserver-server/xorg-xserver-server-builtin-SHA1.patch, xorg-...
arekm
arekm at pld-linux.org
Thu Jun 17 13:18:23 CEST 2010
Author: arekm Date: Thu Jun 17 11:18:23 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- up to 1.8.99.901; stable 1.8.x on XORG_XSERVER_1_8
---- Files affected:
packages/xorg-xserver-server:
xorg-xserver-server-builtin-SHA1.patch (1.2 -> 1.3) , xorg-xserver-server.spec (1.237 -> 1.238)
---- 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.2 packages/xorg-xserver-server/xorg-xserver-server-builtin-SHA1.patch:1.3
--- packages/xorg-xserver-server/xorg-xserver-server-builtin-SHA1.patch:1.2 Sat May 8 21:53:10 2010
+++ packages/xorg-xserver-server/xorg-xserver-server-builtin-SHA1.patch Thu Jun 17 13:18:17 2010
@@ -105,7 +105,7 @@
- [Use libmd SHA1 functions])
- SHA1_LIBS=-lmd
-fi
--AC_CHECK_LIB([sha1], [sha1_begin], [HAVE_LIBSHA1=yes])
+-PKG_CHECK_MODULES([LIBSHA1], [libsha1], [HAVE_LIBSHA1=yes], [HAVE_LIBSHA1=no])
-if test "x$with_sha1" = x && test "x$HAVE_LIBSHA1" = xyes; then
- with_sha1=libsha1
-fi
@@ -219,7 +219,7 @@
-
-void *x_sha1_init(void)
-{
-- SHA1_CTX *ctx = xalloc(sizeof(*ctx));
+- SHA1_CTX *ctx = malloc(sizeof(*ctx));
- if (!ctx)
- return NULL;
- SHA1Init(ctx);
@@ -237,7 +237,7 @@
-{
- SHA1_CTX *sha1_ctx = ctx;
- SHA1Final(result, sha1_ctx);
-- xfree(sha1_ctx);
+- free(sha1_ctx);
- return 1;
-}
-
@@ -247,7 +247,7 @@
-
-void *x_sha1_init(void)
-{
-- CC_SHA1_CTX *ctx = xalloc(sizeof(*ctx));
+- CC_SHA1_CTX *ctx = malloc(sizeof(*ctx));
- if (!ctx)
- return NULL;
- CC_SHA1_Init(ctx);
@@ -265,7 +265,7 @@
-{
- CC_SHA1_CTX *sha1_ctx = ctx;
- CC_SHA1_Final(result, sha1_ctx);
-- xfree(sha1_ctx);
+- free(sha1_ctx);
- return 1;
-}
-
@@ -314,7 +314,7 @@
-
-void *x_sha1_init(void)
-{
-- sha1_ctx *ctx = xalloc(sizeof(*ctx));
+- sha1_ctx *ctx = malloc(sizeof(*ctx));
- if(!ctx)
- return NULL;
- sha1_begin(ctx);
@@ -330,7 +330,7 @@
-int x_sha1_final(void *ctx, unsigned char result[20])
-{
- sha1_end(result, ctx);
-- xfree(ctx);
+- free(ctx);
- return 1;
-}
-
@@ -342,12 +342,12 @@
-void *x_sha1_init(void)
-{
- int ret;
-- SHA_CTX *ctx = xalloc(sizeof(*ctx));
+- SHA_CTX *ctx = malloc(sizeof(*ctx));
- if (!ctx)
- return NULL;
- ret = SHA1_Init(ctx);
- if (!ret) {
-- xfree(ctx);
+- free(ctx);
- return NULL;
- }
- return ctx;
@@ -359,7 +359,7 @@
- SHA_CTX *sha_ctx = ctx;
- ret = SHA1_Update(sha_ctx, data, size);
- if (!ret)
-- xfree(sha_ctx);
+- free(sha_ctx);
- return ret;
-}
-
@@ -368,7 +368,7 @@
- int ret;
- SHA_CTX *sha_ctx = ctx;
- ret = SHA1_Final(result, sha_ctx);
-- xfree(sha_ctx);
+- free(sha_ctx);
- return ret;
-}
-
================================================================
Index: packages/xorg-xserver-server/xorg-xserver-server.spec
diff -u packages/xorg-xserver-server/xorg-xserver-server.spec:1.237 packages/xorg-xserver-server/xorg-xserver-server.spec:1.238
--- packages/xorg-xserver-server/xorg-xserver-server.spec:1.237 Wed Jun 2 06:19:21 2010
+++ packages/xorg-xserver-server/xorg-xserver-server.spec Thu Jun 17 13:18:17 2010
@@ -11,21 +11,21 @@
#
# ABI versions, see hw/xfree86/common/xf86Module.h
%define xorg_xserver_server_ansic_abi 0.4
-%define xorg_xserver_server_extension_abi 3.0
+%define xorg_xserver_server_extension_abi 4.0
%define xorg_xserver_server_font_abi 0.6
-%define xorg_xserver_server_videodrv_abi 7.0
-%define xorg_xserver_server_xinput_abi 9.0
+%define xorg_xserver_server_videodrv_abi 8.0
+%define xorg_xserver_server_xinput_abi 11.0
%define rel 1
Summary: X.org server
Summary(pl.UTF-8): Serwer X.org
Name: xorg-xserver-server
-Version: 1.8.1.901
+Version: 1.8.99.901
Release: %{rel}%{?with_multigl:.mgl}
License: MIT
Group: X11/Servers
Source0: http://xorg.freedesktop.org/releases/individual/xserver/xorg-server-%{version}.tar.bz2
-# Source0-md5: fb5fa2229a4dee151f4525b2f5747c8c
+# Source0-md5: ebc580fcf4ad9fb03ab9119525467f4a
Source1: 10-quirks.conf
Source2: xserver.pamd
Patch0: %{name}-xwrapper.patch
@@ -461,8 +461,6 @@
%attr(755,root,root) %{_libdir}/xorg/modules/extensions/libextmod.so
%{?with_record:%attr(755,root,root) %{_libdir}/xorg/modules/extensions/librecord.so}
%dir %{_libdir}/xorg/modules/input
-%dir %{_libdir}/xorg/modules/linux
-%attr(755,root,root) %{_libdir}/xorg/modules/linux/libfbdevhw.so
%dir %{_libdir}/xorg/modules/multimedia
%attr(755,root,root) %{_libdir}/xorg/modules/multimedia/*.so
%attr(755,root,root) %{_libdir}/xorg/modules/lib*.so
@@ -550,6 +548,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.238 2010/06/17 11:18:17 arekm
+- up to 1.8.99.901; stable 1.8.x on XORG_XSERVER_1_8
+
Revision 1.237 2010/06/02 04:19:21 arekm
- up to 1.8.1.901
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/xorg-xserver-server/xorg-xserver-server-builtin-SHA1.patch?r1=1.2&r2=1.3&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/xorg-xserver-server/xorg-xserver-server.spec?r1=1.237&r2=1.238&f=u
More information about the pld-cvs-commit
mailing list