Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master xorg-modular grimoire by Andraž Levstik (377dcfc2f862ba4676f97a683b7726f027b3338a)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Andraž Levstik <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master xorg-modular grimoire by Andraž Levstik (377dcfc2f862ba4676f97a683b7726f027b3338a)
  • Date: Tue, 24 Apr 2007 09:02:07 -0500

GIT changes to master xorg-modular grimoire by Andraž Levstik
<ruskie AT mages.ath.cx>:

xorg-driver/xf86-input-joystick/DETAILS | 4 -
xorg-driver/xf86-input-joystick/HISTORY | 3
xorg-driver/xf86-video-nv/DETAILS | 4 -
xorg-driver/xf86-video-nv/HISTORY | 3
xorg-lib/libx11/BUILD | 2
xorg-lib/libx11/CONFIGURE | 10 +-
xorg-lib/libx11/DETAILS | 2
xorg-lib/libx11/HISTORY | 7 +
xorg-lib/libx11/PRE_BUILD | 3
xorg-lib/libx11/xorg-libX11-1.1.1-xinitimage.diff | 87
++++++++++++++++++++++
xorg-lib/libxi/DETAILS | 4 -
xorg-lib/libxi/HISTORY | 3
xorg-xserver/xorg-server/DETAILS | 6 -
xorg-xserver/xorg-server/HISTORY | 3
14 files changed, 122 insertions(+), 19 deletions(-)

New commits:
commit 377dcfc2f862ba4676f97a683b7726f027b3338a
Author: Andraž Levstik <ruskie AT mages.ath.cx>
Commit: Andraž Levstik <ruskie AT mages.ath.cx>

xorg-lib/libx11: security update

commit bc1fe576c85352c76037bf90993b4476d47290f5
Author: Andraž Levstik <ruskie AT mages.ath.cx>
Commit: Andraž Levstik <ruskie AT mages.ath.cx>

xorg-xserver/xorg-server: version update

commit 451fd1988b238925747e0a543c14d1daa60f36bf
Author: Andraž Levstik <ruskie AT mages.ath.cx>
Commit: Andraž Levstik <ruskie AT mages.ath.cx>

xorg-lib/libxi: version update

commit bcfd382a5fdc725cf69a40a57fc6ab0a21da3814
Author: Andraž Levstik <ruskie AT mages.ath.cx>
Commit: Andraž Levstik <ruskie AT mages.ath.cx>

xorg-driver/xf86-video-nv: version update

commit 86dafa13b419ab70227b70374785d28401b6e016
Author: Andraž Levstik <ruskie AT mages.ath.cx>
Commit: Andraž Levstik <ruskie AT mages.ath.cx>

xorg-driver/xf86-input-joystick: version update

diff --git a/xorg-driver/xf86-input-joystick/DETAILS
b/xorg-driver/xf86-input-joystick/DETAILS
index 480acc2..f24ede4 100755
--- a/xorg-driver/xf86-input-joystick/DETAILS
+++ b/xorg-driver/xf86-input-joystick/DETAILS
@@ -1,10 +1,10 @@
SPELL=xf86-input-joystick
PKG=xf86-input-joystick
- VERSION=1.2.0
+ VERSION=1.2.1
XORG_VER=X11R7.1
SOURCE=${PKG}-${VERSION}.tar.bz2

SOURCE_URL[0]=http://xorg.freedesktop.org/releases/individual/driver/${SOURCE}
-
SOURCE_HASH=sha512:daafd2a036763fdf0d5dc73b6fa3694405ab4d9ac4f2f05d6da6eec3daa2735a0091b08ef5a4b4011c2bd4c9fb55dfcf89a13079ec7f81cf5d4f22cceac13969
+
SOURCE_HASH=sha512:6f97019bad2f55ae4a17ff24a956b5ea6f1d9104776d3b883ff07efb6db83cd495e9bd0dde859320f3a6bbf2313e47d24b21c1c59eb45382456cacffb074b2c8
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${PKG}-${VERSION}
WEB_SITE=http://xorg.freedesktop.org
ENTERED=20051125
diff --git a/xorg-driver/xf86-input-joystick/HISTORY
b/xorg-driver/xf86-input-joystick/HISTORY
index 25f6da5..6aa20e2 100644
--- a/xorg-driver/xf86-input-joystick/HISTORY
+++ b/xorg-driver/xf86-input-joystick/HISTORY
@@ -1,3 +1,6 @@
+2007-04-24 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
+ * DETAILS: version update 1.2.1
+
2007-04-03 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
* DETAILS: version update

