Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to stable-0.22 grimoire by Arwed von Merkatz (69abc2fcba7e8ce1049c5545e6ba7589742c7b33)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Arwed von Merkatz <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to stable-0.22 grimoire by Arwed von Merkatz (69abc2fcba7e8ce1049c5545e6ba7589742c7b33)
  • Date: Wed, 18 Jun 2008 12:44:23 -0500

GIT changes to stable-0.22 grimoire by Arwed von Merkatz <v.merkatz AT gmx.net>:

VERSION | 2 +-
crypto/openssh/DEPENDS | 17 +++++++++++------
crypto/openssh/HISTORY | 3 +++
e-17/imlib2_loaders/DETAILS | 4 ++--
e-17/imlib2_loaders/HISTORY | 3 +++
e/eterm/DETAILS | 7 ++++---
e/eterm/HISTORY | 6 ++++++
e/imlib2/DETAILS | 5 +++--
e/imlib2/HISTORY | 3 +++
http/apache22/DETAILS | 4 ++--
http/apache22/HISTORY | 3 +++
mail/spambayes/DETAILS | 1 -
mail/spambayes/HISTORY | 3 +++
video/vlc/DETAILS | 6 +++---
video/vlc/HISTORY | 3 +++
x11-libs/wine/HISTORY | 7 ++++++-
x11-libs/wine/PRE_BUILD | 7 +++++++
17 files changed, 63 insertions(+), 21 deletions(-)

New commits:
commit 69abc2fcba7e8ce1049c5545e6ba7589742c7b33
Author: Arwed von Merkatz <v.merkatz AT gmx.net>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>

VERSION 0.22-1

commit 594c443a823b82c447650b8b94f498e443e18be2
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>

wine: fixed compilation with new openssl (>=0.9.8h)

commit 42f984fc98de694bffcf6764400398482894b6c5
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>

openssh: xauth is only available in xorg-modular #14532
(cherry picked from commit f2e54ee6d2dee4896a672e7190882a2bd0163da4)

commit 1f349af0c651ca7738557a96fdd80a4180ecf3f5
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>

spambayes: BUILD_API=1 was still set after two years since the port to 2
#14246
(cherry picked from commit 221961ea6e25bedaa3f2eed7394669045159aae1)

commit 5b06cc2344ef09e4a9d56ce6b30778134ac3c482
Author: Julien ROZO <julien AT rozo.org>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>

vlc: version 0.8.6h re-released
(cherry picked from commit 34290334c807c84a098001dce15dd9dca0387161)

commit ba96d1be3e78cb7ca90a33c345096b3891236717
Author: Ladislav Hagara <ladislav.hagara AT unob.cz>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>

apache22 2.2.9, SECURITY_PATCH=4, CVE-2008-2364, CVE-2007-6420
(cherry picked from commit 6338e0457d19378b014282d57140476a7781d451)

commit dccf794195a6fd03591572372bc3d49f7c993f88
Author: Ladislav Hagara <ladislav.hagara AT unob.cz>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>

imlib2_loaders 1.4.1
I still think that the split up of e section to e, e-16 and e-17 was
useless and confusing.
(cherry picked from commit 37aa0e8feaa14def52ec094b2e85854f65484693)

commit 2878b668b305e3aeb9d42bdd5dcb0755ba2ed5d7
Author: Ladislav Hagara <ladislav.hagara AT unob.cz>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>

imlib2 1.4.1
(cherry picked from commit bab5a3f6e89918acc72285bd5b15627df7d2f999)

commit a1f3f446dd9affcaa2ae459969f69c2d324ad230
Author: Ladislav Hagara <ladislav.hagara AT unob.cz>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>

eterm SECURITY_PATCH=1
(cherry picked from commit 2537a5031ff8cec60d64b35bad4aa9d79f970754)

commit 206d9b612525b15024546a5653fa3b31e4640c13
Author: Ladislav Hagara <ladislav.hagara AT unob.cz>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>

eterm 0.9.5
(cherry picked from commit 2f1c4a5f498da676d6bc29311a578bb00158a630)

