Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to stable-0.14 grimoire by Jaka Kranjc (3846207fa9000498cbc62291565d8089eb01c23f)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Jaka Kranjc <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to stable-0.14 grimoire by Jaka Kranjc (3846207fa9000498cbc62291565d8089eb01c23f)
  • Date: Wed, 14 Nov 2007 03:38:28 -0600

GIT changes to stable-0.14 grimoire by Jaka Kranjc
<lynxlynxlynx AT sourcemage.org>:

graphics-libs/poppler/DETAILS | 6
graphics-libs/poppler/HISTORY | 10
graphics-libs/poppler/PRE_BUILD | 4
kde-apps/koffice/DETAILS | 2
kde-apps/koffice/HISTORY | 6
kde-apps/koffice/PRE_BUILD | 4
kde-apps/koffice/koffice-1.6.3-xpdf2-CVE-2007-4352-5392-5393.diff.bz2 |binary
kde-core/kdegraphics/DETAILS | 2
kde-core/kdegraphics/HISTORY | 5
kde-core/kdegraphics/PRE_BUILD | 3
kde-core/kdegraphics/post-3.5.8-kdegraphics-kpdf.diff.bz2 |binary
php-pear/php/DETAILS | 10
php-pear/php/HISTORY | 3
xfce/xfwm4/DETAILS | 1
xfce/xfwm4/HISTORY | 6
xfce/xfwm4/PRE_BUILD | 3
xfce/xfwm4/xfwm4-gtk+2.patch | 157
++++++++++
17 files changed, 207 insertions(+), 15 deletions(-)

New commits:
commit 3846207fa9000498cbc62291565d8089eb01c23f
Author: George Sherwood <gsherwood AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

php: Updated to version 5.2.5. SECURITY_PATCH++(cherry picked from commit
a7b8b5b8792311949588da99f51998836fdd4ec1)

commit 6f42f0e59e1999d2f338a8885e05dbdf115cbdd8
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

poppler-0.6.2 forgotten files
(cherry picked from commit 3f7a3956b42d3dca3ea42ec3bd665ad0f432f84e)

commit 98927ec66105cd04d5050daa1373d825ee52f838
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

poppler-0.6.1
(cherry picked from commit c11858028d1a932b3d7f2d32e663e2b15719049b)

commit 3703b7589f6d2a1d31f0dbbac5f96653a0d05ab3
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

kdegraphics - secrity fix #14089

commit 19a63e1d01e0438bf379c17a6e47a06aa01cd36a
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

koffice - security update

commit 4a7bc974e7d98d674c20660a176afad3f0aaf789
Author: George Sherwood <gsherwood AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

xfwm4: Added upstream patch to fix xfce4 lockups. PATCHLEVEL++(cherry
picked from commit 62c3b6703cd18ed8b8da6048aa7037d3e6762015)

diff --git a/graphics-libs/poppler/DETAILS b/graphics-libs/poppler/DETAILS
index 00e3a54..4cb8be8 100755
--- a/graphics-libs/poppler/DETAILS
+++ b/graphics-libs/poppler/DETAILS
@@ -11,15 +11,17 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-cvs

SOURCE_URL[0]=cvs://:pserver:anoncvs AT cvs.freedesktop.org:/cvs/poppler:poppler
SOURCE_IGNORE=volatile
else
- VERSION=0.6
+ VERSION=0.6.2
+
SOURCE_HASH=sha512:c7861579aefd063e996d3da29dfc3e38aa9deba242b640ea8c8c6acac78802e686571d052743d44dc60328314d3d85641673080907c7c23f28705c4a36ea7203
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://poppler.freedesktop.org/$SOURCE
- SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
+# SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
fi
WEB_SITE=http://poppler.freedesktop.org/
LICENSE[0]=GPL
ENTERED=20050502
+ SECURITY_PATCH=1
SHORT="a PDF rendering library"
cat << EOF
Poppler is a PDF rendering library based on the xpdf-3.0 code base.
diff --git a/graphics-libs/poppler/HISTORY b/graphics-libs/poppler/HISTORY
index 03168ca..cf1769f 100644
--- a/graphics-libs/poppler/HISTORY
+++ b/graphics-libs/poppler/HISTORY
@@ -1,3 +1,13 @@
+2007-11-10 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.6.2
+ SECURITY_PATCH++
+ fixes CVE-2007-4352, CVE-2007-5392 and CVE-2007-5393
+ bug #14095
+
+2007-10-13 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.6.1
+ * PRE_BUILD: remove sedit
+
2007-09-15 Pol Vinogradov <vin.public AT gmail.com>
* DEPENDS: fixed annoying typo

