[SM-Commit] GIT changes to devel-libpng grimoire by Remko van der Vossen (5ef15ec12167d20ca3966afa72f2f2ef4ec5c6cd)

Remko van der Vossen scm at sourcemage.org
Thu Jan 13 13:33:02 EST 2011


GIT changes to devel-libpng grimoire by Remko van der Vossen <wich at sourcemage.org>:

 ChangeLog                                          |    8 
 accounts                                           |    1 
 chat-im/choqok/BUILD                               |    1 
 chat-im/choqok/DEPENDS                             |    3 
 chat-im/choqok/DETAILS                             |   43 +++
 chat-im/choqok/HISTORY                             |    7 
 chat-im/choqok/PREPARE                             |    5 
 chat-irc/ircii/DETAILS                             |    3 
 chat-irc/ircii/HISTORY                             |    3 
 chat-irc/ircii/ircii-20060725.tar.bz2.sig          |    0 
 chat-irc/ircii/ircii-20081115.tar.bz2.sig          |binary
 chat-libs/libmsn/HISTORY                           |    4 
 chat-libs/libmsn/PRE_BUILD                         |    3 
 chat-libs/libmsn/openssl-1.0.0.patch               |   12 
 crypto/qca-tls/HISTORY                             |    4 
 crypto/qca-tls/PRE_BUILD                           |    3 
 crypto/qca-tls/openssl-1.0.0.patch                 |   12 
 database/mysql-workbench/DETAILS                   |    4 
 database/mysql-workbench/HISTORY                   |    3 
 dev/null                                           |binary
 disk/cdrdao/BUILD                                  |   18 -
 disk/cdrdao/HISTORY                                |    4 
 disk/cdrdao/PRE_BUILD                              |    4 
 disk/lvm/DETAILS                                   |    4 
 disk/lvm/HISTORY                                   |    3 
 doc/wv/DEPENDS                                     |    5 
 doc/wv/DETAILS                                     |   11 
 doc/wv/HISTORY                                     |    4 
 e-17/elsa/BUILD                                    |    5 
 e-17/elsa/DEPENDS                                  |    2 
 e-17/elsa/DETAILS                                  |   21 +
 e-17/elsa/HISTORY                                  |    2 
 e-17/elsa/PREPARE                                  |    2 
 e-17/elsa/PRE_BUILD                                |    4 
 e-17/elsa/init.d/elsa                              |    9 
 gnome2-apps/epiphany/DETAILS                       |    2 
 gnome2-apps/epiphany/HISTORY                       |    3 
 gnome2-apps/epiphany/epiphany-2.91.4.1.tar.bz2.sig |    0 
 gnome2-apps/epiphany/epiphany-2.91.5.tar.bz2.sig   |binary
 gnome2-apps/gthumb2/DETAILS                        |    2 
 gnome2-apps/gthumb2/HISTORY                        |    4 
 gnome2-apps/gthumb2/PRE_BUILD                      |    4 
 gnome2-apps/gthumb2/gthumb-2.12.1.tar.bz2.sig      |    0 
 gnome2-apps/gthumb2/gthumb-2.12.2.tar.bz2.sig      |binary
 gnome2-apps/gthumb2/gthumb-exiv2.patch             |   45 ---
 gnome2-libs/libgda4/BUILD                          |    3 
 gnome2-libs/libgda4/DETAILS                        |    2 
 gnome2-libs/libgda4/HISTORY                        |    4 
 gnome2-libs/libgda4/libgda-4.2.2.tar.bz2.sig       |    0 
 gnome2-libs/libgda4/libgda-4.2.3.tar.bz2.sig       |binary
 gnome2-libs/pangomm/DEPENDS                        |    3 
 gnome2-libs/pangomm/HISTORY                        |    3 
 graphics-libs/mesalib/EXPORTS                      |    1 
 graphics-libs/mesalib/HISTORY                      |    3 
 graphics-libs/mesalib/REPAIR^all^EXPORTS           |    1 
 graphics/gexiv2/DETAILS                            |    6 
 graphics/gexiv2/HISTORY                            |    3 
 graphics/shotwell/DETAILS                          |    4 
 graphics/shotwell/HISTORY                          |    3 
 groups                                             |    1 
 http/webkitgtk3/DETAILS                            |    4 
 http/webkitgtk3/HISTORY                            |    3 
 kde-core/kdebase/HISTORY                           |    4 
 kde-core/kdebase/PRE_BUILD                         |    3 
 kde-core/kdebase/openssl-1.0.0.patch               |   30 ++
 kde-core/kdelibs/HISTORY                           |    4 
 kde-core/kdelibs/PRE_BUILD                         |    5 
 kde-core/kdelibs/openssl-1.0.0.patch               |  294 +++++++++++++++++++++
 kde-core/kdenetwork/HISTORY                        |    4 
 kde-core/kdenetwork/PRE_BUILD                      |    3 
 kde-core/kdenetwork/gcc44.patch                    |   22 +
 kde4/kdebase4/DEPENDS                              |    1 
 kde4/kdebase4/HISTORY                              |    3 
 kernels/kqemu/HISTORY                              |    5 
 kernels/kqemu/PRE_BUILD                            |    3 
 kernels/kqemu/kqemu-1.4.0_pre1-init_MUTEX.patch    |   16 +
 libs/qoauth/BUILD                                  |    5 
 libs/qoauth/DEPENDS                                |    1 
 libs/qoauth/DETAILS                                |   19 +
 libs/qoauth/HISTORY                                |    3 
 security/wireshark/DETAILS                         |    6 
 security/wireshark/HISTORY                         |    4 
 video/mlt/DEPENDS                                  |    2 
 video/mlt/HISTORY                                  |    3 
 xorg-driver/xf86-video-intel/DEPENDS               |   27 +
 xorg-driver/xf86-video-intel/HISTORY               |    3 
 86 files changed, 700 insertions(+), 91 deletions(-)

New commits:
commit 79978bc19344072f68d084cbdee5da93e86a2ceb
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: Vlad Glagolev <stealth at sourcemage.org>

    added postgrey account

commit 9dc66ec6ea3f2a31665e8fabc76f93035ef4499b
Author: Julien ROZO <julien at rozo.org>
Commit: Julien ROZO <julien at rozo.org>

    qca-tls: added a patch to fix compilation issue with openssl version
    1.0.0

commit f2d9439a656b614cc03f3a4744deb45b3ca75969
Author: Julien ROZO <julien at rozo.org>
Commit: Julien ROZO <julien at rozo.org>

    libmsn: oops ! was calling the wrong patch in PRE_BUILD

commit 1329c9c84607932ac6a68c4e56a507cdb1364d83
Author: Julien ROZO <julien at rozo.org>
Commit: Julien ROZO <julien at rozo.org>

    libmsn: added a patch to fix compilation issue with openssl version 1.0.0

commit e4a5459882f9c0b885f41fd195cc652df1183fc3
Author: Julien ROZO <julien at rozo.org>
Commit: Julien ROZO <julien at rozo.org>

    mysql-workbench: updated version to 5.2.31

commit 8c564cd99425094e0e34b408a22bc18c6bdbc709
Author: Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>

    Revert "devel/vala: version 0.11.3"
    
    This reverts commit e11109cb6beb45ad8aebbc3faf50678127690dca.

commit ef90c8e7e17e2c1df924df7ce530b7bc5926c84a
Author: Ladislav Hagara <hgr at vabo.cz>
Commit: Ladislav Hagara <hgr at vabo.cz>

    gthumb2 2.12.2

commit e11109cb6beb45ad8aebbc3faf50678127690dca
Author: Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>

    devel/vala: version 0.11.3

commit e8632c9f90d2a884a479c08d9e87e873d1ab937d
Author: Ismael Luceno <ismael at sourcemage.org>
Commit: Ismael Luceno <ismael at sourcemage.org>

    kdebase4: depends on qimageblitz

commit c9405afefbe648656b0b84f93b5df01b9876632c
Author: Pol Vinogradov <vin.public at gmail.com>
Commit: Pol Vinogradov <vin.public at gmail.com>

    kernels/kqemu: added patch to build with 2.6.37 kernel

commit b5912a5424c84534646b849a5cd18f552419421c
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: Vlad Glagolev <stealth at sourcemage.org>

    xf86-video-intel: corrected dependencies

commit 0edb257c4f0d82d1b680629fd904b8ddf814cefe
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: Vlad Glagolev <stealth at sourcemage.org>

    mesalib: export MESALIB_BUILD

commit 63e9fcb288b2b1aae8dda475ca58533cd4dc2481
Author: Philippe Caseiro <puppetmaster at sourcemage.org>
Commit: Puppet_Master <puppetmaster at sourcemage.org>

    e-17/elsa : Adding new EFL login manager Elsa spell

commit e39fa80fc5bf2dddaf5cfef113d8860e0ab2f792
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: Vlad Glagolev <stealth at sourcemage.org>

    pangomm: added missing dependency

commit bf15018c2ba69fa67e242a3e07d5382459efe80a
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: Vlad Glagolev <stealth at sourcemage.org>

    wv: => 1.2.9

commit d98ffdc55da25b85d32373a557bb91521031a2d4
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: Vlad Glagolev <stealth at sourcemage.org>

    Revert "libxft: added missing dependency"
    
    This reverts commit 76acddb4d0772f285134fee3eb66bee5f54400a1.
    
    let's try one more solution
    (cherry picked from commit 0c943d01171ff2242e3c91177f1770402c411ae7)

commit 78434c175fcb6c2f3bbbde0758bf114ffd3fc93c
Author: Ismael Luceno <ismael at sourcemage.org>
Commit: Ismael Luceno <ismael at sourcemage.org>

    choqok: depends on kdelibs4

commit 111ff30d9ed457090da10701c49d3fdcd90dc5d2
Author: Ismael Luceno <ismael at sourcemage.org>
Commit: Ismael Luceno <ismael at sourcemage.org>

    choqok: fix license

commit a2c55694cd0133b68a571444311dff5e922ce2ad
Author: Ismael Luceno <ismael at sourcemage.org>
Commit: Ismael Luceno <ismael at sourcemage.org>

    choqok: add scm version

commit 433f399ba0bd94d298d1a7bc485b9d67eecb0afd
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: Vlad Glagolev <stealth at sourcemage.org>

    libxft: added missing dependency
    (cherry picked from commit 76acddb4d0772f285134fee3eb66bee5f54400a1)

commit 97f1d101fff4f4ef1d450c6cc8ae9b4c4636d3dd
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: Vlad Glagolev <stealth at sourcemage.org>

    libgda4: => 4.2.3

commit 849daa27bc2e1c2f9236666bb5cf8cf52a4860cc
Author: George Sherwood <gsherwood at sourcemage.org>
Commit: George Sherwood <gsherwood at sourcemage.org>

    epiphany: Updated devel to version 2.91.5

commit 24926f7c4bdd3d3a3c5fc3e43b33bdf2feabcb42
Author: George Sherwood <gsherwood at sourcemage.org>
Commit: George Sherwood <gsherwood at sourcemage.org>

    webkitgtk3: Updated to version 1.3.10