diff --git a/xorg-driver/xf86-video-nv/DETAILS
b/xorg-driver/xf86-video-nv/DETAILS
index 0a22711..537b043 100755
--- a/xorg-driver/xf86-video-nv/DETAILS
+++ b/xorg-driver/xf86-video-nv/DETAILS
@@ -1,10 +1,10 @@
SPELL=xf86-video-nv
PKG=xf86-video-nv
- VERSION=2.0.1
+ VERSION=2.0.2
XORG_VER=X11R7.1
SOURCE=${PKG}-${VERSION}.tar.bz2

SOURCE_URL[0]=http://xorg.freedesktop.org/releases/individual/driver/${SOURCE}
-
SOURCE_HASH=sha512:428127b8a99812940e92de69c0ecca7ea8c08a6a9a29b9753acdd2d5cfa7c4f29bd97bffa9e6d92054e39ae29d2c6e489dad1c6c1cdbc253bdbc94f63af1f199
+
SOURCE_HASH=sha512:f351b06d03c577858f00e45180867b8d456f738b4ea546698833f4dd7b031c0430d05f2368f301dc4afc559a85c9ec6cd1cd03e3287de95f0158cf28be9fd696
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${PKG}-${VERSION}
WEB_SITE=http://xorg.freedesktop.org
ENTERED=20051125
diff --git a/xorg-driver/xf86-video-nv/HISTORY
b/xorg-driver/xf86-video-nv/HISTORY
index a21e652..be9219f 100644
--- a/xorg-driver/xf86-video-nv/HISTORY
+++ b/xorg-driver/xf86-video-nv/HISTORY
@@ -1,3 +1,6 @@
+2007-04-24 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
+ * DETAILS: update to 2.0.2
+
2007-04-03 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
* DETAILS: update to 2.0.1

diff --git a/xorg-lib/libx11/BUILD b/xorg-lib/libx11/BUILD
index 68f436e..2a487cc 100755
--- a/xorg-lib/libx11/BUILD
+++ b/xorg-lib/libx11/BUILD
@@ -1,3 +1,3 @@
-OPTS="--disable-loadable-i18n $LIBX11_OPTS $OPTS" &&
+OPTS="$LIBX11_OPTS $OPTS" &&

default_build
diff --git a/xorg-lib/libx11/CONFIGURE b/xorg-lib/libx11/CONFIGURE
index 3c5e78f..7c24b2c 100755
--- a/xorg-lib/libx11/CONFIGURE
+++ b/xorg-lib/libx11/CONFIGURE
@@ -4,11 +4,11 @@ config_query_option LIBX11_OPTS
\
"--enable-secure-rpc" \
"--disable-secure-rpc" &&

-#config_query_option LIBX11_OPTS \
-# "Enable loadable i18n module support?" \
-# n \
-# "--enable-loadable-i18n" \
-# "--disable-loadable-i18n" &&
+config_query_option LIBX11_OPTS \
+ "Enable loadable i18n module support?" \
+ n \
+ "--enable-loadable-i18n" \
+ "--disable-loadable-i18n" &&

config_query_option LIBX11_OPTS \
"Enable loadable xcursor library support?" \
diff --git a/xorg-lib/libx11/DETAILS b/xorg-lib/libx11/DETAILS
index 857f34b..176980f 100755
--- a/xorg-lib/libx11/DETAILS
+++ b/xorg-lib/libx11/DETAILS
@@ -8,7 +8,7 @@
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${PKG}-${VERSION}
WEB_SITE=http://xorg.freedesktop.org
ENTERED=20051125
- SECURITY_PATCH=1
+ SECURITY_PATCH=2
LICENSE[0]=XCL
SHORT="Module libx11 for xorg"
cat << EOF
diff --git a/xorg-lib/libx11/HISTORY b/xorg-lib/libx11/HISTORY
index 3a96c50..cf72336 100644
--- a/xorg-lib/libx11/HISTORY
+++ b/xorg-lib/libx11/HISTORY
@@ -1,6 +1,7 @@
-2007-04-11 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
- * CONFIGURE: removed loadable i18n module support #13701
- * BUILD: disable loadable i18n module support #13701
+2007-04-24 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
+ * xorg-libX11-1.1.1-xinitimage.diff: added security
+ * PRE_BUILD: security patch apply
+ * DETAILS: SECURITY++

