Source Mage code commit list

[Treeve Jelbert <scm AT sourcemage.org>]

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

 ChangeLog                                                           |   13 
 accounts                                                            |    1 
 archive-libs/libzip/DETAILS                                         |    4 
 archive-libs/libzip/HISTORY                                         |    4 
 archive-libs/libzip/UP_TRIGGERS                                     |    9 
 archive/unrar/DETAILS                                               |    4 
 archive/unrar/HISTORY                                               |    3 
 crypto/6581B5F1.gpg                                                 |binary
 crypto/cyrus-sasl/6581B5F1.gpg                                      |    0 
 crypto/cyrus-sasl/DETAILS                                           |    4 
 crypto/cyrus-sasl/HISTORY                                           |    8 
 crypto/cyrus-sasl/PRE_BUILD                                         |    7 
 crypto/cyrus-sasl/db5.patch                                         |   24 
 crypto/cyrus-sasl/gcc44.diff                                        |   20 
 crypto/libsasl/6581B5F1.gpg                                         |    0 
 crypto/openssl/DETAILS                                              |    8 
 crypto/openssl/HISTORY                                              |    4 
 crypto/pcsc-lite/DETAILS                                            |    6 
 crypto/pcsc-lite/HISTORY                                            |    3 
 database/sqlite/DETAILS                                             |    6 
 database/sqlite/HISTORY                                             |    3 
 dev/null                                                            |binary
 devel/binutils/HISTORY                                              |    3 
 devel/binutils/INSTALL                                              |    4 
 devel/git/DETAILS                                                   |    8 
 devel/git/HISTORY                                                   |    3 
 disk/grub2/DEPENDS                                                  |    1 
 disk/grub2/HISTORY                                                  |    3 
 disk/ntfs-3g/BUILD                                                  |    2 
 disk/ntfs-3g/CONFIGURE                                              |    6 
 disk/ntfs-3g/DEPENDS                                                |    7 
 disk/ntfs-3g/DETAILS                                                |    2 
 disk/ntfs-3g/HISTORY                                                |    6 
 disk/sg3_utils/DETAILS                                              |    4 
 disk/sg3_utils/HISTORY                                              |    3 
 editors/focuswriter/BUILD                                           |    1 
 editors/focuswriter/DEPENDS                                         |    4 
 editors/focuswriter/DETAILS                                         |   13 
 editors/focuswriter/HISTORY                                         |    2 
 gnome2-apps/vinagre/DEPENDS                                         |    2 
 gnome2-apps/vinagre/HISTORY                                         |    3 
 gnome2-libs/libsoup/DEPENDS                                         |    3 
 gnome2-libs/libsoup/DETAILS                                         |    5 
 gnome2-libs/libsoup/HISTORY                                         |    6 
 gnome2-libs/libsoup/libsoup-2.37.3.tar.xz.sig                       |binary
 gnome2-libs/mutter/DETAILS                                          |    4 
 gnome2-libs/mutter/HISTORY                                          |    3 
 gnome2-libs/mutter/mutter-3.2.1.tar.bz2.sig                         |    0 
 gnome2-libs/mutter/mutter-3.2.2.tar.xz.sig                          |binary
 gnome3-libs/gnome-shell/DETAILS                                     |    4 
 gnome3-libs/gnome-shell/HISTORY                                     |    6 
 gnome3-libs/gnome-shell/gnome-shell-3.2.1.tar.bz2.sig               |    0 
 gnome3-libs/gnome-shell/gnome-shell-3.2.2.1.tar.xz.sig              |binary
 groups                                                              |    1 
 http/webkitgtk/DEPENDS                                              |    2 
 http/webkitgtk/HISTORY                                              |    3 
 libs/libgksu/BUILD                                                  |    3 
 libs/libgksu/HISTORY                                                |    5 
 libs/libgksu/PRE_BUILD                                              |    2 
 libs/libgksu/forkpty.patch                                          |  358 
++++++++++
 libs/libidn/DETAILS                                                 |    2 
 libs/libidn/HISTORY                                                 |    3 
 libs/libnih/DETAILS                                                 |   10 
 libs/libnih/HISTORY                                                 |    3 
 mail/courier/CONFLICTS                                              |    1 
 mail/courier/HISTORY                                                |    3 
 mail/esmtp/CONFLICTS                                                |    1 
 mail/esmtp/HISTORY                                                  |    3 
 mail/exim/CONFLICTS                                                 |    1 
 mail/exim/HISTORY                                                   |    3 
 mail/masqmail/BUILD                                                 |   10 
 mail/masqmail/CONFIGURE                                             |   11 
 mail/masqmail/CONFLICTS                                             |    6 
 mail/masqmail/DEPENDS                                               |    6 
 mail/masqmail/DETAILS                                               |   47 +
 mail/masqmail/HISTORY                                               |    3 
 mail/masqmail/INSTALL                                               |   24 
 mail/masqmail/PROVIDES                                              |    2 
 mail/masqmail/SECURITY                                              |    3 
 mail/masqmail/init.d/masqmail                                       |   11 
 mail/masqmail/init.d/masqmail.conf                                  |   10 
 mail/masqmail/masqmail.gpg                                          |binary
 mail/postfix/CONFLICTS                                              |    1 
 mail/postfix/HISTORY                                                |    3 
 mail/qmail/CONFLICTS                                                |    1 
 mail/qmail/HISTORY                                                  |    3 
 mail/sendmail/CONFLICTS                                             |    1 
 mail/sendmail/HISTORY                                               |    3 
 mail/ssmtp/CONFLICTS                                                |    1 
 mail/ssmtp/HISTORY                                                  |    3 
 net/cacti/DETAILS                                                   |   18 
 net/cacti/HISTORY                                                   |    5 
 net/cacti/INSTALL                                                   |    7 
 net/cacti/PREPARE                                                   |    4 
 net/cacti/PRE_BUILD                                                 |   14 
 net/cacti/patches/settings_checkbox.patch                           |   56 +
 net/cifs-utils/DETAILS                                              |    4 
 net/cifs-utils/HISTORY                                              |    3 
 net/iproute2/DETAILS                                                |   15 
 net/iproute2/HISTORY                                                |    4 
 net/iproute2/PRE_BUILD                                              |    2 
 net/iproute2/m_xt.patch                                             |   28 
 net/spine/DETAILS                                                   |    4 
 net/spine/HISTORY                                                   |    3 
 perl-cpan/io-socket-ssl/DETAILS                                     |    2 
 perl-cpan/io-socket-ssl/HISTORY                                     |    3 
 perl-cpan/io-socket-ssl/IO-Socket-SSL-1.33.tar.gz.sig               |    0 
 perl-cpan/io-socket-ssl/IO-Socket-SSL-1.54.tar.gz.sig               |binary
 perl-cpan/net-ssleay/DETAILS                                        |    6 
 perl-cpan/net-ssleay/HISTORY                                        |    3 
 perl-cpan/net-ssleay/Net-SSLeay-1.36.tar.gz.sig                     |    0 
 perl-cpan/net-ssleay/Net-SSLeay-1.42.tar.gz.sig                     |binary
 python-pypi/python-ldap/DEPENDS                                     |    5 
 python-pypi/python-ldap/DETAILS                                     |    6 
 python-pypi/python-ldap/HISTORY                                     |    5 
 python-pypi/python-ldap/PRE_BUILD                                   |   11 
 shell-term-fm/shared-mime-info/DETAILS                              |    4 
 shell-term-fm/shared-mime-info/HISTORY                              |    4 
 shell-term-fm/shared-mime-info/PRE_BUILD                            |    5 
 smgl/upstart/DETAILS                                                |   16 
 smgl/upstart/HISTORY                                                |   10 
 smgl/upstart/PRE_BUILD                                              |    2 
 smgl/upstart/upstart.gpg                                            |binary
 utils/ntp/DEPENDS                                                   |    6 
 utils/ntp/HISTORY                                                   |    3 
 utils/winusb/DEPENDS                                                |    9 
 utils/winusb/DETAILS                                                |   23 
 utils/winusb/HISTORY                                                |    9 
 utils/winusb/PRE_BUILD                                              |    4 
 utils/winusb/parted+ntfs-3g.patch                                   |   20 
 utils/youtube-dl/DETAILS                                            |    4 
 utils/youtube-dl/HISTORY                                            |    3 
 video/guvcview/DETAILS                                              |    4 
 video/guvcview/HISTORY                                              |    3 
 video/lives/DETAILS                                                 |    4 
 video/lives/HISTORY                                                 |    3 
 windowmanagers/awesome/HISTORY                                      |    3 
 windowmanagers/awesome/PRE_BUILD                                    |    3 
 x11/gtk-vnc/DEPENDS                                                 |    2 
 x11/gtk-vnc/HISTORY                                                 |    7 
 x11/gtk-vnc/PRE_SUB_DEPENDS                                         |    6 
 x11/gtk-vnc/REPAIR^fa4f2fa4289ffc42c28cf63eb48ec61a^PRE_SUB_DEPENDS |    8 
 x11/gtk-vnc/SUB_DEPENDS                                             |   11 
 143 files changed, 988 insertions(+), 188 deletions(-)

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

    winusb: a few fixes, related to parted and ntfs-3g

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

    winusb: added missing dep

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

    libgksu: fixed compilation with recent gtk+2 and compatibility with 
recent sudo

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

    winusb: new spell, program to create Windows USB stick installer from 
CD/DVD

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

    grub2: deprecated lzo dependency

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

    ntfs-3g: renewed dependencies and options

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

    iproute2 3.2.0

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

    shared-mime-info 1.0

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

    sg3_utils 1.33

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

    guvcview: berlios -> sourceforge

commit fb53a259a0efa3b0dc6d5f594e418402489c4759
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

    binutils: install libiberty.h (some code wants to use it, LFS recommends 
installing, too)

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

    git 1.7.8.4

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

    gnome-shell 3.2.2.1

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

    python-ldap: => 2.4.7

commit b3ed764234da32f4018aa374f457834cd604f4de
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

    vinagre: Requires gtk-vnc built with gtk+3 bindings

commit 16c59ecbbda74f05ca93bfa7f27f3aeb4ba61aa5
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

    gtk-vnc: Cleanup formatting

commit 8586480f19f46304df48a47945ee3ef9259c3edb
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

    gtk-vnc: Allow choice between gtk+2 (default) and gtk+3
    Some apps require pythong bindings (e.g. virt-manager) which
    do not build with gtk+3 selected.

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

    libzip 0.10

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

    webkitgtk: depends on stable branch of libsoup now

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

    cyrus-sasl: use section key

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

    crypto/6581B5F1.gpg: moved from libsasl spell

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

    editors/focuswriter: new spell, simple, distraction-free writing
    environment

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

    spine: => 0.8.7i

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

    cacti: => 0.8.7i (security)

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

    pcsc-lite 1.8.2

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

    cifs-utils 5.2

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

    lives 1.6.0

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

    youtube-dl 2012.01.08b

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

    ssmtp: conflicts masqmail

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

    qmail: conflicts masqmail

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

    sendmail: conflicts masqmail

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

    postfix: conflicts masqmail

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

    esmtp: conflicts masqmail

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

    courier: conflicts masqmail

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

    exim: conflicts masqmail

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

    masqmail: new spell, MTA for workstations and for servers in small 
networks

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

    added account data for masqmai

commit 4de703d6c7721e0cca5c6b19895835b96d3d1465
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

    libsoup: Devel libsoup requires devel glib2
    
    $ gaze version glib2 libsoup
    Grimoire  Section      Spell    Grimoire Version  Installed Version
    --------  -------      -----    ----------------  -----------------
    test      gnome2-libs  glib2    2.30.2            2.30.2
    test      gnome2-libs  libsoup  2.37.3            2.36.1
    
    checking for GLIB - version >= 2.31.0... no
    *** Could not run GLIB test program, checking why...
    *** The test program failed to compile or link. See the file config.log
    for the
    *** exact error that occured. This usually means GLIB is incorrectly
    installed.
    configure: error: GLIB 2.31.0 or later is required to build libsoup

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

    io-socket-ssl: => 1.54

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

    net-ssleay: => 1.42

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

    mutter 3.2.2

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

    gnome-shell 3.2.2

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

    openssl 0.9.8t, 1.0.0g, SECURITY_PATCH=15

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

    cyrus-sasl: => 2.1.25

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

    unrar: => 4.1.4

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

    docx2txt: => 1.2

commit d068cbbd7f918503dbc847d9cbb5122317304aa5
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Arjan Bouter <abouter AT sourcemage.org>

    ntp: added a missing optional dep on net-snmp

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

    libidn 1.24

commit b9d4b53e4d778643d76780845f61feb52ecbd58d
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Arjan Bouter <abouter AT sourcemage.org>

    upstart: version 1.4

commit 21545d62223454d370f663e16ab9b0774921e0a3
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Arjan Bouter <abouter AT sourcemage.org>

    libnih: version 1.0.3

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

    sqlite: => 3.7.10

commit 5b79cb80dd5396bb0a1ba0395ae9504a3967a270
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Arjan Bouter <abouter AT sourcemage.org>

    awesome: missing PRE_BUILD

commit 095d216e4b5b4bd56ee4c0df6f3f78545742132c
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Arjan Bouter <abouter AT sourcemage.org>

    libsoup: devel version 2.37.3

commit 6f7b8afaf0c7796e89c68fcb347a7bb4b0a72b13
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Arjan Bouter <abouter AT sourcemage.org>

    awesome: added PRE_BUILD to fix glib2 include in spawn.c

diff --git a/ChangeLog b/ChangeLog
index 2b92d79..ee1f851 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2012-01-20 Vlad Glagolev <stealth AT sourcemage.org>
+       * utils/winusb: new spell, program to create Windows USB stick 
installer
+         from CD/DVD
+
+2012-01-19 Ladislav Hagara <hgr AT vabo.cz>
+       * editors/focuswriter: new, simple, distraction-free writing 
environment
+
+2012-01-19 Vlad Glagolev <stealth AT sourcemage.org>
+       * accounts, groups: added account data for masqmail
+       * mail/masqmail: new spell, MTA for workstations and for servers in
+         small networks
+       * crypto/6581B5F1.gpg: moved from libsasl spell
+
 2012-01-16 Ladislav Hagara <hgr AT vabo.cz>
        * archive-libs/snappy: new, fast compression/decompression library
 
diff --git a/accounts b/accounts
index 45531bf..7cc238f 100755
--- a/accounts
+++ b/accounts
@@ -96,4 +96,5 @@ dspam:187:188
 nslcd:188:189
 redis:189:190
 lightdm:191:191
+masqmail:192:192
 nobody:65534:65534
diff --git a/archive-libs/libzip/DETAILS b/archive-libs/libzip/DETAILS
index 3453eca..825daac 100755
--- a/archive-libs/libzip/DETAILS
+++ b/archive-libs/libzip/DETAILS
@@ -1,6 +1,6 @@
            SPELL=libzip
-         VERSION=0.9.3
-     
SOURCE_HASH=sha512:e10e563d79dbe633e8dc10e47c4b724be08d1d15176f46ba0dc433c6a8697484a55c2778d37ce93fbf760ca27a6d12268520d1af79aa0fa3e6926648ccd161e5
+         VERSION=0.10
+     
SOURCE_HASH=sha512:5d42fae92d04dae038c416debabfb11293d66ad886a0189b7409c15efe36b759a8908c7b492084e252d1a0a5a9fe142cc97a5e339e4fd936253189a6097dc710
           SOURCE=$SPELL-$VERSION.tar.bz2
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
        WEB_SITE=http://www.nih.at/libzip
diff --git a/archive-libs/libzip/HISTORY b/archive-libs/libzip/HISTORY
index 6280952..c1b185f 100644
--- a/archive-libs/libzip/HISTORY
+++ b/archive-libs/libzip/HISTORY
@@ -1,3 +1,7 @@
+2012-01-19 Ladislav Hagara <hgr AT vabo.cz>
+       * DETAILS: 0.10
+       * UP_TRIGGERS: added, libzip.so.1 -> libzip.so.2
+
 2010-06-27 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: version 0.9.3
 