diff --git a/graphics-libs/poppler/PRE_BUILD b/graphics-libs/poppler/PRE_BUILD
index c4e1347..df74cbd 100755
--- a/graphics-libs/poppler/PRE_BUILD
+++ b/graphics-libs/poppler/PRE_BUILD
@@ -3,8 +3,4 @@ cd $SOURCE_DIRECTORY &&

if [ "$POPPLER_CVS" == "y" ]; then
NOCONFIGURE=ON ./autogen.sh
-else
- sedit "s/glib >= 2.6/glib-2.0 >= 2.6/" configure.ac &&
- sedit "9i#include <cstdlib>" qt/test-poppler-qt.cpp &&
- autoreconf
fi
diff --git a/kde-apps/koffice/DETAILS b/kde-apps/koffice/DETAILS
index 4aca197..e59396d 100755
--- a/kde-apps/koffice/DETAILS
+++ b/kde-apps/koffice/DETAILS
@@ -7,7 +7,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$KDE_URL/stable/$SPELL-$VERSION/src/$SOURCE
WEB_SITE=http://www.koffice.org
ENTERED=20020405
- SECURITY_PATCH=2
+ SECURITY_PATCH=3
LICENSE[0]=GPL
KEYWORDS="kde office"
SHORT="Full office suite"
diff --git a/kde-apps/koffice/HISTORY b/kde-apps/koffice/HISTORY
index d9537aa..66c0205 100644
--- a/kde-apps/koffice/HISTORY
+++ b/kde-apps/koffice/HISTORY
@@ -1,3 +1,9 @@
+2007-11-08 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: SECURITY_PATCH++
+ * PRE_BUILD: apply patch
+ * koffice-1.6.3-xpdf2-CVE-2007-4352-5392-5393.diff.bz2: added
+ fix bug #14089
+
2007-08-01 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: SECURITY_PATCH++
* PRE_BUILD, koffice-xpdf-CVE-2007-3387.diff: added
diff --git a/kde-apps/koffice/PRE_BUILD b/kde-apps/koffice/PRE_BUILD
index 4faa2a0..281e688 100755
--- a/kde-apps/koffice/PRE_BUILD
+++ b/kde-apps/koffice/PRE_BUILD
@@ -1,3 +1,5 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&
-patch -p0 < $SPELL_DIRECTORY/koffice-xpdf-CVE-2007-3387.diff
+patch -p0 < $SPELL_DIRECTORY/koffice-xpdf-CVE-2007-3387.diff &&
+bzcat $SPELL_DIRECTORY/koffice-1.6.3-xpdf2-CVE-2007-4352-5392-5393.diff.bz2|
\
+ patch -p0
diff --git
a/kde-apps/koffice/koffice-1.6.3-xpdf2-CVE-2007-4352-5392-5393.diff.bz2
b/kde-apps/koffice/koffice-1.6.3-xpdf2-CVE-2007-4352-5392-5393.diff.bz2
new file mode 100644
index 0000000..97dfaf5
Binary files /dev/null and
b/kde-apps/koffice/koffice-1.6.3-xpdf2-CVE-2007-4352-5392-5393.diff.bz2 differ
diff --git a/kde-core/kdegraphics/DETAILS b/kde-core/kdegraphics/DETAILS
index a558d2f..126afb6 100755
--- a/kde-core/kdegraphics/DETAILS
+++ b/kde-core/kdegraphics/DETAILS
@@ -8,7 +8,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$KDE_URL/stable/${VERSION//.0/}/src/$SOURCE
WEB_SITE=http://www.kde.org
ENTERED=20010922
- SECURITY_PATCH=3
+ SECURITY_PATCH=4
LICENSE[0]=GPL
KEYWORDS="kde"
SHORT="Graphics related programs for KDE."
diff --git a/kde-core/kdegraphics/HISTORY b/kde-core/kdegraphics/HISTORY
index c8971d1..d7b5615 100644
--- a/kde-core/kdegraphics/HISTORY
+++ b/kde-core/kdegraphics/HISTORY
@@ -1,3 +1,8 @@
+2007-11-08 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: SECURITY_PATCH++
+ * PRE_BUILD, post-3.5.8-kdegraphics-kpdf.diff.bz2: added
+ securit fix, bug #14089
+
2007-08-01 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: SECURITY_PATCH++
* PRE_BUILD, post-3.5.7-kdegraphics-CVE-2007-3387.diff
diff --git a/kde-core/kdegraphics/PRE_BUILD b/kde-core/kdegraphics/PRE_BUILD
index 336c5ff..759e1f6 100755
--- a/kde-core/kdegraphics/PRE_BUILD
+++ b/kde-core/kdegraphics/PRE_BUILD
@@ -1,3 +1,4 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&
-patch -p0 < $SPELL_DIRECTORY/post-3.5.7-kdegraphics-CVE-2007-3387.diff
+patch -p0 < $SPELL_DIRECTORY/post-3.5.7-kdegraphics-CVE-2007-3387.diff &&
+bzcat $SPELL_DIRECTORY/post-3.5.8-kdegraphics-kpdf.diff.bz2| patch -p0
diff --git a/kde-core/kdegraphics/post-3.5.8-kdegraphics-kpdf.diff.bz2
b/kde-core/kdegraphics/post-3.5.8-kdegraphics-kpdf.diff.bz2
new file mode 100644
index 0000000..1248e44
Binary files /dev/null and
b/kde-core/kdegraphics/post-3.5.8-kdegraphics-kpdf.diff.bz2 differ
diff --git a/php-pear/php/DETAILS b/php-pear/php/DETAILS
index afdd78a..b6fd64f 100755
--- a/php-pear/php/DETAILS
+++ b/php-pear/php/DETAILS
@@ -1,12 +1,12 @@
SPELL=php
if [[ "$PHP_RC" == y ]]; then
- VERSION=5.2.4
-
SOURCE_HASH=sha512:283fda35fe122c843db1b1f941ded842322031f30128f01ec2a406b9197127b7e2d504a16d4ce4c511baf83d404b117fa59fd23c1b7b153352466c9350d4dba1
+ VERSION=5.2.5
+
SOURCE_HASH=sha512:d362c195a018bad5013c2b8539fdf345944266b6336ecc2315a0809ddc2a543bb09bcdd31d6203c056b1d9f4f65ce0b4f4e32c83df529582b05925b3a5b727f6
else
- VERSION=5.2.4
-
SOURCE_HASH=sha512:283fda35fe122c843db1b1f941ded842322031f30128f01ec2a406b9197127b7e2d504a16d4ce4c511baf83d404b117fa59fd23c1b7b153352466c9350d4dba1
+ VERSION=5.2.5
+
SOURCE_HASH=sha512:d362c195a018bad5013c2b8539fdf345944266b6336ecc2315a0809ddc2a543bb09bcdd31d6203c056b1d9f4f65ce0b4f4e32c83df529582b05925b3a5b727f6
fi
- SECURITY_PATCH=5
+ SECURITY_PATCH=6
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://static.php.net/www.php.net/distributions/$SOURCE
diff --git a/php-pear/php/HISTORY b/php-pear/php/HISTORY
index eb0d59e..95a30a5 100644
--- a/php-pear/php/HISTORY
+++ b/php-pear/php/HISTORY
@@ -1,3 +1,6 @@
+2007-11-10 George Sherwood <george AT beernabeer.com>
+ * DETAILS: Updated to version 5.2.5. SECURITY_PATCH++
+
2007-08-30 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 5.2.4, SECURITY_PATCH=5

diff --git a/xfce/xfwm4/DETAILS b/xfce/xfwm4/DETAILS
index 7895669..b735333 100755
--- a/xfce/xfwm4/DETAILS
+++ b/xfce/xfwm4/DETAILS
@@ -7,6 +7,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_GPG="gurus.gpg:$SOURCE.sig"
LICENSE[0]=GPL
ENTERED=20030608
+ PATCHLEVEL=1
KEYWORDS="xfce"
SHORT="Next generation window manager for xfce"
cat << EOF
diff --git a/xfce/xfwm4/HISTORY b/xfce/xfwm4/HISTORY
index 4e013bd..fe13e4c 100644
--- a/xfce/xfwm4/HISTORY
+++ b/xfce/xfwm4/HISTORY
@@ -1,3 +1,9 @@
+2007-10-23 George Sherwood <george AT beernabeer.com>
+ * DETAILS: PATCHLEVEL++
+ * PRE_BUILD: Added to apply patch from
+ http://bugzilla.xfce.org/show_bug.cgi?id=3346
+ * xfwm4-gtk+2.patch: Upstream patch fixes Bug 14005
+
2007-09-30 Arwed v. Merkatz <v.merkatz AT gmx.net>
* DEPENDS: provider for XDAMAGE is libxdamage, not xorg-server

diff --git a/xfce/xfwm4/PRE_BUILD b/xfce/xfwm4/PRE_BUILD
new file mode 100755
index 0000000..b831fe9
--- /dev/null
+++ b/xfce/xfwm4/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+patch -p0 < $SCRIPT_DIRECTORY/xfwm4-gtk+2.patch
diff --git a/xfce/xfwm4/xfwm4-gtk+2.patch b/xfce/xfwm4/xfwm4-gtk+2.patch
new file mode 100644
index 0000000..c56bfbb
--- /dev/null
+++ b/xfce/xfwm4/xfwm4-gtk+2.patch
@@ -0,0 +1,157 @@
+Index: src/display.c
+===================================================================
+--- src/display.c (revision 25820)
++++ src/display.c (working copy)
+@@ -178,6 +178,19 @@
+ FALSE, display_info->atoms) != 0);
+ }
+
++static void
++myDisplayCreateTimestampWin (DisplayInfo *display_info)
++{
++ XSetWindowAttributes attributes;
++
++ attributes.event_mask = PropertyChangeMask;
++ attributes.override_redirect = TRUE;
++ display_info->timestamp_win =
++ XCreateWindow (display_info->dpy, DefaultRootWindow
(display_info->dpy),
++ -100, -100, 10, 10, 0, 0, CopyFromParent,
CopyFromParent,
++ CWEventMask | CWOverrideRedirect, &attributes);
++}
++
+ DisplayInfo *
+ myDisplayInit (GdkDisplay *gdisplay)
+ {
+@@ -309,6 +322,8 @@
+ display->resize_cursor[CORNER_COUNT + SIDE_BOTTOM] =
+ XCreateFontCursor (display->dpy, XC_bottom_side);
+
++ myDisplayCreateTimestampWin (display);
++
+ display->xfilter = NULL;
+ display->screens = NULL;
+ display->clients = NULL;
+@@ -340,6 +355,8 @@
+ display->move_cursor = None;
+ XFreeCursor (display->dpy, display->root_cursor);
+ display->root_cursor = None;
++ XDestroyWindow (display->dpy, display->timestamp_win);
++ display->timestamp_win = None;
+
+ if (display->hostname)
+ {
+Index: src/display.h
+===================================================================
+--- src/display.h (revision 25820)
++++ src/display.h (working copy)
+@@ -226,6 +226,7 @@
+ gboolean quit;
+ gboolean reload;
+
++ Window timestamp_win;
+ Cursor busy_cursor;
+ Cursor move_cursor;
+ Cursor root_cursor;
+Index: src/client.c
+===================================================================
+--- src/client.c (revision 25820)
++++ src/client.c (working copy)
+@@ -4868,21 +4868,19 @@
+
+ if (passdata.c)
+ {
+- GdkPixbuf *icon;
+-
+ TRACE ("entering cycle loop");
+ passdata.wireframe = wireframeCreate (passdata.c);
+- icon = getAppIcon (display_info, passdata.c->window, 32, 32);
+ passdata.tabwin = tabwinCreate (passdata.c->screen_info->gscr, c,
+ passdata.c, passdata.cycle_range,
+
screen_info->params->cycle_workspaces);
+ eventFilterPush (display_info->xfilter, clientCycleEventFilter,
&passdata);
+ gtk_main ();
+ eventFilterPop (display_info->xfilter);
+- wireframeDelete (screen_info, passdata.wireframe);
+ TRACE ("leaving cycle loop");
+ tabwinDestroy (passdata.tabwin);
+ g_free (passdata.tabwin);
++ wireframeDelete (screen_info, passdata.wireframe);
++ updateXserverTime (display_info);
+ }
+
+ if (passdata.c)
+Index: src/hints.c
+===================================================================
+--- src/hints.c (revision 25820)
++++ src/hints.c (working copy)
+@@ -1167,27 +1167,18 @@
+ return setXAtomManagerOwner(display_info, display_info->atoms[atom_id],
root, w);
+ }
+
+-
+-static Bool
+-checkPropEvent (Display *display, XEvent *xevent, XPointer arg)
++void
++updateXserverTime (DisplayInfo *display_info)
+ {
+- DisplayInfo *display_info;
+ ScreenInfo *screen_info;
++ char c = '\0';
+
+- display_info = (DisplayInfo *) arg;
+- g_return_val_if_fail (display_info, FALSE);
++ g_return_if_fail (display_info);
+
+- screen_info = myDisplayGetDefaultScreen (display_info);
+- g_return_val_if_fail (screen_info, FALSE);
+-
+- if ((xevent->type == PropertyNotify) &&
+- (xevent->xproperty.window == screen_info->xfwm4_win) &&
+- (xevent->xproperty.atom ==
display_info->atoms[XFWM4_TIMESTAMP_PROP]))
+- {
+- return TRUE;
+- }
+-
+- return FALSE;
++ XChangeProperty (display_info->dpy, display_info->timestamp_win,
++ display_info->atoms[XFWM4_TIMESTAMP_PROP],
++ display_info->atoms[XFWM4_TIMESTAMP_PROP],
++ 8, PropModeReplace, (unsigned char *) &c, 1);
+ }
+
+ Time
+@@ -1196,7 +1187,6 @@
+ ScreenInfo *screen_info;
+ XEvent xevent;
+ Time timestamp;
+- char c = '\0';
+
+ g_return_val_if_fail (display_info, (Time) CurrentTime);
+ timestamp = myDisplayGetCurrentTime (display_info);
+@@ -1206,12 +1196,8 @@
+ g_return_val_if_fail (screen_info, (Time) CurrentTime);
+
+ TRACE ("getXServerTime: Using X server roundtrip");
+- XChangeProperty (display_info->dpy, screen_info->xfwm4_win,
+- display_info->atoms[XFWM4_TIMESTAMP_PROP],
+- display_info->atoms[XFWM4_TIMESTAMP_PROP],
+- 8, PropModeReplace, (unsigned char *) &c, 1);
+- XIfEvent (display_info->dpy, &xevent, checkPropEvent, (XPointer)
display_info);
+-
++ updateXserverTime (display_info);
++ XWindowEvent (display_info->dpy, display_info->timestamp_win,
PropertyChangeMask, &xevent);
+ timestamp = (Time) myDisplayUpdateCurrentTime (display_info,
&xevent);
+ }
+
+Index: src/hints.h
+===================================================================
+--- src/hints.h (revision 25820)
++++ src/hints.h (working copy)
+@@ -269,6 +269,7 @@
+ int,
+ Window ,
+ Window);
++void updateXserverTime
(DisplayInfo *);
+ Time getXServerTime
(DisplayInfo *);
+
+ #ifdef ENABLE_KDE_SYSTRAY_PROXY



  • [SM-Commit] GIT changes to stable-0.14 grimoire by Jaka Kranjc (3846207fa9000498cbc62291565d8089eb01c23f), Jaka Kranjc, 11/14/2007

Archive powered by MHonArc 2.6.24.

Top of Page