Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to stable-rc-0.61 grimoire by Vlad Glagolev (a6cdb3bd69125855e0fa951a60df861fb7db7f2a)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Vlad Glagolev <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to stable-rc-0.61 grimoire by Vlad Glagolev (a6cdb3bd69125855e0fa951a60df861fb7db7f2a)
  • Date: Thu, 14 Jun 2012 03:42:21 -0500

GIT changes to stable-rc-0.61 grimoire by Vlad Glagolev
<stealth AT sourcemage.org>:

ChangeLog | 16
audio-players/mpd/DEPENDS | 6
audio-players/mpd/HISTORY | 3
chat-irc/xchat/0001-fix-build-with-glib-version-2.32.patch | 16
chat-irc/xchat/HISTORY | 5
chat-libs/loudmouth/HISTORY | 3
chat-libs/loudmouth/PRE_BUILD | 3
crypto/cyrus-sasl/DEPENDS | 7
crypto/cyrus-sasl/HISTORY | 5
crypto/cyrus-sasl/PRE_BUILD | 1
crypto/cyrus-sasl/sqlite.patch | 26
crypto/openssl/HISTORY | 3
crypto/openssl/UP_TRIGGERS | 4
database/ibpp/DETAILS | 2
database/ibpp/HISTORY | 3
database/mariadb/DEPENDS | 7
database/mariadb/DETAILS | 5
database/mariadb/HISTORY | 4
database/postgresql/DETAILS | 6
database/postgresql/HISTORY | 3
dev/null |binary
devel/iasl/DETAILS | 7
devel/iasl/HISTORY | 3
disk/btrfs-progs/BUILD | 3
disk/btrfs-progs/DEPENDS | 2
disk/btrfs-progs/DETAILS | 15
disk/btrfs-progs/HISTORY | 5
disk/btrfs-progs/PREPARE | 2
disk/udisks/DEPENDS | 1
disk/udisks/HISTORY | 3
doc/man/DETAILS | 1
doc/man/HISTORY | 5
doc/man/configs | 2
doc/man/volatiles | 1
excluded | 1
ftp/curl/DETAILS | 6
ftp/curl/HISTORY | 3
gnome2-apps/abiword/HISTORY | 3
gnome2-apps/abiword/PRE_BUILD | 4
gnome2-libs/glib-networking/DEPENDS | 11
gnome2-libs/glib-networking/DETAILS | 2
gnome2-libs/glib-networking/HISTORY | 7
gnome2-libs/glib-networking/PRE_SUB_DEPENDS | 5
gnome2-libs/glib-networking/REPAIR^all^PRE_SUB_DEPENDS | 5
gnome2-libs/glib-networking/SUB_DEPENDS | 6
gnome2-libs/glib-networking/glib-networking-2.32.1.tar.xz.sig | 0
gnome2-libs/glib-networking/glib-networking-2.32.3.tar.xz.sig |binary
gnome2-libs/gnome-python-desktop/HISTORY | 4
gnome2-libs/gnome-python-desktop/PRE_BUILD | 4
gnome2-libs/gnome-python-desktop/metacity-2.34.2.patch | 45 +
gnome2-libs/goffice/HISTORY | 3
gnome2-libs/goffice/PRE_BUILD | 4
gnome2-libs/gvfs/DEPENDS | 8
gnome2-libs/gvfs/DETAILS | 2
gnome2-libs/gvfs/HISTORY | 6
gnome2-libs/gvfs/gvfs-1.12.1.tar.xz.sig | 0
gnome2-libs/gvfs/gvfs-1.12.3.tar.xz.sig |binary
gnome2-libs/intltool/DEPENDS | 3
gnome2-libs/intltool/HISTORY | 3
gnome2-libs/libglade2/DEPENDS | 1
gnome2-libs/libglade2/HISTORY | 3
gnome2-libs/libsoup/DEPENDS | 7
gnome2-libs/libsoup/HISTORY | 3
gnome2-libs/pygobject/BUILD | 3
gnome2-libs/pygobject/DEPENDS | 19
gnome2-libs/pygobject/HISTORY | 12
gnome2-libs/pygobject/PRE_BUILD | 4
gnome2-libs/pygobject/introspection.patch | 28
gnome3-libs/pygobject3/HISTORY | 11
gnome3-libs/pygobject3/UP_TRIGGERS | 5
graphics/bins/DEPENDS | 2
graphics/bins/HISTORY | 3
graphics/libgphoto2/DEPENDS | 2
graphics/libgphoto2/HISTORY | 3
http/apache22/HISTORY | 3
http/apache22/PRE_BUILD | 3
http/apache22/pcre830.patch | 20
http/firefox/DETAILS | 6
http/firefox/HISTORY | 5
http/firefox/PRE_BUILD | 2
http/firefox/mozconfig | 31
http/firefox/mozconfig5 | 30
http/seamonkey/DETAILS | 6
http/seamonkey/HISTORY | 5
http/seamonkey/PRE_BUILD | 4
http/seamonkey/seamonkey-2.9_gcc-4.7-1.patch | 320
----------
http/surf/HISTORY | 4
http/surf/PRE_BUILD | 8
kernel.gpg |binary
libs/glibc/DETAILS | 36 -
libs/glibc/HISTORY | 5
libs/glibc/PRE_BUILD | 34 -
libs/libevent/DETAILS | 2
libs/libevent/HISTORY | 6
libs/libevent/UP_TRIGGERS | 4
libs/libvdpau/DETAILS | 1
libs/libvdpau/HISTORY | 3
libs/libxml2/CVE-2011-0216.patch | 31
libs/libxml2/CVE-2011-1944.patch | 100 ---
libs/libxml2/CVE-2011-2834.patch | 61 -
libs/libxml2/CVE-2011-3102.patch | 42 -
libs/libxml2/CVE-2011-3905.patch | 61 -
libs/libxml2/CVE-2011-3919.patch | 19
libs/libxml2/DEPENDS | 11
libs/libxml2/DETAILS | 5
libs/libxml2/HISTORY | 8
libs/libxml2/PRE_BUILD | 12
libs/libxml2/libxml2-2.7.8-xpath-freeing.patch | 30
libs/libxml2/libxml2-2.7.8-xpath-freeing2.patch | 26
libs/libxml2/libxml2-2.7.8-xpath-hardening.patch | 223 ------
libs/libxml2/libxml2-2.7.8.patch | 21
lxde/lxdm/HISTORY | 4
lxde/lxdm/PRE_BUILD | 3
lxde/lxdm/lxdm-0.4.1-high-cpu-load.patch | 27
net/libpcap/BUILD | 3
net/libpcap/DEPENDS | 11
net/libpcap/HISTORY | 6
net/libpcap/PRE_BUILD | 6
net/libpcap/libnl-3.patch | 21
net/libproxy/DEPENDS | 5
net/libproxy/HISTORY | 3
net/mdnsresponder/BUILD | 1
net/mdnsresponder/DETAILS | 4
net/mdnsresponder/HISTORY | 4
net/nfs-utils/DETAILS | 2
net/nfs-utils/HISTORY | 4
net/nfs-utils/volatiles | 1
net/tor.gpg |binary
net/tor/DETAILS | 4
net/tor/HISTORY | 4
perl-cpan/xml-parser-expat/CONFLICTS | 1
perl-cpan/xml-parser-expat/DETAILS | 10
perl-cpan/xml-parser-expat/HISTORY | 4
perl-cpan/xml-parser/BUILD | 2
perl-cpan/xml-parser/DETAILS | 7
perl-cpan/xml-parser/HISTORY | 5
perl-cpan/xml-parser/INSTALL | 1
perl-cpan/xml-parser/PRE_BUILD | 1
perl-cpan/xml-parser/UP_TRIGGERS | 2
php-pear/php/DETAILS | 10
php-pear/php/HISTORY | 6
php-pear/php/PRE_BUILD | 5
php-pear/php/security-20110929.patch.bz2 | 0
printer/hplip/DETAILS | 1
printer/hplip/HISTORY | 5
printer/hplip/volatiles | 1
python-pypi/pycrypto/DETAILS | 3
python-pypi/pycrypto/HISTORY | 3
python-pypi/sqlalchemy/DEPENDS | 16
python-pypi/sqlalchemy/DETAILS | 4
python-pypi/sqlalchemy/HISTORY | 4
ruby-raa/ruby-1.8/DETAILS | 9
ruby-raa/ruby-1.8/HISTORY | 4
security/wireshark/DETAILS | 6
security/wireshark/HISTORY | 3
smgl/castfs/BUILD | 2
smgl/castfs/HISTORY | 3
smgl/init.d/DEPENDS | 4
smgl/init.d/HISTORY | 6
utils/gnuplot/BUILD | 4
utils/gnuplot/DEPENDS | 7
utils/gnuplot/DETAILS | 4
utils/gnuplot/FINAL | 2
utils/gnuplot/HISTORY | 11
utils/gnuplot/INSTALL | 8
utils/gnuplot/POST_REMOVE | 2
utils/gnuplot/PRE_BUILD | 19
utils/gnuplot/automake-1.12.patch | 36 +
utils/gnuplot/crossbuild.patch | 14
utils/sudo/DETAILS | 4
utils/sudo/HISTORY | 3
video/ffmpeg-svn/DEPENDS | 11
video/ffmpeg-svn/HISTORY | 7
video/mplayer2/DEPENDS | 6
video/mplayer2/DETAILS | 2
video/mplayer2/HISTORY | 4
volatiles | 17
xfce/libxfce4util/HISTORY | 6
xfce/libxfce4util/UP_TRIGGERS | 17
xfce/orage/DEPENDS | 1
xfce/orage/DETAILS | 1
xfce/orage/HISTORY | 3
xfce/xfce4-dict/DEPENDS | 1
xfce/xfce4-dict/DETAILS | 1
xfce/xfce4-dict/HISTORY | 3
xfce/xfce4-mixer/DEPENDS | 1
xfce/xfce4-mixer/DETAILS | 1
xfce/xfce4-mixer/HISTORY | 3
xfce/xfce4-panel/HISTORY | 3
xfce/xfce4-panel/UP_TRIGGERS | 6
xorg-proto/printproto/HISTORY | 5
xorg-proto/printproto/PRE_BUILD | 4
xorg-proto/printproto/printproto-1.0.5.tar.bz2.sig |binary
193 files changed, 890 insertions(+), 1175 deletions(-)

New commits:
commit a6cdb3bd69125855e0fa951a60df861fb7db7f2a
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

libgphoto2 - needs libusb-compat
(cherry picked from commit a8bab8e653f456b4c5079be9cb6db19255c90106)

commit 219d78700c2992367595a49c6408405821dedd06
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

mpd: docs need doxygen
(cherry picked from commit 1e1e56dbb7d92f8df3f6cd827cbd70e6f1c7a186)

commit d54be8fe14b3925e641f8f1cfb40893d818e8334
Author: Sukneet Basuta <sukneet AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

pygobject3: added UP_TRIGGERS - cast pygobject if pygobject has
gobject-introspection enabled, so it is built without it.
See https://bugzilla.gnome.org/show_bug.cgi?id=657054

It is not strictly necessary to for it to be recast since the conflicting
files are overwritten by pygobject3, but some files are left over which I
*assume* may lead to unintentional consequences. It is recommended that
pygobject2 be built without gobject-introspection if pygobect3 is installed
in either case.
(cherry picked from commit 075e265fe04fb3acfe50a2d682b38edfb1f6fc97)

commit bda4410c225d62924a742e7660122f102bb1cd45
Author: Sukneet Basuta <sukneet AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

pygobject3: added UP_TRIGGERS - cast pygobject if pygobject has
gobject-introspection enabled, so it is built without it.
See https://bugzilla.gnome.org/show_bug.cgi?id=657054

It is not strictly necessary to for it to be recast since the conflicting
files are overwritten by pygobject3, but some files are left over which I
*assume* may lead to unintentional consequences. It is recommended that
pygobject2 be built without gobject-introspection if pygobect3 is installed
in either case.
(cherry picked from commit 518f5051a4a5c7083060e0c12666c83f97fb289c)

commit 8653da279cab96dbadcc2b3e7b29a393667053a8
Author: Sukneet Basuta <sukneet AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

pygobject: fix build with gobject-introspection

BUILD: only build with introspection if pygobject3 does not have
introspection enabled.
see https://bugzilla.gnome.org/show_bug.cgi?id=657054
DEPENDS: only depend on gobject-introspection if pygobject3 does not have
introspection enabled.
PRE_BUILD: added, apply patch to fix introspection
introspection.patch: added, remove depreciated references
(cherry picked from commit 3f7e58fad3de8397e4a3e26b565a677ae14f556c)

commit dca9b923ac6e4208471044d83971c672c3005b5c
Author: Sukneet Basuta <sukneet AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

gnuplot: apply fix for automake-1.12
patch from upstream
(cherry picked from commit f31d056cf13f4edae864beb3a967370c0b3860ac)

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

seamonkey: => 2.10 (+security)
(cherry picked from commit 5fe2fa6091e9af9b40a7fee55a69a3ac73a29dda)

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

mariadb: => 5.2.12 (security)
(cherry picked from commit 891e79b3150af0492552b226aee1f7da74e8df59)

commit c1fa7f346aea63bbbc58845db76e42d736c21d4a
Author: Andraž Levstik <ruskie+2054d253 AT codemages.net>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

ibpp: use the right char for (r)
(cherry picked from commit 7ffb2c104239e17b39a7950032e3cd227d20db61)

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

openssl: fixed UP_TRIGGERS
(cherry picked from commit 4c0aa23778f5308a77f9dd60abc3b03453f09c4f)

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

libevent: corrected UP_TRIGGERS
(cherry picked from commit 050389e4f6d83d8cf3f776e2c4b3496819a4c567)

commit 28441294cda4f3c5b2a62d6cb0994e68e934b572
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

libevent 2.0.19
(cherry picked from commit 3eb72d9ff6771411b9ed557cf1f873076d0a92cd)

commit f410aa91c1defa65988f8db3c177d7fb797d2e5c
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

libxfce4util: UP_TRIGGERS fixed

if libxfce4util is installed for the first time:

libxfce4util checking for reverse triggers...

Removing dependees of libxfce4util

No spells to cast!
Cannot cast these spells:
---------------------------
libxfce4util (up_triggers)
(cherry picked from commit 387eb588640f3592c68c37b32cd635f14fd0dfb3)

commit f75b5eb3aa2de6a9be399a348860d858cde18dff
Author: Sukneet Basuta <sukneet AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

init.d: make udev check for linux 3.x more robust
(cherry picked from commit 6ce0e03ddb5a844fb50fbf7dd1b07c90016ce325)

commit 0113d11707e389634465ca5f8e25169d6b4b01ce
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

smgl/castfs: add -lpthread to LDFLAGS to prevent linker error
(cherry picked from commit c8b5f6d9b8d4596d9b0231513daafb167ee5d105)

commit b5e7d3d9aa83bd0c913cdf677c61b1e6b61ba49f
Author: Sukneet Basuta <sukneet AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

init.d: fixed udev check for linux 3.x
(cherry picked from commit 303e7741088e3d5eefb2d3880e6a49a9bf474e37)

commit e3a7b23861044a8705be5fae007a386b26827dab
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

firefox 13.0, SECURITY_PATCH=49
(cherry picked from commit 84c0b2655c5d024b1b508255e7d2c65a8a7c2f31)

commit 2de4500bde6ad8e1ea8536d33c76abc11e1fcf70
Author: Sukneet Basuta <sukneet AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

surf: ensure EDITOR has a value by sourcing /etc/profile.d/editor.sh or
defaulting to nano
(cherry picked from commit 7a6c79f7f83203a14d9d882f484664faa7ee2abd)

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

postgresql: => 9.1.4 (security)
(cherry picked from commit e13f00b3a4c77eb57190f6abd1abfbdc8d755684)

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

sqlalchemy: => 0.7.7, fixed dep flags
(cherry picked from commit 8dbe5ec2f16d9c821399be44636167e30b9f83d0)

commit 435446a9b8398d20e268cf4ca769162e6a4f913f
Author: Sukneet Basuta <sukneet AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

udisks: added depends udev with GUDEV subdepends
(cherry picked from commit 450f0531df44b6673da03a082d2b60a4ba566b7d)

commit 0978cc8b5fde0618c7606fc1ce11acb804aac07a
Author: Sukneet Basuta <sukneet AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

ffmpeg-svn: remove optional_depends dirac replaced by schroedinger
(cherry picked from commit 6f837eed7405e8947aece21dd419e16321930248)

commit 8e51adb4047405b8ffb9d57224e211c6078f07eb
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

ffmpeg-svn: Add optional dependency on libvpx
(cherry picked from commit 9c0cb9e68d746407cd4738dcc37c9c80a27a7519)

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

libpcap: fixed libnl support
(cherry picked from commit ee167d992ede32000fa62424a4cc9d0290f0f954)

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

gnome-python-desktop: Fix compilation with metacity 2.34.2+
(cherry picked from commit c002288c917f8b2830b5a59df5d9cc25717b638c)

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

php: security update for legacy branch (with backported patches) to
20120526
(cherry picked from commit 9e398219ed19fe907c0b18826ef9ad89bfe564e3)

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

iasl: => 20120518
(cherry picked from commit 95c38784805f515c117c34d6db7773c99c16892a)

commit 6702e6eee8e703197565d66ab00839a69351bb62
Author: Julien ROZO <julien AT rozo.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

mdnsresponder: updated version to 333.10, no longer fails to build with
multiple make jobs
(cherry picked from commit 6c1e50a06b088909196be81c77befbc0ae7d283f)

commit ef2728c0492a4deb2ec79dd3df06d07d14a9d3da
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

goffice: pcre_info is replaced by pcre_fullinfo, I added a fix from
opensuse so we can build spells that depend on goffice again.
see
http://lists.opensuse.org/archive/opensuse-commit/2012-02/msg01190.html
for more info
(cherry picked from commit 154e6048583740150a8c385760196e67aed119ca)

commit c721e0587e9d4614096dc1f8d500e4f671ad91a2
Author: Pol Vinogradov <vin.public AT gmail.com>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

video/mplayer2: changed git url, disabled esound and arts dependencies
for scm branch
(cherry picked from commit f8abd674aef9393aaf09e1ddd5108a1062194dc2)

commit b94ce60f9c21fc8e31dcf222b90bacc270c54b6e
Author: Sukneet Basuta <sukneet AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

cyrus-sasl: added sqlite optional_depends
sqlite.patch: added, removes invalid gcc flags to allow compilation with
sqlite support
(cherry picked from commit e610b3dcd6b2e460b7d159b51585e1a6fb50e599)

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

pycrypto: => 2.6 (security)
(cherry picked from commit 72334958f468fe31eb439707329850c4dc95b86d)

commit 30985c29763e6ba06c2fdcd959d146829450582b
Author: Remko van der Vossen <wich AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

apache22: fix compilation for pcre8.30
(cherry picked from commit 9d44198c10a1d6765e58874e94d8661f5a4f1bad)

commit c88245ff7f5d9788e8b2fdec2cce671a0f71797c
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

btrfs-progs: Fix compilation

The convert target isn't valid anymore.
(cherry picked from commit e2de053ae5a4aae2a8b68ccaebddc1901f2efd77)

commit 1a2899ff99c2179b627f1080e83aafd8411ba2f5
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

btrfs-progs: Add dependency on e2fsprogs
(cherry picked from commit 366bbce91d037c3bc6c38e66f54428fe72cae8d0)

commit 691f51bf8306e205af74658f3e981b99a5907437
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

btrfs-progs: Add scm branch

Also add dependency on acl.
(cherry picked from commit f3330322fcc9ae594493ac2d3a1dad9c059ce629)

commit 685569aae2c73ea067a6fbc076cd6f1215bc11bf
Author: Sukneet Basuta <sukneet AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

libglade2: added depends atk
(cherry picked from commit d36365b999d0f726567bdf9bfcde627d830faf7b)

commit 1f326f025143e333405461d718730aabc431ebca
Author: Sukneet Basuta <sukneet AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

printproto: re-sign source tarball, source seems to have changed
removed PRE_BUILD, no longer needed
(cherry picked from commit fa5ee8017f2ff3f688bab8e8acd926e1ecd80ca2)

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

xfce4-dict: PATCHLEVEL=1
(cherry picked from commit 441273b30da9ba37d3b67b191c6d36eba903f0d9)

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

xfce4-mixer: PATCHLEVEL=1
(cherry picked from commit fb2e4f9574993a05d560b8bc0d9e989bdaffcce6)

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

orage: PATCHLEVEL=1
(cherry picked from commit bd7ac5ac234ceb56800a96a49ccca1549ed61d08)

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

xfce4-dict: added missing dep
(cherry picked from commit 620bd06533f973dedf5080486e56637aac2de0b4)

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

xfce4-mixer: added missing dep
(cherry picked from commit 75559f52264322547cea937e9a634195f320ddd9)

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

orage: added missing dep
(cherry picked from commit 74a78652c44f982ca42e0c5f1b4cd4cb9da32d1c)

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

xfce4-panel: fixed the trigger
(cherry picked from commit ee0ff3e43b89423c68c6b66c0894369d297451cd)

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

libxfce4util: properly handle upgrade process
(cherry picked from commit bce6914191fb433462decb3c49ec13463cf64785)

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

volatiles: esc dots
(cherry picked from commit f0b4971026a1ca30c8a5c69747cbd6e97c75811e)

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

bins: corrected required dependencies
(cherry picked from commit e0a6770b336d1d668e5e8031203a4bf4076c8822)

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

xml-parser-expat: conflicts with duplicate spell
(cherry picked from commit 5dd295acadfe2c32bf634236d15e03641798aff7)

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

xml-parser: deprecated duplicate spell
(cherry picked from commit 87ebf1e2b37361321400036c31a131e19892315e)

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

Revert "gnome2-libs/intltool: added dependency on xml-parser"

This reverts commit c7f1ba74291797a884381dec8e5b876fe67b868d.

xml-parser is a wrong duplicate spell

Conflicts:

gnome2-libs/intltool/HISTORY
(cherry picked from commit 9f94609737edf694ff48c9b91d4b3b927f4e5218)

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

xml-parser-expat: => 2.41
(cherry picked from commit c138d67dc37dc2cca872755d3bcdb1677f4831f2)

commit cefc5da0af7abb56a283a51c5661c3a78bc68362
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

curl: set SECURITY_PATCH back to 8

it was set to 0 by commit 86e65842ec5edee6059daa1584a8eaf11355403c
nobody has catched it
(cherry picked from commit 93108fb01334625c775db742ef714cccb5a5c428)

commit 58016556cba9e27e5700565dee5ba2c4d2c36c24
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

curl 7.26.0

no idea why SOURCE_GPG has been replaced by SOURCE_HASH by previous
commit
(cherry picked from commit dde5033f62104f3557442a20f3ee37b0837ff7d1)

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

ruby-1.8: => 1.8.7-p358 (security)
(cherry picked from commit b385c09c4778ef0ad823539fddee376bebfc5191)

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

libproxy: added missing opt deps
(cherry picked from commit d75dc430c3173851b12b3520601074abdeec6648)

commit d450505f3855e16c6fc755f96e7ccf8ef68053a7
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

gnuplot: bump to 4.6 and fixup
(cherry picked from commit 21f562a4a2be16207694ff57a4dd4e33cedf1481)

commit 548a890053953bea43eae2873bdfa3993b992216
Author: Sukneet Basuta <sukneet AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

ChangLog: forgot to add additions to gnu.gpg and kernel.gpg
relevant commits are:
ff89247d36d1f89017f0164788bf434fec2b5c6f -
gnu.gpg: added 5B147849: public key "Aspell Dictionary Upload
<dict-upload AT aspell.net>"
& 7084d80b203bae09e8ba22abcd9aca746cb0eb91 -
kernel.gpg: 6092693E Greg Kroah-Hartman (Linux kernel stable release
signing key)
(cherry picked from commit 58221816fcbfad9ccb04bbca920fd96b3a71ae7f)

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

tor: => 0.2.2.36 (security)
(cherry picked from commit 2ed99055bd41d71ed98dd490b8f55d23b775a960)

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

net/tor.gpg: added 19F78451 public key (Roger Dingledine <arma AT mit.edu>)
(cherry picked from commit f01d8932fde3711f6b0af3d32203e0059ea697bf)

Conflicts:
ChangeLog

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

xchat: fixed compilation with static spelling support
(cherry picked from commit 0f204730c4a21937099bde1f3cb97b874144a69c)

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

libxml2: => 2.8.0
(cherry picked from commit fe54b76870449f3f8f4b5823ca1a913f582f3a41)

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

sudo: => 1.8.5p1 (security)
(cherry picked from commit 903c87e358647880f263077720c4d047b5bed51a)

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

gvfs: corrected dependency for HTTP/FTP support
(cherry picked from commit 9e7f54dc70c3738c539cdb758f925afaa574ee42)

commit 86669874a0fb0c112b48cd88235ebcde31f97fb8
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

gvfs 1.12.3
(cherry picked from commit d433b87e6097cc7cd9686b810671b824358447b7)

commit 6d6eef1008f5ea06752631ed42a78b0e1f30e1a9
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

wireshark 1.6.8, SECURITY_PATCH=36
(cherry picked from commit e4910a63019a869e4413f714a26168f609f0b7d1)

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

libsoup: requires glib-networking built with TLS support
(cherry picked from commit cdbe2447b9fda2ab5febec4bd181ee0bb9200312)

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

glib-networking: added TLS subdependency
(cherry picked from commit 6477def14ee16e7855ba89595b6295ff636db8bd)

commit 69fa9dcf8fdb946e947148ec68c909759f1eafae
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

glib-networking 2.32.3
(cherry picked from commit c7ee4411973cfa85ac1c5d5f91a45c813768098f)

commit 89ed14ae972cddf43260244617ce0ff3de194645
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

abiword: fixed glib includes, only glib.h can be included.
(cherry picked from commit a3bb220a8acef44223da00a63cbba14e2dbe30f4)

commit 915fea9443ffdb9d321ed2911b97914d354f0748
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

loudmouth: fixed glib2 includes
(cherry picked from commit 58cc88ed67d9371dd82285cc03c649e42859fa6e)

commit 8e679caf7835bd4b9a9a74c8cc974b068ade7326
Author: Sukneet Basuta <sukneet AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

