sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to stable-0.40 grimoire by Eric Sandall (17a52dd9a03ff53ce0fd5cfaa5c992895e84dc38)

From: Eric Sandall <scm AT sourcemage.org>
To: sm-commit AT lists.ibiblio.org
Subject: [SM-Commit] GIT changes to stable-0.40 grimoire by Eric Sandall (17a52dd9a03ff53ce0fd5cfaa5c992895e84dc38)
Date: Sat, 6 Feb 2010 20:07:17 -0600

GIT changes to stable-0.40 grimoire by Eric Sandall <sandalle AT sourcemage.org>:

archive/gzip/DETAILS | 3 ++-
archive/gzip/HISTORY | 3 +++
database/mysql/DETAILS | 7 +++++--
database/mysql/HISTORY | 3 +++
kde4-support/phonon/DETAILS | 3 +--
kde4-support/phonon/HISTORY | 6 ++++++
kernels/ndiswrapper/BUILD | 2 +-
kernels/ndiswrapper/FINAL | 2 +-
kernels/ndiswrapper/HISTORY | 5 +++++
kernels/ndiswrapper/INSTALL | 2 +-
kernels/ndiswrapper/PRE_BUILD | 2 +-
libs/glibc/DETAILS | 2 +-
libs/glibc/HISTORY | 5 +++++
libs/glibc/PRE_BUILD | 7 +++++++
libs/glibc/UP_TRIGGERS | 4 ++++
libs/gmime/DETAILS | 3 ++-
libs/gmime/HISTORY | 3 +++
libs/gmime/gmime-2.4.15.tar.gz.sig |binary
libs/libdrm/BUILD | 2 ++
libs/libdrm/HISTORY | 9 +++++++++
libs/libdrm/PRE_SUB_DEPENDS | 5 +++++
libs/libdrm/SUB_DEPENDS | 7 +++++++
mail/thunderbird/DETAILS | 4 ++--
mail/thunderbird/HISTORY | 3 +++
net/ifupdown/HISTORY | 4 ++++
net/ifupdown/INSTALL | 5 ++---
security/wireshark/DETAILS | 6 +++---
security/wireshark/HISTORY | 4 ++++
utils/coreutils/DETAILS | 2 +-
utils/coreutils/HISTORY | 3 ---
x11-toolkits/qt4/CONFLICTS | 8 +-------
x11-toolkits/qt4/DETAILS | 4 ++--
x11-toolkits/qt4/HISTORY | 6 ++++++
xorg-driver/xf86-video-intel/DEPENDS | 2 +-
xorg-driver/xf86-video-intel/HISTORY | 4 ++++
xorg-lib/libxtst/DEPENDS | 3 ++-
xorg-lib/libxtst/HISTORY | 3 +++
37 files changed, 112 insertions(+), 34 deletions(-)

New commits:
commit 17a52dd9a03ff53ce0fd5cfaa5c992895e84dc38
Author: Tommy Boatman <tboatman AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

libxtst: added dependecy for libxi (bug 15561)
(cherry picked from commit f86983f06a94e630177d47bf7b511ee64ebe2b4f)

commit b3787d122008aa5ba8110ff4dad80bd9e67f008c
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

Revert "coreutils: => 8.2, fixed (2009-12-01) weird bug in rm program,
introduced in 8.1"

This reverts commit 96bfa3846ea9db48c0a0804e3b1c988178fb77e3.

coreutils 8.2 breaks installwatch tracking symlinks: Bug #15559
(cherry picked from commit f9728d83fd76884487d3abc89fcea7777d47e28c)
(cherry picked from commit 96c0c822ff6104b356c815e7fbdc430fa0a5e870)

commit 3cf5063ec1075f85ad7a6cb08c870d60b50d9fe5
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

mysql: => 5.0.90 [old]

commit c361b1cd5b92da5ab1fa70b79e7d420f24ee8d2c
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Eric Sandall <sandalle AT sourcemage.org>

