sm-commit AT lists.ibiblio.org
Subject: Source Mage code commit list
List archive
[SM-Commit] GIT changes to devel-xorg-modular grimoire by Vlad Glagolev (857fe5b7d01039f1ddde6a112a22cb9bbc27815c)
- From: Vlad Glagolev <scm AT sourcemage.org>
- To: sm-commit AT lists.ibiblio.org
- Subject: [SM-Commit] GIT changes to devel-xorg-modular grimoire by Vlad Glagolev (857fe5b7d01039f1ddde6a112a22cb9bbc27815c)
- Date: Thu, 6 Dec 2012 19:29:15 -0600
GIT changes to devel-xorg-modular grimoire by Vlad Glagolev
<stealth AT sourcemage.org>:
audio-creation/amsynth/BUILD | 6
audio-creation/amsynth/DEPENDS | 10
audio-creation/amsynth/DETAILS | 13
audio-creation/amsynth/HISTORY | 7
audio-creation/amsynth/INSTALL | 3
audio-creation/amsynth/PRE_BUILD | 4
audio-libs/dssi/HISTORY | 3
audio-libs/dssi/PRE_SUB_DEPENDS | 4
audio-libs/dssi/REPAIR^none^PRE_SUB_DEPENDS | 4
audio-libs/dssi/SUB_DEPENDS | 7
audio-players/mpd/CONFIGURE | 26 +
audio-players/mpd/DEPENDS | 45 +-
audio-players/mpd/DETAILS | 4
audio-players/mpd/HISTORY | 7
crypto/ccrypt/DEPENDS | 9
crypto/ccrypt/DETAILS | 4
crypto/ccrypt/HISTORY | 4
database/postgresql/DETAILS | 4
database/postgresql/HISTORY | 3
gnome3-libs/libsecret/DETAILS | 4
gnome3-libs/libsecret/HISTORY | 3
kernels/linux/HISTORY | 9
kernels/linux/info/patches/maintenance_patches_3/patch-3.0.54 | 5
kernels/linux/info/patches/maintenance_patches_3/patch-3.0.55 | 5
kernels/linux/info/patches/maintenance_patches_3/patch-3.2.35 | 5
kernels/linux/info/patches/maintenance_patches_3/patch-3.4.21 | 5
kernels/linux/info/patches/maintenance_patches_3/patch-3.4.22 | 5
kernels/linux/info/patches/maintenance_patches_3/patch-3.6.9 | 5
kernels/linux/latest.defaults | 2
net/bind-tools/DETAILS | 4
net/bind-tools/HISTORY | 3
net/bind/DETAILS | 4
net/bind/HISTORY | 3
net/samba/DETAILS | 5
net/samba/HISTORY | 3
net/tor/DETAILS | 4
net/tor/HISTORY | 3
php-pear/xcache/DETAILS | 4
php-pear/xcache/FINAL | 2
php-pear/xcache/HISTORY | 5
php-pear/xcache/PRE_BUILD | 3
python-pypi/baker/DETAILS | 4
python-pypi/baker/HISTORY | 3
python-pypi/beaker/DETAILS | 4
python-pypi/beaker/HISTORY | 3
python-pypi/mako/DETAILS | 4
python-pypi/mako/HISTORY | 3
python-pypi/mercurial/DETAILS | 4
python-pypi/mercurial/HISTORY | 3
python-pypi/python-markdown/DETAILS | 4
python-pypi/python-markdown/HISTORY | 3
python-pypi/pyutil/DETAILS | 4
python-pypi/pyutil/HISTORY | 3
python-pypi/webob/DETAILS | 6
python-pypi/webob/HISTORY | 3
utils/util-linux/BUILD | 4
utils/util-linux/DETAILS | 4
utils/util-linux/HISTORY | 5
utils/xen/DETAILS | 2
utils/xen/HISTORY | 8
utils/xen/PRE_BUILD | 11
utils/xen/xsa-12.patch | 22 +
utils/xen/xsa-13.patch | 30 +
utils/xen/xsa-14.patch | 22 +
utils/xen/xsa-16.patch | 31 +
utils/xen/xsa-17.patch | 113 ++++++
utils/xen/xsa-26.patch | 107 ++++++
utils/xen/xsa-27.patch | 168
++++++++++
utils/xen/xsa-28.patch | 36 ++
utils/xen/xsa-29.patch | 49 ++
utils/xen/xsa-30.patch | 57 +++
utils/xen/xsa-31.patch | 50 ++
video/ffmpeg/DETAILS | 2
video/ffmpeg/HISTORY | 3
74 files changed, 968 insertions(+), 65 deletions(-)
New commits:
commit e59d9f790933c133621d604bbb29cbfea890a3c6
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
bind-tools: => 9.9.2-P1 (security)
commit 6c5b259fdace0f8a70c896153582ee79109b11bd
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
bind: => 9.8.4-P1 (security)
commit 0f17afe9fbb2569d8bb3c02035f1353f774d0024
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
tor: => 0.2.3.25 (security)
commit c00291a5bee6e4b5cc89a008f7cc34c9e3148f74
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
xen: security update
commit b52333c40bf43ec491eb432c2986511c2c80cd0b
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
xen: SECURITY_PATCH++ for real
commit ef51862533d5b2b8aa63e2f27d35aaca20630bac
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
xen: security update
commit 1ff7ccff1347f6f1228c9644f8193e52aa8e1a4c
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
linux: => 3.4.22 (lts)
commit 7e7b598fd7f1c3dbb38c1bcb803c079802f0da7f
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
linux: => 3.2.35 (lts)
commit 274863411cd4a23ff97fc3a48e9dabef77d7584e
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
linux: => 3.0.55 (lts)
commit 0e5dd9b0f1891a37f463c75354e422f8a3a31363
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
postgresql: => 9.2.2
commit 9bd919e1dc8616a60e2dbd02917087d3a72ed671
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
baker: => 1.3
commit 83290b126b5f512d68e1fda07ceb60a75e591b14
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
webob: => 1.2.3
commit 3c474aee94b94d9b6fd43c7cd701e38b647dabd5
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
pyutil: => 1.9.4
commit 160e817d64788ef8c99022dede565b1001ba3264
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
python-markdown: => 2.2.1
commit 5723cb5bbfde1c5c23efc9f19abaaf53e6a9b921
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
beaker: => 1.6.4
commit eeed714fb87c0389a731c6b195ee6a6f13b5049f
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
mako: => 0.7.3
commit 5402c2c1c74d21d6b0bd895fe703e786fe234491
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
mercurial: => 2.4.1
commit fa4287b699775cd67458168825fa39b385d5c09e
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
amsynth: => 1.3.2
commit 182b102ae6b30e71825730cfecb37be4338e379d
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
dssi: added HOST subdependency
commit 41763278eac7a1d0f384317d5ad70deb86f01ec0
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
samba: => 3.6.9
commit c053c64cbbeb86ad35f4c934b1fdad08bd9ecf80
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
libsecret: => 0.11
commit 350036874500e734d1adeb5462fb4e76d56798f1
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
ccrypt: => 1.10
commit ff51f5f08ff2b2f52aa99c2c7a62754d4c0701e8
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>
util-linux 2.22.1
commit debfdd53092afe458d797ae65e823e9998118d2e
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
xcache: => 3.0.0
commit 4095f2525a48a4a1e35640e4deaf4ef7ae21a8d0
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>
ffmpeg 1.0.1
commit bf2f5c9f04b6b123660700fe3f5af58f2d97af61
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>
linux 3.6.9
commit 8d90509cd52acfb9c67cb0be25df541c85145314
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
mpd: => 0.17.2
diff --git a/audio-creation/amsynth/BUILD b/audio-creation/amsynth/BUILD
index abcd625..dd6f775 100755
--- a/audio-creation/amsynth/BUILD
+++ b/audio-creation/amsynth/BUILD
@@ -1 +1,5 @@
-OPTS="--disable-dependency-tracking $AMSYNTH_OSS $OPTS" default_build
+OPTS="--disable-dependency-tracking \
+ $AMSYNTH_OSS \
+ $OPTS" &&
+
+default_build
diff --git a/audio-creation/amsynth/DEPENDS b/audio-creation/amsynth/DEPENDS
index a05928e..2219905 100755
--- a/audio-creation/amsynth/DEPENDS
+++ b/audio-creation/amsynth/DEPENDS
@@ -13,6 +13,16 @@ optional_depends JACK-DRIVER \
"--without-jack" \
"for JACK support" &&
+optional_depends lash \
+ "--with-lash" \
+ "--without-lash" \
+ "for LASH support" &&
+
+optional_depends -sub HOST dssi \
+ "--with-dssi" \
+ "--without-dssi" \
+ "to build DSSI plugin" &&
+
optional_depends libsndfile \
"--with-sndfile" \
"--without-sndfile" \
diff --git a/audio-creation/amsynth/DETAILS b/audio-creation/amsynth/DETAILS
index b5f24fd..1a4cb32 100755
--- a/audio-creation/amsynth/DETAILS
+++ b/audio-creation/amsynth/DETAILS
@@ -1,10 +1,11 @@
SPELL=amsynth
- VERSION=1.2.0
- SOURCE=amSynth-$VERSION.tar.gz
- SOURCE_URL[0]=$SOURCEFORGE_URL/amsynthe/$SOURCE
-
SOURCE_HASH=sha512:fe0fd4a7f86de8c72040d789bde97a058c90ec0251e5d2d325a3cb1365e38b5518fc3082d5c2b73e5e10da6b1ef8e3b4495debec8a76fd7b70bf7a38f09bd269
-SOURCE_DIRECTORY="$BUILD_DIRECTORY/amSynth-$VERSION"
- WEB_SITE=http://amsynthe.sourceforge.net/
+ SPELLX=amSynth
+ VERSION=1.3.2
+ SOURCE=$SPELLX-$VERSION.tar.gz
+ SOURCE_URL[0]=http://amsynth.googlecode.com/files/$SOURCE
+
SOURCE_HASH=sha512:c5f312fd1fa5335ccd2c1e7a81a7c0f9094faabec633fe654f04650e5604bb6d05f1348f6ce3c305e840692e2012ac9501ca83f5e5018a0218d9c35a99678e80
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELLX-$VERSION"
+ WEB_SITE=http://code.google.com/p/amsynth/
LICENSE[0]=GPL
ENTERED=20070301
KEYWORDS="editors audio"
diff --git a/audio-creation/amsynth/HISTORY b/audio-creation/amsynth/HISTORY
index 5fb6744..7340aa3 100644
--- a/audio-creation/amsynth/HISTORY
+++ b/audio-creation/amsynth/HISTORY
@@ -1,3 +1,10 @@
+2012-12-05 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 1.3.2; renewed urls
+ * BUILD: added missing "&&"
+ * DEPENDS: added dssi and lash optional dependencies
+ * PRE_BUILD: added, to fix build with recent libtool
+ * INSTALL: added, to fix multijob install
+
2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DEPENDS: changed dependency on g++ to dependency on gcc with
sub-depends on CXX (scripted)
diff --git a/audio-creation/amsynth/INSTALL b/audio-creation/amsynth/INSTALL
new file mode 100755
index 0000000..9d9a4c0
--- /dev/null
+++ b/audio-creation/amsynth/INSTALL
@@ -0,0 +1,3 @@
+make_single &&
+default_install &&
+make_normal
diff --git a/audio-creation/amsynth/PRE_BUILD
b/audio-creation/amsynth/PRE_BUILD
new file mode 100755
index 0000000..1ad610c
--- /dev/null
+++ b/audio-creation/amsynth/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+
+autoreconf -fi
diff --git a/audio-libs/dssi/HISTORY b/audio-libs/dssi/HISTORY
index 517256b..1e081f1 100644
--- a/audio-libs/dssi/HISTORY
+++ b/audio-libs/dssi/HISTORY
@@ -1,3 +1,6 @@
+2012-12-05 Vlad Glagolev <stealth AT sourcemage.org>
+ * SUB_DEPENDS, {REPAIR^none^,}PRE_SUB_DEPENDS: added HOST
subdependency
+
2011-02-16 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 1.1.0
diff --git a/audio-libs/dssi/PRE_SUB_DEPENDS b/audio-libs/dssi/PRE_SUB_DEPENDS
new file mode 100755
index 0000000..b9d5357
--- /dev/null
+++ b/audio-libs/dssi/PRE_SUB_DEPENDS
@@ -0,0 +1,4 @@
+case $THIS_SUB_DEPENDS in
+ HOST) [[ $DSSI_HOST == y ]];;
+ *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}"; return 1;;
+esac
diff --git a/audio-libs/dssi/REPAIR^none^PRE_SUB_DEPENDS
b/audio-libs/dssi/REPAIR^none^PRE_SUB_DEPENDS
new file mode 100755
index 0000000..b9d5357
--- /dev/null
+++ b/audio-libs/dssi/REPAIR^none^PRE_SUB_DEPENDS
@@ -0,0 +1,4 @@
+case $THIS_SUB_DEPENDS in
+ HOST) [[ $DSSI_HOST == y ]];;
+ *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}"; return 1;;
+esac
diff --git a/audio-libs/dssi/SUB_DEPENDS b/audio-libs/dssi/SUB_DEPENDS
new file mode 100755
index 0000000..608cd8e
--- /dev/null
+++ b/audio-libs/dssi/SUB_DEPENDS
@@ -0,0 +1,7 @@
+case $THIS_SUB_DEPENDS in
+ HOST) if [[ $DSSI_HOST != y ]]; then
+ message "Requested JACK/ALSA-sequencer plugin host, forcing option
DSSI_HOST=y" &&
+ DSSI_HOST=y
+ fi;;
+ *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}"; return 1;;
+esac
diff --git a/audio-players/mpd/CONFIGURE b/audio-players/mpd/CONFIGURE
index 56105dc..6b59084 100755
--- a/audio-players/mpd/CONFIGURE
+++ b/audio-players/mpd/CONFIGURE
@@ -6,14 +6,34 @@ config_query_option MPD_OPTS "Enable writing to a FIFO?" y \
"--enable-fifo" \
"--disable-fifo" &&
-config_query_option MPD_OPTS "Enable writing to a pipe?" y \
+config_query_option MPD_OPTS "Enable support for clients connecting via
TCP?" y \
+ "--enable-tcp" \
+ "--disable-tcp" &&
+
+config_query_option MPD_OPTS "Enable support for clients connecting via unix
domain sockets?" y \
+ "--enable-un" \
+ "--disable-un" &&
+
+config_query_option MPD_OPTS "Enable writing to a pipe?" n \
"--enable-pipe-output" \
"--disable-pipe-output" &&
config_query_option MPD_OPTS "Enable HTTP server output?" y \
"--enable-httpd-output" \
- "--disable-httpd-output"
+ "--disable-httpd-output" &&
config_query_option MPD_OPTS "Enable recorder file output plugin?" n \
"--enable-recorder-output" \
- "--disable-recorder-output"
+ "--disable-recorder-output" &&
+
+config_query_option MPD_OPTS "Enable support for Hauppauge Media MVP?" n \
+ "--enable-mvp" \
+ "--disable-mvp" &&
+
+config_query_option MPD_OPTS "Enable support for Inotify automatic database
update?" y \
+ "--enable-inotify" \
+ "--disable-inotify" &&
+
+config_query_option MPD_OPTS "Enable debugging?" n \
+ "--enable-debug" \
+ "--disable-debug"
diff --git a/audio-players/mpd/DEPENDS b/audio-players/mpd/DEPENDS
index ea248ac..fb04e3e 100755
--- a/audio-players/mpd/DEPENDS
+++ b/audio-players/mpd/DEPENDS
@@ -1,16 +1,17 @@
depends zlib &&
depends glib2 &&
+# TODO: missing libraries in grimoire:
+# - libroar (--enable-roar) for RoarAudio support
+# - libgme (--enable-gme) for Blargg's game music emulator plugin
+# - libiso9660 (--enable-iso9660) for iso9660 archive support
+# - despotify (--enable-despotify) for despotify (spotify.com) support
+
optional_depends libao \
"--enable-ao" \
"--disable-ao" \
"for libao support" &&
-optional_depends libcue \
- "--enable-cue" \
- "--disable-cue" \
- "for CUE sheet support" &&
-
optional_depends libffado \
"--enable-ffado" \
"--disable-ffado" \
@@ -21,6 +22,11 @@ optional_depends liblastfm \
"--disable-lastfm" \
"for last.fm radio support" &&
+optional_depends yajl \
+ "--enable-soundcloud" \
+ "--disable-soundcloud" \
+ "for soundcloud.com support" &&
+
optional_depends bzip2 \
"--enable-bzip2" \
"--disable-bzip2" \
@@ -45,7 +51,7 @@ fi &&
optional_depends sidplay-libs \
"--enable-sidplay" \
"--disable-sidplay" \
- "for C64 sid support" &&
+ "for C64 SID support" &&
optional_depends libmpcdec \
"--enable-mpc" \
@@ -57,12 +63,6 @@ optional_depends flac \
"--disable-flac" \
"for FLAC support" &&
-if is_depends_enabled $SPELL flac && is_depends_enabled flac libogg; then
- config_query_option MPD_OPTS "Enable OggFLAC support?" y \
- "--enable-oggflac" \
- "--disable-oggflac"
-fi &&
-
optional_depends faad2 \
"--enable-aac" \
"--disable-aac" \
@@ -189,15 +189,36 @@ optional_depends libmms \
"--disable-mms" \
"for MMS protocol support" &&
+optional_depends libcdio \
+ "--enable-cdio-paranoia" \
+ "--disable-cdio-paranoia" \
+ "for audio CD support" &&
+
+optional_depends libsoup \
+ "--enable-soup" \
+ "--disable-soup" \
+ "for libsoup HTTP streaming support" &&
+
optional_depends avahi \
"--with-zeroconf=avahi" \
"--with-zeroconf=no" \
"for Zeroconf service discovery support" &&
+optional_depends systemd \
+ "--enable-systemd-daemon" \
+ "--disable-systemd-daemon" \
+ "to use the systemd daemon library" &&
+
+optional_depends tcp_wrappers \
+ "--enable-libwrap" \
+ "--disable-libwrap" \
+ "to use libwrap" &&
+
optional_depends xmlto \
"--enable-documentation" \
"--disable-documentation" \
"to build documentation" &&
+
# Xmlto is not enough.
if is_depends_enabled $SPELL xmlto; then
depends doxygen
diff --git a/audio-players/mpd/DETAILS b/audio-players/mpd/DETAILS
index 3e61d8f..1909598 100755
--- a/audio-players/mpd/DETAILS
+++ b/audio-players/mpd/DETAILS
@@ -1,9 +1,9 @@
SPELL=mpd
- VERSION=0.16.8
+ VERSION=0.17.2
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=$SOURCEFORGE_URL/musicpd/$SOURCE
-
SOURCE_HASH=sha512:ce6f0a004dec0e7269c1029c04c8d8f249ee5aeae362f60af6f617dc789e718a12b55d9efb928d7e332d6e9c8e960961b98174c57f5ff5a2f9f5b4999906a2c8
+
SOURCE_HASH=sha512:9637b06b1b5d8311fc12eb0aa9a8d1bec96b7995329ab6fc0b8a6c7d6d0648cc931982e550f456648c9e08d29e33ab7f066b2bb9ad9c105e60a08cc8bf0ba599
LICENSE[0]=GPL
KEYWORDS="music players audio"
WEB_SITE=http://www.musicpd.org/
diff --git a/audio-players/mpd/HISTORY b/audio-players/mpd/HISTORY
index 211fd4c..eed6655 100644
--- a/audio-players/mpd/HISTORY
+++ b/audio-players/mpd/HISTORY
@@ -1,3 +1,10 @@
+2012-12-04 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 0.17.2
+ * CONFIGURE: added missing/new configure options; added missing "&&";
+ reset default value for pipe-output
+ * DEPENDS: dropped support for deprecated dependencies; added new
+ optional dependencies; added TODO list in a comment
+
2012-06-12 Thomas Orgis <sobukus AT sourcemage.org>
* DEPENDS: need doxygen for docs, too
diff --git a/crypto/ccrypt/DEPENDS b/crypto/ccrypt/DEPENDS
new file mode 100755
index 0000000..794081b
--- /dev/null
+++ b/crypto/ccrypt/DEPENDS
@@ -0,0 +1,9 @@
+optional_depends gettext \
+ "--enable-nls" \
+ "--disable-nls" \
+ "for native language support" &&
+
+suggest_depends emacs \
+ "--enable-emacs" \
+ "--disable-emacs" \
+ "for emacs support"
diff --git a/crypto/ccrypt/DETAILS b/crypto/ccrypt/DETAILS
index 69379e4..f5f9e74 100755
--- a/crypto/ccrypt/DETAILS
+++ b/crypto/ccrypt/DETAILS
@@ -1,9 +1,9 @@
SPELL=ccrypt
- VERSION=1.9
+ VERSION=1.10
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://www.mathstat.dal.ca/~selinger/ccrypt/download/$SOURCE
-
SOURCE_HASH=sha512:fb4cbf6787f26303735e0eb3d038952b518c2466ac232a625ea9bd5e99400bb9d88a0cc41a690caa9de942f86365c567a802a1faf735306155aab14ea67464b9
+
SOURCE_HASH=sha512:b0130998f9830f63e8181340b3138260ab3c2014174e74fbcca77299dc9e0f807471fbfb7cc403dec7d0809f136e8afcb4c9bfd4ee5e43a1b3cc7185e14c3188
WEB_SITE=http://www.mathstat.dal.ca/~selinger/ccrypt/
ENTERED=20020929
LICENSE[0]=GPL
diff --git a/crypto/ccrypt/HISTORY b/crypto/ccrypt/HISTORY
index 56019b0..d6209cc 100644
--- a/crypto/ccrypt/HISTORY
+++ b/crypto/ccrypt/HISTORY
@@ -1,3 +1,7 @@
+2012-12-05 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 1.10
+ * DEPENDS: added, to use optional&suggest dependencies
+
2009-08-29 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.9
diff --git a/database/postgresql/DETAILS b/database/postgresql/DETAILS
index 60fe75a..9413ac7 100755
--- a/database/postgresql/DETAILS
+++ b/database/postgresql/DETAILS
@@ -1,6 +1,6 @@
SPELL=postgresql
- VERSION=9.2.1
-
SOURCE_HASH=sha512:37e5c193006c548d0b1e200e9dca18ca918a0fe7d5dcea1615ce6240b7f13d9ea30913ef3b309abac3a4c15f65202aa1e72b1a3cc0b22321854fd6187dbac8d0
+ VERSION=9.2.2
+
SOURCE_HASH=sha512:147690b168838b7d45cc805882cb6ef628cbf656ff115d32ab76c4ad38b06aa00223f728bf0e5befcdd27cc4e27a917493d857f1f29006952f0ff07da6615808
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=ftp://ftp.postgresql.org/pub/source/v$VERSION/$SOURCE
diff --git a/database/postgresql/HISTORY b/database/postgresql/HISTORY
index 106fd69..bf71677 100644
--- a/database/postgresql/HISTORY
+++ b/database/postgresql/HISTORY
@@ -1,3 +1,6 @@
+2012-12-06 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 9.2.2
+
2012-09-30 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 9.2.1
diff --git a/gnome3-libs/libsecret/DETAILS b/gnome3-libs/libsecret/DETAILS
index 5608cd2..ce32770 100755
--- a/gnome3-libs/libsecret/DETAILS
+++ b/gnome3-libs/libsecret/DETAILS
@@ -1,9 +1,9 @@
SPELL=libsecret
- VERSION=0.10
+ VERSION=0.11
SOURCE="${SPELL}-${VERSION}.tar.xz"
BRANCH=`echo $VERSION | cut -d . -f 1,2`
SOURCE_URL[0]=$GNOME_URL/sources/libsecret/${BRANCH}/${SOURCE}
-
SOURCE_HASH=sha512:28b09871e532c26f04b760d014b54cfb478997840e010a07d8862ebf9f8f87f7e67f5ec60e486577020aee29ea75701d7263891126aec638eaad9245e5c2c076
+
SOURCE_HASH=sha512:a4fa9e8e661f8165dacfc15fbe41a8429070c036ce64a7bfbd79ffc0c18ddf16d31518d25298de8e640f3b581e7d8915537ecca85a182b9bad8c03fe1d287122
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
WEB_SITE="https://live.gnome.org/Libsecret";
LICENSE[0]="LGPLv2"
diff --git a/gnome3-libs/libsecret/HISTORY b/gnome3-libs/libsecret/HISTORY
index d48011b..ceb3c5c 100644
--- a/gnome3-libs/libsecret/HISTORY
+++ b/gnome3-libs/libsecret/HISTORY
@@ -1,3 +1,6 @@
+2012-12-05 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 0.11
+
2012-11-24 Vlad Glagolev <stealth AT sourcemage.org>
* DEPENDS: Vala bindings require gobject-introspection
diff --git a/kernels/linux/HISTORY b/kernels/linux/HISTORY
index 78140a8..b2c424c 100644
--- a/kernels/linux/HISTORY
+++ b/kernels/linux/HISTORY
@@ -1,3 +1,12 @@
+2012-12-07 Vlad Glagolev <stealth AT sourcemage.org>
+ * info/patches/maintenance_patches_3/patch-3.0.{54,55}: added
+ * info/patches/maintenance_patches_3/patch-3.2.35: added
+ * info/patches/maintenance_patches_3/patch-3.4.{21,22}: added
+
+2012-12-04 Ladislav Hagara <hgr AT vabo.cz>
+ * latest.defaults: LATEST_maintenance_patches_3=patch-3.6.9
+ * info/patches/maintenance_patches_3/patch-3.6.9: added
+
2012-12-02 Vlad Glagolev <stealth AT sourcemage.org>
* info/patches/maintenance_patches_3/patch-3.0.53: added
* info/patches/maintenance_patches_3/patch-3.4.20: added
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.0.54
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.0.54
new file mode 100755
index 0000000..676d281
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches_3/patch-3.0.54
@@ -0,0 +1,5 @@
+appliedkernels="3.0"
+patchversion="${appliedkernels}.54"
+source="patch-${patchversion}.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/v3.0/${source}"
+sha1sum="89634684fc9f80cdf51581f8b825ff7591499c27"
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.0.55
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.0.55
new file mode 100755
index 0000000..dc1a504
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches_3/patch-3.0.55
@@ -0,0 +1,5 @@
+appliedkernels="3.0"
+patchversion="${appliedkernels}.55"
+source="patch-${patchversion}.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/v3.0/${source}"
+sha1sum="8fbba82f4c9bb10e09c47d134adb0487a83940de"
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.2.35
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.2.35
new file mode 100755
index 0000000..78d4bfe
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches_3/patch-3.2.35
@@ -0,0 +1,5 @@
+appliedkernels="3.2"
+patchversion="${appliedkernels}.35"
+source="patch-${patchversion}.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/v3.x/${source}"
+sha1sum="4b94f132f7896ff5d1a794eda5276c618cea0eac"
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.4.21
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.4.21
new file mode 100755
index 0000000..e22f725
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches_3/patch-3.4.21
@@ -0,0 +1,5 @@
+appliedkernels="3.4"
+patchversion="${appliedkernels}.21"
+source="patch-${patchversion}.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/v3.x/${source}"
+sha1sum="d6f8e3326c472fa929319b528050c314a3562414"
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.4.22
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.4.22
new file mode 100755
index 0000000..74645ba
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches_3/patch-3.4.22
@@ -0,0 +1,5 @@
+appliedkernels="3.4"
+patchversion="${appliedkernels}.22"
+source="patch-${patchversion}.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/v3.x/${source}"
+sha1sum="4a57d2399c4cb1847ccfe78f44cbabe8e28d929a"
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.6.9
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.6.9
new file mode 100755
index 0000000..c348b94
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches_3/patch-3.6.9
@@ -0,0 +1,5 @@
+appliedkernels="3.6"
+patchversion="${appliedkernels}.9"
+source="patch-${patchversion}.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/v3.x/${source}"
+sha1sum="90f17ccadd54257d261a003c8da27e8b2813eee8"
diff --git a/kernels/linux/latest.defaults b/kernels/linux/latest.defaults
index 0884670..619876f 100644
--- a/kernels/linux/latest.defaults
+++ b/kernels/linux/latest.defaults
@@ -2,7 +2,7 @@ LATEST_3=3.6
LATEST_2_6=2.6.39
LATEST_PRE_2_6=patch-2.6.39
LATEST_maintenance_patches=patch-2.6.39.4
-LATEST_maintenance_patches_3=patch-3.6.8
+LATEST_maintenance_patches_3=patch-3.6.9
LATEST_git_patches=patch-2.6.25-rc6-git7
LATEST_2_4=2.4.37.9
LATEST_PRE_2_4=patch-2.4.33-pre1
diff --git a/net/bind-tools/DETAILS b/net/bind-tools/DETAILS
index 07145c7..69c6cbc 100755
--- a/net/bind-tools/DETAILS
+++ b/net/bind-tools/DETAILS
@@ -1,12 +1,12 @@
SPELL=bind-tools
- VERSION=9.9.1-P4
+ VERSION=9.9.2-P1
SOURCE=bind-$VERSION.tar.gz
SOURCE2=$SOURCE.sha512.asc
SOURCE_DIRECTORY="$BUILD_DIRECTORY/bind-$VERSION"
SOURCE_URL[0]=ftp://ftp.isc.org/isc/bind9/$VERSION/$SOURCE
SOURCE2_URL[0]=ftp://ftp.isc.org/isc/bind9/$VERSION/$SOURCE2
SOURCE2_IGNORE=signature
- SECURITY_PATCH=11
+ SECURITY_PATCH=12
SOURCE_GPG=isc.gpg:$SOURCE2:UPSTREAM_KEY
LICENSE[0]=ISC
KEYWORDS="net"
diff --git a/net/bind-tools/HISTORY b/net/bind-tools/HISTORY
index f064c2d..9941e6d 100644
--- a/net/bind-tools/HISTORY
+++ b/net/bind-tools/HISTORY
@@ -1,3 +1,6 @@
+2012-12-07 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 9.9.2-P1; SECURITY_PATCH++
+
2012-10-10 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 9.9.1-P4; SECURITY_PATCH++
diff --git a/net/bind/DETAILS b/net/bind/DETAILS
index f2b41d3..4c32fae 100755
--- a/net/bind/DETAILS
+++ b/net/bind/DETAILS
@@ -1,5 +1,5 @@
SPELL=bind
- VERSION=9.8.3-P3
+ VERSION=9.8.4-P1
SOURCE=$SPELL-${VERSION}.tar.gz
SOURCE2=root.zone.gz
SOURCE2_IGNORE=unversioned
@@ -10,7 +10,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-${VERSION}
SOURCE2_URL[0]=ftp://ftp.internic.net/domain/$SOURCE2
SOURCE3_URL[0]=ftp://ftp.isc.org/isc/bind9/$VERSION/$SOURCE3
SOURCE3_IGNORE=signature
- SECURITY_PATCH=7
+ SECURITY_PATCH=8
SOURCE_GPG="isc.gpg:$SOURCE3:UPSTREAM_KEY"
FORCE_DOWNLOAD[2]=true
LICENSE[0]=ISC
diff --git a/net/bind/HISTORY b/net/bind/HISTORY
index 40b5e80..8333caf 100644
--- a/net/bind/HISTORY
+++ b/net/bind/HISTORY
@@ -1,3 +1,6 @@
+2012-12-07 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 9.8.4-P1; SECURITY_PATCH++
+
2012-09-13 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 9.8.3-P3; SECURITY_PATCH++
diff --git a/net/samba/DETAILS b/net/samba/DETAILS
index 4368f31..48cd14b 100755
--- a/net/samba/DETAILS
+++ b/net/samba/DETAILS
@@ -1,13 +1,12 @@
SPELL=samba
- VERSION=3.6.8
+ VERSION=3.6.9
SECURITY_PATCH=18
- PATCHLEVEL=0
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://download.samba.org/samba/ftp/$SOURCE
SOURCE_URL[1]=ftp://de3.samba.org/pub/$SPELL/$SOURCE
SOURCE_URL[2]=http://us1.samba.org/samba/ftp/old-versions/$SOURCE
-
SOURCE_HASH=sha512:11d7161c6b1c50b740338b80a5d55f0f7f07f6c6f5218b1c8e8e2d3ea14e2e22069a2342700777bbdce734cdf723d00d518f4f9837fbadeac2baf326eb98ee6d
+
SOURCE_HASH=sha512:be0c9d2a51a524015a1210d96c775c754101a2906dc054f3ecae97d18d4e0d50de2ac48a85af62a30d020259ff91068947831e44963925efe3cc48c8051a3be7
if [[ "$SAMBA_VSCAN" == "y" ]] ; then
VSCAN_VERSION=0.3.6c-beta4
SOURCE2=$SPELL-vscan-$VSCAN_VERSION.tar.gz
diff --git a/net/samba/HISTORY b/net/samba/HISTORY
index 55b5c7b..359e778 100644
--- a/net/samba/HISTORY
+++ b/net/samba/HISTORY
@@ -1,3 +1,6 @@
+2012-12-05 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 3.6.9
+
2012-09-17 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 3.6.8
diff --git a/net/tor/DETAILS b/net/tor/DETAILS
index a916281..76de97c 100755
--- a/net/tor/DETAILS
+++ b/net/tor/DETAILS
@@ -4,8 +4,8 @@ if [ "$TOR_DEVEL" == "y" ]; then
VERSION=0.2.2.23-alpha
SECURITY_PATCH=4
else
- VERSION=0.2.2.39
- SECURITY_PATCH=9
+ VERSION=0.2.3.25
+ SECURITY_PATCH=10
fi
SOURCE=$SPELL-$VERSION.tar.gz
diff --git a/net/tor/HISTORY b/net/tor/HISTORY
index adebcc8..22c0dc4 100644
--- a/net/tor/HISTORY
+++ b/net/tor/HISTORY
@@ -1,3 +1,6 @@
+2012-12-07 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 0.2.3.25; SECURITY_PATCH++ (CVE-2012-5573)
+
2012-09-12 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 0.2.2.39; SECURITY_PATCH++; restored
original source url
diff --git a/php-pear/xcache/DETAILS b/php-pear/xcache/DETAILS
index d211b89..274e39c 100755
--- a/php-pear/xcache/DETAILS
+++ b/php-pear/xcache/DETAILS
@@ -1,9 +1,9 @@
SPELL=xcache
- VERSION=1.3.2
+ VERSION=3.0.0
SECURITY_PATCH=1
SOURCE="${SPELL}-${VERSION}.tar.bz2"
SOURCE_URL[0]=http://xcache.lighttpd.net/pub/Releases/${VERSION}/${SOURCE}
-
SOURCE_HASH=sha512:8be9b4ca276dc99f923f935b666b1feaf96a23850a08ad0ad400a2d3ce9db59b572147e454897c8e1dbdb0a1e627298dd9007a5faa227a7d4ba7a8b39231d92c
+
SOURCE_HASH=sha512:06d13972d7f42db1a5e8408ba6fd83ec60292dd52bbc5b4c46b14ae70f407c50130381f5932f1dffd6a0f911b55f043475bee9bc0dbdb53133bca9f5d1c1ad23
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
DOCS="AUTHORS COPYING ChangeLog INSTALL NEWS README THANKS
xcache.ini"
DOC_DIRS="admin"
diff --git a/php-pear/xcache/FINAL b/php-pear/xcache/FINAL
index 7f1d106..3829b8d 100755
--- a/php-pear/xcache/FINAL
+++ b/php-pear/xcache/FINAL
@@ -1,3 +1,3 @@
PHP_EXT=$(php-config --extension-dir) &&
echo "Don't forget to add the following to your /etc/php.ini:" &&
-echo "zend_extension=\"$PHP_EXT/xcache.so\""
+echo "extension=\"$PHP_EXT/xcache.so\""
diff --git a/php-pear/xcache/HISTORY b/php-pear/xcache/HISTORY
index 194c3eb..4dbbf40 100644
--- a/php-pear/xcache/HISTORY
+++ b/php-pear/xcache/HISTORY
@@ -1,3 +1,8 @@
+2012-12-04 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 3.0.0
+ * FINAL: since 3.0.0 uses extension=, zend_extension= is unsupported
+ * PRE_BUILD: removed deprecated lines
+
2011-06-05 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 1.3.2; SECURITY_PATCH++
* BUILD: readability++
diff --git a/php-pear/xcache/PRE_BUILD b/php-pear/xcache/PRE_BUILD
index 22375c3..0ea6031 100755
--- a/php-pear/xcache/PRE_BUILD
+++ b/php-pear/xcache/PRE_BUILD
@@ -1,7 +1,4 @@
default_pre_build &&
cd "${SOURCE_DIRECTORY}" &&
-rm -f "${BUILD_DIRECTORY}/package.xml" &&
-rm -f "${BUILD_DIRECTORY}/package2.xml"
-
phpize
diff --git a/python-pypi/baker/DETAILS b/python-pypi/baker/DETAILS
index 7737c89..72bb591 100755
--- a/python-pypi/baker/DETAILS
+++ b/python-pypi/baker/DETAILS
@@ -1,7 +1,7 @@
SPELL=baker
SPELLX=Baker
- VERSION=1.1
-
SOURCE_HASH=sha512:0c3111a82392570218e427ab22aaad082feb6c3551e887605db81cd5e48ba79d9bc1e6fb70528d13543d9ea32470394ec471dcab7ef8befc9345cee4637cd4e0
+ VERSION=1.3
+
SOURCE_HASH=sha512:2074b52ca73c399174165c17be12002208618b6aeea45b3a14a63afd23af64c2dfd20977726595e148a6804602bf0921291274be3e6d2eb1d64c9ea8fc9b98ad
SOURCE=$SPELLX-$VERSION.tar.gz
SOURCE_URL[0]=http://pypi.python.org/packages/source/B/$SPELLX/$SOURCE
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELLX-$VERSION"
diff --git a/python-pypi/baker/HISTORY b/python-pypi/baker/HISTORY
index c8a19ca..7f3b44d 100644
--- a/python-pypi/baker/HISTORY
+++ b/python-pypi/baker/HISTORY
@@ -1,3 +1,6 @@
+2012-12-05 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.3
+
2011-06-11 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.1
spell created
diff --git a/python-pypi/beaker/DETAILS b/python-pypi/beaker/DETAILS
index 5b3c4f5..7fd2ffb 100755
--- a/python-pypi/beaker/DETAILS
+++ b/python-pypi/beaker/DETAILS
@@ -1,7 +1,7 @@
SPELL=beaker
SPELLX=Beaker
- VERSION=1.6.3
-
SOURCE_HASH=sha512:5ecec8a5589e23597265e9d46dfdf63daf7f470523e957d8f50bff51f8991a8c09e07fe85f0735b05e1fca3ac71c08aa2ccdf9073c6862940f2e67f5a81889eb
+ VERSION=1.6.4
+
SOURCE_HASH=sha512:5a6835d01d0b1bee57844525f1223d74edd26f07cc769df6a8cfa77f44dda4435eb96639175928a1caf7c4f927ac3a674c0fd0e7f50f1aea91da7880de3a6704
SOURCE=$SPELLX-$VERSION.tar.gz
SOURCE_URL[0]=http://pypi.python.org/packages/source/B/$SPELLX/$SOURCE
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELLX-$VERSION"
diff --git a/python-pypi/beaker/HISTORY b/python-pypi/beaker/HISTORY
index 66e9f52..855a0e5 100644
--- a/python-pypi/beaker/HISTORY
+++ b/python-pypi/beaker/HISTORY
@@ -1,3 +1,6 @@
+2012-12-05 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.6.4
+
2012-05-22 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.6.3
diff --git a/python-pypi/mako/DETAILS b/python-pypi/mako/DETAILS
index 65706ed..7cf968f 100755
--- a/python-pypi/mako/DETAILS
+++ b/python-pypi/mako/DETAILS
@@ -1,7 +1,7 @@
SPELL=mako
SPELLX=Mako
- VERSION=0.7.2
-
SOURCE_HASH=sha512:5fe8ca01be4e439aff264a661fad5d006adeaf494366c1c842209aad7da138f0cd33d44581b9e7d0b9e3af410c0260efc0819e46fb7ff785de570af79da9e8f3
+ VERSION=0.7.3
+
SOURCE_HASH=sha512:5d773e46769c91c0c442643b341d3bc9ea64bb0c17121afcd1b05172a38e5d710e35a09fa94e21d5bbc6e01cc18f8578c67dfc21b503b80bd3b1e2bf0b5f1fcd
SOURCE=$SPELLX-$VERSION.tar.gz
SOURCE_URL[0]=http://pypi.python.org/packages/source/M/$SPELLX/$SOURCE
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELLX-$VERSION"
diff --git a/python-pypi/mako/HISTORY b/python-pypi/mako/HISTORY
index 07bb07d..99e9fb9 100644
--- a/python-pypi/mako/HISTORY
+++ b/python-pypi/mako/HISTORY
@@ -1,3 +1,6 @@
+2012-12-05 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.7.3
+
2012-09-11 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.7.2
diff --git a/python-pypi/mercurial/DETAILS b/python-pypi/mercurial/DETAILS
index 3e160f3..d329b1c 100755
--- a/python-pypi/mercurial/DETAILS
+++ b/python-pypi/mercurial/DETAILS
@@ -1,6 +1,6 @@
SPELL=mercurial
- VERSION=2.4
-
SOURCE_HASH=sha512:52d1127de2208aaae693d16fef10ffc9b8663081bece83b7597d65706e9568af3b9e56bd211878774e1ebed92e21365ee9c49602a0ff5e48f89f12244d79c161
+ VERSION=2.4.1
+
SOURCE_HASH=sha512:78be51e205487967d8951d2b5b64e958cdaa0e73a86c0cb7b402ae4a82e16c6af0bdd1aff65de66d7bb8920a81f8693a3a25133847b480641eb56786a76ac254
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_URL[0]=http://www.selenic.com/mercurial/release/$SOURCE
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/python-pypi/mercurial/HISTORY b/python-pypi/mercurial/HISTORY
index b5ddad1..f9b050f 100644
--- a/python-pypi/mercurial/HISTORY
+++ b/python-pypi/mercurial/HISTORY
@@ -1,3 +1,6 @@
+2012-12-05 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: updated to 2.4.1
+
2012-11-03 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: updated to 2.4
diff --git a/python-pypi/python-markdown/DETAILS
b/python-pypi/python-markdown/DETAILS
index 53059f7..ff5f21c 100755
--- a/python-pypi/python-markdown/DETAILS
+++ b/python-pypi/python-markdown/DETAILS
@@ -1,7 +1,7 @@
SPELL=python-markdown
SPELLX=Markdown
- VERSION=2.2.0
-
SOURCE_HASH=sha512:d4a5bbe8bb70dc0737805a52830f485be10d12d7fb628ee54be92bd1a1e11875dc6a6af280c3624b1b97eb7fb28976817b0b8fff45ac8ebe71245c26a4c058b8
+ VERSION=2.2.1
+
SOURCE_HASH=sha512:aa975a9d015e3e1320f35381c7e83e1f355222a3c0096e65ce4f1a1fa253fe0e3389ce1b3786b1cf40f4160863ede39d1081c655efe1c24132a766f02418fd61
SOURCE=${SPELLX}-${VERSION}.tar.gz
SOURCE_URL[0]=http://pypi.python.org/packages/source/M/${SPELLX}/${SOURCE}
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELLX}-${VERSION}"
diff --git a/python-pypi/python-markdown/HISTORY
b/python-pypi/python-markdown/HISTORY
index bb52a4f..b3677e3 100644
--- a/python-pypi/python-markdown/HISTORY
+++ b/python-pypi/python-markdown/HISTORY
@@ -1,3 +1,6 @@
+2012-12-05 Treeve Jelbert <treeve AT sourcemage.oge>
+ * DETAILS: version 2.2.1
+
2012-09-11 Treeve Jelbert <treeve AT sourcemage.oge>
* DETAILS: version 2.2.0
diff --git a/python-pypi/pyutil/DETAILS b/python-pypi/pyutil/DETAILS
index 1f31bc2..238c931 100755
--- a/python-pypi/pyutil/DETAILS
+++ b/python-pypi/pyutil/DETAILS
@@ -1,6 +1,6 @@
SPELL=pyutil
- VERSION=1.9.3
-
SOURCE_HASH=sha512:01d59f3be90a85bbd5001337eab6eb0afe9b50ffe21747783ffb5f9c055e6e8ba2d6404b2a0ecf1c3068b51b555a44569a9417e6b349c40e9b791a8ff2994102
+ VERSION=1.9.4
+
SOURCE_HASH=sha512:78df200025b96bf410eeb7e364e84d627761cb85a0cbfba65dea8ac3db2231128017a6ddf74e0002208d774c96445508932406a2016cc78274269a74b2bfbcc4
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
WEB_SITE=http://pypi.python.org/pypi/$SPELL
diff --git a/python-pypi/pyutil/HISTORY b/python-pypi/pyutil/HISTORY
index 90fe51b..96c5159 100644
--- a/python-pypi/pyutil/HISTORY
+++ b/python-pypi/pyutil/HISTORY
@@ -1,3 +1,6 @@
+2012-12-05 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.9.4
+
2012-06-02 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.9.3
diff --git a/python-pypi/webob/DETAILS b/python-pypi/webob/DETAILS
index a5deb94..36ce1fe 100755
--- a/python-pypi/webob/DETAILS
+++ b/python-pypi/webob/DETAILS
@@ -1,8 +1,8 @@
SPELL=webob
SPELLX=WebOb
- VERSION=1.2.2
-
SOURCE_HASH=sha512:9da345710e31e36a34af6d67d1bd78ad190f53dd99555fdbbf884a827a471c9798b65a31237c4d7808b7804d02936fedcb862a29e9fe9332f09e43489275836f
- SOURCE=$SPELLX-$VERSION.zip
+ VERSION=1.2.3
+
SOURCE_HASH=sha512:831e6bb1d2c6998b6929520098ed4aed3117d038457d9bba28ceba090bf32fcf6a935f88470bee1e0782f6c43395c4fa646d354c946596cc307edb7808e90559
+ SOURCE=$SPELLX-$VERSION.tar.gz
SOURCE_URL[0]=http://pypi.python.org/packages/source/W/$SPELLX/$SOURCE
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELLX-$VERSION"
WEB_SITE=http://pythonpaste.org/webob/
diff --git a/python-pypi/webob/HISTORY b/python-pypi/webob/HISTORY
index a7a235e..c79aef1 100644
--- a/python-pypi/webob/HISTORY
+++ b/python-pypi/webob/HISTORY
@@ -1,3 +1,6 @@
+2012-12-05 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.2.3
+
2012-08-15 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.2.2
diff --git a/utils/util-linux/BUILD b/utils/util-linux/BUILD
index 6f8590e..bdeb680 100755
--- a/utils/util-linux/BUILD
+++ b/utils/util-linux/BUILD
@@ -5,6 +5,10 @@ if [[ $CROSS_INSTALL == on ]]; then
OPTS="--host=$HOST $OPTS"
fi &&
+if [[ $UL_VERSION == latest ]]; then
+ OPTS="--disable-eject --disable-kill --disable-login --disable-sulogin
--disable-su --disable-utmpdump $OPTS"
+fi &&
+
create_group tty &&
disable_pic &&
diff --git a/utils/util-linux/DETAILS b/utils/util-linux/DETAILS
index b31d6c8..9694cf0 100755
--- a/utils/util-linux/DETAILS
+++ b/utils/util-linux/DETAILS
@@ -12,9 +12,9 @@ if [[ $UL_VERSION == aes ]]; then
SOURCE3_GPG=loop-AES.gpg:$SOURCE4:UPSTREAM_KEY
SOURCE4_IGNORE=signature
else
- VERSION=2.21.2
+ VERSION=2.22.1
SECURITY_PATCH=2
-
SOURCE_HASH=sha512:d6499636b40e22f72b957e0334faefce51656a4d8f8dc038c17d24b03d84e50917112a47a18c6601a048d041263714092ecffbd269d41699a4bdb86a89bc3e30
+
SOURCE_HASH=sha512:1aa7f7e943b68d66fac46ad2da4376aaa03d905f86ef92938a8c8b95d761b31bf07ee8c44504774b2b5c918eba45a02c19b81d9fc448518e05d4119f86f1a19a
fi
BRANCH=`echo $VERSION | cut -d . -f 1,2`
SOURCE=$SPELL-$VERSION.tar.bz2
diff --git a/utils/util-linux/HISTORY b/utils/util-linux/HISTORY
index d96ea98..5cf0425 100644
--- a/utils/util-linux/HISTORY
+++ b/utils/util-linux/HISTORY
@@ -1,3 +1,8 @@
+2012-12-04 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: latest updated to 2.22.1
+ * BUILD: eject, kill, login, sulogin, su and utmpdump not installed
+ spells eject, coreutils, shadow and simpleinit-msb have to be
updated
+
2012-10-15 Vlad Glagolev <stealth AT sourcemage.org>
* PREPARE: removed senseless 2nd version check
diff --git a/utils/xen/DETAILS b/utils/xen/DETAILS
index b6a56f2..8ce05b5 100755
--- a/utils/xen/DETAILS
+++ b/utils/xen/DETAILS
@@ -1,6 +1,6 @@
SPELL=xen
VERSION=4.1.3
- SECURITY_PATCH=3
+ SECURITY_PATCH=5
SOURCE=${SPELL}-${VERSION}.tar.gz
SOURCE2=$SOURCE.sig
SOURCE2_IGNORE=signature
diff --git a/utils/xen/HISTORY b/utils/xen/HISTORY
index 72ba730..6d6300b 100644
--- a/utils/xen/HISTORY
+++ b/utils/xen/HISTORY
@@ -1,3 +1,11 @@
+2012-12-07 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: SECURITY_PATCH+=2
+ * PRE_BUILD: apply patches
+ * xsa-{12-14,16-17,26-31}.patch: added, to fix CVE-2012-3494,
+ CVE-2012-3495, CVE-2012-3496, CVE-2012-3498, CVE-2012-3515,
+ CVE-2012-5510, CVE-2012-5511, CVE-2012-5512, CVE-2012-5513,
+ CVE-2012-5514, CVE-2012-5515
+
2012-11-17 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: SECURITY_PATCH++
* PRE_BUILD: apply patches
diff --git a/utils/xen/PRE_BUILD b/utils/xen/PRE_BUILD
index ec73184..c738dc4 100755
--- a/utils/xen/PRE_BUILD
+++ b/utils/xen/PRE_BUILD
@@ -1,6 +1,11 @@
default_pre_build &&
cd ${SOURCE_DIRECTORY} &&
+patch -p1 < "$SPELL_DIRECTORY/xsa-12.patch" &&
+patch -p1 < "$SPELL_DIRECTORY/xsa-13.patch" &&
+patch -p1 < "$SPELL_DIRECTORY/xsa-14.patch" &&
+patch -p1 < "$SPELL_DIRECTORY/xsa-16.patch" &&
+patch -p1 < "$SPELL_DIRECTORY/xsa-17.patch" &&
patch -p0 < "$SPELL_DIRECTORY/xsa-19.patch" &&
patch -p1 < "$SPELL_DIRECTORY/xsa-20.patch" &&
patch -p1 < "$SPELL_DIRECTORY/xsa-21.patch" &&
@@ -8,6 +13,12 @@ patch -p1 < "$SPELL_DIRECTORY/xsa-22.patch" &&
patch -p1 < "$SPELL_DIRECTORY/xsa-23.patch" &&
patch -p1 < "$SPELL_DIRECTORY/xsa-24.patch" &&
patch -p1 < "$SPELL_DIRECTORY/xsa-25.patch" &&
+patch -p1 < "$SPELL_DIRECTORY/xsa-26.patch" &&
+patch -p1 < "$SPELL_DIRECTORY/xsa-27.patch" &&
+patch -p1 < "$SPELL_DIRECTORY/xsa-28.patch" &&
+patch -p1 < "$SPELL_DIRECTORY/xsa-29.patch" &&
+patch -p1 < "$SPELL_DIRECTORY/xsa-30.patch" &&
+patch -p1 < "$SPELL_DIRECTORY/xsa-31.patch" &&
if [[ $XEN_UPINIT != y ]]; then
sedit "s:all install-initd:all:" tools/hotplug/Linux/Makefile
diff --git a/utils/xen/xsa-12.patch b/utils/xen/xsa-12.patch
new file mode 100644
index 0000000..271c4d8
--- /dev/null
+++ b/utils/xen/xsa-12.patch
@@ -0,0 +1,22 @@
+xen: prevent a 64 bit guest setting reserved bits in DR7
+
+The upper 32 bits of this register are reserved and should be written as
+zero.
+
+This is XSA-12 / CVE-2012-3494
+
+Signed-off-by: Jan Beulich <jbeulich AT suse.com>
+Reviewed-by: Ian Campbell <ian.campbell AT citrix.com>
+
+diff -r 353bc0801b11 xen/include/asm-x86/debugreg.h
+--- a/xen/include/asm-x86/debugreg.h Mon Aug 06 12:28:03 2012 +0100
++++ b/xen/include/asm-x86/debugreg.h Wed Aug 15 12:00:21 2012 +0100
+@@ -58,7 +58,7 @@
+ We can slow the instruction pipeline for instructions coming via the
+ gdt or the ldt if we want to. I am not sure why this is an advantage */
+
+-#define DR_CONTROL_RESERVED_ZERO (0x0000d800ul) /* Reserved, read as zero */
++#define DR_CONTROL_RESERVED_ZERO (~0xffff27fful) /* Reserved, read as zero
*/
+ #define DR_CONTROL_RESERVED_ONE (0x00000400ul) /* Reserved, read as one */
+ #define DR_LOCAL_EXACT_ENABLE (0x00000100ul) /* Local exact enable */
+ #define DR_GLOBAL_EXACT_ENABLE (0x00000200ul) /* Global exact enable */
diff --git a/utils/xen/xsa-13.patch b/utils/xen/xsa-13.patch
new file mode 100644
index 0000000..35c4715
--- /dev/null
+++ b/utils/xen/xsa-13.patch
@@ -0,0 +1,30 @@
+xen: handle out-of-pirq condition correctly in PHYSDEVOP_get_free_pirq
+
+This is XSA-13 / CVE-2012-3495
+
+Signed-off-by: Ian Campbell <ian.campbell AT citrix.com>
+Signed-off-by: Jan Beulich <JBeulich AT suse.com>
+
+diff -r 1225aff05dd2 xen/arch/x86/physdev.c
+--- a/xen/arch/x86/physdev.c Thu Aug 09 16:48:07 2012 +0100
++++ b/xen/arch/x86/physdev.c Thu Aug 16 11:07:36 2012 +0100
+@@ -587,11 +587,16 @@ ret_t do_physdev_op(int cmd, XEN_GUEST_H
+ break;
+
+ spin_lock(&d->event_lock);
+- out.pirq = get_free_pirq(d, out.type, 0);
+- d->arch.pirq_irq[out.pirq] = PIRQ_ALLOCATED;
++ ret = get_free_pirq(d, out.type, 0);
++ if ( ret >= 0 )
++ d->arch.pirq_irq[ret] = PIRQ_ALLOCATED;
+ spin_unlock(&d->event_lock);
+
+- ret = copy_to_guest(arg, &out, 1) ? -EFAULT : 0;
++ if ( ret >= 0 )
++ {
++ out.pirq = ret;
++ ret = copy_to_guest(arg, &out, 1) ? -EFAULT : 0;
++ }
+
+ rcu_unlock_domain(d);
+ break;
diff --git a/utils/xen/xsa-14.patch b/utils/xen/xsa-14.patch
new file mode 100644
index 0000000..cd185b3
--- /dev/null
+++ b/utils/xen/xsa-14.patch
@@ -0,0 +1,22 @@
+xen: Don't BUG_ON() PoD operations on a non-translated guest.
+
+This is XSA-14 / CVE-2012-3496
+
+Signed-off-by: Tim Deegan <tim AT xen.org>
+Reviewed-by: Ian Campbell <ian.campbell AT citrix.com>
+Tested-by: Ian Campbell <ian.campbell AT citrix.com>
+
+diff -r 6779ddca8593 -r 8ebda5388e4e xen/arch/x86/mm/p2m.c
+--- a/xen/arch/x86/mm/p2m.c Wed Sep 05 12:28:17 2012 +0100
++++ b/xen/arch/x86/mm/p2m.c Wed Sep 05 12:29:05 2012 +0100
+@@ -2414,7 +2414,8 @@ guest_physmap_mark_populate_on_demand(st
+ int pod_count = 0;
+ int rc = 0;
+
+- BUG_ON(!paging_mode_translate(d));
++ if ( !paging_mode_translate(d) )
++ return -EINVAL;
+
+ rc = gfn_check_limit(d, gfn, order);
+ if ( rc != 0 )
+
diff --git a/utils/xen/xsa-16.patch b/utils/xen/xsa-16.patch
new file mode 100644
index 0000000..d9662d8
--- /dev/null
+++ b/utils/xen/xsa-16.patch
@@ -0,0 +1,31 @@
+x86/pvhvm: properly range-check PHYSDEVOP_map_pirq/MAP_PIRQ_TYPE_GSI
+
+This is being used as a array index, and hence must be validated before
+use.
+
+This is XSA-16 / CVE-2012-3498.
+
+Signed-off-by: Jan Beulich <jbeulich AT suse.com>
+
+diff -r 1225aff05dd2 xen/arch/x86/physdev.c
+--- a/xen/arch/x86/physdev.c Thu Aug 09 16:48:07 2012 +0100
++++ b/xen/arch/x86/physdev.c Thu Aug 16 13:03:36 2012 +0100
+@@ -40,11 +40,18 @@ static int physdev_hvm_map_pirq(
+ struct hvm_girq_dpci_mapping *girq;
+ uint32_t machine_gsi = 0;
+
++ if ( map->index < 0 || map->index >= NR_HVM_IRQS )
++ {
++ ret = -EINVAL;
++ break;
++ }
++
+ /* find the machine gsi corresponding to the
+ * emulated gsi */
+ hvm_irq_dpci = domain_get_irq_dpci(d);
+ if ( hvm_irq_dpci )
+ {
++ BUILD_BUG_ON(ARRAY_SIZE(hvm_irq_dpci->girq) < NR_HVM_IRQS);
+ list_for_each_entry ( girq,
+ &hvm_irq_dpci->girq[map->index],
+ list )
diff --git a/utils/xen/xsa-17.patch b/utils/xen/xsa-17.patch
new file mode 100644
index 0000000..9aa28e0
--- /dev/null
+++ b/utils/xen/xsa-17.patch
@@ -0,0 +1,113 @@
+console: bounds check whenever changing the cursor due to an escape code
+
+This is XSA-17 / CVE-2012-3515
+
+Signed-off-by: Ian Campbell <ian.campbell AT citrix.com>
+
+diff --git a/console.c b/console.c
+index 5e6e3d0..9984d6f 100644
+--- a/tools/ioemu-qemu-xen/console.c
++++ b/tools/ioemu-qemu-xen/console.c
+@@ -794,6 +794,26 @@ static void console_clear_xy(TextConsole *s, int x, int
y)
+ update_xy(s, x, y);
+ }
+
++/* set cursor, checking bounds */
++static void set_cursor(TextConsole *s, int x, int y)
++{
++ if (x < 0) {
++ x = 0;
++ }
++ if (y < 0) {
++ y = 0;
++ }
++ if (y >= s->height) {
++ y = s->height - 1;
++ }
++ if (x >= s->width) {
++ x = s->width - 1;
++ }
++
++ s->x = x;
++ s->y = y;
++}
++
+ static void console_putchar(TextConsole *s, int ch)
+ {
+ TextCell *c;
+@@ -869,7 +889,8 @@ static void console_putchar(TextConsole *s, int ch)
+ s->esc_params[s->nb_esc_params] * 10 + ch - '0';
+ }
+ } else {
+- s->nb_esc_params++;
++ if (s->nb_esc_params < MAX_ESC_PARAMS)
++ s->nb_esc_params++;
+ if (ch == ';')
+ break;
+ #ifdef DEBUG_CONSOLE
+@@ -883,59 +904,37 @@ static void console_putchar(TextConsole *s, int ch)
+ if (s->esc_params[0] == 0) {
+ s->esc_params[0] = 1;
+ }
+- s->y -= s->esc_params[0];
+- if (s->y < 0) {
+- s->y = 0;
+- }
++ set_cursor(s, s->x, s->y - s->esc_params[0]);
+ break;
+ case 'B':
+ /* move cursor down */
+ if (s->esc_params[0] == 0) {
+ s->esc_params[0] = 1;
+ }
+- s->y += s->esc_params[0];
+- if (s->y >= s->height) {
+- s->y = s->height - 1;
+- }
++ set_cursor(s, s->x, s->y + s->esc_params[0]);
+ break;
+ case 'C':
+ /* move cursor right */
+ if (s->esc_params[0] == 0) {
+ s->esc_params[0] = 1;
+ }
+- s->x += s->esc_params[0];
+- if (s->x >= s->width) {
+- s->x = s->width - 1;
+- }
++ set_cursor(s, s->x + s->esc_params[0], s->y);
+ break;
+ case 'D':
+ /* move cursor left */
+ if (s->esc_params[0] == 0) {
+ s->esc_params[0] = 1;
+ }
+- s->x -= s->esc_params[0];
+- if (s->x < 0) {
+- s->x = 0;
+- }
++ set_cursor(s, s->x - s->esc_params[0], s->y);
+ break;
+ case 'G':
+ /* move cursor to column */
+- s->x = s->esc_params[0] - 1;
+- if (s->x < 0) {
+- s->x = 0;
+- }
++ set_cursor(s, s->esc_params[0] - 1, s->y);
+ break;
+ case 'f':
+ case 'H':
+ /* move cursor to row, column */
+- s->x = s->esc_params[1] - 1;
+- if (s->x < 0) {
+- s->x = 0;
+- }
+- s->y = s->esc_params[0] - 1;
+- if (s->y < 0) {
+- s->y = 0;
+- }
++ set_cursor(s, s->esc_params[1] - 1, s->esc_params[0] - 1);
+ break;
+ case 'J':
+ switch (s->esc_params[0]) {
diff --git a/utils/xen/xsa-26.patch b/utils/xen/xsa-26.patch
new file mode 100644
index 0000000..e8b8e7d
--- /dev/null
+++ b/utils/xen/xsa-26.patch
@@ -0,0 +1,107 @@
+gnttab: fix releasing of memory upon switches between versions
+
+gnttab_unpopulate_status_frames() incompletely freed the pages
+previously used as status frame in that they did not get removed from
+the domain's xenpage_list, thus causing subsequent list corruption
+when those pages did get allocated again for the same or another purpose.
+
+Similarly, grant_table_create() and gnttab_grow_table() both improperly
+clean up in the event of an error - pages already shared with the guest
+can't be freed by just passing them to free_xenheap_page(). Fix this by
+sharing the pages only after all allocations succeeded.
+
+This is CVE-2012-5510 / XSA-26.
+
+Signed-off-by: Jan Beulich <jbeulich AT suse.com>
+Acked-by: Ian Campbell <ian.campbell AT citrix.com>
+
+diff --git a/xen/common/grant_table.c b/xen/common/grant_table.c
+index 6c0aa6f..a180aef 100644
+--- a/xen/common/grant_table.c
++++ b/xen/common/grant_table.c
+@@ -1126,12 +1126,13 @@ fault:
+ }
+
+ static int
+-gnttab_populate_status_frames(struct domain *d, struct grant_table *gt)
++gnttab_populate_status_frames(struct domain *d, struct grant_table *gt,
++ unsigned int req_nr_frames)
+ {
+ unsigned i;
+ unsigned req_status_frames;
+
+- req_status_frames = grant_to_status_frames(gt->nr_grant_frames);
++ req_status_frames = grant_to_status_frames(req_nr_frames);
+ for ( i = nr_status_frames(gt); i < req_status_frames; i++ )
+ {
+ if ( (gt->status[i] = alloc_xenheap_page()) == NULL )
+@@ -1162,7 +1163,12 @@ gnttab_unpopulate_status_frames(struct domain *d,
struct grant_table *gt)
+
+ for ( i = 0; i < nr_status_frames(gt); i++ )
+ {
+- page_set_owner(virt_to_page(gt->status[i]), dom_xen);
++ struct page_info *pg = virt_to_page(gt->status[i]);
++
++ BUG_ON(page_get_owner(pg) != d);
++ if ( test_and_clear_bit(_PGC_allocated, &pg->count_info) )
++ put_page(pg);
++ BUG_ON(pg->count_info & ~PGC_xen_heap);
+ free_xenheap_page(gt->status[i]);
+ gt->status[i] = NULL;
+ }
+@@ -1200,19 +1206,18 @@ gnttab_grow_table(struct domain *d, unsigned int
req_nr_frames)
+ clear_page(gt->shared_raw[i]);
+ }
+
+- /* Share the new shared frames with the recipient domain */
+- for ( i = nr_grant_frames(gt); i < req_nr_frames; i++ )
+- gnttab_create_shared_page(d, gt, i);
+-
+- gt->nr_grant_frames = req_nr_frames;
+-
+ /* Status pages - version 2 */
+ if (gt->gt_version > 1)
+ {
+- if ( gnttab_populate_status_frames(d, gt) )
++ if ( gnttab_populate_status_frames(d, gt, req_nr_frames) )
+ goto shared_alloc_failed;
+ }
+
++ /* Share the new shared frames with the recipient domain */
++ for ( i = nr_grant_frames(gt); i < req_nr_frames; i++ )
++ gnttab_create_shared_page(d, gt, i);
++ gt->nr_grant_frames = req_nr_frames;
++
+ return 1;
+
+ shared_alloc_failed:
+@@ -2134,7 +2139,7 @@
gnttab_set_version(XEN_GUEST_HANDLE(gnttab_set_version_t uop))
+
+ if ( op.version == 2 && gt->gt_version < 2 )
+ {
+- res = gnttab_populate_status_frames(d, gt);
++ res = gnttab_populate_status_frames(d, gt, nr_grant_frames(gt));
+ if ( res < 0)
+ goto out_unlock;
+ }
+@@ -2449,9 +2454,6 @@ grant_table_create(
+ clear_page(t->shared_raw[i]);
+ }
+
+- for ( i = 0; i < INITIAL_NR_GRANT_FRAMES; i++ )
+- gnttab_create_shared_page(d, t, i);
+-
+ /* Status pages for grant table - for version 2 */
+ t->status = xmalloc_array(grant_status_t *,
+ grant_to_status_frames(max_nr_grant_frames));
+@@ -2459,6 +2461,10 @@ grant_table_create(
+ goto no_mem_4;
+ memset(t->status, 0,
+ grant_to_status_frames(max_nr_grant_frames) *
sizeof(t->status[0]));
++
++ for ( i = 0; i < INITIAL_NR_GRANT_FRAMES; i++ )
++ gnttab_create_shared_page(d, t, i);
++
+ t->nr_status_frames = 0;
+
+ /* Okay, install the structure. */
diff --git a/utils/xen/xsa-27.patch b/utils/xen/xsa-27.patch
new file mode 100644
index 0000000..f0764cb
--- /dev/null
+++ b/utils/xen/xsa-27.patch
@@ -0,0 +1,168 @@
+hvm: Limit the size of large HVM op batches
+
+Doing large p2m updates for HVMOP_track_dirty_vram without preemption
+ties up the physical processor. Integrating preemption into the p2m
+updates is hard so simply limit to 1GB which is sufficient for a 15000
+* 15000 * 32bpp framebuffer.
+
+For HVMOP_modified_memory and HVMOP_set_mem_type preemptible add the
+necessary machinery to handle preemption.
+
+This is CVE-2012-5511 / XSA-27.
+
+Signed-off-by: Tim Deegan <tim AT xen.org>
+Signed-off-by: Ian Campbell <ian.campbell AT citrix.com>
+Acked-by: Ian Jackson <ian.jackson AT eu.citrix.com>
+
+x86/paging: Don't allocate user-controlled amounts of stack memory.
+
+This is XSA-27 / CVE-2012-5511.
+
+Signed-off-by: Tim Deegan <tim AT xen.org>
+Acked-by: Jan Beulich <jbeulich AT suse.com>
+v2: Provide definition of GB to fix x86-32 compile.
+
+Signed-off-by: Jan Beulich <JBeulich AT suse.com>
+Acked-by: Ian Jackson <ian.jackson AT eu.citrix.com>
+
+
+diff -r 5639047d6c9f xen/arch/x86/hvm/hvm.c
+--- a/xen/arch/x86/hvm/hvm.c Mon Nov 19 09:43:48 2012 +0100
++++ b/xen/arch/x86/hvm/hvm.c Mon Nov 19 16:00:33 2012 +0000
+@@ -3471,6 +3471,9 @@ long do_hvm_op(unsigned long op, XEN_GUE
+ if ( !is_hvm_domain(d) )
+ goto param_fail2;
+
++ if ( a.nr > GB(1) >> PAGE_SHIFT )
++ goto param_fail2;
++
+ rc = xsm_hvm_param(d, op);
+ if ( rc )
+ goto param_fail2;
+@@ -3498,7 +3501,6 @@ long do_hvm_op(unsigned long op, XEN_GUE
+ struct xen_hvm_modified_memory a;
+ struct domain *d;
+ struct p2m_domain *p2m;
+- unsigned long pfn;
+
+ if ( copy_from_guest(&a, arg, 1) )
+ return -EFAULT;
+@@ -3526,8 +3528,9 @@ long do_hvm_op(unsigned long op, XEN_GUE
+ goto param_fail3;
+
+ p2m = p2m_get_hostp2m(d);
+- for ( pfn = a.first_pfn; pfn < a.first_pfn + a.nr; pfn++ )
++ while ( a.nr > 0 )
+ {
++ unsigned long pfn = a.first_pfn;
+ p2m_type_t t;
+ mfn_t mfn = gfn_to_mfn(p2m, pfn, &t);
+ if ( p2m_is_paging(t) )
+@@ -3548,6 +3551,19 @@ long do_hvm_op(unsigned long op, XEN_GUE
+ /* don't take a long time and don't die either */
+ sh_remove_shadows(d->vcpu[0], mfn, 1, 0);
+ }
++
++ a.first_pfn++;
++ a.nr--;
++
++ /* Check for continuation if it's not the last interation */
++ if ( a.nr > 0 && hypercall_preempt_check() )
++ {
++ if ( copy_to_guest(arg, &a, 1) )
++ rc = -EFAULT;
++ else
++ rc = -EAGAIN;
++ break;
++ }
+ }
+
+ param_fail3:
+@@ -3595,7 +3611,6 @@ long do_hvm_op(unsigned long op, XEN_GUE
+ struct xen_hvm_set_mem_type a;
+ struct domain *d;
+ struct p2m_domain *p2m;
+- unsigned long pfn;
+
+ /* Interface types to internal p2m types */
+ p2m_type_t memtype[] = {
+@@ -3625,8 +3640,9 @@ long do_hvm_op(unsigned long op, XEN_GUE
+ goto param_fail4;
+
+ p2m = p2m_get_hostp2m(d);
+- for ( pfn = a.first_pfn; pfn < a.first_pfn + a.nr; pfn++ )
++ while ( a.nr > 0 )
+ {
++ unsigned long pfn = a.first_pfn;
+ p2m_type_t t;
+ p2m_type_t nt;
+ mfn_t mfn;
+@@ -3662,6 +3678,19 @@ long do_hvm_op(unsigned long op, XEN_GUE
+ goto param_fail4;
+ }
+ }
++
++ a.first_pfn++;
++ a.nr--;
++
++ /* Check for continuation if it's not the last interation */
++ if ( a.nr > 0 && hypercall_preempt_check() )
++ {
++ if ( copy_to_guest(arg, &a, 1) )
++ rc = -EFAULT;
++ else
++ rc = -EAGAIN;
++ goto param_fail4;
++ }
+ }
+
+ rc = 0;
+diff -r 5639047d6c9f xen/arch/x86/mm/paging.c
+--- a/xen/arch/x86/mm/paging.c Mon Nov 19 09:43:48 2012 +0100
++++ b/xen/arch/x86/mm/paging.c Mon Nov 19 16:00:33 2012 +0000
+@@ -529,13 +529,18 @@ int paging_log_dirty_range(struct domain
+
+ if ( !d->arch.paging.log_dirty.fault_count &&
+ !d->arch.paging.log_dirty.dirty_count ) {
+- int size = (nr + BITS_PER_LONG - 1) / BITS_PER_LONG;
+- unsigned long zeroes[size];
+- memset(zeroes, 0x00, size * BYTES_PER_LONG);
++ static uint8_t zeroes[PAGE_SIZE];
++ int off, size;
++
++ size = ((nr + BITS_PER_LONG - 1) / BITS_PER_LONG) * sizeof (long);
+ rv = 0;
+- if ( copy_to_guest_offset(dirty_bitmap, 0, (uint8_t *) zeroes,
+- size * BYTES_PER_LONG) != 0 )
+- rv = -EFAULT;
++ for ( off = 0; !rv && off < size; off += sizeof zeroes )
++ {
++ int todo = min(size - off, (int) PAGE_SIZE);
++ if ( copy_to_guest_offset(dirty_bitmap, off, zeroes, todo) )
++ rv = -EFAULT;
++ off += todo;
++ }
+ goto out;
+ }
+ d->arch.paging.log_dirty.fault_count = 0;
+diff -r 5639047d6c9f xen/include/asm-x86/config.h
+--- a/xen/include/asm-x86/config.h Mon Nov 19 09:43:48 2012 +0100
++++ b/xen/include/asm-x86/config.h Mon Nov 19 16:00:33 2012 +0000
+@@ -108,6 +108,9 @@ extern unsigned int trampoline_xen_phys_
+ extern unsigned char trampoline_cpu_started;
+ extern char wakeup_start[];
+ extern unsigned int video_mode, video_flags;
++
++#define GB(_gb) (_gb ## UL << 30)
++
+ #endif
+
+ #define asmlinkage
+@@ -123,7 +126,6 @@ extern unsigned int video_mode, video_fl
+ #define PML4_ADDR(_slot) \
+ ((((_slot ## UL) >> 8) * 0xffff000000000000UL) | \
+ (_slot ## UL << PML4_ENTRY_BITS))
+-#define GB(_gb) (_gb ## UL << 30)
+ #else
+ #define PML4_ENTRY_BYTES (1 << PML4_ENTRY_BITS)
+ #define PML4_ADDR(_slot) \
diff --git a/utils/xen/xsa-28.patch b/utils/xen/xsa-28.patch
new file mode 100644
index 0000000..fe4638e
--- /dev/null
+++ b/utils/xen/xsa-28.patch
@@ -0,0 +1,36 @@
+x86/HVM: range check xen_hvm_set_mem_access.hvmmem_access before use
+
+Otherwise an out of bounds array access can happen if changing the
+default access is being requested, which - if it doesn't crash Xen -
+would subsequently allow reading arbitrary memory through
+HVMOP_get_mem_access (again, unless that operation crashes Xen).
+
+This is XSA-28 / CVE-2012-5512.
+
+Signed-off-by: Jan Beulich <jbeulich AT suse.com>
+Acked-by: Tim Deegan <tim AT xen.org>
+Acked-by: Ian Campbell <ian.campbell AT citrix.com>
+
+diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c
+index 66cf805..08b6418 100644
+--- a/xen/arch/x86/hvm/hvm.c
++++ b/xen/arch/x86/hvm/hvm.c
+@@ -3699,7 +3699,7 @@ long do_hvm_op(unsigned long op,
XEN_GUEST_HANDLE(void) arg)
+ return rc;
+
+ rc = -EINVAL;
+- if ( !is_hvm_domain(d) )
++ if ( !is_hvm_domain(d) || a.hvmmem_access >= ARRAY_SIZE(memaccess) )
+ goto param_fail5;
+
+ p2m = p2m_get_hostp2m(d);
+@@ -3719,9 +3719,6 @@ long do_hvm_op(unsigned long op,
XEN_GUEST_HANDLE(void) arg)
+ ((a.first_pfn + a.nr - 1) > domain_get_maximum_gpfn(d)) )
+ goto param_fail5;
+
+- if ( a.hvmmem_access >= ARRAY_SIZE(memaccess) )
+- goto param_fail5;
+-
+ for ( pfn = a.first_pfn; pfn < a.first_pfn + a.nr; pfn++ )
+ {
+ p2m_type_t t;
diff --git a/utils/xen/xsa-29.patch b/utils/xen/xsa-29.patch
new file mode 100644
index 0000000..f8f6e38
--- /dev/null
+++ b/utils/xen/xsa-29.patch
@@ -0,0 +1,49 @@
+xen: add missing guest address range checks to XENMEM_exchange handlers
+
+Ever since its existence (3.0.3 iirc) the handler for this has been
+using non address range checking guest memory accessors (i.e.
+the ones prefixed with two underscores) without first range
+checking the accessed space (via guest_handle_okay()), allowing
+a guest to access and overwrite hypervisor memory.
+
+This is XSA-29 / CVE-2012-5513.
+
+Signed-off-by: Jan Beulich <jbeulich AT suse.com>
+Acked-by: Ian Campbell <ian.campbell AT citrix.com>
+Acked-by: Ian Jackson <ian.jackson AT eu.citrix.com>
+
+diff --git a/xen/common/compat/memory.c b/xen/common/compat/memory.c
+index 2402984..1d877fc 100644
+--- a/xen/common/compat/memory.c
++++ b/xen/common/compat/memory.c
+@@ -114,6 +114,12 @@ int compat_memory_op(unsigned int cmd,
XEN_GUEST_HANDLE(void) compat)
+ (cmp.xchg.out.nr_extents << cmp.xchg.out.extent_order)) )
+ return -EINVAL;
+
++ if ( !compat_handle_okay(cmp.xchg.in.extent_start,
++ cmp.xchg.in.nr_extents) ||
++ !compat_handle_okay(cmp.xchg.out.extent_start,
++ cmp.xchg.out.nr_extents) )
++ return -EFAULT;
++
+ start_extent = cmp.xchg.nr_exchanged;
+ end_extent = (COMPAT_ARG_XLAT_SIZE - sizeof(*nat.xchg)) /
+ (((1U << ABS(order_delta)) + 1) *
+diff --git a/xen/common/memory.c b/xen/common/memory.c
+index 4e7c234..59379d3 100644
+--- a/xen/common/memory.c
++++ b/xen/common/memory.c
+@@ -289,6 +289,13 @@ static long
memory_exchange(XEN_GUEST_HANDLE(xen_memory_exchange_t) arg)
+ goto fail_early;
+ }
+
++ if ( !guest_handle_okay(exch.in.extent_start, exch.in.nr_extents) ||
++ !guest_handle_okay(exch.out.extent_start, exch.out.nr_extents) )
++ {
++ rc = -EFAULT;
++ goto fail_early;
++ }
++
+ /* Only privileged guests can allocate multi-page contiguous extents. */
+ if ( !multipage_allocation_permitted(current->domain,
+ exch.in.extent_order) ||
diff --git a/utils/xen/xsa-30.patch b/utils/xen/xsa-30.patch
new file mode 100644
index 0000000..817879a
--- /dev/null
+++ b/utils/xen/xsa-30.patch
@@ -0,0 +1,57 @@
+xen: fix error handling of guest_physmap_mark_populate_on_demand()
+
+The only user of the "out" label bypasses a necessary unlock, thus
+enabling the caller to lock up Xen.
+
+Also, the function was never meant to be called by a guest for itself,
+so rather than inspecting the code paths in depth for potential other
+problems this might cause, and adjusting e.g. the non-guest printk()
+in the above error path, just disallow the guest access to it.
+
+Finally, the printk() (considering its potential of spamming the log,
+the more that it's not using XENLOG_GUEST), is being converted to
+P2M_DEBUG(), as debugging is what it apparently was added for in the
+first place.
+
+This is XSA-30 / CVE-2012-5514.
+
+Signed-off-by: Jan Beulich <jbeulich AT suse.com>
+Acked-by: Ian Campbell <ian.campbell AT citrix.com>
+Acked-by: George Dunlap <george.dunlap AT eu.citrix.com>
+Acked-by: Ian Jackson <ian.jackson AT eu.citrix.com>
+
+diff -r 5639047d6c9f xen/arch/x86/mm/p2m.c
+--- a/xen/arch/x86/mm/p2m.c Mon Nov 19 09:43:48 2012 +0100
++++ b/xen/arch/x86/mm/p2m.c Thu Nov 22 17:07:37 2012 +0000
+@@ -2412,6 +2412,9 @@ guest_physmap_mark_populate_on_demand(st
+ mfn_t omfn;
+ int rc = 0;
+
++ if ( !IS_PRIV_FOR(current->domain, d) )
++ return -EPERM;
++
+ if ( !paging_mode_translate(d) )
+ return -EINVAL;
+
+@@ -2430,8 +2433,7 @@ guest_physmap_mark_populate_on_demand(st
+ omfn = gfn_to_mfn_query(p2m, gfn + i, &ot);
+ if ( p2m_is_ram(ot) )
+ {
+- printk("%s: gfn_to_mfn returned type %d!\n",
+- __func__, ot);
++ P2M_DEBUG("gfn_to_mfn returned type %d!\n", ot);
+ rc = -EBUSY;
+ goto out;
+ }
+@@ -2453,10 +2455,10 @@ guest_physmap_mark_populate_on_demand(st
+ BUG_ON(p2m->pod.entry_count < 0);
+ }
+
++out:
+ audit_p2m(p2m, 1);
+ p2m_unlock(p2m);
+
+-out:
+ return rc;
+ }
+
diff --git a/utils/xen/xsa-31.patch b/utils/xen/xsa-31.patch
new file mode 100644
index 0000000..1f3d929
--- /dev/null
+++ b/utils/xen/xsa-31.patch
@@ -0,0 +1,50 @@
+memop: limit guest specified extent order
+
+Allowing unbounded order values here causes almost unbounded loops
+and/or partially incomplete requests, particularly in PoD code.
+
+The added range checks in populate_physmap(), decrease_reservation(),
+and the "in" one in memory_exchange() architecturally all could use
+PADDR_BITS - PAGE_SHIFT, and are being artificially constrained to
+MAX_ORDER.
+
+This is XSA-31 / CVE-2012-5515.
+
+Signed-off-by: Jan Beulich <jbeulich AT suse.com>
+Acked-by: Tim Deegan <tim AT xen.org>
+Acked-by: Ian Jackson <ian.jackson AT eu.citrix.com>
+
+diff --git a/xen/common/memory.c b/xen/common/memory.c
+index 4e7c234..9b9fb18 100644
+--- a/xen/common/memory.c
++++ b/xen/common/memory.c
+@@ -117,7 +117,8 @@ static void populate_physmap(struct memop_args *a)
+
+ if ( a->memflags & MEMF_populate_on_demand )
+ {
+- if ( guest_physmap_mark_populate_on_demand(d, gpfn,
++ if ( a->extent_order > MAX_ORDER ||
++ guest_physmap_mark_populate_on_demand(d, gpfn,
+ a->extent_order) < 0
)
+ goto out;
+ }
+@@ -216,7 +217,8 @@ static void decrease_reservation(struct memop_args *a)
+ xen_pfn_t gmfn;
+
+ if ( !guest_handle_subrange_okay(a->extent_list, a->nr_done,
+- a->nr_extents-1) )
++ a->nr_extents-1) ||
++ a->extent_order > MAX_ORDER )
+ return;
+
+ for ( i = a->nr_done; i < a->nr_extents; i++ )
+@@ -278,6 +280,9 @@ static long
memory_exchange(XEN_GUEST_HANDLE(xen_memory_exchange_t) arg)
+ if ( (exch.nr_exchanged > exch.in.nr_extents) ||
+ /* Input and output domain identifiers match? */
+ (exch.in.domid != exch.out.domid) ||
++ /* Extent orders are sensible? */
++ (exch.in.extent_order > MAX_ORDER) ||
++ (exch.out.extent_order > MAX_ORDER) ||
+ /* Sizes of input and output lists do not overflow a long? */
+ ((~0UL >> exch.in.extent_order) < exch.in.nr_extents) ||
+ ((~0UL >> exch.out.extent_order) < exch.out.nr_extents) ||
diff --git a/video/ffmpeg/DETAILS b/video/ffmpeg/DETAILS
index a3d9b55..6a60461 100755
--- a/video/ffmpeg/DETAILS
+++ b/video/ffmpeg/DETAILS
@@ -1,6 +1,6 @@
SPELL=ffmpeg
if [[ $FFMPEG_RELEASE == stable ]]; then
- VERSION=1.0
+ VERSION=1.0.1
SECURITY_PATCH=13
else
VERSION=0.7.13
diff --git a/video/ffmpeg/HISTORY b/video/ffmpeg/HISTORY
index 4a4add1..e981736 100644
--- a/video/ffmpeg/HISTORY
+++ b/video/ffmpeg/HISTORY
@@ -1,3 +1,6 @@
+2012-12-04 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 1.0.1
+
2012-09-28 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.0
- [SM-Commit] GIT changes to devel-xorg-modular grimoire by Vlad Glagolev (857fe5b7d01039f1ddde6a112a22cb9bbc27815c), Vlad Glagolev, 12/06/2012
Archive powered by MHonArc 2.6.24.