diff --git a/archive-libs/libzip/UP_TRIGGERS b/archive-libs/libzip/UP_TRIGGERS
new file mode 100755
index 0000000..abfbe0e
--- /dev/null
+++ b/archive-libs/libzip/UP_TRIGGERS
@@ -0,0 +1,9 @@
+local OLD_SPELL_VERSION=""
+spell_ok $SPELL && OLD_SPELL_VERSION="$(installed_version $SPELL)"
+if [ "${VERSION:0:4}" != "${OLD_SPELL_VERSION:0:4}" ]; then
+  message "This is an 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
+    up_trigger $each cast_self
+  done
+fi
diff --git a/archive/unrar/DETAILS b/archive/unrar/DETAILS
index 175fba7..11fb095 100755
--- a/archive/unrar/DETAILS
+++ b/archive/unrar/DETAILS
@@ -1,11 +1,11 @@
            SPELL=unrar
-         VERSION=4.1.3
+         VERSION=4.1.4
           SOURCE=${SPELL}src-$VERSION.tar.gz
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL"
    SOURCE_URL[0]=http://www.rarlab.com/rar/$SOURCE
         WEB_SITE=http://www.rarlab.com
          ENTERED=20011117
-     
SOURCE_HASH=sha512:fd853a844bdd5ba40049c7be569a443bb927f3a324dfdb981d9ccaebe6768e8b695e5f84aa10052f3b559ebb60a59a559f64f721d792dc0500d16a6b69a0f607
+     
SOURCE_HASH=sha512:585e817d3246a4b5cc960298a40ae07c25d54becef680b67e59a441a279de3305a764ec455924eff09e8869dcceac2242e5657e8a3a9b741ca29e848e5f9c8e2
       LICENSE[0]=freeware
         KEYWORDS="archive"
            SHORT="unRAR is a utility to extract, view, and test the contents 
of an RAR archive, version 1.50 and above."
diff --git a/archive/unrar/HISTORY b/archive/unrar/HISTORY
index d22bb99..a980988 100644
--- a/archive/unrar/HISTORY
+++ b/archive/unrar/HISTORY
@@ -1,3 +1,6 @@
+2012-01-18 Vlad Glagolev <stealth AT sourcemage.org>
+       * DETAILS: updated spell to 4.1.4
+
 2012-01-12 Vlad Glagolev <stealth AT sourcemage.org>
        * DETAILS: updated spell to 4.1.3
 
diff --git a/crypto/6581B5F1.gpg b/crypto/6581B5F1.gpg
new file mode 100644
index 0000000..eda7920
Binary files /dev/null and b/crypto/6581B5F1.gpg differ
diff --git a/crypto/cyrus-sasl/6581B5F1.gpg b/crypto/cyrus-sasl/6581B5F1.gpg
deleted file mode 100644
index eda7920..0000000
Binary files a/crypto/cyrus-sasl/6581B5F1.gpg and /dev/null differ
diff --git a/crypto/cyrus-sasl/DETAILS b/crypto/cyrus-sasl/DETAILS
index 7ec8500..d1d1c7a 100755
--- a/crypto/cyrus-sasl/DETAILS
+++ b/crypto/cyrus-sasl/DETAILS
@@ -1,9 +1,9 @@
            SPELL=cyrus-sasl
-         VERSION=2.1.23
+         VERSION=2.1.25
   SECURITY_PATCH=1
           SOURCE=$SPELL-$VERSION.tar.gz
          SOURCE2=$SOURCE.sig
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
    SOURCE_URL[0]=ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/$SOURCE
    
SOURCE_URL[1]=ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/OLD-VERSIONS/sasl/$SOURCE
   SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
diff --git a/crypto/cyrus-sasl/HISTORY b/crypto/cyrus-sasl/HISTORY
index e333934..303d2bc 100644
--- a/crypto/cyrus-sasl/HISTORY
+++ b/crypto/cyrus-sasl/HISTORY
@@ -1,3 +1,11 @@
+2012-01-19 Vlad Glagolev <stealth AT sourcemage.org>
+       * 6581B5F1.gpg: deleted, use the same key from section
+
+2012-01-18 Vlad Glagolev <stealth AT sourcemage.org>
+       * DETAILS: updated spell to 2.1.25; quoting paths
+       * gcc44.diff: removed, fixed by upstream
+       * db5.patch: added, for db >5.0 support
+
 2011-09-26 Bor Kraljič <pyrobor AT ver.si>
        * DETAILS: converted to upstream signature checking
        * 6581B5F1.gpg: added gpg keyring
diff --git a/crypto/cyrus-sasl/PRE_BUILD b/crypto/cyrus-sasl/PRE_BUILD
index ec632ca..ba9528d 100755
--- a/crypto/cyrus-sasl/PRE_BUILD
+++ b/crypto/cyrus-sasl/PRE_BUILD
@@ -1,3 +1,4 @@
-default_pre_build   &&
-cd $SOURCE_DIRECTORY &&
-patch  -p0 < $SPELL_DIRECTORY/gcc44.diff
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+
+patch -p1 < "$SPELL_DIRECTORY/db5.patch"
diff --git a/crypto/cyrus-sasl/db5.patch b/crypto/cyrus-sasl/db5.patch
new file mode 100644
index 0000000..5228240
--- /dev/null
+++ b/crypto/cyrus-sasl/db5.patch
@@ -0,0 +1,24 @@
+Author: Ondřej Surý <ondrej AT debian.org>
+Description: Support newer Berkeley DB versions
+--- a/sasldb/db_berkeley.c
++++ b/sasldb/db_berkeley.c
+@@ -101,7 +101,7 @@ static int berkeleydb_open(const sasl_ut
+     ret = db_create(mbdb, NULL, 0);
+     if (ret == 0 && *mbdb != NULL)
+     {
+-#if DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1
++#if (DB_VERSION_MAJOR > 4) || ((DB_VERSION_MAJOR == 4) && (DB_VERSION_MINOR 
>= 1))
+       ret = (*mbdb)->open(*mbdb, NULL, path, NULL, DB_HASH, flags, 0660);
+ #else
+       ret = (*mbdb)->open(*mbdb, path, NULL, DB_HASH, flags, 0660);
+--- a/utils/dbconverter-2.c
++++ b/utils/dbconverter-2.c
+@@ -214,7 +214,7 @@ static int berkeleydb_open(const char *p
+     ret = db_create(mbdb, NULL, 0);
+     if (ret == 0 && *mbdb != NULL)
+     {
+-#if DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1
++#if (DB_VERSION_MAJOR > 4) || ((DB_VERSION_MAJOR == 4) && (DB_VERSION_MINOR 
>= 1))
+       ret = (*mbdb)->open(*mbdb, NULL, path, NULL, DB_HASH, DB_CREATE, 
0664);
+ #else
+       ret = (*mbdb)->open(*mbdb, path, NULL, DB_HASH, DB_CREATE, 0664);
diff --git a/crypto/cyrus-sasl/gcc44.diff b/crypto/cyrus-sasl/gcc44.diff
deleted file mode 100644
index 9f3fb53..0000000
--- a/crypto/cyrus-sasl/gcc44.diff
+++ /dev/null
@@ -1,20 +0,0 @@
---- plugins/digestmd5.c        2006-05-17 18:46:17.000000000 +0200
-+++ plugins/digestmd5.c.cp     2009-04-07 16:20:31.000000000 +0200
-@@ -2715,7 +2715,7 @@
-       "DIGEST-MD5",                   /* mech_name */
- #ifdef WITH_RC4
-       128,                            /* max_ssf */
--#elif WITH_DES
-+#elif defined(WITH_DES)
-       112,
- #else 
-       1,
-@@ -4034,7 +4034,7 @@
-       "DIGEST-MD5",
- #ifdef WITH_RC4                               /* mech_name */
-       128,                            /* max ssf */
--#elif WITH_DES
-+#elif defined(WITH_DES)
-       112,
- #else
-       1,
diff --git a/crypto/libsasl/6581B5F1.gpg b/crypto/libsasl/6581B5F1.gpg
deleted file mode 100644
index eda7920..0000000
Binary files a/crypto/libsasl/6581B5F1.gpg and /dev/null differ
diff --git a/crypto/openssl/DETAILS b/crypto/openssl/DETAILS
index c195bf3..6f9094d 100755
--- a/crypto/openssl/DETAILS
+++ b/crypto/openssl/DETAILS
@@ -6,12 +6,12 @@ fi
 
 case $OPENSSL_BRANCH in
   0.9)
-         VERSION=0.9.8s
-  SECURITY_PATCH=14
+         VERSION=0.9.8t
+  SECURITY_PATCH=15
   ;;
   1.0)
-         VERSION=1.0.0f
-  SECURITY_PATCH=14
+         VERSION=1.0.0g
+  SECURITY_PATCH=15
       PATCHLEVEL=0
   ;;
 esac
diff --git a/crypto/openssl/HISTORY b/crypto/openssl/HISTORY
index 04837c3..ad4034a 100644
--- a/crypto/openssl/HISTORY
+++ b/crypto/openssl/HISTORY
@@ -1,3 +1,7 @@
+2012-01-18 Ladislav Hagara <hgr AT vabo.cz>
+       * DETAILS: 0.9.8t, 1.0.0g, SECURITY_PATCH=15
+         http://www.openssl.org/news/secadv_20120118.txt
+
 2012-01-04 Ladislav Hagara <hgr AT vabo.cz>
        * DETAILS: 0.9.8s, 1.0.0f, SECURITY_PATCH=14
          http://www.openssl.org/news/secadv_20120104.txt
diff --git a/crypto/pcsc-lite/DETAILS b/crypto/pcsc-lite/DETAILS
index bb7da7e..8721e81 100755
--- a/crypto/pcsc-lite/DETAILS
+++ b/crypto/pcsc-lite/DETAILS
@@ -1,9 +1,9 @@
            SPELL=pcsc-lite
-         VERSION=1.8.1
-     
SOURCE_HASH=sha512:fe9b8ae6654cb79af9772d2cf765e9459c3742b5cdf64b10fbe2cfbb4e8066b3e646a49517f992c480e077e856258c13d727327cd5c4da85da3b708236fa1717
+         VERSION=1.8.2
+     
SOURCE_HASH=sha512:093666b8e44c24ef259cc5cf1f46ffebed7f0eedda43f7a4e58112695912b87148b5d1ae8fbd398bd0a623b943bb6f75253e5c6fdccf64f38b750c78a10f3064
           SOURCE=$SPELL-$VERSION.tar.bz2
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
-   SOURCE_URL[0]=http://alioth.debian.org/frs/download.php/3687/$SOURCE
+   SOURCE_URL[0]=http://alioth.debian.org/frs/download.php/3695/$SOURCE
         WEB_SITE=http://pcsclite.alioth.debian.org/
       LICENSE[0]=BSD
          ENTERED=20050106
diff --git a/crypto/pcsc-lite/HISTORY b/crypto/pcsc-lite/HISTORY
index 8b41595..f8c1b01 100644
--- a/crypto/pcsc-lite/HISTORY
+++ b/crypto/pcsc-lite/HISTORY
@@ -1,3 +1,6 @@
+2012-01-19 Ladislav Hagara <hgr AT vabo.cz>
+       * DETAILS: 1.8.2
+
 2011-11-27 Ladislav Hagara <hgr AT vabo.cz>
        * DETAILS: 1.8.1
 
diff --git a/database/sqlite/DETAILS b/database/sqlite/DETAILS
index f618b84..092e86d 100755
--- a/database/sqlite/DETAILS
+++ b/database/sqlite/DETAILS
@@ -1,7 +1,7 @@
            SPELL=sqlite
-         VERSION=3.7.9
-        VERSIONX=autoconf-3070900
-     
SOURCE_HASH=sha512:f2f1739af728ed6f3bd53265fdba7d1f93872daf7a8744c58cf1f54f64873ec3306fadc04d60e5e11e1f9e24caee5d3f936c4f7d7efe2e5c8562a98dfb32fb07
+         VERSION=3.7.10
+        VERSIONX=autoconf-3071000
+     
SOURCE_HASH=sha512:b66ca1eb59eec97415d110879077c0c7cac24e79cdd1f98143cfaa663d5c08888bc243ac3c10efe36e1c9c15b4fb9d661882e0e80c24f2b86bf385f81e058120
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/${SPELL}-${VERSIONX}"
           SOURCE=${SPELL}-${VERSIONX}.tar.gz
    SOURCE_URL[0]=http://sqlite.org/$SOURCE
diff --git a/database/sqlite/HISTORY b/database/sqlite/HISTORY
index ccd7c8b..0e62acb 100644
--- a/database/sqlite/HISTORY
+++ b/database/sqlite/HISTORY
@@ -1,3 +1,6 @@
+2012-01-17 Vlad Glagolev <stealth AT sourcemage.org>
+       * DETAILS: updated spell to 3.7.10
+
 2011-11-01 Vlad Glagolev <stealth AT sourcemage.org>
        * DETAILS: updated spell to 3.7.9
 
diff --git a/devel/binutils/HISTORY b/devel/binutils/HISTORY
index 364f4f0..78f80ea 100644
--- a/devel/binutils/HISTORY
+++ b/devel/binutils/HISTORY
@@ -1,3 +1,6 @@
+2012-01-20 Thomas Orgis <sobukus AT sourcemage.org>
+       * INSTALL: install libiberty.h
+
 2011-11-21 Ladislav Hagara <hgr AT vabo.cz>
        * DETAILS: 2.22
 
diff --git a/devel/binutils/INSTALL b/devel/binutils/INSTALL
index fe69cc0..b805f67 100755
--- a/devel/binutils/INSTALL
+++ b/devel/binutils/INSTALL
@@ -1,3 +1,5 @@
 make_single &&
-make DESTDIR=${INSTALL_ROOT} install &&
+make DESTDIR="$INSTALL_ROOT" install &&
+# other apps want to use the lib
+cp -v ../include/libiberty.h "$INSTALL_ROOT/usr/include" &&
 make_normal
diff --git a/devel/git/DETAILS b/devel/git/DETAILS
index a5fdd37..b9ae433 100755
--- a/devel/git/DETAILS
+++ b/devel/git/DETAILS
@@ -1,10 +1,10 @@
            SPELL=git
-         VERSION=1.7.8.3
+         VERSION=1.7.8.4
   SECURITY_PATCH=1
           SOURCE=$SPELL-$VERSION.tar.gz
 #         SOURCE2=$SOURCE.sign
 #      SOURCE_GPG=kernel.gpg:$SOURCE.sign:UPSTREAM_KEY
-     
SOURCE_HASH=sha512:e2e4dc6d94b77ef74bf7e327fadb0b19494aa1d73acd9994b8c36471808dd80a5c2eb23065ae7f852a9269a45f5f6e311fe05a7ada2801966533e82891cd453a
+     
SOURCE_HASH=sha512:d1ca22acd4a3d1b4b3b257fd2417d09df662865101a3d42bf6a22ae6f28053505124340ca129200e2c3bf1074a0ec9a245dbacf56c50301045010ef4530ebf23
       SOURCE_URL=http://git-core.googlecode.com/files/$SOURCE
 #     SOURCE2_URL=$KERNEL_URL/pub/software/scm/git/$SOURCE2
 #  SOURCE2_IGNORE=signature
@@ -12,7 +12,7 @@ if [[ $GIT_DOC == manpages || $GIT_DOC == both ]]; then
          SOURCE3=$SPELL-manpages-$VERSION.tar.gz
 #         SOURCE4=$SOURCE3.sign
 #     SOURCE3_GPG=kernel.gpg:$SOURCE3.sign:UPSTREAM_KEY
-     
SOURCE3_HASH=sha512:5eca7e853d7ed21cf810c273e5f930f4cbc388c839773d974faeba07148272acfaea874f2c297e35a71e6ffb3612305ccc845a5155f180773354d0cb8ff00c7c
+     
SOURCE3_HASH=sha512:d376d90e41139e896409f1631415f3528c5843452b2b9910257a3d121056d7071380ba556375c10c77be4eea7b8f6cf878d0702cc84215ff1c81f7e902f7717f
      SOURCE3_URL=http://git-core.googlecode.com/files/$SOURCE3
 #     SOURCE4_URL=$KERNEL_URL/pub/software/scm/git/$SOURCE4
 #  SOURCE4_IGNORE=signature
@@ -21,7 +21,7 @@ if [[ $GIT_DOC == htmldocs || $GIT_DOC == both ]]; then
          SOURCE5=$SPELL-htmldocs-$VERSION.tar.gz
 #         SOURCE6=$SOURCE5.sign
 #     SOURCE5_GPG=kernel.gpg:$SOURCE5.sign:UPSTREAM_KEY