gmime 2.4.15, SECURITY_PATCH=1, possible buffer overflows

commit 76790d046d573763bc3ec1e148d122312ceb754c
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Eric Sandall <sandalle AT sourcemage.org>

gzip 1.4, SECURITY_PATCH=1, CVE-2010-0001
(cherry picked from commit 9e9a4f4c0a8e945219197f6268eb8c37618554e1)

commit b0733db26efaf94d520fb8206de4aaac4851fbf5
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Eric Sandall <sandalle AT sourcemage.org>

wireshark 1.2.6, SECURITY_PATCH=21
(cherry picked from commit 5a6f8eff20109c92148d366c7e89b71be4f76289)

commit 17b2e4cd876678341c53a42e84e9eb18bbc12549
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

ndiswrapper: Needs KBUILD to find the kernel
(cherry picked from commit c66b590d06668b47c599c7719e0330f49b975498)

commit cf01a372e847d2163fa9c1e4d9b512c6dbd4b9f2
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

ndiswrapper: Only create/remove ndiswrapper-svn if NDIS_SVN = y
(cherry picked from commit 9d256c7b32b7c33af53def2b1bd15b4069298747)

commit 52c819b952dbe6c73cbffaaaa0e55d9642bd0ef4
Author: George Sherwood <george AT beernabeer.com>
Commit: Eric Sandall <sandalle AT sourcemage.org>

thunderbird: Updated to version 3.0.1 SECURITY_PATCH++
(cherry picked from commit 918134c5dc5c66d72ba134a6d5431b6a25794fed)

commit 3f73f32332254dde5dc5a58e303f300c65e0766c
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

phonon: stable/4.2.1 got moved to Attic/4.2.1
See http://www.mail-archive.com/release-team AT kde.org/msg03306.html
Fixes Bug #15548
Removed SOURCE_URL[1], nothing in the phonon directory anymore
(cherry picked from commit 5ee14897db163cf27ac868bd1bef8dc9d1c36a64)

commit a88e06e5070a72dab35cca3823f4cea0d1bccde7
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

libdrm: Use correct flag ('y' not --enable-intel)
Pass --enable-intel when Intel KMS API is wanted
Removed unneeded REPAIR^none^{PRE_,}SUB_DEPENDS
(cherry picked from commit cb8718bda1a57c0ff80cf70a4e2f9fa7be0c2243)

commit d1639099e5b91032c882d416cc0f4db617b831d0
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

xf86-video-intel: Depends on libdrm built with Intel KMS API
Fixes one issue found in Bug #15547
(cherry picked from commit 684e4e5758d71400b728d313f2dd5a622ef6333b)

commit 3a468d41449124a12238ef4ff87a7a8c7e7b0214
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

libdrm: Allow forcing Intel KMS API
(cherry picked from commit 35b10d52656cd6c4b3ac8a969b3290ddcec6e865)

commit 291ad5775f761230c62c308fa0de9abdb3032eeb
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

