Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to devel-icu grimoire by Treeve Jelbert (b826ffb63ecc8058b330dee40ec76b45b43bd807)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Treeve Jelbert <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to devel-icu grimoire by Treeve Jelbert (b826ffb63ecc8058b330dee40ec76b45b43bd807)
  • Date: Sun, 25 Nov 2012 09:32:39 -0600

GIT changes to devel-icu grimoire by Treeve Jelbert <treeve AT sourcemage.org>:

ChangeLog | 6
archive-libs/libarchive/DEPENDS | 6
archive-libs/libarchive/HISTORY | 3
audio-drivers/alsa-tools/DEPENDS | 3
audio-drivers/alsa-tools/HISTORY | 3
audio-soft/sox/HISTORY | 3
audio-soft/sox/PRE_BUILD | 7
chat-im/gajim/DEPENDS | 5
chat-im/gajim/HISTORY | 3
chat-irc/weechat/DETAILS | 6
chat-irc/weechat/HISTORY | 3
crypto/loop-aes/DETAILS | 2
crypto/loop-aes/HISTORY | 3
database/redis/DETAILS | 4
database/redis/HISTORY | 3
dev/null |binary
disk/fuse/DETAILS | 4
disk/fuse/HISTORY | 3
disk/hdparm/DETAILS | 4
disk/hdparm/HISTORY | 3
disk/udisks2/HISTORY | 16
disk/udisks2/PRE_BUILD | 4
disk/udisks2/loop-ctl.patch | 16
doc/gl-presenter/BUILD | 1
doc/gl-presenter/DEPENDS | 2
doc/gl-presenter/DETAILS | 19
doc/gl-presenter/HISTORY | 3
doc/gl-presenter/INSTALL | 1
e-17/e_dbus/DEPENDS | 6
e-17/e_dbus/HISTORY | 3
e-17/ecore/DEPENDS | 4
e-17/ecore/HISTORY | 3
e-17/edbus/DEPENDS | 2
e-17/edbus/HISTORY | 3
e-17/edje/DEPENDS | 4
e-17/edje/HISTORY | 3
e-17/eeze/DEPENDS | 3
e-17/eeze/HISTORY | 3
e-17/eio/DEPENDS | 4
e-17/eio/HISTORY | 3
ftp/filezilla/DETAILS | 2
ftp/filezilla/FileZilla_3.6.0.1_src.tar.bz2.sig |binary
ftp/filezilla/FileZilla_3.6.0_src.tar.bz2.sig | 0
ftp/filezilla/HISTORY | 3
gnome2-apps/gnome-disk-utility/DEPENDS | 32
gnome2-apps/gnome-disk-utility/DETAILS | 6
gnome2-apps/gnome-disk-utility/HISTORY | 4
gnome2-apps/gnome-disk-utility/gnome-disk-utility-3.0.2.tar.bz2.sig | 0
gnome2-apps/gnome-disk-utility/gnome-disk-utility-3.6.1.tar.xz.sig |binary
gnome2-libs/gvfs/DEPENDS | 5
gnome2-libs/gvfs/DETAILS | 2
gnome2-libs/gvfs/HISTORY | 5
gnome2-libs/gvfs/PRE_BUILD | 4
gnome2-libs/gvfs/gvfs-1.12.3.tar.xz.sig | 0
gnome2-libs/gvfs/gvfs-1.14.2.tar.xz.sig |binary
gnome2-libs/gvfs/gvfs-gphoto25.patch | 59 -
gnome2-libs/libcroco/DEPENDS | 5
gnome2-libs/libcroco/HISTORY | 3
gnome2-libs/librsvg2/DEPENDS | 5
gnome2-libs/librsvg2/HISTORY | 3
gnome3-libs/libsecret/DEPENDS | 23
gnome3-libs/libsecret/HISTORY | 3
graphics-libs/libwebp/DEPENDS | 6
graphics-libs/libwebp/DETAILS | 21
graphics-libs/libwebp/HISTORY | 4
graphics-libs/libwebp/libwebp-0.2.1.tar.gz.sig |binary
graphics-libs/tiff/CVE-2012-4564.patch | 29
graphics-libs/tiff/DETAILS | 2
graphics-libs/tiff/HISTORY | 5
graphics-libs/tiff/PRE_BUILD | 4
http/firefox/DETAILS | 6
http/firefox/HISTORY | 3
http/lighttpd/DETAILS | 6
http/lighttpd/HISTORY | 3
http/seamonkey/DETAILS | 7
http/seamonkey/HISTORY | 4
http/seamonkey/mailnews.patch | 16
kernels/bbswitch/DETAILS | 1
kernels/bbswitch/HISTORY | 4
kernels/bbswitch/TRIGGERS | 1
kernels/linux/HISTORY | 11
kernels/linux/info/patches/maintenance_patches_3/patch-3.0.52 | 5
kernels/linux/info/patches/maintenance_patches_3/patch-3.2.34 | 5
kernels/linux/info/patches/maintenance_patches_3/patch-3.4.19 | 5
kernels/linux/info/patches/maintenance_patches_3/patch-3.6.7 | 5
kernels/linux/latest.defaults | 2
libs/ldns/DETAILS | 4
libs/ldns/HISTORY | 3
libs/qjson/DETAILS | 6
libs/qjson/HISTORY | 3
mail/claws-mail-extra-plugins/DETAILS | 2
mail/claws-mail-extra-plugins/HISTORY | 3
mail/claws-mail/DETAILS | 2
mail/claws-mail/HISTORY | 3
mail/exim/BUILD | 41
mail/exim/DETAILS | 6
mail/exim/FINAL | 3
mail/exim/HISTORY | 9
mail/exim/INSTALL | 5
mail/exim/PREPARE | 18
mail/mailx/BUILD | 4
mail/mailx/DEPENDS | 1
mail/mailx/HISTORY | 4
mail/masqmail/DETAILS | 1
mail/masqmail/HISTORY | 5
mail/masqmail/INSTALL | 2
net/chrony/HISTORY | 4
net/chrony/PRE_BUILD | 4
net/chrony/no-ipv6.patch | 20
net/libproxy/BUILD | 2
net/libproxy/DETAILS | 1
net/libproxy/HISTORY | 5
php-pear/php/DETAILS | 6
php-pear/php/HISTORY | 4
python-pypi/cython/DETAILS | 4
python-pypi/cython/HISTORY | 3
python-pypi/dulwich/DETAILS | 4
python-pypi/dulwich/HISTORY | 3
python-pypi/hg-git/DETAILS | 4
python-pypi/hg-git/HISTORY | 3
python-pypi/reportlab/DETAILS | 6
python-pypi/reportlab/HISTORY | 4
python-pypi/roundup/DETAILS | 5
python-pypi/roundup/HISTORY | 3
utils/colordiff/DETAILS | 4
utils/colordiff/HISTORY | 3
utils/cronie/CONFIGURE | 6
utils/cronie/DEPENDS | 6
utils/cronie/DETAILS | 4
utils/cronie/HISTORY | 6
utils/cronie/INSTALL | 4
utils/schroot/BUILD | 2
utils/schroot/HISTORY | 3
utils/xen/DETAILS | 2
utils/xen/HISTORY | 7
utils/xen/PRE_BUILD | 6
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
++++++++++
video/eviacam/DETAILS | 4
video/eviacam/HISTORY | 3
wm-addons/xxkb/DETAILS | 2
wm-addons/xxkb/HISTORY | 6
wm-addons/xxkb/PRE_BUILD | 1
wm-addons/xxkb/missing_init.patch | 22
xfce/exo/DEPENDS | 16
xfce/exo/DETAILS | 4
xfce/exo/HISTORY | 4
xfce/thunar/DEPENDS | 7
xfce/thunar/DETAILS | 4
xfce/thunar/HISTORY | 4
154 files changed, 1206 insertions(+), 258 deletions(-)

New commits:
commit 1a241b6c35147b1f1b7b89132b92314b62297064
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

sox: apply ffmpeg 0.11 patch only for ffmpeg >=0.11

commit 5fb50568c4d2360767ee888a76161b051aab59f8
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

cronie: => 1.4.9

commit b1a114c4d8aa91509f26e1f7eac101e7866911c7
Author: Robin Cook <rcook AT wyrms.net>
Commit: Robin Cook <rcook AT wyrms.net>

edje: change to using efl

commit b15f2b1a90acd527f612cd45d0eaf363c86c8951
Author: Robin Cook <rcook AT wyrms.net>
Commit: Robin Cook <rcook AT wyrms.net>

ecore: change to using efl

commit f1f4448cbca9b6e0f9b7b38dc2d46da14def0e55
Author: Robin Cook <rcook AT wyrms.net>
Commit: Robin Cook <rcook AT wyrms.net>

e_dbus: change to using efl

commit 64c9214ca9a9b4cb45d6a19872e28a67683ef862
Author: Robin Cook <rcook AT wyrms.net>
Commit: Robin Cook <rcook AT wyrms.net>

eio: change to using efl

commit 3d2d0008f1d73a08c10e089a4b7a881c0524ef4b
Author: Robin Cook <rcook AT wyrms.net>
Commit: Robin Cook <rcook AT wyrms.net>

eeze: change to using efl

commit c2f21b63357ceecde104dfd31defce99ec20d401
Author: Robin Cook <rcook AT wyrms.net>
Commit: Robin Cook <rcook AT wyrms.net>

edbus: change to depend on efl

commit 1955a931a4d4798731ea133d3ab099da2d06b70a
Author: Robin Cook <rcook AT wyrms.net>
Commit: Robin Cook <rcook AT wyrms.net>

New Spell: libwebp - library for Web-P graphics format

commit bfeb69ced03077ae049ba64504f4e47a5d8517a1
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

udisks2: fixed build with older kernel headers

commit 2187f59e3f1ab47393603551869d12a6441a98e8
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

udisks2: corrected email addr in HISTORY

commit 7c22db86e5bc89d4c9effdf6a0bd01b78a0fc91d
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

gnome-disk-utility: => 3.6.1

commit 35a3c917390ab09e016ac0d4aee45cc6ca9e90fe
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

libsecret: corrected dependency tree

commit 4e5e884d01c5939a4a3920836ddbfa3d66d91afc
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

thunar: => 1.5.2 (1.4 crashes with newer gvfs)

commit edc0ae59467e4f807590f0a96f589f4b6c38bcea
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

exo: => 0.9.1

commit 2c5962f4db221f9592c638f2c223dba6b99a3376
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

gvfs: => 1.14.2

commit f01927f7e46aa5032aa6e4924c823003cff4e5a8
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

seamonkey: => 2.14 (security)
(cherry picked from commit c409ec226afd8a9a9eb9ed2c18cc7659c52946c6)

commit 1d70be937d6ebfa328957c297cbce6f74de31558
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

utils/colordiff: version 1.0.13

commit b2d5c0d9e173c873362a861dd07ac55ea01eae33
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

redis: => 2.6.5

commit 83e7ea1bf73dabefd0baa65f790d8c8c745e1c1d
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

weechat: => 0.3.9.2 (security)

commit db6ad373b22456197c61864038ffd7d3531b5bce
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

linux: => 3.0.52 (lts)

commit 0c86e4b6839f4bdfd9049db12b720eec494c915e
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

linux: => 3.4.19 (lts)

commit 418c54f2d0a3f903f45562f4f270203ad0d10ef6
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

php: updated backports+security patches to 20121114 (legacy)

commit b8c1912f6d7029e12f1222fae55485452a958dc8
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

