Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to devel-gcc grimoire by Eric Sandall (c1f47a863aa2a2878391e605a0c58f3834a6dd41)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Eric Sandall <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to devel-gcc grimoire by Eric Sandall (c1f47a863aa2a2878391e605a0c58f3834a6dd41)
  • Date: Tue, 20 Apr 2010 21:43:11 -0500

GIT changes to devel-gcc grimoire by Eric Sandall <sandalle AT sourcemage.org>:

ChangeLog |
14
archive-libs/zlib/DETAILS |
6
archive-libs/zlib/HISTORY |
3
archive/pbzip2/DETAILS |
4
archive/pbzip2/HISTORY |
3
chat-im/galaxium/BUILD |
8
chat-im/galaxium/DEPENDS |
17
chat-im/galaxium/DETAILS |
17
chat-im/galaxium/HISTORY |
3
chat-irc/xchat/HISTORY |
3
chat-irc/xchat/PRE_BUILD |
6
compiz-fusion/compiz-plugins-extra/DETAILS |
5
compiz-fusion/compiz-plugins-extra/HISTORY |
3
compiz-fusion/compiz-plugins-extra/compiz-plugins-extra-0.8.4.tar.bz2.sig |
0
compiz-fusion/compiz-plugins-main/DEPENDS |
6
compiz-fusion/compiz-plugins-main/DETAILS |
5
compiz-fusion/compiz-plugins-main/HISTORY |
3
compiz-fusion/compiz-plugins-main/compiz-plugins-main-0.8.4.tar.bz2.sig |
0
crypto/nss/BUILD |
2
crypto/nss/HISTORY |
4
dev/null
|binary
devel/ctemplate/DEPENDS |
1
devel/ctemplate/DETAILS |
16
devel/ctemplate/HISTORY |
7
devel/phppgadmin/DETAILS |
6
devel/phppgadmin/HISTORY |
3
disk/di/DETAILS |
4
disk/di/HISTORY |
3
disk/udev/DETAILS |
2
disk/udev/HISTORY |
3
gnome2-apps/gedit/CONFLICTS |
1
gnome2-apps/gedit/DETAILS |
2
gnome2-apps/gedit/HISTORY |
4
gnome2-apps/gedit/gedit-2.30.0.tar.bz2.sig |
0
gnome2-apps/gedit/gedit-2.30.2.tar.bz2.sig
|binary
gnome2-libs/clutter/DETAILS |
2
gnome2-libs/clutter/HISTORY |
3
gnome2-libs/clutter/clutter-1.2.4.tar.bz2.sig |
0
gnome2-libs/clutter/clutter-1.2.6.tar.bz2.sig
|binary
gnome2-libs/gobject-introspection/DETAILS |
2
gnome2-libs/gobject-introspection/HISTORY |
3
gnome2-libs/gobject-introspection/gobject-introspection-0.6.10.tar.bz2.sig
|binary
gnome2-libs/gobject-introspection/gobject-introspection-0.6.9.tar.bz2.sig |
0
gnome2-libs/pygtksourceview/DETAILS |
4
gnome2-libs/pygtksourceview/HISTORY |
3
gnu/gcc33/BUILD |
18
gnu/gcc33/HISTORY |
3
gnu/gcc34/BUILD |
11
gnu/gcc34/HISTORY |
3
kde4-apps/kraft/CONFIGURE |
2
kde4-apps/kraft/DEPENDS |
4
kde4-apps/kraft/DETAILS |
21
kde4-apps/kraft/HISTORY |
6
kde4/kdevelop4/DETAILS |
4
kde4/kdevelop4/HISTORY |
3
kde4/kdevplatform4/DETAILS |
6
kde4/kdevplatform4/HISTORY |
3
libs/libanculus-sharp/BUILD |
3
libs/libanculus-sharp/DEPENDS |
2
libs/libanculus-sharp/DETAILS |
27
libs/libanculus-sharp/HISTORY |
3
libs/libanculus-sharp/PRE_SUB_DEPENDS |
5
libs/libanculus-sharp/SUB_DEPENDS |
6
libs/libtasn1/DETAILS |
2
libs/libtasn1/HISTORY |
3
mail/qmail/CONFIGURE |
3
mail/qmail/HISTORY |
3
mail/qmail/PRE_BUILD |
3
mail/qmail/patches/qmail-tls-patch |
1361 ++++++++++
perl-cpan/xml-twig/DETAILS |
4
perl-cpan/xml-twig/HISTORY |
3
python-pypi/papyon/DEPENDS |
3
python-pypi/papyon/DETAILS |
16
python-pypi/papyon/HISTORY |
3
python-pypi/pytz/DETAILS |
4
python-pypi/pytz/HISTORY |
3
science/gnofract4d/DETAILS |
4
science/gnofract4d/HISTORY |
3
telephony/telepathy-butterfly/DEPENDS |
2
telephony/telepathy-butterfly/DETAILS |
2
telephony/telepathy-butterfly/HISTORY |
4
telephony/telepathy-gabble/DETAILS |
2
telephony/telepathy-gabble/HISTORY |
8
telephony/telepathy-haze/DETAILS |
2
telephony/telepathy-haze/HISTORY |
3
telephony/telepathy-mission-control/DETAILS |
2
telephony/telepathy-mission-control/HISTORY |
3
telephony/telepathy-qt/DETAILS |
2
telephony/telepathy-qt/HISTORY |
3
telephony/telepathy-salut/DETAILS |
2
telephony/telepathy-salut/HISTORY |
3
telephony/telepathy-sofiasip/DETAILS |
2
telephony/telepathy-sofiasip/HISTORY |
3
telephony/telepathy.gpg
|binary
utils/dbus-python/DETAILS |
4
utils/dbus-python/HISTORY |
3
utils/iso-codes/DETAILS |
2
utils/iso-codes/HISTORY |
3
wm-addons/wmwifi/BUILD |
3
wm-addons/wmwifi/DETAILS |
8
wm-addons/wmwifi/HISTORY |
7
xorg-app/compiz/DETAILS |
7
xorg-app/compiz/HISTORY |
3
xorg-app/compiz/compiz-0.8.4.tar.gz.sig |
0
104 files changed, 1743 insertions(+), 69 deletions(-)

New commits:
commit 8cd1d99184ae4a03d85260caa8242de1d58b33df
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>

clutter 1.2.6

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

libtasn1 2.6

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

zlib 1.2.5

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

di 4.21

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

gcc34: Doesn't know -msse4* nor -msse5 (GCC 4.4+)

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

gcc33: Doesn't know -msse4* nor -msse5 (GCC 4.4+)

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

gcc33: Remove debugging code

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

devel/ctemplate - new spell

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

kraft: => 0.40

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

kraft - new spell
(cherry picked from commit 4d1d40956d89666af60a6a1c763e0e98f2021d27)

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

udev: version 152

commit 9791f2f4f8fd43b459c3064f7935d158ed161558
Author: Dave Josephsen <dave AT sourcemage.org>
Commit: Dave Josephsen <dave AT sourcemage.org>

qmail: added tls patch

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

galaxium: new spell, jabber/irc/msn instant messenger

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

libanculus-sharp: new spell, utility library for mono

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

pbzip2: => 1.1.1

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

dbus-python: => 0.83.1

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

compiz-plugins-extra: version 0.8.6

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

compiz-plugins-main: version 0.8.6

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

compiz: version 0.8.6

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

papyon: new spell, maintained pymsn fork

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

telepathy-sofiasip: version 0.6.2

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

telepathy-salut: version 0.3.11

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

telepathy-qt: version 0.3.1

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

telepathy-mission-control: version 0.3.4

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

telepathy-haze: version 0.3.4

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

telepathy-gabble: version 0.9.10

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

telepathy-butterfly: version 0.5.8

commit 3a07b7dc32d74968b78155c033ade805aefae601
Author: Arwed von Merkatz <v.merkatz AT gmx.net>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>

nss: fixed BUILD to work for DEFAULT branch, bug 15680

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

iso-codes: => 3.15

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

xml-twig: => 3.34

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

pytz: => 2010h

commit dc93d33536335279a4bf98129db334ec055b430c
Author: Sukneet Basuta <sukneet AT sourcemage.org>
Commit: Sukneet Basuta <sukneet AT sourcemage.org>

wmwifi: => 0.6, fixed SOURCE_URL[0]
upstream website is dead, changed to page on dockapps.org

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

gobject-introspection 0.6.10

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

gedit 2.30.2

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

pygtksourceview 2.10.1

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

gnofract4d 3.13

commit 6220ff3c65f49d4efd1db5da046db33a9fc017ab
Author: Ladislav Hagara <ladislav.hagara AT unob.cz>
Commit: Ladislav Hagara <ladislav.hagara AT unob.cz>

phppgadmin 4.2.3, SECURITY_PATCH=2, #15681

commit 74ae6de8227e9902a7ee803843233f2369c3042e
Author: George Sherwood <george AT beernabeer.com>
Commit: George Sherwood <george AT beernabeer.com>

xchat: Added Gentoo fix to handle gtk+2 deprecated symbols

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

kdevelop4: => 3.10.2

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

kdevplatform4: => 0.10.2

diff --git a/ChangeLog b/ChangeLog
index dfd53f5..69762e7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2010-04-20 Treeve Jelbert <treeve AT sourcemage.org>
+ * kde4-apps/kraft: new spell - business software
+ * devel/ctemplate: new spell - c++ templating language
+
+2010-04-20 Arjan Bouter <abouter AT sourcemage.org>
+ * libs/libanculus-sharp: new spell, mono utility library
+ * chat-im/galaxium: new spell, jabber/irc/msn instant messenger
+
+2010-04-19 Arjan Bouter <abouter AT sourcemage.org>
+ * python-pypi/papyon: new spell, pymsn fork
+
2010-04-17 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* audio-creation/dino: new spell, a midi sequencer

@@ -267,6 +278,9 @@
* telephony/telepathy-butterfly: new spell, pymsn based msn support
for
telepathy

+2010-01-12 Treeve Jelbert <treeve AT sourcemage.org>
+ * kde4-apps/kraft: new spell, small business management for kde4
+
2010-01-10 Ladislav Hagara <hgr AT vabo.cz>
* mail/bsfilter: new spell, bayesian spam filter

diff --git a/archive-libs/zlib/DETAILS b/archive-libs/zlib/DETAILS
index 6b0dda9..d16c277 100755
--- a/archive-libs/zlib/DETAILS
+++ b/archive-libs/zlib/DETAILS
@@ -1,7 +1,7 @@
SPELL=zlib
- VERSION=1.2.4
- PATCHLEVEL=2
-
SOURCE_HASH=sha512:385ba58d27ff02cc5a264180d6c2bb8b3789a555504c669907e294adce2d6bd36ba14da196eab811cdf7f11ab43ac1b38e9d3ea5f44f8616a5e5dbf3a60906de
+ VERSION=1.2.5
+ PATCHLEVEL=0
+
SOURCE_HASH=sha512:88e8aa4bd2f23233cc6c0f52e568c7d8d2c18a69170c2363b574fbe5c86ce352d0768178c3fde6372576c45e0fdf80537ebde773689e3ad8584baddb889d0ede
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://www.zlib.net/$SOURCE
diff --git a/archive-libs/zlib/HISTORY b/archive-libs/zlib/HISTORY
index 81c44b7..4c69200 100644
--- a/archive-libs/zlib/HISTORY
+++ b/archive-libs/zlib/HISTORY
@@ -1,3 +1,6 @@
+2010-04-21 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 1.2.5
+
2010-03-16 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: PATCHLEVEL=1
* BUILD: moved $OPTS here from PRE_BUILD
diff --git a/archive/pbzip2/DETAILS b/archive/pbzip2/DETAILS
index 083944a..68651bb 100755
--- a/archive/pbzip2/DETAILS
+++ b/archive/pbzip2/DETAILS
@@ -1,6 +1,6 @@
SPELL=pbzip2
- VERSION=1.1.0
-
SOURCE_HASH=sha512:84542a90af849f63c632e36d26b1f970d4284cae5a933bdfdfcd2a3872a1cc4138f36f8de7a051e509f0e0faf83d0fc543e9fc1c856ff11e71711f0cf82f7f6a
+ VERSION=1.1.1
+
SOURCE_HASH=sha512:2d5b035bf45f4e3ff4c8e5b175d7808a48af172561a1b64bbf17a7527388b26d2ba79729dc836b1abf14bc2d769d63a9dda477611c6a4279ec776e960fed833f
SOURCE="$SPELL-$VERSION.tar.gz"
SOURCE_URL[0]="http://compression.ca/pbzip2/$SOURCE";
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/archive/pbzip2/HISTORY b/archive/pbzip2/HISTORY
index 2253fd0..3ae6c90 100644
--- a/archive/pbzip2/HISTORY
+++ b/archive/pbzip2/HISTORY
@@ -1,3 +1,6 @@
+2010-04-20 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.1.1
+
2010-03-14 Sukneet Basuta <sukneet AT sourcemage.org>
* DETAILS: updated spell to 1.1.0