glibc: Remove kernel DRM headers (Bug #15547)
PATCHLEVEL++
Rebuild libdrm if drm/drm.h is registered as from glibc
(cherry picked from commit 8cfc3a7b0bad4d316a60721a0c8d74e9e92f72bd)

commit a2fc4beebb3cd62d97076bfde29569c72fa35582
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

qt4: Looks like qt4 needs to conflict even for minor revisions
(cherry picked from commit 73666e8aca16fc26ec55cf91b26613972e39eb5b)

commit 84de0e67120d4d32ae5a1c0b3206fbe6707cec1f
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Eric Sandall <sandalle AT sourcemage.org>

qt4 4.6.1

I had problem to cast it, eventually i dispelled it and then cast it
without problems. Seems it need conflicts itself not only if updating
4.5 -> 4.6. If qt4 doesn't cast for you, please try to dispel it and try
to cast it again.
(cherry picked from commit c5a9def0593caeb97924225720bd30fa580f73d2)

commit 772223f233abf0fc54cf6575fafb15ac437cbd7a
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

ifupdown: Just remove /sbin/ifdown if it exists before we install
Fix Bug #14367
(cherry picked from commit 68f6a3f00c14fd6d16f16812d1382090d3b2ec8d)

diff --git a/archive/gzip/DETAILS b/archive/gzip/DETAILS
index a7ac48c..228c87a 100755
--- a/archive/gzip/DETAILS
+++ b/archive/gzip/DETAILS
@@ -1,5 +1,6 @@
SPELL=gzip
- VERSION=1.3.13
+ VERSION=1.4
+ SECURITY_PATCH=1
SOURCE=$SPELL-${VERSION}.tar.gz
SOURCE2=$SOURCE.sig
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-${VERSION}
diff --git a/archive/gzip/HISTORY b/archive/gzip/HISTORY
index 3d5592e..59cf6e5 100644
--- a/archive/gzip/HISTORY
+++ b/archive/gzip/HISTORY
@@ -1,3 +1,6 @@
+2010-01-21 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 1.4, SECURITY_PATCH=1, CVE-2010-0001
+
2009-10-07 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.3.13
* PRE_BUILD, futimens: deleted
diff --git a/database/mysql/DETAILS b/database/mysql/DETAILS
index c24f582..f20f131 100755
--- a/database/mysql/DETAILS
+++ b/database/mysql/DETAILS
@@ -1,7 +1,10 @@
SPELL=mysql
if [[ $OLD == y ]]; then
- VERSION=5.0.89
- SECURITY_PATCH=3
+ VERSION=5.0.90
+ SOURCE2=$SOURCE.asc
+ SOURCE_GPG=mysql.gpg:$SOURCE2:UPSTREAM_KEY
+ SOURCE2_IGNORE=signature
+ SECURITY_PATCH=4
else
VERSION=5.1.41
fi
diff --git a/database/mysql/HISTORY b/database/mysql/HISTORY
index 5597d5a..c5e5dda 100644
--- a/database/mysql/HISTORY
+++ b/database/mysql/HISTORY
@@ -1,3 +1,6 @@
+2010-02-01 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 5.0.90 [old], SECURITY_PATCH++
+
2009-12-28 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 5.0.89 [old]

diff --git a/kde4-support/phonon/DETAILS b/kde4-support/phonon/DETAILS
index 3d25f68..d45df8e 100755
--- a/kde4-support/phonon/DETAILS
+++ b/kde4-support/phonon/DETAILS
@@ -15,8 +15,7 @@ else
VK=4.2.1

SOURCE_HASH=sha512:087728ae74f221b1b476cce279f2f313423d44bc8735f620450d129b2c55d79b132950653dd957fc1e7290101ef94983e13c99bed6365c45ce8cb493692cef48
SOURCE=$SPELL-$VERSION.tar.bz2
- SOURCE_URL[0]=$KDE_URL/stable/${VK}/src/$SOURCE
- SOURCE_URL[1]=$KDE_URL/stable/phonon/${VERSION}/$SOURCE
+ SOURCE_URL[0]=$KDE_URL/Attic/${VK}/src/$SOURCE
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
fi

diff --git a/kde4-support/phonon/HISTORY b/kde4-support/phonon/HISTORY
index 25e45b6..f847391 100644
--- a/kde4-support/phonon/HISTORY
+++ b/kde4-support/phonon/HISTORY
@@ -1,3 +1,9 @@
+2010-01-19 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: stable/4.2.1 got moved to Attic/4.2.1
+ See http://www.mail-archive.com/release-team AT kde.org/msg03306.html
+ Fixes Bug #15548
+ Removed SOURCE_URL[1], nothing in the phonon directory anymore
+
2009-12-05 Arwed v. Merkatz <v.merkatz AT gmx.net>
* DEPENDS: made glib2 a non-optional dependency,
bug #15506
diff --git a/kernels/ndiswrapper/BUILD b/kernels/ndiswrapper/BUILD
index b294f15..4627280 100755
--- a/kernels/ndiswrapper/BUILD
+++ b/kernels/ndiswrapper/BUILD
@@ -1 +1 @@
-make KVERS=$(get_kernel_version)
+make KVERS=$(get_kernel_version)
KBUILD=$INSTALL_ROOT/usr/src/linux-$(get_kernel_version)
diff --git a/kernels/ndiswrapper/FINAL b/kernels/ndiswrapper/FINAL
index 90fd9b3..b6f82ba 100755
--- a/kernels/ndiswrapper/FINAL
+++ b/kernels/ndiswrapper/FINAL
@@ -1 +1 @@
-rmdir $BUILD_DIRECTORY/ndiswrapper-svn
+[[ "$$NDIS_SVN" == "y" ]] && rmdir $BUILD_DIRECTORY/ndiswrapper-svn || true
diff --git a/kernels/ndiswrapper/HISTORY b/kernels/ndiswrapper/HISTORY
index 1cb3419..43dd37d 100644
--- a/kernels/ndiswrapper/HISTORY
+++ b/kernels/ndiswrapper/HISTORY
@@ -1,3 +1,8 @@
+2010-02-01 Eric Sandall <sandalle AT sourcemage.org>
+ * PRE_BUILD: Only create ndiswrapper-svn if NDIS_SVN = y
+ * BUILD,INSTALL: Needs KBUILD to find the kernel
+ * FINAL: Only remove ndiswrapper-svn if NDIS_SVN = y, always success
+
2009-01-22 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.54

diff --git a/kernels/ndiswrapper/INSTALL b/kernels/ndiswrapper/INSTALL
index 9a3312c..f84615e 100755
--- a/kernels/ndiswrapper/INSTALL
+++ b/kernels/ndiswrapper/INSTALL
@@ -1,2 +1,2 @@
-make KVERS=$(get_kernel_version) mandir=${INSTALL_ROOT}/usr/share/man
install &&
+make KVERS=$(get_kernel_version)
KBUILD=$INSTALL_ROOT/usr/src/linux-$(get_kernel_version)
mandir=${INSTALL_ROOT}/usr/share/man install &&
mkdir -p /etc/ndiswrapper
diff --git a/kernels/ndiswrapper/PRE_BUILD b/kernels/ndiswrapper/PRE_BUILD
index 6c8e209..1ec2ffd 100755
--- a/kernels/ndiswrapper/PRE_BUILD
+++ b/kernels/ndiswrapper/PRE_BUILD
@@ -1,2 +1,2 @@
-mkdir $BUILD_DIRECTORY/ndiswrapper-svn &&
+[[ "$$NDIS_SVN" == "y" ]] && mkdir $BUILD_DIRECTORY/ndiswrapper-svn
default_pre_build
diff --git a/libs/glibc/DETAILS b/libs/glibc/DETAILS
index ac7a739..fd8b4b3 100755
--- a/libs/glibc/DETAILS
+++ b/libs/glibc/DETAILS
@@ -41,7 +41,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
SOURCE_GPG=gnu.gpg:$SOURCE.sig:UPSTREAM_KEY
SOURCE2_IGNORE=signature
- PATCHLEVEL=0
+ PATCHLEVEL=1
fi
if [[ $GLIBC_SANITIZE_HEADERS == n ]]; then
HEADERS_VERSION=2.6.32
diff --git a/libs/glibc/HISTORY b/libs/glibc/HISTORY
index 3aaa8f9..8ef253a 100644
--- a/libs/glibc/HISTORY
+++ b/libs/glibc/HISTORY
@@ -1,3 +1,8 @@
+2010-01-19 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: PATCHLEVEL++
+ * PRE_BUILD: Remove kernel DRM headers (Bug #15547)
+ * UP_TRIGGERS: Rebuild libdrm if drm/drm.h is registered as from glibc
+
2009-12-30 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 2.11.1

diff --git a/libs/glibc/PRE_BUILD b/libs/glibc/PRE_BUILD
index c3bb267..c49726c 100755
--- a/libs/glibc/PRE_BUILD
+++ b/libs/glibc/PRE_BUILD
@@ -58,6 +58,13 @@ else
fi &&

#
+# Remove kernel DRM headers
+# Fixes Bug #15547
+#
+sed -i '/^header-y += drm\//d' $GLIBC_HEADERS_DIR/include/Kbuild &&
+rm -rf $GLIBC_HEADERS_DIR/include/drm &&
+
+#
# Now fixup the normal glibc
#
cd $SOURCE_DIRECTORY &&
diff --git a/libs/glibc/UP_TRIGGERS b/libs/glibc/UP_TRIGGERS
index 23d6683..b64343d 100755
--- a/libs/glibc/UP_TRIGGERS
+++ b/libs/glibc/UP_TRIGGERS
@@ -2,3 +2,7 @@ if ! spell_ok locale; then
up_trigger locale cast_self
echo
fi
+
+if $(gaze from $INSTALL_ROOT/usr/include/drm/drm.h|grep -q glibc); then
+ up_trigger libdrm cast_self
+fi
diff --git a/libs/gmime/DETAILS b/libs/gmime/DETAILS
index 713eb54..6c687bf 100755
--- a/libs/gmime/DETAILS
+++ b/libs/gmime/DETAILS
@@ -2,7 +2,8 @@
if [[ "$GMIME_22BRANCH" == "y" ]]; then
VERSION=2.2.23
else
- VERSION=2.4.11
+ VERSION=2.4.15
+ SECURITY_PATCH=1
fi
BRANCH=`echo $VERSION|cut -d . -f 1,2`
SOURCE=$SPELL-$VERSION.tar.gz
diff --git a/libs/gmime/HISTORY b/libs/gmime/HISTORY
index 46f8dde..e4dc28b 100644
--- a/libs/gmime/HISTORY
+++ b/libs/gmime/HISTORY
@@ -1,3 +1,6 @@
+2010-02-02 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 2.4.15, SECURITY_PATCH=1, possible buffer overflows
+
2009-11-07 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 2.4.11

diff --git a/libs/gmime/gmime-2.4.15.tar.gz.sig
b/libs/gmime/gmime-2.4.15.tar.gz.sig
new file mode 100644
index 0000000..07e56a4
Binary files /dev/null and b/libs/gmime/gmime-2.4.15.tar.gz.sig differ
diff --git a/libs/libdrm/BUILD b/libs/libdrm/BUILD
index e164734..7a65a7b 100755
--- a/libs/libdrm/BUILD
+++ b/libs/libdrm/BUILD
@@ -3,6 +3,8 @@ if [[ $LIBDRM_NV == y ]]; then
fi &&
if [[ $LIBDRM_INTEL == n ]]; then
OPTS="--disable-intel $OPTS"
+else
+ OPTS="--enable-intel $OPTS"
fi &&
if [[ $LIBDRM_RADEON == y ]]; then
OPTS="--enable-radeon-experimental-api $OPTS"
diff --git a/libs/libdrm/HISTORY b/libs/libdrm/HISTORY
index b90bf61..66320b1 100644
--- a/libs/libdrm/HISTORY
+++ b/libs/libdrm/HISTORY
@@ -1,3 +1,12 @@
+2010-01-20 Eric Sandall <sandalle AT sourcemage.org>
+ * {PRE_,}SUB_DEPENDS: Use correct flag ('y' not --enable-intel)
+ * BUILD: Pass --enable-intel when Intel KMS API is wanted
+ * REPAIR^none^{PRE_,}SUB_DEPENDS: Removed, unneeded
+
+2010-01-19 Eric Sandall <sandalle AT sourcemage.org>
+ * {PRE_,}SUB_DEPENDS: Allow forcing Intel KMS API
+ * REPAIR^none^{PRE_,}SUB_DEPENDS: Replace missing files
+
2009-12-18 Arjan Bouter <abouter AT sourcemage.org>
* CONFIGURE,BUILD,INSTALL: there is no longer a libdrm subdir
and the kernel modules can not be build here. Made intel optional.
diff --git a/libs/libdrm/PRE_SUB_DEPENDS b/libs/libdrm/PRE_SUB_DEPENDS
new file mode 100755
index 0000000..688b0c9
--- /dev/null
+++ b/libs/libdrm/PRE_SUB_DEPENDS
@@ -0,0 +1,5 @@
+case $THIS_SUB_DEPENDS in
+ INTEL) [[ "$LIBDRM_INTEL" == "y" ]] && return 0 ;;
+ *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}"
+ return 1;;
+esac
diff --git a/libs/libdrm/SUB_DEPENDS b/libs/libdrm/SUB_DEPENDS
new file mode 100755
index 0000000..c89b004
--- /dev/null
+++ b/libs/libdrm/SUB_DEPENDS
@@ -0,0 +1,7 @@
+case $THIS_SUB_DEPENDS in
+ INTEL) message "${SPELL_COLOR}libdrm${DEFAULT_COLOR}${MESSAGE_COLOR}
requested with Intel KMS API${DEFAULT_COLOR}" &&
+ LIBDRM_INTEL='y'
+ ;;
+ *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}"
+ return 1 ;;
+esac
diff --git a/mail/thunderbird/DETAILS b/mail/thunderbird/DETAILS
index 2313a4b..050286c 100755
--- a/mail/thunderbird/DETAILS
+++ b/mail/thunderbird/DETAILS
@@ -1,5 +1,5 @@
SPELL=thunderbird
- VERSION=3.0
+ VERSION=3.0.1
SOURCE=$SPELL-$VERSION.source.tar.bz2
SOURCE2=$SOURCE.asc
SOURCE_GPG="mozilla.gpg:$SOURCE2:UPSTREAM_KEY"
@@ -7,7 +7,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION

SOURCE_URL[0]=http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/$VERSION/source/$SOURCE

SOURCE2_URL[0]=http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/$VERSION/source/$SOURCE2
SOURCE2_IGNORE=signature
- SECURITY_PATCH=16
+ SECURITY_PATCH=17
WEB_SITE=http://www.mozilla.org/products/thunderbird/
ENTERED=20041028
LICENSE[0]=MOZILLA
diff --git a/mail/thunderbird/HISTORY b/mail/thunderbird/HISTORY
index bd9a2e2..396e705 100644
--- a/mail/thunderbird/HISTORY
+++ b/mail/thunderbird/HISTORY
@@ -1,3 +1,6 @@
+2010-01-25 George Sherwood <gsherwood AT sourcemage.org>
+ * DETAILS: Updated to version 3.0.1. SECURITY_PATCH++
+
2009-12-22 Eric Sandall <sandalle AT sourcemage.org>
* PREPARE: Removed, unused
* DETAILS: Updated to 3.0
diff --git a/net/ifupdown/HISTORY b/net/ifupdown/HISTORY
index 8c7cee2..e2eb434 100644
--- a/net/ifupdown/HISTORY
+++ b/net/ifupdown/HISTORY
@@ -1,3 +1,7 @@
+2010-01-31 Eric Sandall <sandalle AT sourcemage.org>
+ * INSTALL: Just remove /sbin/ifdown if it exists before we install
+ Fix Bug #14367
+
2009-10-19 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.6.9