2006-12-20 Juuso Alasuutari <iuso AT sourcemage.org>
* DEPENDS: Added EXPERIMENTAL notice for libxcb.
diff --git a/xorg-lib/libx11/PRE_BUILD b/xorg-lib/libx11/PRE_BUILD
new file mode 100755
index 0000000..dc7790a
--- /dev/null
+++ b/xorg-lib/libx11/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+patch -p1 < $SPELL_DIRECTORY/xorg-libX11-1.1.1-xinitimage.diff
diff --git a/xorg-lib/libx11/xorg-libX11-1.1.1-xinitimage.diff
b/xorg-lib/libx11/xorg-libX11-1.1.1-xinitimage.diff
new file mode 100644
index 0000000..2ba968d
--- /dev/null
+++ b/xorg-lib/libx11/xorg-libX11-1.1.1-xinitimage.diff
@@ -0,0 +1,87 @@
+diff --git a/src/ImUtil.c b/src/ImUtil.c
+index 83fd030..9e667bb 100644
+--- a/src/ImUtil.c
++++ b/src/ImUtil.c
+@@ -327,12 +327,13 @@ XImage *XCreateImage (dpy, visual, depth
+ {
+ register XImage *image;
+ int bits_per_pixel = 1;
++ int min_bytes_per_line;
+
+ if (depth == 0 || depth > 32 ||
+ (format != XYBitmap && format != XYPixmap && format != ZPixmap) ||
+ (format == XYBitmap && depth != 1) ||
+ (xpad != 8 && xpad != 16 && xpad != 32) ||
+- offset < 0 || image_bytes_per_line < 0)
++ offset < 0)
+ return (XImage *) NULL;
+ if ((image = (XImage *) Xcalloc(1, (unsigned) sizeof(XImage))) ==
NULL)
+ return (XImage *) NULL;
+@@ -363,16 +364,21 @@ XImage *XCreateImage (dpy, visual, depth
+ /*
+ * compute per line accelerator.
+ */
+- if (image_bytes_per_line == 0)
+ {
+ if (format == ZPixmap)
+- image->bytes_per_line =
++ min_bytes_per_line =
+ ROUNDUP((bits_per_pixel * width), image->bitmap_pad);
+ else
+- image->bytes_per_line =
++ min_bytes_per_line =
+ ROUNDUP((width + offset), image->bitmap_pad);
+ }
+- else image->bytes_per_line = image_bytes_per_line;
++ if (image_bytes_per_line == 0) {
++ image->bytes_per_line = min_bytes_per_line;
++ } else if (image_bytes_per_line < min_bytes_per_line) {
++ return 0;
++ } else {
++ image->bytes_per_line = image_bytes_per_line;
++ }
+
+ image->bits_per_pixel = bits_per_pixel;
+ image->obdata = NULL;
+@@ -384,7 +390,11 @@ XImage *XCreateImage (dpy, visual, depth
+ Status XInitImage (image)
+ XImage *image;
+ {
++ int min_bytes_per_line;
++
+ if (image->depth == 0 || image->depth > 32 ||
++ image->bits_per_pixel > 32 || image->bitmap_unit > 32 ||
++ image->bits_per_pixel < 0 || image->bitmap_unit < 0 ||
+ (image->format != XYBitmap &&
+ image->format != XYPixmap &&
+ image->format != ZPixmap) ||
+@@ -392,21 +402,24 @@ Status XInitImage (image)
+ (image->bitmap_pad != 8 &&
+ image->bitmap_pad != 16 &&
+ image->bitmap_pad != 32) ||
+- image->xoffset < 0 || image->bytes_per_line < 0)
++ image->xoffset < 0)
+ return 0;
+
+ /*
+ * compute per line accelerator.
+ */
+- if (image->bytes_per_line == 0)
+- {
+ if (image->format == ZPixmap)
+- image->bytes_per_line =
++ min_bytes_per_line =
+ ROUNDUP((image->bits_per_pixel * image->width),
+ image->bitmap_pad);
+ else
+- image->bytes_per_line =
++ min_bytes_per_line =
+ ROUNDUP((image->width + image->xoffset), image->bitmap_pad);
++
++ if (image->bytes_per_line == 0) {
++ image->bytes_per_line = min_bytes_per_line;
++ } else if (image->bytes_per_line < min_bytes_per_line) {
++ return 0;
+ }
+
+ _XInitImageFuncPtrs (image);
diff --git a/xorg-lib/libxi/DETAILS b/xorg-lib/libxi/DETAILS
index e9f4203..7d56a3e 100755
--- a/xorg-lib/libxi/DETAILS
+++ b/xorg-lib/libxi/DETAILS
@@ -1,10 +1,10 @@
SPELL=libxi
PKG=libXi
- VERSION=1.0.2
+ VERSION=1.0.4
XORG_VER=X11R7.1
SOURCE=${PKG}-${VERSION}.tar.bz2

SOURCE_URL[0]=http://xorg.freedesktop.org/releases/individual/lib/${SOURCE}
-
SOURCE_HASH=sha512:fa029e0e5c42be6e5ca9f1046f36714d4d8545a0c969eef89ebbc38a6a9d2201680ff64f2796f1e7a5c46077ab679a8b8f3e165a23045317b35f573a8a9ccc89
+
SOURCE_HASH=sha512:d7e92a16c3f6e6d3afd8305d263ec067170f5ef1f0daadbaeccc52d3c941f32f083458192dee2262a39448dd4af75d0c568b5e2eefcb5b14cf4b307c53413832
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${PKG}-${VERSION}
WEB_SITE=http://xorg.freedesktop.org
ENTERED=20051125
diff --git a/xorg-lib/libxi/HISTORY b/xorg-lib/libxi/HISTORY
index 6bdaf5a..3b121eb 100644
--- a/xorg-lib/libxi/HISTORY
+++ b/xorg-lib/libxi/HISTORY
@@ -1,3 +1,6 @@
+2007-04-24 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
+ * DETAILS: version update 1.0.4
+
2006-11-09 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
* DETAILS: version update from 1.1.0 -> 1.0.2 odd but 1.0.2 is later
than
1.1.0
diff --git a/xorg-xserver/xorg-server/DETAILS
b/xorg-xserver/xorg-server/DETAILS
index de1c140..980ab5f 100755
--- a/xorg-xserver/xorg-server/DETAILS
+++ b/xorg-xserver/xorg-server/DETAILS
@@ -1,19 +1,19 @@
SPELL=xorg-server
- VERSION=1.2.99.903
+ VERSION=1.3.0.0
XORG_VER=X11R7.1
VERSION2=6.5.2
SOURCE=${SPELL}-${VERSION}.tar.bz2
SOURCE2=MesaLib-${VERSION2}.tar.bz2

SOURCE_URL[0]=http://xorg.freedesktop.org/releases/individual/xserver/${SOURCE}
SOURCE2_URL[0]=${SOURCEFORGE_URL}/mesa3d/${SOURCE2}
-
SOURCE_HASH=sha512:7eadf514e32528c518e7231c42161b053dbb4c8157970d32b0446775cf92a99dfa00fda293cd81544b01758f2d0ef1c35bd542b32a4a0ef33166c2bb0723bf0f
+
SOURCE_HASH=sha512:5660b7e897f72d17dec110e85474dfcf4d842ede59c2316a0899bc13a72aab953e0cd1726845d1e0f22c1ac4f12f11446ebda56c76e6bbd457c174b46b009b48

SOURCE2_HASH=sha512:8b3d1110539684d7b6f0469f471d2c5902e01140bc6c29a9c7f0859dafbd0759ece53799b49845a13c2aef56fb3617a241314e7b3071889ff77ceff08ed14d08
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
SOURCE2_DIRECTORY=${BUILD_DIRECTORY}/Mesa-${VERSION2}
WEB_SITE=http://xorg.freedesktop.org/
ENTERED=20051125
LICENSE[0]=XCL
- SECURITY_PATCH=3
+ SECURITY_PATCH=4
SHORT="X servers (including Xorg, Xprt, Xvfb, Xnest, & Xdmx)"
cat << EOF
The XOrg Foundation, (a.k.a. X.org) has changed to an Open Source model to
diff --git a/xorg-xserver/xorg-server/HISTORY
b/xorg-xserver/xorg-server/HISTORY
index 0116a0e..3b98a84 100644
--- a/xorg-xserver/xorg-server/HISTORY
+++ b/xorg-xserver/xorg-server/HISTORY
@@ -1,3 +1,6 @@
+2007-04-24 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
+ * DETAILS: update to 1.3.0.0
+
2007-04-03 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
* DETAILS: updato to 1.2.99.903




  • [SM-Commit] GIT changes to master xorg-modular grimoire by Andraž Levstik (377dcfc2f862ba4676f97a683b7726f027b3338a), Andraž Levstik, 04/24/2007

Archive powered by MHonArc 2.6.24.

Top of Page