libvdpau: PATCHLEVEL=1
recast to ensure new TRIGGERS are active
(cherry picked from commit f662f3ab673d9eb06590dd264eeec9014a6709cb)

commit 631bda54af786ef02bb1a1e8c97bac1041e0da67
Author: Pol Vinogradov <vin.public AT gmail.com>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

lxde/lxdm/HISTORY: corrected formatting
(cherry picked from commit f1f211ed25cac176735e738fd79177f8efae408b)

commit b09bf87f5739cbf6be2faad67a9172cda393620e
Author: Pol Vinogradov <vin.public AT gmail.com>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

lxde/lxdm: added high CPU load fix
(cherry picked from commit e9865e0ad7de2fd508ae8581382bc07e0ce2bb1d)

commit 07f3cf19ac2ebd143e6cc06b69743712dc32d30f
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

pygobjec: added missing optional dep on libffi
(cherry picked from commit ee515ba466710e914fee4bb0bdcb1e868831f51e)

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

nfs-utils: actually incremented PATCHLEVEL
(cherry picked from commit db809f7b5989f79df0ab2d6823b264e19d7ac06b)

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

man: fixed cleanse check
(cherry picked from commit 796fab5cf4e6b81d1329cb567c6d161236a00a2b)

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

hplip: added volatiles
(cherry picked from commit a583b5fb07453178a320dd704b77a842dfcffceb)

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

nfs-utils: added /var/lib/nfs/xtab to volatiles
(cherry picked from commit d8a2ecbe6f50bd3b8750ca3289e7164305ce2ffd)

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

excluded, volatiles: renewed files
(cherry picked from commit 4d7e8615a4f0b0ef176ec3ec34165b9927b32b01)

Conflicts:
ChangeLog

commit 19d0fc4f330c6eb43d028bdc05528c0dc36428bc
Author: Sukneet Basuta <sukneet AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

glibc: fix SOURCE URLS for sigs of kernel versions >=3.0
PRE_BUILD: correctly verify files with GPG for Kernel headers >=3.1 and
patches >3.0.4
(cherry picked from commit 9c5b31e1e6ab9f376a0ddc72280ab313fd01fad2)

commit 62b7fee286ed702447b98b5f598eb7c6152b816a
Author: Sukneet Basuta <sukneet AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

kernel.gpg: 6092693E Greg Kroah-Hartman (Linux kernel stable release
signing key)
(cherry picked from commit 7084d80b203bae09e8ba22abcd9aca746cb0eb91)

diff --git a/ChangeLog b/ChangeLog
index 23fe507..739af3e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+2012-05-25 Sukneet Basuta <sukneet AT sourcemage.org>
+ * gnu.gpg: added 5B147849: public key for "Aspell Dictionary
+ Upload <dict-upload AT aspell.net>"
+ * kernel.gpg: added (on 2012-05-15) 6092693E Greg Kroah-Hartman
+ (Linux kernel stable release signing key)
+
+2012-05-25 Vlad Glagolev <stealth AT sourcemage.org>
+ * net/tor.gpg: added 19F78451 public key (Roger Dingledine
+ <arma AT mit.edu>)
+ * perl-cpan/xml-parser: deprecated wrong spell
+ * volatiles: esc dots
+
+2012-05-16 Vlad Glagolev <stealth AT sourcemage.org>
+ * excluded: removed volatiles-duplicate line
+ * volatiles: added new values; corrected existing
+
2012-05-13 Vlad Glagolev <stealth AT sourcemage.org>
* volatiles: added /usr/share/locale/locale.alias

diff --git a/audio-players/mpd/DEPENDS b/audio-players/mpd/DEPENDS
index 9aa66f8..ea248ac 100755
--- a/audio-players/mpd/DEPENDS
+++ b/audio-players/mpd/DEPENDS
@@ -197,4 +197,8 @@ optional_depends avahi \
optional_depends xmlto \
"--enable-documentation" \
"--disable-documentation" \
- "to build documentation"
+ "to build documentation" &&
+# Xmlto is not enough.
+if is_depends_enabled $SPELL xmlto; then
+ depends doxygen
+fi
diff --git a/audio-players/mpd/HISTORY b/audio-players/mpd/HISTORY
index 3cfb22e..211fd4c 100644
--- a/audio-players/mpd/HISTORY
+++ b/audio-players/mpd/HISTORY
@@ -1,3 +1,6 @@
+2012-06-12 Thomas Orgis <sobukus AT sourcemage.org>
+ * DEPENDS: need doxygen for docs, too
+
2012-04-13 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 0.16.8

diff --git a/chat-irc/xchat/0001-fix-build-with-glib-version-2.32.patch
b/chat-irc/xchat/0001-fix-build-with-glib-version-2.32.patch
index 79ccf7b..b416c5b 100644
--- a/chat-irc/xchat/0001-fix-build-with-glib-version-2.32.patch
+++ b/chat-irc/xchat/0001-fix-build-with-glib-version-2.32.patch
@@ -9,8 +9,7 @@ Subject: [PATCH] fix build with glib version 2.32
src/common/text.c | 2 +-
src/common/util.c | 2 +-
src/common/xchat.h | 6 +-----
- src/fe-gtk/sexy-spell-entry.c | 2 +-
- 6 files changed, 5 insertions(+), 10 deletions(-)
+ 5 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/src/common/modes.c b/src/common/modes.c
index 1acf7f5..b10dee4 100644
@@ -79,19 +78,6 @@ index 013d6a1..e3f15a8 100644
#include <time.h> /* need time_t */

#ifndef XCHAT_H
-diff --git a/src/fe-gtk/sexy-spell-entry.c b/src/fe-gtk/sexy-spell-entry.c
-index d67ffe2..a926387 100644
---- a/src/fe-gtk/sexy-spell-entry.c
-+++ b/src/fe-gtk/sexy-spell-entry.c
-@@ -26,7 +26,7 @@
- #include <gtk/gtk.h>
- #include "sexy-spell-entry.h"
- #include <string.h>
--#include <glib/gi18n.h>
-+#include <glib.h>
- #include <sys/types.h>
- /*#include "gtkspell-iso-codes.h"
- #include "sexy-marshal.h"*/
--
1.7.10.1

diff --git a/chat-irc/xchat/HISTORY b/chat-irc/xchat/HISTORY
index 8fcb0f9..7b1876b 100644
--- a/chat-irc/xchat/HISTORY
+++ b/chat-irc/xchat/HISTORY
@@ -1,3 +1,8 @@
+2012-05-24 Vlad Glagolev <stealth AT sourcemage.org>
+ * 0001-fix-build-with-glib-version-2.32.patch: corrected the patch
+ to fix compilation with static spelling support
+ <glib/i18n.h> still present in glib2
+
2012-05-05 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* PRE_BUILD, 0001-fix-build-with-glib-version-2.32.patch:
fix build with glib 2.32
diff --git a/chat-libs/loudmouth/HISTORY b/chat-libs/loudmouth/HISTORY
index e6427ef..e20fa20 100644
--- a/chat-libs/loudmouth/HISTORY
+++ b/chat-libs/loudmouth/HISTORY
@@ -1,3 +1,6 @@
+2012-05-20 Arjan Bouter <abouter AT sourcemage.org>
+ * PRE_BUILD: fix for glib2 includes
+
2011-09-14 Andraž "ruskie" Levstik <ruskie+f03a580f AT codemages.net>
* DEPENDS: fix ssl dependency

diff --git a/chat-libs/loudmouth/PRE_BUILD b/chat-libs/loudmouth/PRE_BUILD
index fce4a96..4fe4605 100755
--- a/chat-libs/loudmouth/PRE_BUILD
+++ b/chat-libs/loudmouth/PRE_BUILD
@@ -1,6 +1,7 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&
-
+sedit 's#glib/gerror.h#glib.h#' loudmouth/lm-error.c &&
+sedit '#*glib/gi18n.h*#d' loudmouth/lm-sock.c &&
if [ $(installed_version glibc | cut -d. -f2) -gt 9 ]; then
sedit 's/HAVE_STRNDUP/__USE_XOPEN2K8/' loudmouth/asyncns.c
fi
diff --git a/crypto/cyrus-sasl/DEPENDS b/crypto/cyrus-sasl/DEPENDS
index 470338c..60ea88e 100755
--- a/crypto/cyrus-sasl/DEPENDS
+++ b/crypto/cyrus-sasl/DEPENDS
@@ -35,10 +35,15 @@ if [[ "$CS_MECH" =~ 'auxprop' ]]; then
gdbm) depends gdbm '--with-dblib=gdbm' ;;
esac &&

+ optional_depends sqlite \
+ "--enable-sql --with-sqlite3=$INSTALL_ROOT/usr"\
+ '--without-sqlite3' \
+ 'auxprop SQLite backend' &&
+
optional_depends sqlite2 \
"--enable-sql --with-sqlite=$INSTALL_ROOT/usr" \
'--without-sqlite' \
- 'auxprop SQLite backend' &&
+ 'auxprop SQLite2 backend' &&

optional_depends MYSQL \
"--enable-sql --with-mysql=$INSTALL_ROOT/usr" \
diff --git a/crypto/cyrus-sasl/HISTORY b/crypto/cyrus-sasl/HISTORY
index 303d2bc..2a66b60 100644
--- a/crypto/cyrus-sasl/HISTORY
+++ b/crypto/cyrus-sasl/HISTORY
@@ -1,3 +1,8 @@
+2012-05-28 Sukneet Basuta <sukneet AT sourcemage.org>
+ * DEPENDS: added sqlite optional_depends
+ * PRE_BUILD: patch to fix compilation with sqlite
+ * sqlite.patch: added, removes invalid gcc flags
+
2012-01-19 Vlad Glagolev <stealth AT sourcemage.org>
* 6581B5F1.gpg: deleted, use the same key from section

diff --git a/crypto/cyrus-sasl/PRE_BUILD b/crypto/cyrus-sasl/PRE_BUILD
index ba9528d..fc26314 100755
--- a/crypto/cyrus-sasl/PRE_BUILD
+++ b/crypto/cyrus-sasl/PRE_BUILD
@@ -1,4 +1,5 @@
default_pre_build &&
cd "$SOURCE_DIRECTORY" &&

+patch -p0 < $SPELL_DIRECTORY/sqlite.patch
patch -p1 < "$SPELL_DIRECTORY/db5.patch"
diff --git a/crypto/cyrus-sasl/sqlite.patch b/crypto/cyrus-sasl/sqlite.patch
new file mode 100644
index 0000000..dd2715e
--- /dev/null
+++ b/crypto/cyrus-sasl/sqlite.patch
@@ -0,0 +1,26 @@
+--- configure.b 2011-09-07 09:29:25.000000000 -0400
++++ configure 2012-05-29 04:58:43.374173367 -0400
+@@ -14470,9 +14470,9 @@
+ $as_echo "$as_me: WARNING: SQLite Library not found" >&2;}; true;;
+ *)
+ if test -d ${with_sqlite}/lib; then
+- LIB_SQLITE="-L${with_sqlite}/lib -R${with_sqlite}/lib"
++ LIB_SQLITE="-L${with_sqlite}/lib"
+ else
+- LIB_SQLITE="-L${with_sqlite} -R${with_sqlite}"
++ LIB_SQLITE="-L${with_sqlite}"
+ fi
+
+ LIB_SQLITE_DIR=$LIB_SQLITE
+@@ -14600,9 +14600,9 @@
+ $as_echo "$as_me: WARNING: SQLite3 Library not found" >&2;}; true;;
+ *)
+ if test -d ${with_sqlite3}/lib; then
+- LIB_SQLITE3="-L${with_sqlite3}/lib -R${with_sqlite3}/lib"
++ LIB_SQLITE3="-L${with_sqlite3}/lib"
+ else
+- LIB_SQLITE3="-L${with_sqlite3} -R${with_sqlite3}"
++ LIB_SQLITE3="-L${with_sqlite3}"
+ fi
+
+ LIB_SQLITE3_DIR=$LIB_SQLITE3
diff --git a/crypto/openssl/HISTORY b/crypto/openssl/HISTORY
index 85a9b0d..7fcc22c 100644
--- a/crypto/openssl/HISTORY
+++ b/crypto/openssl/HISTORY
@@ -1,3 +1,6 @@
+2012-06-09 Vlad Glagolev <stealth AT sourcemage.org>
+ * UP_TRIGGERS: don't go below spell_ok if it fails check
+
2012-05-10 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 0.9.8x, 1.0.0j, SECURITY_PATCH=19
http://www.openssl.org/news/secadv_20120510.txt
diff --git a/crypto/openssl/UP_TRIGGERS b/crypto/openssl/UP_TRIGGERS
index d9b53dc..3edee70 100755
--- a/crypto/openssl/UP_TRIGGERS
+++ b/crypto/openssl/UP_TRIGGERS
@@ -1,7 +1,7 @@
# this makes ABI changes automatically cast those that depend on openssl via
an up_trigger

-local OLD_SPELL_VERSION=""
-spell_ok $SPELL && OLD_SPELL_VERSION="$(installed_version $SPELL)"
+spell_ok $SPELL && local OLD_SPELL_VERSION="$(installed_version $SPELL)" ||
return 0
+
if [ "${VERSION/[a-z]*/}" != "${OLD_SPELL_VERSION/[a-z]*/}" ]; then
for each in $(show_up_depends $SPELL 1); do
up_trigger $each cast_self
diff --git a/database/ibpp/DETAILS b/database/ibpp/DETAILS
index e146917..0a27ced 100755
--- a/database/ibpp/DETAILS
+++ b/database/ibpp/DETAILS
@@ -13,7 +13,7 @@ SHORT="C++ classes to access and administer a Firebird
database"
cat << EOF
IBPP, where 'PP' stands for '++', is a C++ client interface for
Firebird Server versions 1.0, 1.5 and further. It also works with
-InterBase� 6.0, though it is expected it might only support Firebird
+InterBase® 6.0, though it is expected it might only support Firebird
in the future. It is a class library, free of any specific
development tool dependancies. It is not tied to any 'visual' or
'RAD' tool. It was indeed developed to add Firebird access in any
diff --git a/database/ibpp/HISTORY b/database/ibpp/HISTORY
index d6d2aad..ca53f7c 100644
--- a/database/ibpp/HISTORY
+++ b/database/ibpp/HISTORY
@@ -1,3 +1,6 @@
+2012-06-09 Andraž "ruskie" Levstik <ruskie+f03a580f AT codemages.net>
+ * DETAILS: use properly encoded char for (r)
+
2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DEPENDS: changed dependency on g++ to dependency on gcc with
sub-depends on CXX (scripted)
diff --git a/database/mariadb/DEPENDS b/database/mariadb/DEPENDS
index 073b1ad..ed9f6ec 100755
--- a/database/mariadb/DEPENDS
+++ b/database/mariadb/DEPENDS
@@ -7,9 +7,10 @@ optional_depends zlib \
"--with-zlib-dir=bundled" \
"to use system zlib instead of bundled" &&

-optional_depends readline \
- "--without-readline" "" \
- "to use system readline instead of bundled" &&
+# temporarily broken cause of mismatching API
+#optional_depends readline \
+# "--without-readline" "" \
+# "to use system readline instead of bundled" &&

optional_depends libedit \
"--without-libedit" "" \
diff --git a/database/mariadb/DETAILS b/database/mariadb/DETAILS
index e25ce01..9261999 100755
--- a/database/mariadb/DETAILS
+++ b/database/mariadb/DETAILS
@@ -1,8 +1,9 @@
SPELL=mariadb
- VERSION=5.2.10
+ VERSION=5.2.12
+ SECURITY_PATCH=1
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
-
SOURCE_HASH=sha512:192f050a349ed01cea9d4830c1528584c37ef6d7a1df207ecadfe617ad6a48f85fcbd075792bd929a37310a8d6086f78bd9db716e11d9a98d57e4451096eadd6
+
SOURCE_HASH=sha512:d4583e0f6b8ae5b90e6c2818ecb98eadd5245e1c2c1a270980dc7b002c62f056fe0c15a389548d6e0ec3c0d83ac72a9fe30b6f9b220c92eae0e0ca29fd7bb333

SOURCE_URL[0]=http://mirrors.fe.up.pt/pub/$SPELL/$SPELL-$VERSION/kvm-tarbake-jaunty-x86/$SOURCE

SOURCE_URL[1]=http://ftp-stud.hs-esslingen.de/pub/Mirrors/$SPELL/$SPELL-$VERSION/kvm-tarbake-jaunty-x86/$SOURCE

SOURCE_URL[2]=http://ftp.osuosl.org/pub/$SPELL/$SPELL-$VERSION/kvm-tarbake-jaunty-x86/$SOURCE
diff --git a/database/mariadb/HISTORY b/database/mariadb/HISTORY
index 267d9e9..63d39d3 100644
--- a/database/mariadb/HISTORY
+++ b/database/mariadb/HISTORY
@@ -1,3 +1,7 @@
+2012-06-10 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 5.2.12; SECURITY_PATCH=1 (CVE-2012-2122)
+ * DEPENDS: disabled system readline support
+
2012-03-02 Arjan Bouter <abouter AT sourcemage.org>
* PRE_SUB_DEPENDS, SUB_DEPENDS: added NDB for ndbcluster

diff --git a/database/postgresql/DETAILS b/database/postgresql/DETAILS
index cc98de6..4da9d13 100755
--- a/database/postgresql/DETAILS
+++ b/database/postgresql/DETAILS
@@ -1,6 +1,6 @@
SPELL=postgresql
- VERSION=9.1.3
-
SOURCE_HASH=sha512:411b9ed2d5cb4c38388710bc6186c8ccc3bddb9a607a933539bfc8b77df81d45c6f0b8ad9117960b0c5756bab51958f47c1e95943a488713841bd400da27a2e9
+ VERSION=9.1.4
+
SOURCE_HASH=sha512:c49937ada0b011d08b8cfd9b7ac5d593dc5c3e36e97c19b2c6e08bb4f14332854b2c64eb1b77a78d6da9612f3cee2a857644b7bd6aedb7a4cd507c5bc64c4a62
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=ftp://ftp.postgresql.org/pub/source/v$VERSION/$SOURCE
@@ -16,7 +16,7 @@ fi

WEB_SITE=http://www.postgresql.org/
GATHER_DOCS=off
- SECURITY_PATCH=10
+ SECURITY_PATCH=11
ENTERED=20011113
LICENSE[0]=BSD
KEYWORDS="database"
diff --git a/database/postgresql/HISTORY b/database/postgresql/HISTORY
index 77f6e0a..bfe6775 100644
--- a/database/postgresql/HISTORY
+++ b/database/postgresql/HISTORY
@@ -1,3 +1,6 @@
+2012-06-05 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 9.1.4; SECURITY_PATCH++
+
2012-04-10 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 9.1.3
SECURITY_PATCH=10
diff --git a/devel/iasl/DETAILS b/devel/iasl/DETAILS
index a67e10b..cae8c38 100755
--- a/devel/iasl/DETAILS
+++ b/devel/iasl/DETAILS
@@ -1,9 +1,10 @@
SPELL=iasl
- VERSION=20120215
+ VERSION=20120518
SOURCE=acpica-unix-$VERSION.tar.gz
+ SOURCE_URL[0]=https://www.acpica.org/download/acpica-unix-$VERSION.tar.gz
+ SOURCE_HINTS="no-check-certificate"
+
SOURCE_HASH=sha512:3a7742a9fa2af1a141931596937ecadaf1d84b1c056e18d025f9735d83e72127a1ed6551e7fa51c17294c2e5e2fb8bc0b6e83aa70f7ad57507bed97c48675996
SOURCE_DIRECTORY="$BUILD_DIRECTORY/acpica-unix-$VERSION"
- SOURCE_URL[0]=http://www.acpica.org/download/acpica-unix-$VERSION.tar.gz
-
SOURCE_HASH=sha512:311f2ee52869c542593ffecef9d7b91b1b9f2dd33e7b40c3729dfca5326baf5ac048dc09a3c86321d1a99865f3dbe081aaf985d2b847c30daaa33bced2e28867
LICENSE[0]=IASL
WEB_SITE=http://www.intel.com/technology/iapc/acpi/
ENTERED=20070530
diff --git a/devel/iasl/HISTORY b/devel/iasl/HISTORY
index b76fa52..e160c3c 100644
--- a/devel/iasl/HISTORY
+++ b/devel/iasl/HISTORY
@@ -1,3 +1,6 @@
+2012-05-31 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 20120518; switched to https url
+
2012-02-16 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 20120215; quoting paths
* BUILD: corrected path to sources
diff --git a/disk/btrfs-progs/BUILD b/disk/btrfs-progs/BUILD
index 73e18c2..8f58e6d 100755
--- a/disk/btrfs-progs/BUILD
+++ b/disk/btrfs-progs/BUILD
@@ -1,2 +1 @@
-make &&
-make convert
+make
diff --git a/disk/btrfs-progs/DEPENDS b/disk/btrfs-progs/DEPENDS
new file mode 100755
index 0000000..c64b9ec
--- /dev/null
+++ b/disk/btrfs-progs/DEPENDS
@@ -0,0 +1,2 @@
+depends acl &&
+depends e2fsprogs
diff --git a/disk/btrfs-progs/DETAILS b/disk/btrfs-progs/DETAILS
index 3f0d343..1e66912 100755
--- a/disk/btrfs-progs/DETAILS
+++ b/disk/btrfs-progs/DETAILS
@@ -1,9 +1,22 @@
SPELL=btrfs-progs
+if [ "$BTRFS_PROGS_BRANCH" = scm ]; then
+ if [ "$BTRFS_PROGS_AUTOUPDATE" = y ]; then
+ VERSION=$(date +%Y%m%d)
+ else
+ VERSION=scm
+ fi
+ SOURCE=$SPELL-scm.tar.bz2
+
SOURCE_URL[0]=git://git.kernel.org/pub/scm/linux/kernel/git/mason/$SPELL.git
+ SOURCE_IGNORE=volatile
+ FORCE_DOWNLOAD=on
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-scm
+else
VERSION=0.19
SOURCE=$SPELL-$VERSION.tar.bz2
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION

SOURCE_URL[0]=http://www.kernel.org/pub/linux/kernel/people/mason/btrfs/$SOURCE

SOURCE_HASH=sha512:f0978432b524f307302d80e3a904684c21b6549f0b444f51a17f1d6f0a3dfebfc39ef185c3431a007fb354218aa7027e665ca6a3c58267bb8d0905ae34dc7b80
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+fi
WEB_SITE=http://btrfs.wiki.kernel.org/
ENTERED=20090205
LICENSE[0]=GPL
diff --git a/disk/btrfs-progs/HISTORY b/disk/btrfs-progs/HISTORY
index 2f7835a..f3897fd 100644
--- a/disk/btrfs-progs/HISTORY
+++ b/disk/btrfs-progs/HISTORY
@@ -1,3 +1,8 @@
+2012-05-26 Ismael Luceno <ismael AT sourcemage.org>
+ * BUILD: Fixed compilation
+ * DEPENDS: Added dependency on acl and e2fsprogs
+ * DETAILS, PREPARE: Added scm branch
+
2010-04-08 Elisamuel Resto <ryuji AT sourcemage.org>
* BUILD: also build btrfs-convert

diff --git a/disk/btrfs-progs/PREPARE b/disk/btrfs-progs/PREPARE
new file mode 100755
index 0000000..22bb1c5
--- /dev/null
+++ b/disk/btrfs-progs/PREPARE
@@ -0,0 +1,2 @@
+. ${GRIMOIRE}/FUNCTIONS &&
+prepare_select_branch scm release
diff --git a/disk/udisks/DEPENDS b/disk/udisks/DEPENDS
index e2ad577..5d33ff9 100755
--- a/disk/udisks/DEPENDS
+++ b/disk/udisks/DEPENDS
@@ -3,6 +3,7 @@ depends parted &&
depends lvm &&
depends libatasmart &&
depends docbook-xsl &&
+depends -sub GUDEV udev &&

optional_depends man \
"--enable-man-pages" \
diff --git a/disk/udisks/HISTORY b/disk/udisks/HISTORY
index 3785790..99cf124 100644
--- a/disk/udisks/HISTORY
+++ b/disk/udisks/HISTORY
@@ -1,3 +1,6 @@
+2012-06-04 Sukneet Basuta <sukneet AT sourcemage.org>
+ * DEPENDS: added depends udev with GUDEV subdepends
+
2011-08-27 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.0.4

diff --git a/doc/man/DETAILS b/doc/man/DETAILS
index 7407fb3..6fa42e6 100755
--- a/doc/man/DETAILS
+++ b/doc/man/DETAILS
@@ -1,5 +1,6 @@
SPELL=man
VERSION=1.6g
+ PATCHLEVEL=1
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SOURCE.sig
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/doc/man/HISTORY b/doc/man/HISTORY
index 4320fa4..e6a5e41 100644
--- a/doc/man/HISTORY
+++ b/doc/man/HISTORY
@@ -1,3 +1,8 @@
+2012-05-16 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: PATCHLEVEL=1
+ * configs: corrected value
+ * volatiles: added, to fix cleanse check
+
2011-01-02 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 1.6g; removed broken source url