diff --git a/net/ifupdown/INSTALL b/net/ifupdown/INSTALL
index 9e8f6b8..fda0e79 100755
--- a/net/ifupdown/INSTALL
+++ b/net/ifupdown/INSTALL
@@ -1,6 +1,5 @@
-# the makefile doesn't ln -sf so it might fail. so we destroy an easily
-# creatable symlink for safety
-if [ -h $INSTALL_ROOT/sbin/ifdown ]; then
+# the makefile doesn't ln -sf so it might fail.
+if [ -f $INSTALL_ROOT/sbin/ifdown ]; then
rm -f $INSTALL_ROOT/sbin/ifdown
fi &&

diff --git a/security/wireshark/DETAILS b/security/wireshark/DETAILS
index cae2d5e..1d39369 100755
--- a/security/wireshark/DETAILS
+++ b/security/wireshark/DETAILS
@@ -1,11 +1,11 @@
SPELL=wireshark
- VERSION=1.2.5
- SECURITY_PATCH=20
+ VERSION=1.2.6
+ SECURITY_PATCH=21
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
SOURCE_URL[1]=http://www.wireshark.org/download/src/$SOURCE
-
SOURCE_HASH=sha512:a5c8a9a54606f885de56b73a88ba21a149433ee177d8a12ec10192a9300dd9c026142415d2ed5fb016c61c0b61ee9fde1f1a99ad08a8772256046e106bdf19a8
+
SOURCE_HASH=sha512:39e6abf40b0a399250d412df6dc58d9b7a1b0bf073aa3c21674f4c8e3df6cb05411c76dca58c22bb3da4d28529c7ad3ee57206e478cd59d9ad442ef3bfbfc762
WEB_SITE=http://www.wireshark.org/
ENTERED=20020116
LICENSE[0]=GPL
diff --git a/security/wireshark/HISTORY b/security/wireshark/HISTORY
index a42b71a..66728d5 100644
--- a/security/wireshark/HISTORY
+++ b/security/wireshark/HISTORY
@@ -1,3 +1,7 @@
+2010-01-28 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 1.2.6, SECURITY_PATCH=21
+ http://www.wireshark.org/security/wnpa-sec-2010-02.html
+
2009-12-18 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 1.2.5, SECURITY_PATCH++
http://www.wireshark.org/security/wnpa-sec-2009-09.html
diff --git a/utils/coreutils/DETAILS b/utils/coreutils/DETAILS
index 1779a22..f6f42be 100755
--- a/utils/coreutils/DETAILS
+++ b/utils/coreutils/DETAILS
@@ -1,5 +1,5 @@
SPELL=coreutils
- VERSION=8.2
+ VERSION=7.6
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SOURCE.sig
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/utils/coreutils/HISTORY b/utils/coreutils/HISTORY
index 6d1d021..a278eef 100644
--- a/utils/coreutils/HISTORY
+++ b/utils/coreutils/HISTORY
@@ -1,6 +1,3 @@
-2009-12-12 Vlad Glagolev <stealth AT sourcemage.org>
- * DETAILS: updated spell to 8.2
-
2009-09-11 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 7.6