diff --git a/VERSION b/VERSION
index ac7e0a0..3d1c3d5 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.22-0
+0.22-1
diff --git a/crypto/openssh/DEPENDS b/crypto/openssh/DEPENDS
index eeafc7b..6f8d43d 100755
--- a/crypto/openssh/DEPENDS
+++ b/crypto/openssh/DEPENDS
@@ -4,11 +4,6 @@ depends openssl &&
depends smgl-fhs &&
depends zlib &&

-optional_depends "xauth" \
- "--with-xauth=${INSTALL_ROOT}/usr/bin/xauth" \
- "" \
- "X server auth (needed by X11Forwarding)" &&
-
optional_depends "tcp_wrappers" \
"--with-tcp-wrappers" \
"" \
@@ -22,4 +17,14 @@ optional_depends "linux-pam"
\
optional_depends "krb5" \
"--with-kerberos5=/usr" \
"" \
- "to enable Kerberos 5 support"
+ "to enable Kerberos 5 support" &&
+
+optional_depends "X11-SERVER" \
+ "" \
+ "" \
+ "X server auth (needed by X11Forwarding)" &&
+
+. $GRIMOIRE/FUNCTIONS &&
+if check_if_xorg_modular_server; then
+ depends xauth --with-xauth="${INSTALL_ROOT}/usr/bin/xauth"
+fi
diff --git a/crypto/openssh/HISTORY b/crypto/openssh/HISTORY
index df5d5c5..aaa06b6 100644
--- a/crypto/openssh/HISTORY
+++ b/crypto/openssh/HISTORY
@@ -1,3 +1,6 @@
+2008-06-13 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * DEPENDS: xauth is only available in xorg-modular #14532
+
2008-04-03 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 5.0p1, SECURITY_PATCH=3, CVE-2008-1483
http://www.openssh.org/txt/release-5.0
diff --git a/e-17/imlib2_loaders/DETAILS b/e-17/imlib2_loaders/DETAILS
index bed2e42..35c7fc0 100755
--- a/e-17/imlib2_loaders/DETAILS
+++ b/e-17/imlib2_loaders/DETAILS
@@ -11,10 +11,10 @@ if [ "$IMLIB2_LOADERS_CVS" == "y" ]; then
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-cvs
SOURCE_IGNORE=volatile
else
- VERSION=1.4.0
+ VERSION=1.4.1
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_URL[0]=$SOURCEFORGE_URL/enlightenment/$SOURCE
-
SOURCE_HASH=sha512:1e192b07d0c30ed92e0e4439263e3a0f18f007f9948ca0cfbeecc7514bc9a20f22e8b07e7d947a65d0c7106d76c578e872fc00ee8dfff0a29e1fe330687b6a27
+
SOURCE_HASH=sha512:e630283c769bceae0979572dd979a56c0b89ab6649762439cadf8dad84fb2898bc91f79da2cbdad136421e86859f8b610a56ee90c37aa6a748c5f145d4b0414d
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
fi
WEB_SITE=http://enlightenment.org
diff --git a/e-17/imlib2_loaders/HISTORY b/e-17/imlib2_loaders/HISTORY
index 6d60668..eccb839 100644
--- a/e-17/imlib2_loaders/HISTORY
+++ b/e-17/imlib2_loaders/HISTORY
@@ -1,3 +1,6 @@
+2008-06-10 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 1.4.1
+
2007-05-06 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.4.0

diff --git a/e/eterm/DETAILS b/e/eterm/DETAILS
index 71edb9c..bf12d80 100755
--- a/e/eterm/DETAILS
+++ b/e/eterm/DETAILS
@@ -1,11 +1,11 @@
SPELL=eterm
if [ "$ETERM_CVS" != "y" ]; then
- VERSION=0.9.4
+ VERSION=0.9.5
SOURCE=Eterm-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/Eterm-$VERSION
SOURCE_URL[0]=http://www.eterm.org/download/$SOURCE
SOURCE_URL[1]=$SOURCEFORGE_URL/$SPELL/$SOURCE
-
SOURCE_HASH=sha512:39101e3b30188e2c0aa245fc254221209a62b13da58b2abcd1b0962091f01abbfd8c58a97b057019b4a8e738741d803ab51c4051f10f9c712c3b88ffc57b7df3
+
SOURCE_HASH=sha512:ef16ec5ddf0dd91ed4c40eff2289f7a61aa5c0fbf3b95bd14afe38557572f586f1dcd459c258cdfadb1dfbc1c50874492c9cc69ee4152a569b097e86c0d7cc44
# SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
else
if [ "$ETERM_CVS_AUTOUPDATE" == "y" ]; then
@@ -19,7 +19,8 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-cvs/
FORCE_DOWNLOAD[1]=on
SOURCE_IGNORE=volatile
fi
- SOURCE2=Eterm-bg-0.9.4.tar.gz
+ SECURITY_PATCH=1
+ SOURCE2=Eterm-bg-0.9.5.tar.gz
SOURCE2_URL[0]=http://www.eterm.org/download/$SOURCE2
SOURCE2_URL[1]=$SOURCEFORGE_URL/$SPELL/$SOURCE