diff --git a/doc/man/configs b/doc/man/configs
old mode 100755
new mode 100644
index 63a45f5..b6e1f75
--- a/doc/man/configs
+++ b/doc/man/configs
@@ -1 +1 @@
-^/usr/share/misc/man.conf
+^/usr/share/misc/man\.conf$
diff --git a/doc/man/volatiles b/doc/man/volatiles
new file mode 100644
index 0000000..b6e1f75
--- /dev/null
+++ b/doc/man/volatiles
@@ -0,0 +1 @@
+^/usr/share/misc/man\.conf$
diff --git a/excluded b/excluded
index d59d7d0..bec13ce 100644
--- a/excluded
+++ b/excluded
@@ -1,5 +1,4 @@
/usr/share/pear/\.[^/]*lock
^/usr/share/pear/.filemap$
/etc/gconf/gconf\.xml\.defaults/.*
-/usr/share/icons/hicolor/icon-theme.cache
^/usr/lib/perl.*/.*/.*/perllocal\.pod$
diff --git a/ftp/curl/DETAILS b/ftp/curl/DETAILS
index 4807198..3fc7697 100755
--- a/ftp/curl/DETAILS
+++ b/ftp/curl/DETAILS
@@ -1,6 +1,6 @@
SPELL=curl
- VERSION=7.25.0
- SECURITY_PATCH=0
+ VERSION=7.26.0
+ SECURITY_PATCH=8
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE2=$SOURCE.asc
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
@@ -8,7 +8,7 @@ SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[1]=ftp://ftp.sunet.se/pub/www/utilities/$SPELL/$SOURCE
SOURCE_URL[2]=ftp://ftp.rge.com/pub/networking/$SPELL/$SOURCE
SOURCE2_URL[0]=$SOURCE_URL.asc
-
SOURCE_HASH=sha512:8053d942f145933a5a293ddc4d3fd7651ccacb57138d9fa23ecb623fd73bbc4d31027a1d3c664be639859f37e54461ace36c29a5063aed1e1fcf7aa0442afecf
+ SOURCE_GPG=curl.gpg:$SOURCE2:UPSTREAM_KEY
SOURCE2_IGNORE=signature
WEB_SITE=http://curl.haxx.se/
ENTERED=20010922
diff --git a/ftp/curl/HISTORY b/ftp/curl/HISTORY
index 42fdf6f..6e73ae5 100644
--- a/ftp/curl/HISTORY
+++ b/ftp/curl/HISTORY
@@ -1,3 +1,6 @@
+2012-05-25 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 7.26.0
+
2012-03-25 Robert Figura <template AT sourcemage.org>
* DETAILS: 7.25.0

diff --git a/gnome2-apps/abiword/HISTORY b/gnome2-apps/abiword/HISTORY
index 2a20157..9227111 100644
--- a/gnome2-apps/abiword/HISTORY
+++ b/gnome2-apps/abiword/HISTORY
@@ -1,3 +1,6 @@
+2012-05-19 Arjan Bouter <abouter AT sourcemage.org>
+ * PRE_BUILD: only glib.h can be included or build will fail
+
2001-08-01 George Sherwood <gsherwood AT sourcemage.org>
* PRE_BUILD: Added to apply patch
* abiword-gcc46.patch: Upstream patch to work with gcc 4.6.x
diff --git a/gnome2-apps/abiword/PRE_BUILD b/gnome2-apps/abiword/PRE_BUILD
index 410429d..ae86946 100755
--- a/gnome2-apps/abiword/PRE_BUILD
+++ b/gnome2-apps/abiword/PRE_BUILD
@@ -1,4 +1,6 @@
default_pre_build &&

cd $SOURCE_DIRECTORY &&
-patch -p0 < $SPELL_DIRECTORY/abiword-gcc46.patch
+patch -p0 < $SPELL_DIRECTORY/abiword-gcc46.patch &&
+# only glib.h can be included
+sedit 34d src/af/util/xp/ut_go_file.h
diff --git a/gnome2-libs/glib-networking/DEPENDS
b/gnome2-libs/glib-networking/DEPENDS
index 8ac8121..1d643d5 100755
--- a/gnome2-libs/glib-networking/DEPENDS
+++ b/gnome2-libs/glib-networking/DEPENDS
@@ -1,4 +1,11 @@
-depends glib2 &&
+. "$GRIMOIRE/FUNCTIONS" &&
+
+depends glib2 &&
+
+if spell_ok glib2 && is_version_less $(installed_version glib2) 2.32; then
+ force_depends glib2
+fi &&
+
depends libgcrypt &&

optional_depends gnutls \
@@ -10,5 +17,3 @@ optional_depends ca-certificates \
"" \
"--without-ca-file" \
"for SSL root certificates"
-
-
diff --git a/gnome2-libs/glib-networking/DETAILS
b/gnome2-libs/glib-networking/DETAILS
index 8572b56..40630fc 100755
--- a/gnome2-libs/glib-networking/DETAILS
+++ b/gnome2-libs/glib-networking/DETAILS
@@ -1,5 +1,5 @@
SPELL=glib-networking
- VERSION=2.32.1
+ VERSION=2.32.3
BRANCH=`echo $VERSION|cut -d . -f 1,2`
SOURCE=$SPELL-$VERSION.tar.xz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/gnome2-libs/glib-networking/HISTORY
b/gnome2-libs/glib-networking/HISTORY
index 3820345..df4351c 100644
--- a/gnome2-libs/glib-networking/HISTORY
+++ b/gnome2-libs/glib-networking/HISTORY
@@ -1,3 +1,10 @@
+2012-05-23 Vlad Glagolev <stealth AT sourcemage.org>
+ * DEPENDS: check glib2 version
+ * {{REPAIR^all^,}PRE_,}SUB_DEPENDS: added, for TLS subdependency
+
+2012-05-16 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 2.32.3
+
2012-04-17 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 2.32.1

diff --git a/gnome2-libs/glib-networking/PRE_SUB_DEPENDS
b/gnome2-libs/glib-networking/PRE_SUB_DEPENDS
new file mode 100755
index 0000000..0285932
--- /dev/null
+++ b/gnome2-libs/glib-networking/PRE_SUB_DEPENDS
@@ -0,0 +1,5 @@
+case $THIS_SUB_DEPENDS in
+ TLS) is_depends_enabled $SPELL gnutls;;
+ *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}"
+ return 1;;
+esac
diff --git a/gnome2-libs/glib-networking/REPAIR^all^PRE_SUB_DEPENDS
b/gnome2-libs/glib-networking/REPAIR^all^PRE_SUB_DEPENDS
new file mode 100755
index 0000000..0285932
--- /dev/null
+++ b/gnome2-libs/glib-networking/REPAIR^all^PRE_SUB_DEPENDS
@@ -0,0 +1,5 @@
+case $THIS_SUB_DEPENDS in
+ TLS) is_depends_enabled $SPELL gnutls;;
+ *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}"
+ return 1;;
+esac
diff --git a/gnome2-libs/glib-networking/SUB_DEPENDS
b/gnome2-libs/glib-networking/SUB_DEPENDS
new file mode 100755
index 0000000..6d80b74
--- /dev/null
+++ b/gnome2-libs/glib-networking/SUB_DEPENDS
@@ -0,0 +1,6 @@
+case $THIS_SUB_DEPENDS in
+ TLS) message "TLS support requested, forcing gnutls dependency" &&
+ depends gnutls "--with-gnutls";;
+ *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}"
+ return 1;;
+esac
diff --git a/gnome2-libs/glib-networking/glib-networking-2.32.1.tar.xz.sig
b/gnome2-libs/glib-networking/glib-networking-2.32.1.tar.xz.sig
deleted file mode 100644
index 67c3cf7..0000000
Binary files a/gnome2-libs/glib-networking/glib-networking-2.32.1.tar.xz.sig
and /dev/null differ
diff --git a/gnome2-libs/glib-networking/glib-networking-2.32.3.tar.xz.sig
b/gnome2-libs/glib-networking/glib-networking-2.32.3.tar.xz.sig
new file mode 100644
index 0000000..e00f48d
Binary files /dev/null and
b/gnome2-libs/glib-networking/glib-networking-2.32.3.tar.xz.sig differ
diff --git a/gnome2-libs/gnome-python-desktop/HISTORY
b/gnome2-libs/gnome-python-desktop/HISTORY
index a33803f..893f401 100644
--- a/gnome2-libs/gnome-python-desktop/HISTORY
+++ b/gnome2-libs/gnome-python-desktop/HISTORY
@@ -1,3 +1,7 @@
+2012-06-01 Eric Sandall <sandalle AT sourcemage.org>
+ * PRE_BUILD: Apply metacity-2.34.2.patch
+ * metacity-2.34.2.patch: Fix compilation with metacity 2.34.2+
+
2010-09-30 Vasil Yonkov <spirtbrat AT sourcemage.org>
* DETAILS: updated spell to 2.32.0