commit d436ac984c2509b10ebba18e741cb142142b7717
Author: Robin Cook <rcook at wyrms.net>
Commit: Robin Cook <rcook at wyrms.net>

    ircii: updated to 20081115

commit 742015064c68703b4030cebf519b48fb8550041e
Author: Ismael Luceno <ismael at sourcemage.org>
Commit: Ismael Luceno <ismael at sourcemage.org>

    choqok: new spell, micro-blogging client for KDE

commit 6c9b8de7e03f578505113f059daa74ad21a6c7f6
Author: Robin Cook <rcook at wyrms.net>
Commit: Robin Cook <rcook at wyrms.net>

    mlt: re-did frei0r entry to fix whatever had gotten wonky

commit eb07e10171ece2069f2ad52cbeb20200423de307
Author: Robin Cook <rcook at wyrms.net>
Commit: Robin Cook <rcook at wyrms.net>

    cdrdao: added if statments to get CVS version to compile

commit ccfed49eab6811e7c0b15b793d79b09f144538df
Author: Ladislav Hagara <hgr at vabo.cz>
Commit: Ladislav Hagara <hgr at vabo.cz>

    lvm 2.02.80

commit 9bc7294ae60ebe0cc8d55cfff82db9036cb7e29d
Author: Ladislav Hagara <hgr at vabo.cz>
Commit: Ladislav Hagara <hgr at vabo.cz>

    wireshark 1.4.3, SECURITY_PATCH=27

commit a770389e89169b199a82df5d912aad920aece547
Author: Ismael Luceno <ismael at sourcemage.org>
Commit: Ismael Luceno <ismael at sourcemage.org>

    qoauth: new spell, A Qt-based library for OAuth authorization scheme

commit fcb759e77fee44751e0cedf06510f61b93969ce2
Author: Ladislav Hagara <hgr at vabo.cz>
Commit: Ladislav Hagara <hgr at vabo.cz>

    shotwell 0.8.1

commit de81e5f2057bc26e1dec7f37f3e5b77111e0c78a
Author: Ladislav Hagara <hgr at vabo.cz>
Commit: Ladislav Hagara <hgr at vabo.cz>

    gexiv2 0.3.0

commit 6ba0265733615a636bddcc492cd8bf5c51ba4151
Author: Julien ROZO <julien at rozo.org>
Commit: Julien ROZO <julien at rozo.org>

    kdenetwork: added a patch to fix compilation issue with gcc 4.4

commit 0e54b8263ea8dece2038a2f2ba2b255c73a6d273
Author: Julien ROZO <julien at rozo.org>
Commit: Julien ROZO <julien at rozo.org>

    kdebase: added a patch to fix compilation issue with openssl version
    1.0.0

commit ccca6b884b1d4afe38f4de77064d943246342ef0
Author: Julien ROZO <julien at rozo.org>
Commit: Julien ROZO <julien at rozo.org>

    kdelis: added a patch to fix compilation issue with openssl version
    1.0.0

diff --git a/ChangeLog b/ChangeLog
index 88021ab..5f658a3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
+2011-01-13 Vlad Glagolev <stealth at sourcemage.org>
+	* accounts, groups: added forgotten account for postgrey
+
+2011-01-12 Philippe "Puppet_Master" Caseiro <puppetmaster at sourcemage.org>
+	* e-17/elsa: new spell, Very fast EFL based login manager 
+
 2011-01-11 Ismael Luceno <ismael at sourcemage.org>
 	* libs/qjson: new spell, library that maps JSON data to QVariant objects
+	* libs/qoauth: new spell, A Qt-based library for OAuth authorization scheme
+	* chat-im/choqok: new spell, micro-blogging client for KDE
 
 2011-01-09 Ismael Luceno <ismael at sourcemage.org>
 	* emacs-lisp/identica-mode: new spell, Emacs major mode for identi.ca
diff --git a/accounts b/accounts
index 5594424..cdea34e 100755
--- a/accounts
+++ b/accounts
@@ -91,4 +91,5 @@ prosody:182:182
 dovenull:183:183
 mongodb:184:185
 unbound:185:186
+postgrey:186:187
 nobody:65534:65534
diff --git a/chat-im/choqok/BUILD b/chat-im/choqok/BUILD
new file mode 100755
index 0000000..2113434
--- /dev/null
+++ b/chat-im/choqok/BUILD
@@ -0,0 +1 @@
+qt4_cmake_build
diff --git a/chat-im/choqok/DEPENDS b/chat-im/choqok/DEPENDS
new file mode 100755
index 0000000..e8c42ea
--- /dev/null
+++ b/chat-im/choqok/DEPENDS
@@ -0,0 +1,3 @@
+depends qjson &&
+depends qoauth &&
+depends kdelibs4
diff --git a/chat-im/choqok/DETAILS b/chat-im/choqok/DETAILS
new file mode 100755
index 0000000..a291d18
--- /dev/null
+++ b/chat-im/choqok/DETAILS
@@ -0,0 +1,43 @@
+           SPELL=choqok
+if [ "$CHOQOK_SCM" = y ]; then
+  if [ "$CHOQOK_AUTOUPDATE" = y ]; then
+         VERSION=$(date +%Y%m%d)
+  else
+         VERSION=git
+  fi
+          SOURCE="${SPELL}-git.tar.bz2"
+      SOURCE_URL=git://git.kde.org/choqok
+   SOURCE_IGNORE=volatile
+  FORCE_DOWNLOAD=on
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-git"
+else
+         VERSION=0.9.98
+          SOURCE="${SPELL}_${VERSION}.tar.bz2"
+   SOURCE_URL[0]=http://${SPELL}.gnufolks.org/pkgs/${SOURCE}
+     SOURCE_HASH=sha512:cdf1d6fc00f729cedf9817724ef5fee857d71ef140bcb4a7169cfb4d5ce49afd992750a4aac8069b8d293a36eb3a738ad5b99dc036f3bb8e3b353daa432fd70b
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
+fi
+        WEB_SITE="http://choqok.gnufolks.org"
+      LICENSE[0]=GPL
+         ENTERED=20110111
+           SHORT="micro-blogging client for KDE"
+cat << EOF
+Features support for:
+
+ * Twitter, identi.ca and self-hosted StatusNet micro-blogging service.
+ * Open Collaboration Services API (Used by opendesktop.org).  * Friends,
+ @Reply, Favorite and Public time-lines.  * Direct messages.  * Multiple
+ Accounts simultaneously.  * Search APIs for Twitter and StatusNet services.
+ * Twitter lists.  * URL shortening services.  * Image and video preview from
+ various services.  * Official Repeat/ReTweet functions.  * Photo uploading
+ to various services.
+
+Other features:
+
+ * KWallet integration.  * Ability to make a quick tweet/dent with global
+ shortcuts. (Ctrl+Meta+T) * Ability to notify user about new statuses arriving.
+ * Status list apperance customization.  * Filtering.  * Setting your last
+ post as current status message in IM clients (Kopete, Pidgin, Psi, Skype).
+ * Send Now Listening text. (Amarok, Exaile, Banshee, Rhythmbox, VLC, etc.)
+ * UnTiny short Urls.  * Proxy support.
+EOF
diff --git a/chat-im/choqok/HISTORY b/chat-im/choqok/HISTORY
new file mode 100644
index 0000000..eda3765
--- /dev/null
+++ b/chat-im/choqok/HISTORY
@@ -0,0 +1,7 @@
+2011-01-12 Ismael Luceno <ismael at sourcemage.org>
+	* PREPARE, DETAILS: add scm version
+	* DEPENDS: depends on kdelibs4
+
+2011-01-11 Ismael Luceno <ismael at sourcemage.org>
+	* DEPENDS, DETAILS: spell created
+
diff --git a/chat-im/choqok/PREPARE b/chat-im/choqok/PREPARE
new file mode 100755
index 0000000..e6bf0e6
--- /dev/null
+++ b/chat-im/choqok/PREPARE
@@ -0,0 +1,5 @@
+config_query CHOQOK_SCM "Build SCM version?" n &&
+if [[ "$CHOQOK_SCM" == "y" ]]; then
+  config_query CHOQOK_AUTOUPDATE \
+    "Automatically update on every system update?" n
+fi
diff --git a/chat-irc/ircii/DETAILS b/chat-irc/ircii/DETAILS
index 27914b9..7455eb9 100755
--- a/chat-irc/ircii/DETAILS
+++ b/chat-irc/ircii/DETAILS
@@ -1,5 +1,5 @@
            SPELL=ircii
-         VERSION=20060725
+         VERSION=20081115
           SOURCE=$SPELL-$VERSION.tar.bz2
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
    SOURCE_URL[0]=ftp://ircii.warped.com/pub/ircII/$SOURCE
@@ -11,7 +11,6 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
         WEB_SITE=http://www.eterna.com.au/ircii/
       LICENSE[0]=BSD
          ENTERED=20011105
-         UPDATED=20020106
         KEYWORDS="irc chat"
            SHORT="ircII is an IRC and ICB client"
 cat << EOF
diff --git a/chat-irc/ircii/HISTORY b/chat-irc/ircii/HISTORY
index aefa8d7..0a7173d 100644
--- a/chat-irc/ircii/HISTORY
+++ b/chat-irc/ircii/HISTORY
@@ -1,3 +1,6 @@
+2011-01-11 Robin Cook <rcook at wyrms.net>
+	* DETAILS: updated VERSION to 20081115
+
 2006-07-28 George Sherwood <george at beernabeer.com>
 	* DETAILS: Updated to 20060725
 
diff --git a/chat-irc/ircii/ircii-20060725.tar.bz2.sig b/chat-irc/ircii/ircii-20060725.tar.bz2.sig
deleted file mode 100644
index b77eef9..0000000
Binary files a/chat-irc/ircii/ircii-20060725.tar.bz2.sig and /dev/null differ
diff --git a/chat-irc/ircii/ircii-20081115.tar.bz2.sig b/chat-irc/ircii/ircii-20081115.tar.bz2.sig
new file mode 100644
index 0000000..b57a40a
Binary files /dev/null and b/chat-irc/ircii/ircii-20081115.tar.bz2.sig differ
diff --git a/chat-libs/libmsn/HISTORY b/chat-libs/libmsn/HISTORY
index 5af4ec6..e455d2d 100644
--- a/chat-libs/libmsn/HISTORY
+++ b/chat-libs/libmsn/HISTORY
@@ -1,3 +1,7 @@
+2011-01-13 Julien "_kaze_" ROZO <julien at rozo.org>
+	* PRE_BUILD, openssl-1.0.0.patch: added a patch to fix compilation
+	  issue with openssl version 1.0.0
+
 2010-01-23 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 4.1
 
