Hello community,
here is the log from the commit of package xorg-x11-server for openSUSE:Factory checked in at 2014-04-26 19:35:02
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/xorg-x11-server (Old)
and /work/SRC/openSUSE:Factory/.xorg-x11-server.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xorg-x11-server"
Changes:
--------
--- /work/SRC/openSUSE:Factory/xorg-x11-server/xorg-x11-server.changes 2014-04-11 14:40:36.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.xorg-x11-server.new/xorg-x11-server.changes 2014-04-26 19:35:03.000000000 +0200
@@ -1,0 +2,5 @@
+Fri Apr 25 01:36:46 UTC 2014 - tobias.johannes.klausmann(a)mni.thm.de
+
+- Add missing BuildRequires
+
+-------------------------------------------------------------------
Old:
----
xorg-server-1.15.99.902.tar.bz2
New:
----
xorg-server-1.15.99.902.2.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xorg-x11-server.spec ++++++
--- /var/tmp/diff_new_pack.S18NVP/_old 2014-04-26 19:35:04.000000000 +0200
+++ /var/tmp/diff_new_pack.S18NVP/_new 2014-04-26 19:35:04.000000000 +0200
@@ -18,7 +18,7 @@
Name: xorg-x11-server
-%define dirsuffix 1.15.99.902
+%define dirsuffix 1.15.99.902.2
Summary: X
License: MIT
@@ -41,8 +41,11 @@
BuildRequires: libtool
BuildRequires: pkgconfig
BuildRequires: pkgconfig(bigreqsproto) >= 1.1.0
+BuildRequires: pkgconfig(compositeproto)
BuildRequires: pkgconfig(damageproto) >= 1.1
BuildRequires: pkgconfig(dmx) >= 1.0.99.1
+BuildRequires: pkgconfig(dri2proto)
+BuildRequires: pkgconfig(dri3proto)
BuildRequires: pkgconfig(epoxy) >= 1.1
BuildRequires: pkgconfig(fixesproto) >= 4.1
BuildRequires: pkgconfig(fontconfig)
@@ -50,6 +53,7 @@
BuildRequires: pkgconfig(fontsproto)
BuildRequires: pkgconfig(fontutil)
BuildRequires: pkgconfig(freetype2)
+BuildRequires: pkgconfig(glproto)
BuildRequires: pkgconfig(ice)
BuildRequires: pkgconfig(inputproto) >= 1.9.99.902
BuildRequires: pkgconfig(kbproto) >= 1.0.3
@@ -57,8 +61,11 @@
BuildRequires: pkgconfig(openssl)
BuildRequires: pkgconfig(pciaccess) >= 0.8.0
BuildRequires: pkgconfig(pixman-1) >= 0.24
+BuildRequires: pkgconfig(presentproto)
BuildRequires: pkgconfig(randrproto) >= 1.2.99.3
BuildRequires: pkgconfig(renderproto) >= 0.11
+BuildRequires: pkgconfig(resourceproto)
+BuildRequires: pkgconfig(scrnsaverproto)
BuildRequires: pkgconfig(sm)
BuildRequires: pkgconfig(x11)
BuildRequires: pkgconfig(xau)
@@ -71,11 +78,14 @@
BuildRequires: pkgconfig(xdmcp)
BuildRequires: pkgconfig(xext) >= 1.0.99.4
BuildRequires: pkgconfig(xextproto) >= 7.1.99
+BuildRequires: pkgconfig(xf86driproto)
BuildRequires: pkgconfig(xfixes)
BuildRequires: pkgconfig(xfont) >= 1.4.2
BuildRequires: pkgconfig(xi) >= 1.2.99.1
+BuildRequires: pkgconfig(xineramaproto)
BuildRequires: pkgconfig(xkbfile)
BuildRequires: pkgconfig(xmu)
+BuildRequires: pkgconfig(xorg-macros)
BuildRequires: pkgconfig(xp)
BuildRequires: pkgconfig(xpm)
BuildRequires: pkgconfig(xprintutil)
@@ -163,7 +173,6 @@
%package sdk
Summary: X
Group: System/Libraries
-Requires: xorg-x11-proto-devel
Requires: xorg-x11-server
Requires: pkgconfig(fontconfig)
Requires: pkgconfig(fontenc)
++++++ xorg-server-1.15.99.902.tar.bz2 -> xorg-server-1.15.99.902.2.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorg-server-1.15.99.902/configure.ac new/xorg-server-1.15.99.902.2/configure.ac
--- old/xorg-server-1.15.99.902/configure.ac 2014-04-08 23:25:18.000000000 +0200
+++ new/xorg-server-1.15.99.902.2/configure.ac 2014-04-19 01:30:18.000000000 +0200
@@ -629,7 +629,7 @@
dnl DDXes.
AC_ARG_ENABLE(xorg, AS_HELP_STRING([--enable-xorg], [Build Xorg server (default: auto)]), [XORG=$enableval], [XORG=auto])
-AC_ARG_ENABLE(dmx, AS_HELP_STRING([--enable-dmx], [Build DMX server (default: auto)]), [DMX=$enableval], [DMX=no])
+AC_ARG_ENABLE(dmx, AS_HELP_STRING([--enable-dmx], [Build DMX server (default: no)]), [DMX=$enableval], [DMX=no])
AC_ARG_ENABLE(xvfb, AS_HELP_STRING([--enable-xvfb], [Build Xvfb server (default: yes)]), [XVFB=$enableval], [XVFB=yes])
AC_ARG_ENABLE(xnest, AS_HELP_STRING([--enable-xnest], [Build Xnest server (default: auto)]), [XNEST=$enableval], [XNEST=auto])
AC_ARG_ENABLE(xquartz, AS_HELP_STRING([--enable-xquartz], [Build Xquartz server for OS-X (default: auto)]), [XQUARTZ=$enableval], [XQUARTZ=auto])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorg-server-1.15.99.902/glamor/glamor_fbo.c new/xorg-server-1.15.99.902.2/glamor/glamor_fbo.c
--- old/xorg-server-1.15.99.902/glamor/glamor_fbo.c 2014-04-08 23:25:18.000000000 +0200
+++ new/xorg-server-1.15.99.902.2/glamor/glamor_fbo.c 2014-04-19 01:30:18.000000000 +0200
@@ -367,10 +367,11 @@
if (flag == GLAMOR_CREATE_PIXMAP_MAP)
goto no_tex;
- if (flag == GLAMOR_CREATE_PIXMAP_FIXUP)
- cache_flag = GLAMOR_CACHE_EXACT_SIZE;
- else
- cache_flag = 0;
+ /* Tiling from textures requires exact pixmap sizes. As we don't
+ * know which pixmaps will be used as tiles, just allocate
+ * everything at the requested size
+ */
+ cache_flag = GLAMOR_CACHE_EXACT_SIZE;
fbo = glamor_pixmap_fbo_cache_get(glamor_priv, w, h, format, cache_flag);
if (fbo)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorg-server-1.15.99.902/hw/kdrive/linux/linux.c new/xorg-server-1.15.99.902.2/hw/kdrive/linux/linux.c
--- old/xorg-server-1.15.99.902/hw/kdrive/linux/linux.c 2014-04-08 23:25:18.000000000 +0200
+++ new/xorg-server-1.15.99.902.2/hw/kdrive/linux/linux.c 2014-04-19 01:30:18.000000000 +0200
@@ -68,13 +68,16 @@
struct stat st;
__uid_t u;
__gid_t g;
+ int r;
if (stat(file, &st) < 0)
return;
u = getuid();
g = getgid();
- if (st.st_uid != u || st.st_gid != g)
- chown(file, u, g);
+ if (st.st_uid != u || st.st_gid != g) {
+ r = chown(file, u, g);
+ (void) r;
+ }
}
static int
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorg-server-1.15.99.902/hw/kdrive/src/kdrive.c new/xorg-server-1.15.99.902.2/hw/kdrive/src/kdrive.c
--- old/xorg-server-1.15.99.902/hw/kdrive/src/kdrive.c 2014-04-08 23:25:18.000000000 +0200
+++ new/xorg-server-1.15.99.902.2/hw/kdrive/src/kdrive.c 2014-04-19 01:30:18.000000000 +0200
@@ -118,10 +118,17 @@
{
if (kdSwitchCmd) {
char *command;
+ int ret;
if (asprintf(&command, "%s %s", kdSwitchCmd, reason) == -1)
return;
- system(command);
+
+ /* Ignore the return value from system; I'm not sure
+ * there's anything more useful to be done when
+ * it fails
+ */
+ ret = system(command);
+ (void) ret;
free(command);
}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorg-server-1.15.99.902/hw/xfree86/.gitignore new/xorg-server-1.15.99.902.2/hw/xfree86/.gitignore
--- old/xorg-server-1.15.99.902/hw/xfree86/.gitignore 2014-04-08 23:25:18.000000000 +0200
+++ new/xorg-server-1.15.99.902.2/hw/xfree86/.gitignore 2014-04-19 01:30:18.000000000 +0200
@@ -1,4 +1,5 @@
Xorg
+Xorg.wrap
Xorg.sh
xorg.conf.example
sdksyms.c
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorg-server-1.15.99.902/hw/xfree86/dri/dri.c new/xorg-server-1.15.99.902.2/hw/xfree86/dri/dri.c
--- old/xorg-server-1.15.99.902/hw/xfree86/dri/dri.c 2014-04-08 23:25:18.000000000 +0200
+++ new/xorg-server-1.15.99.902.2/hw/xfree86/dri/dri.c 2014-04-19 01:30:18.000000000 +0200
@@ -177,19 +177,15 @@
memset(&tmp, 0, sizeof(tmp));
/* Check the DRM lib version.
- * drmGetLibVersion was not supported in version 1.0, so check for
- * symbol first to avoid possible crash or hang.
*/
drmlibmajor = 1;
drmlibminor = 0;
- if (xf86LoaderCheckSymbol("drmGetLibVersion")) {
- drmlibv = drmGetLibVersion(-1);
- if (drmlibv != NULL) {
- drmlibmajor = drmlibv->version_major;
- drmlibminor = drmlibv->version_minor;
- drmFreeVersion(drmlibv);
- }
+ drmlibv = drmGetLibVersion(-1);
+ if (drmlibv != NULL) {
+ drmlibmajor = drmlibv->version_major;
+ drmlibminor = drmlibv->version_minor;
+ drmFreeVersion(drmlibv);
}
/* Check if the libdrm can handle falling back to loading based on name
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorg-server-1.15.99.902/hw/xfree86/man/Makefile.am new/xorg-server-1.15.99.902.2/hw/xfree86/man/Makefile.am
--- old/xorg-server-1.15.99.902/hw/xfree86/man/Makefile.am 2014-04-08 23:25:18.000000000 +0200
+++ new/xorg-server-1.15.99.902.2/hw/xfree86/man/Makefile.am 2014-04-19 01:30:18.000000000 +0200
@@ -5,4 +5,6 @@
if SUID_WRAPPER
appman_PRE += Xorg.wrap.man
fileman_PRE += Xwrapper.config.man
+else
+EXTRA_DIST += Xorg.wrap.man Xwrapper.config.man
endif
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorg-server-1.15.99.902/hw/xfree86/man/Xorg.wrap.man new/xorg-server-1.15.99.902.2/hw/xfree86/man/Xorg.wrap.man
--- old/xorg-server-1.15.99.902/hw/xfree86/man/Xorg.wrap.man 2014-04-08 23:25:18.000000000 +0200
+++ new/xorg-server-1.15.99.902.2/hw/xfree86/man/Xorg.wrap.man 2014-04-19 01:30:18.000000000 +0200
@@ -1,4 +1,4 @@
-.\" Xwrapper.wrap.1
+.\" Xwrapper.wrap.__appmansuffix__
.\"
.\" Copyright 2014 Red Hat, Inc.
.\"
@@ -26,7 +26,7 @@
.\"
.\" shorthand for double quote that works everywhere.
.ds q \N'34'
-.TH Xorg.wrap 1 __xorgversion__
+.TH Xorg.wrap __appmansuffix__ __xorgversion__
.SH NAME
Xorg.wrap \- Xorg X server binary wrapper
.SH DESCRIPTION
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorg-server-1.15.99.902/hw/xfree86/man/Xwrapper.config.man new/xorg-server-1.15.99.902.2/hw/xfree86/man/Xwrapper.config.man
--- old/xorg-server-1.15.99.902/hw/xfree86/man/Xwrapper.config.man 2014-04-08 23:25:18.000000000 +0200
+++ new/xorg-server-1.15.99.902.2/hw/xfree86/man/Xwrapper.config.man 2014-04-19 01:30:18.000000000 +0200
@@ -1 +1 @@
-.so man1/Xorg.wrap.1
+.so man__appmansuffix__/Xorg.wrap.__appmansuffix__
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorg-server-1.15.99.902/hw/xfree86/xorg-wrapper.c new/xorg-server-1.15.99.902.2/hw/xfree86/xorg-wrapper.c
--- old/xorg-server-1.15.99.902/hw/xfree86/xorg-wrapper.c 2014-04-08 23:25:18.000000000 +0200
+++ new/xorg-server-1.15.99.902.2/hw/xfree86/xorg-wrapper.c 2014-04-19 01:30:18.000000000 +0200
@@ -25,6 +25,7 @@
#include "dix-config.h"
+#include <errno.h>
#include <fcntl.h>
#include <limits.h>
#include <stdint.h>
@@ -34,12 +35,17 @@
#include <sys/ioctl.h>
#include <sys/stat.h>
#include <sys/types.h>
+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
+#include <sys/consio.h>
+#endif
#include <unistd.h>
-#include <drm/drm.h>
+#include <drm.h>
#include <xf86drm.h> /* For DRM_DEV_NAME */
#define CONFIG_FILE SYSCONFDIR "/X11/Xwrapper.config"
+static const char *progname;
+
enum { ROOT_ONLY, CONSOLE_ONLY, ANYBODY };
/* KISS non locale / LANG parsing isspace version */
@@ -88,18 +94,21 @@
/* Split in a key + value pair */
equals = strchr(stripped, '=');
if (!equals) {
- fprintf(stderr, "Syntax error at %s line %d\n", CONFIG_FILE, line);
+ fprintf(stderr, "%s: Syntax error at %s line %d\n", progname,
+ CONFIG_FILE, line);
exit(1);
}
*equals = 0;
key = strip(stripped); /* To remove trailing whitespace from key */
value = strip(equals + 1); /* To remove leading whitespace from val */
if (!key[0]) {
- fprintf(stderr, "Missing key at %s line %d\n", CONFIG_FILE, line);
+ fprintf(stderr, "%s: Missing key at %s line %d\n", progname,
+ CONFIG_FILE, line);
exit(1);
}
if (!value[0]) {
- fprintf(stderr, "Missing value at %s line %d\n", CONFIG_FILE, line);
+ fprintf(stderr, "%s: Missing value at %s line %d\n", progname,
+ CONFIG_FILE, line);
exit(1);
}
@@ -113,8 +122,8 @@
*allowed = ANYBODY;
else {
fprintf(stderr,
- "Invalid value '%s' for 'allowed_users' at %s line %d\n",
- value, CONFIG_FILE, line);
+ "%s: Invalid value '%s' for 'allowed_users' at %s line %d\n",
+ progname, value, CONFIG_FILE, line);
exit(1);
}
}
@@ -127,8 +136,8 @@
*needs_root_rights = -1;
else {
fprintf(stderr,
- "Invalid value '%s' for 'needs_root_rights' at %s line %d\n",
- value, CONFIG_FILE, line);
+ "%s: Invalid value '%s' for 'needs_root_rights' at %s line %d\n",
+ progname, value, CONFIG_FILE, line);
exit(1);
}
}
@@ -136,18 +145,45 @@
/* Backward compatibility with older Debian Xwrapper, ignore */
}
else {
- fprintf(stderr, "Invalid key '%s' at %s line %d\n", key,
- CONFIG_FILE, line);
+ fprintf(stderr, "%s: Invalid key '%s' at %s line %d\n", key,
+ progname, CONFIG_FILE, line);
exit(1);
}
}
fclose(f);
}
+static int on_console(int fd)
+{
+#if defined(__linux__)
+ struct stat st;
+ int r;
+
+ r = fstat(fd, &st);
+ if (r == 0 && S_ISCHR(st.st_mode) && major(st.st_rdev) == 4)
+ return 1;
+#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
+ int idx;
+
+ if (ioctl(fd, VT_GETINDEX, &idx) != -1)
+ return 1;
+#else
+#warning This program needs porting to your kernel.
+ static int seen;
+
+ if (!seen) {
+ fprintf(stderr, "%s: Unable to determine if running on a console\n",
+ progname);
+ seen = 1;
+ }
+#endif
+
+ return 0;
+}
+
int main(int argc, char *argv[])
{
struct drm_mode_card_res res;
- struct stat st;
char buf[PATH_MAX];
int i, r, fd;
int kms_cards = 0;
@@ -155,6 +191,8 @@
int allowed = CONSOLE_ONLY;
int needs_root_rights = -1;
+ progname = argv[0];
+
parse_config(&allowed, &needs_root_rights);
/* For non root users check if they are allowed to run the X server */
@@ -168,8 +206,7 @@
case CONSOLE_ONLY:
/* Some of stdin / stdout / stderr maybe redirected to a file */
for (i = STDIN_FILENO; i <= STDERR_FILENO; i++) {
- r = fstat(i, &st);
- if (r == 0 && S_ISCHR(st.st_mode) && major(st.st_rdev) == 4)
+ if (on_console(i))
break;
}
if (i > STDERR_FILENO) {
@@ -207,11 +244,13 @@
uid_t realuid = getuid();
if (setresgid(-1, realgid, realgid) != 0) {
- perror("Could not drop setgid privileges");
+ fprintf(stderr, "%s: Could not drop setgid privileges: %s\n",
+ progname, strerror(errno));
exit(1);
}
if (setresuid(-1, realuid, realuid) != 0) {
- perror("Could not drop setuid privileges");
+ fprintf(stderr, "%s: Could not drop setuid privileges: %s\n",
+ progname, strerror(errno));
exit(1);
}
}
@@ -220,12 +259,14 @@
/* Check if the server is executable by our real uid */
if (access(buf, X_OK) != 0) {
- perror("Missing execute permissions for " SUID_WRAPPER_DIR "Xorg.bin");
+ fprintf(stderr, "%s: Missing execute permissions for %s/Xorg.bin: %s\n",
+ progname, SUID_WRAPPER_DIR, strerror(errno));
exit(1);
}
argv[0] = buf;
(void) execv(argv[0], argv);
- perror("Failed to execute " SUID_WRAPPER_DIR "/Xorg.bin");
+ fprintf(stderr, "%s: Failed to execute %s/Xorg.bin: %s\n",
+ progname, SUID_WRAPPER_DIR, strerror(errno));
exit(1);
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorg-server-1.15.99.902/hw/xquartz/X11Controller.m new/xorg-server-1.15.99.902.2/hw/xquartz/X11Controller.m
--- old/xorg-server-1.15.99.902/hw/xquartz/X11Controller.m 2014-04-08 23:25:18.000000000 +0200
+++ new/xorg-server-1.15.99.902.2/hw/xquartz/X11Controller.m 2014-04-19 01:30:18.000000000 +0200
@@ -942,9 +942,8 @@
/* shutdown the X server, it will exit () for us. */
DarwinSendDDXEvent(kXquartzQuit, 0);
- /* In case it doesn't, exit anyway after a while. */
- remain = 10000000;
- while ((remain = usleep(remain)) > 0) ;
+ /* In case it doesn't, exit anyway after 5s. */
+ [NSThread sleepForTimeInterval:5.0];
exit(1);
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorg-server-1.15.99.902/os/connection.c new/xorg-server-1.15.99.902.2/os/connection.c
--- old/xorg-server-1.15.99.902/os/connection.c 2014-04-08 23:25:18.000000000 +0200
+++ new/xorg-server-1.15.99.902.2/os/connection.c 2014-04-19 01:30:18.000000000 +0200
@@ -353,9 +353,12 @@
{
#if !defined(WIN32)
if (displayfd >= 0) {
- write(displayfd, display, strlen(display));
- write(displayfd, "\n", 1);
+ if (write(displayfd, display, strlen(display)) != strlen(display))
+ FatalError("Cannot write display number to fd %d\n", displayfd);
+ if (write(displayfd, "\n", 1) != 1)
+ FatalError("Cannot write display number to fd %d\n", displayfd);
close(displayfd);
+ displayfd = -1;
}
if (RunFromSmartParent) {
if (ParentProcess > 1) {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorg-server-1.15.99.902/os/log.c new/xorg-server-1.15.99.902.2/os/log.c
--- old/xorg-server-1.15.99.902/os/log.c 2014-04-08 23:25:18.000000000 +0200
+++ new/xorg-server-1.15.99.902.2/os/log.c 2014-04-19 01:30:18.000000000 +0200
@@ -491,13 +491,14 @@
LogSWrite(int verb, const char *buf, size_t len, Bool end_line)
{
static Bool newline = TRUE;
+ int ret;
if (verb < 0 || logVerbosity >= verb)
- write(2, buf, len);
+ ret = write(2, buf, len);
if (verb < 0 || logFileVerbosity >= verb) {
if (inSignalContext && logFileFd >= 0) {
- write(logFileFd, buf, len);
+ ret = write(logFileFd, buf, len);
#ifndef WIN32
if (logFlush && logSync)
fsync(logFileFd);
@@ -529,6 +530,11 @@
bufferPos += len;
}
}
+
+ /* There's no place to log an error message if the log write
+ * fails...
+ */
+ (void) ret;
}
void
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorg-server-1.15.99.902/os/utils.c new/xorg-server-1.15.99.902.2/os/utils.c
--- old/xorg-server-1.15.99.902/os/utils.c 2014-04-08 23:25:18.000000000 +0200
+++ new/xorg-server-1.15.99.902.2/os/utils.c 2014-04-19 01:30:18.000000000 +0200
@@ -313,7 +313,8 @@
if (lfd < 0)
FatalError("Could not create lock file in %s\n", tmp);
snprintf(pid_str, sizeof(pid_str), "%10ld\n", (long) getpid());
- (void) write(lfd, pid_str, 11);
+ if (write(lfd, pid_str, 11) != 11)
+ FatalError("Could not write pid to lock file in %s\n", tmp);
(void) fchmod(lfd, 0444);
(void) close(lfd);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorg-server-1.15.99.902/test/.gitignore new/xorg-server-1.15.99.902.2/test/.gitignore
--- old/xorg-server-1.15.99.902/test/.gitignore 2014-04-08 23:25:18.000000000 +0200
+++ new/xorg-server-1.15.99.902.2/test/.gitignore 2014-04-19 01:30:18.000000000 +0200
@@ -4,6 +4,7 @@
list
misc
os
+sdksyms.c
string
touch
xfree86
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorg-server-1.15.99.902/test/Makefile.am new/xorg-server-1.15.99.902.2/test/Makefile.am
--- old/xorg-server-1.15.99.902/test/Makefile.am 2014-04-08 23:25:18.000000000 +0200
+++ new/xorg-server-1.15.99.902.2/test/Makefile.am 2014-04-19 01:30:18.000000000 +0200
@@ -41,7 +41,7 @@
libxservertest_la_LIBADD = $(XSERVER_LIBS)
if XORG
-nodist_libxservertest_la_SOURCES = $(top_builddir)/hw/xfree86/sdksyms.c
+nodist_libxservertest_la_SOURCES = sdksyms.c
libxservertest_la_LIBADD += \
$(top_builddir)/hw/xfree86/loader/libloader.la \
$(top_builddir)/hw/xfree86/os-support/libxorgos.la \
@@ -55,6 +55,12 @@
$(top_builddir)/hw/xfree86/dixmods/libxorgxkb.la \
@XORG_LIBS@
+BUILT_SOURCES = sdksyms.c
+CLEANFILES = sdksyms.c
+
+sdksyms.c: $(top_builddir)/hw/xfree86/sdksyms.c
+ $(AM_V_GEN)$(LN_S) $(top_builddir)/hw/xfree86/sdksyms.c
+
if DRI
libxservertest_la_LIBADD += $(top_builddir)/hw/xfree86/dri/libdri.la
endif
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorg-server-1.15.99.902/test/signal-logging.c new/xorg-server-1.15.99.902.2/test/signal-logging.c
--- old/xorg-server-1.15.99.902/test/signal-logging.c 2014-04-08 23:25:18.000000000 +0200
+++ new/xorg-server-1.15.99.902.2/test/signal-logging.c 2014-04-19 01:30:18.000000000 +0200
@@ -178,9 +178,14 @@
LogInit(log_file_path, NULL);
assert(f = fopen(log_file_path, "r"));
-#define read_log_msg(msg) \
- fgets(read_buf, sizeof(read_buf), f); \
- msg = strchr(read_buf, ']') + 2; /* advance past [time.stamp] */
+#define read_log_msg(msg) do { \
+ msg = fgets(read_buf, sizeof(read_buf), f); \
+ assert(msg != NULL); \
+ msg = strchr(read_buf, ']'); \
+ assert(msg != NULL); \
+ assert(strlen(msg) > 2); \
+ msg = msg + 2; /* advance past [time.stamp] */ \
+ } while (0)
/* boring test message */
LogMessageVerbSigSafe(X_ERROR, -1, "test message\n");
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorg-server-1.15.99.902/xkb/xkmread.c new/xorg-server-1.15.99.902.2/xkb/xkmread.c
--- old/xorg-server-1.15.99.902/xkb/xkmread.c 2014-04-08 23:25:18.000000000 +0200
+++ new/xorg-server-1.15.99.902.2/xkb/xkmread.c 2014-04-19 01:30:18.000000000 +0200
@@ -1204,7 +1204,8 @@
}
return 0;
}
- fread(file_info, SIZEOF(xkmFileInfo), 1, file);
+ if (fread(file_info, SIZEOF(xkmFileInfo), 1, file) != 1)
+ return 0;
size_toc = file_info->num_toc;
if (size_toc > max_toc) {
DebugF("Warning! Too many TOC entries; last %d ignored\n",
@@ -1212,7 +1213,8 @@
size_toc = max_toc;
}
for (i = 0; i < size_toc; i++) {
- fread(&toc[i], SIZEOF(xkmSectionInfo), 1, file);
+ if (fread(&toc[i], SIZEOF(xkmSectionInfo), 1, file) != 1)
+ return 0;
}
return 1;
}
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