diff --git a/gnome2-libs/gnome-python-desktop/PRE_BUILD
b/gnome2-libs/gnome-python-desktop/PRE_BUILD
new file mode 100755
index 0000000..2efd5fc
--- /dev/null
+++ b/gnome2-libs/gnome-python-desktop/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+message "${MESSAGE_COLOR}Applying metacity 2.34.2+ patch...${DEFAULT_COLOR}"
&&
+patch "${SOURCE_DIRECTORY}"/metacity/metacity.defs \
+ "${SPELL_DIRECTORY}"/metacity-2.34.2.patch
diff --git a/gnome2-libs/gnome-python-desktop/metacity-2.34.2.patch
b/gnome2-libs/gnome-python-desktop/metacity-2.34.2.patch
new file mode 100644
index 0000000..b2ca105
--- /dev/null
+++ b/gnome2-libs/gnome-python-desktop/metacity-2.34.2.patch
@@ -0,0 +1,45 @@
+# From comments in https://bugs.archlinux.org/task/29631 linking to
+#
http://pkgs.fedoraproject.org/gitweb/?p=gnome-python2-desktop.git;a=blob;f=gnome-python-desktop-2.32.0-metacity-build.patch
+From: Daniel Drake <dsd AT laptop.org>
+
+Fix build against metacity-2.34.2. The port to GSettings
+removed these constants from the codebase.
+
+Index: gnome-python-desktop-2.32.0/metacity/metacity.defs
+===================================================================
+--- gnome-python-desktop-2.32.0.orig/metacity/metacity.defs
++++ gnome-python-desktop-2.32.0/metacity/metacity.defs
+@@ -120,32 +120,6 @@
+ )
+ )
+
+-(define-enum FocusMode
+- (in-module "Meta")
+- (c-name "MetaFocusMode")
+-; (gtype-id "META_TYPE_FOCUS_MODE")
+- (values
+- '("click" "META_FOCUS_MODE_CLICK")
+- '("sloppy" "META_FOCUS_MODE_SLOPPY")
+- '("mouse" "META_FOCUS_MODE_MOUSE")
+- )
+-)
+-
+-(define-enum ActionTitlebar
+- (in-module "Meta")
+- (c-name "MetaActionTitlebar")
+-; (gtype-id "META_TYPE_ACTION_TITLEBAR")
+- (values
+- '("toggle-shade" "META_ACTION_TITLEBAR_TOGGLE_SHADE")
+- '("toggle-maximize" "META_ACTION_TITLEBAR_TOGGLE_MAXIMIZE")
+- '("minimize" "META_ACTION_TITLEBAR_MINIMIZE")
+- '("none" "META_ACTION_TITLEBAR_NONE")
+- '("lower" "META_ACTION_TITLEBAR_LOWER")
+- '("menu" "META_ACTION_TITLEBAR_MENU")
+- '("last" "META_ACTION_TITLEBAR_LAST")
+- )
+-)
+-
+ (define-enum FrameType
+ (in-module "Meta")
+ (c-name "MetaFrameType")
+
diff --git a/gnome2-libs/goffice/HISTORY b/gnome2-libs/goffice/HISTORY
index e26e828..ed633b5 100644
--- a/gnome2-libs/goffice/HISTORY
+++ b/gnome2-libs/goffice/HISTORY
@@ -1,3 +1,6 @@
+2012-05-29 Arjan Bouter <abouter AT sourcemage.org>
+ * PRE_BUILD: added a fix for pcre
+
2011-08-02 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 0.8.17

diff --git a/gnome2-libs/goffice/PRE_BUILD b/gnome2-libs/goffice/PRE_BUILD
new file mode 100755
index 0000000..abbc84c
--- /dev/null
+++ b/gnome2-libs/goffice/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd "${SOURCE_DIRECTORY}" &&
+# pcre_info is gone
+sedit 's/pcre_info (r, NULL, NULL)/pcre_fullinfo (r, NULL, 0, NULL)/'
goffice/utils/regutf8.c
diff --git a/gnome2-libs/gvfs/DEPENDS b/gnome2-libs/gvfs/DEPENDS
index 80ede76..04083de 100755
--- a/gnome2-libs/gvfs/DEPENDS
+++ b/gnome2-libs/gvfs/DEPENDS
@@ -4,10 +4,10 @@ depends intltool &&
depends expat &&
depends openssh &&

-optional_depends libsoup \
- "--enable-http" \
- "--disable-http" \
- "build with http/dav backend" &&
+optional_depends -sub SOUP_GNOME libsoup \
+ "--enable-http" \
+ "--disable-http" \
+ "build with http/dav backend" &&

optional_depends avahi \
"--enable-avahi" \
diff --git a/gnome2-libs/gvfs/DETAILS b/gnome2-libs/gvfs/DETAILS
index 8246d9a..8e0cc5c 100755
--- a/gnome2-libs/gvfs/DETAILS
+++ b/gnome2-libs/gvfs/DETAILS
@@ -1,5 +1,5 @@
SPELL=gvfs
- VERSION=1.12.1
+ VERSION=1.12.3
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 7511789..d0cf1e5 100644
--- a/gnome2-libs/gvfs/HISTORY
+++ b/gnome2-libs/gvfs/HISTORY
@@ -1,3 +1,9 @@
+2012-05-24 Vlad Glagolev <stealth AT sourcemage.org>
+ * DEPENDS: corrected dependency for HTTP/FTP support
+
+2012-05-16 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 1.12.3
+
2012-04-16 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.12.1

diff --git a/gnome2-libs/gvfs/gvfs-1.12.1.tar.xz.sig
b/gnome2-libs/gvfs/gvfs-1.12.1.tar.xz.sig
deleted file mode 100644
index f1a67cf..0000000
Binary files a/gnome2-libs/gvfs/gvfs-1.12.1.tar.xz.sig and /dev/null differ
diff --git a/gnome2-libs/gvfs/gvfs-1.12.3.tar.xz.sig
b/gnome2-libs/gvfs/gvfs-1.12.3.tar.xz.sig
new file mode 100644
index 0000000..7047664
Binary files /dev/null and b/gnome2-libs/gvfs/gvfs-1.12.3.tar.xz.sig differ
diff --git a/gnome2-libs/intltool/DEPENDS b/gnome2-libs/intltool/DEPENDS
index 5f83faa..361a782 100755
--- a/gnome2-libs/intltool/DEPENDS
+++ b/gnome2-libs/intltool/DEPENDS
@@ -1,4 +1,3 @@
-depends perl &&
+depends perl &&
depends xml-parser-expat &&
-depends xml-parser &&
depends popt
diff --git a/gnome2-libs/intltool/HISTORY b/gnome2-libs/intltool/HISTORY
index 8d8b37c..31244e4 100644
--- a/gnome2-libs/intltool/HISTORY
+++ b/gnome2-libs/intltool/HISTORY
@@ -1,9 +1,6 @@
2012-03-27 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 0.50.2

-2012-02-27 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
- * DEPENDS: added dependency on xml-parser
-
2011-09-26 Bor Kraljič <pyrobor AT ver.si>
* DETAILS: converted to upstream signature checking
* 23AE85D2.gpg: added gpg keyring
diff --git a/gnome2-libs/libglade2/DEPENDS b/gnome2-libs/libglade2/DEPENDS
index d473641..d49e8fd 100755
--- a/gnome2-libs/libglade2/DEPENDS
+++ b/gnome2-libs/libglade2/DEPENDS
@@ -2,6 +2,7 @@ depends expat &&
depends gtk+2 &&
depends libxml2 &&
depends python &&
+depends atk &&

sub_depends python expat &&

diff --git a/gnome2-libs/libglade2/HISTORY b/gnome2-libs/libglade2/HISTORY
index bcb0be9..2d287a6 100644
--- a/gnome2-libs/libglade2/HISTORY
+++ b/gnome2-libs/libglade2/HISTORY
@@ -1,3 +1,6 @@
+2012-05-26 Sukneet Basuta <sukneet AT sourcemage.org>
+ * DEPENDS: added depends atk
+
2009-03-22 Robin Cook <rcook AT wyrms.net>
* DETAILS: updated VERSION to 2.6.4

diff --git a/gnome2-libs/libsoup/DEPENDS b/gnome2-libs/libsoup/DEPENDS
index b7cf9bb..4635cdb 100755
--- a/gnome2-libs/libsoup/DEPENDS
+++ b/gnome2-libs/libsoup/DEPENDS
@@ -2,9 +2,10 @@ depends autoconf &&
depends automake &&
depends libtool &&
depends libxml2 &&
-depends glib2 &&
+depends glib2 &&
depends libgpg-error &&
depends sqlite &&
+depends -sub TLS glib-networking &&

if [[ $LIBSOUP_GNOME == "y" ]]; then
depends libproxy
@@ -16,9 +17,7 @@ if [[ $LIBSOUP_DEVEL == "y" ]]; then
sub_depends glib2 'GLIB_DEVEL'
fi &&

-depends glib-networking &&
-
optional_depends gtk-doc \
"--enable-gtk-doc" \
"--disable-gtk-doc" \
- "Build documenation with gtk-doc"
+ "Build documenation with gtk-doc"
diff --git a/gnome2-libs/libsoup/HISTORY b/gnome2-libs/libsoup/HISTORY
index aa5a00f..3804d4e 100644
--- a/gnome2-libs/libsoup/HISTORY
+++ b/gnome2-libs/libsoup/HISTORY
@@ -1,3 +1,6 @@
+2012-05-23 Vlad Glagolev <stealth AT sourcemage.org>
+ * DEPENDS: requires glib-networking built with TLS support
+
2012-04-17 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 2.38.1

diff --git a/gnome2-libs/pygobject/BUILD b/gnome2-libs/pygobject/BUILD
index c7d76f3..ea5c468 100755
--- a/gnome2-libs/pygobject/BUILD
+++ b/gnome2-libs/pygobject/BUILD
@@ -1,2 +1,5 @@
+if spell_ok pygobject3; then
+ OPTS="$OPTS --disable-introspection"
+fi &&
OPTS="$OPTS --enable-thread" &&
default_build
diff --git a/gnome2-libs/pygobject/DEPENDS b/gnome2-libs/pygobject/DEPENDS
index 909d1a4..d26c97a 100755
--- a/gnome2-libs/pygobject/DEPENDS
+++ b/gnome2-libs/pygobject/DEPENDS
@@ -2,7 +2,18 @@ depends python &&
depends glib2 &&
depends pycairo &&

-optional_depends gobject-introspection \
- "--enable-introspection" \
- "--disable-introspection" \
- "to enable introspection"
+# introspection in pygoject3 conflicts with introspection in pygobject
+# https://bugzilla.gnome.org/show_bug.cgi?id=657054
+#if ! spell_ok pygobject3; then
+
+ optional_depends gobject-introspection \
+ "--enable-introspection" \
+ "--disable-introspection" \
+ "to enable introspection"
+
+#fi &&
+
+optional_depends libffi \
+ "--with-ffi" \
+ "--without-ffi" \
+ "to enable libffi support"
diff --git a/gnome2-libs/pygobject/HISTORY b/gnome2-libs/pygobject/HISTORY
index 45aed17..70b14e7 100644
--- a/gnome2-libs/pygobject/HISTORY
+++ b/gnome2-libs/pygobject/HISTORY
@@ -1,3 +1,15 @@
+2012-06-11 Sukneet Basuta <sukneet AT sourcemage.org>
+ * BUILD: only build with introspection if pygobject3
+ does not have introspection enabled.
+ see https://bugzilla.gnome.org/show_bug.cgi?id=657054
+ * DEPENDS: only depend on gobject-introspection if pygobject3
+ does not have introspection enabled.
+ * PRE_BUILD: added, apply patch to fix introspection
+ * introspection.patch: added, remove depreciated references
+
+2012-05-18 Arjan Bouter <abouter AT sourcemage.org>
+ * DEPENDS: added missing optional dep on libffi
+
2012-02-13 Vlad Glagolev <stealth AT sourcemage.org>
* DEPENDS: added missing pycairo dep (fixes #361)

diff --git a/gnome2-libs/pygobject/PRE_BUILD b/gnome2-libs/pygobject/PRE_BUILD
new file mode 100755
index 0000000..9dafa11
--- /dev/null
+++ b/gnome2-libs/pygobject/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+
+patch -p0 < $SPELL_DIRECTORY/introspection.patch
diff --git a/gnome2-libs/pygobject/introspection.patch
b/gnome2-libs/pygobject/introspection.patch
new file mode 100644
index 0000000..0b63759
--- /dev/null
+++ b/gnome2-libs/pygobject/introspection.patch
@@ -0,0 +1,28 @@
+--- gi/pygi-info.c.orig 2011-06-13 16:30:25.000000000 +0000
++++ gi/pygi-info.c
+@@ -162,9 +162,6 @@ _pygi_info_new (GIBaseInfo *info)
+ case GI_INFO_TYPE_CONSTANT:
+ type = &PyGIConstantInfo_Type;
+ break;
+- case GI_INFO_TYPE_ERROR_DOMAIN:
+- type = &PyGIErrorDomainInfo_Type;
+- break;
+ case GI_INFO_TYPE_UNION:
+ type = &PyGIUnionInfo_Type;
+ break;
+@@ -481,7 +478,6 @@ _pygi_g_type_info_size (GITypeInfo *type
+ case GI_INFO_TYPE_INVALID:
+ case GI_INFO_TYPE_FUNCTION:
+ case GI_INFO_TYPE_CONSTANT:
+- case GI_INFO_TYPE_ERROR_DOMAIN:
+ case GI_INFO_TYPE_VALUE:
+ case GI_INFO_TYPE_SIGNAL:
+ case GI_INFO_TYPE_PROPERTY:
+@@ -860,7 +856,6 @@ pygi_g_struct_info_is_simple (GIStructIn
+ case GI_INFO_TYPE_INVALID:
+ case GI_INFO_TYPE_FUNCTION:
+ case GI_INFO_TYPE_CONSTANT:
+- case GI_INFO_TYPE_ERROR_DOMAIN:
+ case GI_INFO_TYPE_VALUE:
+ case GI_INFO_TYPE_SIGNAL:
+ case GI_INFO_TYPE_PROPERTY:
diff --git a/gnome3-libs/pygobject3/HISTORY b/gnome3-libs/pygobject3/HISTORY
index 1bc8e00..1fbfadc 100644
--- a/gnome3-libs/pygobject3/HISTORY
+++ b/gnome3-libs/pygobject3/HISTORY
@@ -1,3 +1,14 @@
+2012-06-11 Sukneet Basuta <sukneet AT sourcemage.org>
+ * UP_TRIGGERS: added, cast pygobject if pygobject
+ has gobject-introspection enabled, so it is built
+ without it. See https://bugzilla.gnome.org/show_bug.cgi?id=657054
+ It is not strictly necessary to for it to be recast since
+ the conflicting files are overwritten by pygobject3, but
+ some files are left over which I *assume* may lead to
+ unintentional consequences. It is recommended that pygobject2
+ be built without gobject-introspection if pygobect3 is
+ installed in either case.
+
2012-03-27 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 3.2.0

diff --git a/gnome3-libs/pygobject3/UP_TRIGGERS
b/gnome3-libs/pygobject3/UP_TRIGGERS
new file mode 100755
index 0000000..04704dc
--- /dev/null
+++ b/gnome3-libs/pygobject3/UP_TRIGGERS
@@ -0,0 +1,5 @@
+# introspection in pygoject3 conflicts with introspection in pygobject
+# https://bugzilla.gnome.org/show_bug.cgi?id=657054
+if is_depends_enabled pygobject gobject-introspection; then
+ up_trigger pygobject cast_self
+fi
diff --git a/graphics/bins/DEPENDS b/graphics/bins/DEPENDS
index a714a5d..2c65f82 100755
--- a/graphics/bins/DEPENDS
+++ b/graphics/bins/DEPENDS
@@ -12,4 +12,4 @@ depends text-iconv &&
depends text-unaccent &&
depends uri &&
depends xml-grove &&
-depends xml-parser
+depends xml-parser-expat
diff --git a/graphics/bins/HISTORY b/graphics/bins/HISTORY
index a71882a..7e90fab 100644
--- a/graphics/bins/HISTORY
+++ b/graphics/bins/HISTORY
@@ -1,3 +1,6 @@
+2012-05-25 Vlad Glagolev <stealth AT sourcemage.org>
+ * DEPENDS: xml-parser -> xml-parser-expat
+
2011-09-26 Bor Kraljič <pyrobor AT ver.si>
* DETAILS: converted to upstream signature checking
* 95D463F3.gpg: added gpg keyring
diff --git a/graphics/libgphoto2/DEPENDS b/graphics/libgphoto2/DEPENDS
index b8a47ff..337c2bf 100755
--- a/graphics/libgphoto2/DEPENDS
+++ b/graphics/libgphoto2/DEPENDS
@@ -22,7 +22,7 @@ optional_depends gd "" "" "for GD conversion support" &&
optional_depends libtool "--with-ltdl" "--without-ltdl" \
"an alternative way of opening shared libraries" &&

-optional_depends LIBUSB "" "" "enable use of cameras connected though the
USB port" &&
+optional_depends libusb-compat "" "" "enable use of cameras connected though
the USB port" &&

optional_depends dbus "" "" "for dbus support" &&
optional_depends hal "" "" "for HAL support" &&
diff --git a/graphics/libgphoto2/HISTORY b/graphics/libgphoto2/HISTORY
index 2a9966f..63008c9 100644
--- a/graphics/libgphoto2/HISTORY
+++ b/graphics/libgphoto2/HISTORY
@@ -1,3 +1,6 @@
+2012-06-11 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: LIBUSB => libusb-compat
+
2012-05-09 Treeve Jelbert <treeve AT sourcemage.org>
* DEPENDS: libusb => LIBUSB
add optional lockdev
diff --git a/http/apache22/HISTORY b/http/apache22/HISTORY
index 647088d..e47d6db 100644
--- a/http/apache22/HISTORY
+++ b/http/apache22/HISTORY
@@ -1,3 +1,6 @@
+2012-05-27 Remko van der Vossen <wich AT sourcemage.org>
+ * PRE_BUILD, pcre830.patch: copied pcre8.30 compat fix from upstream
+
2012-01-31 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 2.2.22; SECURITY_PATCH++ (CVE-2011-3368,
CVE-2011-3607, CVE-2011-4317, CVE-2012-0021, CVE-2012-0031,
diff --git a/http/apache22/PRE_BUILD b/http/apache22/PRE_BUILD
new file mode 100755
index 0000000..daad8c2
--- /dev/null
+++ b/http/apache22/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+patch -p4 < $SPELL_DIRECTORY/pcre830.patch
diff --git a/http/apache22/pcre830.patch b/http/apache22/pcre830.patch
new file mode 100644
index 0000000..c4009fb
--- /dev/null
+++ b/http/apache22/pcre830.patch
@@ -0,0 +1,20 @@
+--- httpd/httpd/branches/2.2.x/server/util_pcre.c 2005/11/10 15:20:05
332309
++++ httpd/httpd/branches/2.2.x/server/util_pcre.c 2012/04/04 18:19:19
1309513
+@@ -128,6 +128,7 @@
+ const char *errorptr;
+ int erroffset;
+ int options = 0;
++int nsub;
+
+ if ((cflags & AP_REG_ICASE) != 0) options |= PCRE_CASELESS;
+ if ((cflags & AP_REG_NEWLINE) != 0) options |= PCRE_MULTILINE;
+@@ -137,7 +138,9 @@
+
+ if (preg->re_pcre == NULL) return AP_REG_INVARG;
+
+-preg->re_nsub = pcre_info((const pcre *)preg->re_pcre, NULL, NULL);
++pcre_fullinfo((const pcre *)preg->re_pcre, NULL,
++ PCRE_INFO_CAPTURECOUNT, &nsub);
++preg->re_nsub = (apr_size_t)nsub;
+ return 0;
+ }
diff --git a/http/firefox/DETAILS b/http/firefox/DETAILS
index b75ffc9..22d6e7d 100755
--- a/http/firefox/DETAILS
+++ b/http/firefox/DETAILS
@@ -1,13 +1,13 @@
SPELL=firefox
if [[ $FIREFOX_CVS == y ]]; then
- VERSION=12.0
+ VERSION=13.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=12.0
+ VERSION=13.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=48
+ SECURITY_PATCH=49
fi
SOURCE2_IGNORE=signature
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/http/firefox/HISTORY b/http/firefox/HISTORY
index f9caefc..a673d2c 100644
--- a/http/firefox/HISTORY
+++ b/http/firefox/HISTORY
@@ -1,3 +1,8 @@
+2012-06-06 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 13.0, SECURITY_PATCH=49
+ * PRE_BUILD, mozconfig5: mozconfig5 -> mozconfig
+ * mozconfig: --disable-crashreporter added
+
2012-04-25 Pol Vinogradov <vin.public AT gmail.com>
* DETAILS: 12.0, SECURITY_PATCH=48

diff --git a/http/firefox/PRE_BUILD b/http/firefox/PRE_BUILD
index f62a6d3..8b10399 100755
--- a/http/firefox/PRE_BUILD
+++ b/http/firefox/PRE_BUILD
@@ -11,7 +11,7 @@ patch -p0 < $SPELL_DIRECTORY/glyph.patch &&
#
http://projects.archlinux.org/svntogit/packages.git/plain/trunk/firefox-install-dir.patch?h=packages/firefox
patch -p1 < $SPELL_DIRECTORY/install_dir.patch &&

-cp -v $SPELL_DIRECTORY/mozconfig5 .mozconfig &&
+cp -v $SPELL_DIRECTORY/mozconfig .mozconfig &&

if [[ "$FIREFOX_SAFE" == "y" ]]; then
sed -i '27iac_add_options --enable-safe-browsing' .mozconfig
diff --git a/http/firefox/mozconfig b/http/firefox/mozconfig
new file mode 100644
index 0000000..609fcbb
--- /dev/null
+++ b/http/firefox/mozconfig
@@ -0,0 +1,31 @@
+#
+# See http://www.mozilla.org/build/ for build instructions.
+#
+
+# Options for client.mk.
+mk_add_options MOZ_CO_PROJECT=browser
+mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/firefox-build
+mk_add_options AUTOCONF=autoconf2.13
+
+# Options for 'configure' (same as command-line options).
+ac_add_options --with-pthreads
+ac_add_options --with-system-jpeg=/usr/lib
+ac_add_options --with-system-zlib=/usr/lib
+ac_add_options --disable-system-png
+ac_add_options --enable-application=browser
+ac_add_options --disable-system-cairo
+ac_add_options --enable-default-toolkit=cairo-gtk2
+ac_add_options --disable-freetype2
+ac_add_options --enable-pango
+ac_add_options --enable-svg
+ac_add_options --with-system-nspr
+ac_add_options --with-system-nss
+ac_add_options --disable-dbus
+ac_add_options --disable-installer
+ac_add_options --disable-updater
+ac_add_options --disable-crashreporter
+ac_add_options --disable-tests
+ac_add_options --prefix=$INSTALL_ROOT/usr
+ac_add_options --mandir=$INSTALL_ROOT/usr
+ac_add_options --enable-optimize="$CFLAGS"
+ac_add_options --with-default-mozilla-five-home=/usr/lib/firefox
diff --git a/http/firefox/mozconfig5 b/http/firefox/mozconfig5
deleted file mode 100644
index 9e9d2f0..0000000
--- a/http/firefox/mozconfig5
+++ /dev/null
@@ -1,30 +0,0 @@
-#
-# See http://www.mozilla.org/build/ for build instructions.
-#
-
-# Options for client.mk.
-mk_add_options MOZ_CO_PROJECT=browser
-mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/firefox-build
-mk_add_options AUTOCONF=autoconf2.13
-
-# Options for 'configure' (same as command-line options).
-ac_add_options --with-pthreads
-ac_add_options --with-system-jpeg=/usr/lib
-ac_add_options --with-system-zlib=/usr/lib
-ac_add_options --disable-system-png
-ac_add_options --enable-application=browser
-ac_add_options --disable-system-cairo
-ac_add_options --enable-default-toolkit=cairo-gtk2
-ac_add_options --disable-freetype2
-ac_add_options --enable-pango
-ac_add_options --enable-svg
-ac_add_options --with-system-nspr
-ac_add_options --with-system-nss
-ac_add_options --disable-dbus
-ac_add_options --disable-installer
-ac_add_options --disable-updater
-ac_add_options --disable-tests
-ac_add_options --prefix=$INSTALL_ROOT/usr
-ac_add_options --mandir=$INSTALL_ROOT/usr
-ac_add_options --enable-optimize="$CFLAGS"
-ac_add_options --with-default-mozilla-five-home=/usr/lib/firefox
diff --git a/http/seamonkey/DETAILS b/http/seamonkey/DETAILS
index 3c9c4e5..3fd454e 100755
--- a/http/seamonkey/DETAILS
+++ b/http/seamonkey/DETAILS
@@ -1,13 +1,13 @@
SPELL=seamonkey
- VERSION=2.9.1
+ VERSION=2.10
SOURCE=$SPELL-$VERSION.source.tar.bz2
-
SOURCE_HASH=sha512:d1aea9283e3f49af6faf51e8629bb16eb9859ec961b674df1f7b9acd34cfa6deb2c0ef4e4391abb5e7b41d4f4f8c0e122ca9e226c42dae8de256159a2bd269c6
+
SOURCE_HASH=sha512:58ee8230174ac34183d68ed29baf3e601898fd5ba692de5856181fc48d0f96a022e17012d569960c75e640c00272e41aaa89ee3b0f34a561211fd22015a697d0
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
SOURCE_URL[1]=http://releases.mozilla.org/pub/mozilla.org/$SOURCE_URI
WEB_SITE=http://www.seamonkey-project.org/
- SECURITY_PATCH=42
+ SECURITY_PATCH=43
TMPFS=off
ENTERED=20010922
LICENSE[0]=MPL
diff --git a/http/seamonkey/HISTORY b/http/seamonkey/HISTORY
index 757d9a4..ed60146 100644
--- a/http/seamonkey/HISTORY
+++ b/http/seamonkey/HISTORY
@@ -1,3 +1,8 @@
+2012-06-10 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 2.10; SECURITY_PATCH++
+ * PRE_BUILD: fixed packaging for usage with system libs
+ * seamonkey-2.9_gcc-4.7-1.patch: dropped, fixed by upstream
+
2012-05-01 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 2.9.1
* PRE_BUILD, seamonkey-2.9_gcc-4.7-1.patch: patch from LFS added
diff --git a/http/seamonkey/PRE_BUILD b/http/seamonkey/PRE_BUILD
index 28b9254..98d515b 100755
--- a/http/seamonkey/PRE_BUILD
+++ b/http/seamonkey/PRE_BUILD
@@ -5,8 +5,8 @@ cd comm-release &&

sed -i 's#VPX_CODEC_USE_INPUT_PARTITION#VPX_CODEC_USE_INPUT_FRAGMENTS#'
mozilla/configure &&

-# This patch fixes various files to ensure that Seamonkey compiles with GCC
4.7
-patch -p1 < "$SPELL_DIRECTORY/seamonkey-2.9_gcc-4.7-1.patch" &&
+# ignore packaging errors for the libs we have in a system
+sedit "/^MOZ_PKG_FATAL_WARNINGS/s@= 1@= 0@" suite/installer/Makefile.in &&

patch -p0 < "$SPELL_DIRECTORY/ldap.patch" &&
patch -p0 < "$SPELL_DIRECTORY/mailnews.patch"
diff --git a/http/seamonkey/seamonkey-2.9_gcc-4.7-1.patch
b/http/seamonkey/seamonkey-2.9_gcc-4.7-1.patch
deleted file mode 100644
index e602338..0000000
--- a/http/seamonkey/seamonkey-2.9_gcc-4.7-1.patch
+++ /dev/null
@@ -1,320 +0,0 @@
-Submitted By: Andrew Benton <andy AT benton.eu.com>
-Date: 2012-04-23
-Initial Package Version: 12.0
-Upstream Status: Submitted to Mozilla Bugzilla bug #733867 (not by me)
-Origin: partly from http://gcc.gnu.org/gcc-4.7/porting_to.html and partly
from
-Mozilla Bugzilla bug #733867
-Description: Fixes compiling thunderbird-12.0 with gcc-4.7
-The same effect can be achieved with these seds:
-
-sed -i '/fcntl.h/a#include <unistd.h>' \
-mozilla/ipc/chromium/src/base/file_util_linux.cc
-sed -i '/fcntl.h/a#include <unistd.h>' \
-mozilla/ipc/chromium/src/base/message_pump_libevent.cc
-sed -i '/sys\/time\.h/a#include <unistd.h>' \
-mozilla/ipc/chromium/src/base/time_posix.cc
-sed -i 's#"MSG_LINEBREAK#" MSG_LINEBREAK#g;s#"CRLF#" CRLF#g' \
-mailnews/mime/src/mimemult.cpp \
-mailnews/mime/src/mimedrft.cpp \
-mailnews/local/src/nsPop3Protocol.cpp \
-mailnews/imap/src/nsImapServerResponseParser.cpp \
-mailnews/imap/src/nsImapProtocol.cpp \
-mailnews/imap/src/nsImapMailFolder.cpp \
-mailnews/compose/src/nsSmtpProtocol.cpp \
-mailnews/base/src/nsMsgFolderCompactor.cpp \
-mailnews/base/search/src/nsMsgSearchAdapter.cpp
-
-
-diff -Naur comm-release-orig/mailnews/base/search/src/nsMsgSearchAdapter.cpp
comm-release/mailnews/base/search/src/nsMsgSearchAdapter.cpp
---- comm-release-orig/mailnews/base/search/src/nsMsgSearchAdapter.cpp
2012-04-20 23:32:15.000000000 +0100
-+++ comm-release/mailnews/base/search/src/nsMsgSearchAdapter.cpp
2012-04-23 11:04:20.605341981 +0100
-@@ -688,7 +688,7 @@
- PL_strcat(encoding, "{");
- lengthStr.AppendInt((PRInt32) strlen(value));
- PL_strcat(encoding, lengthStr.get());
-- PL_strcat(encoding, "}"CRLF);
-+ PL_strcat(encoding, "}" CRLF);
- PL_strcat(encoding, value);
- return NS_OK;
- }
-diff -Naur comm-release-orig/mailnews/base/src/nsMsgFolderCompactor.cpp
comm-release/mailnews/base/src/nsMsgFolderCompactor.cpp
---- comm-release-orig/mailnews/base/src/nsMsgFolderCompactor.cpp
2012-04-20 23:32:15.000000000 +0100
-+++ comm-release/mailnews/base/src/nsMsgFolderCompactor.cpp 2012-04-23
11:04:20.588675565 +0100
-@@ -758,7 +758,7 @@
- }
- }
- }
--#define EXTRA_KEYWORD_HDR "
"MSG_LINEBREAK
-+#define EXTRA_KEYWORD_HDR "
" MSG_LINEBREAK
-
- // if status offset isn't in the first block, this code won't work.
There's no good reason
- // for the status offset not to be at the beginning of the message
anyway.
-@@ -1216,7 +1216,7 @@
- // check if there's an envelope header; if not, write one.
- if (strncmp(m_dataBuffer, "From ", 5))
- {
-- m_fileStream->Write("From "CRLF, 7, &bytesWritten);
-+ m_fileStream->Write("From " CRLF, 7, &bytesWritten);
- m_offlineMsgSize += bytesWritten;
- }
- }
-diff -Naur comm-release-orig/mailnews/compose/src/nsSmtpProtocol.cpp
comm-release/mailnews/compose/src/nsSmtpProtocol.cpp
---- comm-release-orig/mailnews/compose/src/nsSmtpProtocol.cpp 2012-04-20
23:32:15.000000000 +0100
-+++ comm-release/mailnews/compose/src/nsSmtpProtocol.cpp 2012-04-23
11:04:20.548676167 +0100
-@@ -1722,7 +1722,7 @@
- {
- m_sendDone = true;
- nsCOMPtr<nsIURI> url = do_QueryInterface(m_runningURL);
-- SendData(url, "QUIT"CRLF); // send a quit command to close the connection
with the server.
-+ SendData(url, "QUIT" CRLF); // send a quit command to close the
connection with the server.
- m_nextState = SMTP_RESPONSE;
- m_nextStateAfterResponse = SMTP_DONE;
- return(0);
-@@ -1969,7 +1969,7 @@
- {
- nsCOMPtr<nsIURI> url = do_QueryInterface(m_runningURL);
- // send a quit command to close the connection with the server.
-- if (SendData(url, "QUIT"CRLF) == NS_OK)
-+ if (SendData(url, "QUIT" CRLF) == NS_OK)
- {
- m_nextState = SMTP_RESPONSE;
- m_nextStateAfterResponse = SMTP_ERROR_DONE;
-diff -Naur comm-release-orig/mailnews/imap/src/nsImapMailFolder.cpp
comm-release/mailnews/imap/src/nsImapMailFolder.cpp
---- comm-release-orig/mailnews/imap/src/nsImapMailFolder.cpp 2012-04-20
23:32:15.000000000 +0100
-+++ comm-release/mailnews/imap/src/nsImapMailFolder.cpp 2012-04-23
11:04:20.535343034 +0100
-@@ -8309,7 +8309,7 @@
- bool needMoreData = false;
- char * newLine = nsnull;
- PRUint32 numBytesInLine = 0;
-- const char *envelope = "From "CRLF;
-+ const char *envelope = "From " CRLF;
- offlineStore->Write(envelope, strlen(envelope), &bytesWritten);
- fileSize += bytesWritten;
- do
-diff -Naur comm-release-orig/mailnews/imap/src/nsImapProtocol.cpp
comm-release/mailnews/imap/src/nsImapProtocol.cpp
---- comm-release-orig/mailnews/imap/src/nsImapProtocol.cpp 2012-04-20
23:32:15.000000000 +0100
-+++ comm-release/mailnews/imap/src/nsImapProtocol.cpp 2012-04-23
11:04:20.505343485 +0100
-@@ -1409,7 +1409,7 @@
- {
- // PRInt32 oldRecent = GetServerStateParser().NumberOfRecentMessages();
- nsCAutoString commandBuffer(GetServerCommandTag());
-- commandBuffer.Append(" IDLE"CRLF);
-+ commandBuffer.Append(" IDLE" CRLF);
-
- do
- {
-@@ -3287,7 +3287,7 @@
- commandString.Append(messageIds);
- commandString.Append(" (");
- commandString.Append(attribute);
-- commandString.Append(")"CRLF);
-+ commandString.Append(")" CRLF);
- nsresult rv = SendData(commandString.get());
-
- if (NS_SUCCEEDED(rv))
-@@ -5283,7 +5283,7 @@
-
- IncrementCommandTagNumber();
- nsCAutoString command(GetServerCommandTag());
-- command.Append(" expunge"CRLF);
-+ command.Append(" expunge" CRLF);
-
- nsresult rv = SendData(command.get());
- if (NS_SUCCEEDED(rv))
-@@ -5359,7 +5359,7 @@
- command.Append(gAppName);
- command.Append("\" \"version\" \"");
- command.Append(gAppVersion);
-- command.Append("\")"CRLF);
-+ command.Append("\")" CRLF);
-
- nsresult rv = SendData(command.get());
- if (NS_SUCCEEDED(rv))
-@@ -5816,7 +5816,7 @@
- nsCAutoString correctedPassword;
- EscapeUserNamePasswordString(password.get(), &correctedPassword);
- command.Append(correctedPassword);
-- command.Append("\""CRLF);
-+ command.Append("\"" CRLF);
- rv = SendData(command.get(), true /* suppress logging */);
- NS_ENSURE_SUCCESS(rv, rv);
- ParseIMAPandCheckForNewMail();
-@@ -7447,7 +7447,7 @@
- nsCString command(GetServerCommandTag());
- command += " create \"";
- command += escapedName;
-- command += "\""CRLF;
-+ command += "\"" CRLF;
-
- nsresult rv = SendData(command.get());
- if(NS_SUCCEEDED(rv))
-@@ -7550,7 +7550,7 @@
- nsCString command (GetServerCommandTag());
- command += " lsub \"\" \"";
- command += escapedPattern;
-- command += "\""CRLF;
-+ command += "\"" CRLF;
-
- PR_Free(boxnameWithOnlineDirectory);
-
-@@ -7579,7 +7579,7 @@
- command += useXLIST ?
- " xlist \"\" \"" : " list \"\" \"";
- command += escapedPattern;
-- command += "\""CRLF;
-+ command += "\"" CRLF;
-
- PR_Free(boxnameWithOnlineDirectory);
-
-@@ -7600,7 +7600,7 @@
- nsCString command (GetServerCommandTag());
- command += " subscribe \"";
- command += escapedName;
-- command += "\""CRLF;
-+ command += "\"" CRLF;
-
- nsresult rv = SendData(command.get());
- if (NS_SUCCEEDED(rv))
-@@ -7618,7 +7618,7 @@
- nsCString command (GetServerCommandTag());
- command += " unsubscribe \"";
- command += escapedName;
-- command += "\""CRLF;
-+ command += "\"" CRLF;
-
- nsresult rv = SendData(command.get());
- if (NS_SUCCEEDED(rv))
-@@ -7632,7 +7632,7 @@
- if (m_urlInProgress)
- return;
- nsCAutoString command (GetServerCommandTag());
-- command += " IDLE"CRLF;
-+ command += " IDLE" CRLF;
- nsresult rv = SendData(command.get());
- if (NS_SUCCEEDED(rv))
- {
-@@ -7659,7 +7659,7 @@
- nsCOMPtr <nsIAsyncInputStream> asyncInputStream =
do_QueryInterface(m_inputStream);
- if (asyncInputStream)
- asyncInputStream->AsyncWait(nsnull, 0, 0, nsnull);
-- nsresult rv = SendData("DONE"CRLF);
-+ nsresult rv = SendData("DONE" CRLF);
- // set a short timeout if we don't want to wait for a response
- if (m_transport && !waitForResponse)
- m_transport->SetTimeout(nsISocketTransport::TIMEOUT_READ_WRITE, 5);
-@@ -7728,8 +7728,8 @@
- PRUint32 msgsHandled = 0;
- const char *formatString;
- formatString = (idsAreUid)
-- ? "%s uid store %s %s"CRLF
-- : "%s store %s %s"CRLF;
-+ ? "%s uid store %s %s" CRLF
-+ : "%s store %s %s" CRLF;
-
- do
- {
-diff -Naur
comm-release-orig/mailnews/imap/src/nsImapServerResponseParser.cpp
comm-release/mailnews/imap/src/nsImapServerResponseParser.cpp
---- comm-release-orig/mailnews/imap/src/nsImapServerResponseParser.cpp
2012-04-20 23:32:15.000000000 +0100
-+++ comm-release/mailnews/imap/src/nsImapServerResponseParser.cpp
2012-04-23 11:04:20.452010953 +0100
-@@ -185,7 +185,7 @@
-
- NS_ASSERTION(aCurrentCommand && *aCurrentCommand != '\r' &&
- *aCurrentCommand != '\n' && *aCurrentCommand != ' ', "Invailid command
string");
-- bool sendingIdleDone = !strcmp(aCurrentCommand, "DONE"CRLF);
-+ bool sendingIdleDone = !strcmp(aCurrentCommand, "DONE" CRLF);
- if (sendingIdleDone)
- fWaitingForMoreClientInput = false;
-
-diff -Naur comm-release-orig/mailnews/local/src/nsPop3Protocol.cpp
comm-release/mailnews/local/src/nsPop3Protocol.cpp
---- comm-release-orig/mailnews/local/src/nsPop3Protocol.cpp 2012-04-20
23:32:16.000000000 +0100
-+++ comm-release/mailnews/local/src/nsPop3Protocol.cpp 2012-04-23
11:04:20.432011254 +0100
-@@ -2483,7 +2483,7 @@
- return(MK_OUT_OF_MEMORY);
- m_pop3ConData->next_state_after_response = POP3_GET_LIST;
- m_listpos = 0;
-- return SendData(m_url, "LIST"CRLF);
-+ return SendData(m_url, "LIST" CRLF);
- }
-
-
-diff -Naur comm-release-orig/mailnews/mime/src/mimedrft.cpp
comm-release/mailnews/mime/src/mimedrft.cpp
---- comm-release-orig/mailnews/mime/src/mimedrft.cpp 2012-04-20
23:32:16.000000000 +0100
-+++ comm-release/mailnews/mime/src/mimedrft.cpp 2012-04-23
11:04:20.408678271 +0100
-@@ -1473,7 +1473,7 @@
- *newbody = 0;
- PL_strcatn(newbody, newbodylen, "<PRE>");
- PL_strcatn(newbody, newbodylen, body);
-- PL_strcatn(newbody, newbodylen, "</PRE>"CRLF);
-+ PL_strcatn(newbody, newbodylen, "</PRE>" CRLF);
- PR_Free(body);
- body = newbody;
- }
-diff -Naur comm-release-orig/mailnews/mime/src/mimemult.cpp
comm-release/mailnews/mime/src/mimemult.cpp
---- comm-release-orig/mailnews/mime/src/mimemult.cpp 2012-04-20
23:32:16.000000000 +0100
-+++ comm-release/mailnews/mime/src/mimemult.cpp 2012-04-23
11:04:20.402011705 +0100
-@@ -280,7 +280,7 @@
- MimeWriteAString(obj, NS_LITERAL_CSTRING(MSG_LINEBREAK));
- MimeWriteAString(obj, NS_LITERAL_CSTRING("Content-Disposition:
attachment; filename=\""));
- MimeWriteAString(obj, fileName);
-- MimeWriteAString(obj, NS_LITERAL_CSTRING("\""MSG_LINEBREAK));
-+ MimeWriteAString(obj, NS_LITERAL_CSTRING("\"" MSG_LINEBREAK));
- MimeWriteAString(obj,
NS_LITERAL_CSTRING("X-Mozilla-External-Attachment-URL: "));
- MimeWriteAString(obj, obj->options->state->detachedFilePath);
- MimeWriteAString(obj, NS_LITERAL_CSTRING(MSG_LINEBREAK));
-@@ -293,10 +293,10 @@
- status = MimeWriteAString(obj, header);
- if (status < 0)
- return status;
-- status = MimeWriteAString(obj,
NS_LITERAL_CSTRING("\""MSG_LINEBREAK"Content-Transfer-Encoding:
8bit"MSG_LINEBREAK));
-+ status = MimeWriteAString(obj, NS_LITERAL_CSTRING("\""
MSG_LINEBREAK"Content-Transfer-Encoding: 8bit" MSG_LINEBREAK));
- MimeWriteAString(obj, NS_LITERAL_CSTRING("Content-Disposition:
inline; filename=\"Deleted: "));
- MimeWriteAString(obj, fileName);
-- MimeWriteAString(obj,
NS_LITERAL_CSTRING("\""MSG_LINEBREAK"X-Mozilla-Altered: AttachmentDeleted;
date=\""));
-+ MimeWriteAString(obj, NS_LITERAL_CSTRING("\""
MSG_LINEBREAK"X-Mozilla-Altered: AttachmentDeleted; date=\""));
- }
- nsCString result;
- char timeBuffer[128];
-@@ -306,8 +306,8 @@
- "%a %b %d %H:%M:%S %Y",
- &now);
- MimeWriteAString(obj, nsDependentCString(timeBuffer));
-- MimeWriteAString(obj, NS_LITERAL_CSTRING("\""MSG_LINEBREAK));
-- MimeWriteAString(obj, NS_LITERAL_CSTRING(MSG_LINEBREAK"You
deleted an attachment from this message. The original MIME headers for the
attachment were:"MSG_LINEBREAK));
-+ MimeWriteAString(obj, NS_LITERAL_CSTRING("\"" MSG_LINEBREAK));
-+ MimeWriteAString(obj, NS_LITERAL_CSTRING(MSG_LINEBREAK"You
deleted an attachment from this message. The original MIME headers for the
attachment were:" MSG_LINEBREAK));
- MimeHeaders_write_raw_headers(mult->hdrs, obj->options, false);
- }
- PRInt32 old_nchildren = container->nchildren;
-diff -Naur
comm-release-orig/mozilla/ipc/chromium/src/base/file_util_linux.cc
comm-release/mozilla/ipc/chromium/src/base/file_util_linux.cc
---- comm-release-orig/mozilla/ipc/chromium/src/base/file_util_linux.cc
2012-04-20 23:39:41.000000000 +0100
-+++ comm-release/mozilla/ipc/chromium/src/base/file_util_linux.cc
2012-04-23 11:03:54.892395244 +0100
-@@ -5,6 +5,7 @@
- #include "base/file_util.h"
-
- #include <fcntl.h>
-+#include <unistd.h>
-
- #include <string>
- #include <vector>
-diff -Naur
comm-release-orig/mozilla/ipc/chromium/src/base/message_pump_libevent.cc
comm-release/mozilla/ipc/chromium/src/base/message_pump_libevent.cc
---- comm-release-orig/mozilla/ipc/chromium/src/base/message_pump_libevent.cc
2012-04-20 23:39:41.000000000 +0100
-+++ comm-release/mozilla/ipc/chromium/src/base/message_pump_libevent.cc
2012-04-23 11:04:00.442311789 +0100
-@@ -6,6 +6,7 @@
-
- #include <errno.h>
- #include <fcntl.h>
-+#include <unistd.h>
-
- #include "eintr_wrapper.h"
- #include "base/logging.h"
-diff -Naur comm-release-orig/mozilla/ipc/chromium/src/base/time_posix.cc
comm-release/mozilla/ipc/chromium/src/base/time_posix.cc
---- comm-release-orig/mozilla/ipc/chromium/src/base/time_posix.cc
2012-04-20 23:39:42.000000000 +0100
-+++ comm-release/mozilla/ipc/chromium/src/base/time_posix.cc 2012-04-23
11:04:06.865548542 +0100
-@@ -8,6 +8,7 @@
- #include <mach/mach_time.h>
- #endif
- #include <sys/time.h>
-+#include <unistd.h>
- #ifdef ANDROID
- #include <time64.h>
- #else
diff --git a/http/surf/HISTORY b/http/surf/HISTORY
index fce6752..da2a64d 100644
--- a/http/surf/HISTORY
+++ b/http/surf/HISTORY
@@ -1,3 +1,7 @@
+2012-06-05 Sukneet Basuta <sukneet AT sourcemage.org>
+ * PRE_BUILD: ensure EDITOR has a value by sourcing
+ /etc/profile.d/editor.sh or defaulting to nano
+
2011-09-29 Ismael Luceno <ismael AT sourcemage.org>
* DEPENDS, DETAILS, DOWNLOAD, PREPARE: Use prepare_select_branch

diff --git a/http/surf/PRE_BUILD b/http/surf/PRE_BUILD
index 13e5708..3c877dc 100755
--- a/http/surf/PRE_BUILD
+++ b/http/surf/PRE_BUILD
@@ -6,8 +6,10 @@ if [[ "$SURF_CONFIG" == 'y' ]]; then
if [[ -e ${INSTALL_ROOT}/usr/share/doc/surf/config.def.h ]]; then
cp ${INSTALL_ROOT}/usr/share/doc/surf/config.def.h ./
fi &&
- if query 'Do you want to edit your config now?' n
- then
- ${EDITOR} config.def.h
+ if query 'Do you want to edit your config now?' n; then
+ if [ -z"$EDITOR" ]; then
+ . /etc/profile.d/editor.sh
+ fi
+ ${EDITOR:-nano} config.def.h
fi
fi
diff --git a/kernel.gpg b/kernel.gpg
index 5723551..66e30c8 100644
Binary files a/kernel.gpg and b/kernel.gpg differ
diff --git a/libs/glibc/DETAILS b/libs/glibc/DETAILS
index 44cbac3..82206a1 100755
--- a/libs/glibc/DETAILS
+++ b/libs/glibc/DETAILS
@@ -55,24 +55,38 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
local LINUX_DIRECTORY
LINUX_DIRECTORY=$(gaze where -path linux | sed "s/linux -> //")
. $LINUX_DIRECTORY/latest.defaults
-if [[ $(uname -r) = 3.* ]]; then
+
+ if [[ $(uname -r) = 3.* ]]; then
HEADERS_VERSION=$(echo $LATEST_maintenance_patches_3 | sed "s/patch-//")
HEADERS_VERSION=${HEADERS_VERSION:-$LATEST_3}
SOURCE3=linux-${LATEST_3}.tar.bz2
+ SOURCE3_URL="${KERNEL_URL}/pub/linux/kernel/v3.0/${SOURCE3}"
+ case $HEADERS_VERSION in
+ 3.[1-9]*)
+ SOURCE6="linux-${LATEST_3}.tar.sign"
+ SOURCE6_URL="${KERNEL_URL}/pub/linux/kernel/v3.0/${SOURCE6}"
+ ;;
+ *)
SOURCE6="${SOURCE3}.sign"
+ SOURCE6_URL="${SOURCE3_URL}.sign"
+ ;;
+ esac
SOURCE6_IGNORE=signature
SOURCE3_GPG="kernel.gpg:${SOURCE6}:ESTABLISHED_UPSTREAM_KEY"
- SOURCE3_URL="${KERNEL_URL}/pub/linux/kernel/v3.0/${SOURCE3}"
- SOURCE6_URL="${SOURCE3_URL}.sign"
- if [[ $HEADERS_VERSION != $LATEST_3 ]]; then
+ if [[ ${HEADERS_VERSION} != $LATEST_3 ]]; then
SOURCE7=patch-${HEADERS_VERSION}.bz2
+ SOURCE7_URL="${KERNEL_URL}/pub/linux/kernel/v3.0/${SOURCE7}"
+ if [[ ${HEADERS_VERSION} > 3.0.4 ]]; then
+ SOURCE8="patch-${HEADERS_VERSION}.sign"
+ SOURCE8_URL="${KERNEL_URL}/pub/linux/kernel/v3.0/${SOURCE8}"
+ else
SOURCE8="${SOURCE7}.sign"
+ SOURCE8_URL="${SOURCE7_URL}.sign"
+ fi
SOURCE8_IGNORE=signature
SOURCE7_GPG="kernel.gpg:${SOURCE8}:ESTABLISHED_UPSTREAM_KEY"
- SOURCE7_URL="${KERNEL_URL}/pub/linux/kernel/v3.0/${SOURCE7}"
- SOURCE8_URL="${SOURCE7_URL}.sign"
- fi
-else
+ fi
+ else
HEADERS_VERSION=$(echo $LATEST_maintenance_patches | sed "s/patch-//")
HEADERS_VERSION=${HEADERS_VERSION:-$LATEST_2_6}
SOURCE3=linux-${LATEST_2_6}.tar.bz2
@@ -81,15 +95,15 @@ else
SOURCE3_GPG="kernel.gpg:${SOURCE6}:ESTABLISHED_UPSTREAM_KEY"
SOURCE3_URL="${KERNEL_URL}/pub/linux/kernel/v2.6/${SOURCE3}"
SOURCE6_URL="${SOURCE3_URL}.sign"
- if [[ $HEADERS_VERSION != $LATEST_2_6 ]]; then
+ if [[ $HEADERS_VERSION != $LATEST_2_6 ]]; then
SOURCE7=patch-${HEADERS_VERSION}.bz2
SOURCE8="${SOURCE7}.sign"
SOURCE8_IGNORE=signature
SOURCE7_GPG="kernel.gpg:${SOURCE8}:ESTABLISHED_UPSTREAM_KEY"
SOURCE7_URL="${KERNEL_URL}/pub/linux/kernel/v2.6/${SOURCE7}"
SOURCE8_URL="${SOURCE7_URL}.sign"
- fi
-fi
+ fi
+ fi
fi
fi
WEB_SITE=http://www.gnu.org/software/libc
diff --git a/libs/glibc/HISTORY b/libs/glibc/HISTORY
index 7cc3658..5b8761c 100644
--- a/libs/glibc/HISTORY
+++ b/libs/glibc/HISTORY
@@ -1,3 +1,8 @@
+2012-05-15 Sukneet Basuta <sukneet AT sourcemage.org>
+ * DETAILS: fix SOURCE URLS for sigs of kernel versions >=3.0
+ * PRE_BUILD: correctly verify files with GPG for Kernel headers >=3.1
+ and patches >3.0.4
+
2011-09-20 Ismael Luceno <ismael AT sourcemage.org>
* DEPENDS, DETAILS, PREPARE: Use prepare_select_branch

diff --git a/libs/glibc/PRE_BUILD b/libs/glibc/PRE_BUILD
index 3ff8bad..55bde86 100755
--- a/libs/glibc/PRE_BUILD
+++ b/libs/glibc/PRE_BUILD
@@ -14,7 +14,21 @@ if [ "$GLIBC_NPTL" = "y" ]; then
persistent_add GLIBC_HEADERS_DIR &&
GLIBC_HEADERS_DIR=$SOURCE_DIRECTORY/${SOURCE3/.tar.bz2} &&

- unpack_file 3 &&
+ case ${HEADERS_VERSION} in
+ 3.[1-9]*)
+ message "${MESSAGE_COLOR}bunzip2
$SOURCE_CACHE/$SOURCE3${DEFAULT_COLOR}"
+ bunzip2 -k $SOURCE_CACHE/$SOURCE3
+ SOURCE3_ORI=$SOURCE3
+ SOURCE3=${SOURCE3/.bz2}
+ unpack_file 3 || return 1
+ message "${MESSAGE_COLOR}rm
$SOURCE_CACHE/$SOURCE3${DEFAULT_COLOR}"
+ rm $SOURCE_CACHE/$SOURCE3
+ SOURCE3=$SOURCE3_ORI
+ ;;
+ *)
+ unpack_file 3 || return 1
+ ;;
+ esac
if [[ $GLIBC_SANITIZE_HEADERS == n ]]; then
cd $GLIBC_HEADERS_DIR &&
if [ ! -z $SOURCE3 ]; then
@@ -24,10 +38,22 @@ if [ "$GLIBC_NPTL" = "y" ]; then
else
cd $GLIBC_HEADERS_DIR &&
if [ ! -z $SOURCE7 ]; then
- verify_file 7 || return 1 &&
- bzcat ${SOURCE_CACHE}/$SOURCE7 > ${SOURCE7%.bz2} &&
+ if [[ ${HEADERS_VERSION} > 3.0.4 ]]; then
+ message "${MESSAGE_COLOR}bunzip2
$SOURCE_CACHE/$SOURCE7${DEFAULT_COLOR}"
+ bunzip2 -k ${SOURCE_CACHE}/$SOURCE7 &&
+ SOURCE7_ORI=${SOURCE7}
+ SOURCE7=${SOURCE7/.bz2}
+ echo $SOURCE7_GPG
+ verify_file 7 || return 1
+ message "${MESSAGE_COLOR}rm $SOURCE_CACHE/$SOURCE7${DEFAULT_COLOR}"
+ rm $SOURCE_CACHE/$SOURCE7
+ SOURCE7=${SOURCE7_ORI}
+ else
+ verify_file 7 || return 1
+ fi
+ bzcat ${SOURCE_CACHE}/$SOURCE7 > ${SOURCE7/.bz2}
message "${MESSAGE_COLOR}Patching ${!patch}${DEFAULT_COLOR}" &&
- patch -p1 < ${SOURCE7%.bz2} &&
+ patch -p1 < ${SOURCE7/.bz2} &&
if [[ $? != 0 ]]; then
message "${PROBLEM_COLOR}Patch ${!patch} failed${DEFAULT_COLOR}" &&
return 1
diff --git a/libs/libevent/DETAILS b/libs/libevent/DETAILS
index cf958b4..24dfa14 100755
--- a/libs/libevent/DETAILS
+++ b/libs/libevent/DETAILS
@@ -1,5 +1,5 @@
SPELL=libevent
- VERSION=2.0.18
+ VERSION=2.0.19
SOURCE=$SPELL-$VERSION-stable.tar.gz
SOURCE2=$SOURCE.asc
SOURCE2_IGNORE=signature
diff --git a/libs/libevent/HISTORY b/libs/libevent/HISTORY
index 8495225..38426e6 100644
--- a/libs/libevent/HISTORY
+++ b/libs/libevent/HISTORY
@@ -1,3 +1,9 @@
+2012-06-09 Vlad Glagolev <stealth AT sourcemage.org>
+ * UP_TRIGGERS: don't compare when spell isn't installed
+
+2012-06-02 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 2.0.19
+
2012-04-24 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 2.0.18

diff --git a/libs/libevent/UP_TRIGGERS b/libs/libevent/UP_TRIGGERS
index b8aa116..4ef15ef 100755
--- a/libs/libevent/UP_TRIGGERS
+++ b/libs/libevent/UP_TRIGGERS
@@ -1,8 +1,8 @@
# up_trigger everything on major version updates

-spell_ok $SPELL && local OLD_SPELL_VERSION="$(installed_version $SPELL)"
+spell_ok $SPELL && local OLD_SPELL_VERSION="$(installed_version $SPELL)" ||
return 0

-if spell_ok $SPELL && [[ "${VERSION:0:1}" != "${OLD_SPELL_VERSION:0:1}" ]];
then
+if [[ "${VERSION:0:1}" != "${OLD_SPELL_VERSION:0:1}" ]]; then
message "This is a possibly incompatible update of $SPELL..." &&
message "Figuring out what spells need to be recast, this may take a
while." &&

diff --git a/libs/libvdpau/DETAILS b/libs/libvdpau/DETAILS
index 747d480..f5654dd 100755
--- a/libs/libvdpau/DETAILS
+++ b/libs/libvdpau/DETAILS
@@ -1,5 +1,6 @@
SPELL=libvdpau
VERSION=0.4.1
+ PATCHLEVEL=1
SOURCE="${SPELL}-${VERSION}.tar.gz"
SOURCE_URL[0]=http://people.freedesktop.org/~aplattner/vdpau/${SOURCE}

SOURCE_HASH=sha512:503d75e034bb5bd0695747e4a7b9ba4c1d207512eb636e08d6f75035ac020ea75af523574257efd08b084ee699268366dfa93d9d94ea07b03507b88f088a59a4
diff --git a/libs/libvdpau/HISTORY b/libs/libvdpau/HISTORY
index 2cf9a57..5499948 100644
--- a/libs/libvdpau/HISTORY
+++ b/libs/libvdpau/HISTORY
@@ -1,3 +1,6 @@
+2012-05-20 Sukneet Basuta <sukneet AT sourcemage.org>
+ * DETAILS: PATCHLEVEL=1
+
2012-04-19 Sukneet Basuta <sukneet AT sourcemage.org>
* TRIGGERS: added, needs to be recast when nvidia_driver is

diff --git a/libs/libxml2/CVE-2011-0216.patch
b/libs/libxml2/CVE-2011-0216.patch
deleted file mode 100644
index dfc99d4..0000000
--- a/libs/libxml2/CVE-2011-0216.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-commit 69f04562f75212bfcabecd190ea8b06ace28ece2
-Author: Daniel Veillard <veillard AT redhat.com>
-Date: Fri Aug 19 11:05:04 2011 +0800
-
- Fix an off by one error in encoding
-
- this off by one error doesn't seems to reproduce on linux
- but the error is real.
-
-diff --git a/encoding.c b/encoding.c
-index d1140bf..fb0c38a 100644
---- a/encoding.c
-+++ b/encoding.c
-@@ -1928,7 +1928,7 @@ xmlCharEncFirstLineInt(xmlCharEncodingHandler
*handler, xmlBufferPtr out,
- if (in == NULL) return(-1);
-
- /* calculate space available */
-- written = out->size - out->use;
-+ written = out->size - out->use - 1; /* count '\0' */
- toconv = in->use;
- /*
- * echo '<?xml version="1.0" encoding="UCS4"?>' | wc -c => 38
-@@ -2059,7 +2059,7 @@ xmlCharEncInFunc(xmlCharEncodingHandler * handler,
xmlBufferPtr out,
- toconv = in->use;
- if (toconv == 0)
- return (0);
-- written = out->size - out->use;
-+ written = out->size - out->use -1; /* count '\0' */
- if (toconv * 2 >= written) {
- xmlBufferGrow(out, out->size + toconv * 2);
- written = out->size - out->use - 1;
diff --git a/libs/libxml2/CVE-2011-1944.patch
b/libs/libxml2/CVE-2011-1944.patch
deleted file mode 100644
index 62dd5d2..0000000
--- a/libs/libxml2/CVE-2011-1944.patch
+++ /dev/null
@@ -1,100 +0,0 @@
-commit d7958b21e7f8c447a26bb2436f08402b2c308be4
-Author: Chris Evans <scarybeasts AT gmail.com>
-Date: Wed Mar 23 08:13:06 2011 +0800
-
- Fix some potential problems on reallocation failures
-
- The count was incremented before the allocation
- and not fixed in case of failure
- * xpath.c: corrects a few instances where the available count of some
- structure is updated before we know the allocation actually
- succeeds
-
-diff --git a/xpath.c b/xpath.c
-index 8b56189..608fe00 100644
---- a/xpath.c
-+++ b/xpath.c
-@@ -3522,13 +3522,13 @@ xmlXPathNodeSetAddNs(xmlNodeSetPtr cur, xmlNodePtr
node, xmlNsPtr ns) {
- } else if (cur->nodeNr == cur->nodeMax) {
- xmlNodePtr *temp;
-
-- cur->nodeMax *= 2;
-- temp = (xmlNodePtr *) xmlRealloc(cur->nodeTab, cur->nodeMax *
-+ temp = (xmlNodePtr *) xmlRealloc(cur->nodeTab, cur->nodeMax * 2 *
- sizeof(xmlNodePtr));
- if (temp == NULL) {
- xmlXPathErrMemory(NULL, "growing nodeset\n");
- return;
- }
-+ cur->nodeMax *= 2;
- cur->nodeTab = temp;
- }
- cur->nodeTab[cur->nodeNr++] = xmlXPathNodeSetDupNs(node, ns);
-@@ -3627,14 +3627,14 @@ xmlXPathNodeSetAddUnique(xmlNodeSetPtr cur,
xmlNodePtr val) {
- } else if (cur->nodeNr == cur->nodeMax) {
- xmlNodePtr *temp;
-
-- cur->nodeMax *= 2;
-- temp = (xmlNodePtr *) xmlRealloc(cur->nodeTab, cur->nodeMax *
-+ temp = (xmlNodePtr *) xmlRealloc(cur->nodeTab, cur->nodeMax * 2 *
- sizeof(xmlNodePtr));
- if (temp == NULL) {
- xmlXPathErrMemory(NULL, "growing nodeset\n");
- return;
- }
- cur->nodeTab = temp;
-+ cur->nodeMax *= 2;
- }
- if (val->type == XML_NAMESPACE_DECL) {
- xmlNsPtr ns = (xmlNsPtr) val;
-@@ -3738,14 +3738,14 @@ xmlXPathNodeSetMerge(xmlNodeSetPtr val1,
xmlNodeSetPtr val2) {
- } else if (val1->nodeNr == val1->nodeMax) {
- xmlNodePtr *temp;
-
-- val1->nodeMax *= 2;
-- temp = (xmlNodePtr *) xmlRealloc(val1->nodeTab, val1->nodeMax *
-+ temp = (xmlNodePtr *) xmlRealloc(val1->nodeTab, val1->nodeMax * 2
*
- sizeof(xmlNodePtr));
- if (temp == NULL) {
- xmlXPathErrMemory(NULL, "merging nodeset\n");
- return(NULL);
- }
- val1->nodeTab = temp;
-+ val1->nodeMax *= 2;
- }
- if (n2->type == XML_NAMESPACE_DECL) {
- xmlNsPtr ns = (xmlNsPtr) n2;
-@@ -3907,14 +3907,14 @@ xmlXPathNodeSetMergeAndClear(xmlNodeSetPtr set1,
xmlNodeSetPtr set2,
- } else if (set1->nodeNr >= set1->nodeMax) {
- xmlNodePtr *temp;
-
-- set1->nodeMax *= 2;
- temp = (xmlNodePtr *) xmlRealloc(
-- set1->nodeTab, set1->nodeMax * sizeof(xmlNodePtr));
-+ set1->nodeTab, set1->nodeMax * 2 * sizeof(xmlNodePtr));
- if (temp == NULL) {
- xmlXPathErrMemory(NULL, "merging nodeset\n");
- return(NULL);
- }
- set1->nodeTab = temp;
-+ set1->nodeMax *= 2;
- }
- if (n2->type == XML_NAMESPACE_DECL) {
- xmlNsPtr ns = (xmlNsPtr) n2;
-@@ -3991,14 +3991,14 @@ xmlXPathNodeSetMergeAndClearNoDupls(xmlNodeSetPtr
set1, xmlNodeSetPtr set2,
- } else if (set1->nodeNr >= set1->nodeMax) {
- xmlNodePtr *temp;
-
-- set1->nodeMax *= 2;
- temp = (xmlNodePtr *) xmlRealloc(
-- set1->nodeTab, set1->nodeMax * sizeof(xmlNodePtr));
-+ set1->nodeTab, set1->nodeMax * 2 * sizeof(xmlNodePtr));
- if (temp == NULL) {
- xmlXPathErrMemory(NULL, "merging nodeset\n");
- return(NULL);
- }
- set1->nodeTab = temp;
-+ set1->nodeMax *= 2;
- }
- set1->nodeTab[set1->nodeNr++] = n2;
- }
diff --git a/libs/libxml2/CVE-2011-2834.patch
b/libs/libxml2/CVE-2011-2834.patch
deleted file mode 100644
index cfc61e0..0000000
--- a/libs/libxml2/CVE-2011-2834.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-commit 1d4526f6f4ec8d18c40e2a09b387652a6c1aa2cd
-Author: Daniel Veillard <veillard AT redhat.com>
-Date: Tue Oct 11 16:34:34 2011 +0800
-
- Fix missing error status in XPath evaluation
-
- Started by Chris Evans, I added a few more place where the
- error should have been set in the evaluation context.
-
-diff --git a/xpath.c b/xpath.c
-index bcee2ea..d9d902c 100644
---- a/xpath.c
-+++ b/xpath.c
-@@ -2485,6 +2485,7 @@ valuePush(xmlXPathParserContextPtr ctxt,
xmlXPathObjectPtr value)
- sizeof(ctxt->valueTab[0]));
- if (tmp == NULL) {
- xmlGenericError(xmlGenericErrorContext, "realloc failed !\n");
-+ ctxt->error = XPATH_MEMORY_ERROR;
- return (0);
- }
- ctxt->valueMax *= 2;
-@@ -9340,6 +9341,7 @@ xmlXPathTranslateFunction(xmlXPathParserContextPtr
ctxt, int nargs) {
- if ( (ch & 0xc0) != 0xc0 ) {
- xmlGenericError(xmlGenericErrorContext,
- "xmlXPathTranslateFunction: Invalid UTF8 string\n");
-+ /* not asserting an XPath error is probably better */
- break;
- }
- /* then skip over remaining bytes for this char */
-@@ -9347,6 +9349,7 @@ xmlXPathTranslateFunction(xmlXPathParserContextPtr
ctxt, int nargs) {
- if ( (*cptr++ & 0xc0) != 0x80 ) {
- xmlGenericError(xmlGenericErrorContext,
- "xmlXPathTranslateFunction: Invalid UTF8
string\n");
-+ /* not asserting an XPath error is probably better
*/
- break;
- }
- if (ch & 0x80) /* must have had error encountered */
-@@ -13410,6 +13413,7 @@ xmlXPathCompOpEval(xmlXPathParserContextPtr ctxt,
xmlXPathStepOpPtr op)
- xmlGenericError(xmlGenericErrorContext,
- "xmlXPathCompOpEval: variable %s bound to undefined prefix
%s\n",
- (char *) op->value4, (char
*)op->value5);
-+ ctxt->error = XPATH_UNDEF_PREFIX_ERROR;
- return (total);
- }
- val = xmlXPathVariableLookupNS(ctxt->context,
-@@ -13464,6 +13468,7 @@ xmlXPathCompOpEval(xmlXPathParserContextPtr ctxt,
xmlXPathStepOpPtr op)
- "xmlXPathCompOpEval: function %s bound to undefined prefix
%s\n",
- (char *)op->value4, (char *)op->value5);
- xmlXPathPopFrame(ctxt, frame);
-+ ctxt->error = XPATH_UNDEF_PREFIX_ERROR;
- return (total);
- }
- func = xmlXPathFunctionLookupNS(ctxt->context,
-@@ -14042,6 +14047,7 @@ xmlXPathCompOpEval(xmlXPathParserContextPtr ctxt,
xmlXPathStepOpPtr op)
- }
- xmlGenericError(xmlGenericErrorContext,
- "XPath: unknown precompiled operation %d\n", op->op);
-+ ctxt->error = XPATH_INVALID_OPERAND;
- return (total);
- }
-
diff --git a/libs/libxml2/CVE-2011-3102.patch
b/libs/libxml2/CVE-2011-3102.patch
deleted file mode 100644
index ca3715c..0000000
--- a/libs/libxml2/CVE-2011-3102.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 39ef0e0c0a73d19d63a731525ce1f9de0c4a7d92 Mon Sep 17 00:00:00 2001
-From: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
-Date: Wed, 23 May 2012 09:57:06 +0200
-Subject: [PATCH] fix CVE-2011-3102
-
----
- xpointer.c | 15 ++++-----------
- 1 file changed, 4 insertions(+), 11 deletions(-)
-
-diff --git a/xpointer.c b/xpointer.c
-index 37afa3a..d37f0b1 100644
---- a/xpointer.c
-+++ b/xpointer.c
-@@ -1007,21 +1007,14 @@ xmlXPtrEvalXPtrPart(xmlXPathParserContextPtr ctxt,
xmlChar *name) {
- NEXT;
- break;
- }
-- *cur++ = CUR;
- } else if (CUR == '(') {
- level++;
-- *cur++ = CUR;
- } else if (CUR == '^') {
-- NEXT;
-- if ((CUR == ')') || (CUR == '(') || (CUR == '^')) {
-- *cur++ = CUR;
-- } else {
-- *cur++ = '^';
-- *cur++ = CUR;
-- }
-- } else {
-- *cur++ = CUR;
-+ if ((NXT(1) == ')') || (NXT(1) == '(') || (NXT(1) == '^')) {
-+ NEXT;
-+ }
- }
-+ *cur++ = CUR;
- NEXT;
- }
- *cur = 0;
---
-1.7.10.1
-
diff --git a/libs/libxml2/CVE-2011-3905.patch
b/libs/libxml2/CVE-2011-3905.patch
deleted file mode 100644
index 53373b7..0000000
--- a/libs/libxml2/CVE-2011-3905.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-commit 77404b8b69bc122d12231807abf1a837d121b551
-Author: Chris Evans <scarybeasts AT gmail.com>
-Date: Wed Dec 14 16:18:25 2011 +0800
-
- Make sure the parser returns when getting a Stop order
-
- patch backported from chromiun bug fixes, assuming author is Chris
-
-diff --git a/parser.c b/parser.c
-index 21d7aa3..4e5dcb9 100644
---- a/parser.c
-+++ b/parser.c
-@@ -4949,7 +4949,8 @@ xmlParsePI(xmlParserCtxtPtr ctxt) {
- (ctxt->sax->processingInstruction != NULL))
- ctxt->sax->processingInstruction(ctxt->userData,
- target, NULL);
-- ctxt->instate = state;
-+ if (ctxt->instate != XML_PARSER_EOF)
-+ ctxt->instate = state;
- return;
- }
- buf = (xmlChar *) xmlMallocAtomic(size * sizeof(xmlChar));
-@@ -5029,7 +5030,8 @@ xmlParsePI(xmlParserCtxtPtr ctxt) {
- } else {
- xmlFatalErr(ctxt, XML_ERR_PI_NOT_STARTED, NULL);
- }
-- ctxt->instate = state;
-+ if (ctxt->instate != XML_PARSER_EOF)
-+ ctxt->instate = state;
- }
- }
-
-@@ -9589,6 +9591,8 @@ xmlParseElement(xmlParserCtxtPtr ctxt) {
- else
- name = xmlParseStartTag(ctxt);
- #endif /* LIBXML_SAX1_ENABLED */
-+ if (ctxt->instate == XML_PARSER_EOF)
-+ return;
- if (name == NULL) {
- spacePop(ctxt);
- return;
-@@ -10975,6 +10979,8 @@ xmlParseTryOrFinish(xmlParserCtxtPtr ctxt, int
terminate) {
- else
- name = xmlParseStartTag(ctxt);
- #endif /* LIBXML_SAX1_ENABLED */
-+ if (ctxt->instate == XML_PARSER_EOF)
-+ goto done;
- if (name == NULL) {
- spacePop(ctxt);
- ctxt->instate = XML_PARSER_EOF;
-@@ -11161,7 +11167,9 @@ xmlParseTryOrFinish(xmlParserCtxtPtr ctxt, int
terminate) {
- else
- xmlParseEndTag1(ctxt, 0);
- #endif /* LIBXML_SAX1_ENABLED */
-- if (ctxt->nameNr == 0) {
-+ if (ctxt->instate == XML_PARSER_EOF) {
-+ /* Nothing */
-+ } else if (ctxt->nameNr == 0) {
- ctxt->instate = XML_PARSER_EPILOG;
- } else {
- ctxt->instate = XML_PARSER_CONTENT;
diff --git a/libs/libxml2/CVE-2011-3919.patch
b/libs/libxml2/CVE-2011-3919.patch
deleted file mode 100644
index b307e57..0000000
--- a/libs/libxml2/CVE-2011-3919.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-commit 5bd3c061823a8499b27422aee04ea20aae24f03e
-Author: Daniel Veillard <veillard AT redhat.com>
-Date: Fri Dec 16 18:53:35 2011 +0800
-
- Fix an allocation error when copying entities
-
-diff --git a/parser.c b/parser.c
-index 4e5dcb9..c55e41d 100644
---- a/parser.c
-+++ b/parser.c
-@@ -2709,7 +2709,7 @@ xmlStringLenDecodeEntities(xmlParserCtxtPtr ctxt,
const xmlChar *str, int len,
-
- buffer[nbchars++] = '&';
- if (nbchars > buffer_size - i - XML_PARSER_BUFFER_SIZE) {
-- growBuffer(buffer, XML_PARSER_BUFFER_SIZE);
-+ growBuffer(buffer, i + XML_PARSER_BUFFER_SIZE);
- }
- for (;i > 0;i--)
- buffer[nbchars++] = *cur++;
diff --git a/libs/libxml2/DEPENDS b/libs/libxml2/DEPENDS
index 14e1e4b..65e7151 100755
--- a/libs/libxml2/DEPENDS
+++ b/libs/libxml2/DEPENDS
@@ -1,13 +1,18 @@
optional_depends icu \
- "--with-icu" \
- "--without-icu" \
- "Unicode support" &&
+ "--with-icu" \
+ "--without-icu" \
+ "Unicode support" &&

optional_depends zlib \
"--with-zlib=${INSTALL_ROOT}/lib" \
"--without-zlib" \
"to build with zlib support" &&

+optional_depends xz-utils \
+ "--with-lzma=${INSTALL_ROOT}/usr/lib" \
+ "--without-lzma" \
+ "to build with LZMA support" &&
+
optional_depends python \
"--with-python" \
"--without-python" \
diff --git a/libs/libxml2/DETAILS b/libs/libxml2/DETAILS
index c3837e7..b094dd4 100755
--- a/libs/libxml2/DETAILS
+++ b/libs/libxml2/DETAILS
@@ -1,8 +1,7 @@
SPELL=libxml2
- VERSION=2.7.8
- PATCHLEVEL=1
+ VERSION=2.8.0
SECURITY_PATCH=7
-
SOURCE_HASH=sha512:cb5d88f95feffde6a805a7583306864ad9cc909e958a1044afc6d5864ec480da545343f25c10bba99be59c2344e98d4cd2dcc8a152407a0ce581a51ce214d6bc
+
SOURCE_HASH=sha512:e36ca96e5ba18f767346f1310c43d3c8c9a35c53252de18ad63ebce7f1f8df7ae40dd0719b2c6d78f5a64e61be154eec63a36ae738d29e93a9139c524a289ad4
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=ftp://xmlsoft.org/$SPELL/$SOURCE
diff --git a/libs/libxml2/HISTORY b/libs/libxml2/HISTORY
index c6f9c6f..d1aaa7f 100644
--- a/libs/libxml2/HISTORY
+++ b/libs/libxml2/HISTORY
@@ -1,3 +1,11 @@
+2012-05-24 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 2.8.0
+ * DEPENDS: added xz-utils opt dep for LZMA support
+ * PRE_BUILD, CVE-2011-0216.patch, CVE-2011-1944.patch,
+ CVE-2011-2834.patch, CVE-2011-3102.patch, CVE-2011-3905.patch,
+ CVE-2011-3919.patch, libxml2-2.7.8-xpath-freeing{,2}.patch,
+ libxml2-2.7.8-xpath-hardening.patch, libxml2-2.7.8.patch: dropped
+
2012-05-23 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* PRE_BUILD, CVE-2011-0216.patch, CVE-2011-1944.patch,
CVE-2011-2834.patch,
diff --git a/libs/libxml2/PRE_BUILD b/libs/libxml2/PRE_BUILD
deleted file mode 100755
index bc044af..0000000
--- a/libs/libxml2/PRE_BUILD
+++ /dev/null
@@ -1,12 +0,0 @@
-default_pre_build &&
-cd $SOURCE_DIRECTORY &&
-patch -p1 < $SPELL_DIRECTORY/libxml2-2.7.8.patch &&
-patch -p1 < $SPELL_DIRECTORY/libxml2-2.7.8-xpath-freeing.patch &&
-patch -p1 < $SPELL_DIRECTORY/libxml2-2.7.8-xpath-freeing2.patch &&
-patch -p1 < $SPELL_DIRECTORY/CVE-2011-1944.patch &&
-patch -p1 < $SPELL_DIRECTORY/libxml2-2.7.8-xpath-hardening.patch &&
-patch -p1 < $SPELL_DIRECTORY/CVE-2011-0216.patch &&
-patch -p1 < $SPELL_DIRECTORY/CVE-2011-2834.patch &&
-patch -p1 < $SPELL_DIRECTORY/CVE-2011-3905.patch &&
-patch -p1 < $SPELL_DIRECTORY/CVE-2011-3919.patch &&
-patch -p1 < $SPELL_DIRECTORY/CVE-2011-3102.patch
diff --git a/libs/libxml2/libxml2-2.7.8-xpath-freeing.patch
b/libs/libxml2/libxml2-2.7.8-xpath-freeing.patch
deleted file mode 100644
index 2844f4a..0000000
--- a/libs/libxml2/libxml2-2.7.8-xpath-freeing.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-commit df83c17e5a2646bd923f75e5e507bc80d73c9722
-Author: Daniel Veillard <veillard AT redhat.com>
-Date: Wed Nov 17 14:12:14 2010 +0100
-
- Fix a potential freeing error in XPath
-
-diff --git a/xpath.c b/xpath.c
-index 81e33f6..1447be5 100644
---- a/xpath.c
-+++ b/xpath.c
-@@ -11763,11 +11763,15 @@
xmlXPathCompOpEvalPositionalPredicate(xmlXPathParserContextPtr ctxt,
-
- if ((ctxt->error != XPATH_EXPRESSION_OK) || (res == -1)) {
- xmlXPathObjectPtr tmp;
-- /* pop the result */
-+ /* pop the result if any */
- tmp = valuePop(ctxt);
-- xmlXPathReleaseObject(xpctxt, tmp);
-- /* then pop off contextObj, which will be freed later */
-- valuePop(ctxt);
-+ if (tmp != contextObj)
-+ /*
-+ * Free up the result
-+ * then pop off contextObj, which will be freed later
-+ */
-+ xmlXPathReleaseObject(xpctxt, tmp);
-+ valuePop(ctxt);
- goto evaluation_error;
- }
-
diff --git a/libs/libxml2/libxml2-2.7.8-xpath-freeing2.patch
b/libs/libxml2/libxml2-2.7.8-xpath-freeing2.patch
deleted file mode 100644
index 714954d..0000000
--- a/libs/libxml2/libxml2-2.7.8-xpath-freeing2.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-commit fec31bcd452e77c10579467ca87a785b41115de6
-Author: Daniel Veillard <veillard AT redhat.com>
-Date: Thu Nov 18 11:07:24 2010 +0100
-
- Small fix for previous commit
-
-diff --git a/xpath.c b/xpath.c
-index 1447be5..8b56189 100644
---- a/xpath.c
-+++ b/xpath.c
-@@ -11765,13 +11765,14 @@
xmlXPathCompOpEvalPositionalPredicate(xmlXPathParserContextPtr ctxt,
- xmlXPathObjectPtr tmp;
- /* pop the result if any */
- tmp = valuePop(ctxt);
-- if (tmp != contextObj)
-+ if (tmp != contextObj) {
- /*
- * Free up the result
- * then pop off contextObj, which will be freed later
- */
- xmlXPathReleaseObject(xpctxt, tmp);
- valuePop(ctxt);
-+ }
- goto evaluation_error;
- }
-
diff --git a/libs/libxml2/libxml2-2.7.8-xpath-hardening.patch
b/libs/libxml2/libxml2-2.7.8-xpath-hardening.patch
deleted file mode 100644
index 7a4ad86..0000000
--- a/libs/libxml2/libxml2-2.7.8-xpath-hardening.patch
+++ /dev/null
@@ -1,223 +0,0 @@
-commit 0f136dcd18c287073a4d67b03fdb9696d7010940
-Author: Daniel Veillard <veillard AT redhat.com>
-Date: Thu Aug 18 17:10:13 2011 +0800
-
- Hardening of XPath evaluation
-
- Add a mechanism of frame for XPath evaluation when entering a function
- or a scoped evaluation, also fix a potential problem in predicate
- evaluation.
-
-diff --git a/include/libxml/xpath.h b/include/libxml/xpath.h
-index 1a9e30e..ddd9dd8 100644
---- a/include/libxml/xpath.h
-+++ b/include/libxml/xpath.h
-@@ -68,7 +68,8 @@ typedef enum {
- XPATH_UNDEF_PREFIX_ERROR,
- XPATH_ENCODING_ERROR,
- XPATH_INVALID_CHAR_ERROR,
-- XPATH_INVALID_CTXT
-+ XPATH_INVALID_CTXT,
-+ XPATH_STACK_ERROR
- } xmlXPathError;
-
- /*
-@@ -380,6 +381,8 @@ struct _xmlXPathParserContext {
- xmlXPathCompExprPtr comp; /* the precompiled expression */
- int xptr; /* it this an XPointer expression */
- xmlNodePtr ancestor; /* used for walking preceding axis */
-+
-+ int valueFrame; /* used to limit Pop on the stack */
- };
-
- /************************************************************************
-diff --git a/xpath.c b/xpath.c
-index b59ac5a..bcee2ea 100644
---- a/xpath.c
-+++ b/xpath.c
-@@ -252,6 +252,7 @@ static const char *xmlXPathErrorMessages[] = {
- "Encoding error\n",
- "Char out of XML range\n",
- "Invalid or incomplete context\n",
-+ "Stack usage errror\n",
- "?? Unknown error ??\n" /* Must be last in the list! */
- };
- #define MAXERRNO ((int)(sizeof(xmlXPathErrorMessages) / \
-@@ -2398,6 +2399,42 @@ xmlXPathCacheConvertNumber(xmlXPathContextPtr ctxt,
xmlXPathObjectPtr val) {
- ************************************************************************/
-
- /**
-+ * xmlXPathSetFrame:
-+ * @ctxt: an XPath parser context
-+ *
-+ * Set the callee evaluation frame
-+ *
-+ * Returns the previous frame value to be restored once done
-+ */
-+static int
-+xmlXPathSetFrame(xmlXPathParserContextPtr ctxt) {
-+ int ret;
-+
-+ if (ctxt == NULL)
-+ return(0);
-+ ret = ctxt->valueFrame;
-+ ctxt->valueFrame = ctxt->valueNr;
-+ return(ret);
-+}
-+
-+/**
-+ * xmlXPathPopFrame:
-+ * @ctxt: an XPath parser context
-+ * @frame: the previous frame value
-+ *
-+ * Remove the callee evaluation frame
-+ */
-+static void
-+xmlXPathPopFrame(xmlXPathParserContextPtr ctxt, int frame) {
-+ if (ctxt == NULL)
-+ return;
-+ if (ctxt->valueNr < ctxt->valueFrame) {
-+ xmlXPatherror(ctxt, __FILE__, __LINE__, XPATH_STACK_ERROR);
-+ }
-+ ctxt->valueFrame = frame;
-+}
-+
-+/**
- * valuePop:
- * @ctxt: an XPath evaluation context
- *
-@@ -2412,6 +2449,12 @@ valuePop(xmlXPathParserContextPtr ctxt)
-
- if ((ctxt == NULL) || (ctxt->valueNr <= 0))
- return (NULL);
-+
-+ if (ctxt->valueNr <= ctxt->valueFrame) {
-+ xmlXPatherror(ctxt, __FILE__, __LINE__, XPATH_STACK_ERROR);
-+ return (NULL);
-+ }
-+
- ctxt->valueNr--;
- if (ctxt->valueNr > 0)
- ctxt->value = ctxt->valueTab[ctxt->valueNr - 1];
-@@ -6154,6 +6197,7 @@ xmlXPathCompParserContext(xmlXPathCompExprPtr comp,
xmlXPathContextPtr ctxt) {
- ret->valueNr = 0;
- ret->valueMax = 10;
- ret->value = NULL;
-+ ret->valueFrame = 0;
-
- ret->context = ctxt;
- ret->comp = comp;
-@@ -11711,6 +11755,7 @@
xmlXPathCompOpEvalPositionalPredicate(xmlXPathParserContextPtr ctxt,
- xmlXPathObjectPtr contextObj = NULL, exprRes = NULL;
- xmlNodePtr oldContextNode, contextNode = NULL;
- xmlXPathContextPtr xpctxt = ctxt->context;
-+ int frame;
-
- #ifdef LIBXML_XPTR_ENABLED
- /*
-@@ -11730,6 +11775,8 @@
xmlXPathCompOpEvalPositionalPredicate(xmlXPathParserContextPtr ctxt,
- */
- exprOp = &ctxt->comp->steps[op->ch2];
- for (i = 0; i < set->nodeNr; i++) {
-+ xmlXPathObjectPtr tmp;
-+
- if (set->nodeTab[i] == NULL)
- continue;
-
-@@ -11757,23 +11804,25 @@
xmlXPathCompOpEvalPositionalPredicate(xmlXPathParserContextPtr ctxt,
- xmlXPathNodeSetAddUnique(contextObj->nodesetval,
- contextNode);
-
-+ frame = xmlXPathSetFrame(ctxt);
- valuePush(ctxt, contextObj);
- res = xmlXPathCompOpEvalToBoolean(ctxt, exprOp, 1);
-+ tmp = valuePop(ctxt);
-+ xmlXPathPopFrame(ctxt, frame);
-
- if ((ctxt->error != XPATH_EXPRESSION_OK) || (res == -1)) {
-- xmlXPathObjectPtr tmp;
-- /* pop the result if any */
-- tmp = valuePop(ctxt);
-- if (tmp != contextObj) {
-+ while (tmp != contextObj) {
- /*
- * Free up the result
- * then pop off contextObj, which will be freed later
- */
- xmlXPathReleaseObject(xpctxt, tmp);
-- valuePop(ctxt);
-+ tmp = valuePop(ctxt);
- }
- goto evaluation_error;
- }
-+ /* push the result back onto the stack */
-+ valuePush(ctxt, tmp);
-
- if (res)
- pos++;
-@@ -13377,7 +13426,9 @@ xmlXPathCompOpEval(xmlXPathParserContextPtr ctxt,
xmlXPathStepOpPtr op)
- xmlXPathFunction func;
- const xmlChar *oldFunc, *oldFuncURI;
- int i;
-+ int frame;
-
-+ frame = xmlXPathSetFrame(ctxt);
- if (op->ch1 != -1)
- total +=
- xmlXPathCompOpEval(ctxt, &comp->steps[op->ch1]);
-@@ -13385,15 +13436,18 @@ xmlXPathCompOpEval(xmlXPathParserContextPtr ctxt,
xmlXPathStepOpPtr op)
- xmlGenericError(xmlGenericErrorContext,
- "xmlXPathCompOpEval: parameter error\n");
- ctxt->error = XPATH_INVALID_OPERAND;
-+ xmlXPathPopFrame(ctxt, frame);
- return (total);
- }
-- for (i = 0; i < op->value; i++)
-+ for (i = 0; i < op->value; i++) {
- if (ctxt->valueTab[(ctxt->valueNr - 1) - i] == NULL) {
- xmlGenericError(xmlGenericErrorContext,
- "xmlXPathCompOpEval: parameter error\n");
- ctxt->error = XPATH_INVALID_OPERAND;
-+ xmlXPathPopFrame(ctxt, frame);
- return (total);
- }
-+ }
- if (op->cache != NULL)
- XML_CAST_FPTR(func) = op->cache;
- else {
-@@ -13409,6 +13463,7 @@ xmlXPathCompOpEval(xmlXPathParserContextPtr ctxt,
xmlXPathStepOpPtr op)
- xmlGenericError(xmlGenericErrorContext,
- "xmlXPathCompOpEval: function %s bound to undefined prefix
%s\n",
- (char *)op->value4, (char *)op->value5);
-+ xmlXPathPopFrame(ctxt, frame);
- return (total);
- }
- func = xmlXPathFunctionLookupNS(ctxt->context,
-@@ -13430,6 +13485,7 @@ xmlXPathCompOpEval(xmlXPathParserContextPtr ctxt,
xmlXPathStepOpPtr op)
- func(ctxt, op->value);
- ctxt->context->function = oldFunc;
- ctxt->context->functionURI = oldFuncURI;
-+ xmlXPathPopFrame(ctxt, frame);
- return (total);
- }
- case XPATH_OP_ARG:
-@@ -14333,6 +14389,7 @@ xmlXPathRunEval(xmlXPathParserContextPtr ctxt, int
toBool)
- ctxt->valueNr = 0;
- ctxt->valueMax = 10;
- ctxt->value = NULL;
-+ ctxt->valueFrame = 0;
- }
- #ifdef XPATH_STREAMING
- if (ctxt->comp->stream) {
-diff --git a/xpointer.c b/xpointer.c
-index 7a42d02..37afa3a 100644
---- a/xpointer.c
-+++ b/xpointer.c
-@@ -1269,6 +1269,7 @@ xmlXPtrEvalXPointer(xmlXPathParserContextPtr ctxt) {
- ctxt->valueNr = 0;
- ctxt->valueMax = 10;
- ctxt->value = NULL;
-+ ctxt->valueFrame = 0;
- }
- SKIP_BLANKS;
- if (CUR == '/') {
diff --git a/libs/libxml2/libxml2-2.7.8.patch
b/libs/libxml2/libxml2-2.7.8.patch
deleted file mode 100644
index a0b62bc..0000000
--- a/libs/libxml2/libxml2-2.7.8.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From 00819877651b87842ed878898ba17dba489820f0 Mon Sep 17 00:00:00 2001
-From: Daniel Veillard <veillard AT redhat.com>
-Date: Thu, 04 Nov 2010 20:53:14 +0000
-Subject: Reactivate the shared library versionning script
-
----
-diff --git a/configure.in b/configure.in
-index 59d0629..a1d2c89 100644
---- a/configure.in
-+++ b/configure.in
-@@ -84,7 +84,7 @@ else
- esac
- fi
- AC_SUBST(VERSION_SCRIPT_FLAGS)
--AM_CONDITIONAL([USE_VERSION_SCRIPT], [test -z "$VERSION_SCRIPT_FLAGS"])
-+AM_CONDITIONAL([USE_VERSION_SCRIPT], [test -n "$VERSION_SCRIPT_FLAGS"])
-
- dnl
- dnl We process the AC_ARG_WITH first so that later we can modify
---
-cgit v0.8.3.1
diff --git a/lxde/lxdm/HISTORY b/lxde/lxdm/HISTORY
index 90882be..c65b56c 100644
--- a/lxde/lxdm/HISTORY
+++ b/lxde/lxdm/HISTORY
@@ -1,3 +1,7 @@
+2012-05-19 Pol Vinogradov <vin.public AT gmail.com>
+ * PRE_BUILD, lxdm-0.4.1-high-cpu-load.patch: added high CPU load fix
+ from upstream SCM
+
2011-11-11 Arjan Bouter <abouter AT sourcemage.org>
* DEPENDS: give a choice between gtk 2 and 3, added optional
dep on libxcb
diff --git a/lxde/lxdm/PRE_BUILD b/lxde/lxdm/PRE_BUILD
index 5b7f691..0982fae 100755
--- a/lxde/lxdm/PRE_BUILD
+++ b/lxde/lxdm/PRE_BUILD
@@ -1,3 +1,4 @@
default_pre_build &&
cd ${SOURCE_DIRECTORY} &&
-rm
${SOURCE_DIRECTORY}/data/{PostLogin,PostLogout,PreLogin,PreReboot,PreShutdown,LoginReady,lxdm.conf}
+rm
${SOURCE_DIRECTORY}/data/{PostLogin,PostLogout,PreLogin,PreReboot,PreShutdown,LoginReady,lxdm.conf}
&&
+patch -p1 < ${SPELL_DIRECTORY}/lxdm-0.4.1-high-cpu-load.patch
diff --git a/lxde/lxdm/lxdm-0.4.1-high-cpu-load.patch
b/lxde/lxdm/lxdm-0.4.1-high-cpu-load.patch
new file mode 100644
index 0000000..3de9730
--- /dev/null
+++ b/lxde/lxdm/lxdm-0.4.1-high-cpu-load.patch
@@ -0,0 +1,27 @@
+From d4e41ecb36a1ea29482b75674d804bb0f05540b2 Mon Sep 17 00:00:00 2001
+From: dgod <dgod.osa AT gmail.com>
+Date: Sun, 25 Dec 2011 15:23:19 +0800
+Subject: [PATCH 1/1] fix event check bug caused cpu 100%
+
+---
+ src/lxcom.c | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/src/lxcom.c b/src/lxcom.c
+index 02763eb..18ee12e 100644
+--- a/src/lxcom.c
++++ b/src/lxcom.c
+@@ -89,7 +89,7 @@ static gboolean lxcom_prepare (GSource *source,gint
*timeout)
+
+ static gboolean lxcom_check(GSource *source)
+ {
+- return TRUE;
++ return (((LXComSource*)source)->poll.revents&G_IO_IN)?TRUE:FALSE;
+ }
+
+ static gboolean lxcom_dispatch (GSource *source,GSourceFunc
callback,gpointer user_data)
+--
+1.7.4.1
+
+
+
diff --git a/net/libpcap/BUILD b/net/libpcap/BUILD
new file mode 100755
index 0000000..6f9ce09
--- /dev/null
+++ b/net/libpcap/BUILD
@@ -0,0 +1,3 @@
+CFLAGS="-I$INSTALL_ROOT/usr/include/libnl3 $CFLAGS" &&
+
+default_build
diff --git a/net/libpcap/DEPENDS b/net/libpcap/DEPENDS
index 46f3a98..1d85d08 100755
--- a/net/libpcap/DEPENDS
+++ b/net/libpcap/DEPENDS
@@ -1,3 +1,12 @@
depends flex &&
depends bison &&
-optional_depends libnl '' '--without-libnl' 'nettlink support'
+
+optional_depends BLUEZ \
+ "--enable-bluetooth" \
+ "--disable-bluetooth" \
+ "for Bluetooth support" &&
+
+optional_depends libnl \
+ "--with-libnl" \
+ "--without-libnl" \
+ "for netlink support"
diff --git a/net/libpcap/HISTORY b/net/libpcap/HISTORY
index 7b5d9cb..2b3a32b 100644
--- a/net/libpcap/HISTORY
+++ b/net/libpcap/HISTORY
@@ -1,3 +1,9 @@
+2012-06-05 Vlad Glagolev <stealth AT sourcemage.org>
+ * BUILD: added, for missing flags
+ * DEPENDS: added optional depends on BLUEZ; corrected flags
+ * PRE_BUILD: added, to apply the patch
+ * libnl-3.patch: added, to make libnl dependency actually work
+
2012-01-03 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.2.1

diff --git a/net/libpcap/PRE_BUILD b/net/libpcap/PRE_BUILD
new file mode 100755
index 0000000..8a3b86d
--- /dev/null
+++ b/net/libpcap/PRE_BUILD
@@ -0,0 +1,6 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+
+patch -p0 < "$SPELL_DIRECTORY/libnl-3.patch" &&
+
+autoconf
diff --git a/net/libpcap/libnl-3.patch b/net/libpcap/libnl-3.patch
new file mode 100644
index 0000000..2ce5936
--- /dev/null
+++ b/net/libpcap/libnl-3.patch
@@ -0,0 +1,21 @@
+--- configure.in.orig 2012-01-02 04:47:37.000000000 +0400
++++ configure.in 2012-06-04 23:41:10.871001151 +0400
+@@ -431,14 +431,14 @@
+
+ if test x$with_libnl != xno ; then
+ #
+- # Try libnl 2.x first.
++ # Try libnl 3.x first.
+ #
+- AC_CHECK_LIB(nl, nl_socket_alloc,
++ AC_CHECK_LIB(nl-3, nl_socket_alloc,
+ [
+ #
+- # Yes, we have libnl 2.x.
++ # Yes, we have libnl 3.x.
+ #
+- LIBS="-lnl-genl -lnl $LIBS"
++ LIBS="-lnl-genl-3 -lnl-3 $LIBS"
+ AC_DEFINE(HAVE_LIBNL,1,[if libnl exists])
+ AC_DEFINE(HAVE_LIBNL_2_x,1,[if libnl exists and is
version 2.x])
+ ],
diff --git a/net/libproxy/DEPENDS b/net/libproxy/DEPENDS
index d403840..388756e 100755
--- a/net/libproxy/DEPENDS
+++ b/net/libproxy/DEPENDS
@@ -12,5 +12,6 @@ fi &&
optional_depends kdelibs4 '-DWITH_KDE4=1' '-DWITH_KDE4=0' 'KDE integration'
&&
optional_depends glib2 '-DWITH_GNOME3=1' '-DWITH_GNOME3=0' 'Gnome
support' &&
optional_depends xulrunner '' '' 'Mozilla support' &&
-optional_depends python '' '' "for Python bindings"
-
+optional_depends vala '-DWITH_VALA=1' '-DWITH_VALA=0' "for Vala
bindings" &&
+optional_depends perl '-DWITH_PERL=1' '-DWITH_PERL=0' "for Perl
bindings" &&
+optional_depends python '-DWITH_PYTHON=1' '-DWITH_PYTHON=0' "for Python
bindings"
diff --git a/net/libproxy/HISTORY b/net/libproxy/HISTORY
index 2016cfd..4d8cbab 100644
--- a/net/libproxy/HISTORY
+++ b/net/libproxy/HISTORY
@@ -1,3 +1,6 @@
+2012-05-25 Vlad Glagolev <stealth AT sourcemage.org>
+ * DEPENDS: added missing opt deps and flags
+
2012-03-10 Robin Cook <rcook AT wyrms.net>
* CONFIGURE: added option for which webkitgtk to use
* DEPENDS: changed to use configure option
diff --git a/net/mdnsresponder/BUILD b/net/mdnsresponder/BUILD
index 9848e46..337b05e 100755
--- a/net/mdnsresponder/BUILD
+++ b/net/mdnsresponder/BUILD
@@ -1,3 +1,2 @@
cd $SOURCE_DIRECTORY/mDNSPosix/ &&
-make_single &&
make os=linux
diff --git a/net/mdnsresponder/DETAILS b/net/mdnsresponder/DETAILS
index 3b642c4..03dc403 100755
--- a/net/mdnsresponder/DETAILS
+++ b/net/mdnsresponder/DETAILS
@@ -1,7 +1,7 @@
SPELL=mdnsresponder
- VERSION=107.6
+ VERSION=333.10
SOURCE=mDNSResponder-${VERSION}.tar.gz
-
SOURCE_HASH=sha512:c9485128fee5c5dfe90737eeef834d797afe53545c62010db8f56405c62a39b39c41c0616b08fc35d150be8fc595d71507662c51a5f0fb798d58b269b136f713
+
SOURCE_HASH=sha512:976502db2fcdf8d24cf81002179fd9ff38d2b8afb6a8183f424ebeee4e968bafb2dbcd9770424a71b3bda12bd2267093471ec31da30c6e4fc5d71eeba7b3e6c2

SOURCE_URL[0]=http://www.opensource.apple.com/darwinsource/tarballs/other/${SOURCE}
SOURCE_DIRECTORY=$BUILD_DIRECTORY/mDNSResponder-$VERSION
WEB_SITE=http://developer.apple.com/networking/bonjour/index.html
diff --git a/net/mdnsresponder/HISTORY b/net/mdnsresponder/HISTORY
index 62b2064..af306df 100644
--- a/net/mdnsresponder/HISTORY
+++ b/net/mdnsresponder/HISTORY
@@ -1,3 +1,7 @@
+2012-05-30 Julien "_kaze_" ROZO <julien AT rozo.org>
+ * DETAILS: updated version to 333.10
+ * BUILD: no longer fails to build with multiple make jobs
+
2008-03-16 Eric Sandall <sandalle AT sourcemage.org>
* BUILD: Fails to build with multiple make jobs

diff --git a/net/nfs-utils/DETAILS b/net/nfs-utils/DETAILS
index bc25096..a73e24a 100755
--- a/net/nfs-utils/DETAILS
+++ b/net/nfs-utils/DETAILS
@@ -1,6 +1,6 @@
SPELL=nfs-utils
VERSION=1.1.6
- PATCHLEVEL=1
+ PATCHLEVEL=2
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$SOURCEFORGE_URL/nfs/$SOURCE
diff --git a/net/nfs-utils/HISTORY b/net/nfs-utils/HISTORY
index 798c6ab..8cce150 100644
--- a/net/nfs-utils/HISTORY
+++ b/net/nfs-utils/HISTORY
@@ -1,3 +1,7 @@
+2012-05-16 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: PATCHLEVEL+=1
+ * volatiles: moved "/var/lib/nfs/xtab" here from global volatiles
+
2011-06-23 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: PATCHLEVEL=1
* PRE_BUILD: apply the patch
diff --git a/net/nfs-utils/volatiles b/net/nfs-utils/volatiles
old mode 100755
new mode 100644
index 3126cf7..3e63a49
--- a/net/nfs-utils/volatiles
+++ b/net/nfs-utils/volatiles
@@ -1,3 +1,4 @@
^/var/lib/nfs/etab$
^/var/lib/nfs/rmtab$
^/var/lib/nfs/state$
+^/var/lib/nfs/xtab$
diff --git a/net/tor.gpg b/net/tor.gpg
index b64da97..8fc8f2d 100644
Binary files a/net/tor.gpg and b/net/tor.gpg differ
diff --git a/net/tor/DETAILS b/net/tor/DETAILS
index 31961e9..beca5c9 100755
--- a/net/tor/DETAILS
+++ b/net/tor/DETAILS
@@ -4,8 +4,8 @@ if [ "$TOR_DEVEL" == "y" ]; then
VERSION=0.2.2.23-alpha
SECURITY_PATCH=4
else
- VERSION=0.2.2.35
- SECURITY_PATCH=6
+ VERSION=0.2.2.36
+ SECURITY_PATCH=7
fi

SOURCE=$SPELL-$VERSION.tar.gz
diff --git a/net/tor/HISTORY b/net/tor/HISTORY
index 738df05..d363c54 100644
--- a/net/tor/HISTORY
+++ b/net/tor/HISTORY
@@ -1,3 +1,7 @@
+2012-05-24 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 0.2.2.36; SECURITY_PATCH++ (several
security
+ fixes)
+
2011-12-17 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 0.2.2.35; SECURITY_PATCH++ (CVE-2011-2778)
* CONFIGURE: removed deprecated (2010-02) IPhone option; switched to
diff --git a/perl-cpan/xml-parser-expat/CONFLICTS
b/perl-cpan/xml-parser-expat/CONFLICTS
new file mode 100755
index 0000000..3c0d77e
--- /dev/null
+++ b/perl-cpan/xml-parser-expat/CONFLICTS
@@ -0,0 +1 @@
+conflicts xml-parser y
diff --git a/perl-cpan/xml-parser-expat/DETAILS
b/perl-cpan/xml-parser-expat/DETAILS
index ce6b180..1788940 100755
--- a/perl-cpan/xml-parser-expat/DETAILS
+++ b/perl-cpan/xml-parser-expat/DETAILS
@@ -1,11 +1,11 @@
SPELL=xml-parser-expat
- VERSION=2.40
-
SOURCE_HASH=sha512:ecb2af535a616f709c9e79e1e72e0bf875611c35b193b516d09896e0deba2dd1332173d16f5fb45e5630bb8019f852209dc3611b8c7a31c5eeed4f30cac288ab
+ VERSION=2.41
+
SOURCE_HASH=sha512:3536a1f048572611636c2461bb98c2b460b5658b960b5b0b2f2a7848cf0b7efb48593f12f7eb99be22c26f417cf443d66c88fcca7fdfa2f03c60f43624d30801
SOURCE=XML-Parser-$VERSION.tar.gz
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/XML-Parser-$VERSION
- SOURCE_URL[0]=$PERL_CPAN_URL/authors/id/C/CH/CHORNY/$SOURCE
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/XML-Parser-$VERSION"
+ SOURCE_URL[0]=$PERL_CPAN_URL/authors/id/T/TO/TODDR/$SOURCE
LICENSE=ART
- WEB_SITE=http://search.cpan.org/~msergeant/XML-Parser/
+ WEB_SITE=http://search.cpan.org/~toddr/XML-Parser/
ENTERED=20020314
KEYWORDS="parser perl"
SHORT="Flexible fast parser with plug-in styles"
diff --git a/perl-cpan/xml-parser-expat/HISTORY
b/perl-cpan/xml-parser-expat/HISTORY
index 3ca3171..ea07998 100644
--- a/perl-cpan/xml-parser-expat/HISTORY
+++ b/perl-cpan/xml-parser-expat/HISTORY
@@ -1,3 +1,7 @@
+2012-05-25 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 2.41; renewed source url
+ * CONFLICTS: conflicts with duplicate spell
+
2010-09-19 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 2.40
new SOURCE_URL
diff --git a/perl-cpan/xml-parser/BUILD b/perl-cpan/xml-parser/BUILD
index 2de29cd..27ba77d 100755
--- a/perl-cpan/xml-parser/BUILD
+++ b/perl-cpan/xml-parser/BUILD
@@ -1 +1 @@
-default_build_perl
+true
diff --git a/perl-cpan/xml-parser/DETAILS b/perl-cpan/xml-parser/DETAILS
index 4c3579a..4d1eff0 100755
--- a/perl-cpan/xml-parser/DETAILS
+++ b/perl-cpan/xml-parser/DETAILS
@@ -1,8 +1,9 @@
SPELL=xml-parser
VERSION=2.36
- SOURCE="XML-Parser-${VERSION}.tar.gz"
- SOURCE_URL[0]=$PERL_CPAN_URL/authors/id/M/MS/MSERGEANT/${SOURCE}
-
SOURCE_HASH=sha512:aadc1d5dcfddf7ad79f5cf05a9b8368d78418cea70b6550011d3ce099ab4eb8333b03ab478eb0faae361b27718e9c4e46f6eca16f68241f2a5c6096af6564110
+ PATCHLEVEL=1
+# SOURCE="XML-Parser-${VERSION}.tar.gz"
+# SOURCE_URL[0]=$PERL_CPAN_URL/authors/id/M/MS/MSERGEANT/${SOURCE}
+#
SOURCE_HASH=sha512:aadc1d5dcfddf7ad79f5cf05a9b8368d78418cea70b6550011d3ce099ab4eb8333b03ab478eb0faae361b27718e9c4e46f6eca16f68241f2a5c6096af6564110
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/XML-Parser-${VERSION}"
WEB_SITE="http://search.cpan.org/~COOPERCL/XML-Parser/";
LICENSE[0]=ART
diff --git a/perl-cpan/xml-parser/HISTORY b/perl-cpan/xml-parser/HISTORY
index 07ea9a4..fffd663 100644
--- a/perl-cpan/xml-parser/HISTORY
+++ b/perl-cpan/xml-parser/HISTORY
@@ -1,6 +1,9 @@
+2012-05-25 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS, {PRE_,}BUILD, INSTALL, UP_TRIGGERS: deprecated duplicate
+ spell in favour of xml-parser-expat
+
2009-09-22 Finn Haedicke <finn_haedicke AT gmx.net>
* DEPENDS: added expat

2009-09-17 David Kowis <dkowis AT shlrm.org>
* BUILD, DEPENDS, DETAILS: spell created
-
diff --git a/perl-cpan/xml-parser/INSTALL b/perl-cpan/xml-parser/INSTALL
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/perl-cpan/xml-parser/INSTALL
@@ -0,0 +1 @@
+true
diff --git a/perl-cpan/xml-parser/PRE_BUILD b/perl-cpan/xml-parser/PRE_BUILD
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/perl-cpan/xml-parser/PRE_BUILD
@@ -0,0 +1 @@
+true
diff --git a/perl-cpan/xml-parser/UP_TRIGGERS
b/perl-cpan/xml-parser/UP_TRIGGERS
new file mode 100755
index 0000000..879c503
--- /dev/null
+++ b/perl-cpan/xml-parser/UP_TRIGGERS
@@ -0,0 +1,2 @@
+up_trigger xml-parser dispel_self
+up_trigger xml-parser-expat cast_self
diff --git a/php-pear/php/DETAILS b/php-pear/php/DETAILS
index a161320..5c29c5c 100755
--- a/php-pear/php/DETAILS
+++ b/php-pear/php/DETAILS
@@ -13,7 +13,7 @@ if [[ $PHP5_BRANCH == stable ]]; then
SOURCE3=$SOURCE2.sig
SOURCE3_IGNORE=signature
SOURCE3_URL="http://download.suhosin.org/$SOURCE3";
- SOURCE2_GPG="$SOURCE3:suhosin.gpg:UPSTREAM_KEY"
+ SOURCE2_GPG="suhosin.gpg:$SOURCE3:UPSTREAM_KEY"
fi
elif [[ $PHP5_BRANCH == alpha ]]; then
VERSION=5.3.13
@@ -23,7 +23,7 @@ elif [[ $PHP5_BRANCH == alpha ]]; then
SECURITY_PATCH=17
elif [[ $PHP5_BRANCH == legacy ]]; then
VERSION=5.2.17
- SECURITY_PATCH=16
+ SECURITY_PATCH=17

SOURCE_HASH=sha512:baf3b5038468c9fa7c1a9e0506ed23559c21ba8df29380498a24e8d31c4c5f3633f29b1bc2faa3e59c6e5336536c09e19a5462b0a9d5916181c08f1f19abbca8
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_URL[0]=http://static.php.net/www.php.net/distributions/$SOURCE
@@ -33,9 +33,13 @@ elif [[ $PHP5_BRANCH == legacy ]]; then
SOURCE2=suhosin-patch-$VERSIONX-$VERSION2.patch.gz
SOURCE2_URL="http://download.suhosin.org/$SOURCE2";
SOURCE3=$SOURCE2.sig
+ SOURCE3_IGNORE=signature
SOURCE3_URL="http://download.suhosin.org/$SOURCE3";
- SOURCE2_GPG="$SOURCE3:suhosin.gpg:UPSTREAM_KEY"
+ SOURCE2_GPG="suhosin.gpg:$SOURCE3:UPSTREAM_KEY"
fi
+ SOURCE4=php52-backports-20120526.patch
+ SOURCE4_URL=http://php52-backports.googlecode.com/files/$SOURCE4
+
SOURCE4_HASH=sha512:d3650e2a7a33b69c4d55125956a141af702fa61a8e470edb143ab49c5865ba18a34659c90e1c28c70826a7b3659a9eeae063a30ee5f7d0e8d4cf96d76320fa9c
else
VERSION=5.3.13
SECURITY_PATCH=17
diff --git a/php-pear/php/HISTORY b/php-pear/php/HISTORY
index 63b5672..043d145 100644
--- a/php-pear/php/HISTORY
+++ b/php-pear/php/HISTORY
@@ -1,3 +1,9 @@
+2012-06-01 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated backports+security patches to 20120526; fixed
+ verification bug for suhosin patch
+ * PRE_BUILD: apply patch for legacy branch
+ * security-20110929.patch.bz2: removed
+
2012-05-09 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 5.3.13, SECURITY_PATCH=17

diff --git a/php-pear/php/PRE_BUILD b/php-pear/php/PRE_BUILD
index b02a038..b3c82e4 100755
--- a/php-pear/php/PRE_BUILD
+++ b/php-pear/php/PRE_BUILD
@@ -2,10 +2,11 @@ default_pre_build &&
cd "${SOURCE_DIRECTORY}" &&

if [[ $PHP5_BRANCH == legacy ]]; then
- bzcat "$SPELL_DIRECTORY/security-20110929.patch.bz2" | patch -p1
+ unpack_file 4 &&
+ patch -p1 < "${SOURCE_CACHE}/${SOURCE4}"
fi &&

if [[ "${PHP5_SUHOSIN}" == "y" ]]; then
- verify_source "${SOURCE2}" &&
+ unpack_file 2 &&
zcat "${SOURCE_CACHE}/${SOURCE2}" | patch -p1
fi
diff --git a/php-pear/php/security-20110929.patch.bz2
b/php-pear/php/security-20110929.patch.bz2
deleted file mode 100644
index a387f51..0000000
Binary files a/php-pear/php/security-20110929.patch.bz2 and /dev/null differ
diff --git a/printer/hplip/DETAILS b/printer/hplip/DETAILS
index d7b9bcd..703733b 100755
--- a/printer/hplip/DETAILS
+++ b/printer/hplip/DETAILS
@@ -1,5 +1,6 @@
SPELL=hplip
VERSION=3.12.4
+ PATCHLEVEL=1
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SOURCE.asc
SOURCE2_IGNORE=signature
diff --git a/printer/hplip/HISTORY b/printer/hplip/HISTORY
index d63e644..47e1d87 100644
--- a/printer/hplip/HISTORY
+++ b/printer/hplip/HISTORY
@@ -1,8 +1,13 @@
+2012-05-16 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: PATCHLEVEL=1
+ * volatiles: added "/var/lib/hp/hplip.state" here from global
volatiles
+
2012-05-09 Treeve Jelbert <treeve AT sourcemage.org>
* DEPENDS: libusb => LIBUSB

2012-04-23 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 3.12.4
+
2012-02-12 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 3.12.2

diff --git a/printer/hplip/volatiles b/printer/hplip/volatiles
new file mode 100644
index 0000000..5200e95
--- /dev/null
+++ b/printer/hplip/volatiles
@@ -0,0 +1 @@
+^/var/lib/hp/hplip.state$
diff --git a/python-pypi/pycrypto/DETAILS b/python-pypi/pycrypto/DETAILS
index b5c6fe4..6036134 100755
--- a/python-pypi/pycrypto/DETAILS
+++ b/python-pypi/pycrypto/DETAILS
@@ -1,5 +1,6 @@
SPELL=pycrypto
- VERSION=2.5
+ VERSION=2.6
+ SECURITY_PATCH=1
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SOURCE.asc
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/python-pypi/pycrypto/HISTORY b/python-pypi/pycrypto/HISTORY
index bf4b357..d741d90 100644
--- a/python-pypi/pycrypto/HISTORY
+++ b/python-pypi/pycrypto/HISTORY
@@ -1,3 +1,6 @@
+2012-05-28 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 2.6; SECURITY_PATCH++ (fixes
CVE-2012-2417)
+
2012-02-14 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 2.5

diff --git a/python-pypi/sqlalchemy/DEPENDS b/python-pypi/sqlalchemy/DEPENDS
index bad51c7..1c508f9 100755
--- a/python-pypi/sqlalchemy/DEPENDS
+++ b/python-pypi/sqlalchemy/DEPENDS
@@ -1,9 +1,7 @@
-depends python &&
-#depends formencode &&
-suggest_depends kinterbasdb "firebird support" &&
-suggest_depends mysql-python "MySQL support" &&
-suggest_depends pygresql "Postgresql support" &&
-suggest_depends pysqlite "sqlite support"
-#if is_depends_enabled $SPELL kinterbasdb;then
-# depends egenix-mx-base
-#fi
+depends python &&
+
+suggest_depends kinterbasdb "" "" "for Firebird support via Kinterbasedb" &&
+suggest_depends mysql-python "" "" "for MySQL support via MySQL-Python" &&
+suggest_depends psycopg2 "" "" "for PostgreSQL support via psycopg2" &&
+suggest_depends pysqlite "" "" "for SQLite support via pysqlite" &&
+suggest_depends -sub SQLITE python "" "" "for SQLite support via native
Python module"
diff --git a/python-pypi/sqlalchemy/DETAILS b/python-pypi/sqlalchemy/DETAILS
index 63bb09c..f0f1970 100755
--- a/python-pypi/sqlalchemy/DETAILS
+++ b/python-pypi/sqlalchemy/DETAILS
@@ -1,7 +1,7 @@
SPELL=sqlalchemy
CHEESESHOP_PKG=SQLAlchemy
- VERSION=0.7.6
-
SOURCE_HASH=sha512:1e5b2274a87542160c65cd6a09272e6dd45aef8f9499c29e5b0eef5cde961fcabbffb1ebe801d2815f480866816e71a3b0dabda8b77e74a778fac0541a379d47
+ VERSION=0.7.7
+
SOURCE_HASH=sha512:02ee0d77a54d1fd12993d29264f3f03f29a0fc18a10ea19e03ac7860f853954ca9ba45a6550591d76b729cc635cd562c02e8fcca23ec356c3af829b547a8bb62
SOURCE="$CHEESESHOP_PKG-$VERSION.tar.gz"

SOURCE_URL[0]=http://pypi.python.org/packages/source/S/$CHEESESHOP_PKG/$SOURCE
SOURCE_URL[1]=$SOURCEFORGE_URL/$SPELL/$SOURCE
diff --git a/python-pypi/sqlalchemy/HISTORY b/python-pypi/sqlalchemy/HISTORY
index 8090bad..aee5132 100644
--- a/python-pypi/sqlalchemy/HISTORY
+++ b/python-pypi/sqlalchemy/HISTORY
@@ -1,3 +1,7 @@
+2012-06-05 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 0.7.7
+ * DEPENDS: updated dependencies; fixed flags
+
2012-03-17 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.7.6

diff --git a/ruby-raa/ruby-1.8/DETAILS b/ruby-raa/ruby-1.8/DETAILS
index ee3aa29..864be02 100755
--- a/ruby-raa/ruby-1.8/DETAILS
+++ b/ruby-raa/ruby-1.8/DETAILS
@@ -1,11 +1,10 @@
SPELL=ruby-1.8
PACKAGE=ruby
- VERSION=1.8.7-p352
+ VERSION=1.8.7-p358
SOURCE=$PACKAGE-$VERSION.tar.bz2
-
SOURCE_HASH=sha512:30ac829da3cbddecb85318662780bca627eab72cad97882eac1ab20678d9609d603cfa9e33a80d701f7112a3445d94b2c8ce5ad82a6865ef86387d931d0a6a3d
- SECURITY_PATCH=9
- SOURCE_URL[0]=ftp://ftp.ruby-lang.org/pub/ruby/stable/$SOURCE
- SOURCE_URL[1]=ftp://www.ibiblio.org/pub/languages/ruby/$SOURCE
+
SOURCE_HASH=sha512:f5d3729cbf869ee8d24a8d73008de8591d7d3fbee7a935c3cd69f755008243e821e53405b1a62e46d6af847a749c73e7463aede091d63ff43e5b1e01ecf06199
+ SECURITY_PATCH=10
+ SOURCE_URL[0]=ftp://ftp.ruby-lang.org/pub/ruby/$SOURCE
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$PACKAGE-$VERSION"
LICENSE[0]=GPL
KEYWORDS="devel"
diff --git a/ruby-raa/ruby-1.8/HISTORY b/ruby-raa/ruby-1.8/HISTORY
index cf01e63..106030e 100644
--- a/ruby-raa/ruby-1.8/HISTORY
+++ b/ruby-raa/ruby-1.8/HISTORY
@@ -1,3 +1,7 @@
+2012-05-25 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 1.8.7-p358; SECURITY_PATCH++; updated
+ mirrorlist
+
2011-07-16 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 1.8.7-p352
SECURITY_PATCH++ (includes p334 patch for FileUtils vulnerability)
diff --git a/security/wireshark/DETAILS b/security/wireshark/DETAILS
index 66dc97a..651eb8e 100755
--- a/security/wireshark/DETAILS
+++ b/security/wireshark/DETAILS
@@ -1,11 +1,11 @@
SPELL=wireshark
- VERSION=1.6.7
- SECURITY_PATCH=35
+ VERSION=1.6.8
+ SECURITY_PATCH=36
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
SOURCE_URL[1]=http://www.wireshark.org/download/src/$SOURCE
-
SOURCE_HASH=sha512:6c96fc6bd32d5fc8888fdee54ae42d202155603b288210bfb2a764171dde5d73d6c39bae1258c6ffa45fc0e40fd456d5dd340415bb4900d6e7175a69f2727b48
+
SOURCE_HASH=sha512:1f2eae0b94632f0bc37dbab16afdba711e1b3c8b059390645c38523d114b2c2908ccd0c396fc0c3b89be8b6fb8a314fee7b1e16c57ce05e98bf88d923b55fc78
WEB_SITE=http://www.wireshark.org/
ENTERED=20020116
LICENSE[0]=GPL
diff --git a/security/wireshark/HISTORY b/security/wireshark/HISTORY
index cc71c6b..8d7a10a 100644
--- a/security/wireshark/HISTORY
+++ b/security/wireshark/HISTORY
@@ -1,3 +1,6 @@
+2012-05-23 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 1.6.8, SECURITY_PATCH=36
+
2012-04-07 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.6.7

diff --git a/smgl/castfs/BUILD b/smgl/castfs/BUILD
index 883fac3..5a8a35f 100755
--- a/smgl/castfs/BUILD
+++ b/smgl/castfs/BUILD
@@ -1,5 +1,5 @@
# fixes static compilation after 2011-05-26 in FUSE
-LDFLAGS="-ldl $LDFLAGS" &&
+LDFLAGS="-ldl -lpthread $LDFLAGS" &&

OPTS="$OPTS $STATIC_FUSE" &&
default_build
diff --git a/smgl/castfs/HISTORY b/smgl/castfs/HISTORY
index 694759f..abe8701 100644
--- a/smgl/castfs/HISTORY
+++ b/smgl/castfs/HISTORY
@@ -1,3 +1,6 @@
+2012-06-06 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * BUILD: added -lpthread to LDFLAGS to prevent link error
+
2012-05-15 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: register new triggers (PATCHLEVEL+=1)
* TRIGGERS: added, to recast statically-linked version on fuse update
diff --git a/smgl/init.d/DEPENDS b/smgl/init.d/DEPENDS
index b4da7f1..305bdcc 100755
--- a/smgl/init.d/DEPENDS
+++ b/smgl/init.d/DEPENDS
@@ -10,11 +10,13 @@ the old static /dev"
elif [[ $DEVICES == udev ]]
then
local KVER=$(get_kernel_version) &&
+ local VER1=${KVER/.*} &&
local VER2=$(echo $KVER | cut -d. -f2) &&
local VER3=$(echo $KVER | cut -d. -f3) &&
VER3=${VER3%%[^0-9]*} &&

- if (( VER2 > 6 )) ||
+ if (( VER1 > 2 )) ||
+ (( VER2 > 6 )) ||
(( VER2 == 6 && VER3 > 14 )) ||
spell_ok udev
then
diff --git a/smgl/init.d/HISTORY b/smgl/init.d/HISTORY
index d47336f..94acc8a 100644
--- a/smgl/init.d/HISTORY
+++ b/smgl/init.d/HISTORY
@@ -1,3 +1,9 @@
+2012-06-07 Sukneet Basuta <sukneet AT sourcemage.org>
+ * DEPENDS: make udev check for linux 3.x more robust
+
+2012-06-06 Sukneet Basuta <sukneet AT sourcemage.org>
+ * DEPENDS: fixed udev check for linux 3.x
+
2011-07-30 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 2.2.13
* init.d/devices: updated to work with linux 3
diff --git a/utils/gnuplot/BUILD b/utils/gnuplot/BUILD
index 95ff7a2..5937f40 100755
--- a/utils/gnuplot/BUILD
+++ b/utils/gnuplot/BUILD
@@ -1,6 +1,2 @@
OPTS="--without-tutorial $OPTS" &&
-
-if [[ $GNUPLOT_BRANCH == scm ]]; then
- ./prepare
-fi &&
default_build
diff --git a/utils/gnuplot/DEPENDS b/utils/gnuplot/DEPENDS
index 2d36ccf..c84f63e 100755
--- a/utils/gnuplot/DEPENDS
+++ b/utils/gnuplot/DEPENDS
@@ -13,7 +13,7 @@ optional_depends "readline"
\
"use gnu readline instead of builtin readline" &&

optional_depends xorg-libs --with-x --without-x "X11 output" &&
-optional_depends wxgtk --enable-wxwidgets --disable-wxwidgets \
+optional_depends wxgtk --enable-wxt --disable-wxt \
"wxWidgets interactive terminal" &&

optional_depends svgalib \
@@ -21,12 +21,15 @@ optional_depends svgalib \
"--without-linux-vga" \
"Linux SVGA console driver?" &&

-optional_depends lua51 "--with-lua" "--without-lua" \
+optional_depends lua "--with-lua" "--without-lua" \
"lua/TikZ terminal" &&

optional_depends cairo "--with-cairo" "--without-cairo" \
"cairo-based terminals" &&

+optional_depends qt4 "--enable-qt" "--disable-qt" \
+ "Qt-based interactive terminal" &&
+
if is_depends_enabled $SPELL wxgtk; then
depends cairo &&
depends pango
diff --git a/utils/gnuplot/DETAILS b/utils/gnuplot/DETAILS
index 7b69eaf..7e4552b 100755
--- a/utils/gnuplot/DETAILS
+++ b/utils/gnuplot/DETAILS
@@ -11,11 +11,11 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-cvs

SOURCE_URL[0]=cvs://:pserver:anonymous AT gnuplot.cvs.sourceforge.net:/cvsroot/gnuplot:gnuplot
SOURCE_IGNORE=volatile
else
- VERSION=4.4.3
+ VERSION=4.6.0
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
-
SOURCE_HASH=sha512:dc520e8074e00f8ba346451ca9e229c31907735185f0ed4ae066ad5f2caa799db04c28181729bef1af467af7341f3b721eba8a0d5ecd6988c5740351fe002fd6
+
SOURCE_HASH=sha512:a4358c20577f978215a22db041f4d369ab69a88624b2fe831d2a1124fffb84d4dafa7f0f5a8bfdb388c663073570adb084949195c6eebd0f11f9b0ac4485debc
fi
WEB_SITE=http://www.gnuplot.info
ENTERED=20020210
diff --git a/utils/gnuplot/FINAL b/utils/gnuplot/FINAL
index ab6596a..39f9e3d 100755
--- a/utils/gnuplot/FINAL
+++ b/utils/gnuplot/FINAL
@@ -1,3 +1,3 @@
-if [[ $GNUPLOT_LUA == "y" ]]; then
+if is_depends_enabled $SPELL lua; then
texhash
fi
diff --git a/utils/gnuplot/HISTORY b/utils/gnuplot/HISTORY
index eeab61b..42d40d3 100644
--- a/utils/gnuplot/HISTORY
+++ b/utils/gnuplot/HISTORY
@@ -1,3 +1,14 @@
+2012-06-11 Sukneet Basuta <sukneet AT sourcemage.org>
+ * PRE_BUILD: apply fix for automake-1.12
+ * automake-1.12.patch: added, patch for automake 1.12.
+ From upstream. Remove on next update.
+
+2012-05-25 Thomas Orgis <sobukus AT sourcemage.org>
+ * DETAILS: update to 4.6
+ * PRE_BUILD, BUILD, crossbuild.patch, FINAL, INSTALL, POST_REMOVE:
+ fix build and clean up the mess for Lua terminals that are upstream
now
+ * DEPENDS: add qt4
+
2011-12-17 Vlad Glagolev <stealth AT sourcemage.org>
* DEPENDS: lua -> lua51

diff --git a/utils/gnuplot/INSTALL b/utils/gnuplot/INSTALL
deleted file mode 100755
index 93b8063..0000000
--- a/utils/gnuplot/INSTALL
+++ /dev/null
@@ -1,8 +0,0 @@
-make install-strip &&
-if [[ $GNUPLOT_LUA == "y" ]]; then
- mkdir -p ${INSTALL_ROOT}/usr/share/texmf/tex/generic/gnuplot-lua-tikz &&
- cp $SOURCE_DIRECTORY/gnuplot_lua_terminal/*.sty \
- $INSTALL_ROOT/usr/share/texmf/tex/generic/gnuplot-lua-tikz &&
- cp $SOURCE_DIRECTORY/gnuplot_lua_terminal/gnuplot.lua \
- $INSTALL_ROOT/usr/libexec/gnuplot/4.2/gnuplot.lua
-fi
diff --git a/utils/gnuplot/POST_REMOVE b/utils/gnuplot/POST_REMOVE
index ab6596a..39f9e3d 100755
--- a/utils/gnuplot/POST_REMOVE
+++ b/utils/gnuplot/POST_REMOVE
@@ -1,3 +1,3 @@
-if [[ $GNUPLOT_LUA == "y" ]]; then
+if is_depends_enabled $SPELL lua; then
texhash
fi
diff --git a/utils/gnuplot/PRE_BUILD b/utils/gnuplot/PRE_BUILD
index 6c01f68..fa1663b 100755
--- a/utils/gnuplot/PRE_BUILD
+++ b/utils/gnuplot/PRE_BUILD
@@ -1,9 +1,14 @@
default_pre_build &&
-if [[ $GNUPLOT_LUA == "y" ]]; then
- cd $SOURCE_DIRECTORY &&
- unpack_file 2 &&
- cp $SOURCE_DIRECTORY/gnuplot_lua_terminal/lua.trm \
- $SOURCE_DIRECTORY/term &&
- echo '#include "lua.trm"' >> $SOURCE_DIRECTORY/src/term.h &&
- sedit 's/^LIBS = /LIBS = -llua /' $SOURCE_DIRECTORY/src/Makefile.in
+cd "$SOURCE_DIRECTORY" &&
+# Fix build that thinks we are cross-compiling.
+# Hopefully fixed in gnuplot 4.7 .
+patch -Np0 < "$SPELL_DIRECTORY/crossbuild.patch" &&
+
+patch -p0 < $SPELL_DIRECTORY/automake-1.12.patch &&
+
+# remove the true when removing the patch above
+if true || [[ $GNUPLOT_BRANCH == scm ]]; then
+ cd "$SOURCE_DIRECTORY" &&
+ autoreconf -iv
fi
+
diff --git a/utils/gnuplot/automake-1.12.patch
b/utils/gnuplot/automake-1.12.patch
new file mode 100644
index 0000000..30d976d
--- /dev/null
+++ b/utils/gnuplot/automake-1.12.patch
@@ -0,0 +1,36 @@
+--- Makefile.am 2012/01/14 08:18:00 1.20.2.1
++++ Makefile.am 2012/05/08 20:28:19 1.20.2.2
+@@ -1,5 +1,5 @@
+ ## Process this file with automake to produce Makefile.in -*-Makefile-*-
+-AUTOMAKE_OPTIONS = foreign 1.2h
++AUTOMAKE_OPTIONS = foreign
+
+ SUBDIRS = config m4 term src docs $(LISPDIR) man demo tutorial share
+
+--- src/Makefile.am 2012/01/19 07:03:27 1.86.2.3
++++ src/Makefile.am 2012/05/08 20:28:20 1.86.2.4
+@@ -1,5 +1,5 @@
+ ## Process this file with automake to produce Makefile.in -*-Makefile-*-
+-AUTOMAKE_OPTIONS = ansi2knr foreign 1.2h
++AUTOMAKE_OPTIONS = foreign
+
+ # in the spirit of automake ...
+ pkglibexecdir = $(libexecdir)/@PACKAGE@/@VERSION_MAJOR@
+--- configure.in 2012/04/26 22:53:11 1.297.2.14
++++ configure.in 2012/05/08 20:28:19 1.297.2.15
+@@ -20,11 +20,12 @@
+ dnl configure.in body
+
+ dnl Compiler characteristics
+-dnl Check for ANSI C prototypes, the const and inline keywords,
+-dnl and ANSI style stringification
++dnl Check for the const and inline keywords and ANSI style stringification
++dnl automake 1.12 dropped support for AM_C_PROTOTYPES and ansi2knr
++dnl But our code still tests for #ifdef PROTOTYPES, so define it here
++AC_DEFINE(PROTOTYPES,1,[Automake 1.12 dropped support for building without
prototypes])
+ AC_GNU_SOURCE
+ AC_PROG_CC
+-AM_C_PROTOTYPES
+ AC_PROG_CPP
+ AC_C_CONST
+ AC_C_INLINE
diff --git a/utils/gnuplot/crossbuild.patch b/utils/gnuplot/crossbuild.patch
new file mode 100644
index 0000000..2235abe
--- /dev/null
+++ b/utils/gnuplot/crossbuild.patch
@@ -0,0 +1,14 @@
+--- configure.in.orig 2012-05-25 09:37:33.000000000 +0200
++++ configure.in 2012-05-25 09:40:29.000000000 +0200
+@@ -31,6 +31,11 @@
+ AC_C_STRINGIZE
+ AC_PROG_LN_S
+
++# hack to avoid false alarm for cross build
++# should not be needed!
++test -z "${build}" && build="${host}"
++test -z "${host}" && host="${build}"
++
+ if test "${build}" != "${host}"
+ then
+ CC=${CC-${host_alias}-gcc}
diff --git a/utils/sudo/DETAILS b/utils/sudo/DETAILS
index 984ab07..192ae56 100755
--- a/utils/sudo/DETAILS
+++ b/utils/sudo/DETAILS
@@ -1,5 +1,5 @@
SPELL=sudo
- VERSION=1.8.4p4
+ VERSION=1.8.5p1
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=ftp://ftp.sudo.ws/pub/$SPELL/$SOURCE
@@ -8,7 +8,7 @@ SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
SOURCE2_URL[1]=${SOURCE_URL[1]}.sig
SOURCE2_IGNORE=signature
- SECURITY_PATCH=7
+ SECURITY_PATCH=8
SOURCE_GPG=sudo.gpg:$SOURCE.sig:UPSTREAM_KEY
WEB_SITE=http://www.courtesan.com/sudo
KEYWORDS="utils"
diff --git a/utils/sudo/HISTORY b/utils/sudo/HISTORY
index 6539458..fd3ae96 100644
--- a/utils/sudo/HISTORY
+++ b/utils/sudo/HISTORY
@@ -1,3 +1,6 @@
+2012-05-24 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 1.8.5p1; SECURITY_PATCH++ (CVE 2012-2337)
+
2012-03-13 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 1.8.4p4

diff --git a/video/ffmpeg-svn/DEPENDS b/video/ffmpeg-svn/DEPENDS
index 5541870..474dcc8 100755
--- a/video/ffmpeg-svn/DEPENDS
+++ b/video/ffmpeg-svn/DEPENDS
@@ -44,13 +44,12 @@ optional_depends x264 \
"--enable-libx264" \
"" \
"h.264" &&
-optional_depends dirac \
- '--enable-libdirac' \
- '--disable-decoder=libdirac' \
- 'dirac encoder' &&
optional_depends schroedinger \
'--enable-libschroedinger' \
'--disable-encoder=libschroedinger' \
- 'schroedinger decoder'
-
+ 'schroedinger decoder' &&
+optional_depends libvpx \
+ "--enable-libvpx" \
+ "" \
+ "VP8 support"

diff --git a/video/ffmpeg-svn/HISTORY b/video/ffmpeg-svn/HISTORY
index 17eed91..3ae94fd 100644
--- a/video/ffmpeg-svn/HISTORY
+++ b/video/ffmpeg-svn/HISTORY
@@ -1,3 +1,10 @@
+2012-06-04 Sukneet Basuta <sukneet AT sourcemage.org>
+ * DEPENDS: remove optional_depends dirac
+ replaced by schroedinger
+
+2012-05-12 Ismael Luceno <ismael AT sourcemage.org>
+ * DEPENDS: Added optional dependency on libvpx
+
2012-04-27 Vlad Glagolev <stealth AT sourcemage.org>
* DEPENDS: subversion -> git

diff --git a/video/mplayer2/DEPENDS b/video/mplayer2/DEPENDS
index a28ed50..c4cf995 100755
--- a/video/mplayer2/DEPENDS
+++ b/video/mplayer2/DEPENDS
@@ -32,8 +32,10 @@ optional_depends x264 "" "" "for x264 codec"
optional_depends twolame "" "" "Twolame (MPEG layer 2 audio) support in
mencoder" &&

# audio devices
-optional_depends esound "" "--disable-esd" "for direct esd audio output" &&
-optional_depends arts "" "--disable-arts" "for arts audio output" &&
+if [ "$MPLAYER2_BRANCH" != "scm" ]; then
+ optional_depends esound "" "--disable-esd" "for direct esd audio output"
&&
+ optional_depends arts "" "--disable-arts" "for arts audio output"
+fi &&
optional_depends alsa-lib "" "--disable-alsa" "for alsa audio output" &&
optional_depends nas "" "--disable-nas" "for NAS audio output" &&
optional_depends pulseaudio "" "--disable-pulse" "for pulseaudio audio
output" &&
diff --git a/video/mplayer2/DETAILS b/video/mplayer2/DETAILS
index e64d3d5..018512a 100755
--- a/video/mplayer2/DETAILS
+++ b/video/mplayer2/DETAILS
@@ -6,7 +6,7 @@ if [ "$MPLAYER2_BRANCH" == "scm" ]; then
VERSION=git
fi
SOURCE=$SPELL-git.tar.bz2
- SOURCE_URL[0]=git_http://git.mplayer2.org/$SPELL:$SPELL-git
+ SOURCE_URL[0]=git://git.mplayer2.org/$SPELL:$SPELL-git
SOURCE_IGNORE=volatile
FORCE_DOWNLOAD=on
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-git
diff --git a/video/mplayer2/HISTORY b/video/mplayer2/HISTORY
index caa59db..457812c 100644
--- a/video/mplayer2/HISTORY
+++ b/video/mplayer2/HISTORY
@@ -1,3 +1,7 @@
+2012-05-29 Pol Vinogradov <vin.public AT gmail.com>
+ * DETAILS: git_http -> git in scm branch
+ * DEPENDS: esound and arts are for stable branch only now
+
2012-01-01 Pol Vinogradov <vin.public AT gmail.com>
* DEPENDS: added LIBAVCODEC, fixed some flags

diff --git a/volatiles b/volatiles
index bfc8448..acfd38d 100644
--- a/volatiles
+++ b/volatiles
@@ -1,13 +1,14 @@
^/usr/lib/perl5/.*/.*/perllocal\.pod
-^/usr/lib/python[^/]*/site-packages/easy-install.pth
+^/usr/lib/python[^/]*/site-packages/easy-install\.pth
^/usr/share/pear/\.filemap$
^/etc/gconf/gconf\.xml\.defaults/.*
^/usr/lib/X11/xinit/xinitrc
+^/usr/lib/gdk-pixbuf-2\.0/.*/loaders\.cache$
^/usr/lib/ghc.*/package\.conf.*$
-^/usr/share/applications/mimeinfo.cache$
-^/usr/share/icons/.*/icon-theme.cache$
-^/usr/share/icons/.*/index.theme$
-^/usr/share/locale/locale.alias$
-^/usr/lib/liblapack.a
-^/var/lib/nfs/xtab
-^/var/lib/hp/hplip.state
+^/usr/lib/gio/modules/giomodule\.cache$
+^/usr/share/applications/mimeinfo\.cache$
+^/usr/share/glib-2\.0/schemas/gschemas\.compiled$
+^/usr/share/icons/.*/icon-theme\.cache$
+^/usr/share/icons/.*/index\.theme$
+^/usr/share/info/standards\.info$
+^/usr/share/locale/locale\.alias$
diff --git a/xfce/libxfce4util/HISTORY b/xfce/libxfce4util/HISTORY
index 265f4b6..52ff928 100644
--- a/xfce/libxfce4util/HISTORY
+++ b/xfce/libxfce4util/HISTORY
@@ -1,3 +1,9 @@
+2012-06-09 Ladislav Hagara <hgr AT vabo.cz>
+ * UP_TRIGGERS: fixed
+
+2012-05-25 Vlad Glagolev <stealth AT sourcemage.org>
+ * UP_TRIGGER: added, for proper upgrade
+
2012-04-29 Ismael Luceno <ismael AT sourcemage.org>
* DETAILS: updated spell to 4.10.0

diff --git a/xfce/libxfce4util/UP_TRIGGERS b/xfce/libxfce4util/UP_TRIGGERS
new file mode 100755
index 0000000..ff7732c
--- /dev/null
+++ b/xfce/libxfce4util/UP_TRIGGERS
@@ -0,0 +1,17 @@
+# recast everything on minor version update
+
+if spell_ok $SPELL; then
+ local OLD_SPELL_VERSION="$(installed_version $SPELL)" &&
+
+ if [[ "${VERSION%.*}" != "${OLD_SPELL_VERSION%.*}" ]]; then
+ message "This is a possibly incompatible update of $SPELL..." &&
+ message "Figuring out what spells need to be recast, this may take a
while." &&
+
+ for each in $(show_up_depends $SPELL 1); do
+ if gaze install $each | xargs readelf -d 2> /dev/null |
+ grep -q "NEEDED.*libxfce4util\.so"; then
+ up_trigger $each cast_self
+ fi
+ done
+ fi
+fi
diff --git a/xfce/orage/DEPENDS b/xfce/orage/DEPENDS
index 5608dad..c342e50 100755
--- a/xfce/orage/DEPENDS
+++ b/xfce/orage/DEPENDS
@@ -1,3 +1,4 @@
+depends libxfce4util &&
depends gtk+2 &&

optional_depends xfce4-panel \
diff --git a/xfce/orage/DETAILS b/xfce/orage/DETAILS
index 3bd6f3e..cdd8f7c 100755
--- a/xfce/orage/DETAILS
+++ b/xfce/orage/DETAILS
@@ -1,6 +1,7 @@
SPELL=orage
if [[ $ORAGE_STABLE == y ]]; then
VERSION=4.8.3
+ PATCHLEVEL=1
BRANCH=`echo $VERSION | cut -d . -f 1,2`
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_URL[0]=http://archive.xfce.org/src/apps/$SPELL/$BRANCH/$SOURCE
diff --git a/xfce/orage/HISTORY b/xfce/orage/HISTORY
index a5d0436..29b5d5e 100644
--- a/xfce/orage/HISTORY
+++ b/xfce/orage/HISTORY
@@ -1,3 +1,6 @@
+2012-05-26 Vlad Glagolev <stealth AT sourcemage.org>
+ * DEPENDS: added missing dep; PATCHLEVEL=1
+
2012-01-08 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 4.8.3

diff --git a/xfce/xfce4-dict/DEPENDS b/xfce/xfce4-dict/DEPENDS
index aef024c..ecaa8aa 100755
--- a/xfce/xfce4-dict/DEPENDS
+++ b/xfce/xfce4-dict/DEPENDS
@@ -1,2 +1,3 @@
depends gtk+2 &&
+depends libxfce4util &&
depends xfce4-panel
diff --git a/xfce/xfce4-dict/DETAILS b/xfce/xfce4-dict/DETAILS
index 663b504..24244b9 100755
--- a/xfce/xfce4-dict/DETAILS
+++ b/xfce/xfce4-dict/DETAILS
@@ -1,5 +1,6 @@
SPELL=xfce4-dict
VERSION=0.6.0
+ PATCHLEVEL=1
BRANCH=`echo $VERSION | cut -d . -f 1,2`
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/xfce/xfce4-dict/HISTORY b/xfce/xfce4-dict/HISTORY
index f497e30..8651042 100644
--- a/xfce/xfce4-dict/HISTORY
+++ b/xfce/xfce4-dict/HISTORY
@@ -1,3 +1,6 @@
+2012-05-26 Vlad Glagolev <stealth AT sourcemage.org>
+ * DEPENDS: added missing dep; PATCHLEVEL=1
+
2011-01-23 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated source url
* DEPENDS: added gtk+2 dependency
diff --git a/xfce/xfce4-mixer/DEPENDS b/xfce/xfce4-mixer/DEPENDS
index 8d3f9c6..70c0231 100755
--- a/xfce/xfce4-mixer/DEPENDS
+++ b/xfce/xfce4-mixer/DEPENDS
@@ -1,3 +1,4 @@
+depends libxfce4util &&
depends libxfcegui4 &&
depends gst-plugins-base &&
depends xfce4-panel
diff --git a/xfce/xfce4-mixer/DETAILS b/xfce/xfce4-mixer/DETAILS
index a8f01d7..7510012 100755
--- a/xfce/xfce4-mixer/DETAILS
+++ b/xfce/xfce4-mixer/DETAILS
@@ -1,5 +1,6 @@
SPELL=xfce4-mixer
VERSION=4.8.0
+ PATCHLEVEL=1
BRANCH=`echo $VERSION | cut -d . -f 1,2`
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/xfce/xfce4-mixer/HISTORY b/xfce/xfce4-mixer/HISTORY
index 6532505..c8a9699 100644
--- a/xfce/xfce4-mixer/HISTORY
+++ b/xfce/xfce4-mixer/HISTORY
@@ -1,3 +1,6 @@
+2012-05-26 Vlad Glagolev <stealth AT sourcemage.org>
+ * DEPENDS: added missing dep; PATCHLEVEL=1
+
2012-01-08 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 4.8.0

diff --git a/xfce/xfce4-panel/HISTORY b/xfce/xfce4-panel/HISTORY
index 20ef373..a17e007 100644
--- a/xfce/xfce4-panel/HISTORY
+++ b/xfce/xfce4-panel/HISTORY
@@ -1,3 +1,6 @@
+2012-05-26 Vlad Glagolev <stealth AT sourcemage.org>
+ * UP_TRIGGERS: fixed the trigger
+
2012-04-29 Ismael Luceno <ismael AT sourcemage.org>
* DETAILS: updated spell to 4.10.0

diff --git a/xfce/xfce4-panel/UP_TRIGGERS b/xfce/xfce4-panel/UP_TRIGGERS
index c1a188e..f3fe4b9 100755
--- a/xfce/xfce4-panel/UP_TRIGGERS
+++ b/xfce/xfce4-panel/UP_TRIGGERS
@@ -2,14 +2,14 @@

if spell_ok $SPELL; then
local OLD_SPELL_VERSION="$(installed_version $SPELL)"
- if [[ ${VERSION%.*} > ${OLD_SPELL_VERSION%.*} ]]; then
- message "This is a possibly incompatible update of xfce4-panel..."
+ if [[ ${VERSION%.*} != ${OLD_SPELL_VERSION%.*} ]]; then
+ message "This is a possibly incompatible update of $SPELL..."
message "Figuring out what spells need to be recast, this may take a
while."

for each in $(show_up_depends $SPELL 1); do
# Check if the binaries link against libpython.so
if gaze install $each | xargs readelf -d 2> /dev/null |
- grep -q "NEEDED.*libxfce4panel.so"; then
+ grep -q "NEEDED.*libxfce4panel\.so"; then
up_trigger $each cast_self
fi
done
diff --git a/xorg-proto/printproto/HISTORY b/xorg-proto/printproto/HISTORY
index 48938dd..b36c5de 100644
--- a/xorg-proto/printproto/HISTORY
+++ b/xorg-proto/printproto/HISTORY
@@ -1,3 +1,8 @@
+2012-05-25 Sukneet Basuta <sukneet AT sourcemage.org>
+ * printproto-1.0.5.tar.bz2.sig: re-sign source tarball,
+ source seems to have changed
+ * PRE_BUILD: removed, no longer needed
+
2011-10-28 Robin Cook <rcook AT wyrms.net>
* DETAILS: updated VERSION to 1.0.5
* PRE_BUILD: added to do autogen.sh
diff --git a/xorg-proto/printproto/PRE_BUILD b/xorg-proto/printproto/PRE_BUILD
deleted file mode 100755
index c5b8fb6..0000000
--- a/xorg-proto/printproto/PRE_BUILD
+++ /dev/null
@@ -1,4 +0,0 @@
-default_pre_build &&
-cd $SOURCE_DIRECTORY &&
-
-./autogen.sh
diff --git a/xorg-proto/printproto/printproto-1.0.5.tar.bz2.sig
b/xorg-proto/printproto/printproto-1.0.5.tar.bz2.sig
index 2f21750..6e9965f 100644
Binary files a/xorg-proto/printproto/printproto-1.0.5.tar.bz2.sig and
b/xorg-proto/printproto/printproto-1.0.5.tar.bz2.sig differ



  • [SM-Commit] GIT changes to stable-rc-0.61 grimoire by Vlad Glagolev (a6cdb3bd69125855e0fa951a60df861fb7db7f2a), Vlad Glagolev, 06/14/2012

Archive powered by MHonArc 2.6.24.

Top of Page