-     
SOURCE5_HASH=sha512:bef36c8f98921bdaf66fe4f7183b89c7153bf9bb2317989d70bcd85c6eb5ac232ce818b49f8db1a3e717bfa7d5ed407225b4819a56fced1b29eec586188ff07d
+     
SOURCE5_HASH=sha512:d520a9b34920ffd844849e071575e80ddc9c911e12c77db6f9b8999ec8fc909eb4a9de882126453df574b84e38e3a537cb07b196760839bd264a910a428d25a7
      SOURCE5_URL=http://git-core.googlecode.com/files/$SOURCE5
 #     SOURCE6_URL=$KERNEL_URL/pub/software/scm/git/$SOURCE6
 #  SOURCE6_IGNORE=signature
diff --git a/devel/git/HISTORY b/devel/git/HISTORY
index bd06e3e..a4c32e2 100644
--- a/devel/git/HISTORY
+++ b/devel/git/HISTORY
@@ -1,3 +1,6 @@
+2012-01-20 Ladislav Hagara <hgr AT vabo.cz>
+       * DETAILS: 1.7.8.4
+
 2012-01-08 Ladislav Hagara <hgr AT vabo.cz>
        * DETAILS: 1.7.8.3
 
diff --git a/disk/grub2/DEPENDS b/disk/grub2/DEPENDS
index d21f5d9..2f49052 100755
--- a/disk/grub2/DEPENDS
+++ b/disk/grub2/DEPENDS
@@ -2,7 +2,6 @@ depends  automake  &&
 depends  gettext   &&
 depends  gnupg     &&
 depends  smgl-fhs  &&
-depends  lzo       &&
 
 if [[ "${GRUB2_SVN}" = 'y' ]]; then
   depends autoconf &&
diff --git a/disk/grub2/HISTORY b/disk/grub2/HISTORY
index 8e6c388..ab87621 100644
--- a/disk/grub2/HISTORY
+++ b/disk/grub2/HISTORY
@@ -1,3 +1,6 @@
+2012-01-20 Vlad Glagolev <stealth AT sourcemage.org>
+       * DEPENDS: lzo support was removed in 2009
+
 2012-01-12 Treeve Jelbert <treeve AT sourcemage.org>
        * DEPENDS: explicity disable device mapper/ LVM support
        * BUILD: force -Os
diff --git a/disk/ntfs-3g/BUILD b/disk/ntfs-3g/BUILD
index 440db21..56377fb 100755
--- a/disk/ntfs-3g/BUILD
+++ b/disk/ntfs-3g/BUILD
@@ -1,2 +1,2 @@
-OPTS="${OPTS} $NTFS3G_ACL $NTFS3G_MTAB" &&
+OPTS="$NTFS3G_ACL $NTFS3G_XATTR $NTFS3G_MTAB ${OPTS}" &&
 default_build
diff --git a/disk/ntfs-3g/CONFIGURE b/disk/ntfs-3g/CONFIGURE
index 1406ca6..5105f89 100755
--- a/disk/ntfs-3g/CONFIGURE
+++ b/disk/ntfs-3g/CONFIGURE
@@ -1,7 +1,11 @@
 config_query_option NTFS3G_ACL  'Enable POSIX ACL support?' y \
                                 '--enable-posix-acls'  \
                                 '--disable-posix-acls' &&
+
+config_query_option NTFS3G_XATTR "Enable system extended attributes 
mappings?" y \
+                                 "--enable-xattr-mappings" \
+                                 "--disable-xattr-mappings" &&
+
 config_query_option NTFS3G_MTAB 'Enable usage of /etc/mtab ?' y \
                                 '--enable-mtab'  \
                                 '--disable-mtab'
-                               
diff --git a/disk/ntfs-3g/DEPENDS b/disk/ntfs-3g/DEPENDS
index 1decb7a..5668791 100755
--- a/disk/ntfs-3g/DEPENDS
+++ b/disk/ntfs-3g/DEPENDS
@@ -1,5 +1,8 @@
-depends attr    &&
-depends gnutls  &&
+optional_depends gnutls \
+                 "--enable-crypto" \
+                 "--disable-crypto" \
+                 "for crypto related code and utilities" &&
+
 message 'If you want to allow normal users to mount ntfs filesystems,' &&
 message 'then you need internal fuse support' &&
 optional_depends fuse '--with-fuse=external' \
diff --git a/disk/ntfs-3g/DETAILS b/disk/ntfs-3g/DETAILS
index 8435bb4..a35bff4 100755
--- a/disk/ntfs-3g/DETAILS
+++ b/disk/ntfs-3g/DETAILS
@@ -3,7 +3,7 @@
          VERSION=2011.4.12
      
SOURCE_HASH=sha512:0bff1d39c84ce774e147dab0a8f7094bb7df8d7bd45a7a4d60ab25b230284ca67cd1746fbe2d063c080a346b40ea6a5960f1fbcae14468c30dcdc66639fc16d9
           SOURCE=$SPELLX-$VERSION.tgz
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELLX-$VERSION"
         WEB_SITE=http://www.tuxera.com
    SOURCE_URL[0]=$WEB_SITE/opensource/$SOURCE
       LICENSE[0]=GPL
diff --git a/disk/ntfs-3g/HISTORY b/disk/ntfs-3g/HISTORY
index 97c666d..41ecc1e 100644
--- a/disk/ntfs-3g/HISTORY
+++ b/disk/ntfs-3g/HISTORY
@@ -1,3 +1,9 @@
+2012-01-20 Vlad Glagolev <stealth AT sourcemage.org>
+       * DETAILS: quoting paths
+       * DEPENDS: gnutls and is optional, attr isn't required
+       * CONFIGURE: xattr is configured here
+       * BUILD: use NTFS3G_XATTR; moved OPTS to the end
+
 2011-04-11 Ladislav Hagara <hgr AT vabo.cz>
        * DETAILS: 2011.4.12, ntfsprogs has been merged
        * CONFLICTS: added
diff --git a/disk/sg3_utils/DETAILS b/disk/sg3_utils/DETAILS
index 4a46979..2ea654f 100755
--- a/disk/sg3_utils/DETAILS
+++ b/disk/sg3_utils/DETAILS
@@ -1,6 +1,6 @@
            SPELL=sg3_utils
-         VERSION=1.32
-     
SOURCE_HASH=sha512:99868cefd8d28313ac436cf067a60838d50287a76511ffffd9c2f944398992cc96747f7ecd6d311cde9d4aa27c1deccafc50e7a0304486a6a2ec45885af9fd19
+         VERSION=1.33
+     
SOURCE_HASH=sha512:3973f91a0d9d28425ed9f9a01b1b17276914be9fd96c1314fcc49044478901bc885245bd1e8dcd3e86a271293d90efd2a66cb7746d0c0d1166ae82a7f3ae8c69
           SOURCE=$SPELL-$VERSION.tar.bz2
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
    SOURCE_URL[0]=http://sg.danny.cz/sg/p/$SOURCE
diff --git a/disk/sg3_utils/HISTORY b/disk/sg3_utils/HISTORY
index 95161fb..abeb9ce 100644
--- a/disk/sg3_utils/HISTORY
+++ b/disk/sg3_utils/HISTORY
@@ -1,3 +1,6 @@
+2012-01-20 Ladislav Hagara <hgr AT vabo.cz>
+       * DETAILS: 1.33
+
 2011-08-05 Ladislav Hagara <hgr AT vabo.cz>
        * DETAILS: 1.32
 
diff --git a/editors/focuswriter/BUILD b/editors/focuswriter/BUILD
new file mode 100755
index 0000000..eec3de4
--- /dev/null
+++ b/editors/focuswriter/BUILD
@@ -0,0 +1 @@
+qt4_build
diff --git a/editors/focuswriter/DEPENDS b/editors/focuswriter/DEPENDS
new file mode 100755
index 0000000..1d42d0e
--- /dev/null
+++ b/editors/focuswriter/DEPENDS
@@ -0,0 +1,4 @@
+depends -sub CXX gcc &&
+depends qt4 &&
+depends hunspell &&
+depends libzip
diff --git a/editors/focuswriter/DETAILS b/editors/focuswriter/DETAILS
new file mode 100755
index 0000000..8a75c4f
--- /dev/null
+++ b/editors/focuswriter/DETAILS
@@ -0,0 +1,13 @@
+           SPELL=focuswriter
+         VERSION=1.3.5.2
+          SOURCE=${SPELL}-${VERSION}-src.tar.bz2
+SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
+      
SOURCE_URL=http://gottcode.org/focuswriter/focuswriter-1.3.5.2-src.tar.bz2
+     
SOURCE_HASH=sha512:3dce6927ad5c7e8d521962d01d8c646393523e22a9e039aa8a44cb4d10f0fdd4f2858a25a1e108031ce3dd2168b761331f2679d4d4c63ee2f4b43ff843ed04d2
+        WEB_SITE=http://gottcode.org/focuswriter/
+         ENTERED=20120119
+      LICENSE[0]=GPL
+           SHORT="simple, distraction-free writing environment"
+cat << EOF
+FocusWriter is a simple, distraction-free writing environment.
+EOF
diff --git a/editors/focuswriter/HISTORY b/editors/focuswriter/HISTORY
new file mode 100644
index 0000000..23f3153
--- /dev/null
+++ b/editors/focuswriter/HISTORY
@@ -0,0 +1,2 @@
+2012-01-19 Ladislav Hagara <hgr AT vabo.cz>
+       * DETAILS, DEPENDS, BUILD: spell created, version 1.3.5.2
diff --git a/gnome2-apps/vinagre/DEPENDS b/gnome2-apps/vinagre/DEPENDS
index 3982ae9..3bc90e7 100755
--- a/gnome2-apps/vinagre/DEPENDS
+++ b/gnome2-apps/vinagre/DEPENDS
@@ -1,7 +1,7 @@
 depends libxml2 &&
 depends vala &&
 depends gtk+3 &&
-depends gtk-vnc &&
+depends -sub 'GTK3' gtk-vnc &&
 depends glib2 &&
 depends gconf2 &&
 depends gnome-doc-utils &&
diff --git a/gnome2-apps/vinagre/HISTORY b/gnome2-apps/vinagre/HISTORY
index 3a48e3a..49593fb 100644
--- a/gnome2-apps/vinagre/HISTORY
+++ b/gnome2-apps/vinagre/HISTORY
@@ -1,3 +1,6 @@
+2012-01-19 Eric Sandall <sandalle AT sourcemage.org>
+       * DEPENDS: Requires gtk-vnc built with gtk+3 bindings
+
 2011-11-26 Sukneet Basuta <sukneet AT sourcemage.org>
        * DETAILS: updated spell to 3.2.2
        * DEPENDS: gtk+2 -> gtk+3
diff --git a/gnome2-libs/libsoup/DEPENDS b/gnome2-libs/libsoup/DEPENDS
index 43698ef..eee1bd6 100755
--- a/gnome2-libs/libsoup/DEPENDS
+++ b/gnome2-libs/libsoup/DEPENDS
@@ -13,7 +13,8 @@ if [[ $LIBSOUP_GNOME == "y" ]]; then
 fi &&
 
 if [[ $LIBSOUP_DEVEL == "y" ]]; then
-depends glib-networking
+  sub_depends glib2 'GLIB_DEVEL' &&
+  depends glib-networking
 else
 optional_depends gnutls \
                  "--enable-ssl" \
diff --git a/gnome2-libs/libsoup/DETAILS b/gnome2-libs/libsoup/DETAILS
index c65539d..4966bb5 100755
--- a/gnome2-libs/libsoup/DETAILS
+++ b/gnome2-libs/libsoup/DETAILS
@@ -1,11 +1,12 @@
            SPELL=libsoup
 if [[ $LIBSOUP_DEVEL == y ]]; then
-         VERSION=2.36.1
+         VERSION=2.37.3
+          SOURCE=$SPELL-$VERSION.tar.xz
 else
          VERSION=2.36.1
+          SOURCE=$SPELL-$VERSION.tar.bz2
 fi
           BRANCH=`echo $VERSION|cut -d . -f 1,2`
-          SOURCE=$SPELL-$VERSION.tar.bz2
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
    SOURCE_URL[0]=$GNOME_URL/sources/$SPELL/$BRANCH/$SOURCE
       SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
diff --git a/gnome2-libs/libsoup/HISTORY b/gnome2-libs/libsoup/HISTORY
index 7d07c66..1585fd5 100644
--- a/gnome2-libs/libsoup/HISTORY
+++ b/gnome2-libs/libsoup/HISTORY
@@ -1,3 +1,9 @@
+2012-01-18 Eric Sandall <sandalle AT sourcemage.org>
+       * DEPENDS: Devel libsoup requires devel glib2
+
+2012-01-11 Arjan Bouter <abouter AT sourcemage.org>
+       * DETAILS: devel version 2.37.3
+
 2011-10-18 Ladislav Hagara <hgr AT vabo.cz>
        * DETAILS: 2.36.1
 
diff --git a/gnome2-libs/libsoup/libsoup-2.37.3.tar.xz.sig 
b/gnome2-libs/libsoup/libsoup-2.37.3.tar.xz.sig
new file mode 100644
index 0000000..19e4da3
Binary files /dev/null and b/gnome2-libs/libsoup/libsoup-2.37.3.tar.xz.sig 
differ
diff --git a/gnome2-libs/mutter/DETAILS b/gnome2-libs/mutter/DETAILS
index d7d4f13..0f10cd2 100755
--- a/gnome2-libs/mutter/DETAILS
+++ b/gnome2-libs/mutter/DETAILS
@@ -1,7 +1,7 @@
            SPELL=mutter
-         VERSION=3.2.1
+         VERSION=3.2.2
           BRANCH=${VERSION:0:3}
-          SOURCE="${SPELL}-${VERSION}.tar.bz2"
+          SOURCE="${SPELL}-${VERSION}.tar.xz"
    SOURCE_URL[0]=$GNOME_URL/sources/$SPELL/$BRANCH/$SOURCE
       SOURCE_GPG="gurus.gpg:${SOURCE}.sig:UPSTREAM_HASH"
 SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
diff --git a/gnome2-libs/mutter/HISTORY b/gnome2-libs/mutter/HISTORY
index 23e855f..d3ebdb9 100644
--- a/gnome2-libs/mutter/HISTORY
+++ b/gnome2-libs/mutter/HISTORY
@@ -1,3 +1,6 @@
+2012-01-18 Ladislav Hagara <hgr AT vabo.cz>
+       * DETAILS: 3.2.2, bz2 -> xz
+
 2011-11-09 Eric Sandall <sandalle AT sourcemage.org>
        * DEPENDS: Merged two optional dependencies on libxext
 
diff --git a/gnome2-libs/mutter/mutter-3.2.1.tar.bz2.sig 
b/gnome2-libs/mutter/mutter-3.2.1.tar.bz2.sig
deleted file mode 100644
index e6e6298..0000000
Binary files a/gnome2-libs/mutter/mutter-3.2.1.tar.bz2.sig and /dev/null 
differ
diff --git a/gnome2-libs/mutter/mutter-3.2.2.tar.xz.sig 
b/gnome2-libs/mutter/mutter-3.2.2.tar.xz.sig
new file mode 100644
index 0000000..8c2eff4
Binary files /dev/null and b/gnome2-libs/mutter/mutter-3.2.2.tar.xz.sig differ
diff --git a/gnome3-libs/gnome-shell/DETAILS b/gnome3-libs/gnome-shell/DETAILS
index 41cb130..e83ecf7 100755
--- a/gnome3-libs/gnome-shell/DETAILS
+++ b/gnome3-libs/gnome-shell/DETAILS
@@ -1,7 +1,7 @@
            SPELL=gnome-shell
-         VERSION=3.2.1
+         VERSION=3.2.2.1
          BRANCH=`echo $VERSION|cut -d . -f 1,2`
-          SOURCE=$SPELL-$VERSION.tar.bz2
+          SOURCE=$SPELL-$VERSION.tar.xz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
    SOURCE_URL[0]=$GNOME_URL/sources/$SPELL/$BRANCH/$SOURCE
       SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
diff --git a/gnome3-libs/gnome-shell/HISTORY b/gnome3-libs/gnome-shell/HISTORY
index 65a153a..d3e5294 100644
--- a/gnome3-libs/gnome-shell/HISTORY
+++ b/gnome3-libs/gnome-shell/HISTORY
@@ -1,3 +1,9 @@
+2012-01-20 Ladislav Hagara <hgr AT vabo.cz>
+       * DETAILS: 3.2.2.1
+
+2012-01-18 Ladislav Hagara <hgr AT vabo.cz>
+       * DETAILS: 3.2.2, bz2 -> xz
+
 2011-12-14 Ladislav Hagara <hgr AT vabo.cz>
        * DEPENDS: pulseaudio added
 