diff --git a/chat-libs/libmsn/PRE_BUILD b/chat-libs/libmsn/PRE_BUILD
new file mode 100755
index 0000000..48c0686
--- /dev/null
+++ b/chat-libs/libmsn/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+patch -p1 < $SPELL_DIRECTORY/openssl-1.0.0.patch
diff --git a/chat-libs/libmsn/openssl-1.0.0.patch b/chat-libs/libmsn/openssl-1.0.0.patch
new file mode 100644
index 0000000..73d7ba9
--- /dev/null
+++ b/chat-libs/libmsn/openssl-1.0.0.patch
@@ -0,0 +1,12 @@
+diff -Naur libmsn-4.1.orig/msntest/msntest.cpp libmsn-4.1/msntest/msntest.cpp
+--- libmsn-4.1.orig/msntest/msntest.cpp	2010-01-05 13:07:08.000000000 +0100
++++ libmsn-4.1/msntest/msntest.cpp	2010-12-29 10:37:11.000000000 +0100
+@@ -259,7 +259,7 @@
+                     if(mySocketsSsl[i].isSSL && !mySocketsSsl[i].isConnected)
+                     {
+                         BIO *bio_socket_new;
+-                        SSL_METHOD *meth=NULL;
++                        const SSL_METHOD *meth=NULL;
+                         meth=SSLv23_client_method();
+                         SSLeay_add_ssl_algorithms();
+                         mySocketsSsl[i].ctx = SSL_CTX_new(meth);
diff --git a/crypto/qca-tls/HISTORY b/crypto/qca-tls/HISTORY
index 855a2a5..7788b0f 100644
--- a/crypto/qca-tls/HISTORY
+++ b/crypto/qca-tls/HISTORY
@@ -1,3 +1,7 @@
+2011-01-13 Julien "_kaze_" ROZO <julien at rozo.org>
+	* PRE_BUILD, openssl-1.0.0.patch: added a patch to fix compilation issue
+	  with openssl version 1.0.0
+
 2006-10-03 Juuso Alasuutari <iuso at sourcemage.org>
 	* DETAILS: [automated] Removed UPDATED.
 
diff --git a/crypto/qca-tls/PRE_BUILD b/crypto/qca-tls/PRE_BUILD
new file mode 100755
index 0000000..48c0686
--- /dev/null
+++ b/crypto/qca-tls/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+patch -p1 < $SPELL_DIRECTORY/openssl-1.0.0.patch
diff --git a/crypto/qca-tls/openssl-1.0.0.patch b/crypto/qca-tls/openssl-1.0.0.patch
new file mode 100644
index 0000000..f5ae808
--- /dev/null
+++ b/crypto/qca-tls/openssl-1.0.0.patch
@@ -0,0 +1,12 @@
+diff -Naur qca-tls-1.0.orig/qca-tls.cpp qca-tls-1.0/qca-tls.cpp
+--- qca-tls-1.0.orig/qca-tls.cpp	2010-12-27 16:38:36.000000000 +0100
++++ qca-tls-1.0/qca-tls.cpp	2010-12-29 10:41:55.000000000 +0100
+@@ -953,7 +953,7 @@
+ 	RSAKeyContext *key;
+ 
+ 	SSL *ssl;
+-	SSL_METHOD *method;
++	const SSL_METHOD *method;
+ 	SSL_CTX *context;
+ 	BIO *rbio, *wbio;
+ 	CertContext cc;
diff --git a/database/mysql-workbench/DETAILS b/database/mysql-workbench/DETAILS
index edb953e..cf0eb6a 100755
--- a/database/mysql-workbench/DETAILS
+++ b/database/mysql-workbench/DETAILS
@@ -1,8 +1,8 @@
            SPELL=mysql-workbench
-         VERSION=5.2.29
+         VERSION=5.2.31
           SOURCE="${SPELL}-gpl-${VERSION}-src.tar.gz"
    SOURCE_URL[0]=http://ftp.gwdg.de/pub/misc/mysql/Downloads/MySQLGUITools/${SOURCE}
-     SOURCE_HASH=sha512:a336f173a83e33bf5abca7a4a47a9e04a0b067a185d8aaf7b3925ff8793db84918d974c05ee1a244a5c91b04491d959024999cd2aa754a63d2955c2bb5826c12
+     SOURCE_HASH=sha512:5dfe89577d460be94e85fd318c874e8bfee4b88e155133622177e05d3f2dc2cf7e107c5bba8c00ada368ebaa037045ac06efd0ef6c22d0f248dcce45e8e5eec5
 SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-gpl-${VERSION}-src"
         WEB_SITE="http://www.mysql.de/downloads/workbench/"
       LICENSE[0]=GPL
diff --git a/database/mysql-workbench/HISTORY b/database/mysql-workbench/HISTORY
index bd2d6e9..8de1a31 100644
--- a/database/mysql-workbench/HISTORY
+++ b/database/mysql-workbench/HISTORY
@@ -1,3 +1,6 @@
+2011-01-13 Julien "_kaze_" ROZO <julien at rozo.org>
+	* DETAILS: updated version to 5.2.31
+
 2010-10-26 Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>
 	* DEPENDS, DETAILS, PRE_BUILD: spell created
 
diff --git a/disk/cdrdao/BUILD b/disk/cdrdao/BUILD
index 83a2ead..0fec124 100755
--- a/disk/cdrdao/BUILD
+++ b/disk/cdrdao/BUILD
@@ -1,11 +1,13 @@
-##### Patch needed for building on x86_64 ######
-ARCH=$(uname -m)                                                        &&
-if [ "${ARCH:0:6}" = "x86_64" ]; then 
-    cd scsilib/RULES                                                    && 
-    cp i686-linux-cc.rul x86_64-linux-cc.rul                            && 
-    cd $SOURCE_DIRECTORY 
-fi                                                                      &&
-################################################
+if [ "$CVS" == "n" ]; then
+   ##### Patch needed for building on x86_64 ######
+   ARCH=$(uname -m)                                                        &&
+   if [ "${ARCH:0:6}" = "x86_64" ]; then 
+       cd scsilib/RULES                                                    && 
+       cp i686-linux-cc.rul x86_64-linux-cc.rul                            && 
+       cd $SOURCE_DIRECTORY 
+   fi                                                                      
+   ################################################
+fi  &&
 
 if  [  "$CVS"  ==  "y"  ]
 then
diff --git a/disk/cdrdao/HISTORY b/disk/cdrdao/HISTORY
index 43265af..950969e 100644
--- a/disk/cdrdao/HISTORY
+++ b/disk/cdrdao/HISTORY
@@ -1,3 +1,7 @@
+2011-01-11 Robin Cook <rcook at wyrms.net>
+	* PRE_BUILD: added if statement for CVS
+	* BUILD: added if statement for CVS
+
 2011-01-05 Vlad Glagolev <stealth at sourcemage.org>
 	* PRE_BUILD: added, to apply the patch
 	* stat.patch: added, to fix compilation with recent headers
diff --git a/disk/cdrdao/PRE_BUILD b/disk/cdrdao/PRE_BUILD
index e0a0900..18d7ab7 100755
--- a/disk/cdrdao/PRE_BUILD
+++ b/disk/cdrdao/PRE_BUILD
@@ -1,4 +1,6 @@
 default_pre_build &&
 cd "$SOURCE_DIRECTORY" &&
 
-patch -p0 < "$SPELL_DIRECTORY/stat.patch"
+if [ "$CVS" == "n" ]; then
+  patch -p0 < "$SPELL_DIRECTORY/stat.patch"
+fi
diff --git a/disk/lvm/DETAILS b/disk/lvm/DETAILS
index d9fac65..f02a954 100755
--- a/disk/lvm/DETAILS
+++ b/disk/lvm/DETAILS
@@ -1,10 +1,10 @@
            SPELL=lvm
-         VERSION=2.02.79
+         VERSION=2.02.80
           SOURCE=LVM2.$VERSION.tgz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/LVM2.$VERSION
    SOURCE_URL[0]=ftp://sources.redhat.com/pub/lvm2/$SOURCE
    SOURCE_URL[1]=ftp://sources.redhat.com/pub/lvm2/old/$SOURCE
-     SOURCE_HASH=sha512:fc214c3edbe6b6148c4d9a35d63b72288de8badc50cce8dae9fd50c445507bed7354480e622569f16cdac0ea08d328091c2e3400e6bcc5b53410eb2485348949
+     SOURCE_HASH=sha512:659f13b521528bb1890cd33cb662d3345ca8320251b8eff8aad44b3973feee975826c8819199eeecf75d260896d71b700273e32182f8d67ff791f9ea31b9c48f
         WEB_SITE=http://sources.redhat.com/lvm2/
          ENTERED=20010922
       LICENSE[0]=GPL
diff --git a/disk/lvm/HISTORY b/disk/lvm/HISTORY
index f921788..614d50e 100644
--- a/disk/lvm/HISTORY
+++ b/disk/lvm/HISTORY
@@ -1,3 +1,6 @@
+2011-01-12 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 2.02.80
+
 2010-12-21 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 2.02.79
 
diff --git a/doc/wv/DEPENDS b/doc/wv/DEPENDS
index e3841a7..9451ffe 100755
--- a/doc/wv/DEPENDS
+++ b/doc/wv/DEPENDS
@@ -1,4 +1,7 @@
 depends libgsf &&
 depends libxml2 &&
 
-optional_depends libwmf '--with-libwmf' '--without-libwmf' 'to see embedded images in doc files'
+optional_depends libwmf \
+                 '--with-libwmf' \
+                 '--without-libwmf' \
+                 'to see embedded images in doc files'
diff --git a/doc/wv/DETAILS b/doc/wv/DETAILS
index d85556a..5ed444b 100755
--- a/doc/wv/DETAILS
+++ b/doc/wv/DETAILS
@@ -1,16 +1,15 @@
            SPELL=wv
-         VERSION=1.2.4
-     SOURCE_HASH=sha512:263a6a2de0cb15030d0f9e8f5a5223b5b4b3b51e5a6fa6b8cae696b392e3a09c36b67b23a302adbfa0b3a747f5a3272dbe3555ed5f39ad584811483c38a4c73b
+         VERSION=1.2.9
+     SOURCE_HASH=sha512:ae5c762012595ce8922bfda8749ad3e9cb055edab30152c3a5feaaf3ca6601f357d1e301b179e9a5860cd99452dd6e63e5f44f5bcc12f8db148bdd334e0200a5
           SOURCE=$SPELL-$VERSION.tar.gz
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-   SOURCE_URL[0]=$SOURCEFORGE_URL/wvware/$SOURCE
-#      PATCHLEVEL=1
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
+   SOURCE_URL[0]=http://www.abisource.com/downloads/$SPELL/$VERSION/$SOURCE
   SECURITY_PATCH=1
         WEB_SITE=http://wvware.sourceforge.net
          ENTERED=20011101
       LICENSE[0]=GPL
         KEYWORDS="microsoft html doc"
-           SHORT='wv is a library for convering Microsoft Word formats to HTML'
+           SHORT="library for convering Microsoft Word formats to HTML"
 cat << EOF
 wv (formerly known as MSWordView) is a library that understands the
 Microsoft Word 2000, 97, 95 and 6 file formats and is able to convert 
diff --git a/doc/wv/HISTORY b/doc/wv/HISTORY
index 55cac95..72d5614 100644
--- a/doc/wv/HISTORY
+++ b/doc/wv/HISTORY
@@ -1,3 +1,7 @@
+2011-01-12 Vlad Glagolev <stealth at sourcemage.org>
+	* DETAILS: updated spell to 1.2.9; quoting paths
+	* DEPENDS: readability++
+
 2006-10-26 Treeve Jelbert <treeve at sourcemage.org>
 	* DETAILS: version 1.2.4
 
diff --git a/e-17/elsa/BUILD b/e-17/elsa/BUILD
new file mode 100755
index 0000000..da6462e
--- /dev/null
+++ b/e-17/elsa/BUILD
@@ -0,0 +1,5 @@
+OPTS="--sysconfdir=${INSTALL_ROOT}/etc \
+      --prefix=${INSTALL_ROOT}/usr     \
+      $OPTS" &&
+
+default_build
diff --git a/e-17/elsa/DEPENDS b/e-17/elsa/DEPENDS
new file mode 100755
index 0000000..7d7a05a
--- /dev/null
+++ b/e-17/elsa/DEPENDS
@@ -0,0 +1,2 @@
+depends edje &&
+depends linux-pam  
diff --git a/e-17/elsa/DETAILS b/e-17/elsa/DETAILS
new file mode 100755
index 0000000..264a18a
--- /dev/null
+++ b/e-17/elsa/DETAILS
@@ -0,0 +1,21 @@
+           SPELL=elsa
+if  [  "$ELSA_CVS_AUTOUPDATE"  ==  "y"  ];  then
+         VERSION=$(date +%Y%m%d)
+else
+         VERSION=svn
+fi
+          SOURCE=$SPELL-svn.tar.bz2
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-svn
+   SOURCE_URL[0]=svn_http://svn.enlightenment.org/svn/e/trunk/PROTO/$SPELL:$SPELL
+  FORCE_DOWNLOAD=on
+   SOURCE_IGNORE=volatile
+        WEB_SITE=http://www.enlightenment.org/
+         ENTERED=20101004
+      LICENSE[0]=GPL
+        KEYWORDS="enlightenment"
+           SHORT="Enlightenned Login Manager"
+cat << EOF
+What elsa do:
+open session with pam with the username and her password
+Integrate with the rc script of your discribution.
+EOF
diff --git a/e-17/elsa/HISTORY b/e-17/elsa/HISTORY
new file mode 100644
index 0000000..2220211
--- /dev/null
+++ b/e-17/elsa/HISTORY
@@ -0,0 +1,2 @@
+2011-01-12 Philippe "Puppet_Master" Caseiro <puppetmaster at sourcemage.org>
+	* BUILD, DEPENDS, DETAILS, init.d/elsa, PRE_BUILD, PREPARE: spell created 
diff --git a/e-17/elsa/PREPARE b/e-17/elsa/PREPARE
new file mode 100755
index 0000000..6ae8108
--- /dev/null
+++ b/e-17/elsa/PREPARE
@@ -0,0 +1,2 @@
+config_query ELSA_CVS_AUTOUPDATE \
+             "Automatically update on every system update?" n
diff --git a/e-17/elsa/PRE_BUILD b/e-17/elsa/PRE_BUILD
new file mode 100755
index 0000000..1af1b77
--- /dev/null
+++ b/e-17/elsa/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+
+NOCONFIGURE=ON ./autogen.sh
diff --git a/e-17/elsa/init.d/elsa b/e-17/elsa/init.d/elsa
new file mode 100755
index 0000000..58007ea
--- /dev/null
+++ b/e-17/elsa/init.d/elsa
@@ -0,0 +1,9 @@
+#!/bin/bash
+#
+
+PROGRAM=/usr/sbin/elsa
+ARGS="-d"
+RUNLEVEL=5
+PROVIDES=display_manager
+
+.  /etc/init.d/smgl_init
diff --git a/gnome2-apps/epiphany/DETAILS b/gnome2-apps/epiphany/DETAILS
index 1c20415..be0116a 100755
--- a/gnome2-apps/epiphany/DETAILS
+++ b/gnome2-apps/epiphany/DETAILS
@@ -1,6 +1,6 @@
            SPELL=epiphany
 if [[ "$EPIPHANY_DEVEL" == "y" ]]; then
-         VERSION=2.91.4.1
+         VERSION=2.91.5
 else
          VERSION=2.30.6
 fi
diff --git a/gnome2-apps/epiphany/HISTORY b/gnome2-apps/epiphany/HISTORY
index 04555eb..0b92297 100644
--- a/gnome2-apps/epiphany/HISTORY
+++ b/gnome2-apps/epiphany/HISTORY
@@ -1,3 +1,6 @@
+2011-01-11 George Sherwood <gsherwood at sourcemage.org>
+	* DETAILS: Updated devel to version 2.91.5
+
 2010-12-24 George Sherwood <gsherwood at sourcemage.org>
 	* DETAILS: Updated devel to version 2.91.4.1
 
diff --git a/gnome2-apps/epiphany/epiphany-2.91.4.1.tar.bz2.sig b/gnome2-apps/epiphany/epiphany-2.91.4.1.tar.bz2.sig
deleted file mode 100644
index 2cb6e4f..0000000
Binary files a/gnome2-apps/epiphany/epiphany-2.91.4.1.tar.bz2.sig and /dev/null differ
diff --git a/gnome2-apps/epiphany/epiphany-2.91.5.tar.bz2.sig b/gnome2-apps/epiphany/epiphany-2.91.5.tar.bz2.sig
new file mode 100644
index 0000000..1550d55
Binary files /dev/null and b/gnome2-apps/epiphany/epiphany-2.91.5.tar.bz2.sig differ
diff --git a/gnome2-apps/gthumb2/DETAILS b/gnome2-apps/gthumb2/DETAILS
index 03672a7..8759179 100755
--- a/gnome2-apps/gthumb2/DETAILS
+++ b/gnome2-apps/gthumb2/DETAILS
@@ -1,5 +1,5 @@
            SPELL=gthumb2
-         VERSION=2.12.1
+         VERSION=2.12.2
           BRANCH=`echo $VERSION|cut -d . -f 1,2`
           SOURCE=gthumb-$VERSION.tar.bz2
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/gthumb-$VERSION
diff --git a/gnome2-apps/gthumb2/HISTORY b/gnome2-apps/gthumb2/HISTORY
index eae2f9c..00af68d 100644
--- a/gnome2-apps/gthumb2/HISTORY
+++ b/gnome2-apps/gthumb2/HISTORY
@@ -1,3 +1,7 @@
+2011-01-13 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 2.12.2
+	* PRE_BUILD, gthumb-exiv2.patch: patch removed, fixed upstream
+
 2011-01-07 Robin Cook <rcook at wyrms.net>
 	* PRE_BUILD: added to apply exiv2 patch until next release
 	  http://bugs.gentoo.org/show_bug.cgi?id=349160
diff --git a/gnome2-apps/gthumb2/PRE_BUILD b/gnome2-apps/gthumb2/PRE_BUILD
deleted file mode 100755
index ea10785..0000000
--- a/gnome2-apps/gthumb2/PRE_BUILD
+++ /dev/null
@@ -1,4 +0,0 @@
-default_pre_build     &&
-cd $SOURCE_DIRECTORY  &&
-
-patch -p1 < $SPELL_DIRECTORY/gthumb-exiv2.patch 
diff --git a/gnome2-apps/gthumb2/gthumb-2.12.1.tar.bz2.sig b/gnome2-apps/gthumb2/gthumb-2.12.1.tar.bz2.sig
deleted file mode 100644
index 180a992..0000000
Binary files a/gnome2-apps/gthumb2/gthumb-2.12.1.tar.bz2.sig and /dev/null differ
diff --git a/gnome2-apps/gthumb2/gthumb-2.12.2.tar.bz2.sig b/gnome2-apps/gthumb2/gthumb-2.12.2.tar.bz2.sig
new file mode 100644
index 0000000..468a4cd
Binary files /dev/null and b/gnome2-apps/gthumb2/gthumb-2.12.2.tar.bz2.sig differ
diff --git a/gnome2-apps/gthumb2/gthumb-exiv2.patch b/gnome2-apps/gthumb2/gthumb-exiv2.patch
deleted file mode 100644
index 5bcb206..0000000
--- a/gnome2-apps/gthumb2/gthumb-exiv2.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-diff --git a/extensions/exiv2_tools/exiv2-utils.cpp b/extensions/exiv2_tools/exiv2-utils.cpp
-index 780bf29..f24b50d 100644
---- a/extensions/exiv2_tools/exiv2-utils.cpp
-+++ b/extensions/exiv2_tools/exiv2-utils.cpp
-@@ -497,19 +497,19 @@ set_attributes_from_tagsets (GFileInfo *info)
- static const char *
- get_exif_default_category (const Exiv2::Exifdatum &md)
- {
-+#if EXIV2_TEST_VERSION(0, 21, 0)
-+	if (Exiv2::ExifTags::isMakerGroup(md.groupName()))
-+#else
- 	if (Exiv2::ExifTags::isMakerIfd(md.ifdId()))
-+#endif
- 		return "Exif::MakerNotes";
- 
--	switch (md.ifdId()) {
--	case Exiv2::ifd1Id:
-+	if (md.groupName().compare("Thumbnail") == 0)
- 		return "Exif::Thumbnail";
--	case Exiv2::gpsIfdId:
-+	else if (md.groupName().compare("GPSInfo") == 0)
- 		return "Exif::GPS";
--	case Exiv2::iopIfdId:
-+	else if (md.groupName().compare("Iop") == 0)
- 		return "Exif::Versions";
--	default:
--		break;
--	}
- 
- 	return "Exif::Other";
- }
-@@ -531,7 +531,11 @@ exiv2_read_metadata (Exiv2::Image::AutoPtr  image,
- 			stringstream description;
- 			if (! md->tagLabel().empty())
- 				description << md->tagLabel();
--			else if (md->ifdId () > Exiv2::ifd1Id)
-+#if EXIV2_TEST_VERSION(0, 21, 0)
-+			else if (Exiv2::ExifTags::isMakerGroup(md->groupName()))
-+#else
-+			else if (Exiv2::ExifTags::isMakerIfd(md->ifdId()))
-+#endif
- 				// Must be a MakerNote - include group name
- 				description << md->groupName() << "." << md->tagName();
- 			else
-
diff --git a/gnome2-libs/libgda4/BUILD b/gnome2-libs/libgda4/BUILD
new file mode 100755
index 0000000..d22e99f
--- /dev/null
+++ b/gnome2-libs/libgda4/BUILD
@@ -0,0 +1,3 @@
+make_single &&
+default_build &&
+make_normal
diff --git a/gnome2-libs/libgda4/DETAILS b/gnome2-libs/libgda4/DETAILS
index aad0d05..b69ffe7 100755
--- a/gnome2-libs/libgda4/DETAILS
+++ b/gnome2-libs/libgda4/DETAILS
@@ -1,5 +1,5 @@
            SPELL=libgda4
-         VERSION=4.2.2
+         VERSION=4.2.3
           BRANCH=$(echo $VERSION|cut -d . -f 1,2)
           SOURCE="libgda-${VERSION}.tar.bz2"
    SOURCE_URL[0]=$GNOME_URL/sources/libgda/$BRANCH/$SOURCE
diff --git a/gnome2-libs/libgda4/HISTORY b/gnome2-libs/libgda4/HISTORY
index 25d8446..160a761 100644
--- a/gnome2-libs/libgda4/HISTORY
+++ b/gnome2-libs/libgda4/HISTORY
@@ -1,3 +1,7 @@
+2011-01-12 Vlad Glagolev <stealth at sourcemage.org>
+	* DETAILS: updated spell to 4.2.3
+	* BUILD: added, to fix multijob build
+
 2010-11-28 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 4.2.2
 
diff --git a/gnome2-libs/libgda4/libgda-4.2.2.tar.bz2.sig b/gnome2-libs/libgda4/libgda-4.2.2.tar.bz2.sig
deleted file mode 100644
index 4cd93b6..0000000
Binary files a/gnome2-libs/libgda4/libgda-4.2.2.tar.bz2.sig and /dev/null differ
diff --git a/gnome2-libs/libgda4/libgda-4.2.3.tar.bz2.sig b/gnome2-libs/libgda4/libgda-4.2.3.tar.bz2.sig
new file mode 100644
index 0000000..60d54f1
Binary files /dev/null and b/gnome2-libs/libgda4/libgda-4.2.3.tar.bz2.sig differ
diff --git a/gnome2-libs/pangomm/DEPENDS b/gnome2-libs/pangomm/DEPENDS
index 52e5517..ed3860c 100755
--- a/gnome2-libs/pangomm/DEPENDS
+++ b/gnome2-libs/pangomm/DEPENDS
@@ -1,3 +1,4 @@
 depends glibmm &&
 depends cairo &&
-depends pango
+depends pango &&
+depends cairomm
diff --git a/gnome2-libs/pangomm/HISTORY b/gnome2-libs/pangomm/HISTORY
index cadc207..cf6936d 100644
--- a/gnome2-libs/pangomm/HISTORY
+++ b/gnome2-libs/pangomm/HISTORY
@@ -1,3 +1,6 @@
+2011-01-12 Vlad Glagolev <stealth at sourcemage.org>
+	* DEPENDS: added missing dependency
+
 2010-12-10 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 2.26.3
 
diff --git a/graphics-libs/mesalib/EXPORTS b/graphics-libs/mesalib/EXPORTS
new file mode 100755
index 0000000..e9b2106
--- /dev/null
+++ b/graphics-libs/mesalib/EXPORTS
@@ -0,0 +1 @@
+MESALIB_BUILD
diff --git a/graphics-libs/mesalib/HISTORY b/graphics-libs/mesalib/HISTORY
index 930c29a..d4506a2 100644
--- a/graphics-libs/mesalib/HISTORY
+++ b/graphics-libs/mesalib/HISTORY
@@ -1,3 +1,6 @@
+2011-01-13 Vlad Glagolev <stealth at sourcemage.org>
+	* {REPAIR^all^,}EXPORTS: added, to export MESALIB_BUILD
+
 2011-01-11 Remko van der Vossen <wich at sourcemage.org>
 	* DEPENDS: stable now too depends on talloc and needs python bindings
 	  for libxml
diff --git a/graphics-libs/mesalib/REPAIR^all^EXPORTS b/graphics-libs/mesalib/REPAIR^all^EXPORTS
new file mode 100755
index 0000000..5b192fa
--- /dev/null
+++ b/graphics-libs/mesalib/REPAIR^all^EXPORTS
@@ -0,0 +1 @@
+MESALIB_OPTS
diff --git a/graphics/gexiv2/DETAILS b/graphics/gexiv2/DETAILS
index abcc52d..a39251e 100755
--- a/graphics/gexiv2/DETAILS
+++ b/graphics/gexiv2/DETAILS
@@ -1,11 +1,11 @@
            SPELL=gexiv2
           SPELLX=libgexiv2
-         VERSION=0.2.2
-     SOURCE_HASH=sha512:223aec3715e9993b4dc0628ec3b3eebf22bde40defe3dd0deed7f8633a1123795d7ca61e1908d4c13bbce98798d9b3076722f5ad5ced82ace7fc505c4c249092
+         VERSION=0.3.0
+     SOURCE_HASH=sha512:cbc538238c47f4278aa41fdd912d180f1a22589976ecb0c9eea4ca71721a4d61924591018c19ff7fa1aec799b1c1aba44d0133011b7e986627c9f7ddcc024dc6
           SOURCE=$SPELLX-$VERSION.tar.bz2
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION
         WEB_SITE=http://trac.yorba.org/wiki/gexiv2
-   SOURCE_URL[0]=http://yorba.org/download/gexiv2/0.2/$SOURCE
+   SOURCE_URL[0]=http://yorba.org/download/gexiv2/${VERSION::3}/$SOURCE
       LICENSE[0]=GPL
          ENTERED=20100709
            SHORT="GObject-based wrapper around the Exiv2 library"
diff --git a/graphics/gexiv2/HISTORY b/graphics/gexiv2/HISTORY
index 3012cdd..4167230 100644
--- a/graphics/gexiv2/HISTORY
+++ b/graphics/gexiv2/HISTORY
@@ -1,3 +1,6 @@
+2011-01-12 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 0.3.0, added ${VERSION::3} into SOURCE_URL[0]
+
 2010-12-24 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 0.2.2
 
diff --git a/graphics/shotwell/DETAILS b/graphics/shotwell/DETAILS
index 6af0fca..01f572c 100755
--- a/graphics/shotwell/DETAILS
+++ b/graphics/shotwell/DETAILS
@@ -1,11 +1,11 @@
            SPELL=shotwell
-         VERSION=0.8.0
+         VERSION=0.8.1
           SOURCE=$SPELL-$VERSION.tar.bz2
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
    SOURCE_URL[0]=http://yorba.org/download/shotwell/${VERSION::3}/$SOURCE
         WEB_SITE=http://yorba.org/shotwell/
          ENTERED=20100709
-     SOURCE_HASH=sha512:f190e47768af938391211c81b9ffc28feaf1dfc8784d762fc76e4a5c2697b169e039559efa1da5c0985d3aff013f6be9af7161bd1c464e7113c588400cfd308c
+     SOURCE_HASH=sha512:c32116f124b364db5458a1751c9f254f7d510416388e36022173f4d7c2b238586aadc57de1023ce75ac48a9bcdeac352e8ce0825a911d44e88cf4c353a5573ec
       LICENSE[0]=GPL
             SHORT="digital photo organizer"
 cat << EOF
diff --git a/graphics/shotwell/HISTORY b/graphics/shotwell/HISTORY
index 424a6df..8ecd084 100644
--- a/graphics/shotwell/HISTORY
+++ b/graphics/shotwell/HISTORY
@@ -1,3 +1,6 @@
+2011-01-12 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 0.8.1
+
 2010-12-24 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 0.8.0, added ${VERSION::3} into SOURCE_URL[0]
 
diff --git a/groups b/groups
index 7391a26..29a1c96 100755
--- a/groups
+++ b/groups
@@ -110,5 +110,6 @@ dovenull:183:
 avahi-autoipd:184:
 mongodb:185:
 unbound:186:
+postgrey:187:
 users:1000:
 nogroup:65534:
diff --git a/http/webkitgtk3/DETAILS b/http/webkitgtk3/DETAILS
index ca9389f..1f36bbd 100755
--- a/http/webkitgtk3/DETAILS
+++ b/http/webkitgtk3/DETAILS
@@ -1,8 +1,8 @@
            SPELL=webkitgtk3
-         VERSION=1.3.9
+         VERSION=1.3.10
           SOURCE=webkit-$VERSION.tar.gz
    SOURCE_URL[0]=http://www.webkitgtk.org/$SOURCE
-     SOURCE_HASH=sha512:fb1062fbe11cd54bd20c13b327e930b2a97fa3c2e418b866b07e0fb46f63759e015e9d2faf71425efbe510ae172a92409f76e8691375e248c0613055a98b621e
+     SOURCE_HASH=sha512:10b1adb7332bc681cc9fb6a5f26215975bfa790772e3b90b0b385745e8ce6b1706e890251773fc02cf4fcfe09cc976b8a51375b955fefec61f2e9a4149f97fe9
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/webkit-$VERSION"
 fi
         WEB_SITE=http://webkitgtk.org/
diff --git a/http/webkitgtk3/HISTORY b/http/webkitgtk3/HISTORY
index 04aee5d..b73fb86 100644
--- a/http/webkitgtk3/HISTORY
+++ b/http/webkitgtk3/HISTORY
@@ -1,3 +1,6 @@
+2011-01-11 George Sherwood <gsherwood at sourcemage.org>
+	* DETAILS: Updated to version 1.3.10
+
 2010-12-24 George Sherwood <gsherwood at sourcemage.org>
 	* DETAILS: Updated to version 1.3.9
 
diff --git a/kde-core/kdebase/HISTORY b/kde-core/kdebase/HISTORY
index 2b0e4d2..8bf45de 100644
--- a/kde-core/kdebase/HISTORY
+++ b/kde-core/kdebase/HISTORY
@@ -1,3 +1,7 @@
+2011-01-13 Julien "_kaze_" ROZO <julien at rozo.org>
+	* PRE_BUILD, openssl-1.0.0.patch: added a patch to fix compilation
+	  issue with openssl version 1.0.0
+
 2010-11-03 Ladislav Hagara <hgr at vabo.cz>
 	* DEPENDS: jpeg -> JPEG
 
diff --git a/kde-core/kdebase/PRE_BUILD b/kde-core/kdebase/PRE_BUILD
index 7f08210..506f78e 100755
--- a/kde-core/kdebase/PRE_BUILD
+++ b/kde-core/kdebase/PRE_BUILD
@@ -2,6 +2,9 @@ default_pre_build                                                 &&
 cd $SOURCE_DIRECTORY 	                                          &&
 patch $SOURCE_DIRECTORY/kcontrol/kfontinst/kfontinst/Fontmap.cpp  \
       $SCRIPT_DIRECTORY/kdebase-gcc44.patch                       &&
+if spell_ok openssl && [[ $(installed_version openssl) > 1.0.0 ]]; then
+      patch -p1 < $SPELL_DIRECTORY/openssl-1.0.0.patch
+fi &&
 
 # splashscreen patch
 if [[ $SMGL_THEME == "y" ]]; then
diff --git a/kde-core/kdebase/openssl-1.0.0.patch b/kde-core/kdebase/openssl-1.0.0.patch
new file mode 100644
index 0000000..6a7ffda
--- /dev/null
+++ b/kde-core/kdebase/openssl-1.0.0.patch
@@ -0,0 +1,30 @@
+diff -Naur kdebase-3.5.10.orig/kcontrol/crypto/crypto.cpp kdebase-3.5.10/kcontrol/crypto/crypto.cpp
+--- kdebase-3.5.10.orig/kcontrol/crypto/crypto.cpp	2006-10-01 19:31:49.000000000 +0200
++++ kdebase-3.5.10/kcontrol/crypto/crypto.cpp	2010-12-30 11:43:14.000000000 +0100
+@@ -2321,7 +2321,7 @@
+ unsigned int i;
+ SSL_CTX *ctx;
+ SSL *ssl;
+-SSL_METHOD *meth;
++const SSL_METHOD *meth;
+ 
+   SSLv2Box->clear();
+   SSLv3Box->clear();
+@@ -2337,7 +2337,7 @@
+   CipherItem *item;
+   for (i=0; ; i++) {
+     int j, k;
+-    SSL_CIPHER *sc;
++    const SSL_CIPHER *sc;
+     sc = (meth->get_cipher)(i);
+     if (!sc)
+       break;
+@@ -2365,7 +2365,7 @@
+ 
+   for (i=0; ; i++) {
+     int j, k;
+-    SSL_CIPHER *sc;
++    const SSL_CIPHER *sc;
+     sc = (meth->get_cipher)(i);
+     if (!sc)
+       break;
diff --git a/kde-core/kdelibs/HISTORY b/kde-core/kdelibs/HISTORY
index f07bbbc..dafbf10 100644
--- a/kde-core/kdelibs/HISTORY
+++ b/kde-core/kdelibs/HISTORY
@@ -1,3 +1,7 @@
+2011-01-13 Julien "_kaze_" ROZO <julien at rozo.org>
+	* PRE_BUILD, openssl-1.0.0.patch: added a patch to fix compilation
+	  issue with openssl version 1.0.0
+
 2010-11-03 Ladislav Hagara <hgr at vabo.cz>
 	* DEPENDS: jpeg -> JPEG
 
diff --git a/kde-core/kdelibs/PRE_BUILD b/kde-core/kdelibs/PRE_BUILD
index c5e4c8b..0d9c1fc 100755
--- a/kde-core/kdelibs/PRE_BUILD
+++ b/kde-core/kdelibs/PRE_BUILD
@@ -2,4 +2,7 @@ default_pre_build &&
 cd "$SOURCE_DIRECTORY" &&
 patch -Np0 < "$SCRIPT_DIRECTORY/inotify.patch"  &&
 patch $SOURCE_DIRECTORY/kioslave/ftp/ftp.cc     \
-      $SCRIPT_DIRECTORY/kdelibs-gcc44.patch
+      $SCRIPT_DIRECTORY/kdelibs-gcc44.patch     &&
+if spell_ok openssl && [[ $(installed_version openssl) > 1.0.0 ]]; then
+      patch -p1 < $SPELL_DIRECTORY/openssl-1.0.0.patch
+fi
diff --git a/kde-core/kdelibs/openssl-1.0.0.patch b/kde-core/kdelibs/openssl-1.0.0.patch
new file mode 100644
index 0000000..1ae45cd
--- /dev/null
+++ b/kde-core/kdelibs/openssl-1.0.0.patch
@@ -0,0 +1,294 @@
+--- kdelibs-3.5.10.orig/kio/kssl/kopenssl.cc
++++ kdelibs-3.5.10/kio/kssl/kopenssl.cc
+@@ -120,10 +120,10 @@ static void (*K_X509_STORE_CTX_set_chain
+ static void (*K_X509_STORE_CTX_set_purpose) (X509_STORE_CTX *, int) = 0L;
+ static void (*K_sk_free) (STACK*) = 0L;
+ static int (*K_sk_num) (STACK*) = 0L;
+-static char* (*K_sk_pop) (STACK*) = 0L;
+-static char* (*K_sk_value) (STACK*, int) = 0L;
++static void* (*K_sk_pop) (STACK*) = 0L;
++static void* (*K_sk_value) (STACK*, int) = 0L;
+ static STACK* (*K_sk_new) (int (*)()) = 0L;
+-static int (*K_sk_push) (STACK*, char*) = 0L;
++static int (*K_sk_push) (STACK*, void*) = 0L;
+ static STACK* (*K_sk_dup) (STACK *) = 0L;
+ static char * (*K_i2s_ASN1_INTEGER) (X509V3_EXT_METHOD *, ASN1_INTEGER *) =0L;
+ static ASN1_INTEGER * (*K_X509_get_serialNumber) (X509 *) = 0L;
+@@ -180,8 +180,8 @@ static void (*K_SSL_SESSION_free)(SSL_SE
+ static int (*K_SSL_set_session)(SSL*,SSL_SESSION*) = 0L;
+ static SSL_SESSION* (*K_d2i_SSL_SESSION)(SSL_SESSION**,unsigned char**, long) = 0L;
+ static int (*K_i2d_SSL_SESSION)(SSL_SESSION*,unsigned char**) = 0L;
+-static STACK *(*K_X509_get1_email)(X509 *x) = 0L;
+-static void (*K_X509_email_free)(STACK *sk) = 0L;
++static KOSSL1_STACK_OF(OPENSSL_STRING) *(*K_X509_get1_email)(X509 *x) = 0L;
++static void (*K_X509_email_free)(KOSSL1_STACK_OF(OPENSSL_STRING) *sk) = 0L;
+ static EVP_CIPHER *(*K_EVP_des_ede3_cbc)() = 0L;
+ static EVP_CIPHER *(*K_EVP_des_cbc)() = 0L;
+ static EVP_CIPHER *(*K_EVP_rc2_cbc)() = 0L;
+@@ -424,10 +424,10 @@ KConfig *cfg;
+       K_X509_STORE_CTX_set_purpose = (void (*)(X509_STORE_CTX *, int)) _cryptoLib->symbol("X509_STORE_CTX_set_purpose");
+       K_sk_free = (void (*) (STACK *)) _cryptoLib->symbol("sk_free");
+       K_sk_num = (int (*) (STACK *)) _cryptoLib->symbol("sk_num");
+-      K_sk_pop = (char* (*) (STACK *)) _cryptoLib->symbol("sk_pop");
+-      K_sk_value = (char* (*) (STACK *, int)) _cryptoLib->symbol("sk_value");
++      K_sk_pop = (void* (*) (STACK *)) _cryptoLib->symbol("sk_pop");
++      K_sk_value = (void* (*) (STACK *, int)) _cryptoLib->symbol("sk_value");
+       K_sk_new = (STACK* (*) (int (*)())) _cryptoLib->symbol("sk_new");
+-      K_sk_push = (int (*) (STACK*, char*)) _cryptoLib->symbol("sk_push");
++      K_sk_push = (int (*) (STACK*, void*)) _cryptoLib->symbol("sk_push");
+       K_sk_dup = (STACK* (*) (STACK *)) _cryptoLib->symbol("sk_dup");
+       K_i2s_ASN1_INTEGER = (char *(*) (X509V3_EXT_METHOD *, ASN1_INTEGER *)) _cryptoLib->symbol("i2s_ASN1_INTEGER");
+       K_X509_get_serialNumber = (ASN1_INTEGER * (*) (X509 *)) _cryptoLib->symbol("X509_get_serialNumber");
+@@ -478,8 +478,8 @@ KConfig *cfg;
+       K_ERR_clear_error = (void (*)()) _cryptoLib->symbol("ERR_clear_error");
+       K_ERR_get_error = (unsigned long (*)()) _cryptoLib->symbol("ERR_get_error");
+       K_ERR_print_errors_fp = (void (*)(FILE*)) _cryptoLib->symbol("ERR_print_errors_fp");
+-      K_X509_get1_email = (STACK *(*)(X509 *x)) _cryptoLib->symbol("X509_get1_email");
+-      K_X509_email_free = (void (*)(STACK *sk)) _cryptoLib->symbol("X509_email_free");
++      K_X509_get1_email = (KOSSL1_STACK_OF(OPENSSL_STRING) *(*)(X509 *x)) _cryptoLib->symbol("X509_get1_email");
++      K_X509_email_free = (void (*)(KOSSL1_STACK_OF(OPENSSL_STRING) *sk)) _cryptoLib->symbol("X509_email_free");
+       K_EVP_des_ede3_cbc = (EVP_CIPHER *(*)()) _cryptoLib->symbol("EVP_des_ede3_cbc");
+       K_EVP_des_cbc = (EVP_CIPHER *(*)()) _cryptoLib->symbol("EVP_des_cbc");
+       K_EVP_rc2_cbc = (EVP_CIPHER *(*)()) _cryptoLib->symbol("EVP_rc2_cbc");
+@@ -568,7 +568,7 @@ KConfig *cfg;
+       K_SSL_set_session = (int (*)(SSL*,SSL_SESSION*)) _sslLib->symbol("SSL_set_session");
+       K_d2i_SSL_SESSION = (SSL_SESSION* (*)(SSL_SESSION**,unsigned char**, long)) _sslLib->symbol("d2i_SSL_SESSION");
+       K_i2d_SSL_SESSION = (int (*)(SSL_SESSION*,unsigned char**)) _sslLib->symbol("i2d_SSL_SESSION");
+-      K_SSL_get_ciphers = (STACK *(*)(const SSL*)) _sslLib->symbol("SSL_get_ciphers");
++      K_SSL_get_ciphers = (STACK_OF(SSL_CIPHER) *(*)(const SSL*)) _sslLib->symbol("SSL_get_ciphers");
+ #endif
+ 
+ 
+@@ -1075,13 +1075,13 @@ int KOpenSSLProxy::sk_num(STACK *s) {
+ }
+ 
+ 
+-char *KOpenSSLProxy::sk_pop(STACK *s) {
++void *KOpenSSLProxy::sk_pop(STACK *s) {
+    if (K_sk_pop) return (K_sk_pop)(s);
+    else return 0L;
+ }
+ 
+ 
+-char *KOpenSSLProxy::sk_value(STACK *s, int n) {
++void *KOpenSSLProxy::sk_value(STACK *s, int n) {
+    if (K_sk_value) return (K_sk_value)(s, n);
+    else return 0L;
+ }
+@@ -1102,13 +1102,13 @@ STACK* KOpenSSLProxy::sk_dup(STACK *s) {
+ }
+ 
+ 
+-STACK* KOpenSSLProxy::sk_new(int (*cmp)()) {
+-   if (K_sk_new) return (K_sk_new)(cmp);
++STACK* KOpenSSLProxy::sk_new(int (*cmp)(const void*, const void*)) {
++  if (K_sk_new) return (K_sk_new)(reinterpret_cast<int (*)()>(cmp));
+    else return 0L;
+ }
+ 
+ 
+-int KOpenSSLProxy::sk_push(STACK* s, char* d) {
++int KOpenSSLProxy::sk_push(STACK* s, void* d) {
+    if (K_sk_push) return (K_sk_push)(s,d);
+    else return -1;
+ }
+@@ -1407,12 +1407,12 @@ RSA* KOpenSSLProxy::RSA_generate_key(int
+    else return 0L;
+ }
+ 
+-STACK *KOpenSSLProxy::X509_get1_email(X509 *x) {
++KOSSL1_STACK_OF(OPENSSL_STRING) *KOpenSSLProxy::X509_get1_email(X509 *x) {
+    if (K_X509_get1_email) return (K_X509_get1_email)(x);
+    else return 0L;
+ }
+ 
+-void KOpenSSLProxy::X509_email_free(STACK *sk) {
++void KOpenSSLProxy::X509_email_free(KOSSL1_STACK_OF(OPENSSL_STRING) *sk) {
+    if (K_X509_email_free) (K_X509_email_free)(sk);
+ }
+ 
+Index: kdelibs-3.5.10/kio/kssl/kopenssl.h
+===================================================================
+--- kdelibs-3.5.10.orig/kio/kssl/kopenssl.h
++++ kdelibs-3.5.10/kio/kssl/kopenssl.h
+@@ -47,6 +47,51 @@ class KOpenSSLProxyPrivate;
+ #include <openssl/evp.h>
+ #include <openssl/stack.h>
+ #include <openssl/bn.h>
++#if OPENSSL_VERSION_NUMBER >= 0x10000000L
++typedef struct asn1_method_st
++	{
++	i2d_of_void *i2d;
++	d2i_of_void *d2i;
++	void *(*create)(void);
++	void (*destroy)(void *);
++	} ASN1_METHOD;
++typedef struct asn1_header_st
++	{
++	ASN1_OCTET_STRING *header;
++	void *data;
++	ASN1_METHOD *meth;
++	} ASN1_HEADER;
++typedef struct stack_st STACK;
++
++#include <openssl/safestack.h>
++
++template<class S> struct KOpenSSLElementType;
++template<class T> struct KOpenSSLStackType;
++
++#define KOSSL_DECLARE_STACK_OF(type)                            \
++  template<> struct KOpenSSLElementType<STACK_OF(type)> {        \
++    typedef type value_t;                                       \
++    typedef type* ptr_t;                                        \
++  };                                                            \
++  template<> struct KOpenSSLStackType<const type*> {             \
++    typedef STACK_OF(type) stack_t;                             \
++    typedef STACK_OF(type) *ptr_t;                              \
++  };
++
++KOSSL_DECLARE_STACK_OF(GENERAL_NAME)
++KOSSL_DECLARE_STACK_OF(SSL_CIPHER)
++KOSSL_DECLARE_STACK_OF(X509)
++
++template<> struct KOpenSSLElementType<STACK_OF(OPENSSL_STRING)> {
++  typedef char value_t;
++  typedef OPENSSL_STRING ptr_t;
++};
++
++#define KOSSL1_STACK_OF(type) STACK_OF(type)
++#else
++#define KOSSL1_STACK_OF(type) STACK
++#endif
++
+ #undef crypt
+ #endif
+ 
+@@ -523,7 +568,7 @@ public:
+    /* 
+     *   Pop off the stack
+     */
+-   char *sk_pop(STACK *s);
++   void *sk_pop(STACK *s);
+ 
+ 
+    /* 
+@@ -541,19 +586,19 @@ public:
+    /* 
+     *  Value of element n in the stack
+     */
+-   char *sk_value(STACK *s, int n);
++   void *sk_value(STACK *s, int n);
+ 
+ 
+    /* 
+     *  Create a new stack
+     */
+-   STACK *sk_new(int (*cmp)());
++   STACK *sk_new(int (*cmp)(const void *, const void *));
+ 
+ 
+    /* 
+     *  Add an element to the stack
+     */
+-   int sk_push(STACK *s, char *d);
++   int sk_push(STACK *s, void *d);
+ 
+ 
+    /* 
+@@ -562,6 +607,54 @@ public:
+    STACK *sk_dup(STACK *s);
+ 
+ 
++#if defined(KSSL_HAVE_SSL) && OPENSSL_VERSION_NUMBER >= 0x10000000L
++
++   /* Use some template magic to simulate the OpenSSL 1.0.0 safestack macros */
++
++   template<class S> typename KOpenSSLElementType<S>::ptr_t
++   sk_pop(S *s) {
++     return reinterpret_cast<typename KOpenSSLElementType<S>::ptr_t>
++       (sk_pop(reinterpret_cast<STACK*>(s)));
++   }
++
++   template<class S> void
++   sk_free(S *s) {
++     typedef typename KOpenSSLElementType<S>::ptr_t ensure_its_a_stack_type;
++     sk_free(reinterpret_cast<STACK*>(s));
++   }
++
++   template<class S> int
++   sk_num(S *s) {
++     typedef typename KOpenSSLElementType<S>::ptr_t ensure_its_a_stack_type;
++     return sk_num(reinterpret_cast<STACK*>(s));
++   }
++
++   template<class S> typename KOpenSSLElementType<S>::ptr_t
++   sk_value(S *s, int n) {
++     return reinterpret_cast<typename KOpenSSLElementType<S>::ptr_t>
++       (sk_value(reinterpret_cast<STACK*>(s), n));
++   }
++
++   template<class T> typename KOpenSSLStackType<T>::ptr_t
++   sk_new(int (*cmp)(T const *, T const *)) {
++     return reinterpret_cast<typename KOpenSSLStackType<T>::ptr_t>
++       (sk_new(reinterpret_cast<int (*)(const void *, const void *)>(cmp)));
++   }
++
++   template<class S> int
++   sk_push(S *s, typename KOpenSSLElementType<S>::ptr_t d) {
++     return sk_push(reinterpret_cast<STACK*>(s), reinterpret_cast<void*>(d));
++   }
++
++   template<class S> S*
++   sk_dup(S* s) {
++     typedef typename KOpenSSLElementType<S>::ptr_t ensure_its_a_stack_type;
++     return reinterpret_cast<S*>(sk_dup(reinterpret_cast<STACK*>(s)));
++   }
++
++#endif
++
++
+    /*
+     *  Convert an ASN1_INTEGER to it's text form
+     */
+@@ -825,8 +918,8 @@ public:
+    int i2d_X509_REQ_fp(FILE *fp, X509_REQ *x);
+ 
+    /* SMime support */
+-   STACK *X509_get1_email(X509 *x);
+-   void X509_email_free(STACK *sk);
++   KOSSL1_STACK_OF(OPENSSL_STRING) *X509_get1_email(X509 *x);
++   void X509_email_free(KOSSL1_STACK_OF(OPENSSL_STRING) *sk);
+ 
+    /* Ciphers needed for SMime */
+    EVP_CIPHER *EVP_des_ede3_cbc();
+Index: kdelibs-3.5.10/kio/kssl/ksmimecrypto.cc
+===================================================================
+--- kdelibs-3.5.10.orig/kio/kssl/ksmimecrypto.cc
++++ kdelibs-3.5.10/kio/kssl/ksmimecrypto.cc
+@@ -87,7 +87,7 @@ KSMIMECryptoPrivate::KSMIMECryptoPrivate
+ 
+ 
+ STACK_OF(X509) *KSMIMECryptoPrivate::certsToX509(QPtrList<KSSLCertificate> &certs) {
+-    STACK_OF(X509) *x509 = sk_new(NULL);
++    STACK_OF(X509) *x509 = sk_X509_new(NULL);
+     KSSLCertificate *cert = certs.first();
+     while(cert) {
+ 	sk_X509_push(x509, cert->getCert());
+Index: kdelibs-3.5.10/kio/kssl/ksslcertificate.cc
+===================================================================
+--- kdelibs-3.5.10.orig/kio/kssl/ksslcertificate.cc
++++ kdelibs-3.5.10/kio/kssl/ksslcertificate.cc
+@@ -225,9 +225,10 @@ void KSSLCertificate::getEmails(QStringL
+ 	if (!d->m_cert)
+ 		return;
+ 	
+-	STACK *s = d->kossl->X509_get1_email(d->m_cert);
++	KOSSL1_STACK_OF(OPENSSL_STRING) *s =
++		d->kossl->X509_get1_email(d->m_cert);
+ 	if (s) {
+-		for(int n=0; n < s->num; n++) {
++		for(int n=0; n < d->kossl->sk_num(s); n++) {
+ 			to.append(d->kossl->sk_value(s,n));
+ 		}
+ 		d->kossl->X509_email_free(s);
+
diff --git a/kde-core/kdenetwork/HISTORY b/kde-core/kdenetwork/HISTORY
index 8419c38..e99d7b6 100644
--- a/kde-core/kdenetwork/HISTORY
+++ b/kde-core/kdenetwork/HISTORY
@@ -1,3 +1,7 @@
+2011-01-13 Julien "_kaze_" ROZO <julien at rozo.org>
+	* PRE_BUILD, gcc44.patch: added a patch to fix compilation issue with
+	  gcc 4.4
+
 2008-11-26 Jaka Kranjc <lynxlynxlynx at sourcemage.org>
 	* CONFLICTS: made kopete default to y (deprecated)
 
diff --git a/kde-core/kdenetwork/PRE_BUILD b/kde-core/kdenetwork/PRE_BUILD
new file mode 100755
index 0000000..7f238a2
--- /dev/null
+++ b/kde-core/kdenetwork/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+patch -p1 < $SPELL_DIRECTORY/gcc44.patch
diff --git a/kde-core/kdenetwork/gcc44.patch b/kde-core/kdenetwork/gcc44.patch
new file mode 100644
index 0000000..9666f36
--- /dev/null
+++ b/kde-core/kdenetwork/gcc44.patch
@@ -0,0 +1,22 @@
+--- kdenetwork-3.5.10.orig/kopete/protocols/oscar/liboscar/rtf.cc	2005-09-10 10:20:23.000000000 +0200
++++ kdenetwork-3.5.10/kopete/protocols/oscar/liboscar/rtf.cc	2010-12-28 14:42:14.000000000 +0100
+@@ -2131,7 +2131,7 @@
+ 
+         FontDef& def = p->fonts[m_nFont-1];
+ 
+-        char *pp = strchr(str, ';');
++        const char *pp = strchr(str, ';');
+         unsigned size;
+         if (pp != NULL)
+            size = (pp - str);
+--- kdenetwork-3.5.10.orig/kopete/protocols/groupwise/libgroupwise/rtf.cc	2005-09-10 10:20:20.000000000 +0200
++++ kdenetwork-3.5.10/kopete/protocols/groupwise/libgroupwise/rtf.cc	2010-12-28 14:37:54.000000000 +0100
+@@ -2235,7 +2235,7 @@
+ 
+         FontDef& def = p->fonts[m_nFont-1];
+ 
+-        char *pp = strchr(str, ';');
++        const char *pp = strchr(str, ';');
+         unsigned size;
+         if (pp != NULL)
+            size = (pp - str);
diff --git a/kde4/kdebase4/DEPENDS b/kde4/kdebase4/DEPENDS
index ebdcd53..ecb19e0 100755
--- a/kde4/kdebase4/DEPENDS
+++ b/kde4/kdebase4/DEPENDS
@@ -9,6 +9,7 @@ depends  libxft         &&
 depends  libxrandr      &&
 depends  libxtst        &&
 depends  shared-desktop-ontologies &&
+depends  qimageblitz    &&
 
 optional_depends  xine-lib   '' ''   'video player'            &&
 if is_depends_enabled $SPELL xine-lib;then
diff --git a/kde4/kdebase4/HISTORY b/kde4/kdebase4/HISTORY
index f6918c0..5cf597a 100644
--- a/kde4/kdebase4/HISTORY
+++ b/kde4/kdebase4/HISTORY
@@ -1,3 +1,6 @@
+2011-01-13 Ismael Luceno <ismael at sourcemage.org>
+	* DEPENDS: depends on qimageblitz
+
 2011-01-07 Bor Kraljič <pyrobor at ver.si>
 	* DETAILS: updated spell to 4.5.5
 
diff --git a/kernels/kqemu/HISTORY b/kernels/kqemu/HISTORY
index 96bf38e..de346b0 100644
--- a/kernels/kqemu/HISTORY
+++ b/kernels/kqemu/HISTORY
@@ -1,3 +1,8 @@
+2011-01-12 Pol Vinogradov <vin.public at gmail.com>
+	* PRE_BUILD, kqemu-1.4.0_pre1-init_MUTEX.patch: patch to build with
+	  kernel 2.6.37, was taken from
+	  http://bugs.gentoo.org/show_bug.cgi?id=350746
+
 2010-04-09 Ismael Luceno <ismael at sourcemage.org>
 	* BUILD: use the standard way to find kernel sources
 
diff --git a/kernels/kqemu/PRE_BUILD b/kernels/kqemu/PRE_BUILD
index fd3e2d1..de99ba4 100755
--- a/kernels/kqemu/PRE_BUILD
+++ b/kernels/kqemu/PRE_BUILD
@@ -1,4 +1,5 @@
 default_pre_build &&
 cd "$SOURCE_DIRECTORY" &&
 
-patch -p0 < "$SPELL_DIRECTORY/ftbfs-linux-2.6.22.patch"
+patch -p0 < "$SPELL_DIRECTORY/ftbfs-linux-2.6.22.patch" &&
+patch -p1 < "$SPELL_DIRECTORY/kqemu-1.4.0_pre1-init_MUTEX.patch"
diff --git a/kernels/kqemu/kqemu-1.4.0_pre1-init_MUTEX.patch b/kernels/kqemu/kqemu-1.4.0_pre1-init_MUTEX.patch
new file mode 100644
index 0000000..0827e72
--- /dev/null
+++ b/kernels/kqemu/kqemu-1.4.0_pre1-init_MUTEX.patch
@@ -0,0 +1,16 @@
+Common subdirectories: kqemu-1.4.0pre1-orig/common and kqemu-1.4.0pre1/common
+diff -u kqemu-1.4.0pre1-orig/kqemu-linux.c kqemu-1.4.0pre1/kqemu-linux.c
+--- kqemu-1.4.0pre1-orig/kqemu-linux.c	2008-05-30 16:33:34.000000000 -0400
++++ kqemu-1.4.0pre1/kqemu-linux.c	2011-01-05 16:51:45.407394748 -0500
+@@ -53,6 +53,10 @@
+ #define PAGE_KERNEL_EXEC PAGE_KERNEL
+ #endif
+ 
++/* init_MUTEX macro was removed in 2.6.37 */
++#if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 36) && !defined(init_MUTEX)
++#define init_MUTEX(sem)		sema_init(sem, 1)
++#endif
+ //#define DEBUG
+ 
+ #ifdef DEBUG
+Common subdirectories: kqemu-1.4.0pre1-orig/tests and kqemu-1.4.0pre1/tests
diff --git a/libs/qoauth/BUILD b/libs/qoauth/BUILD
new file mode 100755
index 0000000..b6c2bf5
--- /dev/null
+++ b/libs/qoauth/BUILD
@@ -0,0 +1,5 @@
+QTDIR="${QTDIR:-$INSTALL_ROOT/usr}" &&
+PATH="$QTDIR/bin/qt4:$PATH" &&
+
+qmake &&
+make
diff --git a/libs/qoauth/DEPENDS b/libs/qoauth/DEPENDS
new file mode 100755
index 0000000..428f269
--- /dev/null
+++ b/libs/qoauth/DEPENDS
@@ -0,0 +1 @@
+depends qt4
diff --git a/libs/qoauth/DETAILS b/libs/qoauth/DETAILS
new file mode 100755
index 0000000..fca14ff
--- /dev/null
+++ b/libs/qoauth/DETAILS
@@ -0,0 +1,19 @@
+           SPELL=qoauth
+if [ "$QOAUTH_AUTOUPDATE" == y ]; then
+         VERSION=$(date +%Y%m%d)
+else
+         VERSION=git
+fi
+          SOURCE=${SPELL}-git.tar.bz2
+   SOURCE_URL[0]=git://github.com/ayoy/${SPELL}.git
+   SOURCE_IGNORE=volatile
+  FORCE_DOWNLOAD=on
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-git"
+        WEB_SITE="https://github.com/ayoy/qoauth"
+      LICENSE[0]=LGPL
+         ENTERED=20110111
+           SHORT="A Qt-based library for OAuth authorization scheme"
+cat << EOF
+QOAuth is an attempt to support interaction with OAuth-powered network
+services in a Qt way, i.e. simply, clearly and efficiently.
+EOF
diff --git a/libs/qoauth/HISTORY b/libs/qoauth/HISTORY
new file mode 100644
index 0000000..a4d3d8c
--- /dev/null
+++ b/libs/qoauth/HISTORY
@@ -0,0 +1,3 @@
+2011-01-11 Ismael Luceno <ismael at sourcemage.org>
+	* BUILD, DEPENDS, DETAILS: spell created
+
diff --git a/security/wireshark/DETAILS b/security/wireshark/DETAILS
index 6100c6c..4e788ee 100755
--- a/security/wireshark/DETAILS
+++ b/security/wireshark/DETAILS
@@ -1,11 +1,11 @@
            SPELL=wireshark
-         VERSION=1.4.2
-  SECURITY_PATCH=26
+         VERSION=1.4.3
+  SECURITY_PATCH=27
           SOURCE=$SPELL-$VERSION.tar.bz2
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
    SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
    SOURCE_URL[1]=http://www.wireshark.org/download/src/$SOURCE
-     SOURCE_HASH=sha512:c0e27a28821bdb4f169e98a654fce5ddb041b2d67ede7d8ebb4cb7a0d461073835f313d302da044eee1aced5bb597b9baeff73ba6e30b3bc19df094ab6447592
+     SOURCE_HASH=sha512:34fd737eeffe1871943e450da3e9c095d9454e87e799f2585041c7d9332a474d06e433a166e18d54362bf02491e2eddefd9e8606382166eead1458022791bcf7
         WEB_SITE=http://www.wireshark.org/
          ENTERED=20020116
       LICENSE[0]=GPL
diff --git a/security/wireshark/HISTORY b/security/wireshark/HISTORY
index e4423c3..f57d44a 100644
--- a/security/wireshark/HISTORY
+++ b/security/wireshark/HISTORY
@@ -1,3 +1,7 @@
+2011-01-12 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 1.4.3, SECURITY_PATCH=27
+	  http://www.wireshark.org/security/wnpa-sec-2011-02.html
+
 2010-11-20 Vlad Glagolev <stealth at sourcemage.org>
 	* DETAILS: updated spell to 1.4.2; SECURITY_PATCH++
 	  http://www.wireshark.org/security/wnpa-sec-2010-14.html
diff --git a/video/mlt/DEPENDS b/video/mlt/DEPENDS
index 6a5624a..2bc1cf9 100755
--- a/video/mlt/DEPENDS
+++ b/video/mlt/DEPENDS
@@ -53,7 +53,7 @@ optional_depends  xine-lib              \
                   "Enable Xine Module"  &&
 
 optional_depends  frei0r-plugins               \
-                  "--enable-frei0r"            \  
+                  "--enable-frei0r"            \
                   "--disable-frei0r"           \
                   "Enable the frei0r module?"  &&
 
diff --git a/video/mlt/HISTORY b/video/mlt/HISTORY
index 102a7fb..166c544 100644
--- a/video/mlt/HISTORY
+++ b/video/mlt/HISTORY
@@ -1,3 +1,6 @@
+2011-01-11 Robin Cook <rcook at wyrms.net>
+	* DEPENDS: redid fier0r-plugin optional as was failing
+
 2010-12-10 Robin Cook <rcook at wyrms.net>
 	* DEPENDS: added frei0r-plugin as optional
 
diff --git a/xorg-driver/xf86-video-intel/DEPENDS b/xorg-driver/xf86-video-intel/DEPENDS
index bf3b76d..6427633 100755
--- a/xorg-driver/xf86-video-intel/DEPENDS
+++ b/xorg-driver/xf86-video-intel/DEPENDS
@@ -1,7 +1,28 @@
 depends -sub "INTEL" libdrm &&
-depends libxvmc &&
-depends xf86driproto &&
 depends xproto &&
 depends xorg-server &&
 depends util-macros &&
-depends -sub 'DRI' mesalib '--enable-dri'
+depends libpciaccess &&
+
+if spell_ok mesalib; then
+  persistent_read mesalib MESALIB_BUILD MESALIB_BUILD || true
+fi &&
+
+if [[ $MESALIB_BUILD == dri ]]; then
+  depends xf86driproto &&
+  depends -sub "DRI" mesalib "--enable-dri"
+else
+  depends mesalib "--disable-dri"
+fi &&
+
+optional_depends libxvmc \
+                 "--enable-xvmc" \
+                 "--disable-xvmc" \
+                 "for XvMC support" &&
+
+if is_depends_enabled $SPELL libxvmc; then
+  depends dri2proto &&
+  depends xcb-util
+fi &&
+
+optional_depends udev "" "" "for udev-based monitor hotplug detection support"
diff --git a/xorg-driver/xf86-video-intel/HISTORY b/xorg-driver/xf86-video-intel/HISTORY
index d0d0ef0..f49061a 100644
--- a/xorg-driver/xf86-video-intel/HISTORY
+++ b/xorg-driver/xf86-video-intel/HISTORY
@@ -1,3 +1,6 @@
+2011-01-13 Vlad Glagolev <stealth at sourcemage.org>
+	* DEPENDS: corrected dependencies
+
 2011-01-10 Vlad Glagolev <stealth at sourcemage.org>
 	* DETAILS: updated spell to 2.14.0; remove extra space in short desc
 



More information about the SM-Commit mailing list