sm-commit AT lists.ibiblio.org
Subject: Source Mage code commit list
List archive
[SM-Commit] GIT changes to stable-0.61 grimoire by Vlad Glagolev (86a5f94c127ef4604b09cd755fc9d8940c5b3129)
- From: Vlad Glagolev <scm AT sourcemage.org>
- To: sm-commit AT lists.ibiblio.org
- Subject: [SM-Commit] GIT changes to stable-0.61 grimoire by Vlad Glagolev (86a5f94c127ef4604b09cd755fc9d8940c5b3129)
- Date: Wed, 9 Jan 2013 15:40:03 -0600
GIT changes to stable-0.61 grimoire by Vlad Glagolev <stealth AT sourcemage.org>:
ChangeLog | 3
audio-creation/gmorgan/DETAILS | 6
audio-creation/gmorgan/HISTORY | 3
audio-libs/libmusicbrainz/DEPENDS | 2
audio-libs/libmusicbrainz/HISTORY | 4
audio-players/listen/DEPENDS | 2
audio-players/listen/HISTORY | 3
cluster/drbd/DETAILS | 20
cluster/drbd/HISTORY | 3
crypto/nss/DETAILS | 12
crypto/nss/HISTORY | 9
crypto/nss/PREPARE | 2
crypto/nss/PRE_BUILD | 6
crypto/nss/PRE_SUB_DEPENDS | 1
crypto/nss/SUB_DEPENDS | 2
crypto/nss/nss-3.14-config-1.patch | 271 +++++
database/sqlite/DETAILS | 6
database/sqlite/HISTORY | 6
devel/b43-tools/DETAILS | 4
devel/b43-tools/HISTORY | 3
devel/oprofileui/DEPENDS | 1
devel/oprofileui/HISTORY | 3
disk/eject/DETAILS | 8
disk/eject/HISTORY | 3
doc/miscfiles/DETAILS | 1
doc/miscfiles/HISTORY | 6
e/imlib2/DETAILS | 2
e/imlib2/HISTORY | 3
graphics-libs/freetype2/DETAILS | 4
graphics-libs/freetype2/HISTORY | 6
graphics-libs/libwmf/DETAILS | 2
graphics-libs/libwmf/HISTORY | 3
graphics/inkscape/DETAILS | 7
graphics/inkscape/HISTORY | 3
http/firefox/DEPENDS | 3
http/firefox/DETAILS | 6
http/firefox/HISTORY | 8
http/seamonkey/DEPENDS | 11
http/seamonkey/DETAILS | 6
http/seamonkey/HISTORY | 8
http/seamonkey/mailnews.patch | 16
kernels/linux/HISTORY | 14
kernels/linux/info/kernels/3.7 | 5
kernels/linux/info/patches/maintenance_patches_3/patch-3.0.56 | 5
kernels/linux/info/patches/maintenance_patches_3/patch-3.0.57 | 5
kernels/linux/info/patches/maintenance_patches_3/patch-3.4.23 | 5
kernels/linux/info/patches/maintenance_patches_3/patch-3.4.24 | 5
kernels/linux/info/patches/maintenance_patches_3/patch-3.6.10 | 5
kernels/linux/info/patches/maintenance_patches_3/patch-3.6.11 | 5
kernels/linux/info/patches/maintenance_patches_3/patch-3.7 | 5
kernels/linux/info/patches/maintenance_patches_3/patch-3.7.1 | 5
kernels/linux/latest.defaults | 4
latex/glosstex/DETAILS | 2
latex/glosstex/HISTORY | 3
latex/lacheck/DETAILS | 2
latex/lacheck/HISTORY | 3
libs/nspr/DETAILS | 4
libs/nspr/HISTORY | 3
mail/bogofilter/DETAILS | 5
mail/bogofilter/HISTORY | 4
net/httpry/BUILD | 1
net/httpry/HISTORY | 5
net/httpry/usrlocal.patch | 11
python-pypi/ctypes/BUILD | 1
python-pypi/ctypes/DETAILS | 26
python-pypi/ctypes/DOWNLOAD | 1
python-pypi/ctypes/HISTORY | 5
python-pypi/ctypes/INSTALL | 1
python-pypi/ctypes/PRE_BUILD | 1
python-pypi/ctypes/TRIGGERS | 1
utils/xen/DEPENDS | 2
utils/xen/DETAILS | 2
utils/xen/HISTORY | 13
utils/xen/PRE_BUILD | 19
utils/xen/init.d/xendomains | 15
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-19.patch | 11
utils/xen/xsa-20.patch | 38
utils/xen/xsa-21.patch | 31
utils/xen/xsa-22.patch | 40
utils/xen/xsa-23.patch | 32
utils/xen/xsa-24.patch | 26
utils/xen/xsa-25.patch | 461
----------
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-libs/smpeg/DETAILS | 2
video-libs/smpeg/HISTORY | 3
x11/xearth/DETAILS | 4
x11/xearth/HISTORY | 3
xorg-lib/libxp/HISTORY | 4
xorg-lib/libxp/PRE_BUILD | 6
xorg-lib/libxp/libXp-1.0.1.tar.bz2.sig |binary
xorg-lib/libxp/werror-fix.patch | 11
101 files changed, 583 insertions(+), 1445 deletions(-)
New commits:
commit 86a5f94c127ef4604b09cd755fc9d8940c5b3129
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
seamonkey: => 2.15 (security)
(cherry picked from commit 35d1bb63811e88ec9ac440f5895e8608c5c161a5)
commit d812e00c999a708a5562adf843461c410bd6d185
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
seamonkey: => 2.14.1
(cherry picked from commit 1acb4f4f777df82f8e6de2aa37ac1e32a84787f6)
commit 148e4705fe1fe3b043042501c3b9d76942cf7a01
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
drbd: added kernel 3.5-3.7 support
(cherry picked from commit b729dfef8f5d77661f5029bf1437e0f14da21dea)
commit 7c2fda6f4d5e4a04e68b72ff1e7beac57388f548
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
oprofileui: Depends on xml-parser
(cherry picked from commit e92df7f0657c21911cfd37c93baf00edb2914398)
commit 6b16e565242d5e07e3820ecfefd33e2d3b921c81
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
doc/miscfiles: remove SOURCE2
(cherry picked from commit c34814078feb7e0cad4a0756c86da6bcd2aff154)
commit abaf838670ad157d991c46240fb268a748793da9
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
x11/xearth: fix WEB_SITE and LICENSE
(cherry picked from commit a94f5764f87d7d2765862f3a4540cf186d215fd1)
commit 97691da3d3440c57a7ad3ba66de786f9318d2489
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
e/imlib2: update WEB_SITE
(cherry picked from commit 53a9d8d73e489a3015856db83c89ef53bdda675f)
commit f4749f809cbe343e827f3b29cda9191107e711f9
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
graphics-libs/libwmf: correct WEB_SITE
(cherry picked from commit 68d388239252866add34f5a7f819fffc14abf847)
commit b32737a10a70ff6212b57c8955384e78cf4b0440
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
latex/glosstex: fix WEB_SITE
(cherry picked from commit 89ecb4f142685ccccacaa6bfa54e836b609ecdf6)
commit d98805757554b4c0ba4f4c599cb73a8821849d67
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
latex/lacheck: fix WEB_SITE
(cherry picked from commit b227311f4297bc4af50ec76a5e0e0f2f3c1c0703)
commit e13233e1abcaa24c79aa65e5e61f95c755bbfdcd
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
python-pypi/ctypes: deprecated in favour of python
(cherry picked from commit a7fad4d079f20ab01addfaf41c5e15183912e807)
Conflicts:
ChangeLog
commit 034c5daa1c640583bf6503087b62e85333db52c1
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
audio-players/listen: change dependency on ctypes to dependency on python
(cherry picked from commit 72462358b85eb3aece919880b700ba34279bf2c8)
commit fcd19b699e9da3f6f980c8626519404980491d54
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
audio-libs/libmusicbrainz: change dependency on ctypes to python
(cherry picked from commit fcebbfcfe69b7dda54fe08eccd5168659ad01bd3)
commit 56a6cc4aa7a25a8a60d9f67ba8d210324699b9a9
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
video-libs/smpeg: fix WEB_SITE
(cherry picked from commit c2fd7c86935979718da89e0e0c5e3dfeffd0f434)
commit 10631057238801e78d6b58998e2b1703715db8db
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
disk/eject: fix SOURCE_URL and WEB_SITE
(cherry picked from commit b4bc76b5547b6be9abcd293b9c359d3af0a23cd4)
commit d827171ccb0c515423964206935890d27250ebd6
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
linux: => 3.6.11 (eol)
(cherry picked from commit fb367dbda8cdae748e17029c0a3b1d60a332fc3e)
commit 5c7dafd9ccba95436ae0bf6254495bace36480ee
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
linux: => 3.4.24 (lts)
(cherry picked from commit 78c1188e87461e848687a13202bf70abd4335323)
commit 59ad2572e3923380fc4de90ee75db63ce1d5aa3a
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
linux: => 3.0.57 (lts)
(cherry picked from commit d67b973203429e17b89469a78570bf356ea8e0c3)
commit 6bda64da19482ee92b4f35970d94535e0c45eb88
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
kernels/linux: version 3.7.1
(cherry picked from commit 8d4f6fdc40e847e99ba9fe0016a7a657d7ccbe74)
commit e9fe8e3108ff0308a2d55da8b74ee2a204be332c
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
freetype2: => 2.4.11
(cherry picked from commit 14ad9ce8a38565a23110913ed57d108efbe036e6)
commit eb3a9c3a9a1354e9f1a9f41d33276bcd9292c5b1
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
freetype2 2.4.10
(cherry picked from commit 839636eb548061bd0f273f201309b961718cf35d)
commit 50bf3040c283cf711bc45cf179cec22b3dc7cb56
Author: Tommy Boatman <tboatman AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
httpry: Fix bombed man page installation (Prometheus report)
(cherry picked from commit 236d1eb3bef0fc0e871d43f28e72cf9f148116e4)
commit 85053badcb26a1fac6314a87993f6d959c84d031
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
inkscape 0.48.4, SECURITY_PATCH=2
Signed by C5ECBAF0
I cann't find it.
(cherry picked from commit f21f36ca3f0415a793222a9144b6448fcad01381)
commit c64954c16e66cfc4755fca6aff47b285cacaf646
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
bogofilter: => 1.2.3 SECURTIY FIX
(cherry picked from commit a2bdc8c52f177df92063ccd90150d8b895adf785)
commit 02fa6570cc0bc95405b4bdd27f43ae2938f3c75f
Author: Tommy Boatman <tboatman AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
b43-tools: Prometheus summon failure - changed website to git.bues.ch
(cherry picked from commit 7857975cd757a3cd4b5e09ec88e2fbaa95903864)
commit bbe340e67636f6db1299121094c2b4cc22e33aa0
Author: Tommy Boatman <tboatman AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
gmorgan -> 0.57 (Prometheus barfs on old version)
(cherry picked from commit 0f6a441ae3e2db76a60cd9322dca07b528f1e8e4)
commit 56b01c4733c4f03ae6467e89f5c11c6fce241c15
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
xen: => 4.1.4
(cherry picked from commit c13f90b28aa40be4ab4ad4c17ea42904340b799c)
commit bbb14dce6469ee43c65a0c10453e750a659cfb4f
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
xen: corrected detection of running domUs after instant poweroff/reboot
(cherry picked from commit b6c9153c8f9eeb9ae900cdad51cc6380ed92cbaa)
commit a482f10b1680b8a9683e8a19dfa5ad9bfe553d8f
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
xen: added gnutls optional dependency
(cherry picked from commit aa9705d2d012aac48374e121735098febe210a6a)
commit 524e621f0a5dc3045b54598946652560e3878bd6
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
linux 3.6.10
(cherry picked from commit 27a232f56ce4b774c100dd778ce295c2b33542bb)
commit af43eca7207dda3517b1dcbc4dffcad9235576d7
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
libxp: sig file updated, upstream sources changes
sha1sum libXp-1.0.1.tar.bz2
9c76823c7cfcb43f097963d0c930dcc4e38807a8 libXp-1.0.1.tar.bz2
same as in Arch
https://projects.archlinux.org/svntogit/packages.git/tree/trunk/PKGBUILD?h=packages/libxp
(cherry picked from commit 33c9aec300cefde1dd8cd8beaa27cbc60d692727)
commit 576891c4464f2cd37501861ccda5a9377725a62d
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
http/firefox: version 18.0
(cherry picked from commit b922174dbe1785999a84c1efa1259bd085baae5f)
commit 0931039c95465a316194122d96cdff332e3e016d
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
firefox 17.0.1
(cherry picked from commit 6e1844dfc1215f9123748fa923a3a0566a4a7940)
commit 68eec6878f087b66e2f0c4474213cf864da61f01
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
sqlite: => 3.7.14.1
(cherry picked from commit 44edf7914bb59dd973129fee89f920a33da22058)
commit aba3dd999e45238d23a359da212e94a4a176c2f6
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
sqlite: => 3.7.14
(cherry picked from commit d8c98af205ec11740ba6c1d27547a9384392b95c)
commit 5b3c9e9ec7f9150bd6b1193f7e21377718f9bc2b
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
nspr 4.9.4
(cherry picked from commit 873abda997e70468ccced4ab842e42a1e32096ad)
commit bf8c81e68b1bbe9a35f1ad8fc06bef7c076f16aa
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
crypto/nss: add 3.14 branch
(cherry picked from commit cc99cfe3153f33a4fc548e59ee752b408b26f34c)
commit 2a7394bc59e076a5a7231a427c36440bcc13a81c
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
nss 3.13.6
(cherry picked from commit 5504b3379ab385a2d57a131fd7f26184a8543441)
diff --git a/ChangeLog b/ChangeLog
index 9d72ab8..e210286 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2012-12-22 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * python-pypi/ctypes: spell deprecated [part of python as of version
2.5]
+
2012-08-13 Vlad Glagolev <stealth AT sourcemage.org>
* lib/libyaml: moved to libs section; new spell, YAML parser and
emitter
written in C
diff --git a/audio-creation/gmorgan/DETAILS b/audio-creation/gmorgan/DETAILS
index c2068e2..74ceea4 100755
--- a/audio-creation/gmorgan/DETAILS
+++ b/audio-creation/gmorgan/DETAILS
@@ -1,9 +1,9 @@
SPELL=gmorgan
- VERSION=0.25
- SOURCE=$SPELL-$VERSION.tar.gz
+ VERSION=0.57
+ SOURCE=$SPELL'_'$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
-
SOURCE_HASH=sha512:d3a24ccad6a18e748ff99fc56f64029f2beb73d335bde9fd9fdb9724618d628248972136594710d3ddd3de6b7c9d7eb42e6ddad10c0bbcfc9654daf50a21404c
+
SOURCE_HASH=sha512:9270232549e6e40efa54f2f9a13ebfd76135084c2cdd04fd6b9982e0e7c4adeeeeed431cb3ccf51754af04c12964b191d4ba3991f50f2f81813d0e6a7a09d197
WEB_SITE=http://gmorgan.sourceforge.net/
ENTERED=20031209
LICENSE[0]=GPL
diff --git a/audio-creation/gmorgan/HISTORY b/audio-creation/gmorgan/HISTORY
index ae66dea..97e65d3 100644
--- a/audio-creation/gmorgan/HISTORY
+++ b/audio-creation/gmorgan/HISTORY
@@ -1,3 +1,6 @@
+2012-12-11 Tommy Boatman <tboatman AT sourcemage.org>
+ * DETAILS: Update to 0.57 to fix Prometheus failure
+
2006-10-03 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: [automated] Removed UPDATED.
diff --git a/audio-libs/libmusicbrainz/DEPENDS
b/audio-libs/libmusicbrainz/DEPENDS
index fd65bda..530054e 100755
--- a/audio-libs/libmusicbrainz/DEPENDS
+++ b/audio-libs/libmusicbrainz/DEPENDS
@@ -1,5 +1,5 @@
depends -sub CXX gcc &&
depends expat &&
if [[ "${LIBMUSICBRAINZ_PYTHON}" == "y" ]]
-then depends ctypes
+then depends python
fi
diff --git a/audio-libs/libmusicbrainz/HISTORY
b/audio-libs/libmusicbrainz/HISTORY
index 4e8d341..e627d63 100644
--- a/audio-libs/libmusicbrainz/HISTORY
+++ b/audio-libs/libmusicbrainz/HISTORY
@@ -1,3 +1,7 @@
+2012-12-23 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DEPENDS: change dependency on ctypes to python since recent
+ versions of python contain ctypes
+
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-players/listen/DEPENDS b/audio-players/listen/DEPENDS
index ead4305..7014133 100755
--- a/audio-players/listen/DEPENDS
+++ b/audio-players/listen/DEPENDS
@@ -1,7 +1,7 @@
depends pygtk2 &&
depends pyvorbis &&
depends pymad &&
-depends ctypes &&
+depends python &&
depends gst-python &&
depends pysqlite &&
depends gnome-python-extras &&
diff --git a/audio-players/listen/HISTORY b/audio-players/listen/HISTORY
index 8e68eb9..5d4cd37 100644
--- a/audio-players/listen/HISTORY
+++ b/audio-players/listen/HISTORY
@@ -1,3 +1,6 @@
+2012-12-23 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DEPENDS: change dep on ctypes to python
+
2010-03-14 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 0.6.5
diff --git a/cluster/drbd/DETAILS b/cluster/drbd/DETAILS
index d808134..1c5c9d1 100755
--- a/cluster/drbd/DETAILS
+++ b/cluster/drbd/DETAILS
@@ -6,18 +6,30 @@ local KERNEL_BRANCH=`get_kernel_version|cut -d . -f -3` &&
if [[ $KERNEL_BRANCH == 2.6.33 ]] || [[ $KERNEL_BRANCH == 2.6.34 ]]; then
VERSION=8.3.7
SOURCE_HASH=sha512:9ea576ed6a75d80009ade0f9540535b2a65ecee6d38b1a85fa3146a97aac8cb3add31154e2921630aa75121c7115d66bdcf45adb8e0fa481bdb27c011b1c9b15
+elif [[ $KERNEL_BRANCH == 2.6.35 ]] || [[ $KERNEL_BRANCH == 2.6.36 ]]; then
+ VERSION=8.3.8.1
+
SOURCE_HASH=sha512:c43c6d065328058db66f708d47ce082603b766deb1530c57aa736a42b4908f780ede41f76395ca45c2691ef1dfd142147a4c98a7bcdb26ba7de73b149d8f9f5f
elif [[ $KERNEL_BRANCH == 2.6.37 ]] || [[ $KERNEL_BRANCH == 2.6.38 ]]; then
VERSION=8.3.9
SOURCE_HASH=sha512:7d6545b3298f2af7cc6ba91a501a15f3232cb914619deae4ff5b09b14d59375015878c8794464cedee298b1209cee60a6bd16cca436471b20c0641cc2a6f2745
elif [[ $KERNEL_BRANCH == 2.6.39 ]]; then
VERSION=8.3.10
SOURCE_HASH=sha512:8d904ada9c80732b47cbf149cf4172658d350856d8688f1dce92c16ce1c4e946a0b3b3a14bb3c9361684fc08b257207c58beaa2fdb534f2abf47ac45aa659389
-elif [[ ${KERNEL_BRANCH%%.*} == 3 ]]; then
+else
+ case ${KERNEL_BRANCH%.*} in
+ 3.[01234])
VERSION=8.3.11
SOURCE_HASH=sha512:2bbf16d69e897adcb247d451f1d844993bdb3ad201027a588f9a45b4fe43fa2f6e98ed6063e8dccc92b9a231ccebf0af85a8671e5672fa710aa986e555ae896d
-else
- VERSION=8.3.8.1
-
SOURCE_HASH=sha512:c43c6d065328058db66f708d47ce082603b766deb1530c57aa736a42b4908f780ede41f76395ca45c2691ef1dfd142147a4c98a7bcdb26ba7de73b149d8f9f5f
+ ;;
+ 3.[567])
+ VERSION=8.3.13
+
SOURCE_HASH=sha512:fff72545ae569dad37d202bd7dcb075e443964e4d2e95ae124bbcac098762bee78f91e4863b56abfca2bdce2baa42bb3fdbdf9bb489f498d84aa679fa43ae702
+ ;;
+ *)
+ message "${PROBLEM_COLOR}ERROR: kernel version $KERNEL_BRANCH not
supported.${MESSAGE_COLOR}" &&
+ return 1
+ ;;
+ esac
fi
BRANCH=`echo $VERSION|cut -d . -f 1,2`
SOURCE=${SPELL}-${VERSION}.tar.gz
diff --git a/cluster/drbd/HISTORY b/cluster/drbd/HISTORY
index 583f731..9c34967 100644
--- a/cluster/drbd/HISTORY
+++ b/cluster/drbd/HISTORY
@@ -1,3 +1,6 @@
+2013-01-08 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: added kernel 3.5-3.7 support (see
drbd.org/download/mainline)
+
2012-03-31 Vlad Glagolev <stealth AT sourcemage.org>
* BUILD: pass KDIR var to build for using correct kernel sources
diff --git a/crypto/nss/DETAILS b/crypto/nss/DETAILS
index 1faeaae..d5a4d41 100755
--- a/crypto/nss/DETAILS
+++ b/crypto/nss/DETAILS
@@ -1,7 +1,7 @@
SPELL=nss
if [ -z "$NSS_BRANCH" ] || [ "$NSS_BRANCH" == "DEFAULT" ]; then
- NSS_BRANCH=3.13
+ NSS_BRANCH=3.14
fi
case $NSS_BRANCH in
@@ -29,10 +29,16 @@ case $NSS_BRANCH in
# SOURCE2_URL[0]=$SOURCE_URL.asc
;;
3.13)
- VERSION=3.13.5
+ VERSION=3.13.6
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_URL[0]=http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_${VERSION//./_}_RTM/src/$SOURCE
-
SOURCE_HASH=sha512:8096390bbb8544ef1c3d5b8e3245b5bb618b4fa718e2fb8ab4c134f3e8b386c07146bbd60a16edd261b4c5014d29b6cf85118ad0e7e43b53ba3fd7c25a7c79b5
+
SOURCE_HASH=sha512:45bc254eb238ea23fdd8d2c9128a22cebe15fda9ed5c9c1d112b5756d4d2b76e7f3a99d3600254bdcd6eeb18bda224d52e676e169207193798200f0d41baa29d
+ ;;
+ 3.14)
+ VERSION=3.14.1
+ SOURCE=$SPELL-$VERSION.tar.gz
+
SOURCE_URL[0]=http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_${VERSION//./_}_RTM/src/$SOURCE
+
SOURCE_HASH=sha512:f62a7ebcdade8815379f80929c63de1284c3ca3f5c87214cb5b327f6689635118d301969d4ef0e1940c7a426253b13ce54acd68a91abc23ab32626341217580e
;;
esac
diff --git a/crypto/nss/HISTORY b/crypto/nss/HISTORY
index dbd334f..1d10e4a 100644
--- a/crypto/nss/HISTORY
+++ b/crypto/nss/HISTORY
@@ -1,3 +1,12 @@
+2013-01-09 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS, SUB_DEPENDS, PRE_SUB_DEPENDS, PREPARE: added
+ 3.14 branch, made it the default
+ * PRE_BUILD, nss-3.14-config-1.patch: regenerated patch
+
+no changes added to commit (use "git add" and/or "git commit -a")
+2012-08-19 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 3.13.6
+
2012-06-05 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 3.13.5
diff --git a/crypto/nss/PREPARE b/crypto/nss/PREPARE
index 50f62f7..686f58a 100755
--- a/crypto/nss/PREPARE
+++ b/crypto/nss/PREPARE
@@ -1 +1 @@
-config_query_list NSS_BRANCH "Which branch of $SPELL do you want to build?"
DEFAULT 3.11 3.12 3.13
+config_query_list NSS_BRANCH "Which branch of $SPELL do you want to build?"
DEFAULT 3.11 3.12 3.13 3.14
diff --git a/crypto/nss/PRE_BUILD b/crypto/nss/PRE_BUILD
index 7a3df51..22d9c9f 100755
--- a/crypto/nss/PRE_BUILD
+++ b/crypto/nss/PRE_BUILD
@@ -2,7 +2,11 @@ default_pre_build &&
cd $SOURCE_DIRECTORY &&
-patch -p1 < $SCRIPT_DIRECTORY/nss-3.12-config-1.patch &&
+if [[ $NSS_BRANCH == "3.14" ]]; then
+ patch -p1 < $SCRIPT_DIRECTORY/nss-3.14-config-1.patch
+else
+ patch -p1 < $SCRIPT_DIRECTORY/nss-3.12-config-1.patch
+fi &&
if [[ "$NSS_PEM" == "y" ]]; then
tar jxvf $SCRIPT_DIRECTORY/nss-pem-20100412.tar.bz2 &&
diff --git a/crypto/nss/PRE_SUB_DEPENDS b/crypto/nss/PRE_SUB_DEPENDS
index dcd5d56..eeb2144 100755
--- a/crypto/nss/PRE_SUB_DEPENDS
+++ b/crypto/nss/PRE_SUB_DEPENDS
@@ -1,6 +1,7 @@
case $THIS_SUB_DEPENDS in
3.12.x) if [ $NSS_BRANCH == "3.12" ]; then return 0; fi;;
3.13.x) if [ $NSS_BRANCH == "3.13" ]; then return 0; fi;;
+ 3.14.x) if [ $NSS_BRANCH == "3.14" ]; then return 0; fi;;
PEM) if [ $NSS_PEM == "y" ]; then return 0; fi;;
esac
return 1
diff --git a/crypto/nss/SUB_DEPENDS b/crypto/nss/SUB_DEPENDS
index 4ec4937..a80f80c 100755
--- a/crypto/nss/SUB_DEPENDS
+++ b/crypto/nss/SUB_DEPENDS
@@ -3,6 +3,8 @@ case $THIS_SUB_DEPENDS in
NSS_BRANCH="3.12" ;;
3.13.x) echo "3.13.x release needed, forcing it." &&
NSS_BRANCH="3.13" ;;
+ 3.14.x) echo "3.13.x release needed, forcing it." &&
+ NSS_BRANCH="3.14" ;;
PEM) echo "nss with pem needed, forcing it." &&
NSS_PEM="y" ;;
*) echo "unknown sub-depends!"; return 1 ;;
diff --git a/crypto/nss/nss-3.14-config-1.patch
b/crypto/nss/nss-3.14-config-1.patch
new file mode 100644
index 0000000..43e3d8a
--- /dev/null
+++ b/crypto/nss/nss-3.14-config-1.patch
@@ -0,0 +1,271 @@
+From 6fc285f4176de5cc4f8afed2188c6021c3367511 Mon Sep 17 00:00:00 2001
+From: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+Date: Wed, 9 Jan 2013 18:12:36 +0100
+Subject: [PATCH] nss-3.14-config-1
+
+---
+ mozilla/security/nss/cmd/disttools/Makefile | 66 +++++++++++
+ mozilla/security/nss/cmd/disttools/nss-config.in | 145
+++++++++++++++++++++++
+ mozilla/security/nss/cmd/disttools/nss.pc.in | 12 ++
+ mozilla/security/nss/cmd/manifest.mn | 1 +
+ 4 files changed, 224 insertions(+)
+ create mode 100644 mozilla/security/nss/cmd/disttools/Makefile
+ create mode 100644 mozilla/security/nss/cmd/disttools/nss-config.in
+ create mode 100644 mozilla/security/nss/cmd/disttools/nss.pc.in
+
+diff --git a/mozilla/security/nss/cmd/disttools/Makefile
b/mozilla/security/nss/cmd/disttools/Makefile
+new file mode 100644
+index 0000000..7395bca
+--- /dev/null
++++ b/mozilla/security/nss/cmd/disttools/Makefile
+@@ -0,0 +1,66 @@
++#! gmake
++#
++# ***** BEGIN LICENSE BLOCK *****
++# Version: MPL 1.1/GPL 2.0/LGPL 2.1
++#
++# The contents of this file are subject to the Mozilla Public License
Version
++# 1.1 (the "License"); you may not use this file except in compliance with
++# the License. You may obtain a copy of the License at
++# http://www.mozilla.org/MPL/
++#
++# Software distributed under the License is distributed on an "AS IS" basis,
++# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
++# for the specific language governing rights and limitations under the
++# License.
++#
++# The Original Code is the Netscape security libraries.
++#
++# The Initial Developer of the Original Code is
++# Netscape Communications Corporation.
++# Portions created by the Initial Developer are Copyright (C) 1994-2000
++# the Initial Developer. All Rights Reserved.
++#
++# Contributor(s):
++# DJ Lucas <dj AT linuxfromscratch.org>
++#
++# Alternatively, the contents of this file may be used under the terms of
++# either the GNU General Public License Version 2 or later (the "GPL"), or
++# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
++# in which case the provisions of the GPL or the LGPL are applicable instead
++# of those above. If you wish to allow use of your version of this file only
++# under the terms of either the GPL or the LGPL, and not to allow others to
++# use your version of this file under the terms of the MPL, indicate your
++# decision by deleting the provisions above and replace them with the notice
++# and other provisions required by the GPL or the LGPL. If you do not delete
++# the provisions above, a recipient may use your version of this file under
++# the terms of any one of the MPL, the GPL or the LGPL.
++#
++# ***** END LICENSE BLOCK *****
++
++CORE_DEPTH = ../../..
++
++VERSION = $(shell grep NSS_VERSION $(CORE_DEPTH)/../dist/public/nss/nss.h |
\
++ cut -d\" -f2)
++NSS_VERSION_MAJOR = $(shell echo $(VERSION) | cut -d. -f1)
++NSS_VERSION_MINOR = $(shell echo $(VERSION) | cut -d. -f2)
++NSS_VERSION_PATCH = $(shell echo $(VERSION) | cut -d. -f3)
++
++
++all: export
++
++export:
++ sed -e 's/@NSS_VERSION_MAJOR@/$(NSS_VERSION_MAJOR)/' \
++ -e 's/@NSS_VERSION_MINOR@/$(NSS_VERSION_MINOR)/' \
++ -e 's/@NSS_VERSION_PATCH@/$(NSS_VERSION_PATCH)/' \
++ nss-config.in > nss-config
++ sed -e 's/@NSS_VERSION_MAJOR@/$(NSS_VERSION_MAJOR)/' \
++ -e 's/@NSS_VERSION_MINOR@/$(NSS_VERSION_MINOR)/' \
++ -e 's/@NSS_VERSION_PATCH@/$(NSS_VERSION_PATCH)/' \
++ nss.pc.in > nss.pc
++
++libs:
++ # Do Nothing
++ echo "Done."
++
++.phony: all export
++
+diff --git a/mozilla/security/nss/cmd/disttools/nss-config.in
b/mozilla/security/nss/cmd/disttools/nss-config.in
+new file mode 100644
+index 0000000..d1641cd
+--- /dev/null
++++ b/mozilla/security/nss/cmd/disttools/nss-config.in
+@@ -0,0 +1,145 @@
++#!/bin/sh
++
++prefix=/usr
++
++major_version=@NSS_VERSION_MAJOR@
++minor_version=@NSS_VERSION_MINOR@
++patch_version=@NSS_VERSION_PATCH@
++
++usage()
++{
++ cat <<EOF
++Usage: nss-config [OPTIONS] [LIBRARIES]
++Options:
++ [--prefix[=DIR]]
++ [--exec-prefix[=DIR]]
++ [--includedir[=DIR]]
++ [--libdir[=DIR]]
++ [--version]
++ [--libs]
++ [--cflags]
++Dynamic Libraries:
++ nss
++ ssl
++ smime
++EOF
++ exit $1
++}
++
++if test $# -eq 0; then
++ usage 1 1>&2
++fi
++
++lib_ssl=yes
++lib_smime=yes
++lib_nssutil=yes
++lib_nss=yes
++lib_softokn=yes
++
++while test $# -gt 0; do
++ case "$1" in
++ -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
++ *) optarg= ;;
++ esac
++
++ case $1 in
++ --prefix=*)
++ prefix=$optarg
++ ;;
++ --prefix)
++ echo_prefix=yes
++ ;;
++ --exec-prefix=*)
++ exec_prefix=$optarg
++ ;;
++ --exec-prefix)
++ echo_exec_prefix=yes
++ ;;
++ --includedir=*)
++ includedir=$optarg
++ ;;
++ --includedir)
++ echo_includedir=yes
++ ;;
++ --libdir=*)
++ libdir=$optarg
++ ;;
++ --libdir)
++ echo_libdir=yes
++ ;;
++ --version)
++ echo ${major_version}.${minor_version}.${patch_version}
++ ;;
++ --cflags)
++ echo_cflags=yes
++ ;;
++ --libs)
++ echo_libs=yes
++ ;;
++ ssl)
++ lib_ssl=yes
++ ;;
++ smime)
++ lib_smime=yes
++ ;;
++ nss)
++ lib_nss=yes
++ ;;
++ *)
++ usage 1 1>&2
++ ;;
++ esac
++ shift
++done
++
++# Set variables that may be dependent upon other variables
++if test -z "$exec_prefix"; then
++ exec_prefix=${prefix}
++fi
++if test -z "$includedir"; then
++ includedir=${prefix}/include/nss
++fi
++if test -z "$libdir"; then
++ libdir=${prefix}/lib
++fi
++
++if test "$echo_prefix" = "yes"; then
++ echo $prefix
++fi
++
++if test "$echo_exec_prefix" = "yes"; then
++ echo $exec_prefix
++fi
++
++if test "$echo_includedir" = "yes"; then
++ echo $includedir
++fi
++
++if test "$echo_libdir" = "yes"; then
++ echo $libdir
++fi
++
++if test "$echo_cflags" = "yes"; then
++ echo -I$includedir
++fi
++
++if test "$echo_libs" = "yes"; then
++ libdirs="-Wl,-R$libdir -L$libdir"
++ if test -n "$lib_ssl"; then
++ libdirs="$libdirs -lssl${major_version}"
++ fi
++ if test -n "$lib_smime"; then
++ libdirs="$libdirs -lsmime${major_version}"
++ fi
++ if test -n "$lib_nssutil"; then
++ libdirs="$libdirs -lnssutil${major_version}"
++ fi
++ if test -n "$lib_nss"; then
++ libdirs="$libdirs -lnss${major_version}"
++ fi
++ if test -n "$lib_softokn"; then
++ libdirs="$libdirs -lsoftokn${major_version}"
++ fi
++ echo $libdirs
++fi
++
+diff --git a/mozilla/security/nss/cmd/disttools/nss.pc.in
b/mozilla/security/nss/cmd/disttools/nss.pc.in
+new file mode 100644
+index 0000000..3a65f0e
+--- /dev/null
++++ b/mozilla/security/nss/cmd/disttools/nss.pc.in
+@@ -0,0 +1,12 @@
++prefix=/usr
++exec_prefix=/usr
++libdir=/usr/lib
++includedir=/usr/include
++
++Name: NSS
++Description: Mozilla Network Security Services
++Version: @NSS_VERSION_MAJOR@.@NSS_VERSION_MINOR@.@NSS_VERSION_PATCH@
++Requires: nspr >= 4.7.0
++Libs: -Wl,-R${libdir} -L${libdir} -lnss3 -lsmime3 -lnssutil3 -lssl3
-lsoftokn3
++Cflags: -I${includedir}/nss
++
+diff --git a/mozilla/security/nss/cmd/manifest.mn
b/mozilla/security/nss/cmd/manifest.mn
+index 3c5b132..b153aac 100644
+--- a/mozilla/security/nss/cmd/manifest.mn
++++ b/mozilla/security/nss/cmd/manifest.mn
+@@ -22,6 +22,7 @@ DIRS = lib \
+ dbtest \
+ derdump \
+ digest \
++ disttools \
+ httpserv \
+ fipstest \
+ $(LOWHASHTEST_SRCDIR) \
+--
+1.8.1
+
diff --git a/database/sqlite/DETAILS b/database/sqlite/DETAILS
index 055e241..7c0819f 100755
--- a/database/sqlite/DETAILS
+++ b/database/sqlite/DETAILS
@@ -1,7 +1,7 @@
SPELL=sqlite
- VERSION=3.7.13
- VERSIONX=autoconf-3071300
-
SOURCE_HASH=sha512:206b107a8806ea6caccc08645777feb1b5421d35792e6075037c1646c424c66c0e1ebe5d146f2cf2e143359e960c1183ce742e8523cd9775f975d220fabb48cd
+ VERSION=3.7.14.1
+ VERSIONX=autoconf-3071401
+
SOURCE_HASH=sha512:0d66e32e5d5d6d83f106f1dea66d08c96846a4c74d4a536be7eeb9f30823988fbc3ecb7377fcddc5c2fa06ad94dd0a27f7f6ef4665718354eb92edc8431631c9
SOURCE_DIRECTORY="$BUILD_DIRECTORY/${SPELL}-${VERSIONX}"
SOURCE=${SPELL}-${VERSIONX}.tar.gz
SOURCE_URL[0]=http://sqlite.org/$SOURCE
diff --git a/database/sqlite/HISTORY b/database/sqlite/HISTORY
index 7ce726b..5a9791f 100644
--- a/database/sqlite/HISTORY
+++ b/database/sqlite/HISTORY
@@ -1,3 +1,9 @@
+2012-10-05 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 3.7.14.1
+
+2012-09-04 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 3.7.14
+
2012-06-13 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 3.7.13
diff --git a/devel/b43-tools/DETAILS b/devel/b43-tools/DETAILS
index e0800c4..efd9a05 100755
--- a/devel/b43-tools/DETAILS
+++ b/devel/b43-tools/DETAILS
@@ -5,11 +5,11 @@ else
VERSION=git
fi
SOURCE="${SPELL}.tar.bz2"
- SOURCE_URL[0]=git_http://git.bu3sch.de/${SPELL}.git
+ SOURCE_URL[0]=git://git.bues.ch/${SPELL}.git
SOURCE_IGNORE=volatile
FORCE_DOWNLOAD=on
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}"
- WEB_SITE="http://bu3sch.de/gitweb?p=b43-tools.git";
+ WEB_SITE="http://git.bues.ch/gitweb?p=${SPELL}.git;a=summary";
LICENSE[0]=GPL
ENTERED=20100331
SHORT="Development tools for the BCM43xx chip"
diff --git a/devel/b43-tools/HISTORY b/devel/b43-tools/HISTORY
index 6c94ef5..d9466aa 100644
--- a/devel/b43-tools/HISTORY
+++ b/devel/b43-tools/HISTORY
@@ -1,3 +1,6 @@
+2012-12-11 Tommy Boatman <tboatman AT sourcemage.org>
+ * DETAILS: website moved to git.bues.ch
+
2011-09-14 Ismael Luceno <ismael AT sourcemage.org>
* PREPARE, DETAILS: Use prepare_select_branch
diff --git a/devel/oprofileui/DEPENDS b/devel/oprofileui/DEPENDS
index f2e9503..119987e 100755
--- a/devel/oprofileui/DEPENDS
+++ b/devel/oprofileui/DEPENDS
@@ -8,6 +8,7 @@ depends gnome-vfs2 &&
depends gtk+2 &&
depends libpng &&
depends libxml2 &&
+depends xml-parser &&
depends oprofile &&
depends pango &&
optional_depends avahi "--with-avahi" "--without-avahi" "use Avahi to
announce and search for OProfile servers"
diff --git a/devel/oprofileui/HISTORY b/devel/oprofileui/HISTORY
index eaf1a6a..2319cce 100644
--- a/devel/oprofileui/HISTORY
+++ b/devel/oprofileui/HISTORY
@@ -1,3 +1,6 @@
+2012-08-29 Ismael Luceno <ismael AT sourcemage.org>
+ * DEPENDS: depends on xml-parser
+
2010-11-25 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DEPENDS, DETAILS: spell created
diff --git a/disk/eject/DETAILS b/disk/eject/DETAILS
index 24a2103..8bb4ea0 100755
--- a/disk/eject/DETAILS
+++ b/disk/eject/DETAILS
@@ -1,11 +1,11 @@
SPELL=eject
VERSION=2.1.5
- SOURCE=$SPELL-$VERSION.tar.gz
+ SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL
- SOURCE_URL[0]=http://ca.geocities.com/jefftranter%40rogers.com/$SOURCE
- SOURCE_GPG="gurus.gpg:${SOURCE}.sig:WORKS_FOR_ME"
+ SOURCE_URL[0]=http://www.paldo.org/paldo/sources/${SPELL}/${SOURCE}
+
SOURCE_HASH=sha512:bc0f7726d854d2b89cad5c5f073d114c7a25c0f33ce058714f7f671e21704b40efc6ca63a10b49f3bfb5f49975cb36e45846bdc103498b5d0d5446cfa6a67da6
LICENSE[0]=GPL
- WEB_SITE=http://ca.geocities.com/jefftranter%40rogers.com/eject.html
+ WEB_SITE=http://eject.sourceforge.net/
ENTERED=20010922
UPDATED=20051230
KEYWORDS="disk cdrom"
diff --git a/disk/eject/HISTORY b/disk/eject/HISTORY
index 183e3d1..57d9677 100644
--- a/disk/eject/HISTORY
+++ b/disk/eject/HISTORY
@@ -1,3 +1,6 @@
+2012-12-23 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: fixed SOURCE_URL and WEB_SITE
+
2006-06-14 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: Updated to 2.1.5. Removed stale SOURCE_URL[1], added
keyword cdrom, modified short & long descriptions.
diff --git a/doc/miscfiles/DETAILS b/doc/miscfiles/DETAILS
index 660355e..41be52c 100755
--- a/doc/miscfiles/DETAILS
+++ b/doc/miscfiles/DETAILS
@@ -1,7 +1,6 @@
SPELL=miscfiles
VERSION=1.4.2
SOURCE=$SPELL-$VERSION.tar.gz
- SOURCE2=$SOURCE.sig
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$GNU_URL/$SPELL/$SOURCE
SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
diff --git a/doc/miscfiles/HISTORY b/doc/miscfiles/HISTORY
index f1ee722..6c01d77 100644
--- a/doc/miscfiles/HISTORY
+++ b/doc/miscfiles/HISTORY
@@ -1,3 +1,9 @@
+2013-01-01 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: remove obsolete SOURCE2
+
+2012-12-25 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 1.5
+
2011-09-26 Bor Kraljič <pyrobor AT ver.si>
* DETAILS: converted to upstream signature checking
* 913797E7.gpg: added gpg keyring
diff --git a/e/imlib2/DETAILS b/e/imlib2/DETAILS
index 26222c8..0fcb406 100755
--- a/e/imlib2/DETAILS
+++ b/e/imlib2/DETAILS
@@ -5,7 +5,7 @@
SOURCE_URL[0]=$SOURCEFORGE_URL/enlightenment/$SOURCE
SOURCE_HASH=sha512:6c3bceec39ffcb7515925c3eb4199834295732a1cc9cfa307aa8610e2565e770edfc5464ca983d1d95570bd9bac09c989e0751fa39b07cf794c0c5dce4262edf
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-${VERSION%-*}"
- WEB_SITE=http://enlightenment.org/Libraries/Imlib2/
+ WEB_SITE=http://sourceforge.net/projects/enlightenment/files/
ENTERED=20010922
LICENSE[0]=BSD
KEYWORDS="enlightenment e16 e17 library wm window-manager"
diff --git a/e/imlib2/HISTORY b/e/imlib2/HISTORY
index 52efccc..27adac9 100644
--- a/e/imlib2/HISTORY
+++ b/e/imlib2/HISTORY
@@ -1,3 +1,6 @@
+2012-12-25 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: updated WEB_SITE
+
2011-09-05 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.4.5
diff --git a/graphics-libs/freetype2/DETAILS b/graphics-libs/freetype2/DETAILS
index bc2559b..8751e51 100755
--- a/graphics-libs/freetype2/DETAILS
+++ b/graphics-libs/freetype2/DETAILS
@@ -1,6 +1,6 @@
SPELL=freetype2
- VERSION=2.4.9
- SECURITY_PATCH=7
+ VERSION=2.4.11
+ SECURITY_PATCH=8
SOURCE=freetype-$VERSION.tar.bz2
SOURCE2=$SOURCE.sig
SOURCE_DIRECTORY="$BUILD_DIRECTORY/freetype-$VERSION"
diff --git a/graphics-libs/freetype2/HISTORY b/graphics-libs/freetype2/HISTORY
index 3bbb23e..9c28507 100644
--- a/graphics-libs/freetype2/HISTORY
+++ b/graphics-libs/freetype2/HISTORY
@@ -1,3 +1,9 @@
+2012-12-22 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 2.4.11; SECURITY_PATCH++
+
+2012-06-15 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 2.4.10
+
2012-03-09 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 2.4.9, SECURITY_PATCH=7
diff --git a/graphics-libs/libwmf/DETAILS b/graphics-libs/libwmf/DETAILS
index 4845e03..1a0f202 100755
--- a/graphics-libs/libwmf/DETAILS
+++ b/graphics-libs/libwmf/DETAILS
@@ -4,7 +4,7 @@
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$SOURCEFORGE_URL/wvware/$SOURCE
- WEB_SITE=http://sourceforge.net/projects/wvware
+ WEB_SITE=http://wvware.sourceforge.net/
ENTERED=20020509
LICENSE[0]=GPL
KEYWORDS="images graphics libs"
diff --git a/graphics-libs/libwmf/HISTORY b/graphics-libs/libwmf/HISTORY
index e584c95..927f38f 100644
--- a/graphics-libs/libwmf/HISTORY
+++ b/graphics-libs/libwmf/HISTORY
@@ -1,3 +1,6 @@
+2012-12-24 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: corrected WEB_SITE
+
2010-11-03 Ladislav Hagara <hgr AT vabo.cz>
* DEPENDS: jpeg -> JPEG
diff --git a/graphics/inkscape/DETAILS b/graphics/inkscape/DETAILS
index 7fe2149..90e6b70 100755
--- a/graphics/inkscape/DETAILS
+++ b/graphics/inkscape/DETAILS
@@ -1,15 +1,16 @@
SPELL=inkscape
- VERSION=0.48.3.1
+ VERSION=0.48.4
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE2=$SOURCE.asc
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
SOURCE2_URL[0]=$SOURCE_URL.asc
- SOURCE_GPG=Ted_Gould.gpg:$SOURCE2:UPSTREAM_KEY
+
SOURCE_HASH=sha512:55954925e74e2c222e7ddb86bf75e9ad17c854d991258fd3a1bf1b2aafe7014418138246a51f9ab9c4444795b03419781517910debd3448ae461f1dd1b5848be
+# SOURCE_GPG=Ted_Gould.gpg:$SOURCE2:UPSTREAM_KEY
SOURCE2_IGNORE=signature
WEB_SITE=http://www.inkscape.org/
ENTERED=20031207
- SECURITY_PATCH=1
+ SECURITY_PATCH=2
LICENSE[0]=GPL
KEYWORDS="graphics"
SHORT="general purpose vector drawing application"
diff --git a/graphics/inkscape/HISTORY b/graphics/inkscape/HISTORY
index 3501092..2f199bd 100644
--- a/graphics/inkscape/HISTORY
+++ b/graphics/inkscape/HISTORY
@@ -1,3 +1,6 @@
+2012-12-19 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 0.48.4, SECURITY_PATCH=2
+
2012-02-19 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 0.48.3.1
diff --git a/http/firefox/DEPENDS b/http/firefox/DEPENDS
index 2797604..7fcfb46 100755
--- a/http/firefox/DEPENDS
+++ b/http/firefox/DEPENDS
@@ -1,3 +1,4 @@
+depends castfs &&
depends atk &&
depends curl &&
depends -sub CXX gcc &&
@@ -11,7 +12,7 @@ depends cairo &&
depends python &&
depends libnotify &&
depends nspr &&
-depends -sub "3.13.x" nss &&
+depends -sub "3.14.x" nss &&
depends autoconf-2.13 &&
depends gtk+2 &&
depends libidl &&
diff --git a/http/firefox/DETAILS b/http/firefox/DETAILS
index 577fdb0..3fc833c 100755
--- a/http/firefox/DETAILS
+++ b/http/firefox/DETAILS
@@ -1,13 +1,13 @@
SPELL=firefox
if [[ $FIREFOX_CVS == y ]]; then
- VERSION=17.0
+ VERSION=18.0
SOURCE=$SPELL-$VERSION.source.tar.bz2
SOURCE2=$SOURCE.asc
SOURCE_GPG=firefox.gpg:$SOURCE2:UPSTREAM_KEY
SOURCE_URL[0]=http://releases.mozilla.org/pub/mozilla.org/${SPELL}/releases/${VERSION}/source/${SOURCE}
SOURCE2_URL[0]=$SOURCE_URL.asc
else
- VERSION=17.0
+ VERSION=18.0
SOURCE=$SPELL-$VERSION.source.tar.bz2
SOURCE2=$SOURCE.asc
SOURCE_GPG=firefox.gpg:$SOURCE2:UPSTREAM_KEY
@@ -15,7 +15,7 @@ else
SOURCE_URL[1]=ftp://ftp.mozilla.org/pub/$SPELL/releases/$VERSION/source/$SOURCE
SOURCE_URL[2]=ftp://ftp.in2p3.fr/pub/mozilla/$SPELL/releases/$VERSION/source/$SOURCE
SOURCE2_URL[0]=$SOURCE_URL.asc
- SECURITY_PATCH=57
+ SECURITY_PATCH=58
fi
SOURCE2_IGNORE=signature
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/http/firefox/HISTORY b/http/firefox/HISTORY
index 79319d6..399e84e 100644
--- a/http/firefox/HISTORY
+++ b/http/firefox/HISTORY
@@ -1,3 +1,11 @@
+2013-01-09 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 18.0, bumped SECURITY_PATCH
+ * DEPENDS: depend on nss version 3.14.x
+
+2012-12-02 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 17.0.1
+ * DEPENDS: castfs added
+
2012-11-21 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 17.0, SECURITY_PATCH=57
diff --git a/http/seamonkey/DEPENDS b/http/seamonkey/DEPENDS
index 0744963..ddbdd73 100755
--- a/http/seamonkey/DEPENDS
+++ b/http/seamonkey/DEPENDS
@@ -1,24 +1,25 @@
. "$GRIMOIRE/FUNCTIONS" &&
-depends JPEG &&
+# requires JCS_EXTENSIONS
+depends libjpeg-turbo &&
depends gtk+2 &&
depends libidl &&
depends libxft &&
depends nspr &&
-if spell_ok nspr && is_version_less $(installed_version nspr) 4.9.2; then
+if spell_ok nspr && is_version_less $(installed_version nspr) 4.9.3; then
force_depends nspr
fi &&
-depends -sub 3.13.x nss &&
+depends -sub 3.14.x nss &&
-if spell_ok nss && is_version_less $(installed_version nss) 3.13.5; then
+if spell_ok nss && is_version_less $(installed_version nss) 3.14.1; then
force_depends nss
fi &&
depends -sub "TSAFE SECURE_DELETE ENABLE_UNLOCK_NOTIFY" sqlite &&
-if spell_ok sqlite && is_version_less $(installed_version sqlite) 3.7.13;
then
+if spell_ok sqlite && is_version_less $(installed_version sqlite) 3.7.14.1;
then
force_depends sqlite
fi &&
diff --git a/http/seamonkey/DETAILS b/http/seamonkey/DETAILS
index 7921ebf..76c066e 100755
--- a/http/seamonkey/DETAILS
+++ b/http/seamonkey/DETAILS
@@ -1,8 +1,8 @@
SPELL=seamonkey
- VERSION=2.14
- SECURITY_PATCH=50
+ VERSION=2.15
+ SECURITY_PATCH=51
SOURCE=$SPELL-$VERSION.source.tar.bz2
-
SOURCE_HASH=sha512:6afeb6d142f17e17786118daef6b1b519ba7d7c5279cd1212c966d0f49cfde70ab0f2f8c0e8687cb08117d075b66631ca87c86b5704ee26672c257d4f22b32dd
+
SOURCE_HASH=sha512:98085c2fc0b8122de82e7cc08e72d5c598bd2fab606ef1db24ced105ba3f8f66be7199a5f6bc913c4f2ea22f298332688ea651ffc28d2b35ec11368520cfc58e
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URI=seamonkey/releases/$VERSION/source/$SOURCE
SOURCE_URL[0]=ftp://ftp.mozilla.org/pub/mozilla.org/$SOURCE_URI
diff --git a/http/seamonkey/HISTORY b/http/seamonkey/HISTORY
index e06b6d8..38c606c 100644
--- a/http/seamonkey/HISTORY
+++ b/http/seamonkey/HISTORY
@@ -1,3 +1,11 @@
+2013-01-09 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 2.15; SECURITY_PATCH++
+ * DEPENDS: updated dependency requirements
+ * mailnews.patch: updated for new release
+
+2012-12-01 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 2.14.1
+
2012-11-21 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 2.14; SECURITY_PATCH++
* mailnews.patch: updated
diff --git a/http/seamonkey/mailnews.patch b/http/seamonkey/mailnews.patch
index cada27d..112de2d 100644
--- a/http/seamonkey/mailnews.patch
+++ b/http/seamonkey/mailnews.patch
@@ -28,11 +28,11 @@
# Check whether --enable-crypto or --disable-crypto was given.
-@@ -27051,6 +27051,7 @@
- (''' RCC ''', r''' $RCC ''')
- (''' MOZ_X11 ''', r''' $MOZ_X11 ''')
- (''' MOZ_UI_LOCALE ''', r''' $MOZ_UI_LOCALE ''')
-+ (''' MOZ_MAIL_NEWS ''', r''' $MOZ_MAIL_NEWS ''')
- (''' MOZ_OFFICIAL_BRANDING ''', r''' $MOZ_OFFICIAL_BRANDING ''')
- (''' MOZ_BRANDING_DIRECTORY ''', r''' $MOZ_BRANDING_DIRECTORY ''')
- (''' MOZ_DISTRIBUTION_ID ''', r''' $MOZ_DISTRIBUTION_ID ''')
+@@ -27643,6 +27653,7 @@
+ (''' RCC ''', r''' $RCC ''')
+ (''' MOZ_X11 ''', r''' $MOZ_X11 ''')
+ (''' MOZ_UI_LOCALE ''', r''' $MOZ_UI_LOCALE ''')
++ (''' MOZ_MAIL_NEWS ''', r''' $MOZ_MAIL_NEWS ''')
+ (''' MOZ_OFFICIAL_BRANDING ''', r''' $MOZ_OFFICIAL_BRANDING ''')
+ (''' MOZ_BRANDING_DIRECTORY ''', r''' $MOZ_BRANDING_DIRECTORY ''')
+ (''' MOZ_DISTRIBUTION_ID ''', r''' $MOZ_DISTRIBUTION_ID ''')
diff --git a/kernels/linux/HISTORY b/kernels/linux/HISTORY
index b2c424c..ddd4ed6 100644
--- a/kernels/linux/HISTORY
+++ b/kernels/linux/HISTORY
@@ -1,3 +1,17 @@
+2012-12-22 Vlad Glagolev <stealth AT sourcemage.org>
+ * info/patches/maintenance_patches_3/patch-3.0.{56,57}: added
+ * info/patches/maintenance_patches_3/patch-3.4.{23,24}: added
+ * info/patches/maintenance_patches_3/patch-3.6.11: added
+
+2012-12-22 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * latest_defaults, info/kernels/3.7,
+ info/patches/maintenance_patches_3/patch-3.7,
+ info/patches/maintenance_patches_3/patch-3.7.1: version 3.7.1
+
+2012-12-10 Ladislav Hagara <hgr AT vabo.cz>
+ * latest.defaults: LATEST_maintenance_patches_3=patch-3.6.10
+ * info/patches/maintenance_patches_3/patch-3.6.10: added
+
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
diff --git a/kernels/linux/info/kernels/3.7 b/kernels/linux/info/kernels/3.7
new file mode 100755
index 0000000..c38697d
--- /dev/null
+++ b/kernels/linux/info/kernels/3.7
@@ -0,0 +1,5 @@
+version="3.7"
+source="linux-${version}.tar.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/v3.x/${source}"
+source2="linux-${version}.tar.sign"
+source2_url="${KERNEL_URL}/pub/linux/kernel/v3.x/${source2}"
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.0.56
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.0.56
new file mode 100755
index 0000000..b0a7559
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches_3/patch-3.0.56
@@ -0,0 +1,5 @@
+appliedkernels="3.0"
+patchversion="${appliedkernels}.56"
+source="patch-${patchversion}.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/v3.0/${source}"
+sha1sum="744f8d00d51b574375830bddd5505d5405a33b36"
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.0.57
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.0.57
new file mode 100755
index 0000000..0520ba6
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches_3/patch-3.0.57
@@ -0,0 +1,5 @@
+appliedkernels="3.0"
+patchversion="${appliedkernels}.57"
+source="patch-${patchversion}.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/v3.0/${source}"
+sha1sum="9fe793bb477e77fe16875e3187d704c110b62477"
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.4.23
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.4.23
new file mode 100755
index 0000000..0f64a0a
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches_3/patch-3.4.23
@@ -0,0 +1,5 @@
+appliedkernels="3.4"
+patchversion="${appliedkernels}.23"
+source="patch-${patchversion}.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/v3.x/${source}"
+sha1sum="8c9322c6f53a3990e2adaafdc03d285e0f8e1595"
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.4.24
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.4.24
new file mode 100755
index 0000000..72315f2
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches_3/patch-3.4.24
@@ -0,0 +1,5 @@
+appliedkernels="3.4"
+patchversion="${appliedkernels}.24"
+source="patch-${patchversion}.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/v3.x/${source}"
+sha1sum="101614d14b524424c41303c6b7d06645e531ed3f"
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.6.10
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.6.10
new file mode 100755
index 0000000..ac25068
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches_3/patch-3.6.10
@@ -0,0 +1,5 @@
+appliedkernels="3.6"
+patchversion="${appliedkernels}.10"
+source="patch-${patchversion}.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/v3.x/${source}"
+sha1sum="efc9fb174bdb4af06aec2a6937a8ec0d9f280031"
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.6.11
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.6.11
new file mode 100755
index 0000000..d9928e0
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches_3/patch-3.6.11
@@ -0,0 +1,5 @@
+appliedkernels="3.6"
+patchversion="${appliedkernels}.11"
+source="patch-${patchversion}.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/v3.x/${source}"
+sha1sum="c7b3c4c5a4e1ee92365372b5a7e9c6152867fd71"
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.7
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.7
new file mode 100755
index 0000000..6fe77ce
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches_3/patch-3.7
@@ -0,0 +1,5 @@
+patchversion="3.7.0"
+source=""
+source_url=""
+appliedkernels="3.7"
+md5sum=""
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.7.1
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.7.1
new file mode 100755
index 0000000..8612281
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches_3/patch-3.7.1
@@ -0,0 +1,5 @@
+appliedkernels="3.7"
+patchversion="${appliedkernels}.1"
+source="patch-${patchversion}.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/v3.x/${source}"
+sha1sum="05816e9e9434234fd3808837635338cf498bc95d"
diff --git a/kernels/linux/latest.defaults b/kernels/linux/latest.defaults
index 619876f..51c5225 100644
--- a/kernels/linux/latest.defaults
+++ b/kernels/linux/latest.defaults
@@ -1,8 +1,8 @@
-LATEST_3=3.6
+LATEST_3=3.7
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.9
+LATEST_maintenance_patches_3=patch-3.7.1
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/latex/glosstex/DETAILS b/latex/glosstex/DETAILS
index 012ce3f..bd7b8f3 100755
--- a/latex/glosstex/DETAILS
+++ b/latex/glosstex/DETAILS
@@ -4,7 +4,7 @@
SOURCE_URL[0]=http://theory.uwinnipeg.ca/scripts/CTAN/support/${SOURCE}
SOURCE_HASH=sha512:9b7d077dad3774449cdc6a637f6de3847202f8c359cb70e57ff3c5f2ec43b005d1249ee1bf770b58074f7659fa7c7065a69ba11010539038e7a06a1a24f956db
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}"
-
WEB_SITE="http://www.ctan.org/tex-archive/help/Catalogue/entries/glosstex.html";
+ WEB_SITE="http://www.ctan.org/pkg/glosstex";
LICENSE[0]=GPL
ENTERED=20091104
SHORT="a tool for the automatic preparation of glossaries"
diff --git a/latex/glosstex/HISTORY b/latex/glosstex/HISTORY
index 7d6b651..f272e75 100644
--- a/latex/glosstex/HISTORY
+++ b/latex/glosstex/HISTORY
@@ -1,3 +1,6 @@
+2012-12-24 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: fix WEB_SITE
+
2009-11-05 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: set VERSION correctly
diff --git a/latex/lacheck/DETAILS b/latex/lacheck/DETAILS
index 73b60f5..226d2aa 100755
--- a/latex/lacheck/DETAILS
+++ b/latex/lacheck/DETAILS
@@ -4,7 +4,7 @@
SOURCE_URL[0]=http://tug.ctan.org/get/support/${SPELL}/${SOURCE}
SOURCE_HASH=sha512:8fbe808a84eb7e5c018ca2b8445525f337ec2f8ce3d220a07ed932fb2aaaca6d1d552ccbd8b3ed1d3f0b27e3be3698247ded975bf86ccf4dc58258587a060bfa
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
-
WEB_SITE="http://tug.ctan.org/cgi-bin/ctanPackageInformation.py?id=lacheck";
+ WEB_SITE="http://www.ctan.org/tex-archive/support/lacheck";
LICENSE[0]="GPLv1"
ENTERED=20090729
KEYWORDS=""
diff --git a/latex/lacheck/HISTORY b/latex/lacheck/HISTORY
index 0b9844f..84c9799 100644
--- a/latex/lacheck/HISTORY
+++ b/latex/lacheck/HISTORY
@@ -1,3 +1,6 @@
+2012-12-24 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: fixed WEB_SITE
+
2009-07-29 Andraž "ruskie" Levstik <ruskie+f03a580f AT codemages.net>
* BUILD, DEPENDS, DETAILS: spell created
* PRE_BUILD: spell created
diff --git a/libs/nspr/DETAILS b/libs/nspr/DETAILS
index 1b55775..d3425fa 100755
--- a/libs/nspr/DETAILS
+++ b/libs/nspr/DETAILS
@@ -1,11 +1,11 @@
SPELL=nspr
- VERSION=4.9.2
+ VERSION=4.9.4
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=http://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v$VERSION/src/$SOURCE
WEB_SITE=http://www.mozilla.org/projects/nspr/
ENTERED=20050512
-
SOURCE_HASH=sha512:1f1f35fc2b9ead7e3b4ef93a02f13c0bcccc314bf9cfad67e6ddb755aaf6ab411499b0b57b94b032e2c7ee21fc7c114ca447e24825b79611f720f88eb37bd348
+
SOURCE_HASH=sha512:5c1caf290bbe6cec7fddd40ae1eefbe54608a0f6fce908b1680513c50661dde40f4c1638ddca56b8a7125b20be6945aa2b4507fa0dde09e3e9eb0b08e90cfe2b
# SOURCE_GPG=gurus.gpg:$SOURCE.sig:WORKS_FOR_ME
LICENSE[0]=MPL
GATHER_DOCS=no
diff --git a/libs/nspr/HISTORY b/libs/nspr/HISTORY
index e43c2f5..d502445 100644
--- a/libs/nspr/HISTORY
+++ b/libs/nspr/HISTORY
@@ -1,3 +1,6 @@
+2012-11-26 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 4.9.4
+
2012-08-07 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 4.9.2
diff --git a/mail/bogofilter/DETAILS b/mail/bogofilter/DETAILS
index a383ea4..77ec24d 100755
--- a/mail/bogofilter/DETAILS
+++ b/mail/bogofilter/DETAILS
@@ -1,6 +1,7 @@
SPELL=bogofilter
- VERSION=1.2.2
-
SOURCE_HASH=sha512:916740b4d916c266c8645aa2c509a7e4e21ea0afe9ef89dfe64aa2e147158d48dd259ca53052c14ae8e422a7f364c9a12fcca67011a4e806581e4346e892a7e6
+ VERSION=1.2.3
+
SOURCE_HASH=sha512:4b3bb4b1e0f12a88a5ec5421c88001ddeb242c39c55733000dfd38691dc4f5c34a5254de60399b20c63c9ee9e1e13ef73582e215fbabc3738871394b26924ca0
+ SECURITY_PATCH=1
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=${SOURCEFORGE_URL}/$SPELL/$SOURCE
diff --git a/mail/bogofilter/HISTORY b/mail/bogofilter/HISTORY
index 26f62af..cc230d4 100644
--- a/mail/bogofilter/HISTORY
+++ b/mail/bogofilter/HISTORY
@@ -1,3 +1,7 @@
+2012-12-13 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.2.3
+ SECURITY_PATCH=1 fixes CVE-2012-5468
+
2010-07-11 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.2.2
diff --git a/net/httpry/BUILD b/net/httpry/BUILD
index 8f58e6d..3baf21f 100755
--- a/net/httpry/BUILD
+++ b/net/httpry/BUILD
@@ -1 +1,2 @@
+patch < $SCRIPT_DIRECTORY/usrlocal.patch &&
make
diff --git a/net/httpry/HISTORY b/net/httpry/HISTORY
index 2ba2dd1..5ea5156 100644
--- a/net/httpry/HISTORY
+++ b/net/httpry/HISTORY
@@ -1,2 +1,7 @@
+2012-12-20 Tommy Boatman <tboatman AT sourcemage.org>
+ * usrlocal.patch: created to install man page to /usr/share/man
+ instead of /usr/local/man
+ * BUILD: added patch before make
+
2012-03-01 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS, DEPENDS, BUILD: spell created, version 0.1.7
diff --git a/net/httpry/usrlocal.patch b/net/httpry/usrlocal.patch
new file mode 100644
index 0000000..b285e5c
--- /dev/null
+++ b/net/httpry/usrlocal.patch
@@ -0,0 +1,11 @@
+--- Makefile 2012-02-29 14:29:03.000000000 -0600
++++ Makefile2 2012-12-20 22:07:47.000000000 -0600
+@@ -51,7 +51,7 @@
+ @echo "--------------------------------------------------"
+ @echo ""
+ cp -f $(PROG) /usr/sbin/
+- cp -f $(PROG).1 /usr/man/man1/ || cp -f $(PROG).1 /usr/local/man/man1/
++ cp -f $(PROG).1 /usr/man/man1/ || cp -f $(PROG).1 /usr/share/man/man1/
+
+ uninstall:
+ rm -f /usr/sbin/$(PROG)
diff --git a/python-pypi/ctypes/BUILD b/python-pypi/ctypes/BUILD
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/python-pypi/ctypes/BUILD
@@ -0,0 +1 @@
+true
diff --git a/python-pypi/ctypes/DETAILS b/python-pypi/ctypes/DETAILS
index 8999a23..5091789 100755
--- a/python-pypi/ctypes/DETAILS
+++ b/python-pypi/ctypes/DETAILS
@@ -1,19 +1,7 @@
- SPELL=ctypes
- VERSION=1.0.2
- SOURCE=$SPELL-$VERSION.tar.gz
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- SOURCE_URL=$SOURCEFORGE_URL/$SPELL/$SOURCE
-
SOURCE_HASH=sha512:40f8909945ad25a9b92a52903a9c524f37c4c902b122959c6e08bcfe4c30572541f15174e33a08e7ceb5e4f1a69566af0201779a519c643705d355c9f47aacd3
- WEB_SITE=http://starship.python.net/crew/theller/ctypes/
- ENTERED=20060627
- LICENSE[0]=GPL
- SHORT="advanced ffi package"
-cat << EOF
-ctypes is an advanced ffi (Foreign Function Interface) package for Python 2.3
-and higher.
-
-ctypes allows to call functions exposed from dlls/shared libraries and has
-extensive facilities to create, access and manipulate simple and complicated
C
-data types in Python - in other words: wrap libraries in pure Python. It is
-even possible to implement C callback functions in pure Python.
-EOF
+ SPELL=ctypes
+ VERSION=0
+ PATCHLEVEL=9999
+ SHORT="deprecated"
+ cat << EOF
+ deprecated spell [replaced by python]
+ EOF
diff --git a/python-pypi/ctypes/DOWNLOAD b/python-pypi/ctypes/DOWNLOAD
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/python-pypi/ctypes/DOWNLOAD
@@ -0,0 +1 @@
+true
diff --git a/python-pypi/ctypes/HISTORY b/python-pypi/ctypes/HISTORY
index 78b9e53..64f20b3 100644
--- a/python-pypi/ctypes/HISTORY
+++ b/python-pypi/ctypes/HISTORY
@@ -1,3 +1,8 @@
+2012-12-23 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * spell deprecated [part of python as of version 2.5]
+ * PATCHLEVEL=9999
+ * DETAILS: version 0
+
2008-01-13 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated to 1.0.2, cleaned up
diff --git a/python-pypi/ctypes/INSTALL b/python-pypi/ctypes/INSTALL
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/python-pypi/ctypes/INSTALL
@@ -0,0 +1 @@
+true
diff --git a/python-pypi/ctypes/PRE_BUILD b/python-pypi/ctypes/PRE_BUILD
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/python-pypi/ctypes/PRE_BUILD
@@ -0,0 +1 @@
+true
diff --git a/python-pypi/ctypes/TRIGGERS b/python-pypi/ctypes/TRIGGERS
new file mode 100755
index 0000000..9550326
--- /dev/null
+++ b/python-pypi/ctypes/TRIGGERS
@@ -0,0 +1 @@
+on_cast ctypes dispel_self
diff --git a/utils/xen/DEPENDS b/utils/xen/DEPENDS
index 6002d09..77780bb 100755
--- a/utils/xen/DEPENDS
+++ b/utils/xen/DEPENDS
@@ -13,6 +13,8 @@ if [[ $XEN_HVM == y ]]; then
depends sdl
fi &&
+optional_depends gnutls "" "" "for TLS support in VNC" &&
+
suggest_depends lxml "" "" "for XenAPI support in XM" &&
suggest_depends pyopenssl "" "" "for SSL support" &&
suggest_depends python-pam "" "" "for PAM support"
diff --git a/utils/xen/DETAILS b/utils/xen/DETAILS
index 8ce05b5..dd80218 100755
--- a/utils/xen/DETAILS
+++ b/utils/xen/DETAILS
@@ -1,5 +1,5 @@
SPELL=xen
- VERSION=4.1.3
+ VERSION=4.1.4
SECURITY_PATCH=5
SOURCE=${SPELL}-${VERSION}.tar.gz
SOURCE2=$SOURCE.sig
diff --git a/utils/xen/HISTORY b/utils/xen/HISTORY
index 6d6300b..118a9bf 100644
--- a/utils/xen/HISTORY
+++ b/utils/xen/HISTORY
@@ -1,3 +1,16 @@
+2012-12-22 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 4.1.4
+ * PRE_BUILD: removed patches
+ * xsa-*.patch: removed, fixed by upstream
+
+2012-12-11 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: PATCHLEVEL=1
+ * init.d/xendomains: corrected detection of running domUs after
instant
+ poweroff/reboot
+
+2012-12-09 Vlad Glagolev <stealth AT sourcemage.org>
+ * DEPENDS: added gnutls optional dependency
+
2012-12-07 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: SECURITY_PATCH+=2
* PRE_BUILD: apply patches
diff --git a/utils/xen/PRE_BUILD b/utils/xen/PRE_BUILD
index c738dc4..c7f9a4a 100755
--- a/utils/xen/PRE_BUILD
+++ b/utils/xen/PRE_BUILD
@@ -1,25 +1,6 @@
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" &&
-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
fi &&
diff --git a/utils/xen/init.d/xendomains b/utils/xen/init.d/xendomains
index 75cc264..7a4ff0b 100755
--- a/utils/xen/init.d/xendomains
+++ b/utils/xen/init.d/xendomains
@@ -60,13 +60,22 @@ function is_running()
$CMD list "${1}" >/dev/null 2>&1
}
-start()
+function is_running_doms()
+{
+ $CMD list | tail -n +2 | grep -v -E "^Domain-0[[:space:]]+0" > /dev/null
+}
+
+start()
{
check_userland
if [ -f $LOCKFILE ]; then
- echo -e "XEN: xendomains already running (lockfile exists)"
- exit 0
+ if is_running_doms; then
+ echo -e "XEN: xendomains already running (lockfile exists)"
+ exit 0
+ else
+ rm -f $LOCKFILE
+ fi
fi
if [ $(ls ${XENDOMAINS_AUTO} | wc -l) == 0 ]; then
diff --git a/utils/xen/xsa-12.patch b/utils/xen/xsa-12.patch
deleted file mode 100644
index 271c4d8..0000000
--- a/utils/xen/xsa-12.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-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
deleted file mode 100644
index 35c4715..0000000
--- a/utils/xen/xsa-13.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-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
deleted file mode 100644
index cd185b3..0000000
--- a/utils/xen/xsa-14.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-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
deleted file mode 100644
index d9662d8..0000000
--- a/utils/xen/xsa-16.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-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
deleted file mode 100644
index 9aa28e0..0000000
--- a/utils/xen/xsa-17.patch
+++ /dev/null
@@ -1,113 +0,0 @@
-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-19.patch b/utils/xen/xsa-19.patch
deleted file mode 100644
index 65b25ca..0000000
--- a/utils/xen/xsa-19.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- tools/ioemu-qemu-xen/vl.c.orig 2012-04-24 21:35:40.000000000 +0400
-+++ tools/ioemu-qemu-xen/vl.c 2012-09-19 14:44:19.190522811 +0400
-@@ -4910,7 +4910,7 @@
- kernel_cmdline = "";
- cyls = heads = secs = 0;
- translation = BIOS_ATA_TRANSLATION_AUTO;
-- monitor_device = "vc:80Cx24C";
-+ monitor_device = "null";
-
- serial_devices[0] = "vc:80Cx24C";
- for(i = 1; i < MAX_SERIAL_PORTS; i++)
diff --git a/utils/xen/xsa-20.patch b/utils/xen/xsa-20.patch
deleted file mode 100644
index bedd318..0000000
--- a/utils/xen/xsa-20.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-VCPU/timers: Prevent overflow in calculations, leading to DoS vulnerability
-
-The timer action for a vcpu periodic timer is to calculate the next
-expiry time, and to reinsert itself into the timer queue. If the
-deadline ends up in the past, Xen never leaves __do_softirq(). The
-affected PCPU will stay in an infinite loop until Xen is killed by the
-watchdog (if enabled).
-
-This is a security problem, XSA-20 / CVE-2012-4535.
-
-Signed-off-by: Andrew Cooper <andrew.cooper3 AT citrix.com>
-Acked-by: Ian Campbell <ian.campbell AT citrix.com>
-
-diff -r 478ba3f146df xen/common/domain.c
---- a/xen/common/domain.c
-+++ b/xen/common/domain.c
-@@ -903,6 +903,9 @@ long do_vcpu_op(int cmd, int vcpuid, XEN
- if ( set.period_ns < MILLISECS(1) )
- return -EINVAL;
-
-+ if ( set.period_ns > STIME_DELTA_MAX )
-+ return -EINVAL;
-+
- v->periodic_period = set.period_ns;
- vcpu_force_reschedule(v);
-
-diff -r 478ba3f146df xen/include/xen/time.h
---- a/xen/include/xen/time.h
-+++ b/xen/include/xen/time.h
-@@ -55,6 +55,8 @@ struct tm gmtime(unsigned long t);
- #define MILLISECS(_ms) ((s_time_t)((_ms) * 1000000ULL))
- #define MICROSECS(_us) ((s_time_t)((_us) * 1000ULL))
- #define STIME_MAX ((s_time_t)((uint64_t)~0ull>>1))
-+/* Chosen so (NOW() + delta) wont overflow without an uptime of 200 years */
-+#define STIME_DELTA_MAX ((s_time_t)((uint64_t)~0ull>>2))
-
- extern void update_vcpu_system_time(struct vcpu *v);
- extern void update_domain_wallclock_time(struct domain *d);
diff --git a/utils/xen/xsa-21.patch b/utils/xen/xsa-21.patch
deleted file mode 100644
index 14158ef..0000000
--- a/utils/xen/xsa-21.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-x86/physdev: Range check pirq parameter from guests
-
-Otherwise Xen will read beyond either end of the struct
-domain.arch.pirq_emuirq array, usually resulting in a fatal page fault.
-
-This vulnerability was introduced by c/s 23241:d21100f1d00e, which adds
-a call to domain_pirq_to_emuirq() which uses the guest provided pirq
-value before range checking it, and was fixed by c/s 23573:584c2e5e03d9
-which changed the behaviour of the domain_pirq_to_emuirq() macro to use
-radix trees instead of a flat array.
-
-This is XSA-21 / CVE-2012-4536.
-
-Signed-off-by: Andrew Cooper <andrew.cooper3 AT citrix.com>
-Acked-by: Jan Beulich <jbeulich AT suse.com>
-Acked-by: Ian Campbell <ian.campbell AT citrix.com>
-
-diff -r 7a401a73d86d xen/arch/x86/physdev.c
---- a/xen/arch/x86/physdev.c
-+++ b/xen/arch/x86/physdev.c
-@@ -234,6 +234,10 @@ static int physdev_unmap_pirq(struct phy
- if ( ret )
- return ret;
-
-+ ret = -EINVAL;
-+ if ( unmap->pirq < 0 || unmap->pirq >= d->nr_pirqs )
-+ goto free_domain;
-+
- if ( is_hvm_domain(d) )
- {
- spin_lock(&d->event_lock);
diff --git a/utils/xen/xsa-22.patch b/utils/xen/xsa-22.patch
deleted file mode 100644
index bb2b88e..0000000
--- a/utils/xen/xsa-22.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-x86/physmap: Prevent incorrect updates of m2p mappings
-
-In certain conditions, such as low memory, set_p2m_entry() can fail.
-Currently, the p2m and m2p tables will get out of sync because we still
-update the m2p table after the p2m update has failed.
-
-If that happens, subsequent guest-invoked memory operations can cause
-BUG()s and ASSERT()s to kill Xen.
-
-This is fixed by only updating the m2p table iff the p2m was
-successfully updated.
-
-This is a security problem, XSA-22 / CVE-2012-4537.
-
-Signed-off-by: Andrew Cooper <andrew.cooper3 AT citrix.com>
-Acked-by: Ian Campbell <ian.campbell AT citrix.com>
-Acked-by: Ian Jackson <ian.jackson AT eu.citrix.com>
-
-diff -r 3a27f4e44b6a xen/arch/x86/mm/p2m.c
---- a/xen/arch/x86/mm/p2m.c
-+++ b/xen/arch/x86/mm/p2m.c
-@@ -2558,7 +2558,10 @@ guest_physmap_add_entry(struct p2m_domai
- if ( mfn_valid(_mfn(mfn)) )
- {
- if ( !set_p2m_entry(p2m, gfn, _mfn(mfn), page_order, t,
p2m->default_access) )
-+ {
- rc = -EINVAL;
-+ goto out; /* Failed to update p2m, bail without updating m2p. */
-+ }
- if ( !p2m_is_grant(t) )
- {
- for ( i = 0; i < (1UL << page_order); i++ )
-@@ -2579,6 +2582,7 @@ guest_physmap_add_entry(struct p2m_domai
- }
- }
-
-+out:
- audit_p2m(p2m, 1);
- p2m_unlock(p2m);
-
diff --git a/utils/xen/xsa-23.patch b/utils/xen/xsa-23.patch
deleted file mode 100644
index 82cb8b9..0000000
--- a/utils/xen/xsa-23.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-xen/mm/shadow: check toplevel pagetables are present before unhooking them.
-
-If the guest has not fully populated its top-level PAE entries when it calls
-HVMOP_pagetable_dying, the shadow code could try to unhook entries from
-MFN 0. Add a check to avoid that case.
-
-This issue was introduced by c/s 21239:b9d2db109cf5.
-
-This is a security problem, XSA-23 / CVE-2012-4538.
-
-Signed-off-by: Tim Deegan <tim AT xen.org>
-Tested-by: Andrew Cooper <andrew.cooper3 AT citrix.com>
-Acked-by: Ian Campbell <ian.campbell AT citrix.com>
-
-diff -r bfd22d40db06 xen/arch/x86/mm/shadow/multi.c
---- a/xen/arch/x86/mm/shadow/multi.c
-+++ b/xen/arch/x86/mm/shadow/multi.c
-@@ -4737,8 +4737,12 @@ static void sh_pagetable_dying(struct vc
- }
- for ( i = 0; i < 4; i++ )
- {
-- if ( fast_path )
-- smfn = _mfn(pagetable_get_pfn(v->arch.shadow_table[i]));
-+ if ( fast_path ) {
-+ if ( pagetable_is_null(v->arch.shadow_table[i]) )
-+ smfn = _mfn(INVALID_MFN);
-+ else
-+ smfn = _mfn(pagetable_get_pfn(v->arch.shadow_table[i]));
-+ }
- else
- {
- /* retrieving the l2s */
diff --git a/utils/xen/xsa-24.patch b/utils/xen/xsa-24.patch
deleted file mode 100644
index e46f513..0000000
--- a/utils/xen/xsa-24.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-compat/gnttab: Prevent infinite loop in compat code
-
-c/s 20281:95ea2052b41b, which introduces Grant Table version 2
-hypercalls introduces a vulnerability whereby the compat hypercall
-handler can fall into an infinite loop.
-
-If the watchdog is enabled, Xen will die after the timeout.
-
-This is a security problem, XSA-24 / CVE-2012-4539.
-
-Signed-off-by: Andrew Cooper <andrew.cooper3 AT citrix.com>
-Acked-by: Jan Beulich <jbeulich AT suse.com>
-Acked-by: Ian Jackson <ian.jackson AT eu.citrix.com>
-
-diff -r bac883cf805a xen/common/compat/grant_table.c
---- a/xen/common/compat/grant_table.c
-+++ b/xen/common/compat/grant_table.c
-@@ -318,6 +318,8 @@ int compat_grant_table_op(unsigned int c
- #undef XLAT_gnttab_get_status_frames_HNDL_frame_list
- if ( unlikely(__copy_to_guest(cmp_uop, &cmp.get_status, 1))
)
- rc = -EFAULT;
-+ else
-+ i = 1;
- }
- break;
- }
diff --git a/utils/xen/xsa-25.patch b/utils/xen/xsa-25.patch
deleted file mode 100644
index f8a9be2..0000000
--- a/utils/xen/xsa-25.patch
+++ /dev/null
@@ -1,461 +0,0 @@
-libxc: builder: limit maximum size of kernel/ramdisk.
-
-Allowing user supplied kernels of arbitrary sizes, especially during
-decompression, can swallow up dom0 memory leading to either virtual
-address space exhaustion in the builder process or allocation
-failures/OOM killing of both toolstack and unrelated processes.
-
-We disable these checks when building in a stub domain for pvgrub
-since this uses the guest's own memory and is isolated.
-
-Decompression of gzip compressed kernels and ramdisks has been safe
-since 14954:58205257517d (Xen 3.1.0 onwards).
-
-This is XSA-25 / CVE-2012-4544.
-
-Also make explicit checks for buffer overflows in various
-decompression routines. These were already ruled out due to other
-properties of the code but check them as a belt-and-braces measure.
-
-Signed-off-by: Ian Campbell <ian.campbell AT citrix.com>
-Acked-by: Ian Jackson <ian.jackson AT eu.citrix.com>
-[ Includes 25589:60f09d1ab1fe for CVE-2012-2625 ]
-
-diff --git a/stubdom/grub/kexec.c b/stubdom/grub/kexec.c
-index 06bef52..b21c91a 100644
---- a/stubdom/grub/kexec.c
-+++ b/stubdom/grub/kexec.c
-@@ -137,6 +137,10 @@ void kexec(void *kernel, long kernel_size, void
*module, long module_size, char
- dom = xc_dom_allocate(xc_handle, cmdline, features);
- dom->allocate = kexec_allocate;
-
-+ /* We are using guest owned memory, therefore no limits. */
-+ xc_dom_kernel_max_size(dom, 0);
-+ xc_dom_ramdisk_max_size(dom, 0);
-+
- dom->kernel_blob = kernel;
- dom->kernel_size = kernel_size;
-
-diff --git a/tools/libxc/xc_dom.h b/tools/libxc/xc_dom.h
-index e72f066..7043f96 100644
---- a/tools/libxc/xc_dom.h
-+++ b/tools/libxc/xc_dom.h
-@@ -52,6 +52,9 @@ struct xc_dom_image {
- void *ramdisk_blob;
- size_t ramdisk_size;
-
-+ size_t max_kernel_size;
-+ size_t max_ramdisk_size;
-+
- /* arguments and parameters */
- char *cmdline;
- uint32_t f_requested[XENFEAT_NR_SUBMAPS];
-@@ -175,6 +178,23 @@ void xc_dom_release_phys(struct xc_dom_image *dom);
- void xc_dom_release(struct xc_dom_image *dom);
- int xc_dom_mem_init(struct xc_dom_image *dom, unsigned int mem_mb);
-
-+/* Set this larger if you have enormous ramdisks/kernels. Note that
-+ * you should trust all kernels not to be maliciously large (e.g. to
-+ * exhaust all dom0 memory) if you do this (see CVE-2012-4544 /
-+ * XSA-25). You can also set the default independently for
-+ * ramdisks/kernels in xc_dom_allocate() or call
-+ * xc_dom_{kernel,ramdisk}_max_size.
-+ */
-+#ifndef XC_DOM_DECOMPRESS_MAX
-+#define XC_DOM_DECOMPRESS_MAX (1024*1024*1024) /* 1GB */
-+#endif
-+
-+int xc_dom_kernel_check_size(struct xc_dom_image *dom, size_t sz);
-+int xc_dom_kernel_max_size(struct xc_dom_image *dom, size_t sz);
-+
-+int xc_dom_ramdisk_check_size(struct xc_dom_image *dom, size_t sz);
-+int xc_dom_ramdisk_max_size(struct xc_dom_image *dom, size_t sz);
-+
- size_t xc_dom_check_gzip(xc_interface *xch,
- void *blob, size_t ziplen);
- int xc_dom_do_gunzip(xc_interface *xch,
-@@ -224,7 +244,8 @@ void xc_dom_log_memory_footprint(struct xc_dom_image
*dom);
- void *xc_dom_malloc(struct xc_dom_image *dom, size_t size);
- void *xc_dom_malloc_page_aligned(struct xc_dom_image *dom, size_t size);
- void *xc_dom_malloc_filemap(struct xc_dom_image *dom,
-- const char *filename, size_t * size);
-+ const char *filename, size_t * size,
-+ const size_t max_size);
- char *xc_dom_strdup(struct xc_dom_image *dom, const char *str);
-
- /* --- alloc memory pool ------------------------------------------- */
-diff --git a/tools/libxc/xc_dom_bzimageloader.c
b/tools/libxc/xc_dom_bzimageloader.c
-index 9852e67..73cfad1 100644
---- a/tools/libxc/xc_dom_bzimageloader.c
-+++ b/tools/libxc/xc_dom_bzimageloader.c
-@@ -47,13 +47,19 @@ static int xc_try_bzip2_decode(
- char *out_buf;
- char *tmp_buf;
- int retval = -1;
-- int outsize;
-+ unsigned int outsize;
- uint64_t total;
-
- stream.bzalloc = NULL;
- stream.bzfree = NULL;
- stream.opaque = NULL;
-
-+ if ( dom->kernel_size == 0)
-+ {
-+ DOMPRINTF("BZIP2: Input is 0 size");
-+ return -1;
-+ }
-+
- ret = BZ2_bzDecompressInit(&stream, 0, 0);
- if ( ret != BZ_OK )
- {
-@@ -66,6 +72,17 @@ static int xc_try_bzip2_decode(
- * the input buffer to start, and we'll realloc as needed.
- */
- outsize = dom->kernel_size;
-+
-+ /*
-+ * stream.avail_in and outsize are unsigned int, while kernel_size
-+ * is a size_t. Check we aren't overflowing.
-+ */
-+ if ( outsize != dom->kernel_size )
-+ {
-+ DOMPRINTF("BZIP2: Input too large");
-+ goto bzip2_cleanup;
-+ }
-+
- out_buf = malloc(outsize);
- if ( out_buf == NULL )
- {
-@@ -98,13 +115,20 @@ static int xc_try_bzip2_decode(
- if ( stream.avail_out == 0 )
- {
- /* Protect against output buffer overflow */
-- if ( outsize > INT_MAX / 2 )
-+ if ( outsize > UINT_MAX / 2 )
- {
- DOMPRINTF("BZIP2: output buffer overflow");
- free(out_buf);
- goto bzip2_cleanup;
- }
-
-+ if ( xc_dom_kernel_check_size(dom, outsize * 2) )
-+ {
-+ DOMPRINTF("BZIP2: output too large");
-+ free(out_buf);
-+ goto bzip2_cleanup;
-+ }
-+
- tmp_buf = realloc(out_buf, outsize * 2);
- if ( tmp_buf == NULL )
- {
-@@ -172,9 +196,15 @@ static int xc_try_lzma_decode(
- unsigned char *out_buf;
- unsigned char *tmp_buf;
- int retval = -1;
-- int outsize;
-+ size_t outsize;
- const char *msg;
-
-+ if ( dom->kernel_size == 0)
-+ {
-+ DOMPRINTF("LZMA: Input is 0 size");
-+ return -1;
-+ }
-+
- ret = lzma_alone_decoder(&stream, 128*1024*1024);
- if ( ret != LZMA_OK )
- {
-@@ -251,13 +281,20 @@ static int xc_try_lzma_decode(
- if ( stream.avail_out == 0 )
- {
- /* Protect against output buffer overflow */
-- if ( outsize > INT_MAX / 2 )
-+ if ( outsize > SIZE_MAX / 2 )
- {
- DOMPRINTF("LZMA: output buffer overflow");
- free(out_buf);
- goto lzma_cleanup;
- }
-
-+ if ( xc_dom_kernel_check_size(dom, outsize * 2) )
-+ {
-+ DOMPRINTF("LZMA: output too large");
-+ free(out_buf);
-+ goto lzma_cleanup;
-+ }
-+
- tmp_buf = realloc(out_buf, outsize * 2);
- if ( tmp_buf == NULL )
- {
-@@ -327,6 +364,12 @@ static int xc_try_lzo1x_decode(
- 0x89, 0x4c, 0x5a, 0x4f, 0x00, 0x0d, 0x0a, 0x1a, 0x0a
- };
-
-+ /*
-+ * lzo_uint should match size_t. Check that this is the case to be
-+ * sure we won't overflow various lzo_uint fields.
-+ */
-+ XC_BUILD_BUG_ON(sizeof(lzo_uint) != sizeof(size_t));
-+
- ret = lzo_init();
- if ( ret != LZO_E_OK )
- {
-@@ -406,6 +449,14 @@ static int xc_try_lzo1x_decode(
- if ( src_len <= 0 || src_len > dst_len || src_len > left )
- break;
-
-+ msg = "Output buffer overflow";
-+ if ( *size > SIZE_MAX - dst_len )
-+ break;
-+
-+ msg = "Decompressed image too large";
-+ if ( xc_dom_kernel_check_size(dom, *size + dst_len) )
-+ break;
-+
- msg = "Failed to (re)alloc memory";
- tmp_buf = realloc(out_buf, *size + dst_len);
- if ( tmp_buf == NULL )
-diff --git a/tools/libxc/xc_dom_core.c b/tools/libxc/xc_dom_core.c
-index fea9de5..2a01d7c 100644
---- a/tools/libxc/xc_dom_core.c
-+++ b/tools/libxc/xc_dom_core.c
-@@ -159,7 +159,8 @@ void *xc_dom_malloc_page_aligned(struct xc_dom_image
*dom, size_t size)
- }
-
- void *xc_dom_malloc_filemap(struct xc_dom_image *dom,
-- const char *filename, size_t * size)
-+ const char *filename, size_t * size,
-+ const size_t max_size)
- {
- struct xc_dom_mem *block = NULL;
- int fd = -1;
-@@ -171,6 +172,13 @@ void *xc_dom_malloc_filemap(struct xc_dom_image *dom,
- lseek(fd, 0, SEEK_SET);
- *size = lseek(fd, 0, SEEK_END);
-
-+ if ( max_size && *size > max_size )
-+ {
-+ xc_dom_panic(dom->xch, XC_OUT_OF_MEMORY,
-+ "tried to map file which is too large");
-+ goto err;
-+ }
-+
- block = malloc(sizeof(*block));
- if ( block == NULL )
- goto err;
-@@ -222,6 +230,40 @@ char *xc_dom_strdup(struct xc_dom_image *dom, const
char *str)
- }
-
- /* ------------------------------------------------------------------------
*/
-+/* decompression buffer sizing
*/
-+int xc_dom_kernel_check_size(struct xc_dom_image *dom, size_t sz)
-+{
-+ /* No limit */
-+ if ( !dom->max_kernel_size )
-+ return 0;
-+
-+ if ( sz > dom->max_kernel_size )
-+ {
-+ xc_dom_panic(dom->xch, XC_INVALID_KERNEL,
-+ "kernel image too large");
-+ return 1;
-+ }
-+
-+ return 0;
-+}
-+
-+int xc_dom_ramdisk_check_size(struct xc_dom_image *dom, size_t sz)
-+{
-+ /* No limit */
-+ if ( !dom->max_ramdisk_size )
-+ return 0;
-+
-+ if ( sz > dom->max_ramdisk_size )
-+ {
-+ xc_dom_panic(dom->xch, XC_INVALID_KERNEL,
-+ "ramdisk image too large");
-+ return 1;
-+ }
-+
-+ return 0;
-+}
-+
-+/* ------------------------------------------------------------------------
*/
- /* read files, copy memory blocks, with transparent gunzip
*/
-
- size_t xc_dom_check_gzip(xc_interface *xch, void *blob, size_t ziplen)
-@@ -235,7 +277,7 @@ size_t xc_dom_check_gzip(xc_interface *xch, void *blob,
size_t ziplen)
-
- gzlen = blob + ziplen - 4;
- unziplen = gzlen[3] << 24 | gzlen[2] << 16 | gzlen[1] << 8 | gzlen[0];
-- if ( (unziplen < 0) || (unziplen > (1024*1024*1024)) ) /* 1GB limit */
-+ if ( (unziplen < 0) || (unziplen > XC_DOM_DECOMPRESS_MAX) )
- {
- xc_dom_printf
- (xch,
-@@ -288,6 +330,9 @@ int xc_dom_try_gunzip(struct xc_dom_image *dom, void
**blob, size_t * size)
- if ( unziplen == 0 )
- return 0;
-
-+ if ( xc_dom_kernel_check_size(dom, unziplen) )
-+ return 0;
-+
- unzip = xc_dom_malloc(dom, unziplen);
- if ( unzip == NULL )
- return -1;
-@@ -588,6 +633,9 @@ struct xc_dom_image *xc_dom_allocate(xc_interface *xch,
- memset(dom, 0, sizeof(*dom));
- dom->xch = xch;
-
-+ dom->max_kernel_size = XC_DOM_DECOMPRESS_MAX;
-+ dom->max_ramdisk_size = XC_DOM_DECOMPRESS_MAX;
-+
- if ( cmdline )
- dom->cmdline = xc_dom_strdup(dom, cmdline);
- if ( features )
-@@ -608,10 +656,25 @@ struct xc_dom_image *xc_dom_allocate(xc_interface *xch,
- return NULL;
- }
-
-+int xc_dom_kernel_max_size(struct xc_dom_image *dom, size_t sz)
-+{
-+ DOMPRINTF("%s: kernel_max_size=%zx", __FUNCTION__, sz);
-+ dom->max_kernel_size = sz;
-+ return 0;
-+}
-+
-+int xc_dom_ramdisk_max_size(struct xc_dom_image *dom, size_t sz)
-+{
-+ DOMPRINTF("%s: ramdisk_max_size=%zx", __FUNCTION__, sz);
-+ dom->max_ramdisk_size = sz;
-+ return 0;
-+}
-+
- int xc_dom_kernel_file(struct xc_dom_image *dom, const char *filename)
- {
- DOMPRINTF("%s: filename=\"%s\"", __FUNCTION__, filename);
-- dom->kernel_blob = xc_dom_malloc_filemap(dom, filename,
&dom->kernel_size);
-+ dom->kernel_blob = xc_dom_malloc_filemap(dom, filename,
&dom->kernel_size,
-+ dom->max_kernel_size);
- if ( dom->kernel_blob == NULL )
- return -1;
- return xc_dom_try_gunzip(dom, &dom->kernel_blob, &dom->kernel_size);
-@@ -621,7 +684,9 @@ int xc_dom_ramdisk_file(struct xc_dom_image *dom, const
char *filename)
- {
- DOMPRINTF("%s: filename=\"%s\"", __FUNCTION__, filename);
- dom->ramdisk_blob =
-- xc_dom_malloc_filemap(dom, filename, &dom->ramdisk_size);
-+ xc_dom_malloc_filemap(dom, filename, &dom->ramdisk_size,
-+ dom->max_ramdisk_size);
-+
- if ( dom->ramdisk_blob == NULL )
- return -1;
- // return xc_dom_try_gunzip(dom, &dom->ramdisk_blob, &dom->ramdisk_size);
-@@ -781,7 +846,11 @@ int xc_dom_build_image(struct xc_dom_image *dom)
- void *ramdiskmap;
-
- unziplen = xc_dom_check_gzip(dom->xch, dom->ramdisk_blob,
dom->ramdisk_size);
-+ if ( xc_dom_ramdisk_check_size(dom, unziplen) != 0 )
-+ unziplen = 0;
-+
- ramdisklen = unziplen ? unziplen : dom->ramdisk_size;
-+
- if ( xc_dom_alloc_segment(dom, &dom->ramdisk_seg, "ramdisk", 0,
- ramdisklen) != 0 )
- goto err;
-diff --git a/tools/pygrub/src/pygrub b/tools/pygrub/src/pygrub
-index 17c0083..1a3c1c3 100644
---- a/tools/pygrub/src/pygrub
-+++ b/tools/pygrub/src/pygrub
-@@ -28,6 +28,7 @@ import grub.LiloConf
- import grub.ExtLinuxConf
-
- PYGRUB_VER = 0.6
-+FS_READ_MAX = 1024 * 1024
-
- def enable_cursor(ison):
- if ison:
-@@ -421,7 +422,8 @@ class Grub:
- if self.__dict__.get('cf', None) is None:
- raise RuntimeError, "couldn't find bootloader config file in
the image provided."
- f = fs.open_file(self.cf.filename)
-- buf = f.read()
-+ # limit read size to avoid pathological cases
-+ buf = f.read(FS_READ_MAX)
- del f
- self.cf.parse(buf)
-
-@@ -670,6 +672,37 @@ if __name__ == "__main__":
- def usage():
- print >> sys.stderr, "Usage: %s [-q|--quiet] [-i|--interactive]
[-n|--not-really] [--output=] [--kernel=] [--ramdisk=] [--args=] [--entry=]
[--output-directory=] [--output-format=sxp|simple|simple0] <image>"
%(sys.argv[0],)
-
-+ def copy_from_image(fs, file_to_read, file_type, output_directory,
-+ not_really):
-+ if not_really:
-+ if fs.file_exists(file_to_read):
-+ return "<%s:%s>" % (file_type, file_to_read)
-+ else:
-+ sys.exit("The requested %s file does not exist" % file_type)
-+ try:
-+ datafile = fs.open_file(file_to_read)
-+ except Exception, e:
-+ print >>sys.stderr, e
-+ sys.exit("Error opening %s in guest" % file_to_read)
-+ (tfd, ret) = tempfile.mkstemp(prefix="boot_"+file_type+".",
-+ dir=output_directory)
-+ dataoff = 0
-+ while True:
-+ data = datafile.read(FS_READ_MAX, dataoff)
-+ if len(data) == 0:
-+ os.close(tfd)
-+ del datafile
-+ return ret
-+ try:
-+ os.write(tfd, data)
-+ except Exception, e:
-+ print >>sys.stderr, e
-+ os.close(tfd)
-+ os.unlink(ret)
-+ del datafile
-+ sys.exit("Error writing temporary copy of "+file_type)
-+ dataoff += len(data)
-+
- try:
- opts, args = getopt.gnu_getopt(sys.argv[1:], 'qinh::',
- ["quiet", "interactive", "not-really",
"help",
-@@ -786,24 +819,18 @@ if __name__ == "__main__":
- if not fs:
- raise RuntimeError, "Unable to find partition containing kernel"
-
-- if not_really:
-- bootcfg["kernel"] = "<kernel:%s>" % chosencfg["kernel"]
-- else:
-- data = fs.open_file(chosencfg["kernel"]).read()
-- (tfd, bootcfg["kernel"]) = tempfile.mkstemp(prefix="boot_kernel.",
-- dir=output_directory)
-- os.write(tfd, data)
-- os.close(tfd)
-+ bootcfg["kernel"] = copy_from_image(fs, chosencfg["kernel"], "kernel",
-+ output_directory, not_really)
-
- if chosencfg["ramdisk"]:
-- if not_really:
-- bootcfg["ramdisk"] = "<ramdisk:%s>" % chosencfg["ramdisk"]
-- else:
-- data = fs.open_file(chosencfg["ramdisk"],).read()
-- (tfd, bootcfg["ramdisk"]) = tempfile.mkstemp(
-- prefix="boot_ramdisk.", dir=output_directory)
-- os.write(tfd, data)
-- os.close(tfd)
-+ try:
-+ bootcfg["ramdisk"] = copy_from_image(fs, chosencfg["ramdisk"],
-+ "ramdisk",
output_directory,
-+ not_really)
-+ except:
-+ if not not_really:
-+ os.unlink(bootcfg["kernel"])
-+ raise
- else:
- initrd = None
-
diff --git a/utils/xen/xsa-26.patch b/utils/xen/xsa-26.patch
deleted file mode 100644
index e8b8e7d..0000000
--- a/utils/xen/xsa-26.patch
+++ /dev/null
@@ -1,107 +0,0 @@
-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
deleted file mode 100644
index f0764cb..0000000
--- a/utils/xen/xsa-27.patch
+++ /dev/null
@@ -1,168 +0,0 @@
-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
deleted file mode 100644
index fe4638e..0000000
--- a/utils/xen/xsa-28.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-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
deleted file mode 100644
index f8f6e38..0000000
--- a/utils/xen/xsa-29.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-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
deleted file mode 100644
index 817879a..0000000
--- a/utils/xen/xsa-30.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-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
deleted file mode 100644
index 1f3d929..0000000
--- a/utils/xen/xsa-31.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-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-libs/smpeg/DETAILS b/video-libs/smpeg/DETAILS
index 3ba39af..6dd2810 100755
--- a/video-libs/smpeg/DETAILS
+++ b/video-libs/smpeg/DETAILS
@@ -3,7 +3,7 @@
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://mirrors.sunsite.dk/lokigames/open-source/smpeg/$SOURCE
- WEB_SITE=http://www.lokigames.com/development/smpeg.php3
+ WEB_SITE=http://icculus.org/smpeg/
ENTERED=20010922
SOURCE_HASH=sha512:d566bb68b0caacecdf61cd766b26e003fd4e153c243d873f7aae33ab69919202bd121bb9c10f494bd9530267ddec2a9e018eb46ee8bb9d502a29cd2de2f1bbfb
LICENSE[0]=GPL
diff --git a/video-libs/smpeg/HISTORY b/video-libs/smpeg/HISTORY
index d03e316..2b9a613 100644
--- a/video-libs/smpeg/HISTORY
+++ b/video-libs/smpeg/HISTORY
@@ -1,3 +1,6 @@
+2012-12-23 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: fix WEB_SITE
+
2006-10-03 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: [automated] Removed UPDATED.
diff --git a/x11/xearth/DETAILS b/x11/xearth/DETAILS
index 8f51c56..36054b2 100755
--- a/x11/xearth/DETAILS
+++ b/x11/xearth/DETAILS
@@ -5,9 +5,9 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=ftp://cag.lcs.mit.edu/pub/tuna/$SOURCE
SOURCE_URL[1]=ftp://ftp.cs.colorado.edu/users/tuna/$SOURCE
SOURCE_HASH=sha512:ab1c146385a0e61f6208a0218cabc8a10902f52feb50f328a330cdbddc5d2eff2c3efdf6719b625bcc07171ed2fd6201230ad8a71cd77a451ad9c81383bfd46e
- WEB_SITE=http://www.cs.colorado.edu/~tuna/xearth/
+ WEB_SITE=http://hewgill.com/xearth/original/
ENTERED=20020910
- LICENSE[0]=http://www.cs.colorado.edu/~tuna/xearth/copyright.html
+ LICENSE[0]=http://hewgill.com/xearth/original/copyright.html
KEYWORDS="x11"
SHORT='Xearth sets the X root window to an image of the Earth'
cat << EOF
diff --git a/x11/xearth/HISTORY b/x11/xearth/HISTORY
index 8dca3a1..686c662 100644
--- a/x11/xearth/HISTORY
+++ b/x11/xearth/HISTORY
@@ -1,3 +1,6 @@
+2012-12-25 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: fixed WEB_SITE and LICENSE
+
2011-10-14 Bor Kraljič <pyrobor AT ver.si>
* DETAILS: fixed long description wrap (scripted)
diff --git a/xorg-lib/libxp/HISTORY b/xorg-lib/libxp/HISTORY
index d97b99d..4b78f93 100644
--- a/xorg-lib/libxp/HISTORY
+++ b/xorg-lib/libxp/HISTORY
@@ -1,3 +1,7 @@
+2012-12-08 Ladislav Hagara <hgr AT vabo.cz>
+ * sig file updated
+ * PRE_BUILD, werror-fix.patch: removed
+
2011-12-25 Robin Cook <rcook AT wyrms.net>
* PRE_BUILD: appy patch to remove werror causing build to fail.
diff --git a/xorg-lib/libxp/PRE_BUILD b/xorg-lib/libxp/PRE_BUILD
deleted file mode 100755
index f32c7bd..0000000
--- a/xorg-lib/libxp/PRE_BUILD
+++ /dev/null
@@ -1,6 +0,0 @@
-default_pre_build &&
-cd $SOURCE_DIRECTORY &&
-
-./autogen.sh &&
-
-patch -p0 < $SCRIPT_DIRECTORY/werror-fix.patch
diff --git a/xorg-lib/libxp/libXp-1.0.1.tar.bz2.sig
b/xorg-lib/libxp/libXp-1.0.1.tar.bz2.sig
index 87d5148..73700f1 100644
Binary files a/xorg-lib/libxp/libXp-1.0.1.tar.bz2.sig and
b/xorg-lib/libxp/libXp-1.0.1.tar.bz2.sig differ
diff --git a/xorg-lib/libxp/werror-fix.patch b/xorg-lib/libxp/werror-fix.patch
deleted file mode 100644
index 25dc373..0000000
--- a/xorg-lib/libxp/werror-fix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure-orig 2011-12-25 15:52:45.689534862 -0600
-+++ configure 2011-12-25 15:53:08.762535820 -0600
-@@ -7606,7 +7606,7 @@
- CFLAGS="$xorg_testset_save_CFLAGS"
-
- if test "$supported" = "yes" ; then
-- BASE_CFLAGS="$BASE_CFLAGS -Werror=pointer-to-int-cast"
-+ BASE_CFLAGS="$BASE_CFLAGS"
- found="yes"
- fi
- fi
- [SM-Commit] GIT changes to stable-0.61 grimoire by Vlad Glagolev (86a5f94c127ef4604b09cd755fc9d8940c5b3129), Vlad Glagolev, 01/09/2013
Archive powered by MHonArc 2.6.24.