diff --git a/gnome3-libs/gnome-shell/gnome-shell-3.2.1.tar.bz2.sig 
b/gnome3-libs/gnome-shell/gnome-shell-3.2.1.tar.bz2.sig
deleted file mode 100644
index a1ad193..0000000
Binary files a/gnome3-libs/gnome-shell/gnome-shell-3.2.1.tar.bz2.sig and 
/dev/null differ
diff --git a/gnome3-libs/gnome-shell/gnome-shell-3.2.2.1.tar.xz.sig 
b/gnome3-libs/gnome-shell/gnome-shell-3.2.2.1.tar.xz.sig
new file mode 100644
index 0000000..65943e7
Binary files /dev/null and 
b/gnome3-libs/gnome-shell/gnome-shell-3.2.2.1.tar.xz.sig differ
diff --git a/groups b/groups
index d65f43d..2546446 100755
--- a/groups
+++ b/groups
@@ -116,5 +116,6 @@ dspam:188:
 nslcd:189:
 redis:190:
 lightdm:191:
+masqmail:192:
 users:1000:
 nogroup:65534:
diff --git a/http/webkitgtk/DEPENDS b/http/webkitgtk/DEPENDS
index 66f43a0..796824a 100755
--- a/http/webkitgtk/DEPENDS
+++ b/http/webkitgtk/DEPENDS
@@ -10,7 +10,7 @@ depends JPEG &&
 depends bison &&
 depends flex &&
 depends sqlite &&
-depends -sub SOUP_DEVEL libsoup
+depends libsoup &&
 depends enchant &&
 depends libxt &&
 
diff --git a/http/webkitgtk/HISTORY b/http/webkitgtk/HISTORY
index eef4e0a..1f4420b 100644
--- a/http/webkitgtk/HISTORY
+++ b/http/webkitgtk/HISTORY
@@ -1,3 +1,6 @@
+2012-01-19 Vlad Glagolev <stealth AT sourcemage.org>
+       * DEPENDS: libsoup is up to date enough to be used as stable
+
 2011-09-29 Ladislav Hagara <hgr AT vabo.cz>
        * DETAILS: 1.6.1
        * BUILD: --with-gtk=2.0 added
diff --git a/libs/libgksu/BUILD b/libs/libgksu/BUILD
new file mode 100755
index 0000000..f9d60da
--- /dev/null
+++ b/libs/libgksu/BUILD
@@ -0,0 +1,3 @@
+LDFLAGS="-lgtk-x11-2.0 $LDFLAGS" &&
+
+default_build
diff --git a/libs/libgksu/HISTORY b/libs/libgksu/HISTORY
index 139ee65..3019187 100644
--- a/libs/libgksu/HISTORY
+++ b/libs/libgksu/HISTORY
@@ -1,3 +1,8 @@
+2012-01-20 Vlad Glagolev <stealth AT sourcemage.org>
+       * BUILD: added, to fix linking with recent gtk+2
+       * PRE_BUILD: apply the patch
+       * forkpty.patch: added, to fix work with recent sudo
+
 2011-03-10 Eric Sandall <sandalle AT sourcemage.org>
        * PRE_BUILD: Apply make.tab.patch
        * make.tab.patch: Fix spaces -> tabs in Makefile.{in,am}
diff --git a/libs/libgksu/PRE_BUILD b/libs/libgksu/PRE_BUILD
index ae31f41..dd7e857 100755
--- a/libs/libgksu/PRE_BUILD
+++ b/libs/libgksu/PRE_BUILD
@@ -1,3 +1,5 @@
 default_pre_build &&
 cd "$SOURCE_DIRECTORY" &&
+
+patch -p1 < "$SPELL_DIRECTORY"/forkpty.patch &&
 patch -p1 < "$SPELL_DIRECTORY"/make.tab.patch