SOURCE2_HASH=sha512:2d58d1342c7750f8dde93451b732cff3a0580d76635054632728cf2d8e5c5298732c855672981810cf21a8d1f5d46626abe1f35fbf33e2b713cc5d6bc82d10f8
diff --git a/e/eterm/HISTORY b/e/eterm/HISTORY
index 64672d3..26db368 100644
--- a/e/eterm/HISTORY
+++ b/e/eterm/HISTORY
@@ -1,3 +1,9 @@
+2008-06-14 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: SECURITY_PATCH=1, CVE-2008-1692
+
+2008-06-12 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 0.9.5
+
2008-02-28 Dale E. Edmons <linuxfan AT sourcemage.org>
* DETAILS: KEYWORDS update.

diff --git a/e/imlib2/DETAILS b/e/imlib2/DETAILS
index 499af2d..a074e7e 100755
--- a/e/imlib2/DETAILS
+++ b/e/imlib2/DETAILS
@@ -11,10 +11,11 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-cvs
SOURCE_IGNORE=volatile
FORCE_DOWNLOAD=on
else
- VERSION=1.4.0
+ VERSION=1.4.1
+ SECURITY_PATCH=1
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_URL[0]=$SOURCEFORGE_URL/enlightenment/$SOURCE
-
SOURCE_HASH=sha512:adc5bb7cf9f7072c9f90755e23e56c26dfe31dd70ba719e79c82fe167a5b6754b18e0513f17129411959b700a0e4cef3794cb2cdecb172ed4549da4459ef44a8
+
SOURCE_HASH=sha512:532237ceab36c74b26caf4186e9e27690211f27d4ff8e442f4e40df22d9c37bd82038d58475ea37e6f3b013668e94753b2e23ec0eed478a67ecebbe724668f66
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-${VERSION%-*}
fi
WEB_SITE=http://enlightenment.org/Libraries/Imlib2/
diff --git a/e/imlib2/HISTORY b/e/imlib2/HISTORY
index cd42315..cfade4e 100644
--- a/e/imlib2/HISTORY
+++ b/e/imlib2/HISTORY
@@ -1,3 +1,6 @@
+2008-06-10 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 1.4.1, SECURITY_PATCH=1
+
2008-02-28 Dale E. Edmons <linuxfan AT sourcemage.org>
* DETAILS: KEYWORDS update.

diff --git a/http/apache22/DETAILS b/http/apache22/DETAILS
index f2203bf..7880955 100755
--- a/http/apache22/DETAILS
+++ b/http/apache22/DETAILS
@@ -1,6 +1,6 @@
SPELL=apache22
- VERSION=2.2.8
- SECURITY_PATCH=3
+ VERSION=2.2.9
+ SECURITY_PATCH=4
SOURCE=httpd-$VERSION.tar.gz
SOURCE2=$SOURCE.asc
SOURCE_GPG="apache.gpg:$SOURCE2:UPSTREAM_KEY"
diff --git a/http/apache22/HISTORY b/http/apache22/HISTORY
index cb9dc7a..0fa393d 100644
--- a/http/apache22/HISTORY
+++ b/http/apache22/HISTORY
@@ -1,3 +1,6 @@
+2008-06-14 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 2.2.9, SECURITY_PATCH=4, CVE-2008-2364, CVE-2007-6420
+
2008-05-27 Remko van der Vossen <wich AT sourcemage.org>
* CONFLICTS: conflict with xshttpd if that is compiled without prefix
* PREPARE: 'type' "2.2.3" -> "2.2.*"
diff --git a/mail/spambayes/DETAILS b/mail/spambayes/DETAILS
index cc007e2..933ea4b 100755
--- a/mail/spambayes/DETAILS
+++ b/mail/spambayes/DETAILS
@@ -8,7 +8,6 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
ENTERED=20030305
LICENSE[0]=PYTHON
KEYWORDS="mail"
- BUILD_API=1
SHORT="The SpamBayes project is working on developing a Bayesian
anti-spam filter."
cat << EOF
The SpamBayes project is working on developing a Bayesian anti-spam filter.
diff --git a/mail/spambayes/HISTORY b/mail/spambayes/HISTORY
index 6cebdab..4ec0603 100644
--- a/mail/spambayes/HISTORY
+++ b/mail/spambayes/HISTORY
@@ -1,3 +1,6 @@
+2008-06-16 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * DETAILS: BUILD_API=1 was still set #14246
+
2006-10-03 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: [automated] Removed UPDATED.

