Hello community,
here is the log from the commit of package xorg-x11-libs
checked in at Mon Jun 23 01:58:45 CEST 2008.
--------
--- xorg-x11-libs/xorg-x11-libs.changes 2008-05-22 09:37:28.000000000 +0200
+++ xorg-x11-libs/xorg-x11-libs.changes 2008-06-12 23:16:12.965038000 +0200
@@ -1,0 +2,5 @@
+Thu Jun 12 23:17:09 CEST 2008 - sndirsch@suse.de
+
+- libpciaccess 0.10.3
+
+-------------------------------------------------------------------
Old:
----
libpciaccess-0.10.2.tar.bz2
New:
----
libpciaccess-0.10.3.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xorg-x11-libs.spec ++++++
--- /var/tmp/diff_new_pack.w13016/_old 2008-06-23 01:57:20.000000000 +0200
+++ /var/tmp/diff_new_pack.w13016/_new 2008-06-23 01:57:20.000000000 +0200
@@ -20,7 +20,7 @@
%endif
Url: http://xorg.freedesktop.org/
Version: 7.3
-Release: 61
+Release: 66
License: X11/MIT
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Group: System/Libraries
@@ -58,7 +58,7 @@
Source30: libXcliplist-20070501.tar.bz2
Source31: xcb-util-0.2.tar.bz2
Source32: pixman-0.10.0.tar.bz2
-Source33: libpciaccess-0.10.2.tar.bz2
+Source33: libpciaccess-0.10.3.tar.bz2
Patch: libXrandr.diff
Patch2: libXft-2.1.7-lcd-filter-2.patch
Patch3: p_xft_cjk.diff
@@ -226,6 +226,8 @@
%{_mandir}/man3/*
%changelog
+* Fri Jun 13 2008 sndirsch@suse.de
+- libpciaccess 0.10.3
* Thu May 22 2008 sndirsch@suse.de
- libFS 1.0.1
* Put all copyright/license notices into COPYING file
++++++ libpciaccess-0.10.2.tar.bz2 -> libpciaccess-0.10.3.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libpciaccess-0.10.2/ChangeLog new/libpciaccess-0.10.3/ChangeLog
--- old/libpciaccess-0.10.2/ChangeLog 2008-05-21 19:51:23.000000000 +0200
+++ new/libpciaccess-0.10.3/ChangeLog 2008-06-10 21:26:54.000000000 +0200
@@ -1,3 +1,21 @@
+commit ed0555e4225aec26aaaa40f4f3c15fd914390817
+Author: Adam Jackson
+Date: Tue Jun 10 15:24:56 2008 -0400
+
+ libpciaccess 0.10.3
+
+commit 07577a875bc9996437cfe30e5a87ca6b1a0f7e4a
+Author: Adam Jackson
+Date: Tue Jun 10 15:23:06 2008 -0400
+
+ libpciaccess 0.10.2
+
+commit e3adc06b8b8214478aa1d3e85fd5f83b79d039b4
+Author: Eric Anholt
+Date: Thu Jun 5 11:39:06 2008 -0700
+
+ Catch and recover from yet another linux kernel bug in mprotect.
+
commit 4586bb6766983d040bff38b43dc458c47e0ca21f
Author: Adam Jackson
Date: Wed May 21 13:44:38 2008 -0400
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libpciaccess-0.10.2/configure new/libpciaccess-0.10.3/configure
--- old/libpciaccess-0.10.2/configure 2008-05-21 19:51:00.000000000 +0200
+++ new/libpciaccess-0.10.3/configure 2008-06-10 21:26:46.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for libpciaccess 0.10.2.
+# Generated by GNU Autoconf 2.61 for libpciaccess 0.10.3.
#
# Report bugs to https://bugs.freedesktop.org/enter_bug.cgi?product=xorg&component=libpciaccess.
#
@@ -728,8 +728,8 @@
# Identity of this package.
PACKAGE_NAME='libpciaccess'
PACKAGE_TARNAME='libpciaccess'
-PACKAGE_VERSION='0.10.2'
-PACKAGE_STRING='libpciaccess 0.10.2'
+PACKAGE_VERSION='0.10.3'
+PACKAGE_STRING='libpciaccess 0.10.3'
PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg&component=libpciaccess'
# Factoring default headers for most tests.
@@ -1404,7 +1404,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures libpciaccess 0.10.2 to adapt to many kinds of systems.
+\`configure' configures libpciaccess 0.10.3 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1474,7 +1474,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of libpciaccess 0.10.2:";;
+ short | recursive ) echo "Configuration of libpciaccess 0.10.3:";;
esac
cat <<\_ACEOF
@@ -1582,7 +1582,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-libpciaccess configure 0.10.2
+libpciaccess configure 0.10.3
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1596,7 +1596,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by libpciaccess $as_me 0.10.2, which was
+It was created by libpciaccess $as_me 0.10.3, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@@ -2286,7 +2286,7 @@
# Define the identity of the package.
PACKAGE='libpciaccess'
- VERSION='0.10.2'
+ VERSION='0.10.3'
cat >>confdefs.h <<_ACEOF
@@ -19991,7 +19991,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by libpciaccess $as_me 0.10.2, which was
+This file was extended by libpciaccess $as_me 0.10.3, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -20044,7 +20044,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-libpciaccess config.status 0.10.2
+libpciaccess config.status 0.10.3
configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libpciaccess-0.10.2/configure.ac new/libpciaccess-0.10.3/configure.ac
--- old/libpciaccess-0.10.2/configure.ac 2008-05-21 19:45:41.000000000 +0200
+++ new/libpciaccess-0.10.3/configure.ac 2008-06-10 21:24:44.000000000 +0200
@@ -40,7 +40,7 @@
AC_PREREQ([2.57])
-AC_INIT(libpciaccess, 0.10.2, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg&component=libpciaccess], libpciaccess)
+AC_INIT(libpciaccess, 0.10.3, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg&component=libpciaccess], libpciaccess)
AM_INIT_AUTOMAKE([dist-bzip2])
AM_MAINTAINER_MODE
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libpciaccess-0.10.2/src/linux_sysfs.c new/libpciaccess-0.10.3/src/linux_sysfs.c
--- old/libpciaccess-0.10.2/src/linux_sysfs.c 2008-05-21 19:44:35.000000000 +0200
+++ new/libpciaccess-0.10.3/src/linux_sysfs.c 2008-06-10 21:21:36.000000000 +0200
@@ -537,12 +537,11 @@
map->memory = mmap(NULL, map->size, prot, MAP_SHARED, fd, offset);
if (map->memory == MAP_FAILED) {
- err = errno;
map->memory = NULL;
+ close(fd);
+ return errno;
}
- close(fd);
-
#ifdef HAVE_MTRR
if ((map->flags & PCI_DEV_MAP_FLAG_CACHABLE) != 0) {
sentry.type = MTRR_TYPE_WRBACK;
@@ -562,11 +561,27 @@
}
/* KLUDGE ALERT -- rewrite the PTEs to turn off the CD and WT bits */
mprotect (map->memory, map->size, PROT_NONE);
- mprotect (map->memory, map->size, PROT_READ|PROT_WRITE);
+ err = mprotect (map->memory, map->size, PROT_READ|PROT_WRITE);
+
+ if (err != 0) {
+ fprintf(stderr, "mprotect(PROT_READ | PROT_WRITE) failed: %s\n",
+ strerror(errno));
+ fprintf(stderr, "remapping without mprotect performace kludge.\n");
+
+ munmap(map->memory, map->size);
+ map->memory = mmap(NULL, map->size, prot, MAP_SHARED, fd, offset);
+ if (map->memory == MAP_FAILED) {
+ map->memory = NULL;
+ close(fd);
+ return errno;
+ }
+ }
}
#endif
- return err;
+ close(fd);
+
+ return 0;
}
/**
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org