diff --git a/x11-toolkits/qt4/CONFLICTS b/x11-toolkits/qt4/CONFLICTS
index 6c9828d..be85071 100755
--- a/x11-toolkits/qt4/CONFLICTS
+++ b/x11-toolkits/qt4/CONFLICTS
@@ -1,7 +1 @@
-if spell_ok $SPELL;then
- OLDQT=`installed_version $SPELL| cut -c-3` &&
- NEWQT=`echo $VERSION | cut -c-3`
- if [[ $OLDQT != $NEWQT ]];then
- conflicts qt4 y
- fi
-fi
+conflicts qt4 y
diff --git a/x11-toolkits/qt4/DETAILS b/x11-toolkits/qt4/DETAILS
index 09a1fb7..7dbc0a5 100755
--- a/x11-toolkits/qt4/DETAILS
+++ b/x11-toolkits/qt4/DETAILS
@@ -4,8 +4,8 @@ if [[ $QT_TMPFS == n ]]; then
TMPFS=off
fi
SPELLX=qt-everywhere-opensource-src
- VERSION=4.6.0
-
SOURCE_HASH=sha512:fb67e20426565723757cd12fbe130352fb04817b508bf35df79ba5545d3b7bfd7af4016206d8070ce4a85209849886968db2519621f3b96e2f5c6a28934b2386
+ VERSION=4.6.1
+
SOURCE_HASH=sha512:a3c16a138a578e4016279627e933bdbb87923770e5c877c83a3cbdb15a5575fe7fefcb63c39faaed30cdb7d36aeec0d1bc3b5d8d3902a6ce5763c5f9e91919bc
SOURCE=$SPELLX-$VERSION.tar.gz
URI=qt/source/$SOURCE
SECURITY_PATCH=3
diff --git a/x11-toolkits/qt4/HISTORY b/x11-toolkits/qt4/HISTORY
index efdade3..570e16a 100644
--- a/x11-toolkits/qt4/HISTORY
+++ b/x11-toolkits/qt4/HISTORY
@@ -1,3 +1,9 @@
+2010-01-21 Eric Sandall <sandalle AT sourcemage.org>
+ * CONFLICTS: Looks like qt4 needs to conflict even for minor revisions
+
+2010-01-22 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 4.6.1
+
2009-12-01 Eric Sandall <sandalle AT sourcemage.org>
* CONFLICTS: SELF -> SPELL, there is no SELF
Remove debug message, corrupted conflict message to:
diff --git a/xorg-driver/xf86-video-intel/DEPENDS
b/xorg-driver/xf86-video-intel/DEPENDS
index b424254..856747b 100755
--- a/xorg-driver/xf86-video-intel/DEPENDS
+++ b/xorg-driver/xf86-video-intel/DEPENDS
@@ -1,4 +1,4 @@
-depends libdrm &&
+depends -sub "INTEL" libdrm &&
depends libxvmc &&
depends xproto &&
depends xorg-server &&
diff --git a/xorg-driver/xf86-video-intel/HISTORY
b/xorg-driver/xf86-video-intel/HISTORY
index 1b28eb1..af54403 100644
--- a/xorg-driver/xf86-video-intel/HISTORY
+++ b/xorg-driver/xf86-video-intel/HISTORY
@@ -1,3 +1,7 @@
+2010-01-19 Eric Sandall <sandalle AT sourcemage.org>
+ * DEPENDS: Depends on libdrm built with Intel KMS API
+ Fixes one issue found in Bug #15547
+
2009-10-26 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: Updated to 2.9.1
SOURCE matches upstream posted MD5
diff --git a/xorg-lib/libxtst/DEPENDS b/xorg-lib/libxtst/DEPENDS
index de708a5..b6a3d73 100755
--- a/xorg-lib/libxtst/DEPENDS
+++ b/xorg-lib/libxtst/DEPENDS
@@ -6,4 +6,5 @@ depends recordproto &&
depends xextproto &&
depends inputproto &&
depends libx11 &&
-depends libxext
+depends libxext &&
+depends libxi
diff --git a/xorg-lib/libxtst/HISTORY b/xorg-lib/libxtst/HISTORY
index dbd9f9f..e21250b 100644
--- a/xorg-lib/libxtst/HISTORY
+++ b/xorg-lib/libxtst/HISTORY
@@ -1,3 +1,6 @@
+2010-02-03 Tommy Boatman <tboatman AT sourcemage.org>
+ * DEPENDS: added libxi as dependency (bug 15561)
+
2009-10-04 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.1.0

[SM-Commit] GIT changes to stable-0.40 grimoire by Eric Sandall (17a52dd9a03ff53ce0fd5cfaa5c992895e84dc38), Eric Sandall, 02/06/2010