diff --git a/video/vlc/DETAILS b/video/vlc/DETAILS
index f75105a..f44b0bc 100755
--- a/video/vlc/DETAILS
+++ b/video/vlc/DETAILS
@@ -1,15 +1,15 @@
SPELL=vlc
- VERSION=0.8.6g
+ VERSION=0.8.6h
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://download.videolan.org/pub/vlc/$VERSION/$SOURCE
WEB_SITE=http://www.videolan.org
-
SOURCE_HASH=sha512:482c63b2618e7ad4578c59a62facd83510a3b2b41e2e270b06128312f58f008bd38ef2d545f0029809020b843bcee77aa2553d98b18dff53bd11e3d07cbd6185
+
SOURCE_HASH=sha512:35a5be997854de19a4075c3272beb7c91382b6bbbe892ddfe8e69d3818dc137ae7d1654540e266322363586cbcbc4864ab572a32a3f576769990049e381e6d64
# SOURCE_GPG="gurus.gpg:$SOURCE.sig:WORKS_FOR_ME"
LICENSE[0]=GPL
ENTERED=20011113
KEYWORDS="player video"
- SECURITY_PATCH=6
+ SECURITY_PATCH=7
SHORT="multimedia player"
cat << EOF
VLC (initially VideoLAN Client) is a highly portable multimedia player for
diff --git a/video/vlc/HISTORY b/video/vlc/HISTORY
index c573e14..9cb7b52 100644
--- a/video/vlc/HISTORY
+++ b/video/vlc/HISTORY
@@ -1,3 +1,6 @@
+2008-06-04 Julien "_kaze_" ROZO <julien AT rozo.org>
+ * DETAILS: updated version to 0.8.6h, SECURITY_PATCH=7
+
2008-05-23 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: updated SOURCE_HASH #14520

diff --git a/x11-libs/wine/HISTORY b/x11-libs/wine/HISTORY
index b45825b..7fedd87 100644
--- a/x11-libs/wine/HISTORY
+++ b/x11-libs/wine/HISTORY
@@ -1,3 +1,9 @@
+2008-05-31 Vlad Glagolev <stealth AT sourcemage.org>
+ * PRE_BUILD: added fix for openssl>=0.9.8h
+
+2008-05-30 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.0-rc3
+
2008-05-23 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.0-rc2

@@ -462,4 +468,3 @@
2002-05-23 Adam Clark <adamsgl AT dhbit.ca>
* DETAILS: updated to 20020509
* HISTORY: added this HISTORY file
-
diff --git a/x11-libs/wine/PRE_BUILD b/x11-libs/wine/PRE_BUILD
new file mode 100755
index 0000000..7b20d10
--- /dev/null
+++ b/x11-libs/wine/PRE_BUILD
@@ -0,0 +1,7 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+
+# fix for openssl>=0.9.8h
+sed -i "s:X509_EXTENSIONS:X509_EXTENSIONZ:" dlls/crypt32/{en,de}code.c \
+ dlls/crypt32/tests/encode.c \
+ include/wincrypt.h



  • [SM-Commit] GIT changes to stable-0.22 grimoire by Arwed von Merkatz (69abc2fcba7e8ce1049c5545e6ba7589742c7b33), Arwed von Merkatz, 06/18/2008

Archive powered by MHonArc 2.6.24.

Top of Page