diff --git a/chat-im/galaxium/BUILD b/chat-im/galaxium/BUILD
new file mode 100755
index 0000000..ce53b26
--- /dev/null
+++ b/chat-im/galaxium/BUILD
@@ -0,0 +1,8 @@
+cd "${SOURCE_DIRECTORY}" &&
+./autogen.sh --prefix="${INSTALL_ROOT}/usr" \
+ --sysconfdir="${INSTALL_ROOT}/etc" \
+ --localstatedir="${INSTALL_ROOT}/var" \
+ --infodir="${INSTALL_ROOT}/usr/share/info" \
+ --mandir="${INSTALL_ROOT}/usr/share/man" \
+ $OPTS &&
+make
diff --git a/chat-im/galaxium/DEPENDS b/chat-im/galaxium/DEPENDS
new file mode 100755
index 0000000..4287522
--- /dev/null
+++ b/chat-im/galaxium/DEPENDS
@@ -0,0 +1,17 @@
+depends gtk-sharp-2 &&
+depends libanculus-sharp &&
+depends -sub gtk-sharp-2 libanculus-sharp &&
+depends notify-sharp &&
+depends mono-addins &&
+depends gstreamer &&
+optional_depends webkit-sharp '--enable-webkit' \
+ '--disable-webkit' \
+ 'Enable webkit support?' &&
+optional_depends gecko-sharp-2 '--enable-gecko' \
+ '--disable-gecko' \
+ 'Enable gecko support? (default: disabled)' &&
+# should be optional, but won't build without gnome-sharp
+#optional_depends gnome-sharp '--enable-gnome' \
+# '--disable-gnome' \
+# 'Enable gnome support? (default: disabled)'
+depends gnome-sharp
diff --git a/chat-im/galaxium/DETAILS b/chat-im/galaxium/DETAILS
new file mode 100755
index 0000000..846bd55
--- /dev/null
+++ b/chat-im/galaxium/DETAILS
@@ -0,0 +1,17 @@
+ SPELL=galaxium
+ VERSION=svn
+ SOURCE="${SPELL}-${VERSION}.tar.bz2"
+ SOURCE_URL[0]=svn_http://${SPELL}.googlecode.com/svn/trunk:galaxium
+ SOURCE_IGNORE=volatile
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
+ WEB_SITE="http://code.google.com/p/galaxium";
+ LICENSE[0]=GPL
+ ENTERED=20100420
+ SHORT="instant messenger"
+cat << EOF
+Galaxium is an instant messenger application designed for the GNOME desktop.
+It will allow you to connect to MSN, Jabber, and IRC.
+You can communicate with your family, friends and co-workers from around the
+world, using different networks at the same time, while still keeping the
+unique user experience of each network's features.
+EOF
diff --git a/chat-im/galaxium/HISTORY b/chat-im/galaxium/HISTORY
new file mode 100644
index 0000000..8ad4ec7
--- /dev/null
+++ b/chat-im/galaxium/HISTORY
@@ -0,0 +1,3 @@
+2010-04-20 Arjan Bouter <abouter AT sourcemage.org>
+ * DEPENDS, DETAILS, PRE_BUILD: spell created
+
diff --git a/chat-irc/xchat/HISTORY b/chat-irc/xchat/HISTORY
index bc2e5c7..43a6381 100644
--- a/chat-irc/xchat/HISTORY
+++ b/chat-irc/xchat/HISTORY
@@ -1,3 +1,6 @@
+2010-04-18 George Sherwood <gsherwood AT sourcemage.org>
+ * PRE_BUILD: Added Gentoo fix for deprecated gtk symbols
+
2008-09-06 George Sherwood <george AT beernabeer.com>
* PRE_BUILD: Added to apply patch
* xchat-gtk.patch: Added upstream patch to build with gtk 2.14.x
diff --git a/chat-irc/xchat/PRE_BUILD b/chat-irc/xchat/PRE_BUILD
index b1faf2a..30aedf2 100755
--- a/chat-irc/xchat/PRE_BUILD
+++ b/chat-irc/xchat/PRE_BUILD
@@ -1,3 +1,7 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&
-patch -p0 < $SCRIPT_DIRECTORY/xchat-gtk.patch
+patch -p0 < $SCRIPT_DIRECTORY/xchat-gtk.patch &&
+
+#Gentoo Fix for recent version of GTK+2
+# Don't disable deprecated gtk+ symbols
+sed -i -e '/define GTK_DISABLE_DEPRECATED/d' src/fe-gtk/*.c
diff --git a/compiz-fusion/compiz-plugins-extra/DETAILS
b/compiz-fusion/compiz-plugins-extra/DETAILS
index b70ebb3..a3284a8 100755
--- a/compiz-fusion/compiz-plugins-extra/DETAILS
+++ b/compiz-fusion/compiz-plugins-extra/DETAILS
@@ -11,11 +11,10 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-git
FORCE_DOWNLOAD=1
SOURCE_IGNORE=volatile
else
- VERSION=0.8.4
+ VERSION=0.8.6
SOURCE=$SPELL-$VERSION.tar.bz2

SOURCE_URL[0]=http://releases.compiz.org/components/${SPELL/compiz-/}/$SOURCE
-#
SOURCE_HASH=sha512:a2172f230e60b0463af8f43938559911f16aa33d8898eb0e2b3298f1a5e420ef4a133f1ed7a47b9394732ca016bd117a35f9793c7e3e7ca2b89a281db905286a
- SOURCE_GPG=gurus.gpg:$SOURCE.sig:WORKS_FOR_ME
+
SOURCE_HASH=sha512:2dabfa796f17ccc80add2b37fedfe7762b5ae5e966850d191f9ca4b5609a55ae6e8b96aa0707fa75d963ccc8b5a504f0f008014b89f2de871c863c4932f2521b
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
fi
WEB_SITE=http://www.compiz-fusion.org/
diff --git a/compiz-fusion/compiz-plugins-extra/HISTORY
b/compiz-fusion/compiz-plugins-extra/HISTORY
index 063767e..5dd89e3 100644
--- a/compiz-fusion/compiz-plugins-extra/HISTORY
+++ b/compiz-fusion/compiz-plugins-extra/HISTORY
@@ -1,3 +1,6 @@
+2010-04-19 Arjan Bouter <abouter AT sourcemage.org>
+ * DETAILS: version 0.8.6
+
2009-10-23 Bearcat M. Sandor <sourcemage AT feline-soul.com>
* DETAILS: updated spell to 0.8.4

diff --git
a/compiz-fusion/compiz-plugins-extra/compiz-plugins-extra-0.8.4.tar.bz2.sig
b/compiz-fusion/compiz-plugins-extra/compiz-plugins-extra-0.8.4.tar.bz2.sig
deleted file mode 100644
index a50ffae..0000000
Binary files
a/compiz-fusion/compiz-plugins-extra/compiz-plugins-extra-0.8.4.tar.bz2.sig
and /dev/null differ
diff --git a/compiz-fusion/compiz-plugins-main/DEPENDS
b/compiz-fusion/compiz-plugins-main/DEPENDS
index 873d8d5..0e8594f 100755
--- a/compiz-fusion/compiz-plugins-main/DEPENDS
+++ b/compiz-fusion/compiz-plugins-main/DEPENDS
@@ -1,5 +1,7 @@
if [ "$COMPIZ_PLUGINS_MAIN_TRUNK" == "y" ]; then
depends "git"
fi &&
-depends "libcompizconfig" &&
-depends "librsvg2"
+#depends "libcompizconfig" &&
+#depends "librsvg2"
+depends compiz-bcop &&
+depends compiz
diff --git a/compiz-fusion/compiz-plugins-main/DETAILS
b/compiz-fusion/compiz-plugins-main/DETAILS
index b2070db..005dca0 100755
--- a/compiz-fusion/compiz-plugins-main/DETAILS
+++ b/compiz-fusion/compiz-plugins-main/DETAILS
@@ -11,11 +11,10 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-git
FORCE_DOWNLOAD=1
SOURCE_IGNORE=volatile
else
- VERSION=0.8.4
+ VERSION=0.8.6
SOURCE=$SPELL-$VERSION.tar.bz2

SOURCE_URL[0]=http://releases.compiz.org/components/${SPELL/compiz-/}/$SOURCE
-#
SOURCE_HASH=sha512:6eca811acb9751a7b98647d41ae91262f0d3af29068ffcf5f073047e27630853c190f02e6dcbde578ec91ba9a6ac6b06dc27e2f2ef2a2290b0bf1c9cd3ad4794
- SOURCE_GPG=gurus.gpg:$SOURCE.sig:WORKS_FOR_ME
+
SOURCE_HASH=sha512:1a5310762138b4a4e1f3a5f5c53cee30431b1d5aa420abc05970b6a970c5c02818d7a6bbde0c2f42282f0370fbddebcacbea0a97105372b76496804183eef6a7
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
fi
WEB_SITE=http://www.compiz-fusion.org/
diff --git a/compiz-fusion/compiz-plugins-main/HISTORY
b/compiz-fusion/compiz-plugins-main/HISTORY
index de143de..d145ff0 100644
--- a/compiz-fusion/compiz-plugins-main/HISTORY
+++ b/compiz-fusion/compiz-plugins-main/HISTORY
@@ -1,3 +1,6 @@
+2010-04-19 Arjan Bouter <abouter AT sourcemage.org>
+ * DETAILS: version 0.8.6
+
2009-10-23 Bearcat M. Sandor <sourcemage AT feline-soul.com>
* DETAILS: updated spell to 0.8.4

diff --git
a/compiz-fusion/compiz-plugins-main/compiz-plugins-main-0.8.4.tar.bz2.sig
b/compiz-fusion/compiz-plugins-main/compiz-plugins-main-0.8.4.tar.bz2.sig
deleted file mode 100644
index 5cbeab1..0000000
Binary files
a/compiz-fusion/compiz-plugins-main/compiz-plugins-main-0.8.4.tar.bz2.sig and
/dev/null differ
diff --git a/crypto/nss/BUILD b/crypto/nss/BUILD
index d037513..7a287c0 100755
--- a/crypto/nss/BUILD
+++ b/crypto/nss/BUILD
@@ -13,7 +13,7 @@ cd $SOURCE_DIRECTORY/mozilla/security/coreconf &&

echo 'INCLUDES += -I/usr/include/nspr -I$(DIST)/include/dbm' >> headers.mk &&

-if [[ $NSS_BRANCH != 3.12 ]]; then
+if [[ $NSS_BRANCH == 3.11 ]]; then
sedit 's:$(DIST)/lib:/usr/lib/nspr:' location.mk
fi &&

diff --git a/crypto/nss/HISTORY b/crypto/nss/HISTORY
index fefab15..cfdd68e 100644
--- a/crypto/nss/HISTORY
+++ b/crypto/nss/HISTORY
@@ -1,3 +1,7 @@
+2010-04-19 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * BUILD: fixed location.mk sedit to only apply to 3.11, not DEFAULT
+ branch, fixes bug #15680
+
2010-03-26 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS, PRE_BUILD, BUILD, INSTALL: used official nss tarball

diff --git a/devel/ctemplate/DEPENDS b/devel/ctemplate/DEPENDS
new file mode 100755
index 0000000..fd0b0eb
--- /dev/null
+++ b/devel/ctemplate/DEPENDS
@@ -0,0 +1 @@
+depends g++
diff --git a/devel/ctemplate/DETAILS b/devel/ctemplate/DETAILS
new file mode 100755
index 0000000..4f6d21c
--- /dev/null
+++ b/devel/ctemplate/DETAILS
@@ -0,0 +1,16 @@
+ SPELL=ctemplate
+ VERSION=0.97
+
SOURCE_HASH=sha512:1cd9fa10018e3c58823154a93c1660492e0e2eff681ad3249b85c6340d4ded6e72b27d865e79f3cb17844d64d18aa212d25e01b3d5c0ba135e2cc7e69bf01d2c
+ SOURCE=$SPELL-$VERSION.tar.gz
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+ WEB_SITE=http://$SPELL.SourceForge.net
+WEB_SITE=http://code.google.com/p/google-ctemplate
+ SOURCE_URL[0]=http://google-ctemplate.googlecode.com/files/$SOURCE
+ LICENSE[0]=BSD
+ ENTERED=20100112
+ KEYWORDS="c++ devel"
+ SHORT="simple but powerful template language for C++"
+cat << EOF
+CTemplate is a simple but powerful template language for C++. It emphasizes
separating logic from
+presentation: it is impossible to embed application logic in this template
language.
+EOF
diff --git a/devel/ctemplate/HISTORY b/devel/ctemplate/HISTORY
new file mode 100644
index 0000000..db7563c
--- /dev/null
+++ b/devel/ctemplate/HISTORY
@@ -0,0 +1,7 @@
+2010-04-20 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.97
+
+2010-01-12 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.96
+ spell created
+
diff --git a/devel/phppgadmin/DETAILS b/devel/phppgadmin/DETAILS
index 1fb6df0..de57453 100755
--- a/devel/phppgadmin/DETAILS
+++ b/devel/phppgadmin/DETAILS
@@ -1,7 +1,7 @@
SPELL=phppgadmin
- VERSION=4.2.1
-
SOURCE_HASH=sha512:1c449f6e6daea30ff434fabd59109b3f6eabcd53ab7dc8bee197a25374c26d93b892c5400786ac1b01866a0a368a63c0ad485d55d72302350ab90b93d8efd58b
- SECURITY_PATCH=1
+ VERSION=4.2.3
+
SOURCE_HASH=sha512:b40c968d427d9510d0e6d5e5d7994298d615351cc30a72d50b5f49420f2fedb5ddb754801377ea4a7a955fe2401086fb0a4236f464b3346f6f3f1373f8848ddb
+ SECURITY_PATCH=2
SOURCE=phpPgAdmin-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/phpPgAdmin-$VERSION
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
diff --git a/devel/phppgadmin/HISTORY b/devel/phppgadmin/HISTORY
index fd133e5..6cc207a 100644
--- a/devel/phppgadmin/HISTORY
+++ b/devel/phppgadmin/HISTORY
@@ -1,3 +1,6 @@
+2010-04-18 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 4.2.3, SECURITY_PATCH=2, #15681
+
2008-08-10 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 4.2.1

diff --git a/disk/di/DETAILS b/disk/di/DETAILS
index 58d89d6..5f73d49 100755
--- a/disk/di/DETAILS
+++ b/disk/di/DETAILS
@@ -1,9 +1,9 @@
SPELL=di
- VERSION=4.20
+ VERSION=4.21
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://www.gentoo.com/di/$SOURCE
-
SOURCE_HASH=sha512:995634a703fd76254aec4be5eeaa1a342820b8e92d26104617dab3bb755c674d8a8038460f4cda867c523abc4299a6ff45b7eac027bb1c6f588579a41909c470
+
SOURCE_HASH=sha512:62eed78def304ea1ced9ba2a3b0f033ba1403284652010cb0345a99a248a6b458a0445f7d310384073b85a7ac0100f80bff95f6c48e879a07ecd64bb17eefb7f
# SOURCE_GPG="gurus.gpg:${SOURCE}.sig:WORKS_FOR_ME"
WEB_SITE=http://www.gentoo.com/di/
ENTERED=20020527
diff --git a/disk/di/HISTORY b/disk/di/HISTORY
index 2cc19f2..f873c6b 100644
--- a/disk/di/HISTORY
+++ b/disk/di/HISTORY
@@ -1,3 +1,6 @@
+2010-04-21 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 4.21
+
2010-04-15 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 4.20
* PRE_BUILD: added
diff --git a/disk/udev/DETAILS b/disk/udev/DETAILS
index 8d05936..8462a82 100755
--- a/disk/udev/DETAILS
+++ b/disk/udev/DETAILS
@@ -1,5 +1,5 @@
SPELL=udev
- VERSION=151
+ VERSION=152
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE2=$SOURCE.sign
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/disk/udev/HISTORY b/disk/udev/HISTORY
index f02d2e5..70ab057 100644
--- a/disk/udev/HISTORY
+++ b/disk/udev/HISTORY
@@ -1,3 +1,6 @@
+2010-04-20 Arjan Bouter <abouter AT sourcemage.org>
+ * DETAILS: version 152
+
2010-01-27 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 151

diff --git a/gnome2-apps/gedit/CONFLICTS b/gnome2-apps/gedit/CONFLICTS
deleted file mode 100755
index 1f290c7..0000000
--- a/gnome2-apps/gedit/CONFLICTS
+++ /dev/null
@@ -1 +0,0 @@
-conflicts gedit2 y
diff --git a/gnome2-apps/gedit/DETAILS b/gnome2-apps/gedit/DETAILS
index 2066ce2..81e9352 100755
--- a/gnome2-apps/gedit/DETAILS
+++ b/gnome2-apps/gedit/DETAILS
@@ -1,5 +1,5 @@
SPELL=gedit
- VERSION=2.30.0
+ VERSION=2.30.2
BRANCH=`echo $VERSION|cut -d . -f 1,2`
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/gnome2-apps/gedit/HISTORY b/gnome2-apps/gedit/HISTORY
index 2633344..c434520 100644
--- a/gnome2-apps/gedit/HISTORY
+++ b/gnome2-apps/gedit/HISTORY
@@ -1,3 +1,7 @@
+2010-04-18 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 2.30.2
+ * CONFLICTS: removed
+
2010-03-31 Vasil Yonkov <spirtbrat AT sourcemage.org>
* DETAILS: updated spell to 2.30.0

diff --git a/gnome2-apps/gedit/gedit-2.30.0.tar.bz2.sig
b/gnome2-apps/gedit/gedit-2.30.0.tar.bz2.sig
deleted file mode 100644
index d819880..0000000
Binary files a/gnome2-apps/gedit/gedit-2.30.0.tar.bz2.sig and /dev/null differ
diff --git a/gnome2-apps/gedit/gedit-2.30.2.tar.bz2.sig
b/gnome2-apps/gedit/gedit-2.30.2.tar.bz2.sig
new file mode 100644
index 0000000..e82667d
Binary files /dev/null and b/gnome2-apps/gedit/gedit-2.30.2.tar.bz2.sig differ
diff --git a/gnome2-libs/clutter/DETAILS b/gnome2-libs/clutter/DETAILS
index 9d93d4d..3f50790 100755
--- a/gnome2-libs/clutter/DETAILS
+++ b/gnome2-libs/clutter/DETAILS
@@ -1,5 +1,5 @@
SPELL=clutter
- VERSION=1.2.4
+ VERSION=1.2.6
BRANCH=${VERSION:0:3}
SOURCE="${SPELL}-${VERSION}.tar.bz2"
SOURCE_URL[0]=$GNOME_URL/sources/$SPELL/$BRANCH/$SOURCE
diff --git a/gnome2-libs/clutter/HISTORY b/gnome2-libs/clutter/HISTORY
index 4fccd63..3c80ed4 100644
--- a/gnome2-libs/clutter/HISTORY
+++ b/gnome2-libs/clutter/HISTORY
@@ -1,3 +1,6 @@
+2010-04-21 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 1.2.6
+
2010-03-30 Vasil Yonkov <spirtbrat AT sourcemage.org>
* DETAILS: updated spell to 1.2.4

diff --git a/gnome2-libs/clutter/clutter-1.2.4.tar.bz2.sig
b/gnome2-libs/clutter/clutter-1.2.4.tar.bz2.sig
deleted file mode 100644
index c233d68..0000000
Binary files a/gnome2-libs/clutter/clutter-1.2.4.tar.bz2.sig and /dev/null
differ
diff --git a/gnome2-libs/clutter/clutter-1.2.6.tar.bz2.sig
b/gnome2-libs/clutter/clutter-1.2.6.tar.bz2.sig
new file mode 100644
index 0000000..5c688e7
Binary files /dev/null and b/gnome2-libs/clutter/clutter-1.2.6.tar.bz2.sig
differ
diff --git a/gnome2-libs/gobject-introspection/DETAILS
b/gnome2-libs/gobject-introspection/DETAILS
index f6a981c..a41781e 100755
--- a/gnome2-libs/gobject-introspection/DETAILS
+++ b/gnome2-libs/gobject-introspection/DETAILS
@@ -1,5 +1,5 @@
SPELL=gobject-introspection
- VERSION=0.6.9
+ VERSION=0.6.10
BRANCH=`echo $VERSION|cut -d . -f 1,2`
SOURCE=${SPELL}-${VERSION}.tar.bz2
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
diff --git a/gnome2-libs/gobject-introspection/HISTORY
b/gnome2-libs/gobject-introspection/HISTORY
index 3ddadc3..06d16bc 100644
--- a/gnome2-libs/gobject-introspection/HISTORY
+++ b/gnome2-libs/gobject-introspection/HISTORY
@@ -1,3 +1,6 @@
+2010-04-18 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 0.6.10
+
2010-04-12 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 0.6.9

diff --git
a/gnome2-libs/gobject-introspection/gobject-introspection-0.6.10.tar.bz2.sig
b/gnome2-libs/gobject-introspection/gobject-introspection-0.6.10.tar.bz2.sig
new file mode 100644
index 0000000..ed9544f
Binary files /dev/null and
b/gnome2-libs/gobject-introspection/gobject-introspection-0.6.10.tar.bz2.sig
differ
diff --git
a/gnome2-libs/gobject-introspection/gobject-introspection-0.6.9.tar.bz2.sig
b/gnome2-libs/gobject-introspection/gobject-introspection-0.6.9.tar.bz2.sig
deleted file mode 100644
index 2518352..0000000
Binary files
a/gnome2-libs/gobject-introspection/gobject-introspection-0.6.9.tar.bz2.sig
and /dev/null differ
diff --git a/gnome2-libs/pygtksourceview/DETAILS
b/gnome2-libs/pygtksourceview/DETAILS
index 9eff707..1cbfe12 100755
--- a/gnome2-libs/pygtksourceview/DETAILS
+++ b/gnome2-libs/pygtksourceview/DETAILS
@@ -1,6 +1,6 @@
SPELL=pygtksourceview
- VERSION=2.10.0
-
SOURCE_HASH=sha512:581e9e5519422f9d6ca220d0a1a27494e6c51870a1448e6ab13c3b7f47773c31c5812189150913ea66d2c3eca5fb371cdf2ce6ab8fa0683ba01584b376867f0f
+ VERSION=2.10.1
+
SOURCE_HASH=sha512:6f8f35ba36cb26f256861ff7f14c3236cf566d6d02f3dea69f63844081caee969ad6288a2aa48d35d4eb542cda73da9d4bfe2cc57548ca15cd372011cab0276e
BRANCH=$(echo $VERSION | cut -d . -f 1,2)
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/gnome2-libs/pygtksourceview/HISTORY
b/gnome2-libs/pygtksourceview/HISTORY
index e3363a3..83188c3 100644
--- a/gnome2-libs/pygtksourceview/HISTORY
+++ b/gnome2-libs/pygtksourceview/HISTORY
@@ -1,3 +1,6 @@
+2010-04-18 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 2.10.1
+
2010-03-29 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 2.10.0

diff --git a/gnu/gcc33/BUILD b/gnu/gcc33/BUILD
index b436ef6..56ceab4 100755
--- a/gnu/gcc33/BUILD
+++ b/gnu/gcc33/BUILD
@@ -5,6 +5,7 @@ sedit 's:#!/bin/sh:#!/bin/bash:'
$SOURCE_DIRECTORY/configure &&
# same for pentium3m
# Doesn't know core2, replace with nocona, nor does it no -mssse3, remove it
# Doesn't know native -march nor -mtune (GCC 4.2+)
+# Doesn't know -msse4* nor -msse5
# See
http://gcc.gnu.org/onlinedocs/gcc-3.3.6/gcc/i386-and-x86_002d64-Options.html
CFLAGS=${CFLAGS/pentium4m/pentium4} &&
CXXFLAGS=${CXXFLAGS/pentium4m/pentium4} &&
@@ -14,10 +15,16 @@ CFLAGS=${CFLAGS/core2/nocona} &&
CXXFLAGS=${CFLAGS/core2/nocona} &&
CFLAGS=${CFLAGS/-mssse3/} &&
CXXFLAGS=${CXXFLAGS/-mssse3/} &&
-
-echo ARCHITECTURE = $ARCHITECTURE > /tmp/gcc33.opt &&
-echo CFLAGS = $CFLAGS >> /tmp/gcc33.opt &&
-echo CXXFLAGS = $CXXFLAGS >> /tmp/gcc33.opt &&
+CFLAGS=${CFLAGS/-msse4a/} &&
+CXXFLAGS=${CXXFLAGS/-msse4a/} &&
+CFLAGS=${CFLAGS/-msse4.1/} &&
+CXXFLAGS=${CXXFLAGS/-msse4.1/} &&
+CFLAGS=${CFLAGS/-msse4.2/} &&
+CXXFLAGS=${CXXFLAGS/-msse4.2/} &&
+CFLAGS=${CFLAGS/-msse4/} &&
+CXXFLAGS=${CXXFLAGS/-msse4/} &&
+CFLAGS=${CFLAGS/-msse5/} &&
+CXXFLAGS=${CXXFLAGS/-msse5/} &&

case $ARCHITECTURE in
native-x86_64-64)
@@ -30,9 +37,6 @@ case $ARCHITECTURE in
;;
esac &&

-echo CFLAGS = $CFLAGS >> /tmp/gcc33.opt &&
-echo CXXFLAGS = $CXXFLAGS >> /tmp/gcc33.opt &&
-
cd $SOURCE_DIRECTORY.bld &&
$SOURCE_DIRECTORY/configure \
--host=$HOST \
diff --git a/gnu/gcc33/HISTORY b/gnu/gcc33/HISTORY
index 5ca5dc3..3eb0764 100644
--- a/gnu/gcc33/HISTORY
+++ b/gnu/gcc33/HISTORY
@@ -1,3 +1,6 @@
+2010-04-20 Eric Sandall <sandalle AT sourcemage.org>
+ * BULD: Doesn't know -msse4* nor -msse5 (GCC 4.4+)
+
2010-04-06 Eric Sandall <sandalle AT sourcemage.org>
* BUILD: Doesn't know native -march nor -mtune (GCC 4.2+)

diff --git a/gnu/gcc34/BUILD b/gnu/gcc34/BUILD
index 176e80d..2e1d57b 100755
--- a/gnu/gcc34/BUILD
+++ b/gnu/gcc34/BUILD
@@ -1,10 +1,21 @@
# Doesn't know core2, replace with nocona, nor does it no -mssse3, remove it
# Doesn't know native -march nor -mtune (GCC 4.2+)
+# Doesn't know -msse4* nor -msse5
# See
http://gcc.gnu.org/onlinedocs/gcc-3.4.6/gcc/i386-and-x86_002d64-Options.html
CFLAGS=${CFLAGS/core2/nocona} &&
CXXFLAGS=${CFLAGS/core2/nocona} &&
CFLAGS=${CFLAGS/-mssse3/} &&
CXXFLAGS=${CXXFLAGS/-mssse3/} &&
+CFLAGS=${CFLAGS/-msse4a/} &&
+CXXFLAGS=${CXXFLAGS/-msse4a/} &&
+CFLAGS=${CFLAGS/-msse4.1/} &&
+CXXFLAGS=${CXXFLAGS/-msse4.1/} &&
+CFLAGS=${CFLAGS/-msse4.2/} &&
+CXXFLAGS=${CXXFLAGS/-msse4.2/} &&
+CFLAGS=${CFLAGS/-msse4/} &&
+CXXFLAGS=${CXXFLAGS/-msse4/} &&
+CFLAGS=${CFLAGS/-msse5/} &&
+CXXFLAGS=${CXXFLAGS/-msse5/} &&

case $ARCHITECTURE in
native-x86_64-64)
diff --git a/gnu/gcc34/HISTORY b/gnu/gcc34/HISTORY
index 6fc46a4..1a6a4b5 100644
--- a/gnu/gcc34/HISTORY
+++ b/gnu/gcc34/HISTORY
@@ -1,3 +1,6 @@
+2010-04-20 Eric Sandall <sandalle AT sourcemage.org>
+ * BUILD: Doesn't know -msse4* nor -msse5 (GCC 4.4+)
+
2010-04-06 Eric Sandall <sandalle AT sourcemage.org>
* BUILD: Doesn't know native -march nor -mtune (GCC 4.2+)

diff --git a/kde4-apps/kraft/CONFIGURE b/kde4-apps/kraft/CONFIGURE
new file mode 100755
index 0000000..47117a8
--- /dev/null
+++ b/kde4-apps/kraft/CONFIGURE
@@ -0,0 +1,2 @@
+source $SECTION_DIRECTORY/KDE_CONFIGURE
+config_query_list KRAFT_DB 'which database system to use?' SQLITE MYSQL
diff --git a/kde4-apps/kraft/DEPENDS b/kde4-apps/kraft/DEPENDS
new file mode 100755
index 0000000..677a242
--- /dev/null
+++ b/kde4-apps/kraft/DEPENDS
@@ -0,0 +1,4 @@
+source "$SECTION_DIRECTORY/KDE_DEPENDS" &&
+depends ctemplate &&
+sub_depends qt4 $KRAFT_DB &&
+depends kdepimlibs4
diff --git a/kde4-apps/kraft/DETAILS b/kde4-apps/kraft/DETAILS
new file mode 100755
index 0000000..b1a271c
--- /dev/null
+++ b/kde4-apps/kraft/DETAILS
@@ -0,0 +1,21 @@
+ SPELL=kraft
+ VERSION=0.40
+ SOURCE=$SPELL-$VERSION.tar.bz2
+
SOURCE_HASH=sha512:8b91136ebdf9ffbae6b4cb7942a7fd76767bd7394b9a7bfc69aea6060d318be70f22d605cb2e1b75a8a0c3adbe00d9da3e11b6587e607853fea2d92ddc88bde8
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+ WEB_SITE=http://volle-kraft-voraus.de
+
SOURCE_URL=http://sourceforge.net/projects/kraft/files/kraft/$VERSION/$SOURCE/download
+ LICENSE[0]=GPL
+ ENTERED=20100112
+ KEYWORDS='kde4 money'
+ SHORT='small business management'
+cat << EOF
+Kraft is a program suitable for all trades or crafts.
+It covers the practical issues of a small business and helps through ease of
use yet powerfull features to
+deal with most of the office jobs effectively.
+. Customer management
+. Easy creation of offers, invoices and acceptance of order documents.
+. Calculation of positions
+. Easy material management
+. Templates for texts and positions
+EOF
diff --git a/kde4-apps/kraft/HISTORY b/kde4-apps/kraft/HISTORY
new file mode 100644
index 0000000..a0477e7
--- /dev/null
+++ b/kde4-apps/kraft/HISTORY
@@ -0,0 +1,6 @@
+2010-04-20 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.40
+
+2010-01-12 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version master (git)
+ spell created
diff --git a/kde4/kdevelop4/DETAILS b/kde4/kdevelop4/DETAILS
index f65d8a0..1ba2dc9 100755
--- a/kde4/kdevelop4/DETAILS
+++ b/kde4/kdevelop4/DETAILS
@@ -1,7 +1,7 @@
SPELL=kdevelop4
SPELLX=${SPELL//4}
- VERSION=3.10.0
-
SOURCE_HASH=sha512:170f450d737c17a6f4e431be39e817a068125558b542699b8d2b4473d7bb9fb65ae1e341b15ea57744d4ef27dd61d29a8f0b2ffdd65169952a64c19a5a9866f4
+ VERSION=3.10.2
+
SOURCE_HASH=sha512:041d88a08e900c324df21bf31936d6fa01981b758677ece0c41862b24ecbd8eb10aad2bb861b5d9f8a3ae01a52ef6057b9407019ae6eca0fc5fe277d07f51a6f
SOURCE=$SPELLX-$VERSION.tar.bz2
SOURCE_URL[0]=$KDE_URL/unstable/$SPELLX/$VERSION/src/$SOURCE
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELLX-$VERSION"
diff --git a/kde4/kdevelop4/HISTORY b/kde4/kdevelop4/HISTORY
index 938c859..4b44321 100644
--- a/kde4/kdevelop4/HISTORY
+++ b/kde4/kdevelop4/HISTORY
@@ -1,3 +1,6 @@
+2010-04-18 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 3.10.2 (rc3)
+
2010-04-08 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 3.10.0

diff --git a/kde4/kdevplatform4/DETAILS b/kde4/kdevplatform4/DETAILS
index 669431a..b09d0de 100755
--- a/kde4/kdevplatform4/DETAILS
+++ b/kde4/kdevplatform4/DETAILS
@@ -1,8 +1,8 @@
SPELL=kdevplatform4
SPELLX=${SPELL//4}
- VERSION=0.10.0
- VX=3.10.0
-
SOURCE_HASH=sha512:c3dc6ebf605ab94718fdced4a5c9c3a82f8f75e08d37b8972f193895bbabf86cce2ba7fbad5122627961b8acf7d617d6d3b3057c9efee4b9a5be2c2cac1c36f5
+ VERSION=0.10.2
+ VX=3.10.2
+
SOURCE_HASH=sha512:69f532aa19a647dcc1a497e2fe3bf37b95bbec0ec64ed8aa2cb78d8b373ffc34b8b10bdafeccfe296da7192343a3ac7592226803294611ff626fdf3cb7b327e4
SOURCE=$SPELLX-$VERSION.tar.bz2
SOURCE_URL[0]=$KDE_URL/unstable/kdevelop/$VX/src/$SOURCE
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELLX-$VERSION"
diff --git a/kde4/kdevplatform4/HISTORY b/kde4/kdevplatform4/HISTORY
index af10c37..09ed4fc 100644
--- a/kde4/kdevplatform4/HISTORY
+++ b/kde4/kdevplatform4/HISTORY
@@ -1,3 +1,6 @@
+2010-04-18 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: 0.10.2 (rc3)
+
2010-04-08 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: 0.10.0

diff --git a/libs/libanculus-sharp/BUILD b/libs/libanculus-sharp/BUILD
new file mode 100755
index 0000000..11600d9
--- /dev/null
+++ b/libs/libanculus-sharp/BUILD
@@ -0,0 +1,3 @@
+cd "${SOURCE_DIRECTORY}" &&
+sh autogen.sh --prefix="${INSTALL_ROOT}/usr" ${OPTS} &&
+make
diff --git a/libs/libanculus-sharp/DEPENDS b/libs/libanculus-sharp/DEPENDS
new file mode 100755
index 0000000..ad8e5b5
--- /dev/null
+++ b/libs/libanculus-sharp/DEPENDS
@@ -0,0 +1,2 @@
+depends webkit-sharp &&
+optional_depends gtk-sharp-2 '' '--disable-gtk' 'Enable GTK# support?'
diff --git a/libs/libanculus-sharp/DETAILS b/libs/libanculus-sharp/DETAILS
new file mode 100755
index 0000000..bcad06a
--- /dev/null
+++ b/libs/libanculus-sharp/DETAILS
@@ -0,0 +1,27 @@
+ SPELL=libanculus-sharp
+ VERSION=0.3.1
+ SOURCE="${SPELL}-${VERSION}.tar.bz2"
+ SOURCE_URL[0]="http://libanculus-sharp.googlecode.com/files/${SOURCE}";
+
SOURCE_HASH=sha512:ad3bc2604f7a1d43560cc3e9c0868f4ac542cf0405618117baca9d805425766e4b03e7aca6fc29bd9afdb51f77f70ce9e943b375be7fe6ffdc45589cc68e6cb0
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
+ WEB_SITE="http://code.google.com/p/libanculus-sharp";
+ LICENSE[0]=MIT
+ ENTERED=20100420
+ SHORT="Reusable utility library for Mono"
+cat << EOF
+"Anculus" means servant in Latin, and that is exactly what the library does.
+It serves and helps you to easily and quickly write new applications.
+libanculus-sharp contains all the building blocks that you need to develop
+a good C# application.
+
+Features:
+
+* XML Configuration files (primitive types, strings, serializable objects,
+ lists, arrays, ...)
+* Sorting algorithms (quicksort)
+* String Search algorithms (Boyer-Moore, Aho-Corasick)
+* Translation support (Managed Gettext)
+* Logging (Console, Colored Console, File)
+* Thread dispatching (Gtk-sharp, System.Windows.Forms, Background thread)
+* Collections (sorted list)
+EOF
diff --git a/libs/libanculus-sharp/HISTORY b/libs/libanculus-sharp/HISTORY
new file mode 100644
index 0000000..1c999ca
--- /dev/null
+++ b/libs/libanculus-sharp/HISTORY
@@ -0,0 +1,3 @@
+2010-04-20 Arjan Bouter <abouter AT sourcemage.org>
+ * BUILD, DETAILS, DEPENDS, SUB_DEPENDS, PRE_SUB_DEPENDS:
+ created spell, version 0.3.1
diff --git a/libs/libanculus-sharp/PRE_SUB_DEPENDS
b/libs/libanculus-sharp/PRE_SUB_DEPENDS
new file mode 100755
index 0000000..d446310
--- /dev/null
+++ b/libs/libanculus-sharp/PRE_SUB_DEPENDS
@@ -0,0 +1,5 @@
+case $THIS_SUB_DEPENDS in
+ GTK) is_depends_enabled $SPELL gtk-sharp-2 ;;
+ *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}"
+ return 1;;
+esac
diff --git a/libs/libanculus-sharp/SUB_DEPENDS
b/libs/libanculus-sharp/SUB_DEPENDS
new file mode 100755
index 0000000..6d7c8ea
--- /dev/null
+++ b/libs/libanculus-sharp/SUB_DEPENDS
@@ -0,0 +1,6 @@
+case $THIS_SUB_DEPENDS in
+ GTK) message "GTK# support requested, forcing gtk-sharp-2 dependency" &&
+ depends gtk-sharp-2 ;;
+ *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}"
+ return 1;;
+esac
diff --git a/libs/libtasn1/DETAILS b/libs/libtasn1/DETAILS
index 0b20aa8..d8a61ac 100755
--- a/libs/libtasn1/DETAILS
+++ b/libs/libtasn1/DETAILS
@@ -1,5 +1,5 @@
SPELL=libtasn1
- VERSION=2.5
+ VERSION=2.6
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SOURCE.sig
SOURCE2_IGNORE=signature
diff --git a/libs/libtasn1/HISTORY b/libs/libtasn1/HISTORY
index cabe74d..6b75bca 100644
--- a/libs/libtasn1/HISTORY
+++ b/libs/libtasn1/HISTORY
@@ -1,3 +1,6 @@
+2010-04-21 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 2.6
+
2010-03-16 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 2.5

diff --git a/mail/qmail/CONFIGURE b/mail/qmail/CONFIGURE
index 4aad3da..d02d9ea 100755
--- a/mail/qmail/CONFIGURE
+++ b/mail/qmail/CONFIGURE
@@ -1,3 +1,4 @@
config_query QMAIL_PATCH_QMAILQUEUE "Apply the qmailqueue patch?" n &&
config_query QMAIL_PATCH_LOCALBIND "Apply the local-bind patch?" n &&
-config_query QMAIL_PATCH_OVERSIZEDNS "Apply the oversize DNS patch?" n
+config_query QMAIL_PATCH_OVERSIZEDNS "Apply the oversize DNS patch?" n &&
+config_query QMAIL_PATCH_TLS "Apply the TLS patch?" n
diff --git a/mail/qmail/HISTORY b/mail/qmail/HISTORY
index a4242a3..b05ddd1 100644
--- a/mail/qmail/HISTORY
+++ b/mail/qmail/HISTORY
@@ -1,3 +1,6 @@
+2010-04-20 Dave Josephsen <dave AT sourcemage.org>
+ * CONFIGURE, PRE_BUILD, patches/qmail-tls-patch: Add TLS patch
+
2008-07-26 Elisamuel Resto <ryuji AT sourcemage.org>
* DETAILS: removed REJECT; LICENSE is now PublicDomain

diff --git a/mail/qmail/PRE_BUILD b/mail/qmail/PRE_BUILD
index bac5961..55163ea 100755
--- a/mail/qmail/PRE_BUILD
+++ b/mail/qmail/PRE_BUILD
@@ -10,6 +10,9 @@ fi &&
if [ "$QMAIL_PATCH_OVERSIZEDNS" == "y" ]; then
patch -p1 <$SCRIPT_DIRECTORY/patches/qmail-dns-patch
fi &&
+if [ "$QMAIL_PATCH_TLS" == "y" ]; then
+ patch -p1 <$SCRIPT_DIRECTORY/patches/qmail-tls-patch
+fi &&

if ! is_depends_enabled $SPELL groff; then
sed -i -e '/auto_qmail,"man\//d' hier.c &&
diff --git a/mail/qmail/patches/qmail-tls-patch
b/mail/qmail/patches/qmail-tls-patch
new file mode 100644
index 0000000..a832814
--- /dev/null
+++ b/mail/qmail/patches/qmail-tls-patch
@@ -0,0 +1,1361 @@
+Frederik Vermeulen <qmail-tls akrul inoa.net> 20021228-renato
+http://inoa.net/qmail/qmail-1.03-tls.patch
+
+This patch implements RFC2487 in qmail. This means you can
+get SSL or TLS encrypted and authenticated SMTP between
+the MTAs and from MUA to MTA.
+The code is considered experimental (but has worked for
+many since its first release on 1999-03-21).
+
+Usage: - install OpenSSL-0.9.6g http://www.openssl.org/
+ (any 0.9.6 version is presumed to work)
+ - apply patch to qmail-1.03 http://www.qmail.org/
+ The patches to qmail-remote.c
+ and qmail-smtpd.c can be applied separately.
+ - provide a server certificate in /var/qmail/control/servercert.pem.
+ "make cert" makes a self-signed certificate.
+ "make cert-req" makes a certificate request.
+ Note: you can add the CA certificate and intermediate
+ certs to the end of servercert.pem.
+ - replace qmail-smtpd and/or qmail-remote binary
+ - verify operation (header information should show
+ something like
+ "Received [..] with DES-CBC3-SHA encrypted SMTP;")
+ If you don't have a server to test with, you can test
+ by sending mail to tag-ping AT tbs-internet.com,
+ which will bounce your mail.
+
+Optional: - when DEBUG is defined, some extra TLS info will be logged
+ - qmail-remote will authenticate with the certificate in
+ /var/qmail/control/clientcert.pem. By preference this is
+ the same as servercert.pem, where nsCertType should be
+ == server,client or be a generic certificate (no usage
specified).
+ - when a 512 RSA key is provided in /var/qmail/control/rsa512.pem,
+ this key will be used instead of on-the-fly generation by
+ qmail-smtpd. Periodical replacement can be done by
crontab:
+ 01 01 * * * umask 0077; /usr/local/ssl/bin/openssl
genrsa \
+ -out /var/qmail/control/rsa512.new 512 > /dev/null 2>&1
&&\
+ chown qmaild.qmail /var/qmail/control/rsa512.new &&
/bin/mv -f \
+ /var/qmail/control/rsa512.new
/var/qmail/control/rsa512.pem
+ - server authentication:
+ qmail-remote requires authentication from servers for which
+ /var/qmail/control/tlshosts/host.dom.ain.pem exists.
+ The .pem file contains the validating CA certificates
+ (or self-signed server certificate).
+ CommonName has to match.
+ WARNING: this option may cause mail to be delayed, bounced,
+ doublebounced, and lost.
+ - client authentication:
+ when relay rules would reject an incoming mail,
+ qmail-smtpd can allow the mail based on a presented cert.
+ Certs are verified against a CA list in
+ /var/qmail/control/clientca.pem (eg. http://www.modssl.org/
+ source/cvs/exp/mod_ssl/pkg.mod_ssl/pkg.sslcfg/ca-bundle.crt)
+ and the cert email-address has to match a line in
+ /var/qmail/control/tlsclients. This email-address is logged
+ in the headers.
+ - cipher selection:
+ qmail-remote:
+ openssl cipher string (`man ciphers`) read from
+ /var/qmail/control/tlsclientciphers
+ qmail-smtpd:
+ openssl cipher string read from TLSCIPHERS environment variable
+ (can vary based on client IP address e.g.)
+ or if that is not available /var/qmail/control/tlsserverciphers
+ - smtps (deprecated SMTP over TLS via port 465):
+ qmail-remote: when connecting to port 465
+ qmail-smtpd: when SMTPS environment variable is not empty
+
+Caveats: - do a `make clean` after patching
+ - binaries dynamically linked with current openssl versions need
+ recompilation when the shared openssl libs are upgraded.
+ - this patch could conflict with other patches (notably those
+ replacing \n with \r\n, which is a bad idea on encrypted links).
+ - some broken servers have a problem with TLSv1 compatibility.
+ Uncomment the line where we set the SSL_OP_NO_TLSv1 option.
+ - needs working /dev/urandom (or EGD for openssl versions >0.9.7)
+ for seeding random number generator.
+ - packagers should make sure that installing without a valid
+ servercert is impossible
+ - when applied in combination with AUTH patch, AUTH patch
+ should be applied first and first part of this patch
+ will fail. This error can be ignored. Packagers should
+ cut the first 12 lines of this patch to make a happy
+ patch
+
+Copyright: GPL
+ Links with OpenSSL
+ Inspiration and code from examples in SSLeay (E. Young
+ <eay AT cryptsoft.com> and T. Hudson <tjh AT cryptsoft.com>),
+ stunnel (M. Trojnara <mtrojnar AT ddc.daewoo.com.pl>),
+ Postfix/TLS (L. Jaenicke <Lutz.Jaenicke AT aet.tu-cottbus.de>),
+ modssl (R. Engelschall <rse AT engelschall.com>),
+ openssl examples of E. Rescorla <ekr AT rtfm.com>.
+ Debug code, tlscipher selection, many feature suggestions,
+ French docs https://www.TBS-internet.com/ssl/qmail-tls.html
+ from Jean-Philippe Donnio <tag-ssl AT tbs-internet.com>.
+ Openssl usage consulting from B. M"oller <bmoeller AT acm.org>.
+ Bug report from A. Dustman <adustman AT comstar.net>.
+ Ssl_timeoutio functions (non-blocking io, timeouts), smtps,
+ auth, qmtp, mxps patch compatibility, man pages, code cleanup,
+ improved error reporting, RFC2595 server identity check
+ from A. Meltzer <albertikm (a) hotmail.com>.
+ Bug report from Niall Richard Murphy, Tim Helton.
+
+Bug reports: mailto:<qmail-tls AT inoa.net>
+
+
+>----< Cut the next 12 lines if applying over AUTH server patch >---<
+--- qmail-1.03-orig/qmail-smtpd.c Mon Jun 15 03:53:16 1998
++++ qmail-1.03/qmail-smtpd.c Tue Jun 18 09:49:38 2002
+@@ -229,7 +229,8 @@
+ }
+ void smtp_ehlo(arg) char *arg;
+ {
+- smtp_greet("250-"); out("\r\n250-PIPELINING\r\n250 8BITMIME\r\n");
++ smtp_greet("250-");
++ out("\r\n250-PIPELINING\r\n250 8BITMIME\r\n");
+ seenmail = 0; dohelo(arg);
+ }
+ void smtp_rset()
+>----< Cut previous 12 lines if applying over AUTH server patch >---<
+
+
+
+>----< The next 89 lines are the qmail-remote EHLO patch >---<
+--- qmail-1.03-orig/qmail-remote.c Mon Jun 15 03:53:16 1998
++++ qmail-1.03/qmail-remote.c Sun Nov 24 13:05:20 2002
+@@ -163,6 +163,59 @@ unsigned long smtpcode()
+ return code;
+ }
+
++#ifdef EHLO
++saa ehlokw = {0}; /* list of EHLO keywords and parameters */
++int maxehlokwlen = 0;
++
++unsigned long ehlo()
++{
++ stralloc *sa;
++ char *s, *e, *p;
++ unsigned long code;
++
++ if (ehlokw.len > maxehlokwlen) maxehlokwlen = ehlokw.len;
++ ehlokw.len = 0;
++
++# ifdef MXPS
++ if (type == 's') return 0;
++# endif
++
++ substdio_puts(&smtpto, "EHLO ");
++ substdio_put(&smtpto, helohost.s, helohost.len);
++ substdio_puts(&smtpto, "\r\n");
++ substdio_flush(&smtpto);
++
++ code = smtpcode();
++ if (code != 250) return code;
++
++ s = smtptext.s;
++ while (*s++ != '\n') ; /* skip the first line: contains the domain */
++
++ e = smtptext.s + smtptext.len - 6; /* 250-?\n */
++ while (s <= e)
++ {
++ if (!saa_readyplus(&ehlokw, 1)) temp_nomem();
++ sa = ehlokw.sa + ehlokw.len++;
++ if (ehlokw.len > maxehlokwlen) *sa = sauninit; else sa->len = 0;
++
++ /* smtptext is known to end in a '\n' */
++ for (p = (s += 4); ; ++p)
++ if (*p == '\n' || *p == ' ' || *p == '\t') {
++ if (!stralloc_catb(sa, s, p - s) || !stralloc_0(sa)) temp_nomem();
++ if (*p++ == '\n') break;
++ while (*p == ' ' || *p == '\t') ;
++ s = p;
++ }
++ s = p;
++ /* keyword should consist of alpha-num and '-'
++ * broken AUTH might use '=' instead of space */
++ for (p = sa->s; *p; ++p) if (*p == '=') { *p = 0; break; }
++ }
++
++ return 250;
++}
++#endif
++
+ void outsmtptext()
+ {
+ int i;
+@@ -224,12 +277,26 @@ void smtp()
+
+ if (smtpcode() != 220) quit("ZConnected to "," but greeting failed");
+
++#ifdef EHLO
++ code = ehlo();
++
++ if (code == 250) {
++ /* add EHLO response checks here */
++
++ /* and if EHLO failed, use HELO */
++ } else {
++#endif
++
+ substdio_puts(&smtpto,"HELO ");
+ substdio_put(&smtpto,helohost.s,helohost.len);
+ substdio_puts(&smtpto,"\r\n");
+ substdio_flush(&smtpto);
+ if (smtpcode() != 250) quit("ZConnected to "," but my name was rejected");
+
++#ifdef EHLO
++ }
++#endif
++
+ substdio_puts(&smtpto,"MAIL FROM:<");
+ substdio_put(&smtpto,sender.s,sender.len);
+ substdio_puts(&smtpto,">\r\n");
+>----< Previous 89 lines are the qmail-remote EHLO patch >---<
+
+
+
+--- qmail-1.03-orig/qmail-smtpd.c Mon Jun 15 03:53:16 1998
++++ qmail-1.03/qmail-smtpd.c Mon Jul 1 10:47:54 2002
+@@ -227,6 +227,7 @@ void smtp_helo(arg) char *arg;
+ smtp_greet("250 "); out("\r\n");
+ seenmail = 0; dohelo(arg);
+ }
++/* ESMTP extensions are published here */
+ void smtp_ehlo(arg) char *arg;
+ {
+ smtp_greet("250-");
+@@ -231,2 +232,5 @@ void smtp_ehlo(arg) char *arg;
+ {
+ smtp_greet("250-");
++#ifdef TLS
++ if (!ssl) out("\r\n250-STARTTLS");
++#endif
+--- qmail-1.03-orig-orig/qmail-smtpd.c Sat Dec 28 14:11:34 2002
++++ qmail-1.03/qmail-smtpd.c Sun Dec 8 18:27:20 2002
+@@ -28,9 +28,26 @@
+ unsigned int databytes = 0;
+ int timeout = 1200;
+
++const char *protocol = "SMTP";
++
++#ifdef TLS
++# include "tls.h"
++# include "ssl_timeoutio.h"
++
++void tls_init();
++int tls_verify();
++void tls_nogateway();
++int ssl_rfd = -1, ssl_wfd = -1; /* SSL_get_Xfd() are broken */
++#endif
++
+ int safewrite(fd,buf,len) int fd; char *buf; int len;
+ {
+ int r;
++#ifdef TLS
++ if (ssl && fd == ssl_wfd)
++ r = ssl_timeoutwrite(timeout, ssl_rfd, ssl_wfd, ssl, buf, len);
++ else
++#endif
+ r = timeoutwrite(timeout,fd,buf,len);
+ if (r <= 0) _exit(1);
+ return r;
+@@ -50,7 +67,16 @@ void die_ipme() { out("421 unable to fig
+ void straynewline() { out("451 See
http://pobox.com/~djb/docs/smtplf.html.\r\n";); flush(); _exit(1); }
+
+ void err_bmf() { out("553 sorry, your envelope sender is in my badmailfrom
list (#5.7.1)\r\n"); }
++#ifndef TLS
+ void err_nogateway() { out("553 sorry, that domain isn't in my list of
allowed rcpthosts (#5.7.1)\r\n"); }
++#else
++void err_nogateway()
++{
++ out("553 sorry, that domain isn't in my list of allowed rcpthosts");
++ tls_nogateway();
++ out(" (#5.7.1)\r\n");
++}
++#endif
+ void err_unimpl() { out("502 unimplemented (#5.5.1)\r\n"); }
+ void err_syntax() { out("555 syntax error (#5.5.4)\r\n"); }
+ void err_wantmail() { out("503 MAIL first (#5.5.1)\r\n"); }
+@@ -131,6 +157,11 @@ void setup()
+ if (!remotehost) remotehost = "unknown";
+ remoteinfo = env_get("TCPREMOTEINFO");
+ relayclient = env_get("RELAYCLIENT");
++
++#ifdef TLS
++ if (env_get("SMTPS")) { smtps = 1; tls_init(); }
++ else
++#endif
+ dohelo(remotehost);
+ }
+
+@@ -213,6 +244,9 @@ int addrallowed()
+ int r;
+ r = rcpthosts(addr.s,str_len(addr.s));
+ if (r == -1) die_control();
++#ifdef TLS
++ if (r == 0) if (tls_verify()) r = -2;
++#endif
+ return r;
+ }
+
+@@ -274,6 +308,11 @@ int saferead(fd,buf,len) int fd; char *b
+ {
+ int r;
+ flush();
++#ifdef TLS
++ if (ssl && fd == ssl_rfd)
++ r = ssl_timeoutread(timeout, ssl_rfd, ssl_wfd, ssl, buf, len);
++ else
++#endif
+ r = timeoutread(timeout,fd,buf,len);
+ if (r == -1) if (errno == error_timeout) die_alarm();
+ if (r <= 0) die_read();
+@@ -383,7 +422,7 @@ void smtp_data() {
+ qp = qmail_qp(&qqt);
+ out("354 go ahead\r\n");
+
+- received(&qqt,"SMTP",local,remoteip,remotehost,remoteinfo,fakehelo);
++ received(&qqt,protocol,local,remoteip,remotehost,remoteinfo,fakehelo);
+ blast(&hops);
+ hops = (hops >= MAXHOPS);
+ if (hops) qmail_fail(&qqt);
+@@ -399,6 +438,203 @@ void smtp_data() {
+ out("\r\n");
+ }
+
++#ifdef TLS
++stralloc proto = {0};
++int ssl_verified = 0;
++const char *ssl_verify_err = 0;
++
++void smtp_tls(char *arg)
++{
++ if (ssl) err_unimpl();
++ else if (*arg) out("501 Syntax error (no parameters allowed)
(#5.5.4)\r\n");
++ else tls_init();
++}
++
++RSA *tmp_rsa_cb(SSL *ssl, int export, int keylen)
++{
++ if (!export) keylen = 512;
++ if (keylen == 512) {
++ BIO *in = BIO_new_file("control/rsa512.pem", "r");
++ if (in) {
++ RSA *rsa = PEM_read_bio_RSAPrivateKey(in, NULL, NULL, NULL);
++ BIO_free(in);
++ if (rsa) return rsa;
++ }
++ }
++ return RSA_generate_key(keylen, RSA_F4, NULL, NULL);
++}
++
++/* don't want to fail handshake if cert isn't verifiable */
++int verify_cb(int preverify_ok, X509_STORE_CTX *ctx) { return 1; }
++
++void tls_nogateway()
++{
++ /* there may be cases when relayclient is set */
++ if (!ssl || relayclient) return;
++ out("; no valid cert for gatewaying");
++ if (ssl_verify_err) { out(": "); out(ssl_verify_err); }
++}
++void tls_out(const char *s1, const char *s2)
++{
++ out("454 TLS "); out(s1);
++ if (s2) { out(": "); out(s2); }
++ out(" (#4.3.0)\r\n"); flush();
++}
++void tls_err(const char *s) { tls_out(s, ssl_error()); if (smtps)
die_read(); }
++
++# define CLIENTCA "control/clientca.pem"
++# define SERVERCERT "control/servercert.pem"
++
++int tls_verify()
++{
++ stralloc clients = {0};
++ struct constmap mapclients;
++
++ if (!ssl || relayclient || ssl_verified) return 0;
++ ssl_verified = 1; /* don't do this twice */
++
++ /* request client cert to see if it can be verified by one of our CAs
++ * and the associated email address matches an entry in tlsclients */
++ switch (control_readfile(&clients, "control/tlsclients", 0))
++ {
++ case 1:
++ if (constmap_init(&mapclients, clients.s, clients.len, 0)) {
++ /* if CLIENTCA contains all the standart root certificates, a
++ * 0.9.6b client might fail with SSL_R_EXCESSIVE_MESSAGE_SIZE;
++ * it is probably due to 0.9.6b supporting only 8k key exchange
++ * data while the 0.9.6c release increases that limit to 100k */
++ STACK_OF(X509_NAME) *sk = SSL_load_client_CA_file(CLIENTCA);
++ if (sk) {
++ SSL_set_client_CA_list(ssl, sk);
++ SSL_set_verify(ssl, SSL_VERIFY_PEER | SSL_VERIFY_CLIENT_ONCE, NULL);
++ break;
++ }
++ constmap_free(&mapclients);
++ }
++ case 0: alloc_free(clients.s); return 0;
++ case -1: die_control();
++ }
++
++ if (ssl_timeoutrehandshake(timeout, ssl_rfd, ssl_wfd, ssl) <= 0) {
++ const char *err = ssl_strerror();
++ tls_out("rehandshake failed", err); die_read();
++ }
++
++ do { /* one iteration */
++ X509 *peercert;
++ X509_NAME *subj;
++ stralloc email = {0};
++
++ int n = SSL_get_verify_result(ssl);
++ if (n != X509_V_OK)
++ { ssl_verify_err = X509_verify_cert_error_string(n); break; }
++ peercert = SSL_get_peer_certificate(ssl);
++ if (!peercert) break;
++
++ subj = X509_get_subject_name(peercert);
++ n = X509_NAME_get_index_by_NID(subj, NID_pkcs9_emailAddress, -1);
++ if (n >= 0) {
++ const ASN1_STRING *s = X509_NAME_get_entry(subj, n)->value;
++ if (s) { email.len = s->length; email.s = s->data; }
++ }
++
++ if (email.len <= 0)
++ ssl_verify_err = "contains no email address";
++ else if (!constmap(&mapclients, email.s, email.len))
++ ssl_verify_err = "email address not in my list of tlsclients";
++ else {
++ /* add the cert email to the proto if it helped allow relaying */
++ --proto.len;
++ if (!stralloc_cats(&proto, "\n cert ") /* continuation line */
++ || !stralloc_catb(&proto, email.s, email.len)
++ || !stralloc_0(&proto)) die_nomem();
++ relayclient = "";
++ protocol = proto.s;
++ }
++
++ X509_free(peercert);
++ } while (0);
++ constmap_free(&mapclients); alloc_free(clients.s);
++
++ /* we are not going to need this anymore: free the memory */
++ SSL_set_client_CA_list(ssl, NULL);
++ SSL_set_verify(ssl, SSL_VERIFY_NONE, NULL);
++
++ return relayclient ? 1 : 0;
++}
++
++void tls_init()
++{
++ SSL *myssl;
++ SSL_CTX *ctx;
++ const char *ciphers;
++ stralloc saciphers = {0};
++
++ SSL_library_init();
++
++ /* a new SSL context with the bare minimum of options */
++ ctx = SSL_CTX_new(SSLv23_server_method());
++ if (!ctx) { tls_err("unable to initialize ctx"); return; }
++
++ if (!SSL_CTX_use_certificate_chain_file(ctx, SERVERCERT))
++ { SSL_CTX_free(ctx); tls_err("missing certificate"); return; }
++ SSL_CTX_load_verify_locations(ctx, CLIENTCA, NULL);
++ /* set the callback here; SSL_set_verify didn't work before 0.9.6c */
++ SSL_CTX_set_verify(ctx, SSL_VERIFY_NONE, verify_cb);
++
++ /* a new SSL object, with the rest added to it directly to avoid copying
*/
++ myssl = SSL_new(ctx);
++ SSL_CTX_free(ctx);
++ if (!myssl) { tls_err("unable to initialize ssl"); return; }
++
++ /* this will also check whether publc and private keys match */
++ if (!SSL_use_RSAPrivateKey_file(myssl, SERVERCERT, SSL_FILETYPE_PEM))
++ { SSL_free(myssl); tls_err("no valid RSA private key"); return; }
++
++ ciphers = env_get("TLSCIPHERS");
++ if (!ciphers) {
++ if (control_readfile(&saciphers, "control/tlsserverciphers") == -1)
++ { SSL_free(myssl); die_control(); }
++ if (saciphers.len) { /* convert all '\0's except the last one to ':' */
++ int i;
++ for (i = 0; i < saciphers.len - 1; ++i)
++ if (!saciphers.s[i]) saciphers.s[i] = ':';
++ ciphers = saciphers.s;
++ }
++ }
++ if (!ciphers || !*ciphers) ciphers = "DEFAULT";
++ SSL_set_cipher_list(myssl, ciphers);
++ alloc_free(saciphers.s);
++
++ SSL_set_tmp_rsa_callback(myssl, tmp_rsa_cb);
++ SSL_set_rfd(myssl, ssl_rfd = substdio_fileno(&ssin));
++ SSL_set_wfd(myssl, ssl_wfd = substdio_fileno(&ssout));
++
++ if (!smtps) { out("220 ready for tls\r\n"); flush(); }
++
++ if (ssl_timeoutaccept(timeout, ssl_rfd, ssl_wfd, myssl) <= 0) {
++ /* neither cleartext nor any other response here is part of a standard
*/
++ const char *err = ssl_strerror();
++ ssl_free(myssl); tls_out("connection failed", err); die_read();
++ }
++ ssl = myssl;
++
++ /* populate the protocol string, used in Received */
++ if (!stralloc_copys(&proto, SSL_get_cipher(ssl))
++ || !stralloc_cats(&proto, " encrypted SMTP")) die_nomem();
++ if (smtps) if (!stralloc_append(&proto, "S")) die_nomem();
++ if (!stralloc_0(&proto)) die_nomem();
++ protocol = proto.s;
++
++ /* have to discard the pre-STARTTLS HELO/EHLO argument, if any */
++ dohelo(remotehost);
++}
++
++# undef SERVERCERT
++# undef CLIENTCA
++
++#endif
++
+ struct commands smtpcommands[] = {
+ { "rcpt", smtp_rcpt, 0 }
+ , { "mail", smtp_mail, 0 }
+@@ -408,6 +644,9 @@ struct commands smtpcommands[] = {
+ , { "ehlo", smtp_ehlo, flush }
+ , { "rset", smtp_rset, 0 }
+ , { "help", smtp_help, flush }
++#ifdef TLS
++, { "starttls", smtp_tls, flush }
++#endif
+ , { "noop", err_noop, flush }
+ , { "vrfy", err_vrfy, flush }
+ , { 0, err_unimpl, flush }
+--- qmail-1.03-orig-orig/qmail-remote.c Sat Dec 28 14:11:34 2002
++++ qmail-1.03/qmail-remote.c Sun Dec 8 18:27:20 2002
+@@ -48,6 +48,17 @@ saa reciplist = {0};
+
+ struct ip_address partner;
+
++#ifdef TLS
++# include <sys/stat.h>
++# include "tls.h"
++# include "ssl_timeoutio.h"
++# include <openssl/x509v3.h>
++# define EHLO 1
++
++int tls_init();
++const char *ssl_err_str = 0;
++#endif
++
+ void out(s) char *s; { if (substdio_puts(subfdoutsmall,s) == -1) _exit(0); }
+ void zero() { if (substdio_put(subfdoutsmall,"\0",1) == -1) _exit(0); }
+ void zerodie() { zero(); substdio_flush(subfdoutsmall); _exit(0); }
+@@ -99,6 +110,9 @@ void dropped() {
+ outhost();
+ out(" but connection died. ");
+ if (flagcritical) out("Possible duplicate! ");
++#ifdef TLS
++ if (ssl_err_str) { out(ssl_err_str); out(" "); }
++#endif
+ out("(#4.4.2)\n");
+ zerodie();
+ }
+@@ -110,6 +124,12 @@ int timeout = 1200;
+ int saferead(fd,buf,len) int fd; char *buf; int len;
+ {
+ int r;
++#ifdef TLS
++ if (ssl) {
++ r = ssl_timeoutread(timeout, smtpfd, smtpfd, ssl, buf, len);
++ if (r < 0) ssl_err_str = ssl_strerror();
++ } else
++#endif
+ r = timeoutread(timeout,smtpfd,buf,len);
+ if (r <= 0) dropped();
+ return r;
+@@ -117,6 +137,12 @@ int saferead(fd,buf,len) int fd; char *b
+ int safewrite(fd,buf,len) int fd; char *buf; int len;
+ {
+ int r;
++#ifdef TLS
++ if (ssl) {
++ r = ssl_timeoutwrite(timeout, smtpfd, smtpfd, ssl, buf, len);
++ if (r < 0) ssl_err_str = ssl_strerror();
++ } else
++#endif
+ r = timeoutwrite(timeout,smtpfd,buf,len);
+ if (r <= 0) dropped();
+ return r;
+@@ -232,6 +258,11 @@ void quit(prepend,append)
+ char *prepend;
+ char *append;
+ {
++#ifdef TLS
++ /* shouldn't talk to the client unless in an appropriate state */
++ int state = ssl ? ssl->state : SSL_ST_BEFORE;
++ if (state & SSL_ST_OK || !smtps && state & SSL_ST_BEFORE)
++#endif
+ substdio_putsflush(&smtpto,"QUIT\r\n");
+ /* waiting for remote side is just too ridiculous */
+ out(prepend);
+@@ -239,6 +270,30 @@ char *append;
+ out(append);
+ out(".\n");
+ outsmtptext();
++
++#if defined(TLS) && defined(DEBUG)
++ if (ssl) {
++ X509 *peercert;
++
++ out("STARTTLS proto="); out(SSL_get_version(ssl));
++ out("; cipher="); out(SSL_get_cipher(ssl));
++
++ /* we want certificate details */
++ if (peercert = SSL_get_peer_certificate(ssl)) {
++ char *str;
++
++ str = X509_NAME_oneline(X509_get_subject_name(peercert), NULL, 0);
++ out("; subject="); out(str); OPENSSL_free(str);
++
++ str = X509_NAME_oneline(X509_get_issuer_name(peercert), NULL, 0);
++ out("; issuer="); out(str); OPENSSL_free(str);
++
++ X509_free(peercert);
++ }
++ out(";\n");
++ }
++#endif
++
+ zerodie();
+ }
+
+@@ -267,6 +322,182 @@ void blast()
+ substdio_flush(&smtpto);
+ }
+
++#ifdef TLS
++char *partner_fqdn = 0;
++
++# define TLS_QUIT quit(ssl ? "; connected to " : "; connecting to ", "")
++void tls_quit(const char *s1, const char *s2)
++{
++ out(s1); if (s2) { out(": "); out(s2); } TLS_QUIT;
++}
++# define tls_quit_error(s) tls_quit(s, ssl_error())
++
++int match_partner(const char *s, int len)
++{
++ if (!case_diffb(partner_fqdn, len, s) && !partner_fqdn[len]) return 1;
++ /* we also match if the name is *.domainname */
++ if (*s == '*') {
++ const char *domain = partner_fqdn + str_chr(partner_fqdn, '.');
++ if (!case_diffb(domain, --len, ++s) && !domain[len]) return 1;
++ }
++ return 0;
++}
++
++/* don't want to fail handshake if certificate can't be verified */
++int verify_cb(int preverify_ok, X509_STORE_CTX *ctx) { return 1; }
++
++int tls_init()
++{
++ int i;
++ SSL *myssl;
++ SSL_CTX *ctx;
++ stralloc saciphers = {0};
++ const char *ciphers, *servercert = 0;
++
++ if (partner_fqdn) {
++ struct stat st;
++ stralloc tmp = {0};
++ if (!stralloc_copys(&tmp, "control/tlshosts/")
++ || !stralloc_catb(&tmp, partner_fqdn, str_len(partner_fqdn))
++ || !stralloc_catb(&tmp, ".pem", 5)) temp_nomem();
++ if (stat(tmp.s, &st)) alloc_free(tmp.s); else servercert = tmp.s;
++ }
++
++ if (!smtps) {
++ stralloc *sa = ehlokw.sa;
++ unsigned int len = ehlokw.len;
++ /* look for STARTTLS among EHLO keywords */
++ for ( ; len && case_diffs(sa->s, "STARTTLS"); ++sa, --len) ;
++ if (!len) {
++ if (!servercert) return 0;
++ out("ZNo TLS achieved while "); out(servercert);
++ out(" exists"); smtptext.len = 0; TLS_QUIT;
++ }
++ }
++
++ SSL_library_init();
++ ctx = SSL_CTX_new(SSLv23_client_method());
++ if (!ctx) {
++ if (!smtps && !servercert) return 0;
++ smtptext.len = 0;
++ tls_quit_error("ZTLS error initializing ctx");
++ }
++
++ if (servercert) {
++ if (!SSL_CTX_load_verify_locations(ctx, servercert, NULL)) {
++ SSL_CTX_free(ctx);
++ smtptext.len = 0;
++ out("ZTLS unable to load "); tls_quit_error(servercert);
++ }
++ /* set the callback here; SSL_set_verify didn't work before 0.9.6c */
++ SSL_CTX_set_verify(ctx, SSL_VERIFY_PEER, verify_cb);
++ }
++
++ /* let the other side complain if it needs a cert and we don't have one */
++# define CLIENTCERT "control/clientcert.pem"
++ if (SSL_CTX_use_certificate_chain_file(ctx, CLIENTCERT))
++ SSL_CTX_use_RSAPrivateKey_file(ctx, CLIENTCERT, SSL_FILETYPE_PEM);
++# undef CLIENTCERT
++
++ myssl = SSL_new(ctx);
++ SSL_CTX_free(ctx);
++ if (!myssl) {
++ if (!smtps && !servercert) return 0;
++ smtptext.len = 0;
++ tls_quit_error("ZTLS error initializing ssl");
++ }
++
++ if (!smtps) substdio_putsflush(&smtpto, "STARTTLS\r\n");
++
++ /* while the server is preparing a responce, do something else */
++ if (control_readfile(&saciphers, "control/tlsclientciphers", 0) == -1)
++ { SSL_free(myssl); temp_control(); }
++ if (saciphers.len) {
++ for (i = 0; i < saciphers.len - 1; ++i)
++ if (!saciphers.s[i]) saciphers.s[i] = ':';
++ ciphers = saciphers.s;
++ }
++ else ciphers = "DEFAULT";
++ SSL_set_cipher_list(myssl, ciphers);
++ alloc_free(saciphers.s);
++
++ /* SSL_set_options(myssl, SSL_OP_NO_TLSv1); */
++ SSL_set_fd(myssl, smtpfd);
++
++ /* read the responce to STARTTLS */
++ if (!smtps) {
++ if (smtpcode() != 220) {
++ SSL_free(myssl);
++ if (!servercert) return 0;
++ out("ZSTARTTLS rejected while ");
++ out(servercert); out(" exists"); TLS_QUIT;
++ }
++ smtptext.len = 0;
++ }
++
++ ssl = myssl;
++ if (ssl_timeoutconn(timeout, smtpfd, smtpfd, ssl) <= 0)
++ tls_quit("ZTLS connect failed", ssl_strerror());
++
++ if (servercert) {
++ X509 *peercert;
++ STACK_OF(GENERAL_NAME) *gens;
++
++ int r = SSL_get_verify_result(ssl);
++ if (r != X509_V_OK) {
++ out("ZTLS unable to verify server with ");
++ tls_quit(servercert, X509_verify_cert_error_string(r));
++ }
++ alloc_free(servercert);
++
++ peercert = SSL_get_peer_certificate(ssl);
++ if (!peercert) {
++ out("ZTLS unable to verify server ");
++ tls_quit(partner_fqdn, "no certificate provided");
++ }
++
++ /* RFC 2595 section 2.4: find a matching name
++ * first find a match among alternative names */
++ gens = X509_get_ext_d2i(peercert, NID_subject_alt_name, 0, 0);
++ if (gens) {
++ for (i = 0, r = sk_GENERAL_NAME_num(gens); i < r; ++i)
++ {
++ const GENERAL_NAME *gn = sk_GENERAL_NAME_value(gens, i);
++ if (gn->type == GEN_DNS)
++ if (match_partner(gn->d.ia5->data, gn->d.ia5->length)) break;
++ }
++ sk_GENERAL_NAME_free(gens);
++ }
++
++ /* no alternative name matched, look up commonName */
++ if (!gens || i >= r) {
++ stralloc peer = {0};
++ X509_NAME *subj = X509_get_subject_name(peercert);
++ i = X509_NAME_get_index_by_NID(subj, NID_commonName, -1);
++ if (i >= 0) {
++ const ASN1_STRING *s = X509_NAME_get_entry(subj, i)->value;
++ if (s) { peer.len = s->length; peer.s = s->data; }
++ }
++ if (peer.len <= 0) {
++ out("ZTLS unable to verify server ");
++ tls_quit(partner_fqdn, "certificate contains no valid commonName");
++ }
++ if (!match_partner(peer.s, peer.len)) {
++ out("ZTLS unable to verify server "); out(partner_fqdn);
++ out(": received certificate for "); outsafe(&peer); TLS_QUIT;
++ }
++ }
++
++ X509_free(peercert);
++ }
++
++ if (smtps) if (smtpcode() != 220)
++ quit("ZTLS Connected to "," but greeting failed");
++
++ return 1;
++}
++#endif
++
+ stralloc recip = {0};
+
+ void smtp()
+@@ -274,12 +505,37 @@ void smtp()
+ unsigned long code;
+ int flagbother;
+ int i;
++
++#ifndef PORT_SMTP
++ /* the qmtpc patch uses smtp_port and undefines PORT_SMTP */
++# define port smtp_port
++#endif
++
++#ifdef TLS
++# ifdef MXPS
++ if (type == 'S') smtps = 1;
++ else if (type != 's')
++# endif
++ if (port == 465) smtps = 1;
++ if (!smtps)
++#endif
+
+ if (smtpcode() != 220) quit("ZConnected to "," but greeting failed");
+
+ #ifdef EHLO
++# ifdef TLS
++ if (!smtps)
++# endif
+ code = ehlo();
+
++# ifdef TLS
++ if (tls_init())
++ /* RFC2487 says we should issue EHLO (even if we might not need
++ * extensions); at the same time, it does not prohibit a server
++ * to reject the EHLO and make us fallback to HELO */
++ code = ehlo();
++# endif
++
+ if (code == 250) {
+ /* add EHLO response checks here */
+
+@@ -484,6 +740,9 @@ char **argv;
+ if (timeoutconn(smtpfd,&ip.ix[i].ip,(unsigned int) port,timeoutconnect)
== 0) {
+ tcpto_err(&ip.ix[i].ip,0);
+ partner = ip.ix[i].ip;
++#ifdef TLS
++ partner_fqdn = ip.ix[i].fqdn;
++#endif
+ smtp(); /* does not return */
+ }
+ tcpto_err(&ip.ix[i].ip,errno == error_timeout);
+--- qmail-1.03-orig/qmail-smtpd.8 Mon Jun 15 10:53:16 1998
++++ qmail-1.03/qmail-smtpd.8 Sun Dec 8 18:27:20 2002
+@@ -14,6 +14,15 @@ must be supplied several environment var
+ see
+ .BR tcp-environ(5) .
+
++If the environment variable
++.B SMTPS
++is non-empty,
++.B qmail-smtpd
++starts a TLS session (to support the deprecated SMTPS protocol,
++normally on port 465). Otherwise,
++.B qmail-smtpd
++offers the STARTTLS extension to ESMTP.
++
+ .B qmail-smtpd
+ is responsible for counting hops.
+ It rejects any message with 100 or more
+@@ -49,6 +58,12 @@ may be of the form
+ .BR @\fIhost ,
+ meaning every address at
+ .IR host .
++
++.TP 5
++.I clientca.pem
++A list of Certifying Authority (CA) certificates that are used to verify
++the client-presented certificates during a TLS-encrypted session.
++
+ .TP 5
+ .I databytes
+ Maximum number of bytes allowed in a message,
+@@ -151,6 +166,19 @@ may include wildcards:
+
+ Envelope recipient addresses without @ signs are
+ always allowed through.
++
++.TP 5
++.I rsa512.pem
++If this 512 RSA key is provided,
++.B qmail-smtpd
++will use it for TLS sessions instead of generaring one on-the-fly.
++
++.TP 5
++.I servercert.pem
++SSL certificate to be presented to clients in
++TLS-encrypted sessions. Certifying Authority
++(CA) and intermediate certificates can be added at the end of the file.
++
+ .TP 5
+ .I smtpgreeting
+ SMTP greeting message.
+@@ -169,6 +197,24 @@ Number of seconds
+ .B qmail-smtpd
+ will wait for each new buffer of data from the remote SMTP client.
+ Default: 1200.
++
++.TP 5
++.I tlsclients
++A list of email addresses. When relay rules would reject an incoming
message,
++.B qmail-smtpd
++can allow it if the client presents a certificate that can be verified
against
++the CA list in
++.I clientca.pem
++and the certificate email address is in
++.IR tlsclients .
++
++.TP 5
++.I tlsserverciphers
++A set of OpenSSL cipher strings. Multiple ciphers contained in a
++string should be separated by a colon. If the environment variable
++.B TLSCIPHERS
++is set to such a string, it takes precedence.
++
+ .SH "SEE ALSO"
+ tcp-env(1),
+ tcp-environ(5),
+--- qmail-1.03-orig/qmail-remote.8 Mon Jun 15 10:53:16 1998
++++ qmail-1.03/qmail-remote.8 Sun Dec 8 18:27:20 2002
+@@ -114,6 +114,10 @@ arguments.
+ always exits zero.
+ .SH "CONTROL FILES"
+ .TP 5
++.I clientcert.pem
++SSL certificate that is used to authenticate with the remote server
++during a TLS session.
++.TP 5
+ .I helohost
+ Current host name,
+ for use solely in saying hello to the remote SMTP server.
+@@ -156,6 +160,8 @@ may be empty;
+ this tells
+ .B qmail-remote
+ to look up MX records as usual.
++.I port
++value of 465 (deprecated smtps port) causes TLS session to be started.
+ .I smtproutes
+ may include wildcards:
+
+@@ -195,6 +201,26 @@ Number of seconds
+ .B qmail-remote
+ will wait for each response from the remote SMTP server.
+ Default: 1200.
++
++.TP 5
++.I tlsclientciphers
++A set of OpenSSL client cipher strings. Multiple ciphers
++contained in a string should be separated by a colon.
++
++.TP 5
++.I tlshosts/<FQDN>.pem
++.B qmail-remote
++requires authentication from servers for which this certificate exists
++.RB ( <FQDN>
++is the fully-qualified domain name of the server). One of the
++.I dNSName
++or the
++.I CommonName
++attributes have to match.
++
++.B WARNING:
++this option may cause mail to be delayed, bounced, doublebounced, or lost.
++
+ .SH "SEE ALSO"
+ addresses(5),
+ envelopes(5),
+--- qmail-1.03-orig/qmail-control.9 Mon Jun 15 10:53:16 1998
++++ qmail-1.03/qmail-control.9 Sun Dec 8 18:27:20 2002
+@@ -43,6 +43,8 @@ control default used by
+ .I badmailfrom \fR(none) \fRqmail-smtpd
+ .I bouncefrom \fRMAILER-DAEMON \fRqmail-send
+ .I bouncehost \fIme \fRqmail-send
++.I clientca.pem \fR(none) \fRqmail-smtpd
++.I clientcert.pem \fR(none) \fRqmail-remote
+ .I concurrencylocal \fR10 \fRqmail-send
+ .I concurrencyremote \fR20 \fRqmail-send
+ .I defaultdomain \fIme \fRqmail-inject
+@@ -61,11 +63,17 @@ control default used by
+ .I qmqpservers \fR(none) \fRqmail-qmqpc
+ .I queuelifetime \fR604800 \fRqmail-send
+ .I rcpthosts \fR(none) \fRqmail-smtpd
++.I rsa512.pem \fR(none) \fRqmail-smtpd
++.I servercert.pem \fR(none) \fRqmail-smtpd
+ .I smtpgreeting \fIme \fRqmail-smtpd
+ .I smtproutes \fR(none) \fRqmail-remote
+ .I timeoutconnect \fR60 \fRqmail-remote
+ .I timeoutremote \fR1200 \fRqmail-remote
+ .I timeoutsmtpd \fR1200 \fRqmail-smtpd
++.I tlsclients \fR(none) \fRqmail-smtpd
++.I tlsclientciphers \fR(none) \fRqmail-remote
++.I tlshosts/FQDN.pem \fR(none) \fRqmail-remote
++.I tlsserverciphers \fR(none) \fRqmail-smtpd
+ .I virtualdomains \fR(none) \fRqmail-send
+ .fi
+ .RE
+--- qmail-1.03-orig/dns.c Mon Jun 15 10:53:16 1998
++++ qmail-1.03/dns.c Sun Dec 8 18:27:20 2002
+@@ -269,12 +269,11 @@ stralloc *sa;
+ int pref;
+ {
+ int r;
+- struct ip_mx ix;
++ struct ip_mx ix = {0};
+
+ if (!stralloc_copy(&glue,sa)) return DNS_MEM;
+ if (!stralloc_0(&glue)) return DNS_MEM;
+ if (glue.s[0]) {
+- ix.pref = 0;
+ if (!glue.s[ip_scan(glue.s,&ix.ip)] ||
!glue.s[ip_scanbracket(glue.s,&ix.ip)])
+ {
+ if (!ipalloc_append(ia,&ix)) return DNS_MEM;
+@@ -293,9 +292,16 @@ int pref;
+ ix.ip = ip;
+ ix.pref = pref;
+ if (r == DNS_SOFT) return DNS_SOFT;
+- if (r == 1)
++ if (r == 1) {
++#ifdef IX_FQDN
++ ix.fqdn = glue.s;
++#endif
+ if (!ipalloc_append(ia,&ix)) return DNS_MEM;
+ }
++ }
++#ifdef IX_FQDN
++ glue.s = 0;
++#endif
+ return 0;
+ }
+
+@@ -315,7 +321,7 @@ unsigned long random;
+ {
+ int r;
+ struct mx { stralloc sa; unsigned short p; } *mx;
+- struct ip_mx ix;
++ struct ip_mx ix = {0};
+ int nummx;
+ int i;
+ int j;
+@@ -327,7 +333,6 @@ unsigned long random;
+ if (!stralloc_copy(&glue,sa)) return DNS_MEM;
+ if (!stralloc_0(&glue)) return DNS_MEM;
+ if (glue.s[0]) {
+- ix.pref = 0;
+ if (!glue.s[ip_scan(glue.s,&ix.ip)] ||
!glue.s[ip_scanbracket(glue.s,&ix.ip)])
+ {
+ if (!ipalloc_append(ia,&ix)) return DNS_MEM;
+--- qmail-1.03-orig/ipalloc.h Mon Jun 15 10:53:16 1998
++++ qmail-1.03/ipalloc.h Sun Dec 8 18:27:20 2002
+@@ -3,7 +3,15 @@
+
+ #include "ip.h"
+
++#ifdef TLS
++# define IX_FQDN 1
++#endif
++
++#ifdef IX_FQDN
++struct ip_mx { struct ip_address ip; int pref; char *fqdn; } ;
++#else
+ struct ip_mx { struct ip_address ip; int pref; } ;
++#endif
+
+ #include "gen_alloc.h"
+
+--- qmail-1.03-orig/tls.c Sat Dec 28 14:11:34 2002
++++ qmail-1.03/tls.c Sun Dec 8 18:27:20 2002
+@@ -0,0 +1,26 @@
++#include "exit.h"
++#include "error.h"
++#include <string.h>
++#include <openssl/ssl.h>
++#include <openssl/err.h>
++
++int smtps = 0;
++SSL *ssl = NULL;
++
++void ssl_free(SSL *myssl) { SSL_shutdown(myssl); SSL_free(myssl); }
++void ssl_exit(int status) { if (ssl) ssl_free(ssl); _exit(status); }
++
++const char *ssl_error()
++{
++ int r = ERR_get_error();
++ if (!r) return NULL;
++ SSL_load_error_strings();
++ return ERR_error_string(r, NULL);
++}
++const char *ssl_strerror()
++{
++ const char *err = ssl_error();
++ if (err) return err;
++ if (!errno) return 0;
++ return errno == error_timeout ? "timed out" : strerror(errno);
++}
+--- qmail-1.03-orig/tls.h Sat Dec 28 14:11:34 2002
++++ qmail-1.03/tls.h Sun Dec 8 18:27:20 2002
+@@ -0,0 +1,16 @@
++#ifndef TLS_H
++#define TLS_H
++
++#include <openssl/ssl.h>
++
++extern int smtps;
++extern SSL *ssl;
++
++void ssl_free(SSL *myssl);
++void ssl_exit(int status);
++# define _exit ssl_exit
++
++const char *ssl_error();
++const char *ssl_strerror();
++
++#endif
+--- qmail-1.03-orig/ssl_timeoutio.c Sat Dec 28 14:11:34 2002
++++ qmail-1.03/ssl_timeoutio.c Sun Dec 8 18:27:20 2002
+@@ -0,0 +1,94 @@
++#include "select.h"
++#include "error.h"
++#include "ndelay.h"
++#include "ssl_timeoutio.h"
++
++int ssl_timeoutio(int (*fun)(),
++ long t, int rfd, int wfd, SSL *ssl, char *buf, int len)
++{
++ int n;
++ const long end = t + time(NULL);
++
++ do {
++ fd_set fds;
++ struct timeval tv;
++
++ const int r = buf ? fun(ssl, buf, len) : fun(ssl);
++ if (r > 0) return r;
++
++ t = end - time(NULL);
++ if (t < 0) break;
++ tv.tv_sec = t; tv.tv_usec = 0;
++
++ FD_ZERO(&fds);
++ switch (SSL_get_error(ssl, r))
++ {
++ default: return r; /* some other error */
++ case SSL_ERROR_WANT_READ:
++ FD_SET(rfd, &fds); n = select(rfd + 1, &fds, NULL, NULL, &tv);
++ break;
++ case SSL_ERROR_WANT_WRITE:
++ FD_SET(wfd, &fds); n = select(wfd + 1, NULL, &fds, NULL, &tv);
++ break;
++ }
++
++ /* n is the number of descriptors that changed status */
++ } while (n > 0);
++
++ if (n != -1) errno = error_timeout;
++ return -1;
++}
++
++int ssl_timeoutaccept(long t, int rfd, int wfd, SSL *ssl)
++{
++ int r;
++
++ /* if connection is established, keep NDELAY */
++ if (ndelay_on(rfd) == -1 || ndelay_on(wfd) == -1) return -1;
++ r = ssl_timeoutio(SSL_accept, t, rfd, wfd, ssl, NULL, 0);
++
++ if (r <= 0) { ndelay_off(rfd); ndelay_off(wfd); }
++ else SSL_set_mode(ssl, SSL_MODE_ENABLE_PARTIAL_WRITE);
++
++ return r;
++}
++
++int ssl_timeoutconn(long t, int rfd, int wfd, SSL *ssl)
++{
++ int r;
++
++ /* if connection is established, keep NDELAY */
++ if (ndelay_on(rfd) == -1 || ndelay_on(wfd) == -1) return -1;
++ r = ssl_timeoutio(SSL_connect, t, rfd, wfd, ssl, NULL, 0);
++
++ if (r <= 0) { ndelay_off(rfd); ndelay_off(wfd); }
++ else SSL_set_mode(ssl, SSL_MODE_ENABLE_PARTIAL_WRITE);
++
++ return r;
++}
++
++int ssl_timeoutrehandshake(long t, int rfd, int wfd, SSL *ssl)
++{
++ int r;
++
++ SSL_renegotiate(ssl);
++ r = ssl_timeoutio(SSL_do_handshake, t, rfd, wfd, ssl, NULL, 0);
++ if (r <= 0 || ssl->type == SSL_ST_CONNECT) return r;
++
++ /* this is for the server only */
++ ssl->state = SSL_ST_ACCEPT;
++ return ssl_timeoutio(SSL_do_handshake, t, rfd, wfd, ssl, NULL, 0);
++}
++
++int ssl_timeoutread(long t, int rfd, int wfd, SSL *ssl, char *buf, int len)
++{
++ if (!buf) return 0;
++ if (SSL_pending(ssl)) return SSL_read(ssl, buf, len);
++ return ssl_timeoutio(SSL_read, t, rfd, wfd, ssl, buf, len);
++}
++
++int ssl_timeoutwrite(long t, int rfd, int wfd, SSL *ssl, char *buf, int len)
++{
++ if (!buf) return 0;
++ return ssl_timeoutio(SSL_write, t, rfd, wfd, ssl, buf, len);
++}
+--- qmail-1.03-orig/ssl_timeoutio.h Sat Dec 28 14:11:34 2002
++++ qmail-1.03/ssl_timeoutio.h Sun Dec 8 18:27:20 2002
+@@ -0,0 +1,21 @@
++#ifndef SSL_TIMEOUTIO_H
++#define SSL_TIMEOUTIO_H
++
++#include <openssl/ssl.h>
++
++/* the version is like this: 0xMNNFFPPS: major minor fix patch status */
++#if OPENSSL_VERSION_NUMBER < 0x00906000L
++# error "Need OpenSSL version at least 0.9.6"
++#endif
++
++int ssl_timeoutconn(long t, int rfd, int wfd, SSL *ssl);
++int ssl_timeoutaccept(long t, int rfd, int wfd, SSL *ssl);
++int ssl_timeoutrehandshake(long t, int rfd, int wfd, SSL *ssl);
++
++int ssl_timeoutread(long t, int rfd, int wfd, SSL *ssl, char *buf, int len);
++int ssl_timeoutwrite(long t, int rfd, int wfd, SSL *ssl, char *buf, int
len);
++
++int ssl_timeoutio(
++ int (*fun)(), long t, int rfd, int wfd, SSL *ssl, char *buf, int len);
++
++#endif
+--- qmail-1.03-orig/TARGETS Mon Jun 15 10:53:16 1998
++++ qmail-1.03/TARGETS Sun Dec 8 18:27:20 2002
+@@ -168,6 +168,8 @@ control.o
+ constmap.o
+ timeoutread.o
+ timeoutwrite.o
++tls.o
++ssl_timeoutio.o
+ timeoutconn.o
+ tcpto.o
+ dns.o
+@@ -320,6 +322,7 @@ binm2
+ binm2+df
+ binm3
+ binm3+df
++Makefile-cert
+ it
+ qmail-local.0
+ qmail-lspawn.0
+--- qmail-1.03-orig/Makefile-cert.mk Sat Dec 28 14:11:34 2002
++++ qmail-1.03/Makefile-cert.mk Sat Aug 17 18:30:01 2002
+@@ -0,0 +1,21 @@
++cert-req: req.pem
++cert cert-req: QMAIL/control/clientcert.pem
++ @:
++
++QMAIL/control/clientcert.pem: QMAIL/control/servercert.pem
++ ln -s $< $@
++
++QMAIL/control/servercert.pem:
++ PATH=$$PATH:/usr/local/ssl/bin \
++ openssl req -new -x509 -nodes -days 366 -out $@ -keyout $@
++ chmod 640 $@
++ chown qmaild.qmail $@
++
++req.pem:
++ PATH=$$PATH:/usr/local/ssl/bin openssl req \
++ -new -nodes -out $@ -keyout QMAIL/control/servercert.pem
++ chmod 640 QMAIL/control/servercert.pem
++ chown qmaild.qmail QMAIL/control/servercert.pem
++ @echo
++ @echo "Send req.pem to your CA to obtain signed_req.pem, and do:"
++ @echo "cat signed_req.pem >> QMAIL/control/servercert.pem"
+--- qmail-1.03-orig/conf-cc Mon Jun 15 10:53:16 1998
++++ qmail-1.03/conf-cc Sat Dec 28 13:59:33 2002
+@@ -1,3 +1,3 @@
+-cc -O2
++cc -O2 -DTLS=20021228 -I/usr/local/ssl/include
+
+ This will be used to compile .c files.
+--- qmail-1.03-orig/Makefile Mon Jun 15 10:53:16 1998
++++ qmail-1.03/Makefile Sun Dec 8 18:27:20 2002
+@@ -1444,6 +1444,7 @@ ndelay.a case.a sig.a open.a lock.a seek
+ substdio.a error.a str.a fs.a auto_qmail.o dns.lib socket.lib
+ ./load qmail-remote control.o constmap.o timeoutread.o \
+ timeoutwrite.o timeoutconn.o tcpto.o now.o dns.o ip.o \
++ tls.o ssl_timeoutio.o -L/usr/local/ssl/lib -lssl -lcrypto \
+ ipalloc.o ipme.o quote.o ndelay.a case.a sig.a open.a \
+ lock.a seek.a getln.a stralloc.a alloc.a substdio.a error.a \
+ str.a fs.a auto_qmail.o `cat dns.lib` `cat socket.lib`
+@@ -1539,6 +1540,7 @@ open.a sig.a case.a env.a stralloc.a all
+ fs.a auto_qmail.o socket.lib
+ ./load qmail-smtpd rcpthosts.o commands.o timeoutread.o \
+ timeoutwrite.o ip.o ipme.o ipalloc.o control.o constmap.o \
++ tls.o ssl_timeoutio.o ndelay.a -L/usr/local/ssl/lib -lssl -lcrypto \
+ received.o date822fmt.o now.o qmail.o cdb.a fd.a wait.a \
+ datetime.a getln.a open.a sig.a case.a env.a stralloc.a \
+ alloc.a substdio.a error.a str.a fs.a auto_qmail.o `cat \
+@@ -2108,6 +2110,19 @@ timeoutwrite.o: \
+ compile timeoutwrite.c timeoutwrite.h select.h error.h readwrite.h
+ ./compile timeoutwrite.c
+
++qmail-smtpd: tls.o ssl_timeoutio.o ndelay.a
++qmail-remote: tls.o ssl_timeoutio.o
++qmail-smtpd.o: tls.h ssl_timeoutio.h
++qmail-remote.o: tls.h ssl_timeoutio.h
++
++tls.o: \
++compile tls.c exit.h error.h
++ ./compile tls.c
++
++ssl_timeoutio.o: \
++compile ssl_timeoutio.c ssl_timeoutio.h select.h error.h ndelay.h
++ ./compile ssl_timeoutio.c
++
+ token822.o: \
+ compile token822.c stralloc.h gen_alloc.h alloc.h str.h token822.h \
+ gen_alloc.h gen_allocdefs.h
+@@ -2139,3 +2154,13 @@ compile wait_nohang.c haswaitp.h
+ wait_pid.o: \
+ compile wait_pid.c error.h haswaitp.h
+ ./compile wait_pid.c
++
++cert cert-req: \
++Makefile-cert
++ @$(MAKE) -sf $< $@
++
++Makefile-cert: \
++conf-qmail Makefile-cert.mk
++ @cat Makefile-cert.mk \
++ | sed s}QMAIL}"`head -1 conf-qmail`"}g \
++ > $@
diff --git a/perl-cpan/xml-twig/DETAILS b/perl-cpan/xml-twig/DETAILS
index 7e4e561..a9bdf61 100755
--- a/perl-cpan/xml-twig/DETAILS
+++ b/perl-cpan/xml-twig/DETAILS
@@ -1,6 +1,6 @@
SPELL=xml-twig
- VERSION=3.32
-
SOURCE_HASH=sha512:877360d6f0ef8c5c9af908775e583f1ef830be657e7ce7e37f0e01bf1e84ad22188c107f565f6d7fd8c96608f6d19efe7e912acc3d360976333c42b9afb34a14
+ VERSION=3.34
+
SOURCE_HASH=sha512:f70fa749fc293574dbb736164b78be109cdfb1a4508f555480ad326aaacecd055efa3faef2d267a9d204df3dd30249b1050f6138f67461371c2db2c97b670c3d
SOURCE=XML-Twig-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/XML-Twig-$VERSION
WEB_SITE=http://xmltwig.com/xmltwig/
diff --git a/perl-cpan/xml-twig/HISTORY b/perl-cpan/xml-twig/HISTORY
index 9a9a946..cf01302 100644
--- a/perl-cpan/xml-twig/HISTORY
+++ b/perl-cpan/xml-twig/HISTORY
@@ -1,3 +1,6 @@
+2010-04-19 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 3.34
+
2008-01-07 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS, DEPENDS, BUILD: cleaned up

diff --git a/python-pypi/papyon/DEPENDS b/python-pypi/papyon/DEPENDS
new file mode 100755
index 0000000..3fbf183
--- /dev/null
+++ b/python-pypi/papyon/DEPENDS
@@ -0,0 +1,3 @@
+depends pyopenssl &&
+depends pygobject &&
+depends pycrypto
diff --git a/python-pypi/papyon/DETAILS b/python-pypi/papyon/DETAILS
new file mode 100755
index 0000000..74f63f8
--- /dev/null
+++ b/python-pypi/papyon/DETAILS
@@ -0,0 +1,16 @@
+ SPELL=papyon
+ VERSION=0.4.6
+ SOURCE="${SPELL}-${VERSION}.tar.gz"
+ SOURCE_URL[0]=http://telepathy.freedesktop.org/releases/${SPELL}/${SOURCE}
+
SOURCE_HASH=sha512:f47a653f4c24285381f862812f545e40be4355a126a07ae6b201ead3e1afcd021de9e439f88c45a84d03993225b08ad7049ef3d432c025c1554b1b92742df4a9
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
+ WEB_SITE="http://telepathy.freedesktop.org/wiki/Papyon";
+ LICENSE[0]=GPL
+ ENTERED=20100419
+ SHORT="a fork of the unmaintained pymsn library"
+cat << EOF
+papyon is the library behind the msn connection manager :
telepathy-butterfly.
+It is a fork of the unmaintained pymsn msn library.
+papyon uses the glib mainloop to process the network events in an
asynchronous
+manner.
+EOF
diff --git a/python-pypi/papyon/HISTORY b/python-pypi/papyon/HISTORY
new file mode 100644
index 0000000..8fce625
--- /dev/null
+++ b/python-pypi/papyon/HISTORY
@@ -0,0 +1,3 @@
+2010-04-19 Arjan Bouter <abouter AT sourcemage.org>
+ * DEPENDS, DETAILS: spell created
+
diff --git a/python-pypi/pytz/DETAILS b/python-pypi/pytz/DETAILS
index c71ac18..796c02b 100755
--- a/python-pypi/pytz/DETAILS
+++ b/python-pypi/pytz/DETAILS
@@ -1,8 +1,8 @@
SPELL=pytz
- VERSION=2010e
+ VERSION=2010h
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_URL[0]=http://pypi.python.org/packages/source/p/$SPELL/$SOURCE
-
SOURCE_HASH=sha512:d251cd30989c7aa0dc677dc16a5471e83f1fa03a4979e0cabff888be22205e56e8b7b2e71c0bb9627f2c3a8df029e04db883cc08bf9bc1bf387217fb244c835a
+
SOURCE_HASH=sha512:4222ebb9fafbc0b059bac54b55a3e2ecc4d1f286cc0d0457a42b5759dea6f6c09c9b43bb2cd9a7e70f090ad33c2ff1e08fd2f6358904bc1b7a601f85cb45a737
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
WEB_SITE=http://pytz.sourceforge.net/
LICENSE[0]=BSD
diff --git a/python-pypi/pytz/HISTORY b/python-pypi/pytz/HISTORY
index f41b06c..4c58c81 100644
--- a/python-pypi/pytz/HISTORY
+++ b/python-pypi/pytz/HISTORY
@@ -1,3 +1,6 @@
+2010-04-19 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 2010h
+
2010-03-09 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 2010e

diff --git a/science/gnofract4d/DETAILS b/science/gnofract4d/DETAILS
index 4ca0032..48918c1 100755
--- a/science/gnofract4d/DETAILS
+++ b/science/gnofract4d/DETAILS
@@ -1,8 +1,8 @@
SPELL=gnofract4d
- VERSION=3.12
+ VERSION=3.13
SOURCE=gnofract4d-${VERSION}.tar.gz
SOURCE_URL[0]=${SOURCEFORGE_URL}/${SPELL}/${SOURCE}
-
SOURCE_HASH=sha512:963e01823eaf932b500d8afb0d4d711f1528a25b7af229eeea0e9882a6baa8c9c9f9b9fbdc3e8ec6a337ddbe0d1a2d92f661e7dc30134841ee44a868948d6461
+
SOURCE_HASH=sha512:866c01be0ca04603d3ea9632d6172893a6b4d843b8720955f1ba1bf843e8034278dc9c4f00ef9bde9c9ae611a5815aafa6c999c84252b9c7b6afa9c4ff17940b
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
WEB_SITE=http://gnofract4d.sourceforge.net/
ENTERED=20050307
diff --git a/science/gnofract4d/HISTORY b/science/gnofract4d/HISTORY
index ae69c28..d922de2 100644
--- a/science/gnofract4d/HISTORY
+++ b/science/gnofract4d/HISTORY
@@ -1,3 +1,6 @@
+2010-04-18 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 3.13
+
2009-06-07 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 3.12

diff --git a/telephony/telepathy-butterfly/DEPENDS
b/telephony/telepathy-butterfly/DEPENDS
index 670f50a..45970f0 100755
--- a/telephony/telepathy-butterfly/DEPENDS
+++ b/telephony/telepathy-butterfly/DEPENDS
@@ -1,2 +1,2 @@
-depends pymsn &&
+depends papyon &&
depends telepathy-python
diff --git a/telephony/telepathy-butterfly/DETAILS
b/telephony/telepathy-butterfly/DETAILS
index 70bab6c..4a08865 100755
--- a/telephony/telepathy-butterfly/DETAILS
+++ b/telephony/telepathy-butterfly/DETAILS
@@ -1,5 +1,5 @@
SPELL=telepathy-butterfly
- VERSION=0.5.7
+ VERSION=0.5.8
SOURCE="${SPELL}-${VERSION}.tar.gz"
SOURCE_URL[0]=http://telepathy.freedesktop.org/releases/${SPELL}/${SOURCE}
SOURCE2="${SOURCE}.asc"
diff --git a/telephony/telepathy-butterfly/HISTORY
b/telephony/telepathy-butterfly/HISTORY
index 609416f..cf811fa 100644
--- a/telephony/telepathy-butterfly/HISTORY
+++ b/telephony/telepathy-butterfly/HISTORY
@@ -1,3 +1,7 @@
+2010-04-19 Arjan Bouter <abouter AT sourcemage.org>
+ * DEPENDS: version 0.5.8 and switched from pymsn to papyon
+ * ../telepathy.gpg: added E976169A
+
2010-04-06 Arjan Bouter <abouter AT sourcemage.org>
* DETAILS: version 0.5.7 and switched to upstream key
* BUILD, INSTALL: removed, project now uses autotools
diff --git a/telephony/telepathy-gabble/DETAILS
b/telephony/telepathy-gabble/DETAILS
index 26cfb5d..78ce4be 100755
--- a/telephony/telepathy-gabble/DETAILS
+++ b/telephony/telepathy-gabble/DETAILS
@@ -1,5 +1,5 @@
SPELL=telepathy-gabble
- VERSION=0.9.1
+ VERSION=0.9.10
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SOURCE.asc
WEB_SITE=http://telepathy.freedesktop.org
diff --git a/telephony/telepathy-gabble/HISTORY
b/telephony/telepathy-gabble/HISTORY
index 8d11e07..29eba6d 100644
--- a/telephony/telepathy-gabble/HISTORY
+++ b/telephony/telepathy-gabble/HISTORY
@@ -1,3 +1,7 @@
+2010-04-19 Arjan Bouter <abouter AT sourcemage.org>
+ * DETAILS: version 0.9.10 and corrected spacing of previous
+ HISTORY entry ;)
+
2009-10-03 Bearcat M. Sandor <sourcemage AT feline-soul.com>
- * DETAILS: version 0.9.1
- * Spell created
+ * DETAILS: version 0.9.1
+ * Spell created
diff --git a/telephony/telepathy-haze/DETAILS
b/telephony/telepathy-haze/DETAILS
index c7a0423..3dff682 100755
--- a/telephony/telepathy-haze/DETAILS
+++ b/telephony/telepathy-haze/DETAILS
@@ -1,5 +1,5 @@
SPELL=telepathy-haze
- VERSION=0.3.3
+ VERSION=0.3.4
SOURCE="${SPELL}-${VERSION}.tar.gz"
SOURCE_URL[0]=http://telepathy.freedesktop.org/releases/${SPELL}/${SOURCE}

SOURCE_HASH=sha512:30b29ad85583fa10e9f7754aa5bb331b1a513978bf68a58eb29257f416fcc03c168ef6d60bb9ce63ed3448bc052e49ffc605743095e7c89c757ea4f164c482ed
diff --git a/telephony/telepathy-haze/HISTORY
b/telephony/telepathy-haze/HISTORY
index de9dc45..ba905b5 100644
--- a/telephony/telepathy-haze/HISTORY
+++ b/telephony/telepathy-haze/HISTORY
@@ -1,3 +1,6 @@
+2010-04-19 Arjan Bouter <abouter AT sourcemage.org>
+ * DETAILS: version 0.3.4
+
2010-01-27 Arjan Bouter <abouter AT sourcemage.org>
* DEPENDS, DETAILS: spell created

diff --git a/telephony/telepathy-mission-control/DETAILS
b/telephony/telepathy-mission-control/DETAILS
index ef25a2e..debf0c1 100755
--- a/telephony/telepathy-mission-control/DETAILS
+++ b/telephony/telepathy-mission-control/DETAILS
@@ -1,5 +1,5 @@
SPELL=telepathy-mission-control
- VERSION=5.3.2
+ VERSION=5.4.0
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SOURCE.asc
WEB_SITE=http://telepathy.freedesktop.org
diff --git a/telephony/telepathy-mission-control/HISTORY
b/telephony/telepathy-mission-control/HISTORY
index ddb29af..6f27a70 100644
--- a/telephony/telepathy-mission-control/HISTORY
+++ b/telephony/telepathy-mission-control/HISTORY
@@ -1,3 +1,6 @@
+2010-04-19 Arjan Bouter <abouter AT sourcemage.org>
+ * DETAILS: updated to 5.4.0
+
2010-04-06 Arjan Bouter <abouter AT sourcemage.org>
* DETAILS: updated to 5.3.2

diff --git a/telephony/telepathy-qt/DETAILS b/telephony/telepathy-qt/DETAILS
index fabef9d..6920f79 100755
--- a/telephony/telepathy-qt/DETAILS
+++ b/telephony/telepathy-qt/DETAILS
@@ -8,7 +8,7 @@ if [[ $TELQT_SVN == y ]];then
SOURCE_URL[0]=git://git.collabora.co.uk/git/$SPELLX.git
FORCE_DOWNLOAD=on
else
- VERSION=0.2.1
+ VERSION=0.3.1
SOURCE=$SPELLX-$VERSION.tar.gz
SOURCE2=$SOURCE.asc
SOURCE_URL[0]=$WEB_SITE/releases/$SPELLX/$SOURCE
diff --git a/telephony/telepathy-qt/HISTORY b/telephony/telepathy-qt/HISTORY
index b480caf..4c068c8 100644
--- a/telephony/telepathy-qt/HISTORY
+++ b/telephony/telepathy-qt/HISTORY
@@ -1,3 +1,6 @@
+2010-04-19 Arjan Bouter <abouter AT sourcemage.org>
+ * DETAILS updated stable version to 0.3.1
+
2010-01-04 Julien "_kaze_" ROZO <julien AT rozo.org>
* DETAILS: updated stable version to 0.2.1

diff --git a/telephony/telepathy-salut/DETAILS
b/telephony/telepathy-salut/DETAILS
index 6af85b8..7d9e725 100755
--- a/telephony/telepathy-salut/DETAILS
+++ b/telephony/telepathy-salut/DETAILS
@@ -1,5 +1,5 @@
SPELL=telepathy-salut
- VERSION=0.3.10
+ VERSION=0.3.11
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SOURCE.asc
WEB_SITE=http://telepathy.freedesktop.org
diff --git a/telephony/telepathy-salut/HISTORY
b/telephony/telepathy-salut/HISTORY
index 6f8ac67..10abf88 100644
--- a/telephony/telepathy-salut/HISTORY
+++ b/telephony/telepathy-salut/HISTORY
@@ -1,3 +1,6 @@
+2010-04-19 Arjan Bouter <abouter AT sourcemage.org>
+ * DETAILS: version 0.3.11
+
2009-10-03 Bearcat M. Sandor <sourcemage AT feline-soul.com>
* DETAILS: version 0.3.10
spell created
diff --git a/telephony/telepathy-sofiasip/DETAILS
b/telephony/telepathy-sofiasip/DETAILS
index 3a46af7..37a3654 100755
--- a/telephony/telepathy-sofiasip/DETAILS
+++ b/telephony/telepathy-sofiasip/DETAILS
@@ -1,5 +1,5 @@
SPELL=telepathy-sofiasip
- VERSION=0.5.18
+ VERSION=0.6.2
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SOURCE.asc
WEB_SITE=http://telepathy.freedesktop.org
diff --git a/telephony/telepathy-sofiasip/HISTORY
b/telephony/telepathy-sofiasip/HISTORY
index bf7e73a..f147a93 100644
--- a/telephony/telepathy-sofiasip/HISTORY
+++ b/telephony/telepathy-sofiasip/HISTORY
@@ -1,3 +1,6 @@
+2010-04-19 Arjan Bouter <abouter AT sourcemage.org>
+ * DETAILS: version 0.6.2
+
2009-10-03 Bearcat M. Sandor <sourcemage AT feline-soul.net>
* DETAILS: version 0.5.18, removed hash, changed to upstream asc key,
updated WEB_SITE url

diff --git a/telephony/telepathy.gpg b/telephony/telepathy.gpg
index 4200ebe..cfa933a 100644
Binary files a/telephony/telepathy.gpg and b/telephony/telepathy.gpg differ
diff --git a/utils/dbus-python/DETAILS b/utils/dbus-python/DETAILS
index e8f07e5..560fee9 100755
--- a/utils/dbus-python/DETAILS
+++ b/utils/dbus-python/DETAILS
@@ -1,6 +1,6 @@
SPELL=dbus-python
- VERSION=0.83.0
-
SOURCE_HASH=sha512:240d40359a05e733a5e4ef5e72f0c67813e0b823feb540f320fa24af057ba3c0ae47399fbb466716866f0f4326ecacf490e7025ec5536d8681e229742a5ec149
+ VERSION=0.83.1
+
SOURCE_HASH=sha512:eafb5a2caa5ad670650d3c8cb5ad72a566bd691e7bd0a4ff9fa85bc0e1abf885621b316e2d9ae76a48bec49cf54605f86ba33f5ff8a2f6520b782832d4a444a3
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=http://dbus.freedesktop.org/releases/$SPELL/$SOURCE
diff --git a/utils/dbus-python/HISTORY b/utils/dbus-python/HISTORY
index a7fe734..98bd561 100644
--- a/utils/dbus-python/HISTORY
+++ b/utils/dbus-python/HISTORY
@@ -1,3 +1,6 @@
+2010-04-19 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.3.1
+
2008-08-01 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 0.83.0, quoting paths!

diff --git a/utils/iso-codes/DETAILS b/utils/iso-codes/DETAILS
index 7429016..ddec0aa 100755
--- a/utils/iso-codes/DETAILS
+++ b/utils/iso-codes/DETAILS
@@ -1,5 +1,5 @@
SPELL=iso-codes
- VERSION=3.14
+ VERSION=3.15
SOURCE=${SPELL}-${VERSION}.tar.bz2
SOURCE2=${SOURCE}.sig
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
diff --git a/utils/iso-codes/HISTORY b/utils/iso-codes/HISTORY
index 18ffb16..5c4add1 100644
--- a/utils/iso-codes/HISTORY
+++ b/utils/iso-codes/HISTORY
@@ -1,3 +1,6 @@
+2010-04-19 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 3.15
+
2010-03-13 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 3.14

diff --git a/wm-addons/wmwifi/BUILD b/wm-addons/wmwifi/BUILD
index 0c600a2..df276d3 100755
--- a/wm-addons/wmwifi/BUILD
+++ b/wm-addons/wmwifi/BUILD
@@ -1,3 +1,4 @@
aclocal &&
automake &&
-default_build
+./configure &&
+make top_builddir=${SOURCE_DIRECTORY}
diff --git a/wm-addons/wmwifi/DETAILS b/wm-addons/wmwifi/DETAILS
index 95b6a7c..1e8ad85 100755
--- a/wm-addons/wmwifi/DETAILS
+++ b/wm-addons/wmwifi/DETAILS
@@ -1,11 +1,11 @@
SPELL=wmwifi
- VERSION=0.5
+ VERSION=0.6
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- SOURCE_URL[0]=http://digitalssg.net/debian/${SOURCE}
- WEB_SITE=http://wmwifi.digitalssg.net/
+ SOURCE_URL[0]=http://www.dockapps.org/download.php/id/669/${SOURCE}
+ WEB_SITE=http://www.dockapps.org/file.php/id/222
ENTERED=20050421
-
SOURCE_HASH=sha512:59eb294c5bc6be9fec41375466a073c181b2f90ae710040a8fda84a2e61be09cefbd1af6179d6c67b07691ad388793ec2c8af64c932a61d4409211d211c0b2e1
+
SOURCE_HASH=sha512:ae0a66b68f991907b7e8434a872cc8b1fd9219d633260183a6917e1d34dd4ddc7be91dd71b6cb0ed20781ca4eaa6a0cfc2adcb7a838b734050264a5fae4cadd0
LICENSE[0]=GPL
KEYWORDS="wireless wm-addons"
SHORT="A dockapp to monitor wireless signal strength."
diff --git a/wm-addons/wmwifi/HISTORY b/wm-addons/wmwifi/HISTORY
index e69aec4..3aea67b 100644
--- a/wm-addons/wmwifi/HISTORY
+++ b/wm-addons/wmwifi/HISTORY
@@ -1,3 +1,10 @@
+2010-04-19 Sukneet Basuta <sukneet AT sourcemage.org>
+ * DETAILS: Fixed SOURCE_URL[0]
+ updated spell to 0.6
+ upstream WEBSITE dead, changed to page on dockapps.org
+ * BUILD: removed default_build and added make with
+ top_builddir specified, would not compile otherwise
+
2008-03-18 Eric Sandall <sandalle AT sourcemage.org>
* DEPENDS: Switch X11-LIBS to the one and only xorg-libs

diff --git a/xorg-app/compiz/DETAILS b/xorg-app/compiz/DETAILS
index fedb941..c57e667 100755
--- a/xorg-app/compiz/DETAILS
+++ b/xorg-app/compiz/DETAILS
@@ -1,9 +1,8 @@
SPELL=compiz
- VERSION=0.8.4
- SOURCE=${SPELL}-${VERSION}.tar.gz
+ VERSION=0.8.6
+ SOURCE=${SPELL}-${VERSION}.tar.bz2
SOURCE_URL[0]=http://releases.compiz.org/components/$SPELL/$SOURCE
-#
SOURCE_HASH=sha512:04dc199fb46c56b049d921f455add97033c7a253024a3f550ddb30345c76dd9646cd69b2632c06e49e26240039b32502292efe8422a1a2861154b296febd7cd7
- SOURCE_GPG=gurus.gpg:$SOURCE.sig:WORKS_FOR_ME
+
SOURCE_HASH=sha512:eea66c60e5df1c67da40490fad44d35c24c1de75812e098be350922b87adf43af783a36c7795e4cc1c9d4bbc32de2d76d72380161e30c43cf8f162353499ab8d
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
WEB_SITE=http://www.freedesktop.org/wiki/Software/Compiz
ENTERED=20061003
diff --git a/xorg-app/compiz/HISTORY b/xorg-app/compiz/HISTORY
index ffa0b9d..1e4fef4 100644
--- a/xorg-app/compiz/HISTORY
+++ b/xorg-app/compiz/HISTORY
@@ -1,3 +1,6 @@
+2010-04-19 Arjan Bouter <abouter AT sourcemage.org>
+ * DETAILS: version 0.8.6
+
2009-10-23 Bearcat M. Sandor <sourcemage AT feline-soul.com>
* DETAILS: updated spell to 0.8.4

diff --git a/xorg-app/compiz/compiz-0.8.4.tar.gz.sig
b/xorg-app/compiz/compiz-0.8.4.tar.gz.sig
deleted file mode 100644
index 8de68bd..0000000
Binary files a/xorg-app/compiz/compiz-0.8.4.tar.gz.sig and /dev/null differ



  • [SM-Commit] GIT changes to devel-gcc grimoire by Eric Sandall (c1f47a863aa2a2878391e605a0c58f3834a6dd41), Eric Sandall, 04/20/2010

Archive powered by MHonArc 2.6.24.

Top of Page