xxkb: fixed crash in some cases (see
https://bugs.gentoo.org/show_bug.cgi?id=407127)

commit 8c6af5e8e85c2c29c8cfef56e71ebad27bc3b177
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

fuse: => 2.9.2

commit e2339de557378cda8e9f7cf77989158e9d5f7424
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

cython: => 0.17.2

commit ee794d5c332d23179de1cdf4018115f49121bdaa
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

qjson: => 0.8.0

commit 27138340017e7e67b6c9ea05f103bc6afce4ff30
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

loop-aes: => 3.6f

commit 14202a6910f5f5634f8e4aef1c7753d0cb22de58
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>

firefox 17.0, SECURITY_PATCH=57

commit 12b44fef02e769cac080a5f4d319f7ef10eecb99
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

lighttpd: => 1.4.32 (security)

commit 46cb7d5d4016798348b7f831624763d5553fad9e
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

chrony: fixed build without IPv6 support

commit c831dfeba37e3bf155ee629668e149ba41d301cd
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

dulwich: => 0.8.6

commit 9a5478c0fceedbeb245b4dd25ee207368afb56fa
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

hg-git: => 0.3.4

commit 5349c068e81321471d25e69e085c1ee44a69037f
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

hdparm: => 9.43

commit de27e21d702ac88e2a81a6ea81a9bf61c7e0ebbb
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

librsvg2 - make link to icu explicit

commit 68fe264baf67bbb2e84cd76eca248565abc0cab2
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

libcroco - make link to icu explicit

commit cbcc0bb3f922e899b4aa43e9ea794329e72bb24f
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

libarchive - make link to icu explicit

commit 6d4cc228330acf19950b1bcc19662e6ffd0071b9
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

reportlab: => 2.6

commit 4c8d0c9c8be093e3b5fa2e343db1c8829a80d970
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>

filezilla 3.6.0.1

commit 183ba593cc9e29a786ce995758efdf0b07a3c9e8
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

audio-drivers/alsa-tools: correct date of history entry

commit 297d7f93cb9ba76390acb8981ebd29182066bf0e
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>

ldns 1.6.16

commit 2eae95e231d9ff5316aaeaa44039fee8f9b4ad0f
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

audio-drivers/alsa-tools: add dependency on gtk+2

commit fcd662373aafa381e6045e91e46ea19d36b9bac4
Author: Pol Vinogradov <vin.public AT gmail.com>
Commit: Pol Vinogradov <vin.public AT gmail.com>

mail/claws-mail-extra-plugins: updated to 3.9.0

commit 0eb478da8a7631fb2232a191cc6d909316945446
Author: Pol Vinogradov <vin.public AT gmail.com>
Commit: Pol Vinogradov <vin.public AT gmail.com>

mail/claws-mail: version 3.9.0

commit 2200e993fcb780a80afb44e47444ee24dd6de528
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

gajim: pyasn1 is required for ssl support

commit 0fdb11f44af9c9c2d50d6859330fe3e7a3cdb158
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

masqmail: corrected permissions for maildir

commit 2b02e190c5c84a3d9ac59846b226e2eacc4a3f01
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

bbswitch: recast spell on kernel update

commit c391106a4991e950db598fe33d7331bbe26bf45c
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>

linux 3.6.7

commit 7d8429ebeb48dfec5cd09abf46eb680ded6c369f
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>

eviacam 1.6.0

commit 5057b94ff0f06bece56f7d8170dc3a8f682cca9c
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

doc/gl-presenter: new spell, a dual-screen pdf presenter

commit a4659cbe9c3b577ee7ad5261472a6e01f0e55804
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

mailx: fixed multijob build

commit 0ad79a45a7c2e6c4c3752e66d04b78d9957f9f68
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

mailx: added missing openssl dependency

commit 3ca7ca1ec8eb7292590fba85bf282e5e2876dafe
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

exim: => 4.80.1 (security)

commit 4b51ebd5b3c4a62df278a5e3ed598347550e059e
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

xen: security update

commit 8dec07e38ea380d0f1bf19f18061fcf14a056812
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

tiff: fixed CVE-2012-4564 (security)

commit c64071229575e42a5553c76226d6e5029dc54223
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

libproxy: security update

commit 36ecf941205ef888457b90cbd9479eae43ef332e
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

roundup: => 1.4.20 (security)

commit 03941634d87007ca5e6cbe8aa84c6ccc111fe23f
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

linux: => 3.2.34 (lts)

commit c9deb1ea4d0f99d6d687202752ec3717b052d71b
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

schroot: Fix OPTS

The space should be before, instead of after the string being appended.

diff --git a/ChangeLog b/ChangeLog
index aca4037..7aeee9d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2012-11-24 Robin Cook <rcook AT wyrms.net>
+ * New Spell: graphics-libs/libwebp library for Web-P graphics format
+
+2012-11-17 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * doc/gl-presenter: new spell, a dual-screen pdf presenter
+
2012-11-15 Ladislav Hagara <hgr AT vabo.cz>
* e-17/efl: new spell, collection of libraries

diff --git a/archive-libs/libarchive/DEPENDS b/archive-libs/libarchive/DEPENDS
index cb1874e..2e97ae8 100755
--- a/archive-libs/libarchive/DEPENDS
+++ b/archive-libs/libarchive/DEPENDS
@@ -42,6 +42,12 @@ optional_depends libxml2 \
"--with-xml2" \
"--without-xml2" \
"for xar support through libxml2" &&
+# make icu usage explicit
+if is_depends_enabled $SPELL libxml2;then
+ if is_depends_enabled libxml2 icu;then
+ depends icu
+ fi
+fi &&

optional_depends expat \
"--with-expat" \
diff --git a/archive-libs/libarchive/HISTORY b/archive-libs/libarchive/HISTORY
index b338ae6..7b6515d 100644
--- a/archive-libs/libarchive/HISTORY
+++ b/archive-libs/libarchive/HISTORY
@@ -1,3 +1,6 @@
+2012-11-17 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: make icu usage explicit
+
2012-05-14 Vlad Glagolev <stealth AT sourcemage.org>
* DEPENDS: fixed dependencies: _all_ of them are optional; added
missing

diff --git a/audio-drivers/alsa-tools/DEPENDS
b/audio-drivers/alsa-tools/DEPENDS
index 08fbe8b..bd7455f 100755
--- a/audio-drivers/alsa-tools/DEPENDS
+++ b/audio-drivers/alsa-tools/DEPENDS
@@ -4,4 +4,5 @@ if [[ $ALSA_TOOLS_BRANCH == scm ]]; then
depends automake &&
depends autoconf
fi &&
-depends fltk
+depends fltk &&
+depends gtk+2
diff --git a/audio-drivers/alsa-tools/HISTORY
b/audio-drivers/alsa-tools/HISTORY
index 60c6291..98e6f58 100644
--- a/audio-drivers/alsa-tools/HISTORY
+++ b/audio-drivers/alsa-tools/HISTORY
@@ -1,3 +1,6 @@
+2012-11-18 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DEPENDS: added dependency on gtk+2
+
2012-09-08 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 1.0.26.1

diff --git a/audio-soft/sox/HISTORY b/audio-soft/sox/HISTORY
index f77f9c2..89152db 100644
--- a/audio-soft/sox/HISTORY
+++ b/audio-soft/sox/HISTORY
@@ -1,3 +1,6 @@
+2012-11-25 Vlad Glagolev <stealth AT sourcemage.org>
+ * PRE_BUILD: apply ffmpeg 0.11 patch only for ffmpeg >=0.11
+
2012-06-20 Arjan Bouter <abouter AT sourcemage.org>
* ffmpeg-0.11-arch.patch: added patch from arch to fix
building against ffmpeg 0.11
diff --git a/audio-soft/sox/PRE_BUILD b/audio-soft/sox/PRE_BUILD
index af4ad33..bc5bec1 100755
--- a/audio-soft/sox/PRE_BUILD
+++ b/audio-soft/sox/PRE_BUILD
@@ -1,5 +1,10 @@
+. "$GRIMOIRE/FUNCTIONS" &&
+
default_pre_build &&
cd "$SOURCE_DIRECTORY" &&

patch -p0 < "$SPELL_DIRECTORY/file-5.0.patch" &&
-patch -p1 < "${SPELL_DIRECTORY}/ffmpeg-0.11-arch.patch"
+
+if spell_ok ffmpeg && is_version_less 0.10 $(installed_version ffmpeg); then
+ patch -p1 < "${SPELL_DIRECTORY}/ffmpeg-0.11-arch.patch"
+fi
diff --git a/chat-im/gajim/DEPENDS b/chat-im/gajim/DEPENDS
index 5f477b1..5f85e5f 100755
--- a/chat-im/gajim/DEPENDS
+++ b/chat-im/gajim/DEPENDS
@@ -13,6 +13,11 @@ if is_depends_enabled $SPELL farstream; then
fi &&

suggest_depends pyopenssl "" "" "for secure connections support" &&
+
+if is_depends_enabled $SPELL pyopenssl; then
+ depends pyasn1
+fi &&
+
suggest_depends dbus-python "" "" "to control Gajim via commandline" &&

if is_depends_enabled $SPELL dbus-python; then
diff --git a/chat-im/gajim/HISTORY b/chat-im/gajim/HISTORY
index b8da4f7..a0a958e 100644
--- a/chat-im/gajim/HISTORY
+++ b/chat-im/gajim/HISTORY
@@ -1,3 +1,6 @@
+2012-11-18 Vlad Glagolev <stealth AT sourcemage.org>
+ * DEPENDS: pyasn1 is required for secure connections
+
2012-11-03 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 0.15.2

diff --git a/chat-irc/weechat/DETAILS b/chat-irc/weechat/DETAILS
index 024fc98..e031e50 100755
--- a/chat-irc/weechat/DETAILS
+++ b/chat-irc/weechat/DETAILS
@@ -16,10 +16,10 @@ else

SOURCE_HASH=sha512:4e6901d44d8f343c9d2dfe3bd1383930eee0aadd9ec0f609bca524881e73d1a1089755e9ab369a31ccdd3452b80b84cac7cfd29b44949921c9571e4bd22dcc62
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-devel
else
- VERSION=0.3.9.1
- SECURITY_PATCH=1
+ VERSION=0.3.9.2
+ SECURITY_PATCH=2
SOURCE=$SPELL-$VERSION.tar.bz2
-
SOURCE_HASH=sha512:976678a2218c0ede9068bc300067a29a726f61fe42b059942c4b410545ab5a9f17e13f3ec20271885094bd8f927182069dd46ed09ddbee8ca63f16db825d4c90
+
SOURCE_HASH=sha512:a34a72204e289fe7ebb5441214b5256471af54e13198ce5dbb58dade043090fb09042ef35e672ef3d3174d0e48744c4d103644fbbea743b32b2b65bd982da965
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
fi
SOURCE_URL[0]=http://www.weechat.org/files/src/$SOURCE
diff --git a/chat-irc/weechat/HISTORY b/chat-irc/weechat/HISTORY
index bcdc6e0..52fcf65 100644
--- a/chat-irc/weechat/HISTORY
+++ b/chat-irc/weechat/HISTORY
@@ -1,3 +1,6 @@
+2012-11-23 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 0.3.9.2 (stable); SECURITY_PATCH++
+
2012-11-10 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 0.3.9.1 (stable); SECURITY_PATCH++

diff --git a/crypto/loop-aes/DETAILS b/crypto/loop-aes/DETAILS
index 8e007f9..cb06f97 100755
--- a/crypto/loop-aes/DETAILS
+++ b/crypto/loop-aes/DETAILS
@@ -1,5 +1,5 @@
SPELL=loop-aes
- VERSION=3.6e
+ VERSION=3.6f
SOURCE=loop-AES-v$VERSION.tar.bz2
SOURCE2=$SOURCE.sign
SOURCE_DIRECTORY="$BUILD_DIRECTORY/loop-AES-v$VERSION"
diff --git a/crypto/loop-aes/HISTORY b/crypto/loop-aes/HISTORY
index 4b87892..2350396 100644
--- a/crypto/loop-aes/HISTORY
+++ b/crypto/loop-aes/HISTORY
@@ -1,3 +1,6 @@
+2012-11-22 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 3.6f
+
2011-12-01 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 3.6e
* PRE_BUILD: removed, patches built-in
diff --git a/database/redis/DETAILS b/database/redis/DETAILS
index 5c42a17..6b0b9f5 100755
--- a/database/redis/DETAILS
+++ b/database/redis/DETAILS
@@ -1,8 +1,8 @@
SPELL=redis
- VERSION=2.6.3
+ VERSION=2.6.5
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_URL[0]=http://redis.googlecode.com/files/$SOURCE
-
SOURCE_HASH=sha512:28fdb4732e53cd05022bb696114439014f97099fb49b9bb0326af1766095c50dc886407dcc45bb47a6109cb44c7761907426b57e301b73b029d1bbe161e3c886
+
SOURCE_HASH=sha512:05acc3596db20a246a355849b393e2148b2d63d647ee6205cab134ff1a20a3c281ee217b601d67e483928b35a52392befd936f7888001b62ae5e96760af1404a
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
LICENSE[0]=BSD
WEB_SITE=http://redis.io/
diff --git a/database/redis/HISTORY b/database/redis/HISTORY
index 79f8dc5..9112041 100644
--- a/database/redis/HISTORY
+++ b/database/redis/HISTORY
@@ -1,3 +1,6 @@
+2012-11-23 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 2.6.5
+
2012-11-07 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 2.6.3

diff --git a/disk/fuse/DETAILS b/disk/fuse/DETAILS
index 6f3dee8..56359c9 100755
--- a/disk/fuse/DETAILS
+++ b/disk/fuse/DETAILS
@@ -1,7 +1,7 @@
SPELL=fuse
if [ "$FUSE_BRANCH" != "scm" ]; then
- VERSION=2.9.1
-
SOURCE_HASH=sha512:6675810ba92b9f8dd289eec9c4eb45fe371e6a7f7c0c5c7a2533d813353fcbbcb78e20eb61a92057a985a556eacc67e4e6a9d5d06513028e1c2c19ab7fe59ffc
+ VERSION=2.9.2
+
SOURCE_HASH=sha512:017076a58a4d184f27657e1dcdc7d5f6814a9acdc365769e1efb6bf840380fba32bcee5f57b62ecb353840c06e0a8cc7c3eeeadceb4e983188b59af2fb2171bd
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/disk/fuse/HISTORY b/disk/fuse/HISTORY
index 85d3042..d41fe67 100644
--- a/disk/fuse/HISTORY
+++ b/disk/fuse/HISTORY
@@ -1,3 +1,6 @@
+2012-11-22 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 2.9.2
+
2012-08-05 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 2.9.1
* init.patch: updated
diff --git a/disk/hdparm/DETAILS b/disk/hdparm/DETAILS
index 5c49991..570e8fc 100755
--- a/disk/hdparm/DETAILS
+++ b/disk/hdparm/DETAILS
@@ -1,6 +1,6 @@
SPELL=hdparm
- VERSION=9.42
-
SOURCE_HASH=sha512:ef2a2959403845c1068ab1bfd01205d85a493a4cc61dd61a94c54a7b54ec9a0604805dad8a5d3b8ff810b1753d4e11d2d4dacf09ff5871354d48b308aed07f29
+ VERSION=9.43
+
SOURCE_HASH=sha512:24cf10290d11c611951064ae2f4fc0c06d2aa764eb2801126c0cda272944adc1c07bc905c6c11dd964dd966e213aed1cde06afc7f24c565cfa709ba9134842df
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
diff --git a/disk/hdparm/HISTORY b/disk/hdparm/HISTORY
index b953337..f289b18 100644
--- a/disk/hdparm/HISTORY
+++ b/disk/hdparm/HISTORY
@@ -1,3 +1,6 @@
+2012-11-19 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 9.43
+
2012-10-01 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 9.42

diff --git a/disk/udisks2/HISTORY b/disk/udisks2/HISTORY
index 0b208f1..53be92d 100644
--- a/disk/udisks2/HISTORY
+++ b/disk/udisks2/HISTORY
@@ -1,22 +1,26 @@
-2012-10-05 Treeve Jelbert <treeve AT sourcemage.otg>
+2012-11-24 Vlad Glagolev <stealth AT sourcemage.org>
+ * PRE_BUILD: added, to apply the patch
+ * loop-ctl.patch: added, to fix build with kernel headers before
26.07.11
+
+2012-10-05 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: 2.0.0

-2012-07-31 Treeve Jelbert <treeve AT sourcemage.otg>
+2012-07-31 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: 1.99.0
* DEPENDS: fix libacl => acl

-2012-05-21 Treeve Jelbert <treeve AT sourcemage.otg>
+2012-05-21 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: 1.97.0
* DEPENDS: gobject-introspection is optional
add libacl

-2012-04-15 Treeve Jelbert <treeve AT sourcemage.otg>
+2012-04-15 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: 1.94.0

-2012-04-04 Treeve Jelbert <treeve AT sourcemage.otg>
+2012-04-04 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: 1.93.0

-2012-02-09 Treeve Jelbert <treeve AT sourcemage.otg>
+2012-02-09 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: 1.91.0
spell created

diff --git a/disk/udisks2/PRE_BUILD b/disk/udisks2/PRE_BUILD
new file mode 100755
index 0000000..cec3d9f
--- /dev/null
+++ b/disk/udisks2/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+
+patch -p0 < "$SPELL_DIRECTORY/loop-ctl.patch"
diff --git a/disk/udisks2/loop-ctl.patch b/disk/udisks2/loop-ctl.patch
new file mode 100644
index 0000000..3fc1748
--- /dev/null
+++ b/disk/udisks2/loop-ctl.patch
@@ -0,0 +1,16 @@
+--- src/udiskslinuxmanager.h.orig 2011-10-10 22:13:43.000000000 +0400
++++ src/udiskslinuxmanager.h 2012-11-24 17:52:35.021912864 +0400
+@@ -23,6 +23,13 @@
+
+ #include "udisksdaemontypes.h"
+
++/* /dev/loop-control interface */
++#ifndef LOOP_CTL_ADD
++# define LOOP_CTL_ADD 0x4C80
++# define LOOP_CTL_REMOVE 0x4C81
++# define LOOP_CTL_GET_FREE 0x4C82
++#endif
++
+ G_BEGIN_DECLS
+
+ #define UDISKS_TYPE_LINUX_MANAGER (udisks_linux_manager_get_type ())
diff --git a/doc/gl-presenter/BUILD b/doc/gl-presenter/BUILD
new file mode 100755
index 0000000..eec3de4
--- /dev/null
+++ b/doc/gl-presenter/BUILD
@@ -0,0 +1 @@
+qt4_build
diff --git a/doc/gl-presenter/DEPENDS b/doc/gl-presenter/DEPENDS
new file mode 100755
index 0000000..79928c7
--- /dev/null
+++ b/doc/gl-presenter/DEPENDS
@@ -0,0 +1,2 @@
+depends -sub OPENGL qt4 &&
+depends poppler
diff --git a/doc/gl-presenter/DETAILS b/doc/gl-presenter/DETAILS
new file mode 100755
index 0000000..e2d222d
--- /dev/null
+++ b/doc/gl-presenter/DETAILS
@@ -0,0 +1,19 @@
+ SPELL=gl-presenter
+ VERSION=0.3.3
+ SOURCE="gl_presenter-${VERSION}.tar.bz2"
+
SOURCE_URL[0]=http://www.unix-ag.uni-kl.de/~kldenker/gl_presenter/download/source/${SOURCE}
+
SOURCE_HASH=sha512:13f4ec1de3802eff1f159849ca96ea0e14931b330a2a1b504b02036de30041d562b4cfc70fca84a180ccedd606b102facf428c516c66e528eccf78c3bfd62ee0
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/gl_presenter-${VERSION}"
+ WEB_SITE="http://www.unix-ag.uni-kl.de/~kldenker/gl_presenter/";
+ LICENSE[0]=GPL
+ ENTERED=20121117
+ SHORT="a dual-screen OpenGL PDF presentation software"
+cat << EOF
+A dual-screen OpenGL PDF presentation software.
+
+Features:
+
+ * multi-display-support * preview of next two slides * fade animation *
+ clock and timer * selection mode * notes * touch screen interface * zoom
+ * bookmarks
+EOF
diff --git a/doc/gl-presenter/HISTORY b/doc/gl-presenter/HISTORY
new file mode 100644
index 0000000..fdbf2d2
--- /dev/null
+++ b/doc/gl-presenter/HISTORY
@@ -0,0 +1,3 @@
+2012-11-17 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * BUILD, DEPENDS, DETAILS, INSTALL: spell created
+
diff --git a/doc/gl-presenter/INSTALL b/doc/gl-presenter/INSTALL
new file mode 100755
index 0000000..8f4b6a8
--- /dev/null
+++ b/doc/gl-presenter/INSTALL
@@ -0,0 +1 @@
+install -m755 $SOURCE_DIRECTORY/gl_presenter ${INSTALL_ROOT}/usr/bin/
diff --git a/e-17/e_dbus/DEPENDS b/e-17/e_dbus/DEPENDS
index 6459e4e..ab2e645 100755
--- a/e-17/e_dbus/DEPENDS
+++ b/e-17/e_dbus/DEPENDS
@@ -1,5 +1,3 @@
depends dbus &&
-depends eina &&
-depends evas &&
-depends ecore &&
-depends eobj
+depends efl &&
+depends ecore
diff --git a/e-17/e_dbus/HISTORY b/e-17/e_dbus/HISTORY
index b84fdff..f85bb53 100644
--- a/e-17/e_dbus/HISTORY
+++ b/e-17/e_dbus/HISTORY
@@ -1,3 +1,6 @@
+2012-11-24 Robin Cook <rcook AT wyrms.net>
+ * DEPENDS: change to using efl
+
2012-10-17 Eric Sandall <sandalle AT sourcemage.org>
* DEPENDS: Depends on eobj

diff --git a/e-17/ecore/DEPENDS b/e-17/ecore/DEPENDS
index 87baab1..e29fb94 100755
--- a/e-17/ecore/DEPENDS
+++ b/e-17/ecore/DEPENDS
@@ -1,8 +1,6 @@
depends curl '--enable-curl' &&
depends dbus &&
-depends eina &&
-depends eobj &&
-depends evas &&
+depends efl &&

if [ "$ECORE_BRANCH" = "scm" ]; then
depends subversion &&
diff --git a/e-17/ecore/HISTORY b/e-17/ecore/HISTORY
index 1d9c919..b6f3f7e 100644
--- a/e-17/ecore/HISTORY
+++ b/e-17/ecore/HISTORY
@@ -1,3 +1,6 @@
+2012-11-24 Robin Cook <rcook AT wyrms.net>
+ * DEPENDS: change to using efl
+
2012-10-17 Eric Sandall <sandalle AT sourcemage.org>
* DEPENDS: Depends on eobj

diff --git a/e-17/edbus/DEPENDS b/e-17/edbus/DEPENDS
index 5541c90..c50ad09 100755
--- a/e-17/edbus/DEPENDS
+++ b/e-17/edbus/DEPENDS
@@ -1,5 +1,5 @@
depends subversion &&
-depends eina &&
+depends efl &&
depends ecore &&

optional_depends check "" "" "Use check?" &&
diff --git a/e-17/edbus/HISTORY b/e-17/edbus/HISTORY
index dfe49e8..40bdfa0 100644
--- a/e-17/edbus/HISTORY
+++ b/e-17/edbus/HISTORY
@@ -1,2 +1,5 @@
+2012-11-24 Robin Cook <rcook AT wyrms.net>
+ * DEPENDS: change to using efl
+
2012-11-02 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS, DEPENDS, PREPARE, PRE_BUILD: spell created
diff --git a/e-17/edje/DEPENDS b/e-17/edje/DEPENDS
index 100cc68..0749c5c 100755
--- a/e-17/edje/DEPENDS
+++ b/e-17/edje/DEPENDS
@@ -1,6 +1,4 @@
-depends eet &&
-depends eina &&
-depends embryo &&
+depends efl &&
depends ecore &&
depends lua51 &&

diff --git a/e-17/edje/HISTORY b/e-17/edje/HISTORY
index 8a39e85..a67f5b4 100644
--- a/e-17/edje/HISTORY
+++ b/e-17/edje/HISTORY
@@ -1,3 +1,6 @@
+2012-11-24 Robin Cook <rcook AT wyrms.net>
+ * DEPENDS: change to using efl
+
2011-12-17 Vlad Glagolev <stealth AT sourcemage.org>
* DEPENDS: lua -> lua51

diff --git a/e-17/eeze/DEPENDS b/e-17/eeze/DEPENDS
index 1bc4725..701f878 100755
--- a/e-17/eeze/DEPENDS
+++ b/e-17/eeze/DEPENDS
@@ -1,6 +1,5 @@
depends util-linux &&
-depends eet &&
-depends eina &&
+depends efl &&
depends ecore &&
depends udev &&

diff --git a/e-17/eeze/HISTORY b/e-17/eeze/HISTORY
index e101113..8d5b346 100644
--- a/e-17/eeze/HISTORY
+++ b/e-17/eeze/HISTORY
@@ -1,3 +1,6 @@
+2012-11-24 Robin Cook <rcook AT wyrms.net>
+ * DEPENDS: change to using efl
+
2011-11-13 Robin Cook <rcook AT wyrms.net>
* DEPENDS: added eet, eina, util-linux

diff --git a/e-17/eio/DEPENDS b/e-17/eio/DEPENDS
index c708072..5c420d4 100755
--- a/e-17/eio/DEPENDS
+++ b/e-17/eio/DEPENDS
@@ -1,2 +1,2 @@
-depends ecore &&
-depends eina
+depends efl &&
+depends ecore
diff --git a/e-17/eio/HISTORY b/e-17/eio/HISTORY
index ef049ac..25fb180 100644
--- a/e-17/eio/HISTORY
+++ b/e-17/eio/HISTORY
@@ -1,3 +1,6 @@
+2012-11-24 Robin Cook <rcook AT wyrms.net>
+ * DEPENDS: change to using efl
+
2011-11-13 Robin Cook <rcook AT wyrms.net>
* BUILD: added to apply configure options
* CONFIGURE: added to query configure options
diff --git a/ftp/filezilla/DETAILS b/ftp/filezilla/DETAILS
index 71a23ba..e06a41c 100755
--- a/ftp/filezilla/DETAILS
+++ b/ftp/filezilla/DETAILS
@@ -1,5 +1,5 @@
SPELL=filezilla
- VERSION=3.6.0
+ VERSION=3.6.0.1
SOURCE="FileZilla_${VERSION}_src.tar.bz2"
SOURCE_URL[0]=$SOURCEFORGE_URL/${SPELL}/${SOURCE}
SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
diff --git a/ftp/filezilla/FileZilla_3.6.0.1_src.tar.bz2.sig
b/ftp/filezilla/FileZilla_3.6.0.1_src.tar.bz2.sig
new file mode 100644
index 0000000..64542de
Binary files /dev/null and b/ftp/filezilla/FileZilla_3.6.0.1_src.tar.bz2.sig
differ
diff --git a/ftp/filezilla/FileZilla_3.6.0_src.tar.bz2.sig
b/ftp/filezilla/FileZilla_3.6.0_src.tar.bz2.sig
deleted file mode 100644
index e5bdd90..0000000
Binary files a/ftp/filezilla/FileZilla_3.6.0_src.tar.bz2.sig and /dev/null
differ
diff --git a/ftp/filezilla/HISTORY b/ftp/filezilla/HISTORY
index f660476..85b7868 100644
--- a/ftp/filezilla/HISTORY
+++ b/ftp/filezilla/HISTORY
@@ -1,3 +1,6 @@
+2012-11-19 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 3.6.0.1
+
2012-11-12 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 3.6.0

diff --git a/gnome2-apps/gnome-disk-utility/DEPENDS
b/gnome2-apps/gnome-disk-utility/DEPENDS
index d819279..df6be39 100755
--- a/gnome2-apps/gnome-disk-utility/DEPENDS
+++ b/gnome2-apps/gnome-disk-utility/DEPENDS
@@ -1,26 +1,10 @@
depends glib2 &&
depends gtk+3 &&
-depends udisks &&
-depends -sub GTK3 avahi &&
-depends libnotify &&
-depends unique &&
-
-optional_depends rarian \
- "--enable-scrollkeeper" \
- "--disable-scrollkeeper" \
- "to register with rarian" &&
-
-optional_depends gtk-doc \
- "--enable-gtk-doc" \
- "--disable-gtk-doc" \
- "to build documentation" &&
-
-optional_depends libgnome-keyring \
- "--enable-gnome-keyring" \
- "--disable-gnome-keyring" \
- "to use gnome keyring" &&
-
-optional_depends nautilus2 \
- "--enable-nautilus" \
- "--disable-nautilus" \
- "for nautilus extensions"
+depends udisks2 &&
+depends libpwquality &&
+depends libsecret &&
+
+optional_depends gettext \
+ "--enable-nls" \
+ "--disable-nls" \
+ "for Native Language Support"
diff --git a/gnome2-apps/gnome-disk-utility/DETAILS
b/gnome2-apps/gnome-disk-utility/DETAILS
index 0e6b50e..5fb99e8 100755
--- a/gnome2-apps/gnome-disk-utility/DETAILS
+++ b/gnome2-apps/gnome-disk-utility/DETAILS
@@ -1,7 +1,7 @@
SPELL=gnome-disk-utility
- VERSION=3.0.2
- BRANCH=`echo $VERSION|cut -d . -f 1,2`
- SOURCE=$SPELL-$VERSION.tar.bz2
+ VERSION=3.6.1
+ BRANCH=`echo $VERSION|cut -d . -f 1,2`
+ SOURCE=$SPELL-$VERSION.tar.xz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$GNOME_URL/sources/$SPELL/$BRANCH/$SOURCE
SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
diff --git a/gnome2-apps/gnome-disk-utility/HISTORY
b/gnome2-apps/gnome-disk-utility/HISTORY
index 1f18cf2..2e037a8 100644
--- a/gnome2-apps/gnome-disk-utility/HISTORY
+++ b/gnome2-apps/gnome-disk-utility/HISTORY
@@ -1,3 +1,7 @@
+2012-11-24 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 3.6.1
+ * DEPENDS: refreshed dependency list
+
2011-10-20 Eric Sandall <sandalle AT sourcemage.org>
* DEPENDS: Requires avahi built with gtk+3 support for Avahi UI
Depends on gtk+3, not gtk+2
diff --git
a/gnome2-apps/gnome-disk-utility/gnome-disk-utility-3.0.2.tar.bz2.sig
b/gnome2-apps/gnome-disk-utility/gnome-disk-utility-3.0.2.tar.bz2.sig
deleted file mode 100644
index 2f15fd5..0000000
Binary files
a/gnome2-apps/gnome-disk-utility/gnome-disk-utility-3.0.2.tar.bz2.sig and
/dev/null differ
diff --git
a/gnome2-apps/gnome-disk-utility/gnome-disk-utility-3.6.1.tar.xz.sig
b/gnome2-apps/gnome-disk-utility/gnome-disk-utility-3.6.1.tar.xz.sig
new file mode 100644
index 0000000..7c67c3d
Binary files /dev/null and
b/gnome2-apps/gnome-disk-utility/gnome-disk-utility-3.6.1.tar.xz.sig differ
diff --git a/gnome2-libs/gvfs/DEPENDS b/gnome2-libs/gvfs/DEPENDS
index 04083de..50c76ad 100755
--- a/gnome2-libs/gvfs/DEPENDS
+++ b/gnome2-libs/gvfs/DEPENDS
@@ -41,11 +41,6 @@ optional_depends fuse \
"--disable-fuse" \
"build with FUSE support" &&

-optional_depends gconf2 \
- "--enable-gconf" \
- "--disable-gconf" \
- "build with GConf support" &&
-
optional_depends hal \
"--enable-hal" \
"--disable-hal" \
diff --git a/gnome2-libs/gvfs/DETAILS b/gnome2-libs/gvfs/DETAILS
index 8e0cc5c..f0063ed 100755
--- a/gnome2-libs/gvfs/DETAILS
+++ b/gnome2-libs/gvfs/DETAILS
@@ -1,5 +1,5 @@
SPELL=gvfs
- VERSION=1.12.3
+ VERSION=1.14.2
BRANCH=`echo $VERSION|cut -d . -f 1,2`
SOURCE=$SPELL-$VERSION.tar.xz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/gnome2-libs/gvfs/HISTORY b/gnome2-libs/gvfs/HISTORY
index cad61a0..5c7ed74 100644
--- a/gnome2-libs/gvfs/HISTORY
+++ b/gnome2-libs/gvfs/HISTORY
@@ -1,3 +1,8 @@
+2012-11-24 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 1.14.2
+ * DEPENDS: removed gconf2 deprecated dependency
+ * PRE_BUILD, gvfs-gphoto25.patch: dropped, fixed by upstream
+
2012-09-22 Sukneet Basuta <sukneet AT sourcemage.org>
* PRE_BUILD: run autoreconf to solve libtool version mismatch errors

diff --git a/gnome2-libs/gvfs/PRE_BUILD b/gnome2-libs/gvfs/PRE_BUILD
deleted file mode 100755
index ed491b2..0000000
--- a/gnome2-libs/gvfs/PRE_BUILD
+++ /dev/null
@@ -1,4 +0,0 @@
-default_pre_build &&
-cd $SOURCE_DIRECTORY &&
-patch -p1 < $SPELL_DIRECTORY/gvfs-gphoto25.patch &&
-autoreconf -f -i
diff --git a/gnome2-libs/gvfs/gvfs-1.12.3.tar.xz.sig
b/gnome2-libs/gvfs/gvfs-1.12.3.tar.xz.sig
deleted file mode 100644
index 7047664..0000000
Binary files a/gnome2-libs/gvfs/gvfs-1.12.3.tar.xz.sig and /dev/null differ
diff --git a/gnome2-libs/gvfs/gvfs-1.14.2.tar.xz.sig
b/gnome2-libs/gvfs/gvfs-1.14.2.tar.xz.sig
new file mode 100644
index 0000000..5e7431e
Binary files /dev/null and b/gnome2-libs/gvfs/gvfs-1.14.2.tar.xz.sig differ
diff --git a/gnome2-libs/gvfs/gvfs-gphoto25.patch
b/gnome2-libs/gvfs/gvfs-gphoto25.patch
deleted file mode 100644
index 361fcb7..0000000
--- a/gnome2-libs/gvfs/gvfs-gphoto25.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-diff -ur gvfs-1.12.3/configure.ac gvfs-mod/configure.ac
---- gvfs-1.12.3/configure.ac 2012-05-15 13:04:27.000000000 -0500
-+++ gvfs-mod/configure.ac 2012-09-08 19:15:26.998713492 -0500
-@@ -397,6 +397,9 @@
- if test "x$use_gphoto2" = "xyes"; then
- PKG_CHECK_MODULES(GPHOTO2, libgphoto2 >= 2.4.0)
- AC_DEFINE(HAVE_GPHOTO2, 1, [Define to 1 if gphoto2 is available])
-+ PKG_CHECK_MODULES(GPHOTO2, libgphoto2 >= 2.5.0,
-+ AC_DEFINE(HAVE_GPHOTO25, 1, [Define to 1 if libgphoto2 2.5 is
available])
-+ )
- else
- AC_MSG_WARN([Not building with gphoto2 support. Need OS tweaks in hal
volume monitor.])
- msg_gphoto2=no
-diff -ur gvfs-1.12.3/daemon/gvfsbackendgphoto2.c
gvfs-mod/daemon/gvfsbackendgphoto2.c
---- gvfs-1.12.3/daemon/gvfsbackendgphoto2.c 2012-05-15 13:01:50.000000000
-0500
-+++ gvfs-mod/daemon/gvfsbackendgphoto2.c 2012-09-08 19:22:51.463710301
-0500
-@@ -1647,7 +1647,7 @@
- return;
- }
-
-- DEBUG (" '%s' '%s' '%s'", info.name, info.path, info.library_filename);
-+ /* DEBUG (" '%s' '%s' '%s'", info.name, info.path,
info.library_filename); */
-
- /* set port */
- rc = gp_camera_set_port_info (gphoto2_backend->camera, info);
-@@ -2590,7 +2590,11 @@
- }
- }
-
-- rc = gp_camera_folder_put_file (gphoto2_backend->camera, dir, file_dest,
gphoto2_backend->context);
-+ #ifdef HAVE_GPHOTO25
-+ rc = gp_camera_folder_put_file (gphoto2_backend->camera, dir, new_name,
GP_FILE_TYPE_NORMAL, file_dest, gphoto2_backend->context);
-+ #else
-+ rc = gp_camera_folder_put_file (gphoto2_backend->camera, dir, file_dest,
gphoto2_backend->context);
-+ #endif
- if (rc != 0)
- goto out;
-
-@@ -3222,14 +3226,18 @@
- if (rc != 0)
- goto out;
-
-- gp_file_set_type (file, GP_FILE_TYPE_NORMAL);
- gp_file_set_name (file, write_handle->name);
- gp_file_set_mtime (file, time (NULL));
- gp_file_set_data_and_size (file,
- dup_for_gphoto2 (write_handle->data,
write_handle->size),
- write_handle->size);
-
-- rc = gp_camera_folder_put_file (gphoto2_backend->camera,
write_handle->dir, file, gphoto2_backend->context);
-+ #ifdef HAVE_GPHOTO25
-+ rc = gp_camera_folder_put_file (gphoto2_backend->camera,
write_handle->dir, write_handle->name, GP_FILE_TYPE_NORMAL, file,
gphoto2_backend->context);
-+ #else
-+ gp_file_set_type (file, GP_FILE_TYPE_NORMAL);
-+ rc = gp_camera_folder_put_file (gphoto2_backend->camera,
write_handle->dir, file, gphoto2_backend->context);
-+ #endif
- if (rc != 0)
- {
- gp_file_unref (file);
diff --git a/gnome2-libs/libcroco/DEPENDS b/gnome2-libs/libcroco/DEPENDS
index e9aeebb..dd36054 100755
--- a/gnome2-libs/libcroco/DEPENDS
+++ b/gnome2-libs/libcroco/DEPENDS
@@ -1,3 +1,8 @@
depends libxml2 &&
+# make icu usage explicit
+if is_depends_enabled libxml2 icu;then
+ depends icu
+fi &&
+
depends pcre &&
depends glib2
diff --git a/gnome2-libs/libcroco/HISTORY b/gnome2-libs/libcroco/HISTORY
index 229baea..74080bd 100644
--- a/gnome2-libs/libcroco/HISTORY
+++ b/gnome2-libs/libcroco/HISTORY
@@ -1,3 +1,6 @@
+2012-11-17 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: make link to icu excplicit
+
2012-04-01 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 0.6.5

diff --git a/gnome2-libs/librsvg2/DEPENDS b/gnome2-libs/librsvg2/DEPENDS
index 8de34ea..4fb5776 100755
--- a/gnome2-libs/librsvg2/DEPENDS
+++ b/gnome2-libs/librsvg2/DEPENDS
@@ -6,6 +6,11 @@ depends freetype2 &&
depends -sub PNG cairo &&
depends pango &&
depends libxml2 &&
+# make icu usage explicit
+if is_depends_enabled libxml2 icu;then
+ depends icu
+fi &&
+
depends libcroco &&

optional_depends gtk-doc \
diff --git a/gnome2-libs/librsvg2/HISTORY b/gnome2-libs/librsvg2/HISTORY
index 59e34ed..e48fbc5 100644
--- a/gnome2-libs/librsvg2/HISTORY
+++ b/gnome2-libs/librsvg2/HISTORY
@@ -1,3 +1,6 @@
+2012-11-17 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: make link to icu explicit
+
2012-10-21 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 2.36.4

diff --git a/gnome3-libs/libsecret/DEPENDS b/gnome3-libs/libsecret/DEPENDS
index 91050e8..962b5c2 100755
--- a/gnome3-libs/libsecret/DEPENDS
+++ b/gnome3-libs/libsecret/DEPENDS
@@ -1,19 +1,24 @@
-depends perl &&
+depends perl &&
depends glib2 &&

optional_depends gtk-doc \
"--enable-gtk-doc" \
"--disable-gtk-doc" \
"Build documentation with gtk-doc" &&
+
optional_depends gobject-introspection \
- "--enable-introspection=yes" \
- "--enable-introspection=no" \
- "to enable introspection support" &&
-optional_depends vala \
- "--enable-vala=yes" \
- "--enable-vala=no" \
- "for Vala bindings" &&
+ "--enable-introspection" \
+ "--disable-introspection" \
+ "for introspection support" &&
+
+if is_depends_enabled $SPELL gobject-introspection; then
+ optional_depends vala \
+ "--enable-vala" \
+ "--disable-vala" \
+ "for Vala bindings"
+fi &&
+
optional_depends libgcrypt \
"--enable-gcrypt" \
"--disable-gcrypt" \
- "for gcrypt and transport encryption"
+ "for gcrypt and transport encryption"
diff --git a/gnome3-libs/libsecret/HISTORY b/gnome3-libs/libsecret/HISTORY
index 23a6fd2..d48011b 100644
--- a/gnome3-libs/libsecret/HISTORY
+++ b/gnome3-libs/libsecret/HISTORY
@@ -1,3 +1,6 @@
+2012-11-24 Vlad Glagolev <stealth AT sourcemage.org>
+ * DEPENDS: Vala bindings require gobject-introspection
+
2012-09-27 Sukneet Basuta <sukneet AT sourcemage.org>
* DEPENDS, DETAILS: spell created

diff --git a/graphics-libs/libwebp/DEPENDS b/graphics-libs/libwebp/DEPENDS
new file mode 100755
index 0000000..4e30f65
--- /dev/null
+++ b/graphics-libs/libwebp/DEPENDS
@@ -0,0 +1,6 @@
+depends autoconf &&
+depends automake &&
+depends libtool &&
+depends libpng &&
+depends JPEG &&
+depends tiff
diff --git a/graphics-libs/libwebp/DETAILS b/graphics-libs/libwebp/DETAILS
new file mode 100755
index 0000000..767212a
--- /dev/null
+++ b/graphics-libs/libwebp/DETAILS
@@ -0,0 +1,21 @@
+ SPELL=libwebp
+ VERSION=0.2.1
+ SOURCE=$SPELL-$VERSION.tar.gz
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+ SOURCE_URL[0]=https://webp.googlecode.com/files/$SOURCE
+ SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
+ WEB_SITE=https://developers.google.com/speed/webp/
+ ENTERED=20121124
+ LICENSE[0]=GOOGLE
+ KEYWORDS="graphics libs"
+ SHORT="libwebp is a library that supports the WEB-P graphics
format."
+cat << EOF
+WebP is a new image format that provides lossless and lossy compression for
+images on the web. WebP lossless images are 26% smaller in size compared to
+PNGs. WebP lossy images are 25-34% smaller in size compared to JPEG images
at
+equivalent SSIM index. WebP supports lossless transparency (also known as
+alpha channel) with just 22% additional bytes. Transparency is also
supported
+with lossy compression and typically provides 3x smaller file sizes compared
+to PNG when lossy compression is acceptable for the red/green/blue color
+channels.
+EOF
diff --git a/graphics-libs/libwebp/HISTORY b/graphics-libs/libwebp/HISTORY
new file mode 100644
index 0000000..5382e3d
--- /dev/null
+++ b/graphics-libs/libwebp/HISTORY
@@ -0,0 +1,4 @@
+2012-11-24 Robin Cook <rcook AT wyrms.net>
+ * New Spell: DETAILS, DEPENDS
+
+
diff --git a/graphics-libs/libwebp/libwebp-0.2.1.tar.gz.sig
b/graphics-libs/libwebp/libwebp-0.2.1.tar.gz.sig
new file mode 100644
index 0000000..ebee870
Binary files /dev/null and b/graphics-libs/libwebp/libwebp-0.2.1.tar.gz.sig
differ
diff --git a/graphics-libs/tiff/CVE-2012-4564.patch
b/graphics-libs/tiff/CVE-2012-4564.patch
new file mode 100644
index 0000000..7b2f773
--- /dev/null
+++ b/graphics-libs/tiff/CVE-2012-4564.patch
@@ -0,0 +1,29 @@
+--- a/tools/ppm2tiff.c
++++ b/tools/ppm2tiff.c
+@@ -85,6 +85,7 @@
+ int c;
+ extern int optind;
+ extern char* optarg;
++ tmsize_t scanline_size;
+
+ if (argc < 2) {
+ fprintf(stderr, "%s: Too few arguments\n", argv[0]);
+@@ -233,8 +234,16 @@
+ }
+ if (TIFFScanlineSize(out) > linebytes)
+ buf = (unsigned char *)_TIFFmalloc(linebytes);
+- else
+- buf = (unsigned char *)_TIFFmalloc(TIFFScanlineSize(out));
++ else {
++ scanline_size = TIFFScanlineSize(out);
++ if (scanline_size != 0)
++ buf = (unsigned char
*)_TIFFmalloc(TIFFScanlineSize(out));
++ else {
++ fprintf(stderr, "%s: scanline size
overflow\n",infile);
++ (void) TIFFClose(out);
++ exit(-2);
++ }
++ }
+ if (resolution > 0) {
+ TIFFSetField(out, TIFFTAG_XRESOLUTION, resolution);
+ TIFFSetField(out, TIFFTAG_YRESOLUTION, resolution);
diff --git a/graphics-libs/tiff/DETAILS b/graphics-libs/tiff/DETAILS
index 76b311d..f592b56 100755
--- a/graphics-libs/tiff/DETAILS
+++ b/graphics-libs/tiff/DETAILS
@@ -1,5 +1,6 @@
SPELL=tiff
VERSION=4.0.3
+ SECURITY_PATCH=6
PATCHLEVEL=1

SOURCE_HASH=sha512:d80e18b00e9e696a30b954c0d92e5f2f773fd9a7a0a944cf6cabb69c1798e671506580daa1cd2ebf493ae922000170c2491dfc6d4c0a9cd0b865684070595a73
SOURCE=$SPELL-$VERSION.tar.gz
@@ -7,7 +8,6 @@ SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=ftp://ftp.remotesensing.org/pub/libtiff/$SOURCE
WEB_SITE=http://www.remotesensing.org/libtiff/
ENTERED=20010922
- SECURITY_PATCH=5
LICENSE[0]=LGPL
KEYWORDS="graphics libs"
SHORT="tiff provides support for the Tag Image File Format."
diff --git a/graphics-libs/tiff/HISTORY b/graphics-libs/tiff/HISTORY
index 20ddde0..64f440f 100644
--- a/graphics-libs/tiff/HISTORY
+++ b/graphics-libs/tiff/HISTORY
@@ -1,3 +1,8 @@
+2012-11-17 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: SECURITY_PATCH++
+ * PRE_BUILD: added, to apply the patch
+ * CVE-2012-4564.patch: added, fixes CVE-2012-4564 security issue
+
2012-09-23 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 4.0.3
SECURITY_PATCH++ : fixes CVE-2012-3401
diff --git a/graphics-libs/tiff/PRE_BUILD b/graphics-libs/tiff/PRE_BUILD
new file mode 100755
index 0000000..af23332
--- /dev/null
+++ b/graphics-libs/tiff/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+
+patch -p1 < "$SPELL_DIRECTORY/CVE-2012-4564.patch"
diff --git a/http/firefox/DETAILS b/http/firefox/DETAILS
index abc472c..577fdb0 100755
--- a/http/firefox/DETAILS
+++ b/http/firefox/DETAILS
@@ -1,13 +1,13 @@
SPELL=firefox
if [[ $FIREFOX_CVS == y ]]; then
- VERSION=16.0.2
+ VERSION=17.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=16.0.2
+ VERSION=17.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=56
+ SECURITY_PATCH=57
fi
SOURCE2_IGNORE=signature
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/http/firefox/HISTORY b/http/firefox/HISTORY
index a7ec542..79319d6 100644
--- a/http/firefox/HISTORY
+++ b/http/firefox/HISTORY
@@ -1,3 +1,6 @@
+2012-11-21 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 17.0, SECURITY_PATCH=57
+
2012-10-27 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 16.0.2, SECURITY_PATCH=56

diff --git a/http/lighttpd/DETAILS b/http/lighttpd/DETAILS
index 7f9a056..021d6e4 100755
--- a/http/lighttpd/DETAILS
+++ b/http/lighttpd/DETAILS
@@ -1,14 +1,14 @@
SPELL=lighttpd
- VERSION=1.4.31
+ VERSION=1.4.32
BRANCH=`echo -n $VERSION | cut -d . -f 1,2`
-
SOURCE_HASH=sha512:1d5853adb8a8f923b3413c3841f9a17b307e6a81206a9509c1fac3e301ca1bb1e26bdb2f45ebd6dcc540935e6168c9bc1ee2046199907841331aaa64e54a92c7
+
SOURCE_HASH=sha512:ffd5488a2ed57daa26b6d16223f422a94e88f2488cdc50bbb354c45daa535fbf9231fbbe73c23327a0adb708cc2b67fbdc60c34195a2a46a171dcc0f30bb3efb
SOURCE=$SPELL-$VERSION.tar.bz2

SOURCE_URL[0]=http://download.lighttpd.net/lighttpd/releases-$BRANCH.x/$SOURCE
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
WEB_SITE=http://www.lighttpd.net/
LICENSE[0]=BSD
ENTERED=20050722
- SECURITY_PATCH=7
+ SECURITY_PATCH=8
KEYWORDS="http"
SHORT="light httpd"
cat << EOF
diff --git a/http/lighttpd/HISTORY b/http/lighttpd/HISTORY
index 3a24921..eb5b48e 100644
--- a/http/lighttpd/HISTORY
+++ b/http/lighttpd/HISTORY
@@ -1,3 +1,6 @@
+2012-11-21 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 1.4.32; SECURITY_PATCH++ (CVE-2012-5533)
+
2012-05-31 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 1.4.31

diff --git a/http/seamonkey/DETAILS b/http/seamonkey/DETAILS
index 3fe48d6..7921ebf 100755
--- a/http/seamonkey/DETAILS
+++ b/http/seamonkey/DETAILS
@@ -1,9 +1,8 @@
SPELL=seamonkey
- VERSION=2.13.2
- SECURITY_PATCH=49
- PATCHLEVEL=1
+ VERSION=2.14
+ SECURITY_PATCH=50
SOURCE=$SPELL-$VERSION.source.tar.bz2
-
SOURCE_HASH=sha512:4f47cb1a69ead10b871c2718718b92352fd511e34222caed489bf75eccb4aef392fec4d9e4e28b96ccc55b37a8723335d576548eff0416c6969b6045fd22d43b
+
SOURCE_HASH=sha512:6afeb6d142f17e17786118daef6b1b519ba7d7c5279cd1212c966d0f49cfde70ab0f2f8c0e8687cb08117d075b66631ca87c86b5704ee26672c257d4f22b32dd
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 e230a51..e06b6d8 100644
--- a/http/seamonkey/HISTORY
+++ b/http/seamonkey/HISTORY
@@ -1,3 +1,7 @@
+2012-11-21 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 2.14; SECURITY_PATCH++
+ * mailnews.patch: updated
+
2012-11-04 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: PATCHLEVEL=1
* BUILD: fixed segfault for corei7-avx archspecs
diff --git a/http/seamonkey/mailnews.patch b/http/seamonkey/mailnews.patch
index 2f402a9..cada27d 100644
--- a/http/seamonkey/mailnews.patch
+++ b/http/seamonkey/mailnews.patch
@@ -28,11 +28,11 @@


# Check whether --enable-crypto or --disable-crypto was given.
-@@ -26203,6 +26213,7 @@
- s%@MOZ_DFB@%$MOZ_DFB%g
- s%@MOZ_X11@%$MOZ_X11%g
- s%@MOZ_UI_LOCALE@%$MOZ_UI_LOCALE%g
-+s%@MOZ_MAIL_NEWS@%$MOZ_MAIL_NEWS%g
- s%@MOZ_OFFICIAL_BRANDING@%$MOZ_OFFICIAL_BRANDING%g
- s%@MOZ_BRANDING_DIRECTORY@%$MOZ_BRANDING_DIRECTORY%g
- s%@MOZ_DISTRIBUTION_ID@%$MOZ_DISTRIBUTION_ID%g
+@@ -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 ''')
diff --git a/kernels/bbswitch/DETAILS b/kernels/bbswitch/DETAILS
index 4613894..34cebf3 100755
--- a/kernels/bbswitch/DETAILS
+++ b/kernels/bbswitch/DETAILS
@@ -1,5 +1,6 @@
SPELL=bbswitch
VERSION=0.5
+ PATCHLEVEL=1

SOURCE_HASH=sha512:62326fd194e4b70b8b4c55ffab937336d1c7cfc332f4193ade0219c2e438a926177765214c2c968292b3fcfcf357ea3c9c06c2bf84cfbf0a33480f22ef1c5d5d
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/kernels/bbswitch/HISTORY b/kernels/bbswitch/HISTORY
index 93a82cd..262bd4d 100644
--- a/kernels/bbswitch/HISTORY
+++ b/kernels/bbswitch/HISTORY
@@ -1,2 +1,6 @@
+2012-11-18 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: PATCHLEVEL=1
+ * TRIGGERS: added, to recast on kernel update
+
2012-11-05 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS, BUILD: spell created
diff --git a/kernels/bbswitch/TRIGGERS b/kernels/bbswitch/TRIGGERS
new file mode 100755
index 0000000..5c92593
--- /dev/null
+++ b/kernels/bbswitch/TRIGGERS
@@ -0,0 +1 @@
+on_cast linux cast_self
diff --git a/kernels/linux/HISTORY b/kernels/linux/HISTORY
index 06e84a4..0437720 100644
--- a/kernels/linux/HISTORY
+++ b/kernels/linux/HISTORY
@@ -1,3 +1,14 @@
+2012-11-23 Vlad Glagolev <stealth AT sourcemage.org>
+ * info/patches/maintenance_patches_3/patch-3.4.19: added
+ * info/patches/maintenance_patches_3/patch-3.0.52: added
+
+2012-11-18 Ladislav Hagara <hgr AT vabo.cz>
+ * latest.defaults: LATEST_maintenance_patches_3=patch-3.6.7
+ * info/patches/maintenance_patches_3/patch-3.6.7: added
+
+2012-11-17 Vlad Glagolev <stealth AT sourcemage.org>
+ * info/patches/maintenance_patches_3/patch-3.2.34: added
+
2012-11-05 Vlad Glagolev <stealth AT sourcemage.org>
* info/patches/maintenance_patches_3/patch-3.4.18: added
* info/patches/maintenance_patches_3/patch-3.0.51: added
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.0.52
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.0.52
new file mode 100755
index 0000000..1e7928d
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches_3/patch-3.0.52
@@ -0,0 +1,5 @@
+appliedkernels="3.0"
+patchversion="${appliedkernels}.52"
+source="patch-${patchversion}.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/v3.0/${source}"
+sha1sum="b66089a5add9d1da2c78531c8a63dacc28ee0d76"
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.2.34
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.2.34
new file mode 100755
index 0000000..7e174d4
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches_3/patch-3.2.34
@@ -0,0 +1,5 @@
+appliedkernels="3.2"
+patchversion="${appliedkernels}.34"
+source="patch-${patchversion}.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/v3.x/${source}"
+sha1sum="64f4dafc30a40f4ef52fc9dffcef2cbe23ad3386"
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.4.19
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.4.19
new file mode 100755
index 0000000..9d9f9bc
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches_3/patch-3.4.19
@@ -0,0 +1,5 @@
+appliedkernels="3.4"
+patchversion="${appliedkernels}.19"
+source="patch-${patchversion}.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/v3.x/${source}"
+sha1sum="09f73e30b2fcd1911d297fcae8d5317f2bbf0c81"
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.6.7
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.6.7
new file mode 100755
index 0000000..0351d6d
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches_3/patch-3.6.7
@@ -0,0 +1,5 @@
+appliedkernels="3.6"
+patchversion="${appliedkernels}.7"
+source="patch-${patchversion}.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/v3.x/${source}"
+sha1sum="f4329a73dd2d98e29c8b30b9136f4c0c3b2d0c60"
diff --git a/kernels/linux/latest.defaults b/kernels/linux/latest.defaults
index 69a6cc6..b666dd7 100644
--- a/kernels/linux/latest.defaults
+++ b/kernels/linux/latest.defaults
@@ -2,7 +2,7 @@ LATEST_3=3.6
LATEST_2_6=2.6.39
LATEST_PRE_2_6=patch-2.6.39
LATEST_maintenance_patches=patch-2.6.39.4
-LATEST_maintenance_patches_3=patch-3.6.6
+LATEST_maintenance_patches_3=patch-3.6.7
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/libs/ldns/DETAILS b/libs/ldns/DETAILS
index 69db3bf..af3114d 100755
--- a/libs/ldns/DETAILS
+++ b/libs/ldns/DETAILS
@@ -1,9 +1,9 @@
SPELL=ldns
- VERSION=1.6.13
+ VERSION=1.6.16
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://www.nlnetlabs.nl/downloads/ldns/$SOURCE
-
SOURCE_HASH=sha512:35bc4cd673ea48dc5d08f22ec06b0ceaa1448c9171beeb3989a1a33c95e616694db3a515466e54f1364636dcf48425600cd42541397be9209f165adb445200e1
+
SOURCE_HASH=sha512:ae32abf4fc146b4f8efb7d7751b09f629d28cbcb39d9493e5c00198b862d16274bc1bf6ac68c4fe35f177184bfe71bf68e1e6461c0fe6b6d57855549b08a4515
LICENSE[0]=MIT
WEB_SITE=http://www.nlnetlabs.nl/projects/ldns/
GATHER_DOCS=off
diff --git a/libs/ldns/HISTORY b/libs/ldns/HISTORY
index 0813085..a4d2c03 100644
--- a/libs/ldns/HISTORY
+++ b/libs/ldns/HISTORY
@@ -1,3 +1,6 @@
+2012-11-19 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 1.6.16
+
2012-05-23 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 1.6.13

diff --git a/libs/qjson/DETAILS b/libs/qjson/DETAILS
index 1d508d5..00e26fa 100755
--- a/libs/qjson/DETAILS
+++ b/libs/qjson/DETAILS
@@ -1,9 +1,9 @@
SPELL=qjson
- VERSION=0.7.1
+ VERSION=0.8.0
+
SOURCE_HASH=sha512:370858a267d1849981d45302fe5cc8c2cb23eb68d9708739ba5842af53ac655b7301ab17a3e1cf3f267bc26c8ea4ddf2ae3f3a79bd530df532771286a5fc5eb2
SOURCE="${SPELL}-${VERSION}.tar.bz2"

SOURCE_URL[0]=$SOURCEFORGE_URL/project/${SPELL}/${SPELL}/${VERSION}/${SOURCE}
-
SOURCE_HASH=sha512:a3cba247f0a6d2dff38d6ed9ed1da444969faf79fac7979db325b91bcf89eba8a696e1bd072c56aa5bdaef5180f54762e05a0e131d459944499b711f3b04f62b
-SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}"
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
WEB_SITE="http://qjson.sourceforge.net";
LICENSE[0]=LGPL
ENTERED=20110111
diff --git a/libs/qjson/HISTORY b/libs/qjson/HISTORY
index a4d3d8c..3eef7ce 100644
--- a/libs/qjson/HISTORY
+++ b/libs/qjson/HISTORY
@@ -1,3 +1,6 @@
+2012-11-22 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.8.0
+
2011-01-11 Ismael Luceno <ismael AT sourcemage.org>
* BUILD, DEPENDS, DETAILS: spell created

diff --git a/mail/claws-mail-extra-plugins/DETAILS
b/mail/claws-mail-extra-plugins/DETAILS
index d6c1bb2..a039a53 100755
--- a/mail/claws-mail-extra-plugins/DETAILS
+++ b/mail/claws-mail-extra-plugins/DETAILS
@@ -1,5 +1,5 @@
SPELL=claws-mail-extra-plugins
- VERSION=3.8.1
+ VERSION=3.9.0
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_URL=$SOURCEFORGE_URL/sylpheed-claws/$SOURCE
SOURCE2=${SOURCE}.asc
diff --git a/mail/claws-mail-extra-plugins/HISTORY
b/mail/claws-mail-extra-plugins/HISTORY
index 972202e..d7e94d9 100644
--- a/mail/claws-mail-extra-plugins/HISTORY
+++ b/mail/claws-mail-extra-plugins/HISTORY
@@ -1,3 +1,6 @@
+2012-11-18 Pol Vinogradov <vin.public AT gmail.com>
+ * DETAILS: 3.9.0
+
2012-06-29 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 3.8.1
* CONFIGURE: +pdf_viewer
diff --git a/mail/claws-mail/DETAILS b/mail/claws-mail/DETAILS
index 97a0fe8..e208ce0 100755
--- a/mail/claws-mail/DETAILS
+++ b/mail/claws-mail/DETAILS
@@ -1,5 +1,5 @@
SPELL=claws-mail
- VERSION=3.8.1
+ VERSION=3.9.0
SECURITY_PATCH=1
PATCHLEVEL=0
SOURCE=$SPELL-${VERSION}.tar.bz2
diff --git a/mail/claws-mail/HISTORY b/mail/claws-mail/HISTORY
index 2f64db2..284fa89 100644
--- a/mail/claws-mail/HISTORY
+++ b/mail/claws-mail/HISTORY
@@ -1,3 +1,6 @@
+2012-11-18 Pol Vinogradov <vin.public AT gmail.com>
+ * DETAILS: 3.9.0
+
2012-06-29 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 3.8.1

diff --git a/mail/exim/BUILD b/mail/exim/BUILD
index afbabb3..a36d28e 100755
--- a/mail/exim/BUILD
+++ b/mail/exim/BUILD
@@ -1,33 +1,18 @@
create_account exim &&
create_account mail &&

-mkdir -p $INSTALL_ROOT/var/spool/mail &&
-chmod 1777 $INSTALL_ROOT/var/spool/mail &&
-chown exim:exim $INSTALL_ROOT/var/spool/mail &&
+# always correct permissions for older setups
+install -vm 2775 -d -o exim -g mail "$INSTALL_ROOT/var/spool/mail" &&

-if [[ -e $INSTALL_ROOT/var/spool/mail/db ]]
-then
- chown -R exim:exim $INSTALL_ROOT/var/spool/mail/db
-fi &&
-
-if [[ -e $INSTALL_ROOT/var/spool/mail/input ]]
-then
- chown -R exim:exim $INSTALL_ROOT/var/spool/mail/input
-fi &&
-
-if [[ -e $INSTALL_ROOT/var/spool/mail/log ]]
-then
- chown -R exim:exim $INSTALL_ROOT/var/spool/mail/log
-fi &&
-
-if [[ -e $INSTALL_ROOT/var/spool/mail/msglog ]]
-then
- chown -R exim:exim $INSTALL_ROOT/var/spool/mail/msglog
-fi &&
-
-chgrp -R exim $INSTALL_ROOT/var/spool/mail &&
+for maildir in db input msglog; do
+ if [[ -e $INSTALL_ROOT/var/spool/mail/$maildir ]]; then
+ chown -R exim:exim "$INSTALL_ROOT/var/spool/mail/$maildir"
+ else
+ install -vm 770 -d -o exim -g exim
"$INSTALL_ROOT/var/spool/mail/$maildir"
+ fi
+done &&

-mkdir -p Local &&
+mkdir -vp Local &&

if list_find "$OPTS" '--enable-x11-monitor'; then
cp src/EDITME Local/Makefile &&
@@ -191,5 +176,7 @@ echo "EXIM_GROUP=exim" >>
Local/Makefile &&
echo "PCRE_LIBS=-lpcre" >> Local/Makefile &&

sedit 's:tail \-1:tail \-n 1:' scripts/Configure-config.h &&
-make_single &&
-make
+
+make_single &&
+make &&
+make_normal
diff --git a/mail/exim/DETAILS b/mail/exim/DETAILS
index 6797df4..48f1354 100755
--- a/mail/exim/DETAILS
+++ b/mail/exim/DETAILS
@@ -1,12 +1,12 @@
SPELL=exim
- VERSION=4.77
- SECURITY_PATCH=6
+ VERSION=4.80.1
+ SECURITY_PATCH=7
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE2=$SOURCE.asc
SOURCE_GPG="exim.gpg:$SOURCE2:VERIFIED_UPSTREAM_KEY"
SOURCE2_IGNORE=signature
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
- SOURCE_SUBURI="exim/exim4/old"
+ SOURCE_SUBURI="exim/exim4"
if [[ "$EXIM_MIRRORS" == "austria" ]]; then
SOURCE_URL[0]=ftp://exim.inode.at/$SOURCE_SUBURI/$SOURCE
SOURCE2_URL[0]=ftp://exim.inode.at/$SOURCE_SUBURI/$SOURCE2
diff --git a/mail/exim/FINAL b/mail/exim/FINAL
index 801e9f7..d3bf9fe 100755
--- a/mail/exim/FINAL
+++ b/mail/exim/FINAL
@@ -1,6 +1,3 @@
-chgrp -R mail $INSTALL_ROOT/var/spool/mail &&
-chmod -R g+rw $INSTALL_ROOT/var/spool/mail &&
-
EXIM_SCHEDULE="0 * * * * /usr/sbin/exim -q" &&

if [ "$FCRON" == "y" ]
diff --git a/mail/exim/HISTORY b/mail/exim/HISTORY
index 6c899d9..345683d 100644
--- a/mail/exim/HISTORY
+++ b/mail/exim/HISTORY
@@ -1,3 +1,12 @@
+2012-11-17 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 4.80.1; SECURITY_PATCH++; updated source
uri
+ * PREPARE: added query for 4.80 migration
+ * INSTALL: use 'default_install', corrected typo
+ * FINAL: dropped recursive permission changes
+ * BUILD: moved 'make_normal' here, verbosity++; simplified permission
+ changes for exim-only dirs; changed default permissions on
+ /var/spool/mail from 1777 to safer 2775 for basic security reasons
+
2012-09-20 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS, PREPARE: fixed urls, dropped outdated & broken; quoting
paths

diff --git a/mail/exim/INSTALL b/mail/exim/INSTALL
index 07e1def..98275e0 100755
--- a/mail/exim/INSTALL
+++ b/mail/exim/INSTALL
@@ -1,7 +1,6 @@
-make_normal &&
-make install &&
+default_install &&

-# copy usefull convert tool
+# copy useful convert tool
message "Look @ /usr/doc/exim/doc for convert tools..." &&
cp -v src/convert*.src doc/ &&

diff --git a/mail/exim/PREPARE b/mail/exim/PREPARE
index b0bab5c..7ad2d99 100755
--- a/mail/exim/PREPARE
+++ b/mail/exim/PREPARE
@@ -1,3 +1,21 @@
+. "$GRIMOIRE/FUNCTIONS" &&
+
+local OLD_SPELL_VERSION="" &&
+if spell_ok $SPELL; then
+ OLD_SPELL_VERSION="$(installed_version $SPELL)"
+ if is_version_less "${OLD_SPELL_VERSION}" "4.80"; then
+ message "${PROBLEM_COLOR}" &&
+ message "This is backwards-incompatible update of Exim." &&
+ message "You need to check README.UPDATING file and ChangeLog of Exim
4.80"
+ message "carefully before continuing." &&
+ message "${DEFAULT_COLOR}" &&
+
+ if ! query "Do you wish to upgrade Exim now?" n; then
+ return 1
+ fi
+ fi
+fi &&
+
config_query_list EXIM_MIRRORS \
"Which group of exim mirrors would you like to use?" \
"austria" \
diff --git a/mail/mailx/BUILD b/mail/mailx/BUILD
index 08e266f..79cfd89 100755
--- a/mail/mailx/BUILD
+++ b/mail/mailx/BUILD
@@ -1 +1,3 @@
-make PREFIX="$INSTALL_ROOT/usr" SENDMAIL="$INSTALL_ROOT/usr/sbin/sendmail"
+make_single &&
+make PREFIX="$INSTALL_ROOT/usr" SENDMAIL="$INSTALL_ROOT/usr/sbin/sendmail" &&
+make_normal
diff --git a/mail/mailx/DEPENDS b/mail/mailx/DEPENDS
new file mode 100755
index 0000000..ed472ed
--- /dev/null
+++ b/mail/mailx/DEPENDS
@@ -0,0 +1 @@
+depends openssl
diff --git a/mail/mailx/HISTORY b/mail/mailx/HISTORY
index dbe5962..14fe434 100644
--- a/mail/mailx/HISTORY
+++ b/mail/mailx/HISTORY
@@ -1,3 +1,7 @@
+2012-11-17 Vlad Glagolev <stealth AT sourcemage.org>
+ * DEPENDS: added, for openssl required dependency
+ * BUILD: fixed multijob build
+
2010-04-16 Vlad Glagolev <stealth AT sourcemage.org>
* PRE_BUILD: added, to apply the patch
* openssl-1.patch: added, to fix compilation with openssl 1
diff --git a/mail/masqmail/DETAILS b/mail/masqmail/DETAILS
index aab8643..6dfe039 100755
--- a/mail/masqmail/DETAILS
+++ b/mail/masqmail/DETAILS
@@ -1,5 +1,6 @@
SPELL=masqmail
VERSION=0.3.4
+ PATCHLEVEL=1
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SOURCE.asc
SOURCE_URL[0]=http://marmaro.de/prog/$SPELL/files/$SOURCE
diff --git a/mail/masqmail/HISTORY b/mail/masqmail/HISTORY
index 122d387..5b53f50 100644
--- a/mail/masqmail/HISTORY
+++ b/mail/masqmail/HISTORY
@@ -1,3 +1,8 @@
+2012-11-18 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: PATCHLEVEL=1
+ * INSTALL: set up /var/spool/mail under 'mail' group; changed mode to
+ 2775
+
2012-09-10 Vlad Glagolev <stealth AT sourcemage.org>
* INSTALL: corrected default config installation

diff --git a/mail/masqmail/INSTALL b/mail/masqmail/INSTALL
index 034a598..14b4119 100755
--- a/mail/masqmail/INSTALL
+++ b/mail/masqmail/INSTALL
@@ -9,7 +9,7 @@ ln -vsf "$TRACK_ROOT/usr/sbin/masqmail"
"$INSTALL_ROOT/usr/sbin/mailq" &&
ln -vsf "$TRACK_ROOT/usr/sbin/masqmail" "$INSTALL_ROOT/usr/sbin/runq" &&
ln -vsf "$TRACK_ROOT/usr/sbin/masqmail" "$INSTALL_ROOT/usr/sbin/mailrm" &&

-install -vm 1777 -d -o masqmail -g masqmail "$INSTALL_ROOT/var/spool/mail" &&
+install -vm 2775 -d -o masqmail -g mail "$INSTALL_ROOT/var/spool/mail" &&

if [[ -e $INSTALL_ROOT/var/spool/mail/input ]]; then
chown -R masqmail:masqmail "$INSTALL_ROOT/var/spool/mail/input"
diff --git a/net/chrony/HISTORY b/net/chrony/HISTORY
index d08d368..b026b83 100644
--- a/net/chrony/HISTORY
+++ b/net/chrony/HISTORY
@@ -1,3 +1,7 @@
+2012-11-21 Vlad Glagolev <stealth AT sourcemage.org>
+ * PRE_BUILD: added, to apply the patch
+ * no-ipv6.patch: added, to fix build without IPv6 support
+
2011-10-14 Bor Kraljič <pyrobor AT ver.si>
* DETAILS: fixed long description wrap (scripted)

diff --git a/net/chrony/PRE_BUILD b/net/chrony/PRE_BUILD
new file mode 100755
index 0000000..25482b9
--- /dev/null
+++ b/net/chrony/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+
+patch -p0 < "$SPELL_DIRECTORY/no-ipv6.patch"
diff --git a/net/chrony/no-ipv6.patch b/net/chrony/no-ipv6.patch
new file mode 100644
index 0000000..0f13a0f
--- /dev/null
+++ b/net/chrony/no-ipv6.patch
@@ -0,0 +1,20 @@
+--- ntp_io.c.orig 2011-07-13 16:55:28.000000000 +0400
++++ ntp_io.c 2012-11-21 17:44:29.000000000 +0400
+@@ -355,7 +355,7 @@
+ }
+ #endif
+
+-#ifdef IPV6_PKTINFO
++#if defined(IPV6_PKTINFO) && defined(HAVE_IPV6)
+ if (cmsg->cmsg_level == IPPROTO_IPV6 && cmsg->cmsg_type ==
IPV6_PKTINFO) {
+ struct in6_pktinfo ipi;
+
+@@ -466,7 +466,7 @@
+ }
+ #endif
+
+-#ifdef IPV6_PKTINFO
++#if defined(IPV6_PKTINFO) && defined(HAVE_IPV6)
+ if (remote_addr->local_ip_addr.family == IPADDR_INET6) {
+ struct cmsghdr *cmsg;
+ struct in6_pktinfo *ipi;
diff --git a/net/libproxy/BUILD b/net/libproxy/BUILD
index 1a1ed52..3bed602 100755
--- a/net/libproxy/BUILD
+++ b/net/libproxy/BUILD
@@ -1,5 +1,5 @@
if [ "$LIBPROXY_WEBKIT" == "none" ]; then
- OPTS="-DWITH_WEBKIT=0 $OPTS"
+ OPTS="-DWITH_WEBKIT=0 $OPTS"
fi &&

cmake_build
diff --git a/net/libproxy/DETAILS b/net/libproxy/DETAILS
index 94b9795..119376b 100755
--- a/net/libproxy/DETAILS
+++ b/net/libproxy/DETAILS
@@ -1,5 +1,6 @@
SPELL=libproxy
VERSION=0.4.10
+ SECURITY_PATCH=1

SOURCE_HASH=sha512:d7400740290bffb66ced317692f6b6fdb3e9973e48af1287df51dd3813706164ac6ee6970bde0f7b28beed4a6b6086bf957d85ec8c543e4c0af7044defb88e82
SOURCE="${SPELL}-${VERSION}.tar.gz"
SOURCE_URL[0]=http://libproxy.googlecode.com/files/${SOURCE}
diff --git a/net/libproxy/HISTORY b/net/libproxy/HISTORY
index 1233c01..16dd4cb 100644
--- a/net/libproxy/HISTORY
+++ b/net/libproxy/HISTORY
@@ -1,3 +1,8 @@
+2012-11-17 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: this was a security update (at least CVE-2012-4504);
+ SECURITY_PATCH=1
+ * BUILD: cleaned up
+
2012-11-16 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.4.10
* PRE_BUILD, unistd.patch: deleted
diff --git a/php-pear/php/DETAILS b/php-pear/php/DETAILS
index 5114f97..6c07afa 100755
--- a/php-pear/php/DETAILS
+++ b/php-pear/php/DETAILS
@@ -23,7 +23,7 @@ elif [[ $PHP5_BRANCH == alpha ]]; then
SECURITY_PATCH=19
elif [[ $PHP5_BRANCH == legacy ]]; then
VERSION=5.2.17
- SECURITY_PATCH=20
+ SECURITY_PATCH=21

SOURCE_HASH=sha512:baf3b5038468c9fa7c1a9e0506ed23559c21ba8df29380498a24e8d31c4c5f3633f29b1bc2faa3e59c6e5336536c09e19a5462b0a9d5916181c08f1f19abbca8
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_URL[0]=http://static.php.net/www.php.net/distributions/$SOURCE
@@ -37,9 +37,9 @@ elif [[ $PHP5_BRANCH == legacy ]]; then
SOURCE3_URL="http://download.suhosin.org/$SOURCE3";
SOURCE2_GPG="suhosin.gpg:$SOURCE3:UPSTREAM_KEY"
fi
- SOURCE4=php52-backports-20120924.patch
+ SOURCE4=php52-backports-20121114.patch
SOURCE4_URL=http://php52-backports.googlecode.com/files/$SOURCE4
-
SOURCE4_HASH=sha512:1753ebbe9c5abadc13dc84ad1cb3baa7369489691016eb4a49fa51120fc7eeb9971ece34767ce4659b4b35b2b9744d7d84c20cf1ba84acab015650c7a1fd9d96
+
SOURCE4_HASH=sha512:cce9b47afd100ff0b650972fa6c7b0ed1c255da95bb8427238d336fee05fc7125cf9aacf5b9503986c3c45d57ca075e5b805dd0a2eb857917281ae4c4d715fad
else
VERSION=5.3.17
SECURITY_PATCH=19
diff --git a/php-pear/php/HISTORY b/php-pear/php/HISTORY
index 85bd433..0027eb6 100644
--- a/php-pear/php/HISTORY
+++ b/php-pear/php/HISTORY
@@ -1,3 +1,7 @@
+2012-11-23 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated backports+security patches to 20121114;
+ SECUIRTY_PATCH++
+
2012-10-03 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated backports+security patches to 20120924;
SECUIRTY_PATCH++
diff --git a/python-pypi/cython/DETAILS b/python-pypi/cython/DETAILS
index dce301e..4a18c8c 100755
--- a/python-pypi/cython/DETAILS
+++ b/python-pypi/cython/DETAILS
@@ -1,6 +1,6 @@
SPELL=cython
- VERSION=0.17.1
-
SOURCE_HASH=sha512:eda1b8090e5e21e7e039ef4dd03de186a7b416df9d5a4e4422abeeb4d51383b9a6858e1ac4902d8e5010f661b295bbb2452c43c8738be668379b4eb4835d0f61
+ VERSION=0.17.2
+
SOURCE_HASH=sha512:03b4d03ff848b660b9a0e0c39bb48173945c013b7bfc8b32638633d7bbeaaae6ac1cb2c26ddd6ae3f15303cae8c49b611501cc7dbc23def193b4dfada7efd4fa
SOURCE=Cython-${VERSION}.tar.gz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/Cython-${VERSION}"
SOURCE_URL[0]=http://www.cython.org/release/${SOURCE}
diff --git a/python-pypi/cython/HISTORY b/python-pypi/cython/HISTORY
index 33e78ca..d3c9c08 100644
--- a/python-pypi/cython/HISTORY
+++ b/python-pypi/cython/HISTORY
@@ -1,3 +1,6 @@
+2012-11-22 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.17.2
+
2012-10-04 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.17.1

diff --git a/python-pypi/dulwich/DETAILS b/python-pypi/dulwich/DETAILS
index e35f2e1..3e95f2a 100755
--- a/python-pypi/dulwich/DETAILS
+++ b/python-pypi/dulwich/DETAILS
@@ -1,6 +1,6 @@
SPELL=dulwich
- VERSION=0.8.5
-
SOURCE_HASH=sha512:9914b711dc0f699097a65cb4fe137d1b4e0ae9b3c0e1bb75791e891fa0f9a6bd25433523c5d7a70c65697b1e6c12d79bc82a8da3104f513198924fd32373defb
+ VERSION=0.8.6
+
SOURCE_HASH=sha512:fc49dbd468ee67bd8589db246445a4ab636c3c4ba522b50653f69446395b9273279b65691076924572d3615f4cacbfb9e37d2a6c51fdc8dac5aaff52ea209887
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
WEB_SITE=http://samba.org/~jelmer/dulwich
diff --git a/python-pypi/dulwich/HISTORY b/python-pypi/dulwich/HISTORY
index 0e6fa48..0aed719 100644
--- a/python-pypi/dulwich/HISTORY
+++ b/python-pypi/dulwich/HISTORY
@@ -1,3 +1,6 @@
+2012-11-20 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.8.6
+
2012-03-31 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.8.5

diff --git a/python-pypi/hg-git/DETAILS b/python-pypi/hg-git/DETAILS
index ff694af..bd4f8da 100755
--- a/python-pypi/hg-git/DETAILS
+++ b/python-pypi/hg-git/DETAILS
@@ -1,6 +1,6 @@
SPELL=hg-git
- VERSION=0.3.2
-
SOURCE_HASH=sha512:d0c5793b4383f69a908c678f5d73983919c767c83438b35cefde93c80c253d93691dae58b9916d9379614156327d62991a113a139d217e88f802ea35b9b7b3e6
+ VERSION=0.3.4
+
SOURCE_HASH=sha512:a60013f15348d5c57d73187edad9fc37765300407d9ece5069c36c04cc4d0d7f624fb5b820eb523c8a5f8276526a52ca54bdf6726bb8e74694eddbe9f85e4445
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
WEB_SITE=http://hg-git.github.com/
diff --git a/python-pypi/hg-git/HISTORY b/python-pypi/hg-git/HISTORY
index de81af1..382f4f1 100644
--- a/python-pypi/hg-git/HISTORY
+++ b/python-pypi/hg-git/HISTORY
@@ -1,3 +1,6 @@
+2012-11-20 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.3.4
+
2012-02-02 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.3.2

diff --git a/python-pypi/reportlab/DETAILS b/python-pypi/reportlab/DETAILS
index dc22587..eaf1920 100755
--- a/python-pypi/reportlab/DETAILS
+++ b/python-pypi/reportlab/DETAILS
@@ -1,9 +1,9 @@
SPELL=reportlab
- VERSION=2.5
-
SOURCE_HASH=sha512:9fd043aeb94e1531156b40766e262af2976ef1f55009eaf42ea713d8cde0452ed1c17bbb98d28babf24177552ef9a1d2e9d149ac1f4db904ab806c20114f8766
+ VERSION=2.6
+
SOURCE_HASH=sha512:d1173231ec6924c225808607edd287b11095cda1856554ff42efb5911285b766f43b79d8747ea2867221aa5c158455ee864dbe903ceffeae535938d2fef59131
SOURCE=$SPELL-${VERSION}.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- WEB_SITE=http://www.reportlab.org
+ WEB_SITE=http://www.reportlab.com
SOURCE_URL[0]=$WEB_SITE/ftp/$SOURCE
SOURCE_URL[1]=http://pypi.python.org/packages/source/r/reportlab/$SOURCE
ENTERED=20040122
diff --git a/python-pypi/reportlab/HISTORY b/python-pypi/reportlab/HISTORY
index 89b9f22..e5c2739 100644
--- a/python-pypi/reportlab/HISTORY
+++ b/python-pypi/reportlab/HISTORY
@@ -1,3 +1,7 @@
+2012-11-16 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 2.6
+ new WEB_SITE
+
2011-10-14 Bor Kraljič <pyrobor AT ver.si>
* DETAILS: fixed long description wrap (scripted)

diff --git a/python-pypi/roundup/DETAILS b/python-pypi/roundup/DETAILS
index 5b77700..dcfa844 100755
--- a/python-pypi/roundup/DETAILS
+++ b/python-pypi/roundup/DETAILS
@@ -1,8 +1,9 @@
SPELL=roundup
- VERSION=1.4.19
+ VERSION=1.4.20
+ SECURITY_PATCH=1
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_URL[0]=http://pypi.python.org/packages/source/r/$SPELL/$SOURCE
-
SOURCE_HASH=sha512:497cad23e1074e535cf2729d52f07ec2103c89e5c0927be678f02299c036dac6dc262fe909310e066588f00144151b98b55a7dfd8c1df28680f99fecc255236e
+
SOURCE_HASH=sha512:62a1ca744afb7e17a4e165d695e1623d73810a3d3e6c374a4b73d010fcc3e93756ca0bfb6dc4cf7937acd1156c4b938e881e2e9ffd9b0c8e4c4366b730cc43b1
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
WEB_SITE=http://roundup.sourceforge.net/
LICENSE[0]=PYTHON
diff --git a/python-pypi/roundup/HISTORY b/python-pypi/roundup/HISTORY
index 3c1016e..ac65baf 100644
--- a/python-pypi/roundup/HISTORY
+++ b/python-pypi/roundup/HISTORY
@@ -1,3 +1,6 @@
+2012-11-17 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 1.4.20; SECURITY_PATCH++
+
2011-07-16 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 1.4.19

diff --git a/utils/colordiff/DETAILS b/utils/colordiff/DETAILS
index ac01f36..c7a0978 100755
--- a/utils/colordiff/DETAILS
+++ b/utils/colordiff/DETAILS
@@ -1,9 +1,9 @@
SPELL=colordiff
- VERSION=1.0.12
+ VERSION=1.0.13
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://www.colordiff.org/$SOURCE
-
SOURCE_HASH=sha512:d3e8fd354007752b32500ae9b80c8a4ca120b438d7fbaa747f61e109221a5c2f947773ef1d36afab11f95d10be05a1ab06edb12496c42f7acf6733b614bcff50
+
SOURCE_HASH=sha512:8a47ea9e0c703d6b577a01e9a63df58233f752d4e72bb7f8213fcc076efcc52869df5e694126abbdc8a63816010786a577fa37ed3e175162dece3f17bd79fdda
WEB_SITE=http://www.colordiff.org/
ENTERED=20050902
LICENSE[0]=GPL
diff --git a/utils/colordiff/HISTORY b/utils/colordiff/HISTORY
index 93280ce..1510309 100644
--- a/utils/colordiff/HISTORY
+++ b/utils/colordiff/HISTORY
@@ -1,3 +1,6 @@
+2012-11-24 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 1.0.13
+
2012-11-13 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.0.12, WEB_SITE and SOURCE_URL[0] updated

diff --git a/utils/cronie/CONFIGURE b/utils/cronie/CONFIGURE
index da7ffa2..b95f832 100755
--- a/utils/cronie/CONFIGURE
+++ b/utils/cronie/CONFIGURE
@@ -1,6 +1,10 @@
config_query_option CRONIE_OPTS "Enable inotify support?" n \
"--with-inotify" \
- "--without-inotify"
+ "--without-inotify" &&
+
+config_query_option CRONIE_OPTS "Enable system crontab support?" n \
+ "--with-syscrontab" \
+ "--without-syscrontab" &&

config_query_option CRONIE_OPTS "Enable Anacron support?" n \
"--enable-anacron" \
diff --git a/utils/cronie/DEPENDS b/utils/cronie/DEPENDS
index 9c22c0f..36da2a7 100755
--- a/utils/cronie/DEPENDS
+++ b/utils/cronie/DEPENDS
@@ -1,6 +1,6 @@
-optional_depends MAIL-TRANSPORT-AGENT \
- "" "" \
- "for sending reports" &&
+suggest_depends MAIL-TRANSPORT-AGENT \
+ "" "" \
+ "for sending reports" &&

optional_depends linux-pam \
"--with-pam" \
diff --git a/utils/cronie/DETAILS b/utils/cronie/DETAILS
index 0ed0eb8..cbe7337 100755
--- a/utils/cronie/DETAILS
+++ b/utils/cronie/DETAILS
@@ -1,9 +1,9 @@
SPELL=cronie
- VERSION=1.4.8
+ VERSION=1.4.9
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_URL[0]=https://fedorahosted.org/releases/c/r/$SPELL/$SOURCE
SOURCE_HINTS="no-check-certificate"
-
SOURCE_HASH=sha512:e2fd54910ffc233c24f3a0e6dce3b845b74b36c42cfd7cbae614201bc8f024a04b7c12dc82b43cd4a8f1dbf49c2dc96a5e0539ef58a936f11dc13c2269564eeb
+
SOURCE_HASH=sha512:932684fb982e273f63828ec71397f4bfa27c6a0559a63d797fcc38f53ec0fcdeb6708c542f9ec952a54e1218ae6cf3aa7c3a7e5c485bb08ce77e2a6549cc46b7
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
WEB_SITE=https://fedorahosted.org/cronie/
LICENSE[0]=ISC
diff --git a/utils/cronie/HISTORY b/utils/cronie/HISTORY
index c560d4f..c1eecda 100644
--- a/utils/cronie/HISTORY
+++ b/utils/cronie/HISTORY
@@ -1,3 +1,9 @@
+2012-11-25 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 1.4.9
+ * CONFIGURE: added option for syscrontab support
+ * INSTALL: /etc/crontab is optional
+ * DEPENDS: optional -> suggest for MTA
+
2011-07-02 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 1.4.8

diff --git a/utils/cronie/INSTALL b/utils/cronie/INSTALL
index 8a38600..ab2a472 100755
--- a/utils/cronie/INSTALL
+++ b/utils/cronie/INSTALL
@@ -11,4 +11,6 @@ fi &&
install -vm 755 -d "$INSTALL_ROOT/etc/cron.d" &&
install -vm 770 -o daemon -g crontab -d "$INSTALL_ROOT/var/spool/cron" &&

-install_config_file "$SPELL_DIRECTORY/crontab" "$INSTALL_ROOT/etc/crontab"
+if list_find "$CRONIE_OPTS" "--with-syscrontab"; then
+ install_config_file "$SPELL_DIRECTORY/crontab" "$INSTALL_ROOT/etc/crontab"
+fi
diff --git a/utils/schroot/BUILD b/utils/schroot/BUILD
index 61d03a7..10f70e0 100755
--- a/utils/schroot/BUILD
+++ b/utils/schroot/BUILD
@@ -1,2 +1,2 @@
-OPTS+='--enable-shared ' &&
+OPTS+=' --enable-shared' &&
default_build
diff --git a/utils/schroot/HISTORY b/utils/schroot/HISTORY
index c505ebc..264fce6 100644
--- a/utils/schroot/HISTORY
+++ b/utils/schroot/HISTORY
@@ -1,3 +1,6 @@
+2012-11-16 Ismael Luceno <ismael.luceno AT gmail.com>
+ * BUILD: Fixed OPTS
+
2012-08-13 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.5.3
* DEPENDS: linux-pam is optional, add e2fsprogs, doxygen
diff --git a/utils/xen/DETAILS b/utils/xen/DETAILS
index e04dcd6..b6a56f2 100755
--- a/utils/xen/DETAILS
+++ b/utils/xen/DETAILS
@@ -1,6 +1,6 @@
SPELL=xen
VERSION=4.1.3
- SECURITY_PATCH=2
+ SECURITY_PATCH=3
SOURCE=${SPELL}-${VERSION}.tar.gz
SOURCE2=$SOURCE.sig
SOURCE2_IGNORE=signature
diff --git a/utils/xen/HISTORY b/utils/xen/HISTORY
index 7ce226d..72ba730 100644
--- a/utils/xen/HISTORY
+++ b/utils/xen/HISTORY
@@ -1,3 +1,10 @@
+2012-11-17 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: SECURITY_PATCH++
+ * PRE_BUILD: apply patches
+ * xsa-{20-25}.patch: added, to fix CVE-2012-4535, CVE-2012-4536,
+ CVE-2012-4537, CVE-2012-4538, CVE-2012-4539, CVE-2012-4544,
+ CVE-2012-2625
+
2012-08-19 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: SECURITY_PATCH++
* xsa-19.patch: added, to fix CVE-2012-4411
diff --git a/utils/xen/PRE_BUILD b/utils/xen/PRE_BUILD
index 4a7ade4..ec73184 100755
--- a/utils/xen/PRE_BUILD
+++ b/utils/xen/PRE_BUILD
@@ -2,6 +2,12 @@ default_pre_build &&
cd ${SOURCE_DIRECTORY} &&

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" &&

if [[ $XEN_UPINIT != y ]]; then
sedit "s:all install-initd:all:" tools/hotplug/Linux/Makefile
diff --git a/utils/xen/xsa-20.patch b/utils/xen/xsa-20.patch
new file mode 100644
index 0000000..bedd318
--- /dev/null
+++ b/utils/xen/xsa-20.patch
@@ -0,0 +1,38 @@
+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
new file mode 100644
index 0000000..14158ef
--- /dev/null
+++ b/utils/xen/xsa-21.patch
@@ -0,0 +1,31 @@
+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
new file mode 100644
index 0000000..bb2b88e
--- /dev/null
+++ b/utils/xen/xsa-22.patch
@@ -0,0 +1,40 @@
+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
new file mode 100644
index 0000000..82cb8b9
--- /dev/null
+++ b/utils/xen/xsa-23.patch
@@ -0,0 +1,32 @@
+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
new file mode 100644
index 0000000..e46f513
--- /dev/null
+++ b/utils/xen/xsa-24.patch
@@ -0,0 +1,26 @@
+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
new file mode 100644
index 0000000..f8a9be2
--- /dev/null
+++ b/utils/xen/xsa-25.patch
@@ -0,0 +1,461 @@
+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/video/eviacam/DETAILS b/video/eviacam/DETAILS
index 57e645a..8513fd0 100755
--- a/video/eviacam/DETAILS
+++ b/video/eviacam/DETAILS
@@ -1,8 +1,8 @@
SPELL=eviacam
- VERSION=1.5.4
+ VERSION=1.6.0
SOURCE=${SPELL}_${VERSION}.orig.tar.gz
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
-
SOURCE_HASH=sha512:991a30b8fcb8df8697d7dce44135070bdb5b5b8f6218cc86f62fb3ebb8905cd502514d8327250f95e4cf22b3899bcde5816e5ae1efd0c85010ccbe606cbcb5bb
+
SOURCE_HASH=sha512:066a4b7ed5403a7d17e4cd5e27b9159e9ab4e4fe8820fecbe18db356b32d002195158dec443191e37781b50eee09c3b2001fcafd6c8b25b3531cfde796acd95c
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
WEB_SITE=http://eviacam.sourceforge.net/
LICENSE[0]=GPL
diff --git a/video/eviacam/HISTORY b/video/eviacam/HISTORY
index 014a45d..a412968 100644
--- a/video/eviacam/HISTORY
+++ b/video/eviacam/HISTORY
@@ -1,3 +1,6 @@
+2012-11-18 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 1.6.0
+
2012-09-07 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS, DEPENDS, PRE_BUILD, 01-visionpipeline.patch: spell created,
version 1.5.4, patch from Arch
diff --git a/wm-addons/xxkb/DETAILS b/wm-addons/xxkb/DETAILS
index 259d9ce..4264b4c 100755
--- a/wm-addons/xxkb/DETAILS
+++ b/wm-addons/xxkb/DETAILS
@@ -1,6 +1,6 @@
SPELL=xxkb
VERSION=1.11
- PATCHLEVEL=1
+ PATCHLEVEL=2
SOURCE=$SPELL-$VERSION-src.tar.gz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL"
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
diff --git a/wm-addons/xxkb/HISTORY b/wm-addons/xxkb/HISTORY
index 16c8154..102e836 100644
--- a/wm-addons/xxkb/HISTORY
+++ b/wm-addons/xxkb/HISTORY
@@ -1,3 +1,9 @@
+2012-11-23 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: PATCHLEVEL++
+ * PRE_BUILD: apply the patch
+ * missing_init.patch: added, to fix some memory issue that leads to
+ crash
+
2012-07-24 Vlad Glagolev <stealth AT sourcemage.org>
* DEPENDS: added missing imake dependency

diff --git a/wm-addons/xxkb/PRE_BUILD b/wm-addons/xxkb/PRE_BUILD
index a69a2e0..843aa59 100755
--- a/wm-addons/xxkb/PRE_BUILD
+++ b/wm-addons/xxkb/PRE_BUILD
@@ -1,4 +1,5 @@
default_pre_build &&
cd "$SOURCE_DIRECTORY" &&

+patch -p0 < "$SPELL_DIRECTORY/missing_init.patch" &&
patch -p0 < "$SPELL_DIRECTORY/imake.patch"
diff --git a/wm-addons/xxkb/missing_init.patch
b/wm-addons/xxkb/missing_init.patch
new file mode 100644
index 0000000..52ea883
--- /dev/null
+++ b/wm-addons/xxkb/missing_init.patch
@@ -0,0 +1,22 @@
+--- xxkb.c 2012-03-06 17:49:02.888079235 +0200
++++ xxkb_fixed.c 2012-03-06 17:48:58.712462301 +0200
+@@ -667,12 +667,14 @@
+ Window rwin, parent, *children;
+ int num;
+
+- XQueryTree(dpy, temp_win, &rwin,
&parent, &children, &num);
+- AddWindow(temp_win, parent);
++ if (XQueryTree(dpy, temp_win, &rwin,
&parent, &children, &num) != 0)
++ {
++ AddWindow(temp_win, parent);
+
+- if (children != None) {
+- XFree(children);
+- }
++ if (children != None) {
++ XFree(children);
++ }
++ }
+ }
+ break;
+
diff --git a/xfce/exo/DEPENDS b/xfce/exo/DEPENDS
index dfc163f..21e8676 100755
--- a/xfce/exo/DEPENDS
+++ b/xfce/exo/DEPENDS
@@ -3,15 +3,6 @@ depends libxfce4util &&
depends libxfce4ui &&
depends uri &&

-optional_depends pygtk2 \
- "--enable-python" \
- "--disable-python" \
- "for Python bindings" &&
-
-if is_depends_enabled $SPELL pygtk2; then
- depends python
-fi &&
-
optional_depends gettext \
"--enable-nls" \
"--disable-nls" \
@@ -20,9 +11,4 @@ optional_depends gettext \
optional_depends gtk-doc \
"--enable-gtk-doc" \
"--disable-gtk-doc" \
- "use gtk-doc to build documentation" &&
-
-optional_depends gnome-doc-utils \
- "--enable-gen-doc" \
- "--disable-gen-doc" \
- "to generate HTML documentation"
+ "use gtk-doc to build documentation"
diff --git a/xfce/exo/DETAILS b/xfce/exo/DETAILS
index d199536..c30ef59 100755
--- a/xfce/exo/DETAILS
+++ b/xfce/exo/DETAILS
@@ -1,10 +1,10 @@
SPELL=exo
- VERSION=0.8.0
+ VERSION=0.9.1
BRANCH=`echo $VERSION | cut -d . -f 1,2`
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=http://archive.xfce.org/src/xfce/$SPELL/$BRANCH/$SOURCE
-
SOURCE_HASH=sha512:28b7ad276f0efdb519145c7e09e8fd88e7c28dea67e0c9cb5384703e126cd935dad86d57ea207ea7c5d6d1d6838ed54c55b72e2a68095e79c743fddb0081cbf4
+
SOURCE_HASH=sha512:c77c1e8e101894afcdee67180ff5047fb4b74c5819fb640e81981f03a59ed6df091bcb94e4a1b35e6642010ea25e39645911afda89e3f707cf40f4c5aae44d94
WEB_SITE=http://thunar.xfce.org/
ENTERED=20050101
LICENSE=LGPL
diff --git a/xfce/exo/HISTORY b/xfce/exo/HISTORY
index 4299c76..9395c08 100644
--- a/xfce/exo/HISTORY
+++ b/xfce/exo/HISTORY
@@ -1,3 +1,7 @@
+2012-11-24 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 0.9.1
+ * DEPENDS: dropped deprecated dependencies
+
2012-05-10 Eric Sandall <sandalle AT sourcemage.org>
* DEPENDS: 0.8.x requires libxfce4ui

diff --git a/xfce/thunar/DEPENDS b/xfce/thunar/DEPENDS
index 3b699b0..89d1064 100755
--- a/xfce/thunar/DEPENDS
+++ b/xfce/thunar/DEPENDS
@@ -52,9 +52,4 @@ optional_depends libnotify \
optional_depends startup-notification \
"--enable-startup-notification" \
"--disable-startup-notification" \
- "for startup notification library support" &&
-
-optional_depends gnome-doc-utils \
- "--enable-gen-doc" \
- "--disable-gen-doc" \
- "to generate HTML documentation"
+ "for startup notification library support"
diff --git a/xfce/thunar/DETAILS b/xfce/thunar/DETAILS
index 2498dc9..ee7cfa4 100755
--- a/xfce/thunar/DETAILS
+++ b/xfce/thunar/DETAILS
@@ -1,11 +1,11 @@
SPELL=thunar
- VERSION=1.4.0
+ VERSION=1.5.2
BRANCH=`echo $VERSION | cut -d . -f 1,2`
SOURCE=Thunar-$VERSION.tar.bz2
SOURCE_DIRECTORY="$BUILD_DIRECTORY/Thunar-$VERSION"
SOURCE_URL[0]=http://archive.xfce.org/src/xfce/$SPELL/$BRANCH/$SOURCE
WEB_SITE=http://thunar.xfce.org/
-
SOURCE_HASH=sha512:43e805fe8a870542abf1544174aea854ee48dea521fd5024531a4a500e609e7b919f42b1d0311278d33538e082d58e6f958ed0ce713a3d33fbeeab82907ff00f
+
SOURCE_HASH=sha512:d7ab13245db59e37b8c71ede15a076127746be6a3119e0ef65a996ac260476c483513e310fd236fafc46bd8ee8d5617a9fbdfeb5225b6dba5ccc111ed55ef6c2
LICENSE[0]=GPL
LICENSE[1]=LGPL
ENTERED=20030608
diff --git a/xfce/thunar/HISTORY b/xfce/thunar/HISTORY
index 8eb0fce..95eb5db 100644
--- a/xfce/thunar/HISTORY
+++ b/xfce/thunar/HISTORY
@@ -1,3 +1,7 @@
+2012-11-24 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 1.5.2
+ * DEPENDS: dropped deprecated dependencies
+
2012-04-29 Ismael Luceno <ismael AT sourcemage.org>
* DETAILS: updated spell to 1.4.0




  • [SM-Commit] GIT changes to devel-icu grimoire by Treeve Jelbert (b826ffb63ecc8058b330dee40ec76b45b43bd807), Treeve Jelbert, 11/25/2012

Archive powered by MHonArc 2.6.24.

Top of Page