diff --git a/libs/libgksu/forkpty.patch b/libs/libgksu/forkpty.patch
new file mode 100644
index 0000000..14113f9
--- /dev/null
+++ b/libs/libgksu/forkpty.patch
@@ -0,0 +1,358 @@
+--- libgksu-2.0.12.orig/libgksu/libgksu.c      2009-06-29 13:48:24.000000000 
-0400
++++ libgksu-2.0.12/libgksu/libgksu.c   2010-01-12 07:32:10.450657456 -0500
+@@ -1,7 +1,6 @@
+ /*
+  * Gksu -- a library providing access to su functionality
+  * Copyright (C) 2004-2009 Gustavo Noronha Silva
+- * Portions Copyright (C) 2009 VMware, Inc.
+  *
+  * This library is free software; you can redistribute it and/or
+  * modify it under the terms of the GNU Lesser General Public
+@@ -56,9 +55,6 @@
+ static void
+ gksu_context_launch_complete (GksuContext *context);
+ 
+-static void
+-read_line (int fd, gchar *buffer, int n);
+-
+ GType
+ gksu_error_get_type (void)
+ {
+@@ -2009,8 +2005,6 @@ gksu_su_fuller (GksuContext *context,
+       for (i = 0 ; cmd[i] != NULL ; i++)
+       g_free (cmd[i]);
+       g_free(cmd);
+-
+-      _exit(1);
+     }
+   else if (pid == -1)
+     {
+@@ -2125,10 +2119,10 @@ gksu_su_fuller (GksuContext *context,
+         /* drop the \n echoed on password entry if su did request
+            a password */
+         if (password_needed)
+-          read_line (fdpty, buf, 255);
++          read (fdpty, buf, 255);
+         if (context->debug)
+           fprintf (stderr, "DEBUG (run:post-after-pass) buf: -%s-\n", buf);
+-        read_line (fdpty, buf, 255);
++        read (fdpty, buf, 255);
+         if (context->debug)
+           fprintf (stderr, "DEBUG (run:post-after-pass) buf: -%s-\n", buf);
+       }
+@@ -2142,9 +2136,7 @@ gksu_su_fuller (GksuContext *context,
+       {
+         int retval = 0;
+ 
+-        /* Red Hat's su shows the full path to su in its error messages. */
+-        if (!strncmp (buf, "su:", 3) ||
+-            !strncmp (buf, "/bin/su:", 7))
++        if (!strncmp (buf, "su", 2))
+           {
+             gchar **strings;
+ 
+@@ -2155,11 +2147,7 @@ gksu_su_fuller (GksuContext *context,
+               }
+ 
+             strings = g_strsplit (buf, ":", 2);
+-
+-            /* Red Hat and Fedora use 'incorrect password'. */
+-            if (strings[1] &&
+-                (g_str_has_prefix(strings[1], " Authentication failure") ||
+-                 g_str_has_prefix(strings[1], " incorrect password")))
++            if (strings[1] && !strncmp (strings[1], " Authentication 
failure", 23))
+               {
+                 if (used_gnome_keyring)
+                   g_set_error (error, gksu_quark,
+@@ -2473,12 +2461,6 @@ gksu_sudo_fuller (GksuContext *context,
+ {
+   char **cmd;
+   char buffer[256] = {0};
+-  char *child_stderr = NULL;
+-  /* This command is used to gain a token */
+-  char *const verifycmd[] =
+-    {
+-      "/usr/bin/sudo", "-p", "GNOME_SUDO_PASS", "-v", NULL
+-    };
+   int argcount = 8;
+   int i, j;
+ 
+@@ -2489,8 +2471,9 @@ gksu_sudo_fuller (GksuContext *context,
+ 
+   pid_t pid;
+   int status;
+-  FILE *fdfile = NULL;
+-  int fdpty = -1;
++  FILE *infile, *outfile;
++  int parent_pipe[2]; /* For talking to the parent */
++  int child_pipe[2];  /* For talking to the child */
+ 
+   context->sudo_mode = TRUE;
+ 
+@@ -2565,10 +2548,6 @@ gksu_sudo_fuller (GksuContext *context,
+   cmd[argcount] = g_strdup("-S");
+   argcount++;
+ 
+-  /* Make sudo noninteractive (we should already have a token) */
+-  cmd[argcount] = g_strdup("-n");
+-  argcount++;
+-
+   /* Make sudo use next arg as prompt */
+   cmd[argcount] = g_strdup("-p");
+   argcount++;
+@@ -2647,21 +2626,26 @@ gksu_sudo_fuller (GksuContext *context,
+       fprintf (stderr, "cmd[%d]: %s\n", i, cmd[i]);
+     }
+ 
+-  pid = forkpty(&fdpty, NULL, NULL, NULL);
+-  if (pid == 0)
++  if ((pipe(parent_pipe)) == -1)
+     {
+-      // Child
+-      setsid();   // make us session leader
+-
+-      execv(verifycmd[0], verifycmd);
++      g_set_error (error, gksu_quark, GKSU_ERROR_PIPE,
++                 _("Error creating pipe: %s"),
++                 strerror(errno));
++      sudo_reset_xauth (context, xauth, xauth_env);
++      return FALSE;
++    }
+ 
+-      g_set_error (error, gksu_quark, GKSU_ERROR_EXEC,
+-                 _("Failed to exec new process: %s"),
++  if ((pipe(child_pipe)) == -1)
++    {
++      g_set_error (error, gksu_quark, GKSU_ERROR_PIPE,
++                 _("Error creating pipe: %s"),
+                  strerror(errno));
+       sudo_reset_xauth (context, xauth, xauth_env);
+       return FALSE;
+     }
+-  else if (pid == -1)
++
++  pid = fork();
++  if (pid == -1)
+     {
+       g_set_error (error, gksu_quark, GKSU_ERROR_FORK,
+                  _("Failed to fork new process: %s"),
+@@ -2669,26 +2653,56 @@ gksu_sudo_fuller (GksuContext *context,
+       sudo_reset_xauth (context, xauth, xauth_env);
+       return FALSE;
+     }
++  else if (pid == 0)
++    {
++      // Child
++      setsid();   // make us session leader
++      close(child_pipe[1]);
++      dup2(child_pipe[0], STDIN_FILENO);
++      dup2(parent_pipe[1], STDERR_FILENO);
+ 
++      execv(cmd[0], cmd);
++
++      g_set_error (error, gksu_quark, GKSU_ERROR_EXEC,
++                 _("Failed to exec new process: %s"),
++                 strerror(errno));
++      sudo_reset_xauth (context, xauth, xauth_env);
++      return FALSE;
++    }
+   else
+     {
+       gint counter = 0;
+       gchar *cmdline = NULL;
+-      struct termios tio;
+ 
+       // Parent
+-      fdfile = fdopen(fdpty, "w+");
++      close(parent_pipe[1]);
+ 
+-      /* make sure we notice that ECHO is turned off, if it gets
+-         turned off */
+-      tcgetattr (fdpty, &tio);
+-      for (counter = 0; (tio.c_lflag & ECHO) && counter < 15; counter++)
+-      {
+-        usleep (1000);
+-        tcgetattr (fdpty, &tio);
+-      }
++      infile = fdopen(parent_pipe[0], "r");
++      if (!infile)
++      {
++        g_set_error (error, gksu_quark, GKSU_ERROR_PIPE,
++                     _("Error opening pipe: %s"),
++                     strerror(errno));
++        sudo_reset_xauth (context, xauth, xauth_env);
++        return FALSE;
++      }
+ 
+-      fcntl (fdpty, F_SETFL, O_NONBLOCK);
++      outfile = fdopen(child_pipe[1], "w");
++      if (!outfile)
++      {
++        g_set_error (error, gksu_quark, GKSU_ERROR_PIPE,
++                     _("Error opening pipe: %s"),
++                     strerror(errno));
++        sudo_reset_xauth (context, xauth, xauth_env);
++        return FALSE;
++      }
++
++      /*
++      we are expecting to receive a GNOME_SUDO_PASS
++      if we don't there are two possibilities: an error
++      or a password is not needed
++      */
++      fcntl (parent_pipe[0], F_SETFL, O_NONBLOCK);
+ 
+       { /* no matter if we can read, since we're using
+          O_NONBLOCK; this is just to avoid the prompt
+@@ -2697,11 +2711,11 @@ gksu_sudo_fuller (GksuContext *context,
+       struct timeval tv;
+ 
+       FD_ZERO(&rfds);
+-      FD_SET(fdpty, &rfds);
++      FD_SET(parent_pipe[0], &rfds);
+       tv.tv_sec = 1;
+       tv.tv_usec = 0;
+ 
+-      select (fdpty + 1, &rfds, NULL, NULL, &tv);
++      select (parent_pipe[0] + 1, &rfds, NULL, NULL, &tv);
+       }
+ 
+       /* Try hard to find the prompt; it may happen that we're
+@@ -2713,7 +2727,7 @@ gksu_sudo_fuller (GksuContext *context,
+         if (strncmp (buffer, "GNOME_SUDO_PASS", 15) == 0)
+           break;
+ 
+-        read_line (fdpty, buffer, 256);
++        read_line (parent_pipe[0], buffer, 256);
+ 
+         if (context->debug)
+           fprintf (stderr, "buffer: -%s-\n", buffer);
+@@ -2747,17 +2761,18 @@ gksu_sudo_fuller (GksuContext *context,
+ 
+         usleep (1000);
+ 
+-        write (fdpty, password, strlen(password) + 1);
+-        write (fdpty, "\n", 1);
++        fprintf (outfile, "%s\n", password);
++        fclose (outfile);
+ 
+         nullify_password (password);
+ 
+-        fcntl(fdpty, F_SETFL, fcntl(fdpty, F_GETFL) & ~O_NONBLOCK);
++        /* turn NONBLOCK off */
++        fcntl(parent_pipe[0], F_SETFL, fcntl(parent_pipe[0], F_GETFL) & 
~O_NONBLOCK);
+         /* ignore the first newline that comes right after sudo receives
+            the password */
+-        fgets (buffer, 255, fdfile);
+-        /* this is the status we are interested in */
+-        fgets (buffer, 255, fdfile);
++        fgets (buffer, 255, infile);
++        /* this is the status we are interessted in */
++        fgets (buffer, 255, infile);
+       }
+       else
+       {
+@@ -2766,7 +2781,7 @@ gksu_sudo_fuller (GksuContext *context,
+           fprintf (stderr, "No password prompt found; we'll assume we don't 
need a password.\n");
+ 
+           /* turn NONBLOCK off, also if have no prompt */
+-          fcntl(fdpty, F_SETFL, fcntl(fdpty, F_GETFL) & ~O_NONBLOCK);
++          fcntl(parent_pipe[0], F_SETFL, fcntl(parent_pipe[0], F_GETFL) & 
~O_NONBLOCK);
+ 
+         should_display = gconf_client_get_bool (context->gconf_client,
+                                                 BASE_PATH 
"display-no-pass-info", NULL);
+@@ -2785,9 +2800,14 @@ gksu_sudo_fuller (GksuContext *context,
+         fprintf (stderr, "%s", buffer);
+       }
+ 
+-      if (g_str_has_prefix (buffer, "Sorry, try again."))
++      if (!strcmp (buffer, "Sorry, try again.\n"))
+       g_set_error (error, gksu_quark, GKSU_ERROR_WRONGPASS,
+                    _("Wrong password."));
++      else if (!strncmp (buffer, "Sorry, user ", 12))
++      g_set_error (error, gksu_quark, GKSU_ERROR_NOT_ALLOWED,
++                   _("The underlying authorization mechanism (sudo) "
++                     "does not allow you to run this program. Contact "
++                     "the system administrator."));
+       else
+       {
+         gchar *haystack = buffer;
+@@ -2805,10 +2825,6 @@ gksu_sudo_fuller (GksuContext *context,
+           }
+       }
+ 
+-      /* If we have an error, let's just stop sudo right there. */
+-      if (error)
+-        close(fdpty);
+-
+       cmdline = g_strdup("sudo");
+       /* wait for the child process to end or become something other
+        than sudo */
+@@ -2825,23 +2841,17 @@ gksu_sudo_fuller (GksuContext *context,
+       if (context->sn_context)
+       gksu_context_launch_complete (context);
+ 
++      while (read (parent_pipe[0], buffer, 255) > 0)
++      {
++        fprintf (stderr, "%s", buffer);
++        bzero(buffer, 256);
++      }
++
+       /* if the process is still active waitpid() on it */
+       if (pid_exited != pid)
+       waitpid(pid, &status, 0);
+       sudo_reset_xauth (context, xauth, xauth_env);
+ 
+-      /*
+-       * Did token acquisition succeed? If so, spawn sudo in
+-       * non-interactive mode. It should either succeed or die
+-       * immediately if you're not allowed to run the command.
+-       */
+-      if (WEXITSTATUS(status) == 0)
+-        {
+-          g_spawn_sync(NULL, cmd, NULL, 0, NULL, NULL,
+-                       NULL, &child_stderr, &status,
+-                       error);
+-        }
+-
+       if (exit_status)
+       {
+               if (WIFEXITED(status)) {
+@@ -2853,13 +2863,6 @@ gksu_sudo_fuller (GksuContext *context,
+ 
+       if (WEXITSTATUS(status))
+       {
+-          if (g_str_has_prefix(child_stderr, "Sorry, user "))
+-            {
+-              g_set_error (error, gksu_quark, GKSU_ERROR_NOT_ALLOWED,
+-                           _("The underlying authorization mechanism (sudo) 
"
+-                             "does not allow you to run this program. 
Contact "
+-                             "the system administrator."));
+-            }
+         if(cmdline)
+           {
+             /* sudo already exec()ed something else, don't report
+@@ -2868,7 +2871,6 @@ gksu_sudo_fuller (GksuContext *context,
+             if (!g_str_has_suffix (cmdline, "sudo"))
+               {
+                 g_free (cmdline);
+-                g_free (child_stderr);
+                 return FALSE;
+               }
+             g_free (cmdline);
+@@ -2881,11 +2883,11 @@ gksu_sudo_fuller (GksuContext *context,
+       }
+     }
+ 
+-  fprintf(stderr, child_stderr);
+-  g_free(child_stderr);
+-
+   /* if error is set we have found an error condition */
+-  return (error == NULL);
++  if (error)
++    return FALSE;
++
++  return TRUE;
+ }
+ 
+ /**
diff --git a/libs/libidn/DETAILS b/libs/libidn/DETAILS
index 097f83d..357757b 100755
--- a/libs/libidn/DETAILS
+++ b/libs/libidn/DETAILS
@@ -1,5 +1,5 @@
            SPELL=libidn
-         VERSION=1.22
+         VERSION=1.24
           SOURCE=$SPELL-$VERSION.tar.gz
          SOURCE2=$SOURCE.sig
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/libs/libidn/HISTORY b/libs/libidn/HISTORY
index e657632..7a6816f 100644
--- a/libs/libidn/HISTORY
+++ b/libs/libidn/HISTORY
@@ -1,3 +1,6 @@
+2012-01-17 Ladislav Hagara <hgr AT vabo.cz>
+       * DETAILS: 1.24
+
 2011-05-05 Ladislav Hagara <hgr AT vabo.cz>
        * DETAILS: 1.22
 
diff --git a/libs/libnih/DETAILS b/libs/libnih/DETAILS
index 6dfd4f3..991dabe 100755
--- a/libs/libnih/DETAILS
+++ b/libs/libnih/DETAILS
@@ -1,9 +1,9 @@
            SPELL=libnih
-         VERSION=1.0.2.orig
-          SOURCE="${SPELL}_${VERSION}.tar.gz"
-   
SOURCE_URL[0]=http://archive.ubuntu.com/ubuntu/pool/main/libn/${SPELL}/${SOURCE}
-     
SOURCE_HASH=sha512:d13f46dc2e449d8864a39e1b71747e419b8d262d3c8ce7f555569208e3b72c5e74550d05336036794cc9debec52fec03eb7e9544b7bd93f37691048d0e52ad6c
-SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-1.0.2"
+         VERSION=1.0.3
+          SOURCE="${SPELL}-${VERSION}.tar.gz"
+   
SOURCE_URL[0]="http://launchpad.net/${SPELL}/${VERSION:0:3}/${VERSION}/+download/${SOURCE}";
+     
SOURCE_HASH=sha512:fce40d2445b28c27b8838631681ca3206a4f053b2dd4fc488fc9ef98bbd3d933e3d62b82cf346be2ef1677f6457f692cf5544cd915a6bb1e5c618f98ffa101b4
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
         WEB_SITE="https://launchpad.net/libnih";
       LICENSE[0]=GPL
          ENTERED=20101114
diff --git a/libs/libnih/HISTORY b/libs/libnih/HISTORY
index f98a20a..7cb0369 100644
--- a/libs/libnih/HISTORY
+++ b/libs/libnih/HISTORY
@@ -1,3 +1,6 @@
+2012-01-17 Arjan Bouter <abouter AT sourcemage.org>
+       * DETAILS: version 1.0.3
+
 2010-11-14 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
        * DEPENDS, DETAILS: spell created
 
diff --git a/mail/courier/CONFLICTS b/mail/courier/CONFLICTS
index d60101b..36fa790 100755
--- a/mail/courier/CONFLICTS
+++ b/mail/courier/CONFLICTS
@@ -1,4 +1,5 @@
 conflicts courier-imap &&
+conflicts masqmail &&
 conflicts esmtp &&
 conflicts exim &&
 conflicts postfix &&
diff --git a/mail/courier/HISTORY b/mail/courier/HISTORY
index 8bbee30..496ca4e 100644
--- a/mail/courier/HISTORY
+++ b/mail/courier/HISTORY
@@ -1,3 +1,6 @@
+2012-01-19 Vlad Glagolev <stealth AT sourcemage.org>
+       * CONFLICTS: added masqmail
+
 2011-03-27 Remko van der Vossen <wich AT sourcemage.org>
        * DETAILS: version 0.65.3
        * init.d/*: simplified and use smgl_init (working NEEDS)
diff --git a/mail/esmtp/CONFLICTS b/mail/esmtp/CONFLICTS
index 3ae5540..6482df0 100755
--- a/mail/esmtp/CONFLICTS
+++ b/mail/esmtp/CONFLICTS
@@ -1,3 +1,4 @@
+conflicts  masqmail  &&
 conflicts  courier   &&
 conflicts  exim      &&
 conflicts  postfix   &&
diff --git a/mail/esmtp/HISTORY b/mail/esmtp/HISTORY
index 3060a7c..7862f87 100644
--- a/mail/esmtp/HISTORY
+++ b/mail/esmtp/HISTORY
@@ -1,3 +1,6 @@
+2012-01-19 Vlad Glagolev <stealth AT sourcemage.org>
+       * CONFLICTS: added masqmail
+
 2011-10-23 Vlad Glagolev <stealth AT sourcemage.org>
        * DETAILS: updated spell to 1.2
 
diff --git a/mail/exim/CONFLICTS b/mail/exim/CONFLICTS
index 91e224b..d8f360d 100755
--- a/mail/exim/CONFLICTS
+++ b/mail/exim/CONFLICTS
@@ -1,3 +1,4 @@
+conflicts  masqmail  &&
 conflicts  courier   &&
 conflicts  esmtp     &&
 conflicts  postfix   &&
diff --git a/mail/exim/HISTORY b/mail/exim/HISTORY
index 9022940..3d9d4dd 100644
--- a/mail/exim/HISTORY
+++ b/mail/exim/HISTORY
@@ -1,3 +1,6 @@
+2012-01-19 Vlad Glagolev <stealth AT sourcemage.org>
+       * CONFLICTS: added masqmail
+
 2011-10-10 Vlad Glagolev <stealth AT sourcemage.org>
        * DETAILS: updated spell to 4.77; SECURITY_PATCH++
 
diff --git a/mail/masqmail/BUILD b/mail/masqmail/BUILD
new file mode 100755
index 0000000..be4c244
--- /dev/null
+++ b/mail/masqmail/BUILD
@@ -0,0 +1,10 @@
+create_account masqmail &&
+create_account mail &&
+
+OPTS="--with-user=masqmail \
+      --with-group=masqmail \
+      --with-spooldir=$INSTALL_ROOT/var/spool/mail \
+      $MASQMAIL_OPTS \
+      $OPTS" &&
+
+default_build
diff --git a/mail/masqmail/CONFIGURE b/mail/masqmail/CONFIGURE
new file mode 100755
index 0000000..e203269
--- /dev/null
+++ b/mail/masqmail/CONFIGURE
@@ -0,0 +1,11 @@
+config_query_option MASQMAIL_OPTS "Enable resolver support?" y \
+                                  "--enable-resolver" \
+                                  "--disable-resolver" &&
+
+config_query_option MASQMAIL_OPTS "Enable AUTH (RFC 2554) client support?" y 
\
+                                  "--enable-auth" \
+                                  "--disable-auth" &&
+
+config_query_option MASQMAIL_OPTS "Enable debugging?" n \
+                                  "--enable-debug" \
+                                  "--disable-debug"
diff --git a/mail/masqmail/CONFLICTS b/mail/masqmail/CONFLICTS
new file mode 100755
index 0000000..a1641aa
--- /dev/null
+++ b/mail/masqmail/CONFLICTS
@@ -0,0 +1,6 @@
+conflicts  exim      &&
+conflicts  courier   &&
+conflicts  esmtp     &&
+conflicts  postfix   &&
+conflicts  sendmail  &&
+conflicts  netqmail
diff --git a/mail/masqmail/DEPENDS b/mail/masqmail/DEPENDS
new file mode 100755
index 0000000..dad78f0
--- /dev/null
+++ b/mail/masqmail/DEPENDS
@@ -0,0 +1,6 @@
+depends glib2 &&
+
+optional_depends liblockfile \
+                 "--with-liblockfile" \
+                 "--without-liblockfile" \
+                 "to use liblock"
diff --git a/mail/masqmail/DETAILS b/mail/masqmail/DETAILS
new file mode 100755
index 0000000..aab8643
--- /dev/null
+++ b/mail/masqmail/DETAILS
@@ -0,0 +1,47 @@
+           SPELL=masqmail
+         VERSION=0.3.4
+          SOURCE=$SPELL-$VERSION.tar.gz
+         SOURCE2=$SOURCE.asc
+   SOURCE_URL[0]=http://marmaro.de/prog/$SPELL/files/$SOURCE
+  SOURCE2_URL[0]=$SOURCE_URL.asc
+      SOURCE_GPG=masqmail.gpg:$SOURCE2:UPSTREAM_KEY
+  SOURCE2_IGNORE=signature
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
+      LICENSE[0]=GPL
+        WEB_SITE=http://marmaro.de/prog/masqmail/
+         ENTERED=20120119
+           SHORT="MTA for workstations and for servers in small networks"
+cat << EOF
+Masqmail is a mail server designed for hosts that are not permanently 
connected
+to the Internet. It handles outgoing messages, i.e. those that are to be sent
+over the non-permanent link (usually a ppp or slip connection over a modem or
+ISDN adapter) specially and delivers them only when explicitely told to do 
so.
+There is support for multiple providers, it is possible to write different
+configurations for each one. The configuration chosen is selected at delivery
+time, so that if for example a delivery of a message failed while connected 
with
+provider 1, it may be delivered when connected to provider 2. For each 
provider
+another mail host (or none) can be specified.
+
+Masqmail provides (a yet simple) mechanism to rewrite headers, also 
depending on
+the current connection. This makes it possible to deliver messages with a 
return
+address on the local network which will be rewitten at delivery time.
+
+The purpose of this is:
+
+- to allow delivery failure messages that are produced on the local network 
to
+be delivered immediately, while those that are produced outside can be 
delivered
+to a mailbox on the internet, to be retrieved later.
+
+- to give mail servers a return address which they can accept if they check 
for
+spam mail. Many mail servers require a return address which has the same 
domain
+as the server it is getting the message from. If you normally connect to only
+one provider, this is usually not a problem as you can configure your mailer 
to
+a fixed address (but then there is still the problem with the failure 
messages),
+but it is a problem if you use different ones from time to time.
+
+Masqmail shall once be a complete replacement for sendmail (or other MTAs 
such
+as exim, qmail or smail) on a local network, but it is NOT supposed to be
+installed in a network with a permanent internet connection (at least if it 
is
+not behind a secure firewall) because it has no ability to check for 
undesired
+relaying or spam filtering.
+EOF
diff --git a/mail/masqmail/HISTORY b/mail/masqmail/HISTORY
new file mode 100644
index 0000000..80df95c
--- /dev/null
+++ b/mail/masqmail/HISTORY
@@ -0,0 +1,3 @@
+2012-01-19 Vlad Glagolev <stealth AT sourcemage.org>
+       * DETAILS, DEPENDS, CONFIGURE, BUILD, CONFLICTS, PROVIDES, SECURITY,
+         INSTALL, init.d/masqmail{,.conf}, masqmail.gpg: spell created
diff --git a/mail/masqmail/INSTALL b/mail/masqmail/INSTALL
new file mode 100755
index 0000000..2fb052b
--- /dev/null
+++ b/mail/masqmail/INSTALL
@@ -0,0 +1,24 @@
+default_install &&
+
+install_config_file examples/masqmail.conf "$INSTALL_ROOT/etc/masqmail" &&
+
+ln -vsf "$TRACK_ROOT/usr/sbin/masqmail" "$INSTALL_ROOT/usr/lib/sendmail" &&
+ln -vsf "$TRACK_ROOT/usr/sbin/masqmail" "$INSTALL_ROOT/usr/sbin/sendmail" &&
+
+ln -vsf "$TRACK_ROOT/usr/sbin/masqmail" "$INSTALL_ROOT/usr/sbin/mailq" &&
+ln -vsf "$TRACK_ROOT/usr/sbin/masqmail" "$INSTALL_ROOT/usr/sbin/runq" &&
+ln -vsf "$TRACK_ROOT/usr/sbin/masqmail" "$INSTALL_ROOT/usr/sbin/mailrm" &&
+
+install -vm 1777 -d -o masqmail -g masqmail "$INSTALL_ROOT/var/spool/mail" &&
+
+if [[ -e $INSTALL_ROOT/var/spool/mail/input ]]; then
+  chown -R masqmail:masqmail "$INSTALL_ROOT/var/spool/mail/input"
+fi &&
+if [[ -e $INSTALL_ROOT/var/spool/mail/lock ]]; then
+  chown -R masqmail:masqmail "$INSTALL_ROOT/var/spool/mail/lock"
+fi &&
+
+if [[ $INIT_INSTALLED ]]; then
+  install_config_file "$SPELL_DIRECTORY/init.d/masqmail.conf" \
+                      "$INSTALL_ROOT/etc/sysconfig/masqmail"
+fi
diff --git a/mail/masqmail/PROVIDES b/mail/masqmail/PROVIDES
new file mode 100755
index 0000000..bebbaa4
--- /dev/null
+++ b/mail/masqmail/PROVIDES
@@ -0,0 +1,2 @@
+MAIL-TRANSPORT-AGENT
+SENDMAIL
diff --git a/mail/masqmail/SECURITY b/mail/masqmail/SECURITY
new file mode 100755
index 0000000..e1979f3
--- /dev/null
+++ b/mail/masqmail/SECURITY
@@ -0,0 +1,3 @@
+The use of MasqMail is *strongly* discouraged if you have a permanent 
connection
+to the internet without a firewall. Mainly because it does not have the 
ability
+to block relaying (it relays every mail). --FAQ
diff --git a/mail/masqmail/init.d/masqmail b/mail/masqmail/init.d/masqmail
new file mode 100755
index 0000000..478438c
--- /dev/null
+++ b/mail/masqmail/init.d/masqmail
@@ -0,0 +1,11 @@
+#!/bin/bash
+
+. /etc/sysconfig/masqmail
+
+PROGRAM=/usr/sbin/masqmail
+ARGS="-bd -q${QUEUE_DELAY}"
+PIDFILE="/var/run/masqmail/masqmail.pid"
+RUNLEVEL=3
+NEEDS="+network"
+
+. /etc/init.d/smgl_init
diff --git a/mail/masqmail/init.d/masqmail.conf 
b/mail/masqmail/init.d/masqmail.conf
new file mode 100644
index 0000000..0e16086
--- /dev/null
+++ b/mail/masqmail/init.d/masqmail.conf
@@ -0,0 +1,10 @@
+#
+# Configuration file for masqmail's init.d script
+#
+
+#
+# Accumulated message queue process time
+# e.g. every 10 minutes
+#
+QUEUE_DELAY=10m
+
diff --git a/mail/masqmail/masqmail.gpg b/mail/masqmail/masqmail.gpg
new file mode 100644
index 0000000..b489034
Binary files /dev/null and b/mail/masqmail/masqmail.gpg differ
diff --git a/mail/postfix/CONFLICTS b/mail/postfix/CONFLICTS
index ef52ac0..b94f6db 100755
--- a/mail/postfix/CONFLICTS
+++ b/mail/postfix/CONFLICTS
@@ -1,3 +1,4 @@
+conflicts masqmail &&
 conflicts exim &&
 conflicts qmail &&
 conflicts sendmail
diff --git a/mail/postfix/HISTORY b/mail/postfix/HISTORY
index 79e1a02..a795e42 100644
--- a/mail/postfix/HISTORY
+++ b/mail/postfix/HISTORY
@@ -1,3 +1,6 @@
+2012-01-19 Vlad Glagolev <stealth AT sourcemage.org>
+       * CONFLICTS: added masqmail
+
 2011-06-25 Elisamuel Resto <ryuji AT sourcemage.org>
        * DEPENDS: updated stable to 2.8.3; experimental to 2.9-20110615
 
diff --git a/mail/qmail/CONFLICTS b/mail/qmail/CONFLICTS
index 6496d05..3c0a6f0 100755
--- a/mail/qmail/CONFLICTS
+++ b/mail/qmail/CONFLICTS
@@ -1,3 +1,4 @@
+conflicts  masqmail   &&
 conflicts  exim       &&
 conflicts  netqmail   &&
 conflicts  sendmail   &&
diff --git a/mail/qmail/HISTORY b/mail/qmail/HISTORY
index b05ddd1..287eff9 100644
--- a/mail/qmail/HISTORY
+++ b/mail/qmail/HISTORY
@@ -1,3 +1,6 @@
+2012-01-19 Vlad Glagolev <stealth AT sourcemage.org>
+       * CONFLICTS: added masqmail
+
 2010-04-20 Dave Josephsen <dave AT sourcemage.org>
        * CONFIGURE, PRE_BUILD, patches/qmail-tls-patch: Add TLS patch
 
diff --git a/mail/sendmail/CONFLICTS b/mail/sendmail/CONFLICTS
index ecde466..38cde47 100755
--- a/mail/sendmail/CONFLICTS
+++ b/mail/sendmail/CONFLICTS
@@ -1,3 +1,4 @@
+conflicts  masqmail     &&
 conflicts  courier      &&
 conflicts  esmtp        &&
 conflicts  exim         &&
diff --git a/mail/sendmail/HISTORY b/mail/sendmail/HISTORY
index 41219d9..98ec9e1 100644
--- a/mail/sendmail/HISTORY
+++ b/mail/sendmail/HISTORY
@@ -1,3 +1,6 @@
+2012-01-19 Vlad Glagolev <stealth AT sourcemage.org>
+       * CONFLICTS: added masqmail
+
 2011-10-14 Bor Kraljič <pyrobor AT ver.si>
        * DETAILS: fixed long description wrap (scripted)
 
diff --git a/mail/ssmtp/CONFLICTS b/mail/ssmtp/CONFLICTS
index de2ee92..f55db76 100755
--- a/mail/ssmtp/CONFLICTS
+++ b/mail/ssmtp/CONFLICTS
@@ -1,3 +1,4 @@
+conflicts  masqmail
 conflicts  esmtp
 conflicts  exim
 conflicts  qmail
diff --git a/mail/ssmtp/HISTORY b/mail/ssmtp/HISTORY
index e91b691..1ed69d3 100644
--- a/mail/ssmtp/HISTORY
+++ b/mail/ssmtp/HISTORY
@@ -1,3 +1,6 @@
+2012-01-19 Vlad Glagolev <stealth AT sourcemage.org>
+       * CONFLICTS: added masqmail
+
 2010-02-05 Bor Kraljič <pyrobor AT ver.si>
        * DETAILS: changed SOURCE .gz => .bz2
 
diff --git a/net/cacti/DETAILS b/net/cacti/DETAILS
index 4971f4d..6b878be 100755
--- a/net/cacti/DETAILS
+++ b/net/cacti/DETAILS
@@ -1,16 +1,10 @@
            SPELL=cacti
-         VERSION=0.8.7h
-  SECURITY_PATCH=2
-          SOURCE=$SPELL-$VERSION.tar.gz
-     
SOURCE_HASH=sha512:cbd96e8d0fd0fe49249fa4b85174dbdf27d79b42a7934a6466995585f748ddc8b771cd7903199fe4e53d54b1bcfd3c271bbdc93477904cece00520b65c806ebf
-if [[ $CACTI_PA == y ]]; then
-      VERSION_PA=3.0
-         SOURCE2=$SPELL-plugin-$VERSION-PA-v${VERSION_PA}.tar.gz
-  SOURCE2_URL[0]=http://www.cacti.net/downloads/pia/$SOURCE2
-    
SOURCE2_HASH=sha512:2d6d45b2095ec1c09e504516f5c0ebee8734c351a25750565ec09fe5d2a98ccc6e74e0bed12e005d4157f4ec85a3fe3941bf0e538621011c36ba79f0f764c224
-SOURCE_DIRECTORY2="$BUILD_DIRECTORY/$SPELL-PA-${VERSION_PA}"
-fi
-SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
+         VERSION=0.8.7i
+     VERSION_PIA=3.1
+  SECURITY_PATCH=3
+          SOURCE=$SPELL-$VERSION-PIA-${VERSION_PIA}.tar.gz
+     
SOURCE_HASH=sha512:239e5e4f8697029b6075cd194937aefd95bba961388c98591a867d2ad83d3284d9960bf1ca9241e167f100697fd91b532d311d842a91d63220d6b678eec3699c
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION-PIA-${VERSION_PIA}"
    SOURCE_URL[0]=http://www.cacti.net/downloads/$SOURCE
       LICENSE[0]=GPL
         WEB_SITE=http://www.cacti.net/
diff --git a/net/cacti/HISTORY b/net/cacti/HISTORY
index 92862c4..f688dd0 100644
--- a/net/cacti/HISTORY
+++ b/net/cacti/HISTORY
@@ -1,3 +1,8 @@
+2012-01-19 Vlad Glagolev <stealth AT sourcemage.org>
+       * DETAILS: updated spell to 0.8.7i; SECURITY_PATCH++; PA is now 
bundled
+       * PREPARE: removed
+       * patches: added official patch 
(http://cacti.net/download_patches.php)
+
 2011-10-12 Vlad Glagolev <stealth AT sourcemage.org>
        * DETAILS: updated spell to 0.8.7h; SECURITY_PATCH++; updated plugin
          arch to 3.0; updated PA source url
diff --git a/net/cacti/INSTALL b/net/cacti/INSTALL
index cd7fd58..3ab09b7 100755
--- a/net/cacti/INSTALL
+++ b/net/cacti/INSTALL
@@ -1,6 +1 @@
-cd ${SOURCE_DIRECTORY} &&
-install_www_files &&
-
-if [[ $CACTI_PA == y ]]; then
-  rm_source_dir "$SOURCE_DIRECTORY2"
-fi
+install_www_files
diff --git a/net/cacti/PREPARE b/net/cacti/PREPARE
deleted file mode 100755
index 521ab6d..0000000
--- a/net/cacti/PREPARE
+++ /dev/null
@@ -1,4 +0,0 @@
-message "Plugin Architecture provides users with the ability to write or 
use\n" \
-        "plugins with Cacti" &&
-
-config_query CACTI_PA "Install Plugin Architecture?" n
diff --git a/net/cacti/PRE_BUILD b/net/cacti/PRE_BUILD
index 5d34beb..4f1cd3f 100755
--- a/net/cacti/PRE_BUILD
+++ b/net/cacti/PRE_BUILD
@@ -5,18 +5,4 @@ if [[ -d "$SPELL_DIRECTORY/patches" ]]; then
   for patch in "$SPELL_DIRECTORY/patches"/*.patch; do
     patch -p1 < $patch
   done
-fi &&
-
-if [[ $CACTI_PA == y ]]; then
-  mk_source_dir "$SOURCE_DIRECTORY2"
-  cd "$SOURCE_DIRECTORY2" &&
-  unpack_file 2 &&
-
-  cd "$SOURCE_DIRECTORY" &&
-
-  cat "$SOURCE_DIRECTORY2/cacti-plugin-arch/pa.sql" >> cacti.sql &&
-  patch -p1 < 
"$SOURCE_DIRECTORY2/cacti-plugin-arch/$SPELL-plugin-$VERSION-PA-v${VERSION_PA}.diff"
 &&
-
-  # cleaning up post-patching
-  rm -f *.orig
 fi
diff --git a/net/cacti/patches/settings_checkbox.patch 
b/net/cacti/patches/settings_checkbox.patch
new file mode 100644
index 0000000..2226df2
--- /dev/null
+++ b/net/cacti/patches/settings_checkbox.patch
@@ -0,0 +1,56 @@
+--- 0.8.7i/graph_settings.php  2011-10-12 15:43:42.356672000 -0400
++++ 0.8.7i-patched/graph_settings.php  2011-12-21 11:34:38.000000000 -0500
+@@ -54,7 +54,29 @@
+ 
+       while (list($tab_short_name, $tab_fields) = each($settings_graphs)) {
+               while (list($field_name, $field_array) = each($tab_fields)) {
+-                      if ((isset($field_array["items"])) && 
(is_array($field_array["items"]))) {
++                      if ($field_array["method"] == "checkbox") {
++                              if (isset($_POST[$field_name])) {
++                                      db_execute("REPLACE INTO 
settings_graphs (user_id,name,value) VALUES (" . $_SESSION["sess_user_id"] . 
",'$field_name', 'on')");
++                              }else{
++                                      db_execute("REPLACE INTO 
settings_graphs (user_id,name,value) VALUES (" . $_SESSION["sess_user_id"] . 
",'$field_name', '')");
++                              }
++                      }elseif ($field_array["method"] == "checkbox_group") {
++                              while (list($sub_field_name, 
$sub_field_array) = each($field_array["items"])) {
++                                      if (isset($_POST[$sub_field_name])) {
++                                              db_execute("REPLACE INTO 
settings_graphs (user_id,name,value) VALUES (" . $_SESSION["sess_user_id"] . 
",'$sub_field_name', 'on')");
++                                      }else{
++                                              db_execute("REPLACE INTO 
settings_graphs (user_id,name,value) VALUES (" . $_SESSION["sess_user_id"] . 
",'$sub_field_name', '')");
++                                      }
++                              }
++                      }elseif ($field_array["method"] == 
"textbox_password") {
++                              if ($_POST[$field_name] != 
$_POST[$field_name."_confirm"]) {
++                                      raise_message(4);
++                                      break;
++                              }elseif (isset($_POST[$field_name])) {
++                                      $value = 
$cnn_id->qstr(get_request_var_post($field_name));
++                                      db_execute("REPLACE INTO 
settings_graphs (user_id,name,value) VALUES (" .  $_SESSION["sess_user_id"] . 
",'$field_name', $value)");
++                              }
++                      }elseif ((isset($field_array["items"])) && 
(is_array($field_array["items"]))) {
+                               while (list($sub_field_name, 
$sub_field_array) = each($field_array["items"])) {
+                                       if (isset($_POST[$sub_field_name])) {
+                                               $value = 
$cnn_id->qstr(get_request_var_post($sub_field_name));
+--- 0.8.7i/settings.php        2011-10-12 15:43:42.356672000 -0400
++++ 0.8.7i-patched/settings.php        2011-12-21 13:50:23.868244800 -0500
+@@ -32,6 +31,20 @@
+       while (list($field_name, $field_array) = 
each($settings{$_POST["tab"]})) {
+               if (($field_array["method"] == "header") || 
($field_array["method"] == "spacer" )){
+                       /* do nothing */
++              }elseif ($field_array["method"] == "checkbox") {
++                      if (isset($_POST[$field_name])) {
++                              db_execute("replace into settings 
(name,value) values ('$field_name', 'on')");
++                      }else{
++                              db_execute("replace into settings 
(name,value) values ('$field_name', '')");
++                      }
++              }elseif ($field_array["method"] == "checkbox_group") {
++                      while (list($sub_field_name, $sub_field_array) = 
each($field_array["items"])) {
++                              if (isset($_POST[$sub_field_name])) {
++                                      db_execute("replace into settings 
(name,value) values ('$sub_field_name', 'on')");
++                              }else{
++                                      db_execute("replace into settings 
(name,value) values ('$sub_field_name', '')");
++                              }
++                      }
+               }elseif ($field_array["method"] == "textbox_password") {
+                       if ($_POST[$field_name] != 
$_POST[$field_name."_confirm"]) {
+                               raise_message(4);
diff --git a/net/cifs-utils/DETAILS b/net/cifs-utils/DETAILS
index 6daffbc..02767af 100755
--- a/net/cifs-utils/DETAILS
+++ b/net/cifs-utils/DETAILS
@@ -1,8 +1,8 @@
            SPELL=cifs-utils
-         VERSION=5.1
+         VERSION=5.2
           SOURCE="${SPELL}-${VERSION}.tar.bz2"
    SOURCE_URL[0]=ftp://ftp.samba.org/pub/linux-cifs/${SPELL}/${SOURCE}
-     
SOURCE_HASH=sha512:f30640dcfc55cf529b012735b5d5d93db7950a7c5e397ac886a4c83b43d136be13f15eb1ad9ba35d935f0033743c1218cda059b4850e548935235cffb990ae0e
 
+     
SOURCE_HASH=sha512:e5ab1a90911bfd0df6c7ee691f289deda04c38ceaeb5e1e67fda700b687e3cc63874c4261e124467fdf561a7678660ca8f9d17c0e2159242f6e9d7f938fccd7e
 SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
         WEB_SITE="https://wiki.samba.org/index.php/LinuxCIFS_utils";
       LICENSE[0]=GPL
diff --git a/net/cifs-utils/HISTORY b/net/cifs-utils/HISTORY
index cab9e44..0a80e0c 100644
--- a/net/cifs-utils/HISTORY
+++ b/net/cifs-utils/HISTORY
@@ -1,3 +1,6 @@
+2012-01-19 Ladislav Hagara <hgr AT vabo.cz>
+       * DETAILS: 5.2
+
 2011-12-19 Julien "_kaze_" ROZO <julien AT rozo.org>
        * CONFIGURE, DEPENDS, BUILD: added the possibility to enable/disable
          cifsacl, which depends on keyutils to be built
diff --git a/net/iproute2/DETAILS b/net/iproute2/DETAILS
index 34e77d9..e7408ff 100755
--- a/net/iproute2/DETAILS
+++ b/net/iproute2/DETAILS
@@ -1,13 +1,14 @@
            SPELL=iproute2
-         VERSION=2.6.39
-          SOURCE=$SPELL-$VERSION.tar.gz
-         SOURCE2=${SOURCE}.sign
-  SOURCE2_IGNORE=signature
+         VERSION=3.2.0
+          SOURCE=$SPELL-$VERSION.tar.xz
+     
SOURCE_HASH=sha512:daa82498a81c0afa322878b4d6d3a448c361a1bb21c1e2f323d8ff4fdf43030106c4e5c9f4c8381f81dd66df2b2d162ac7d62b361b79914e9416d9bfb0c30762
+#         SOURCE2=${SOURCE}.sign
+#  SOURCE2_IGNORE=signature
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-   SOURCE_URL[0]=http://developer.osdl.org/dev/iproute2/download/$SOURCE
-  SOURCE2_URL[0]=http://developer.osdl.org/dev/iproute2/download/$SOURCE2
+   SOURCE_URL[0]=${KERNEL_URL}/pub/linux/utils/net/iproute2/$SOURCE
+#  SOURCE2_URL[0]=http://developer.osdl.org/dev/iproute2/download/$SOURCE2
       PATCHLEVEL=0
-      SOURCE_GPG="iproute2.gpg:${SOURCE2}:VERIFIED_UPSTREAM_KEY"
+#      SOURCE_GPG="iproute2.gpg:${SOURCE2}:VERIFIED_UPSTREAM_KEY"
       LICENSE[0]=GPL
         WEB_SITE=http://linux-net.osdl.org/index.php/Iproute2
          ENTERED=20020528
diff --git a/net/iproute2/HISTORY b/net/iproute2/HISTORY
index 0462b34..b74e909 100644
--- a/net/iproute2/HISTORY
+++ b/net/iproute2/HISTORY
@@ -1,3 +1,7 @@
+2012-01-20 Ladislav Hagara <hgr AT vabo.cz>
+       * DETAILS: 3.2.0, SOURCE_URL[0] updated
+       * PRE_BUILD, m_xt.patch: patch removed
+
 2011-07-19 Ladislav Hagara <hgr AT vabo.cz>
        * DETAILS: 2.6.39, bz2 -> gz, sig -> sign
 
diff --git a/net/iproute2/PRE_BUILD b/net/iproute2/PRE_BUILD
index 0f624ed..305a26d 100755
--- a/net/iproute2/PRE_BUILD
+++ b/net/iproute2/PRE_BUILD
@@ -1,8 +1,6 @@
 default_pre_build &&
 cd "$SOURCE_DIRECTORY" &&
 
-patch -p0 < "$SPELL_DIRECTORY/m_xt.patch" &&
-
 sedit  "s/-O2/$CFLAGS/"  Makefile                             &&
 sedit  "s:DESTDIR=/usr/:DESTDIR=:"     Makefile               &&
 sedit  "s:/share/:/usr/share/:"        Makefile               &&
diff --git a/net/iproute2/m_xt.patch b/net/iproute2/m_xt.patch
deleted file mode 100644
index 43ea142..0000000
--- a/net/iproute2/m_xt.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- tc/m_xt.c.orig
-+++ tc/m_xt.c
-@@ -162,7 +162,11 @@ static int parse_ipt(struct action_util *a,int *argc_p,
-                                       return -1;
-                               }
-                               tcipt_globals.opts =
--                                  xtables_merge_options(tcipt_globals.opts,
-+                                  xtables_merge_options(
-+#if XTABLES_VERSION_CODE > 5
-+                                                        
tcipt_globals.orig_opts,
-+#endif
-+                                                        tcipt_globals.opts,
-                                                         m->extra_opts,
-                                                         &m->option_offset);
-                       } else {
-@@ -307,7 +311,11 @@ print_ipt(struct action_util *au,FILE * f, struct 
rtattr *arg)
-                       }
- 
-                       tcipt_globals.opts =
--                          xtables_merge_options(tcipt_globals.opts,
-+                          xtables_merge_options(
-+#if XTABLES_VERSION_CODE > 5
-+                                                tcipt_globals.orig_opts,
-+#endif
-+                                                tcipt_globals.opts,
-                                                 m->extra_opts,
-                                                 &m->option_offset);
-               } else {
diff --git a/net/spine/DETAILS b/net/spine/DETAILS
index 13385aa..e8d4fcc 100755
--- a/net/spine/DETAILS
+++ b/net/spine/DETAILS
@@ -1,8 +1,8 @@
            SPELL=spine
-         VERSION=0.8.7h
+         VERSION=0.8.7i
           SOURCE=cacti-$SPELL-$VERSION.tar.gz
    SOURCE_URL[0]=http://www.cacti.net/downloads/$SPELL/$SOURCE
-     
SOURCE_HASH=sha512:681ea0849a477636348fbede7b11d04900cb3a2bbcb747deccaea31c67adfdb07f2692934a44de5975a142632154c7249ca66455c4f1beb1679bcfb56088e396
+     
SOURCE_HASH=sha512:3ccca10cdd12672c37591579a9ce9e70a7b4a60c562904ed99c4f26bd73b9227421ea0ba3a87351629847fcf54fdc659404b6e0abaf97d4b63213de82703fabd
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/cacti-$SPELL-$VERSION"
         WEB_SITE=http://www.cacti.net/spine_info.php
       LICENSE[0]=LGPL
diff --git a/net/spine/HISTORY b/net/spine/HISTORY
index eac4652..d8fe182 100644
--- a/net/spine/HISTORY
+++ b/net/spine/HISTORY
@@ -1,3 +1,6 @@
+2012-01-19 Vlad Glagolev <stealth AT sourcemage.org>
+       * DETAILS: updated spell to 0.8.7i
+
 2011-10-05 Vlad Glagolev <stealth AT sourcemage.org>
        * DETAILS: updated spell to 0.8.7h
        * DEPENDS: added libcap optional dependency
diff --git a/perl-cpan/io-socket-ssl/DETAILS b/perl-cpan/io-socket-ssl/DETAILS
index 9adb130..70b7cb2 100755
--- a/perl-cpan/io-socket-ssl/DETAILS
+++ b/perl-cpan/io-socket-ssl/DETAILS
@@ -1,5 +1,5 @@
            SPELL=io-socket-ssl
-         VERSION=1.33
+         VERSION=1.54
           SOURCE=IO-Socket-SSL-$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/IO-Socket-SSL-$VERSION
    SOURCE_URL[0]=http://www.cpan.org/authors/id/S/SU/SULLR/$SOURCE
diff --git a/perl-cpan/io-socket-ssl/HISTORY b/perl-cpan/io-socket-ssl/HISTORY
index afc730f..9345bd3 100644
--- a/perl-cpan/io-socket-ssl/HISTORY
+++ b/perl-cpan/io-socket-ssl/HISTORY
@@ -1,3 +1,6 @@
+2012-01-19 Vlad Glagolev <stealth AT sourcemage.org>
+       * DETAILS: updated spell to 1.54
+
 2010-06-17 Robin Cook <rcook AT wyrms.net>
        * DETAILS: updated VERSION to 1.33
 
diff --git a/perl-cpan/io-socket-ssl/IO-Socket-SSL-1.33.tar.gz.sig 
b/perl-cpan/io-socket-ssl/IO-Socket-SSL-1.33.tar.gz.sig
deleted file mode 100644
index b981e2c..0000000
Binary files a/perl-cpan/io-socket-ssl/IO-Socket-SSL-1.33.tar.gz.sig and 
/dev/null differ
diff --git a/perl-cpan/io-socket-ssl/IO-Socket-SSL-1.54.tar.gz.sig 
b/perl-cpan/io-socket-ssl/IO-Socket-SSL-1.54.tar.gz.sig
new file mode 100644
index 0000000..2fdd46e
Binary files /dev/null and 
b/perl-cpan/io-socket-ssl/IO-Socket-SSL-1.54.tar.gz.sig differ
diff --git a/perl-cpan/net-ssleay/DETAILS b/perl-cpan/net-ssleay/DETAILS
index 48e9120..38b31a3 100755
--- a/perl-cpan/net-ssleay/DETAILS
+++ b/perl-cpan/net-ssleay/DETAILS
@@ -1,11 +1,11 @@
            SPELL=net-ssleay
-         VERSION=1.36
+         VERSION=1.42
           SOURCE=Net-SSLeay-$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/Net-SSLeay-$VERSION
-   SOURCE_URL[0]=$PERL_CPAN_URL/CPAN/authors/id/F/FL/FLORA/$SOURCE
+   SOURCE_URL[0]=$PERL_CPAN_URL/CPAN/authors/id/M/MI/MIKEM/$SOURCE
       SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
          LICENSE=ART
-        WEB_SITE=http://search.cpan.org/~flora/Net-SSLeay/
+        WEB_SITE=http://search.cpan.org/~mikem/Net-SSLeay/
          ENTERED=20011212
         KEYWORDS="perl"
            SHORT="allows scripts to call the functions in the OpenSSL 
library"
diff --git a/perl-cpan/net-ssleay/HISTORY b/perl-cpan/net-ssleay/HISTORY
index 9e9b2b3..9e8ee59 100644
--- a/perl-cpan/net-ssleay/HISTORY
+++ b/perl-cpan/net-ssleay/HISTORY
@@ -1,3 +1,6 @@
+2012-01-19 Vlad Glagolev <stealth AT sourcemage.org>
+       * DETAILS: updated spell to 1.42; renewed urls
+
 2011-08-11 Vlad Glagolev <stealth AT sourcemage.org>
        * BUILD: made build non-interactive
 
diff --git a/perl-cpan/net-ssleay/Net-SSLeay-1.36.tar.gz.sig 
b/perl-cpan/net-ssleay/Net-SSLeay-1.36.tar.gz.sig
deleted file mode 100644
index 8b712a8..0000000
Binary files a/perl-cpan/net-ssleay/Net-SSLeay-1.36.tar.gz.sig and /dev/null 
differ
diff --git a/perl-cpan/net-ssleay/Net-SSLeay-1.42.tar.gz.sig 
b/perl-cpan/net-ssleay/Net-SSLeay-1.42.tar.gz.sig
new file mode 100644
index 0000000..d23a97b
Binary files /dev/null and b/perl-cpan/net-ssleay/Net-SSLeay-1.42.tar.gz.sig 
differ
diff --git a/python-pypi/python-ldap/DEPENDS b/python-pypi/python-ldap/DEPENDS
index 9960b58..aedea46 100755
--- a/python-pypi/python-ldap/DEPENDS
+++ b/python-pypi/python-ldap/DEPENDS
@@ -1,5 +1,8 @@
 depends python &&
 depends openldap &&
 
-optional_depends LIBSASL "" "" "for SASL support" &&
+if is_depends_enabled openldap cyrus-sasl; then
+  optional_depends LIBSASL "" "" "for SASL support"
+fi &&
+
 optional_depends openssl "" "" "for encrypted communications"
diff --git a/python-pypi/python-ldap/DETAILS b/python-pypi/python-ldap/DETAILS
index 2652997..90e30bf 100755
--- a/python-pypi/python-ldap/DETAILS
+++ b/python-pypi/python-ldap/DETAILS
@@ -1,11 +1,11 @@
            SPELL=python-ldap
-         VERSION=2.4.3
-     
SOURCE_HASH=sha512:30addd6e0985a0962cb254643411c666430f0fb6353a33bf7cdfaabd0e86076871da1ac3269c4dd7373cbe5dd3a658652307895ec61ab9891593004b4d6edadd
+         VERSION=2.4.7
+     
SOURCE_HASH=sha512:acb10be5ad1a654096018d488c9c6bf252668daae971881665e6ab15f03ad8d761b2602ebff2eb44e010d1ba028d023556f5dcd1ffcc39dd916b9e9095ed2feb
           SOURCE=$SPELL-$VERSION.tar.gz
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
    SOURCE_URL[0]=http://pypi.python.org/packages/source/p/$SPELL/$SOURCE
       LICENSE[0]=PYTHON
-        WEB_SITE=http://python-ldap.sourceforge.net/
+        WEB_SITE=http://www.python-ldap.org/
          ENTERED=20020416
            SHORT="Python interface to LDAP"
 cat << EOF
diff --git a/python-pypi/python-ldap/HISTORY b/python-pypi/python-ldap/HISTORY
index 0a27af4..01404b5 100644
--- a/python-pypi/python-ldap/HISTORY
+++ b/python-pypi/python-ldap/HISTORY
@@ -1,3 +1,8 @@
+2012-01-20 Vlad Glagolev <stealth AT sourcemage.org>
+       * DETAILS: updated spell to 2.4.7; renewed website
+       * DEPENDS: corrected dependencies
+       * PRE_BUILD: reimplemented defines' selection
+
 2011-07-23 Vlad Glagolev <stealth AT sourcemage.org>
        * DETAILS: updated spell to 2.4.3
 
diff --git a/python-pypi/python-ldap/PRE_BUILD 
b/python-pypi/python-ldap/PRE_BUILD
index bea747c..9ad426d 100755
--- a/python-pypi/python-ldap/PRE_BUILD
+++ b/python-pypi/python-ldap/PRE_BUILD
@@ -1,11 +1,10 @@
 default_pre_build &&
 cd "$SOURCE_DIRECTORY" &&
 
-if ! is_depends_enabled $SPELL cyrus-sasl; then
-  sed -i "s:sasl2 ::" setup.cfg
+if ! is_depends_enabled $SPELL $(get_spell_provider $SPELL LIBSASL); then
+  sedit "s: HAVE_SASL::" setup.cfg
 fi &&
 
-sed -i "s|^\(library_dirs[[:space:]]*=\).*$|\1 /usr/lib     /usr/lib/sasl2|" 
\
-  setup.cfg &&
-sed -i "s|^\(include_dirs[[:space:]]*=\).*$|\1 /usr/include 
/usr/include/sasl|" \
-  setup.cfg
+if ! is_depends_enabled $SPELL openssl; then
+  sedit "s: HAVE_TLS::" setup.cfg
+fi
diff --git a/shell-term-fm/shared-mime-info/DETAILS 
b/shell-term-fm/shared-mime-info/DETAILS
index 6249422..1221843 100755
--- a/shell-term-fm/shared-mime-info/DETAILS
+++ b/shell-term-fm/shared-mime-info/DETAILS
@@ -1,6 +1,6 @@
            SPELL=shared-mime-info
-         VERSION=0.91
-     
SOURCE_HASH=sha512:c4cd4934e1ead7f14b839212820baa145b524c234ae197c363a262d843e2efa29603ddb151230702f497e732476e71acddd71ff479c805b7319668e76b44c49c
+         VERSION=1.0
+     
SOURCE_HASH=sha512:d4b8ad9a982519681fa0fb5b25d8e6b5c4701bca96785b2729e34330a75668c65b0303ad882c7a1928f48cafc7e5a5803f4bdee4db3cfd76dd58e61435c7e6ca
           SOURCE=$SPELL-$VERSION.tar.xz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
    SOURCE_URL[0]=http://freedesktop.org/~hadess/$SOURCE
diff --git a/shell-term-fm/shared-mime-info/HISTORY 
b/shell-term-fm/shared-mime-info/HISTORY
index 9002a0b..689511f 100644
--- a/shell-term-fm/shared-mime-info/HISTORY
+++ b/shell-term-fm/shared-mime-info/HISTORY
@@ -1,3 +1,7 @@
+2012-01-20 Ladislav Hagara <hgr AT vabo.cz>
+       * DETAILS: 1.0
+       * PRE_BUILD: removed
+
 2011-11-27 Ladislav Hagara <hgr AT vabo.cz>
        * DETAILS: 0.91, bz2 -> xz
        * PRE_BUILD: added due to bz2 -> xz
diff --git a/shell-term-fm/shared-mime-info/PRE_BUILD 
b/shell-term-fm/shared-mime-info/PRE_BUILD
deleted file mode 100755
index 6f54504..0000000
--- a/shell-term-fm/shared-mime-info/PRE_BUILD
+++ /dev/null
@@ -1,5 +0,0 @@
-mk_source_dir $SOURCE_DIRECTORY &&
-cd $BUILD_DIRECTORY &&
-verify_file '' &&
-xz -dc $SOURCE_CACHE/$SOURCE | tar -xf -
-cd $SOURCE_DIRECTORY
diff --git a/smgl/upstart/DETAILS b/smgl/upstart/DETAILS
index e601825..e4aa440 100755
--- a/smgl/upstart/DETAILS
+++ b/smgl/upstart/DETAILS
@@ -1,15 +1,19 @@
            SPELL=upstart
-         VERSION=0.6.7
+         VERSION=1.4
           SOURCE=$SPELL-$VERSION.tar.gz
-     
SOURCE_HASH=sha512:789b66eef67d98e320ae859cb1ee157f86d675adb5cebff5db2eb50a172045925d2a39833c5ae3a5885a6a9ad753fe63bc0ff624e0785075cb952d05ef7bbe09
-   SOURCE_URL[0]=http://upstart.ubuntu.com/download/${VERSION:0:3}/${SOURCE}
+         SOURCE2=${SOURCE}.asc
+   SOURCE_URL[0]=http://upstart.ubuntu.com/download/${VERSION}/${SOURCE}
+#   
SOURCE_URL[0]=http://launchpad.net/upstart/1.x/${VERSION}/+download/${SOURCE}
+  SOURCE2_URL[0]=${SOURCE_URL[0]}.asc
+  SOURCE2_IGNORE=signature
+      SOURCE_GPG=upstart.gpg:$SOURCE2:UPSTREAM_KEY
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
         WEB_SITE=http://upstart.ubuntu.com
          ENTERED=20080113
       LICENSE[0]=GPL
            SHORT="init system"
 cat << EOF
-upstart is a replacement for the /sbin/init daemon which handles starting
-of tasks and services during boot,
-stopping them during shutdown and supervising them while the system is 
running.
+upstart is a replacement for the /sbin/init daemon which handles starting of
+tasks and services during boot, stopping them during shutdown and supervising
+them while the system is running.
 EOF
diff --git a/smgl/upstart/HISTORY b/smgl/upstart/HISTORY
index 02aa917..6badb02 100644
--- a/smgl/upstart/HISTORY
+++ b/smgl/upstart/HISTORY
@@ -1,5 +1,11 @@
-2011-10-14 Bor Kraljič <pyrobor AT ver.si>
-       * DETAILS: fixed long description wrap (scripted)
+2012-01-17 Arjan Bouter <abouter AT sourcemage.org>
+       * DETAILS: version 1.4
+       * PRE_BUILD: fixed removal of sysv-compat jobs
+       * upstart.gpg: added another key they use for releases
+
+2011-11-10 Arjan Bouter <abouter AT sourcemage.org>
+       * DETAILS: version 1.2, long description <80 col
+         switched to upstream gpg checking
 
 2011-03-30 Arjan Bouter <abouter AT sourcemage.org>
        * DETAILS: version 0.6.7
diff --git a/smgl/upstart/PRE_BUILD b/smgl/upstart/PRE_BUILD
index bbb1de0..dfcbe6d 100755
--- a/smgl/upstart/PRE_BUILD
+++ b/smgl/upstart/PRE_BUILD
@@ -1,3 +1,3 @@
 default_pre_build &&
 cd ${SOURCE_DIRECTORY} &&
-sedit 's/util conf doc/util doc/' Makefile.in
+sedit 's/ conf / /' Makefile.in
diff --git a/smgl/upstart/upstart.gpg b/smgl/upstart/upstart.gpg
new file mode 100644
index 0000000..765a46d
Binary files /dev/null and b/smgl/upstart/upstart.gpg differ
diff --git a/utils/ntp/DEPENDS b/utils/ntp/DEPENDS
index 80847c1..cebfbec 100755
--- a/utils/ntp/DEPENDS
+++ b/utils/ntp/DEPENDS
@@ -11,4 +11,8 @@ optional_depends mdnsresponder \
 
 optional_depends w3c-libwww \
                  "" "" \
-                 "for MD5 functions"
+                 "for MD5 functions" &&
+
+optional_depends net-snmp \
+                 "--with-ntpsnmpd" "--without-ntpsnmpd" \
+                 "for snmp support"
diff --git a/utils/ntp/HISTORY b/utils/ntp/HISTORY
index 2564cde..1649c37 100644
--- a/utils/ntp/HISTORY
+++ b/utils/ntp/HISTORY
@@ -1,3 +1,6 @@
+2012-01-17 Arjan Bouter <abouter AT sourcemage.org>
+       * DEPENDS: added missing optional dep on net-snmp
+
 2012-01-05 Julien "_kaze_" ROZO <julien AT rozo.org>
        * DETAILS: updated version to 4.2.6p5
 
diff --git a/utils/winusb/DEPENDS b/utils/winusb/DEPENDS
new file mode 100755
index 0000000..b590b36
--- /dev/null
+++ b/utils/winusb/DEPENDS
@@ -0,0 +1,9 @@
+depends -sub CXX gcc &&
+depends wxgtk &&
+
+runtime_depends gksu &&
+
+runtime_depends grub2 &&
+runtime_depends parted &&
+runtime_depends ntfs-3g &&
+runtime_depends util-linux
diff --git a/utils/winusb/DETAILS b/utils/winusb/DETAILS
new file mode 100755
index 0000000..d23a897
--- /dev/null
+++ b/utils/winusb/DETAILS
@@ -0,0 +1,23 @@
+           SPELL=winusb
+         VERSION=1.0.3
+      PATCHLEVEL=1
+          SOURCE=$SPELL-$VERSION.tar.gz
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
+   SOURCE_URL[0]=http://fr.congelli.eu/directdl/$SPELL/$SOURCE
+     
SOURCE_HASH=sha512:bd9d7f278c4ebf83395686b6a2324408bf72fdb7f12e987378526290b0015147e7e6333010974bf4088d47bf3bbcc62612320742216ec41f2cc69dec9d0ecf8b
+        WEB_SITE=http://en.congelli.eu/prog_info_winusb.html
+         ENTERED=20120120
+      LICENSE[0]=GPL
+        KEYWORDS="windows boot"
+           SHORT="program to create Windows USB stick installer from CD/DVD"
+cat << EOF
+WinUSB is a simple tool that enable you to create your own usb stick windows
+installer from an iso image or a real DVD.
+
+This package contains two programs:
+- WinUSB-gui: a graphical interface which is very easy to use.
+- winusb: the command line tool.
+
+Supported images: Windows Vista, Seven+ installer for any language and any
+version (home, pro...) and Windows PE.
+EOF
diff --git a/utils/winusb/HISTORY b/utils/winusb/HISTORY
new file mode 100644
index 0000000..7768601
--- /dev/null
+++ b/utils/winusb/HISTORY
@@ -0,0 +1,9 @@
+2012-01-21 Vlad Glagolev <stealth AT sourcemage.org>
+       * DETAILS: PATCHLEVEL=1
+       * DEPENDS: gksu is required when running under regular user
+       * PRE_BUILD: apply the patch
+       * parted+ntfs-3g.patch: added to force mount.ntfs-3g instead of 
kernel's
+         ntfs and fix alignment settings in parted
+
+2012-01-20 Vlad Glagolev <stealth AT sourcemage.org>
+       * DETAILS, DEPENDS: spell created
diff --git a/utils/winusb/PRE_BUILD b/utils/winusb/PRE_BUILD
new file mode 100755
index 0000000..3cc26df
--- /dev/null
+++ b/utils/winusb/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+
+patch -p0 < "$SPELL_DIRECTORY/parted+ntfs-3g.patch"
diff --git a/utils/winusb/parted+ntfs-3g.patch 
b/utils/winusb/parted+ntfs-3g.patch
new file mode 100644
index 0000000..d7e4e32
--- /dev/null
+++ b/utils/winusb/parted+ntfs-3g.patch
@@ -0,0 +1,20 @@
+--- src/winusb.orig    2012-01-19 16:28:30.000000000 +0400
++++ src/winusb 2012-01-21 02:05:58.093387384 +0400
+@@ -330,7 +330,7 @@
+ 
+       # Create partiton
+       size=$(env LANG='' parted -s "$device" print | grep ^Disk | cut -f2 
-d':' | sed 's/\s//g')
+-      parted --align cylinder -s "$device" mkpart primary 1MB "$size" # We 
start at 1MB for grub (it needs a post-mbr gap for its code)
++      parted -s "$device" mkpart primary 1MB "$size" # We start at 1MB for 
grub (it needs a post-mbr gap for its code)
+       partition="${targetMedia}1" # first partition
+       partprobe "$device" # Reload partition table
+ 
+@@ -360,7 +360,7 @@
+ fi
+ 
+ mkdir -p "$partitionMountPath"
+-mount "$partition" "$partitionMountPath"
++mount.ntfs-3g "$partition" "$partitionMountPath"
+ 
+ freeSpace=$(df --block-size 1 "$partitionMountPath" | grep "$partition" | 
awk '{print $4}')
+ neededSpace=$(du -s "$isoMountPath" --bytes | awk '{print $1}')
diff --git a/utils/youtube-dl/DETAILS b/utils/youtube-dl/DETAILS
index 994a973..7db904c 100755
--- a/utils/youtube-dl/DETAILS
+++ b/utils/youtube-dl/DETAILS
@@ -1,10 +1,10 @@
            SPELL=youtube-dl
-         VERSION=2011.08.04
+         VERSION=2012.01.08b
           SOURCE=$SPELL
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
    SOURCE_URL[0]=https://github.com/rg3/youtube-dl/raw/$VERSION/$SOURCE
  SOURCE_HINTS[0]="no-check-certificate"
-     
SOURCE_HASH=sha512:4a8e0428a9cb6226295fcc111130804136b070f35fdd8f0000284250e8ff1cc43958cd22d8da601102751d934653b2089cffb94795d6a9a484f4391797321056
+     
SOURCE_HASH=sha512:c5394f60df62466ab400bf73fdb94f803ab4c83df93d18cde2c3882d5e9027d4832802e21b664f16d283881604e649d76a0a8fe0f12ea672739a67874071d08a
   FORCE_DOWNLOAD=on
       LICENSE[0]=BSD
         KEYWORDS="utils"
diff --git a/utils/youtube-dl/HISTORY b/utils/youtube-dl/HISTORY
index ed38779..f821197 100644
--- a/utils/youtube-dl/HISTORY
+++ b/utils/youtube-dl/HISTORY
@@ -1,3 +1,6 @@
+2012-01-19 Ladislav Hagara <hgr AT vabo.cz>
+       * DETAILS: 2012.01.08b
+
 2011-08-05 Ladislav Hagara <hgr AT vabo.cz>
        * DETAILS: 2011.08.04
 
diff --git a/video/guvcview/DETAILS b/video/guvcview/DETAILS
index ac855dd..37501a3 100755
--- a/video/guvcview/DETAILS
+++ b/video/guvcview/DETAILS
@@ -1,10 +1,10 @@
            SPELL=guvcview
          VERSION=1.5.0
           SOURCE=${SPELL}-src-${VERSION}.tar.gz
-   SOURCE_URL[0]=http://download.berlios.de/${SPELL}/${SOURCE}
+   SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
      
SOURCE_HASH=sha512:c5d266eb0165eab0973b78ad527bf7806dc1e77d8a4e8d318c613acfaf764677c7a560156b25eb0a6fae5651d1a3e38ed83bb675885be4d1dcc63e57746d886a
 SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-src-${VERSION}"
-        WEB_SITE=http://guvcview.berlios.de/
+        WEB_SITE=http://guvcview.sourceforge.net/
       LICENSE[0]=GPL
          ENTERED=20090402
         KEYWORDS="video"
diff --git a/video/guvcview/HISTORY b/video/guvcview/HISTORY
index 3239bda..b41680e 100644
--- a/video/guvcview/HISTORY
+++ b/video/guvcview/HISTORY
@@ -1,3 +1,6 @@
+2012-01-20 Ladislav Hagara <hgr AT vabo.cz>
+       * DETAILS: WEB_SITE and SOURCE_URL[0] updated, berlios -> sourceforge
+
 2011-08-15 Vlad Glagolev <stealth AT sourcemage.org>
        * DETAILS: updated spell to 1.5.0
 
diff --git a/video/lives/DETAILS b/video/lives/DETAILS
index 7f8d30f..ee2fa57 100755
--- a/video/lives/DETAILS
+++ b/video/lives/DETAILS
@@ -1,6 +1,6 @@
            SPELL=lives
-         VERSION=1.0.10
-     
SOURCE_HASH=sha512:564d3efcce4e7803f0d8cc9828177ef6c1a28976babc5f62767951387bcd28742f91ede959c98a863ee0d1c7ef0feb2406bae07f4e53f7f0ac7704061a05c12a
+         VERSION=1.6.0
+     
SOURCE_HASH=sha512:020ec26b58fccd39c0cfd83354aab562343d908891d8f4c97c14d9280b89ec0a95e2bc335381a8d7c62dc5ebd873ef36311fcb4ce19af2cb31a66f5c95aded05
           SOURCE=LiVES-$VERSION.tar.bz2
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/lives-$VERSION
    SOURCE_URL[0]=http://www.xs4all.nl/%7Esalsaman/lives/current/$SOURCE
diff --git a/video/lives/HISTORY b/video/lives/HISTORY
index fc263f1..072e433 100644
--- a/video/lives/HISTORY
+++ b/video/lives/HISTORY
@@ -1,3 +1,6 @@
+2012-01-19 Ladislav Hagara <hgr AT vabo.cz>
+       * DETAILS: 1.6.0
+
 2011-04-27 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
        * DETAILS: version 1.0.10
 
diff --git a/windowmanagers/awesome/HISTORY b/windowmanagers/awesome/HISTORY
index 593ba3f..1ec7c95 100644
--- a/windowmanagers/awesome/HISTORY
+++ b/windowmanagers/awesome/HISTORY
@@ -1,3 +1,6 @@
+2012-01-11 Arjan Bouter <abouter AT sourcemage.org>
+       * PRE_BUILD: added to fix glib2 include
+
 2011-12-17 Vlad Glagolev <stealth AT sourcemage.org>
        * DEPENDS: lua -> lua51
 
diff --git a/windowmanagers/awesome/PRE_BUILD 
b/windowmanagers/awesome/PRE_BUILD
new file mode 100755
index 0000000..0a1261e
--- /dev/null
+++ b/windowmanagers/awesome/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd "${SOURCE_DIRECTORY}" &&
+sedit 's#glib/gspawn.h#glib-2.0/glib.h#' spawn.c
diff --git a/x11/gtk-vnc/DEPENDS b/x11/gtk-vnc/DEPENDS
index 694ea2e..0285a90 100755
--- a/x11/gtk-vnc/DEPENDS
+++ b/x11/gtk-vnc/DEPENDS
@@ -1,5 +1,3 @@
-depends gtk+3 "--with-gtk=3.0" &&
-
 depends  gnutls  &&
 depends  -sub VAPIGEN vala &&
 
diff --git a/x11/gtk-vnc/HISTORY b/x11/gtk-vnc/HISTORY
index 7fcdbcf..316a523 100644
--- a/x11/gtk-vnc/HISTORY
+++ b/x11/gtk-vnc/HISTORY
@@ -1,10 +1,15 @@
+2012-01-19 Eric Sandall <sandalle AT sourcemage.org>
+       * DEPENDS, SUB_DEPENDS: Allow choice between gtk+2 (default) and gtk+3
+         Some apps require pythong bindings (e.g. virt-manager) which
+         do not build with gtk+3 selected.
+
 2011-11-20 Sukneet Basuta <sukneet AT sourcemage.org>
        * DETAILS: bz2 => xz
 
 2011-11-11 Sukneet Basuta <sukneet AT sourcemage.org>
        * DETAILS: updated spell to 0.4.4
          bz2 => xz
-       * DEPENDS: added depends vala with VAPIGEN 
+       * DEPENDS: added depends vala with VAPIGEN
 
 2011-07-19 Ladislav Hagara <hgr AT vabo.cz>
        * DETAILS: 0.4.3
diff --git a/x11/gtk-vnc/PRE_SUB_DEPENDS b/x11/gtk-vnc/PRE_SUB_DEPENDS
index 6d312e2..241941f 100755
--- a/x11/gtk-vnc/PRE_SUB_DEPENDS
+++ b/x11/gtk-vnc/PRE_SUB_DEPENDS
@@ -1,6 +1,8 @@
 case $THIS_SUB_DEPENDS in
-  PYTHON) is_depends_enabled $SPELL python && return 0
-          ;;
+  PYTHON) is_depends_enabled $SPELL python &&
+          is_depends_enabled $SPELL gtk+2 && return 0 ;;
+    GTK2) is_depends_enabled $SPELL gtk+2 && return 0 ;;
+    GTK3) is_depends_enabled $SPELL gtk+3 && return 0 ;;
 esac
 
 return 1
diff --git 
a/x11/gtk-vnc/REPAIR^fa4f2fa4289ffc42c28cf63eb48ec61a^PRE_SUB_DEPENDS 
b/x11/gtk-vnc/REPAIR^fa4f2fa4289ffc42c28cf63eb48ec61a^PRE_SUB_DEPENDS
new file mode 100755
index 0000000..241941f
--- /dev/null
+++ b/x11/gtk-vnc/REPAIR^fa4f2fa4289ffc42c28cf63eb48ec61a^PRE_SUB_DEPENDS
@@ -0,0 +1,8 @@
+case $THIS_SUB_DEPENDS in
+  PYTHON) is_depends_enabled $SPELL python &&
+          is_depends_enabled $SPELL gtk+2 && return 0 ;;
+    GTK2) is_depends_enabled $SPELL gtk+2 && return 0 ;;
+    GTK3) is_depends_enabled $SPELL gtk+3 && return 0 ;;
+esac
+
+return 1
diff --git a/x11/gtk-vnc/SUB_DEPENDS b/x11/gtk-vnc/SUB_DEPENDS
index 474d208..e9d41db 100755
--- a/x11/gtk-vnc/SUB_DEPENDS
+++ b/x11/gtk-vnc/SUB_DEPENDS
@@ -1,6 +1,13 @@
 case $THIS_SUB_DEPENDS in
-  PYTHON) echo "python bindings requested, forcing them."
-          depends python '--with-python'
+  PYTHON) echo "python bindings requested, forcing them." &&
+          depends python '--with-python' &&
+          depends gtk+2 '--with-gtk=2.0'
+          ;;
+    GTK2) echo "gtk+2 bindings requested, forcing them." &&
+          depends gtk+2 '--with-gtk=2.0'
+          ;;
+    GTK3) echo "gtk+3 bindings requested, forcing them." &&
+          depends gtk+3 '--with-gtk=3.0'
           ;;
        *) echo "unknown sub-depends!"
           return 1