sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to devel-gnome-2.30 grimoire by Vasil Yonkov (b2ff43a947862cf3ee4618d0264c558e8a939dba)

From: Vasil Yonkov <scm AT sourcemage.org>
To: sm-commit AT lists.ibiblio.org
Subject: [SM-Commit] GIT changes to devel-gnome-2.30 grimoire by Vasil Yonkov (b2ff43a947862cf3ee4618d0264c558e8a939dba)
Date: Wed, 31 Mar 2010 16:46:55 -0500

GIT changes to devel-gnome-2.30 grimoire by Vasil Yonkov
<spirtbrat AT sourcemage.org>:

ChangeLog |
12
audio-soft/mediatomb/DEPENDS |
10
audio-soft/mediatomb/HISTORY |
8
audio-soft/mediatomb/PRE_BUILD |
13
audio-soft/mediatomb/curl-7.18.patch |
13
audio-soft/mediatomb/glibc-2.10.patch |
24 +
audio-soft/mediatomb/newffmpeg.patch |
77 ++++
audio-soft/mediatomb/ps3-pcm.patch |
139 +++++++
crypto/openssl/DETAILS |
2
crypto/openssl/HISTORY |
3
dev/null
|binary
devel/b43-tools/BUILD |
2
devel/b43-tools/DEPENDS |
2
devel/b43-tools/DETAILS |
18
devel/b43-tools/HISTORY |
3
devel/b43-tools/INSTALL |
1
devel/b43-tools/PREPARE |
2
devel/python/DEPENDS |
1
devel/python/DETAILS |
1
devel/python/HISTORY |
4
doc/evince/HISTORY |
2
doc/evince/evince-2.29.92.tar.bz2.sig
|binary
doc/evince/evince-2.30.0.tar.bz2.sig
|binary
editors/openoffice/BUILD |
32 -
editors/openoffice/CONFIGURE |
20 +
editors/openoffice/CONFLICTS |
1
editors/openoffice/DEPENDS |
107 ++---
editors/openoffice/DETAILS |
32 -
editors/openoffice/HISTORY |
12
editors/openoffice/INSTALL |
5
editors/openoffice/OOo_3.1.1_src_binfilter.tar.bz2.sig |
0
editors/openoffice/OOo_3.1.1_src_core.tar.bz2.sig |
0
editors/openoffice/OOo_3.1.1_src_extensions.tar.bz2.sig |
0
editors/openoffice/OOo_3.1.1_src_l10n.tar.bz2.sig |
0
editors/openoffice/OOo_3.1.1_src_system.tar.bz2.sig |
0
editors/openoffice/OOo_3.1.1_src_testautomation.tar.bz2.sig |
0
editors/openoffice/OOo_3.2.0_src_binfilter.tar.bz2.sig
|binary
editors/openoffice/OOo_3.2.0_src_core.tar.bz2.sig
|binary
editors/openoffice/OOo_3.2.0_src_extensions.tar.bz2.sig
|binary
editors/openoffice/OOo_3.2.0_src_l10n.tar.bz2.sig
|binary
editors/openoffice/OOo_3.2.0_src_testautomation.tar.bz2.sig
|binary
editors/openoffice/PREPARE |
6
editors/openoffice/PRE_BUILD |
7
editors/openoffice/TODO |
11
editors/openoffice/getline.patch |
43 --
editors/openoffice/oo.dict |
18
editors/openoffice/oo.languages |
105 -----
graphics-libs/mesalib/DETAILS |
4
graphics-libs/mesalib/HISTORY |
4
graphics-libs/mesalib/MesaLib-7.6.1.tar.bz2.sig |
0
graphics-libs/mesalib/MesaLib-7.7.1.tar.bz2.sig
|binary
graphics-libs/mesalib/MesaLib-7.7.tar.bz2.sig |
0
graphics-libs/mesalib/MesaLib-7.8.tar.bz2.sig
|binary
graphics-libs/poppler/DETAILS |
4
graphics-libs/poppler/HISTORY |
3
http/lighttpd/CONFIGURE |
1
http/lighttpd/HISTORY |
5
http/lighttpd/PRE_BUILD |
4
http/lighttpd/external_auth_program-1.4.25.patch |
183 ++++++++++
http/seamonkey/DETAILS |
6
http/seamonkey/HISTORY |
4
i18n/ibus-anthy/DEPENDS |
2
i18n/ibus-anthy/DETAILS |
14
i18n/ibus-anthy/HISTORY |
3
i18n/ibus/DEPENDS |
5
i18n/ibus/DETAILS |
14
i18n/ibus/HISTORY |
3
kde4-apps/kmymoney4/DEPENDS |
19 +
kde4-apps/kmymoney4/DETAILS |
23 +
kde4-apps/kmymoney4/HISTORY |
8
kde4-apps/kmymoney4/PRE_BUILD |
4
kde4-apps/kmymoney4/kmymoney.gpg
|binary
kernels/openfwwf/BUILD |
1
kernels/openfwwf/DEPENDS |
1
kernels/openfwwf/DETAILS |
13
kernels/openfwwf/HISTORY |
3
kernels/openfwwf/INSTALL |
1
mail/alpine/DETAILS |
2
mail/alpine/HISTORY |
4
mail/alpine/PRE_BUILD |
4
mail/thunderbird/DETAILS |
4
mail/thunderbird/HISTORY |
4
utils/rsyslog/DETAILS |
4
utils/rsyslog/HISTORY |
3
utils/unetbootin/DETAILS |
5
utils/unetbootin/HISTORY |
3
utils/unetbootin/unetbootin-source-424.tar.gz.sig
|binary
xorg-driver/xf86-input-synaptics/DETAILS |
2
xorg-driver/xf86-input-synaptics/HISTORY |
4
xorg-driver/xf86-input-synaptics/xf86-input-synaptics-1.2.1.tar.bz2.sig |
0
xorg-driver/xf86-input-synaptics/xf86-input-synaptics-1.2.2.tar.bz2.sig
|binary
xorg-driver/xf86-video-intel/DETAILS |
2
xorg-driver/xf86-video-intel/HISTORY |
4
xorg-driver/xf86-video-intel/xf86-video-intel-2.10.0.tar.bz2.sig |
0
xorg-driver/xf86-video-intel/xf86-video-intel-2.11.0.tar.bz2.sig
|binary
95 files changed, 814 insertions(+), 299 deletions(-)

New commits:
commit 044892471696791a09d246407b89ea6d1f6abd0f
Author: Vasil Yonkov <spirtbrat AT sourcemage.org>
Commit: Vasil Yonkov <spirtbrat AT sourcemage.org>

Revert "evince: => 2.30.0"

This reverts commit 2bfb0db8e1ff733b6c61863969457e5ca537bae6.

commit 5a5d7ad812cbef4a8cf752dcba784bd64c0ab37b
Author: Vasil Yonkov <spirtbrat AT sourcemage.org>
Commit: Vasil Yonkov <spirtbrat AT sourcemage.org>

mesalib: feature => 7.7.1, developement => 7.8

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

unetbootin: Updated to 424

commit db1c58c0b6cf6fde95065b23020fe687e931f032
Author: Ismael Luceno <ismael.luceno AT gmail.com>
Commit: Ismael Luceno <ismael.luceno AT gmail.com>

i18n/ibus-anthy: new spell, Anthy module for IBus

commit 0ee2e17a9095e0ddff866447d172f6a9467a046d
Author: Ismael Luceno <ismael.luceno AT gmail.com>
Commit: Ismael Luceno <ismael.luceno AT gmail.com>

i18n/ibus: new spell, IBus input framework

commit bce9ddd62184f9f58b37c2d00ab7ead038843575
Author: Ismael Luceno <ismael.luceno AT gmail.com>
Commit: Ismael Luceno <ismael.luceno AT gmail.com>

fix spacing in ChangeLog

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

openoffice: version 3.2.0, and it works!

commit ff5743becb2ae9d1b328cf9ec6170c12d72f9ba6
Author: Ismael Luceno <ismael.luceno AT gmail.com>
Commit: Ismael Luceno <ismael.luceno AT gmail.com>

b43-tools: fix WEB_SITE

commit 5fe8c7f2bbdc6004a979965dd035d1c7a8b883c8
Author: Ismael Luceno <ismael.luceno AT gmail.com>
Commit: Ismael Luceno <ismael.luceno AT gmail.com>

b43-tools: new spell, development tools for BCM43xx

commit aecc7b533b6b46effa4401f0947403152bc67a5d
Author: Ismael Luceno <ismael.luceno AT gmail.com>
Commit: Ismael Luceno <ismael.luceno AT gmail.com>

openfwwf: new spell, free software firmware for BCM43xx

commit cd31f7b9f3914f5e035a0e8e1b03cf86a7efeff1
Author: Andraž Levstik <ruskie+2054d253 AT codemages.net>
Commit: Andraž Levstik <ruskie+2054d253 AT codemages.net>

Revert "miro: updated to 2.5.4"

This reverts commit b5bc1a3522b970f9616a692dfd6c8db0ca7be7ce.

My bad overwrote an existing commit

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

kmymoney4: => 3.97.0

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

kmymoney4 - 3.95.0
(cherry picked from commit 0cb0ac4310c7ecb4016521c70113cd1e561f663b)

commit b5bc1a3522b970f9616a692dfd6c8db0ca7be7ce
Author: Andraž Levstik <ruskie+2054d253 AT codemages.net>
Commit: Andraž Levstik <ruskie+2054d253 AT codemages.net>

miro: updated to 2.5.4

commit da1e1919f4ae9b3606e90df5f2c82fd749edda4f
Author: Andraž Levstik <ruskie+2054d253 AT codemages.net>
Commit: Andraž Levstik <ruskie+2054d253 AT codemages.net>

mediatomb: added some patches and a few tweaks

commit 83dc565bf5c2b739aca4f0c78f57d0475e5ad315
Author: Andraž Levstik <ruskie+2054d253 AT codemages.net>
Commit: Andraž Levstik <ruskie+2054d253 AT codemages.net>

lighttpd: added external auth program feature patch forward ported from
lighttpd bug 1985(wontfix by upstream)

commit 5e3e39fcf909329650c04d21b5cea89641b54fc2
Author: Andraž Levstik <ruskie+2054d253 AT codemages.net>
Commit: Andraž Levstik <ruskie+2054d253 AT codemages.net>

alpine: update topal to 72, fixes bug 15633

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

evince: => 2.30.0

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

poppler: devel => 0.13.2

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

rsyslog: v4stable => 4.6.2

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

openssl: Fix GPGME -> OPENSSL for branch variable

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

xf86-input-synaptics: Updated to 1.2.2
SOURCE matches upstream posted SHA1

If you plan to use synaptics 1.2.2 with server 1.8, the following
config snippet is recommended in /etc/xorg.conf.d/10-synaptics.conf
/etc/X11/xorg.conf for Source Mage):

Section "InputClass"
Identifier "touchpad catchall"
Driver "synaptics"
MatchIsTouchpad "on"
MatchDevicePath "/dev/input/event*"
EndSection

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

xf86-video-intel: Updated to 2.11.0

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

thunderbird 3.0.4, SECURITY_PATCH=19

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

seamonkey 2.0.4

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

python optional_depends on openssl

$ cleanse --nofix_quick python
Doing initialization for the ldd check
Checking python (1 of 1)
File test
Library test
The following files from python have missing library dependencies:
/usr/lib/python2.6/lib-dynload/_hashlib.so
libssl.so.0.9.8 => not found
libcrypto.so.0.9.8 => not found
/usr/lib/python2.6/lib-dynload/_ssl.so
libssl.so.0.9.8 => not found
libcrypto.so.0.9.8 => not found

python is broken

The following spells were broken:
python

diff --git a/ChangeLog b/ChangeLog
index a558297..3ef208a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,9 +1,16 @@
+2010-03-31 Ismael Luceno <ismael AT sourcemage.org>
+ * kernels/openfwwf: new spell, free software firmware for BCM43xx
+ * devel/b43-tools: new spell, development tools for BCM43xx
+ * i18n/ibus: new spell, IBus input framework
+ * i18n/ibus-anthy: new spell, Anthy module for IBus
+
2010-03-30 Treeve Jelbert <treeve AT sourcemage.org>
* dev/shiboken: new spell
Python binding generator based on CPython

2010-03-29 Philippe "Puppet_Master" Caseiro <puppetmaster AT sourcemage.org>
- * http/spawn-fcgi : new spell, for fcgi management
+ * http/spawn-fcgi: new spell, for fcgi management
+
2010-03-29 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* kde4-apps/qtmpc: moved to audio-players to fix installation

@@ -234,6 +241,9 @@
* audio-libs/libmpdclient: new spell
a library for interfacing Music Player Daemon (MPD)

+2009-12-30 Treeve Jelbert <treeve AT sourcemage.org>
+ * kde4-apps/kmymoney4: added, money management for kde4
+
2009-12-30 Vasil Yonkov <spirtbrat AT sourcemage.org>
* gnome2-libs/libgda4: new spell,
data abstraction library based on GLib
diff --git a/audio-soft/mediatomb/DEPENDS b/audio-soft/mediatomb/DEPENDS
index 62d96f0..8a3ae35 100755
--- a/audio-soft/mediatomb/DEPENDS
+++ b/audio-soft/mediatomb/DEPENDS
@@ -1,7 +1,7 @@
message "MediaTomb requires either sqlite or mysql to store it's db"
optional_depends sqlite \
- "--enable-sqlite" \
- "--disable-sqlite" \
+ "--enable-sqlite3" \
+ "--disable-sqlite3" \
"to store the media db in sqlite" &&
optional_depends mysql \
"--enable-mysql" \
@@ -12,8 +12,8 @@ optional_depends expat \
"--disable-expat" \
"use the expat XML parser" &&
optional_depends zlib \
- "" \
- "" \
+ "--enable-db-autocreate" \
+ "--disable-db-autocreate" \
"for auto creation of the media db" &&
optional_depends file \
"--enable-libmagic" \
@@ -45,6 +45,6 @@ optional_depends libextractor \
"--disable-libextractor" \
"to gather metadata from various files (NOT recommended)" &&
optional_depends LIBAVCODEC \
- "--enable-ffmpeg --with-ffmpeg-h=/usr/include/libavformat" \
+ "--enable-ffmpeg" \
"--disable-ffmpeg" \
"to gather metadata from video files"
diff --git a/audio-soft/mediatomb/HISTORY b/audio-soft/mediatomb/HISTORY
index 80226bb..39e2249 100644
--- a/audio-soft/mediatomb/HISTORY
+++ b/audio-soft/mediatomb/HISTORY
@@ -1,3 +1,11 @@
+2010-03-31 Andraž "ruskie" Levstik <ruskie+f03a580f AT codemages.net>
+ * DEPENDS: a few tweaks
+ * PRE_BUILD: use proper headers
+ * curl-7.18.patch: curl 7.18, gentoo patch
+ * glibc-2.10.patch: glibc 2.10, gentoo patch
+ * newffmpeg.patch: improved configure, gentoo patch
+ * ps3-pcm.patch: proper PCM streaming to PS3, gentoo patch
+
2009-09-04 Arjan Bouter <abouter AT sourcemage.org>
* init.d/*: added init scripts
* INSTALL: create mediatomb homedir
diff --git a/audio-soft/mediatomb/PRE_BUILD b/audio-soft/mediatomb/PRE_BUILD
index 4a5537a..ad371f7 100755
--- a/audio-soft/mediatomb/PRE_BUILD
+++ b/audio-soft/mediatomb/PRE_BUILD
@@ -2,7 +2,12 @@ default_pre_build &&
create_account mediatomb &&
cd $SOURCE_DIRECTORY &&
sedit 's#FFMPEG_SEARCH_HEADERS/ffmpeg#FFMPEG_SEARCH_HEADERS#g' configure &&
-sedit 's#ffmpeg/avformat.h#avformat.h#g' configure &&
-sedit 's#ffmpeg/avformat.h#avformat.h#g' src/metadata/ffmpeg_handler.cc &&
-#next line can prolly be removed for versions > 0.11.0, fixed in svn
-sedit 's#CURLOPT_NOBODY)#CURLOPT_NOBODY, 1)#' src/url.cc
+sedit 's#ffmpeg/avformat.h#libavformat/avformat.h#g' configure &&
+sedit 's#ffmpeg/avformat.h#libavformat/avformat.h#g'
src/metadata/ffmpeg_handler.cc &&
+##next line can prolly be removed for versions > 0.11.0, fixed in svn
+#sedit 's#CURLOPT_NOBODY)#CURLOPT_NOBODY, 1)#' src/url.cc
+
+patch -p1 < $SPELL_DIRECTORY/curl-7.18.patch &&
+patch -p0 < $SPELL_DIRECTORY/glibc-2.10.patch &&
+patch -p1 < $SPELL_DIRECTORY/newffmpeg.patch &&
+patch -p1 < $SPELL_DIRECTORY/ps3-pcm.patch
diff --git a/audio-soft/mediatomb/curl-7.18.patch
b/audio-soft/mediatomb/curl-7.18.patch
new file mode 100644
index 0000000..5d0d4b2
--- /dev/null
+++ b/audio-soft/mediatomb/curl-7.18.patch
@@ -0,0 +1,13 @@
+Index: mediatomb-0.11.0/src/url.cc
+===================================================================
+--- mediatomb-0.11.0.orig/src/url.cc
++++ mediatomb-0.11.0/src/url.cc
+@@ -75,7 +75,7 @@
+
+ if (only_header)
+ {
+- curl_easy_setopt(curl_handle, CURLOPT_NOBODY);
++ curl_easy_setopt(curl_handle, CURLOPT_NOBODY, TRUE);
+ curl_easy_setopt(curl_handle, CURLOPT_HEADERFUNCTION, URL::dl);
+ curl_easy_setopt(curl_handle, CURLOPT_HEADERDATA,
+ (void *)buffer.getPtr());
diff --git a/audio-soft/mediatomb/glibc-2.10.patch
b/audio-soft/mediatomb/glibc-2.10.patch
new file mode 100644
index 0000000..ff207b7
--- /dev/null
+++ b/audio-soft/mediatomb/glibc-2.10.patch
@@ -0,0 +1,24 @@
+Index: src/tools.cc
+===================================================================
+--- src/tools.cc (revisione 2018)
++++ src/tools.cc (copia locale)
+@@ -303,8 +303,8 @@
+ Ref<StringBuffer> buf(new StringBuffer(len / 2));
+ for (int i = 0; i < len; i += 2)
+ {
+- char *chi = strchr(HEX_CHARS, ptr[i]);
+- char *clo = strchr(HEX_CHARS, ptr[i + 1]);
++ const char *chi = strchr(HEX_CHARS, ptr[i]);
++ const char *clo = strchr(HEX_CHARS, ptr[i + 1]);
+ int hi, lo;
+
+ if (chi)
+@@ -397,7 +397,7 @@
+ char clo = data[i++];
+ int hi, lo;
+
+- char *pos;
++ const char *pos;
+
+ pos = strchr(hex, chi);
+ if (!pos)
diff --git a/audio-soft/mediatomb/newffmpeg.patch
b/audio-soft/mediatomb/newffmpeg.patch
new file mode 100644
index 0000000..e18a161
--- /dev/null
+++ b/audio-soft/mediatomb/newffmpeg.patch
@@ -0,0 +1,77 @@
+Index: mediatomb-0.11.0/configure.ac
+===================================================================
+--- mediatomb-0.11.0.orig/configure.ac
++++ mediatomb-0.11.0/configure.ac
+@@ -2340,9 +2340,14 @@ if test "x$FFMPEG_OK" = xyes; then
+ ]
+ )
+ else
+- AC_CHECK_HEADER(ffmpeg/avformat.h,
+- [],
++ AC_CHECK_HEADERS([ffmpeg/avformat.h libavformat/avformat.h],
++ [ffmpeg_found=yes; break;], [],
+ [
++ #define __STDC_CONSTANT_MACROS
++ #include <stdint.h>
++ ]
++ )
++ if test "x$ffmpeg_found" != "xyes"; then
+ CPPFLAGS="-I$SEARCH_DIR_HEADERS"
+ unset ac_cv_header_ffmpeg_avformat_h
+ AC_CHECK_HEADER($SEARCH_DIR_HEADERS/ffmpeg/avformat.h,
+@@ -2357,12 +2362,7 @@ if test "x$FFMPEG_OK" = xyes; then
+ #include <stdint.h>
+ ]
+ )
+- ],
+- [
+- #define __STDC_CONSTANT_MACROS
+- #include <stdint.h>
+- ]
+- )
++ fi
+ fi
+ fi
+
+@@ -2447,7 +2447,11 @@ if test "x$FFMPEG_OK" = xyes; then
+ [
+ #define __STDC_CONSTANT_MACROS
+ #include <stdint.h>
++ #ifdef HAVE_LIBAVFORMAT_AVFORMAT_H
++ #include <libavformat/avformat.h>
++ #else
+ #include <ffmpeg/avformat.h>
++ #endif
+ ],
+ [
+ av_register_all();
+@@ -2462,7 +2466,11 @@ if test "x$FFMPEG_OK" = xyes; then
+ #define __STDC_CONSTANT_MACROS
+ #include <stdint.h>
+ extern "C" {
+- #include <ffmpeg/avformat.h>
++ #ifdef HAVE_LIBAVFORMAT_AVFORMAT_H
++ #include <libavformat/avformat.h>
++ #else
++ #include <ffmpeg/avformat.h>
++ #endif
+ }
+ ],
+ [
+Index: mediatomb-0.11.0/src/metadata/ffmpeg_handler.cc
+===================================================================
+--- mediatomb-0.11.0.orig/src/metadata/ffmpeg_handler.cc
++++ mediatomb-0.11.0/src/metadata/ffmpeg_handler.cc
+@@ -56,7 +56,11 @@ extern "C"
+ {
+ #endif
+
+-#include <ffmpeg/avformat.h>
++#ifdef HAVE_LIBAVFORMAT_AVFORMAT_H
++# include <libavformat/avformat.h>
++#else
++# include <ffmpeg/avformat.h>
++#endif
+
+ #ifdef FFMPEG_NEEDS_EXTERN_C
+ } // extern "C"
diff --git a/audio-soft/mediatomb/ps3-pcm.patch
b/audio-soft/mediatomb/ps3-pcm.patch
new file mode 100644
index 0000000..11657f0
--- /dev/null
+++ b/audio-soft/mediatomb/ps3-pcm.patch
@@ -0,0 +1,139 @@
+diff -urpN mediatomb-0.11.0.orig/src/cds_resource_manager.cc
mediatomb-0.11.0/src/cds_resource_manager.cc
+--- mediatomb-0.11.0.orig/src/cds_resource_manager.cc 2008-05-26
23:14:56.000000000 +1000
++++ mediatomb-0.11.0/src/cds_resource_manager.cc 2008-05-26
23:14:56.000000000 +1000
+@@ -184,6 +184,30 @@ void CdsResourceManager::addResources(Re
+
t_res->addAttribute(MetadataHandler::getResAttrName(R_DURATION),
+ duration);
+
++ int freq = tp->getSampleFreq();
++ if (freq == SOURCE)
++ {
++ String frequency =
item->getResource(0)->getAttribute(MetadataHandler::getResAttrName(R_SAMPLEFREQUENCY));
++ if (string_ok(frequency))
++
t_res->addAttribute(MetadataHandler::getResAttrName(R_SAMPLEFREQUENCY),
frequency);
++ }
++ else if (freq != OFF)
++ {
++
t_res->addAttribute(MetadataHandler::getResAttrName(R_SAMPLEFREQUENCY),
String::from(freq));
++ }
++
++ int chan = tp->getNumChannels();
++ if (chan == SOURCE)
++ {
++ String nchannels =
item->getResource(0)->getAttribute(MetadataHandler::getResAttrName(R_NRAUDIOCHANNELS));
++ if (string_ok(nchannels))
++
t_res->addAttribute(MetadataHandler::getResAttrName(R_NRAUDIOCHANNELS),
nchannels);
++ }
++ else if (chan != OFF)
++ {
++
t_res->addAttribute(MetadataHandler::getResAttrName(R_NRAUDIOCHANNELS),
String::from(chan));
++ }
++
+ if (tp->isThumbnail())
+ t_res->addOption(_(RESOURCE_CONTENT_TYPE),
_(EXIF_THUMBNAIL));
+
+diff -urpN mediatomb-0.11.0.orig/src/config_manager.cc
mediatomb-0.11.0/src/config_manager.cc
+--- mediatomb-0.11.0.orig/src/config_manager.cc 2008-05-26
23:14:56.000000000 +1000
++++ mediatomb-0.11.0/src/config_manager.cc 2008-05-26 23:14:56.000000000
+1000
+@@ -2092,6 +2092,43 @@ Ref<TranscodingProfileList> ConfigManage
+ prof->setAcceptURL(false);
+ }
+
++ if (child->getChildByName(_("sample-frequency")) != nil)
++ {
++ param = child->getChildText(_("sample-frequency"));
++ if (param == "source")
++ prof->setSampleFreq(SOURCE);
++ else if (param == "off")
++ prof->setSampleFreq(OFF);
++ else
++ {
++ int freq = param.toInt();
++ if (freq <= 0)
++ throw _Exception(_("Error in config file: incorrect "
++ "parameter for <sample-frequency> "
++ "tag"));
++
++ prof->setSampleFreq(freq);
++ }
++ }
++
++ if (child->getChildByName(_("audio-channels")) != nil)
++ {
++ param = child->getChildText(_("audio-channels"));
++ if (param == "source")
++ prof->setNumChannels(SOURCE);
++ else if (param == "off")
++ prof->setNumChannels(OFF);
++ else
++ {
++ int chan = param.toInt();
++ if (chan <= 0)
++ throw _Exception(_("Error in config file: incorrect "
++ "parameter for <number-of-channels> "
++ "tag"));
++ prof->setNumChannels(chan);
++ }
++ }
++
+ if (child->getChildByName(_("hide-original-resource")) != nil)
+ {
+ param = child->getChildText(_("hide-original-resource"));
+diff -urpN mediatomb-0.11.0.orig/src/transcoding/transcoding.cc
mediatomb-0.11.0/src/transcoding/transcoding.cc
+--- mediatomb-0.11.0.orig/src/transcoding/transcoding.cc 2008-05-26
23:14:56.000000000 +1000
++++ mediatomb-0.11.0/src/transcoding/transcoding.cc 2008-05-26
23:14:56.000000000 +1000
+@@ -52,6 +52,8 @@ TranscodingProfile::TranscodingProfile()
+ accept_url = true;
+ hide_orig_res = false;
+ thumbnail = false;
++ sample_frequency = SOURCE; // keep original
++ number_of_channels = SOURCE;
+ attributes = Ref<Dictionary>(new Dictionary());
+ fourcc_list = Ref<Array<StringBase> >(new Array<StringBase>());
+ fourcc_mode = FCC_None;
+@@ -66,6 +68,8 @@ TranscodingProfile::TranscodingProfile(t
+ accept_url = true;
+ hide_orig_res = false;
+ thumbnail = false;
++ sample_frequency = SOURCE; // keep original
++ number_of_channels = SOURCE;
+ buffer_size = 0;
+ chunk_size = 0;
+ initial_fill_size = 0;
+diff -urpN mediatomb-0.11.0.orig/src/transcoding/transcoding.h
mediatomb-0.11.0/src/transcoding/transcoding.h
+--- mediatomb-0.11.0.orig/src/transcoding/transcoding.h 2008-05-26
23:14:56.000000000 +1000
++++ mediatomb-0.11.0/src/transcoding/transcoding.h 2008-05-26
23:14:56.000000000 +1000
+@@ -39,6 +39,9 @@
+ #include "dictionary.h"
+ #include "object_dictionary.h"
+
++#define SOURCE (-1)
++#define OFF 0
++
+ typedef enum transcoding_type_t
+ {
+ TR_None,
+@@ -164,6 +167,14 @@ public:
+ /// \brief Provides information on the mode of the list
+ avi_fourcc_listmode_t getAVIFourCCListMode() { return fourcc_mode; }
+
++ /// \brief Sample frequency handling
++ void setSampleFreq(int freq) { sample_frequency = freq; }
++ int getSampleFreq() { return sample_frequency; }
++
++ /// \brief Number of channels
++ void setNumChannels(int chans) { number_of_channels = chans; }
++ int getNumChannels() { return number_of_channels; }
++
+ protected:
+ zmm::String name;
+ zmm::String tm;
+@@ -178,6 +189,8 @@ protected:
+ size_t chunk_size;
+ size_t initial_fill_size;
+ transcoding_type_t tr_type;
++ int number_of_channels;
++ int sample_frequency;
+ zmm::Ref<Dictionary> attributes;
+ zmm::Ref<zmm::Array<zmm::StringBase> > fourcc_list;
+ avi_fourcc_listmode_t fourcc_mode;
diff --git a/crypto/openssl/DETAILS b/crypto/openssl/DETAILS
index c0dd0ed..1f23c89 100755
--- a/crypto/openssl/DETAILS
+++ b/crypto/openssl/DETAILS
@@ -1,6 +1,6 @@
SPELL=openssl

-if [[ -z "$OPENSSL_BRANCH" ]] || [[ $GPGME_BRANCH == DEFAULT ]]; then
+if [[ -z "$OPENSSL_BRANCH" ]] || [[ $OPENSSL_BRANCH == DEFAULT ]]; then
OPENSSL_BRANCH="0.9"
fi

diff --git a/crypto/openssl/HISTORY b/crypto/openssl/HISTORY
index 4208da7..d176a1c 100644
--- a/crypto/openssl/HISTORY
+++ b/crypto/openssl/HISTORY
@@ -1,3 +1,6 @@
+2010-03-30 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: Fix GPGME -> OPENSSL for branch variable
+
2010-03-29 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS, PREPARE: added support for 1.0.0, default is 0.9.8n

diff --git a/devel/b43-tools/BUILD b/devel/b43-tools/BUILD
new file mode 100755
index 0000000..fe2395a
--- /dev/null
+++ b/devel/b43-tools/BUILD
@@ -0,0 +1,2 @@
+cd assembler &&
+make
diff --git a/devel/b43-tools/DEPENDS b/devel/b43-tools/DEPENDS
new file mode 100755
index 0000000..d197df6
--- /dev/null
+++ b/devel/b43-tools/DEPENDS
@@ -0,0 +1,2 @@
+depends bison &&
+depends flex
diff --git a/devel/b43-tools/DETAILS b/devel/b43-tools/DETAILS
new file mode 100755
index 0000000..f76ad88
--- /dev/null
+++ b/devel/b43-tools/DETAILS
@@ -0,0 +1,18 @@
+ SPELL=b43-tools
+if [[ $B43TOOLS_AUTOUPDATE == y ]]; then
+ VERSION=$(date +%Y%m%d)
+else
+ VERSION=git
+fi
+ SOURCE="${SPELL}.tar.bz2"
+ SOURCE_URL[0]=git_http://git.bu3sch.de/git/${SPELL}.git
+ SOURCE_IGNORE=volatile
+ FORCE_DOWNLOAD=on
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}"
+ WEB_SITE="http://bu3sch.de/gitweb?p=b43-tools.git";
+ LICENSE[0]=GPL
+ ENTERED=20100331
+ SHORT="Development tools for the BCM43xx chip"
+cat << EOF
+Development tools for the Broadcom 43xx series Wireless-LAN chip
+EOF
diff --git a/devel/b43-tools/HISTORY b/devel/b43-tools/HISTORY
new file mode 100644
index 0000000..e13e083
--- /dev/null
+++ b/devel/b43-tools/HISTORY
@@ -0,0 +1,3 @@
+2010-03-31 Ismael Luceno <ismael AT sourcemage.org>
+ * BUILD, DEPENDS, DETAILS, INSTALL, PREPARE: spell created
+
diff --git a/devel/b43-tools/INSTALL b/devel/b43-tools/INSTALL
new file mode 100755
index 0000000..508cb92
--- /dev/null
+++ b/devel/b43-tools/INSTALL
@@ -0,0 +1 @@
+make PREFIX="${INSTALL_ROOT}"/usr install
diff --git a/devel/b43-tools/PREPARE b/devel/b43-tools/PREPARE
new file mode 100755
index 0000000..6ef5a11
--- /dev/null
+++ b/devel/b43-tools/PREPARE
@@ -0,0 +1,2 @@
+config_query B43TOOLS_AUTOUPDATE \
+ "Automatically update on every system update?" n
diff --git a/devel/python/DEPENDS b/devel/python/DEPENDS
index 5411c95..feb1de2 100755
--- a/devel/python/DEPENDS
+++ b/devel/python/DEPENDS
@@ -5,6 +5,7 @@ optional_depends tk "" "" "for Tk support" &&
optional_depends ncurses "" "" "for Ncurses support" &&
optional_depends readline "" "" "for Readline support" &&
optional_depends expat "" "" "for XML parser module" &&
+optional_depends openssl "" "" "for SSL support" &&

optional_depends g++ \
"--with-cxx-main=g++" \
diff --git a/devel/python/DETAILS b/devel/python/DETAILS
index 6c95fc0..7b766f0 100755
--- a/devel/python/DETAILS
+++ b/devel/python/DETAILS
@@ -1,5 +1,6 @@
SPELL=python
VERSION=2.6.5
+ PATCHLEVEL=1
SOURCE=Python-$VERSION.tar.bz2
SOURCE2=$SOURCE.asc
SOURCE_DIRECTORY="$BUILD_DIRECTORY/Python-$VERSION"
diff --git a/devel/python/HISTORY b/devel/python/HISTORY
index a715972..2f87d63 100644
--- a/devel/python/HISTORY
+++ b/devel/python/HISTORY
@@ -1,3 +1,7 @@
+2010-03-30 Ladislav Hagara <hgr AT vabo.cz>
+ * DEPENDS: added optional_depends openssl
+ * DETAILS: PATCHLEVEL=1
+
2010-03-22 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 2.6.5

diff --git a/doc/evince/HISTORY b/doc/evince/HISTORY
index 7580403..8573bc1 100644
--- a/doc/evince/HISTORY
+++ b/doc/evince/HISTORY
@@ -1,4 +1,4 @@
-2010-03-31 Vasil Yonkov <spirtbrat AT sourcemage.org>
+2010-03-31 Sukneet Basuta <sukneet AT sourcemage.org>
* DETAILS: updated spell to 2.30.0

2010-03-24 Vasil Yonkov <spirtbrat AT sourcemage.org>
diff --git a/doc/evince/evince-2.29.92.tar.bz2.sig
b/doc/evince/evince-2.29.92.tar.bz2.sig
new file mode 100644
index 0000000..a9ef969
Binary files /dev/null and b/doc/evince/evince-2.29.92.tar.bz2.sig differ
diff --git a/doc/evince/evince-2.30.0.tar.bz2.sig
b/doc/evince/evince-2.30.0.tar.bz2.sig
index 663e374..26443ad 100644
Binary files a/doc/evince/evince-2.30.0.tar.bz2.sig and
b/doc/evince/evince-2.30.0.tar.bz2.sig differ
diff --git a/editors/openoffice/BUILD b/editors/openoffice/BUILD
index 3fe7130..217805d 100755
--- a/editors/openoffice/BUILD
+++ b/editors/openoffice/BUILD
@@ -1,31 +1,29 @@
-# --with-vendor=\"Source Mage GNU/Linux\" \
-# --with-build-version="\"$(head -n1 ${SPELL_DIRECTORY}/HISTORY
|awk '{print $2, $3}' )\"" \
-# --with-system-headers \
-# --with-system-libs \
-# --with-system-stdlibs \
-
OPTS="${OPTS} ${OOO_OPTS}" &&
if [[ "${OOO_BINFILTER}" = 'n' ]]; then
OPTS="${OPTS} --disable-binfilter"
fi &&
-export PKGFORMAT="installed" &&
-export SRC_ROOT="${SOURCE_DIRECTORY}" &&
+
+if [[ "${MAKE_NJOBS}" = "" ]]; then
+ MAKE_NJOBS=1
+fi

cd ${SOURCE_DIRECTORY} &&
-./configure --prefix=${INSTALL_ROOT}/usr \
+
+./configure --prefix=${INSTALL_ROOT}/opt \
--sysconfdir=${INSTALL_ROOT}/etc \
--localstatedir=${INSTALL_ROOT}/var \
--mandir=${INSTALL_ROOT}/usr/share/man \
--infodir=${INSTALL_ROOT}/usr/share/info \
- --with-dict \
- --with-x \
+ --with-vendor="Source Mage GNU/Linux" \
--disable-epm \
- --disable-odk \
- --disable-mathmldtd \
- --disable-qadevooo \
- --with-vendor="Source\ Mage\ GNU/Linux" \
+ --with-use-shell=bash \
+ --with-system-stdlibs \
+ --without-myspell-dicts \
+ --with-system-dicts \
+ --with-lang="$OOO_LANG" \
$OPTS &&

-./bootstrap &&
source Linux*Env.Set.sh &&
-dmake
+./bootstrap &&
+echo "building with $MAKE_NJOBS make jobs"
+nodep=TRUE NO_HIDS=TRUE dmake -P${MAKE_NJOBS}
diff --git a/editors/openoffice/CONFIGURE b/editors/openoffice/CONFIGURE
index 62d78d2..56fa38b 100755
--- a/editors/openoffice/CONFIGURE
+++ b/editors/openoffice/CONFIGURE
@@ -1,3 +1,5 @@
+source $GRIMOIRE/FUNCTIONS &&
+
config_query_option OOO_OPTS "build QuickStart systray plugin?" n \
"--enable-systray" \
"--disable-systray" &&
@@ -18,4 +20,20 @@ config_query_option OOO_OPTS "enable the PDF Import
extension and Xpdf?" n \
"--disable-pdfimport" &&
config_query_option OOO_OPTS "enable the VBA compatibility feature?" n \
"--with-vba-package-format=builtin" \
- "--disable-vba"
+ "--disable-vba" &&
+config_query_option OOO_OPTS 'install the OOo SDK (not needed)' n \
+ '--enable-odk' \
+ '--disable-odk' &&
+config_query_option OOO_OPTS 'install mathmldtd?' n \
+ '--enable-mathmldtd' \
+ '--disable-mathmldtd' &&
+config_query_option OOO_OPTS 'install the OOo dev testsuite? (not needed)' n
\
+ '--enable-qadevooo' \
+ '--disable-qadevooo' &&
+config_query_multi OOO_LANG \
+ 'Which localizations do you want to support? (en-US is always
enabled)' \
+ af ar as ast be-BY bg bn bo br brx bs ca cs cy da de dgo dz el en-GB \
+ en-ZA eo es et eu fa fi fr ga gl gu he hi-IN hr hu id is it ja ka kid
kk \
+ km kn ko kok ks ku lt lv mai mk ml mn mni mr my nb ne nl nn nr ns oc
om \
+ or pa-IN pap pl pt pt-BR ro ru rw sa-IN sat sd sh si sk sl sr ss st sv
\
+ sw-TZ ta te tg th tn tr ts ug uk ur uz ve vi xh zh-CN zh-TW zu
diff --git a/editors/openoffice/CONFLICTS b/editors/openoffice/CONFLICTS
index 67fa1b1..e57273a 100755
--- a/editors/openoffice/CONFLICTS
+++ b/editors/openoffice/CONFLICTS
@@ -1,4 +1,3 @@
-conflicts openoffice &&
conflicts openoffice-bin &&
conflicts openoffice2-bin &&
conflicts openoffice3-bin
diff --git a/editors/openoffice/DEPENDS b/editors/openoffice/DEPENDS
index 8244beb..e612a61 100755
--- a/editors/openoffice/DEPENDS
+++ b/editors/openoffice/DEPENDS
@@ -1,53 +1,55 @@
-# good old fashioned hard dependencies, with or without options
-depends gmp &&
-depends freetype2 &&
-depends archive-zip &&
-depends zip '--with-zip-home=/usr/bin/zip' &&
-depends unzip '--with-unzip-home=/usr/bin/uzip' &&
+# good old fashioned hard dependencies
+depends freetype2 &&
+depends archive-zip &&
+depends zip &&
+depends unzip &&

-# dependencies that are required but will use local versions when missing
-optional_depends libwpd '--with-system-libwpd' '' 'use system libpwd' &&
-optional_depends icu '--with-system-icu' '' 'use system ICU?' &&
-optional_depends python '--with-system-python' '' 'use system python?' &&
-optional_depends db '--with-system-db' '--without-system-db' 'use system
db?' &&
-#optional_depends lucene '--with-system-lucene' '' 'use system Lucene?' &&
-optional_depends expat '--with-system-expat' '' 'use system expat?' &&
-optional_depends libxml2 '--with-system-libxml' '' 'use system libxml2?
(recommended)' &&
-optional_depends libxslt '--with-system-libxslt' '' 'use system libxslt?
(recommended)' &&
-optional_depends jpeg '--with-system-jpeg' '' 'use system JPEG?' &&
-optional_depends openssl '--with-system-openssl' '' 'use system OpenSSL?
(recommended)' &&
-optional_depends zlib '--with-system-zlib' '' 'use system zlib?
(recommended)' &&
-optional_depends poppler '--with-system-poppler' '' 'use system poppler?'
&&
-optional_depends curl '--with-system-curl' '' 'use system curl?' &&
-optional_depends boost '--with-system-boost' '' 'use system boost?' &&
-optional_depends hunspell '--with-system-hunspell' '' 'enable system
hunspell?' &&
-optional_depends stlport "--with-stlport=${INSTALL_ROOT}/usr"
'--without-stlport' 'use system stlport? (not recommended)' &&
-optional_depends ant "--with-ant-home=${INSTALL_ROOT}/usr" '' 'enable system
ant?' &&
-optional_depends vigra '--with-system-vigra' '--without-system-vigra'
'enable system vigra?' &&
+# dependencies that are required but will use included
+# OOo versions when missing (some of them might be in the openoffice
'system' tarball)
+depends libwpd '--with-system-libwpd' &&
+depends icu '--with-system-icu' &&
+depends python '--with-system-python' &&
+depends db '--with-system-db' &&
+depends expat '--with-system-expat' &&
+depends libxml2 '--with-system-libxml' &&
+depends libxslt '--with-system-libxslt' &&
+depends jpeg '--with-system-jpeg' &&
+depends openssl '--with-system-openssl' &&
+depends zlib '--with-system-zlib' &&
+depends poppler '--with-system-poppler' &&
+depends curl '--with-system-curl' &&
+depends boost '--with-system-boost' &&
+depends hunspell '--with-system-hunspell' &&
+depends hyphen '--with-system-altlinuxhyph' &&
+# just weird, it needs to be installed but OOo won't build when you specify
--with-stlport
+depends stlport "--without-stlport" &&
+depends vigra '--with-system-vigra' &&
+depends sane-backends '--with-system-sane-header' &&
+depends lp_solve '--with-system-lpsolve' &&
+depends libxrender '--with-system-xrender-headers' &&
+depends ttf-bitstream-vera '--without-fonts --without-afms' &&

# regular optional dependencies
-optional_depends tcsh \
- '--with-use-shell=tcsh' \
- '--with-use-shell=bash' \
- 'use TCSH instead of BASH (default)' &&
optional_depends ODBC-MGR \
'--with-system-odbc --with-system-odbc-headers' \
'' \
'enable ODBC database access? (recommended)' &&
optional_depends JAVA \
'--with-java --with-system-jars' \
- '--without-java --without-system-jars' \
+ '--without-java' \
'enable JAVA support?' &&
if (is_depends_enabled ${SPELL} JAVA); then
+ depends ant "--with-ant-home=${INSTALL_ROOT}/usr" &&
+ depends lucene '--with-system-lucene' &&
optional_depends gcj \
'--enable-gcjaot' \
'--disable-gcjaot' \
'Build with[out] using Ahead of Time java compilation?'
fi &&
-optional_depends GTK2 \
- '--enable-gtk' \
- '--disable-gtk' \
- 'use GTK vclplug? (recommended)' &&
+optional_depends GTK2 \
+ '--enable-gtk' \
+ '--disable-gtk' \
+ 'use GTK vclplug? (recommended)' &&
if [[ "$(get_spell_provider ${SPELL} GTK2)" = 'gtk+2' ]] || \
[[ "$(get_spell_provider ${SPELL} GTK2)" = 'gtk+2-directfb' ]]; then
optional_depends gconf2 \
@@ -57,15 +59,16 @@ optional_depends gconf2 \
optional_depends evolution \
'--enable-evolution2' \
'--disable-evolution2' \
- 'use evolution?' &&
+ 'enable use of evolution addressbook?' &&
optional_depends gnome-vfs2 \
'--enable-gnome-vfs' \
'--disable-gnome-vfs' \
'enable GNOME virtual filesystem support?'
fi &&
+#probably wrong, but I have no idea what to include for KDE and which
version ;)
optional_depends kdebase4 \
- '--enable-kde --enable-kdeab' \
- '--disable-kde --disable-kdeab' \
+ '--enable-kde4 --enable-kdeab' \
+ '--disable-kde4 --disable-kdeab' \
'enable KDE addressbook and vclplugin' &&
optional_depends cairo \
'--enable-cairo --with-system-cairo' \
@@ -79,28 +82,20 @@ optional_depends libxrandr \
'--enable-randr' \
'--disable-randr' \
'enable RandR support in the vcl project?' &&
-optional_depends libxrender \
- '--with-system-xrender-headers' \
- '' \
- 'use system libxrender?' &&
optional_depends agg \
- '--with-agg --with-system-agg' \
+ '--with-agg' \
'--without-agg' \
'enable agg support?' &&
# I'm only testing with xulrunner, feel free to add others ;)
optional_depends xulrunner \
- '--disable-mozilla --with-system-mozilla=xulrunner' \
- '--disable-build-mozilla' \
+ '--with-system-mozilla=xulrunner' \
+ '--disable-mozilla' \
"use xulrunner instead of 'strangely hacked up mozilla
binary'? (recommended)" &&
-#always --without-ppds. not needed without and provided with cups
+#always --without-ppds. not needed without cups or provided by cups
optional_depends CUPS \
'--enable-cups --without-ppds' \
'--disable-cups --without-ppds' \
'use CUPS in the psprint project?' &&
-optional_depends sane-backends \
- '--with-system-sane-header' \
- '' \
- 'use sane backends?' &&
optional_depends fontconfig \
'--enable-fontconfig --disable-fontooo' \
'--disable-fontconfig --enable-fontooo' \
@@ -109,11 +104,10 @@ optional_depends dbus \
'--enable-dbus' \
'--disable-dbus' \
'use D-BUS for screensaver control?' &&
-#probably wrong, but I have no idea what to include for KDE and which
version ;)
optional_depends linux-pam \
'--enable-pam' \
'--disable-pam' \
- 'use Linux-PAM?' &&
+ 'enable PAM support?' &&
optional_depends neon \
'--enable-neon --with-system-neon' \
'--disable-neon' \
@@ -125,13 +119,4 @@ optional_depends libxaw \
optional_depends openldap \
'--enable-ldap --with-openldap' \
'--disable-ldap --without-openldap' \
- "enable the use of the OpenLDAP LDAP SDK?" &&
-optional_depends rpm \
- '--enable-epm' \
- '--disable-epm' \
- "enable self-packaging code? (not recommended)" &&
-# this one is intentionally reversed
-optional_depends ttf-bitstream-vera \
- '--without-fonts' \
- '--with-fonts' \
- 'use system provided font instead of packaged version?
(recommended)'
+ "enable the use of the OpenLDAP LDAP SDK?"
diff --git a/editors/openoffice/DETAILS b/editors/openoffice/DETAILS
index df2035d..347ada9 100755
--- a/editors/openoffice/DETAILS
+++ b/editors/openoffice/DETAILS
@@ -1,45 +1,41 @@
SPELL=openoffice
- VERSION=3.1.1
- BUILD_VERSION=310_m19
+ VERSION='3.2.0'
+ BUILD_VERSION=320_m12
+
COMMON_PATH="http://download.services.openoffice.org/files/stable/${VERSION}";
SOURCE="OOo_${VERSION}_src_core.tar.bz2"
SOURCE_GPG="gurus.gpg:${SOURCE}.sig:WORKS_FOR_ME"
+ SOURCE_URL[0]=${COMMON_PATH}/${SOURCE}
SOURCE2="OOo_${VERSION}_src_extensions.tar.bz2"
SOURCE2_GPG="gurus.gpg:${SOURCE2}.sig:WORKS_FOR_ME"
- SOURCE3="OOo_${VERSION}_src_system.tar.bz2"
+ SOURCE2_URL[0]=${COMMON_PATH}/${SOURCE2}
+ SOURCE3="OOo_${VERSION}_src_testautomation.tar.bz2"
SOURCE3_GPG="gurus.gpg:${SOURCE3}.sig:WORKS_FOR_ME"
+ SOURCE3_URL[0]=${COMMON_PATH}/${SOURCE3}
SOURCE4="OOo_${VERSION}_src_l10n.tar.bz2"
+ SOURCE4_URL[0]=${COMMON_PATH}/${SOURCE4}
SOURCE4_GPG="gurus.gpg:${SOURCE4}.sig:WORKS_FOR_ME"
- COMMON_PATH=openoffice/stable/${VERSION}
- SOURCE_URL[0]=http://mirrors.isc.org/pub/${COMMON_PATH}/${SOURCE}
- SOURCE2_URL[0]=http://mirrors.isc.org/pub/${COMMON_PATH}/${SOURCE2}
- SOURCE3_URL[0]=http://mirrors.isc.org/pub/${COMMON_PATH}/${SOURCE3}
- SOURCE4_URL[0]=http://mirrors.isc.org/pub/${COMMON_PATH}/${SOURCE4}
if [[ "${OOO_BINFILTER}" = 'y' ]]; then
SOURCE5="OOo_${VERSION}_src_binfilter.tar.bz2"
SOURCE5_GPG="gurus.gpg:${SOURCE5}.sig:WORKS_FOR_ME"
- SOURCE5_URL[0]=http://mirrors.isc.org/pub/${COMMON_PATH}/${SOURCE5}
-fi &&
-if [[ "${OOO_TEST}" = 'y' ]]; then
- SOURCE6="OOo_${VERSION}_src_testautomation.tar.bz2"
- SOURCE6_GPG="gurus.gpg:${SOURCE6}.sig:WORKS_FOR_ME"
- SOURCE6_URL[0]=http://mirrors.isc.org/pub/${COMMON_PATH}/${SOURCE6}
+ SOURCE5_URL[0]=${COMMON_PATH}/${SOURCE5}
fi &&
+# SOURCE6="OOo_${VERSION}_src_system.tar.bz2"
+# SOURCE6_GPG="gurus.gpg:${SOURCE6}.sig:WORKS_FOR_ME"
+# SOURCE6_URL[0]=${COMMON_PATH}/${SOURCE6}
SOURCE_DIRECTORY=$BUILD_DIRECTORY/OOO${BUILD_VERSION}
LICENSE[0]=LGPL
WEB_SITE=http://www.openoffice.org
ENTERED=20080909
ARCHIVE="off"
- SHORT="The binary version of OpenOffice 3"
+ SHORT="OpenOffice 3"
cat << EOF
OpenOffice.org is the open source project through which Sun Microsystems has
released the technology for the popular StarOffice[tm] Productivity Suite.
All of the StarOffice code is available under the GNU Lesser General Public
License (LGPL) as well as the Sun Industry Standards Source License (SISSL).

-Sun is participating as a member of the OpenOffice.org community.
-OpenOffice.org is being hosted by CollabNet.
-
The suite includes:
+sbase - A database application
scalc - A spreadsheet application
sdraw - A vector drawing program
simpress - A presentation program
diff --git a/editors/openoffice/HISTORY b/editors/openoffice/HISTORY
index ca0e852..95a864d 100644
--- a/editors/openoffice/HISTORY
+++ b/editors/openoffice/HISTORY
@@ -1,3 +1,15 @@
+2010-03-26 Arjan Bouter <abouter AT sourcemage.org>
+ * BUILD,CONFIGURE,CONFLICTS,DEPENDS,INSTALL,PRE_BUILD,PREPARE,DETAILS:
+ version 3.2.0 and the spell works!
+ * TODO: added list of things to check and/or repair
+
+2009-09-01 Arjan Bouter <abouter AT sourcemage.org>
+ * DETAILS,PREPARE,PREBUILD: made some tarballs optional
+ * BUILD,CONFIGURE: moved more options to CONFIGURE
+ * DEPENDS: switched from OOo to system libs and headers
+ where it was optional.
+ * getline.patch: removed
+
2009-08-31 Arjan Bouter <abouter AT sourcemage.org>
* version 3.1.1 and various other fixes.
still work in progress.
diff --git a/editors/openoffice/INSTALL b/editors/openoffice/INSTALL
new file mode 100755
index 0000000..1e71faa
--- /dev/null
+++ b/editors/openoffice/INSTALL
@@ -0,0 +1,5 @@
+dmake install --prefix="${INSTALL_ROOT}/opt" &&
+OOO_APPPATH="${INSTALL_ROOT}/opt/openoffice/openoffice.org3/program" &&
+for app in sbase scalc sdraw simpress smath soffice spadmin swriter ; do
+ ln -s "${OOO_APPPATH}/$app" ${INSTALL_ROOT}/usr/bin/$app
+done
diff --git a/editors/openoffice/OOo_3.1.1_src_binfilter.tar.bz2.sig
b/editors/openoffice/OOo_3.1.1_src_binfilter.tar.bz2.sig
deleted file mode 100644
index bc60eab..0000000
Binary files a/editors/openoffice/OOo_3.1.1_src_binfilter.tar.bz2.sig and
/dev/null differ
diff --git a/editors/openoffice/OOo_3.1.1_src_core.tar.bz2.sig
b/editors/openoffice/OOo_3.1.1_src_core.tar.bz2.sig
deleted file mode 100644
index 0675bf7..0000000
Binary files a/editors/openoffice/OOo_3.1.1_src_core.tar.bz2.sig and
/dev/null differ
diff --git a/editors/openoffice/OOo_3.1.1_src_extensions.tar.bz2.sig
b/editors/openoffice/OOo_3.1.1_src_extensions.tar.bz2.sig
deleted file mode 100644
index 249e7df..0000000
Binary files a/editors/openoffice/OOo_3.1.1_src_extensions.tar.bz2.sig and
/dev/null differ
diff --git a/editors/openoffice/OOo_3.1.1_src_l10n.tar.bz2.sig
b/editors/openoffice/OOo_3.1.1_src_l10n.tar.bz2.sig
deleted file mode 100644
index 766fd83..0000000
Binary files a/editors/openoffice/OOo_3.1.1_src_l10n.tar.bz2.sig and
/dev/null differ
diff --git a/editors/openoffice/OOo_3.1.1_src_system.tar.bz2.sig
b/editors/openoffice/OOo_3.1.1_src_system.tar.bz2.sig
deleted file mode 100644
index 7126f52..0000000
Binary files a/editors/openoffice/OOo_3.1.1_src_system.tar.bz2.sig and
/dev/null differ
diff --git a/editors/openoffice/OOo_3.1.1_src_testautomation.tar.bz2.sig
b/editors/openoffice/OOo_3.1.1_src_testautomation.tar.bz2.sig
deleted file mode 100644
index 7db0c77..0000000
Binary files a/editors/openoffice/OOo_3.1.1_src_testautomation.tar.bz2.sig
and /dev/null differ
diff --git a/editors/openoffice/OOo_3.2.0_src_binfilter.tar.bz2.sig
b/editors/openoffice/OOo_3.2.0_src_binfilter.tar.bz2.sig
new file mode 100644
index 0000000..0cd1c92
Binary files /dev/null and
b/editors/openoffice/OOo_3.2.0_src_binfilter.tar.bz2.sig differ
diff --git a/editors/openoffice/OOo_3.2.0_src_core.tar.bz2.sig
b/editors/openoffice/OOo_3.2.0_src_core.tar.bz2.sig
new file mode 100644
index 0000000..f3031c8
Binary files /dev/null and
b/editors/openoffice/OOo_3.2.0_src_core.tar.bz2.sig differ
diff --git a/editors/openoffice/OOo_3.2.0_src_extensions.tar.bz2.sig
b/editors/openoffice/OOo_3.2.0_src_extensions.tar.bz2.sig
new file mode 100644
index 0000000..53ecc8a
Binary files /dev/null and
b/editors/openoffice/OOo_3.2.0_src_extensions.tar.bz2.sig differ
diff --git a/editors/openoffice/OOo_3.2.0_src_l10n.tar.bz2.sig
b/editors/openoffice/OOo_3.2.0_src_l10n.tar.bz2.sig
new file mode 100644
index 0000000..d557492
Binary files /dev/null and
b/editors/openoffice/OOo_3.2.0_src_l10n.tar.bz2.sig differ
diff --git a/editors/openoffice/OOo_3.2.0_src_testautomation.tar.bz2.sig
b/editors/openoffice/OOo_3.2.0_src_testautomation.tar.bz2.sig
new file mode 100644
index 0000000..c122679
Binary files /dev/null and
b/editors/openoffice/OOo_3.2.0_src_testautomation.tar.bz2.sig differ
diff --git a/editors/openoffice/PREPARE b/editors/openoffice/PREPARE
index 89c9577..d1c7c1e 100755
--- a/editors/openoffice/PREPARE
+++ b/editors/openoffice/PREPARE
@@ -1,2 +1,4 @@
-config_query OOO_BINFILTER 'enable legacy binary file formats filters?' n
&&
-config_query OOO_TEST 'enable testautomation?' n
+message "${PROBLEM_COLOR}OpenOffice.org needs lots of space to
build.${DEFAULT_COLOR}" &&
+message "${PROBLEM_COLOR}expect anything from 6 to 10 GB${DEFAULT_COLOR}" &&
+query 'Do you have that much space available in your build directory?' n &&
+config_query OOO_BINFILTER 'enable legacy binary file formats filters?' n
diff --git a/editors/openoffice/PRE_BUILD b/editors/openoffice/PRE_BUILD
index d0448e0..f5b6598 100755
--- a/editors/openoffice/PRE_BUILD
+++ b/editors/openoffice/PRE_BUILD
@@ -6,8 +6,7 @@ unpack_file '4' &&
if [[ "${OOO_BINFILTER}" = 'y' ]]; then
unpack_file '5'
fi &&
-if [[ "${OOO_TEST}" = 'y' ]]; then
- unpack_file '6'
-fi &&
+
cd ${SOURCE_DIRECTORY} &&
-patch -p0 < ${SPELL_DIRECTORY}/getline.patch
+#somehow they forgot that db versions above 4.7 could be written one day ;)
+sedit 's#1 7#1 9#' configure
diff --git a/editors/openoffice/TODO b/editors/openoffice/TODO
new file mode 100644
index 0000000..8095f7a
--- /dev/null
+++ b/editors/openoffice/TODO
@@ -0,0 +1,11 @@
+* alter and copy the desktopfiles into /usr/share/applications
+ so they are shown in the windowmanager menu
+* the extensions and l10n tarballs could be optional, maybe...
+* JAVA support, not tested at all
+* fix JAVA based dependencies (write spells, fix chained dependencies)
+* hsqldb spell needs to be written
+* graphite spell may need to be written
+* figure out dictionaries
+* figure out hyphenation (hyphen, mythes)
+* figure out spelling (myspell, hunspell)
+* smgl themed bitmaps maybe? (--with-intro-bitmaps --with-about-bitmaps)
diff --git a/editors/openoffice/getline.patch
b/editors/openoffice/getline.patch
deleted file mode 100644
index 74420f7..0000000
--- a/editors/openoffice/getline.patch
+++ /dev/null
@@ -1,43 +0,0 @@
---- soltools/mkdepend/def.h.orig 2009-05-18 15:28:59.000000000 +0200
-+++ soltools/mkdepend/def.h 2009-05-18 15:29:36.000000000 +0200
-@@ -154,7 +154,7 @@
-
- char *copy();
- char *base_name();
--char *getline();
-+char *ooo_getline();
- char *isdefined();
- struct filepointer *getfile();
- struct inclist *newinclude();
---- soltools/mkdepend/main.c.orig 2009-05-18 15:29:08.000000000 +0200
-+++ soltools/mkdepend/main.c 2009-05-18 15:30:23.000000000 +0200
-@@ -548,7 +548,7 @@
- * Get the next line. We only return lines beginning with '#' since that
- * is all this program is ever interested in.
- */
--char *getline(filep)
-+char *ooo_getline(filep)
- register struct filepointer *filep;
- {
- register char *p, /* walking pointer */
---- soltools/mkdepend/parse.c.orig 2009-05-18 15:29:17.000000000 +0200
-+++ soltools/mkdepend/parse.c 2009-05-18 15:30:43.000000000 +0200
-@@ -45,7 +45,7 @@
- register int type;
- boolean recfailOK;
-
-- while ((line = getline(filep))) {
-+ while ((line = ooo_getline(filep))) {
- switch(type = deftype(line, filep, file_red, file, TRUE,
symbols)) {
- case IF:
- doif:
-@@ -168,7 +168,7 @@
- register char *line;
- register int type;
-
-- while ((line = getline(filep))) {
-+ while ((line = ooo_getline(filep))) {
- switch(type = deftype(line, filep, file_red, file, FALSE,
symbols)) {
- case IF:
- case IFFALSE:
-
diff --git a/editors/openoffice/oo.dict b/editors/openoffice/oo.dict
deleted file mode 100644
index c662bb6..0000000
--- a/editors/openoffice/oo.dict
+++ /dev/null
@@ -1,18 +0,0 @@
-da_DA
-Danish
-off
-en_GB
-English_(Great_Britian)
-off
-en_US
-English_(United_States)
-off
-de_DE
-German
-off
-it_IT
-Italian
-off
-ru_RU
-Russian
-off
diff --git a/editors/openoffice/oo.languages b/editors/openoffice/oo.languages
deleted file mode 100644
index d86e4c3..0000000
--- a/editors/openoffice/oo.languages
+++ /dev/null
@@ -1,105 +0,0 @@
-ar
-Arabic
-off
-ca
-Catalan
-off
-zh-CN
-Chinese_(Simplified)
-off
-zh-TW
-Chinese_(Traditional)
-off
-hr-HR
-Croatian
-off
-cs
-Czech
-off
-da
-Danish
-off
-nl
-Dutch
-off
-en-GB
-English_(Great_Britian)
-off
-en-US
-English_(United_States)
-off
-et
-Estonian
-off
-fi
-Finnish
-off
-fr
-French
-off
-de
-German
-off
-el
-Greek
-off
-he
-Hebrew
-off
-hi-IN
-Hindi
-off
-hu
-Hungarian
-off
-it
-Italian
-off
-ja
-Japanese
-off
-ko
-Korean
-off
-no
-Norwegian
-off
-pl
-Polish
-off
-pt-BR
-Portuguese_(Brazil)
-off
-pt
-Portuguese_(Portugal)
-off
-ru
-Russian
-off
-sr-YU
-Serbian_Cyrillic
-off
-sh-YU
-Serbian_Latin
-off
-sk
-Slovak
-off
-sl-SI
-Slovenian
-off
-es
-Spanish
-off
-sv
-Sweedish
-off
-th
-Thai
-off
-tr
-Turkish
-off
-uk-UA
-Ukrainian
-off
diff --git a/graphics-libs/mesalib/DETAILS b/graphics-libs/mesalib/DETAILS
index bc862d9..5ab068b 100755
--- a/graphics-libs/mesalib/DETAILS
+++ b/graphics-libs/mesalib/DETAILS
@@ -21,10 +21,10 @@ case $MESALIB_VER in
VERSION=7.5.2
;;
feature)
- VERSION=7.6.1
+ VERSION=7.7.1
;;
developement)
- VERSION=7.7
+ VERSION=7.8
;;
git)
if [[ "$MESALIB_GIT_AUTOUPDATE" == "y" ]]; then
diff --git a/graphics-libs/mesalib/HISTORY b/graphics-libs/mesalib/HISTORY
index fb9cee6..c1b0ec7 100644
--- a/graphics-libs/mesalib/HISTORY
+++ b/graphics-libs/mesalib/HISTORY
@@ -1,3 +1,7 @@
+2010-03-31 Vasil Yonkov <spirtbrat AT sourcemage.org>
+ * DETAILS: updated MESALIB_VER=feature to 7.7.1
+ updated MESALIB_VER=developement to 7.8
+
2010-02-26 Eric Sandall <sandalle AT sourcemage.org>
* INSTALL: Fails with multiple make jobs

diff --git a/graphics-libs/mesalib/MesaLib-7.6.1.tar.bz2.sig
b/graphics-libs/mesalib/MesaLib-7.6.1.tar.bz2.sig
deleted file mode 100644
index 350ef50..0000000
Binary files a/graphics-libs/mesalib/MesaLib-7.6.1.tar.bz2.sig and /dev/null
differ
diff --git a/graphics-libs/mesalib/MesaLib-7.7.1.tar.bz2.sig
b/graphics-libs/mesalib/MesaLib-7.7.1.tar.bz2.sig
new file mode 100644
index 0000000..37e6fc7
Binary files /dev/null and b/graphics-libs/mesalib/MesaLib-7.7.1.tar.bz2.sig
differ
diff --git a/graphics-libs/mesalib/MesaLib-7.7.tar.bz2.sig
b/graphics-libs/mesalib/MesaLib-7.7.tar.bz2.sig
deleted file mode 100644
index 23e9c22..0000000
Binary files a/graphics-libs/mesalib/MesaLib-7.7.tar.bz2.sig and /dev/null
differ
diff --git a/graphics-libs/mesalib/MesaLib-7.8.tar.bz2.sig
b/graphics-libs/mesalib/MesaLib-7.8.tar.bz2.sig
new file mode 100644
index 0000000..578beac
Binary files /dev/null and b/graphics-libs/mesalib/MesaLib-7.8.tar.bz2.sig
differ
diff --git a/graphics-libs/poppler/DETAILS b/graphics-libs/poppler/DETAILS
index d04ddd5..0aec901 100755
--- a/graphics-libs/poppler/DETAILS
+++ b/graphics-libs/poppler/DETAILS
@@ -12,8 +12,8 @@ SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-git"
SOURCE_IGNORE=volatile
else
if [[ $POPPLER_VER == devel ]]; then
- VERSION=0.13.1
-
SOURCE_HASH=sha512:2fcfc8e4188c7520b01d7391fd4bda7f9af3259d6cdae69ede2114c65b997f056f0a2e31abdb31ebcab84b2b7abf43367069692c3305bdeacd8b3c83eb3f3253
+ VERSION=0.13.2
+
SOURCE_HASH=sha512:45107b5cc0c8cfb173be797a6ad6def631dac86f8695e53404f2025365cbff6d1fa3b723f0a149cf1e0993d7ee658be72df811e0bc14bc098b9a20162e3d4bf5
else
VERSION=0.12.4

SOURCE_HASH=sha512:523efd19ded80c90c00a87bb46df2e53327523c90785470773e0f94e839b2c5dd7bd7f41b63abf14a03ec53d412fe2fcb9f5eb7e5d54daec2b219bf3b558ac25
diff --git a/graphics-libs/poppler/HISTORY b/graphics-libs/poppler/HISTORY
index 8aafff3..a69063f 100644
--- a/graphics-libs/poppler/HISTORY
+++ b/graphics-libs/poppler/HISTORY
@@ -1,3 +1,6 @@
+2010-03-30 Sukneet Basuta <sukneet AT sourcemage.org>
+ * DETAILS: updated devel to 0.13.2
+
2010-03-19 Sukneet Basuta <sukneet AT sourcemage.org>
* DETAILS: updated devel to 0.13.1
* BUILD: removed OPI postscript switch, invalid configure switch
diff --git a/http/lighttpd/CONFIGURE b/http/lighttpd/CONFIGURE
index 0c98245..bb050b2 100755
--- a/http/lighttpd/CONFIGURE
+++ b/http/lighttpd/CONFIGURE
@@ -1,2 +1,3 @@
+config_query LIGHTTPD_EXTAUTH "Do you want to patch in external
authentication program support?" n &&
config_query_option LIGHTTPD_OPTS "Do you want webdav support?" n \
"--with-webdav-props" "--without-webdav-props"
diff --git a/http/lighttpd/HISTORY b/http/lighttpd/HISTORY
index ffbf441..62da7c0 100644
--- a/http/lighttpd/HISTORY
+++ b/http/lighttpd/HISTORY
@@ -1,3 +1,8 @@
+2010-03-31 Andraž "ruskie" Levstik <ruskie+f03a580f AT codemages.net>
+ * CONFIGURE: query for patch
+ * PRE_BUILD: optionally apply patch
+ * external_auth_program-1.4.25.patch: added patch
+
2010-03-27 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: PATCHLEVEL=1
* network-ssl.patch: added, to fix working with the newest openssl (n)
diff --git a/http/lighttpd/PRE_BUILD b/http/lighttpd/PRE_BUILD
index debbf53..6aa59ba 100755
--- a/http/lighttpd/PRE_BUILD
+++ b/http/lighttpd/PRE_BUILD
@@ -2,3 +2,7 @@ default_pre_build &&
cd "$SOURCE_DIRECTORY" &&

patch -p0 < "$SPELL_DIRECTORY/network-ssl.patch"
+if [[ $LIGHTTPD_EXTAUTH == y ]]; then
+patch -p0 < $SPELL_DIRECTORY/external_auth_program-1.4.25.patch
+fi
+
diff --git a/http/lighttpd/external_auth_program-1.4.25.patch
b/http/lighttpd/external_auth_program-1.4.25.patch
new file mode 100644
index 0000000..c1296c0
--- /dev/null
+++ b/http/lighttpd/external_auth_program-1.4.25.patch
@@ -0,0 +1,183 @@
+--- src/http_auth.h.orig 2010-01-02 17:58:11.000000000 +0100
++++ src/http_auth.h 2010-01-02 17:59:17.000000000 +0100
+@@ -14,7 +14,8 @@
+ AUTH_BACKEND_PLAIN,
+ AUTH_BACKEND_LDAP,
+ AUTH_BACKEND_HTPASSWD,
+- AUTH_BACKEND_HTDIGEST
++ AUTH_BACKEND_HTDIGEST,
++ AUTH_BACKEND_PROGRAM
+ } auth_backend_t;
+
+ typedef struct {
+@@ -38,6 +39,8 @@
+ unsigned short auth_ldap_starttls;
+ unsigned short auth_ldap_allow_empty_pw;
+
++ buffer *auth_program_exec;
++
+ unsigned short auth_debug;
+
+ /* generated */
+--- src/http_auth.c.orig 2010-01-02 17:58:11.000000000 +0100
++++ src/http_auth.c 2010-01-02 18:02:34.000000000 +0100
+@@ -287,6 +287,8 @@
+ stream_close(&f);
+ } else if (p->conf.auth_backend == AUTH_BACKEND_LDAP) {
+ ret = 0;
++ } else if (p->conf.auth_backend == AUTH_BACKEND_PROGRAM) {
++ ret = 0;
+ } else {
+ return -1;
+ }
+@@ -827,6 +829,57 @@
+
+ return 0;
+ #endif
++ } else if (p->conf.auth_backend == AUTH_BACKEND_PROGRAM) {
++ buffer *progbuf = p->conf.auth_program_exec;
++ const char *prog;
++ FILE *pipe;
++ int ret;
++
++ /*
++ * This is tested when loading configuration,
++ * but better be paranoid.
++ */
++ if(!progbuf || progbuf->used == 0) {
++ log_error_write(srv, __FILE__, __LINE__, "s",
++ "Missing 'auth.backend.program.exec'
directive");
++ return -1;
++ }
++ prog = progbuf->ptr;
++ /*
++ * Preliminary check, so we can have better error reporting.
++ * It was tested during configuration reading, but maybe
++ * something happened to the program since that time.
++ *
++ * If someone mess with the program after this test, it
++ * would simply fail in the popen()/pclose() which we check
anyway.
++ */
++ if(access(prog, F_OK | X_OK) < 0) {
++ log_error_write(srv, __FILE__, __LINE__, "ssss",
++ "auth.backend.program: Failed
access(",
++ prog,
++ "): ",
++ strerror(errno));
++ return -1;
++ }
++ if((pipe = popen(prog, "w")) == NULL) {
++ log_error_write(srv, __FILE__, __LINE__, "ssss",
++ "Failed popen(",
++ prog,
++ "): ",
++ strerror(errno));
++ return -1;
++ }
++ fprintf(pipe, "%s:%s\n", username->ptr, pw);
++ if((ret = pclose(pipe)) != 0) {
++ log_error_write(srv, __FILE__, __LINE__, "sssds",
++ "Failed pclose(", prog, "):", ret,
strerror(errno));
++ return -1;
++ }
++ if (p->conf.auth_debug) {
++ log_error_write(srv, __FILE__, __LINE__, "ss",
++ "auth.backend.program success for: ",
username->ptr);
++ }
++ return 0;
+ }
+ return -1;
+ }
+--- src/mod_auth.c.orig 2010-01-02 17:58:11.000000000 +0100
++++ src/mod_auth.c 2010-01-02 18:08:14.000000000 +0100
+@@ -82,6 +82,7 @@
+
+ if (s->ldap) ldap_unbind_s(s->ldap);
+ #endif
++ buffer_free(s->auth_program_exec);
+
+ free(s);
+ }
+@@ -119,6 +120,7 @@
+ PATCH(ldap_filter_pre);
+ PATCH(ldap_filter_post);
+ #endif
++ PATCH(auth_program_exec);
+
+ /* skip the first, the global context */
+ for (i = 1; i < srv->config_context->used; i++) {
+@@ -169,6 +171,8 @@
+ PATCH(auth_ldap_bindpw);
+ } else if (buffer_is_equal_string(du->key,
CONST_STR_LEN("auth.backend.ldap.allow-empty-pw"))) {
+ PATCH(auth_ldap_allow_empty_pw);
++ } else if (buffer_is_equal_string(du->key,
CONST_STR_LEN("auth.backend.program.exec"))) {
++ PATCH(auth_program_exec);
+ }
+ }
+ }
+@@ -326,7 +330,8 @@
+ { "auth.backend.ldap.allow-empty-pw", NULL,
T_CONFIG_BOOLEAN, T_CONFIG_SCOPE_CONNECTION }, /* 11 */
+ { "auth.backend.htdigest.userfile", NULL, T_CONFIG_STRING,
T_CONFIG_SCOPE_CONNECTION }, /* 12 */
+ { "auth.backend.htpasswd.userfile", NULL, T_CONFIG_STRING,
T_CONFIG_SCOPE_CONNECTION }, /* 13 */
+- { "auth.debug", NULL, T_CONFIG_SHORT,
T_CONFIG_SCOPE_CONNECTION }, /* 14 */
++ { "auth.backend.program.exec", NULL, T_CONFIG_STRING,
T_CONFIG_SCOPE_CONNECTION }, /* 14 */
++ { "auth.debug", NULL, T_CONFIG_SHORT,
T_CONFIG_SCOPE_CONNECTION }, /* 15 */
+ { NULL, NULL, T_CONFIG_UNSET,
T_CONFIG_SCOPE_UNSET }
+ };
+
+@@ -352,6 +357,7 @@
+ s->auth_ldap_filter = buffer_init();
+ s->auth_ldap_cafile = buffer_init();
+ s->auth_ldap_starttls = 0;
++ s->auth_program_exec = buffer_init();
+ s->auth_debug = 0;
+
+ s->auth_require = array_init();
+@@ -376,7 +382,8 @@
+ cv[11].destination = &(s->auth_ldap_allow_empty_pw);
+ cv[12].destination = s->auth_htdigest_userfile;
+ cv[13].destination = s->auth_htpasswd_userfile;
+- cv[14].destination = &(s->auth_debug);
++ cv[14].destination = s->auth_program_exec;
++ cv[15].destination = &(s->auth_debug);
+
+ p->config_storage[i] = s;
+ ca = ((data_config *)srv->config_context->data[i])->value;
+@@ -394,6 +401,8 @@
+ s->auth_backend = AUTH_BACKEND_PLAIN;
+ } else if (0 == strcmp(s->auth_backend_conf->ptr,
"ldap")) {
+ s->auth_backend = AUTH_BACKEND_LDAP;
++ } else if (0 == strcmp(s->auth_backend_conf->ptr,
"program")) {
++ s->auth_backend = AUTH_BACKEND_PROGRAM;
+ } else {
+ log_error_write(srv, __FILE__, __LINE__,
"sb", "auth.backend not supported:", s->auth_backend_conf);
+
+@@ -534,6 +543,28 @@
+ return (ret);
+ break;
+ }
++ case AUTH_BACKEND_PROGRAM: {
++ const char *prog;
++ /*
++ * Let's make some sanity checks so we detect
them during
++ * startup and not only when trying to
authenticate.
++ */
++ if(!(s->auth_program_exec) ||
s->auth_program_exec->used == 0) {
++ log_error_write(srv, __FILE__, __LINE__, "s",
++ "Missing or empty
auth.backend.program.exec");
++ return HANDLER_ERROR;
++ }
++ prog = s->auth_program_exec->ptr;
++ if(access(prog, F_OK | X_OK) < 0) {
++ log_error_write(srv, __FILE__, __LINE__,
"ssss",
++ "auth.backend.program:
Failed access(",
++ prog,
++ "): ",
++ strerror(errno));
++ return HANDLER_ERROR;
++ }
++ break;
++ }
+ default:
+ break;
+ }
diff --git a/http/seamonkey/DETAILS b/http/seamonkey/DETAILS
index b4f007a..eb47f13 100755
--- a/http/seamonkey/DETAILS
+++ b/http/seamonkey/DETAILS
@@ -1,12 +1,12 @@
SPELL=seamonkey
- VERSION=2.0.3
+ VERSION=2.0.4
SOURCE=$SPELL-$VERSION.source.tar.bz2
-
SOURCE_HASH=sha512:37816dd44a3351c10c77e3f0b0cce50c40902faf43da590e1acd1a6e73171f88cb4d2e95d889fa34916df956139212eb3088d6ed09303e720ed72335b4027a7b
+
SOURCE_HASH=sha512:2b2a97193e9329a47a5c3e35a8eecdf460cd945d16ad098526ee712a4e8d56622500eb18254eabbfcf60c0b6fb0408d9f9ec1cd72180db3e3598e8417776ff72
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URI=seamonkey/releases/$VERSION/source/$SOURCE
SOURCE_URL[0]=http://releases.mozilla.org/pub/mozilla.org/$SOURCE_URI
WEB_SITE=http://www.seamonkey-project.org/
- SECURITY_PATCH=22
+ SECURITY_PATCH=23
ENTERED=20010922
LICENSE[0]=MPL
DOCS="LICENSE README.txt"
diff --git a/http/seamonkey/HISTORY b/http/seamonkey/HISTORY
index e8136d7..4a89ee3 100644
--- a/http/seamonkey/HISTORY
+++ b/http/seamonkey/HISTORY
@@ -1,3 +1,7 @@
+2010-03-30 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 2.0.4, SECURITY_PATCH=23
+
http://www.mozilla.org/security/known-vulnerabilities/seamonkey20.html
+
2010-02-18 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 2.0.3, SECURITY_PATCH=22

http://www.mozilla.org/security/known-vulnerabilities/seamonkey20.html
diff --git a/i18n/ibus-anthy/DEPENDS b/i18n/ibus-anthy/DEPENDS
new file mode 100755
index 0000000..18ba5ab
--- /dev/null
+++ b/i18n/ibus-anthy/DEPENDS
@@ -0,0 +1,2 @@
+depends ibus &&
+depends anthy
diff --git a/i18n/ibus-anthy/DETAILS b/i18n/ibus-anthy/DETAILS
new file mode 100755
index 0000000..71d3801
--- /dev/null
+++ b/i18n/ibus-anthy/DETAILS
@@ -0,0 +1,14 @@
+ SPELL=ibus-anthy
+ VERSION=1.2.0.20100313
+ SOURCE="${SPELL}-${VERSION}.tar.gz"
+ SOURCE_URL[0]=http://${SPELL}.googlecode.com/files/${SOURCE}
+
SOURCE_HASH=sha512:7168ee06c2cb9d69c2d4530b2c752e688eaad6ec2b3577026ef2081b81643791598947ac0d30d00dab2c8a9b5a4bf86519037fc0ddc75ca375c55813f61066d4
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
+ WEB_SITE="http://code.google.com/p/ibus/";
+ LICENSE[0]=LGPL
+ ENTERED=20100331
+ SHORT="Anthy input module for IBus"
+cat << EOF
+This module connects IBus to Anthy, a Japanese input method for
+Hiragana-to-Kanji/Kana conversion.
+EOF
diff --git a/i18n/ibus-anthy/HISTORY b/i18n/ibus-anthy/HISTORY
new file mode 100644
index 0000000..2c4ce32
--- /dev/null
+++ b/i18n/ibus-anthy/HISTORY
@@ -0,0 +1,3 @@
+2010-03-31 Ismael Luceno <ismael AT sourcemage.org>
+ * DEPENDS, DETAILS: spell created
+
diff --git a/i18n/ibus/DEPENDS b/i18n/ibus/DEPENDS
new file mode 100755
index 0000000..6b607bc
--- /dev/null
+++ b/i18n/ibus/DEPENDS
@@ -0,0 +1,5 @@
+depends python &&
+depends dbus-glib &&
+depends dbus-python &&
+depends notify-python &&
+depends iso-codes
diff --git a/i18n/ibus/DETAILS b/i18n/ibus/DETAILS
new file mode 100755
index 0000000..d2398b8
--- /dev/null
+++ b/i18n/ibus/DETAILS
@@ -0,0 +1,14 @@
+ SPELL=ibus
+ VERSION=1.3.1
+ SOURCE="${SPELL}-${VERSION}.tar.gz"
+ SOURCE_URL[0]=http://${SPELL}.googlecode.com/files/${SOURCE}
+
SOURCE_HASH=sha512:d30abe9a0b17249d485c32810b0b6d13fa5ce17e824cfc9e72680a2537ca5fbba0b242f75c607bcab9f3fb5ea12d0521cbd6d35b9e0a036128c2647eed5edf3e
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
+ WEB_SITE="http://code.google.com/p/ibus/";
+ LICENSE[0]=LGPL
+ ENTERED=20100331
+ SHORT="Intelligent Input Bus"
+cat << EOF
+IBus (Intelligent Input Bus) is a next generation input framework for UNIX
+and UNIX-like operating systems.
+EOF
diff --git a/i18n/ibus/HISTORY b/i18n/ibus/HISTORY
new file mode 100644
index 0000000..2c4ce32
--- /dev/null
+++ b/i18n/ibus/HISTORY
@@ -0,0 +1,3 @@
+2010-03-31 Ismael Luceno <ismael AT sourcemage.org>
+ * DEPENDS, DETAILS: spell created
+
diff --git a/kde4-apps/kmymoney4/DEPENDS b/kde4-apps/kmymoney4/DEPENDS
new file mode 100755
index 0000000..c781ad2
--- /dev/null
+++ b/kde4-apps/kmymoney4/DEPENDS
@@ -0,0 +1,19 @@
+source "$SECTION_DIRECTORY/KDE_DEPENDS" &&
+sub_depends qt4 QT3 &&
+depends libx11 &&
+depends kdepimlibs4 &&
+depends libxml2 &&
+depends pkgconfig &&
+depends -sub GRAPH boost &&
+depends shared-mime-info &&
+optional_depends libical '' '' 'calendar plugin' &&
+optional_depends libofx '' '' 'OFX direct connection to your bank' &&
+if is_depends_enabled $SPELL libofx; then
+ depends libxml++ &&
+ depends glibmm/var/state/sorcery/packages
+fi &&
+optional_depends finance-quote '' '' 'stock exchange price quotes'
+optional_depends aqbanking '' '' 'online banking' &&
+if is_depends_enabled $SPELL aqbanking;then
+ depends gwenhywfar
+fi
diff --git a/kde4-apps/kmymoney4/DETAILS b/kde4-apps/kmymoney4/DETAILS
new file mode 100755
index 0000000..bc5c03c
--- /dev/null
+++ b/kde4-apps/kmymoney4/DETAILS
@@ -0,0 +1,23 @@
+ SPELL=kmymoney4
+ SPELLX=kmymoney
+ VERSION=3.97.0
+# SOURCE_HASH=sha512:
+ SOURCE=$SPELLX-$VERSION.tar.bz2
+ SOURCE2=$SOURCE.sig
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION
+
SOURCE_URL[0]=http://sourceforge.net/projects/kmymoney2/files/KMyMoney-KDE4/$VERSION/$SOURCE/download
+
SOURCE2_URL[0]=http://sourceforge.net/projects/kmymoney2/files/KMyMoney-KDE4/$VERSION/$SOURCE2/download
+ SOURCE_GPG=kmymoney.gpg:${SOURCE}.sig:WORKS_FOR_ME
+ LICENSE[0]=GPL
+ KEYWORDS="finance kde4"
+ WEB_SITE=http://kmymoney2.sourceforge.net/
+ ENTERED=20091230
+ SHORT="Personal finance manager for KDE"
+cat << EOF
+KMyMoney4 is specifically aimed at the typical home user at present.
+Each account belongs to an institution and can be reconciled to balance your
+transactions. QIF import and export is supported within accounts so KMyMoney4
+can read files exported from other programs and when downloaded from online
+banking institutions. A search dialog is also provided to let the user find
+transactions that match specific criteria.
+EOF
diff --git a/kde4-apps/kmymoney4/HISTORY b/kde4-apps/kmymoney4/HISTORY
new file mode 100644
index 0000000..1adfe29
--- /dev/null
+++ b/kde4-apps/kmymoney4/HISTORY
@@ -0,0 +1,8 @@
+2010-03-31 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 3.97.0
+ convert to gpg checking
+ * kmymoney.gpg: added
+
+2009-12-30 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 3.95
+ spell created
diff --git a/kde4-apps/kmymoney4/PRE_BUILD b/kde4-apps/kmymoney4/PRE_BUILD
new file mode 100755
index 0000000..3aae7c6
--- /dev/null
+++ b/kde4-apps/kmymoney4/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+sed -i '/UPDATE_XDG_MIMETYPES/D' CMakeLists.txt
+#patch -p0 < $SPELL_DIRECTORY/xxx.diff
diff --git a/kde4-apps/kmymoney4/kmymoney.gpg
b/kde4-apps/kmymoney4/kmymoney.gpg
new file mode 100644
index 0000000..92c3613
Binary files /dev/null and b/kde4-apps/kmymoney4/kmymoney.gpg differ
diff --git a/kernels/openfwwf/BUILD b/kernels/openfwwf/BUILD
new file mode 100755
index 0000000..8f58e6d
--- /dev/null
+++ b/kernels/openfwwf/BUILD
@@ -0,0 +1 @@
+make
diff --git a/kernels/openfwwf/DEPENDS b/kernels/openfwwf/DEPENDS
new file mode 100755
index 0000000..1d1e99c
--- /dev/null
+++ b/kernels/openfwwf/DEPENDS
@@ -0,0 +1 @@
+depends b43-tools
diff --git a/kernels/openfwwf/DETAILS b/kernels/openfwwf/DETAILS
new file mode 100755
index 0000000..00ba7b6
--- /dev/null
+++ b/kernels/openfwwf/DETAILS
@@ -0,0 +1,13 @@
+ SPELL=openfwwf
+ VERSION=5.2
+ SOURCE="${SPELL}-${VERSION}.tar.gz"
+ SOURCE_URL[0]=http://www.ing.unibs.it/${SPELL}/firmware/${SOURCE}
+
SOURCE_HASH=sha512:17c2332dea6d0e49a3916bcf46394cb81d9bfa7c2bee56c16267c9b2919f079c240617549f0998acd53a5b63b61a3b04ea1af84b304977c061eff508feaf4bf5
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
+ WEB_SITE="http://www.ing.unibs.it/openfwwf/";
+ LICENSE[0]=GPL
+ ENTERED=20100331
+ SHORT="Free software firmware for BCM43xx"
+cat << EOF
+Free software firmware for Broadcom BCM43xx devices with Wireless-Core
Revision 5
+EOF
diff --git a/kernels/openfwwf/HISTORY b/kernels/openfwwf/HISTORY
new file mode 100644
index 0000000..44ce19a
--- /dev/null
+++ b/kernels/openfwwf/HISTORY
@@ -0,0 +1,3 @@
+2010-03-31 Ismael Luceno <ismael AT sourcemage.org>
+ * BUILD, DEPENDS, DETAILS, INSTALL: spell created
+
diff --git a/kernels/openfwwf/INSTALL b/kernels/openfwwf/INSTALL
new file mode 100755
index 0000000..1b9ba1d
--- /dev/null
+++ b/kernels/openfwwf/INSTALL
@@ -0,0 +1 @@
+make PREFIX="${INSTALL_ROOT}/lib/firmware/b43" install
diff --git a/mail/alpine/DETAILS b/mail/alpine/DETAILS
index 576ff34..3e896b5 100755
--- a/mail/alpine/DETAILS
+++ b/mail/alpine/DETAILS
@@ -68,7 +68,7 @@ if [[ $ALPINE_CHAPPA == y ]]; then

SOURCE21_URL[0]=http://staff.washington.edu/chappa/alpine/patches/alpine-2.00/maildir.patch.gz
fi
if [[ $ALPINE_TOPAL == y ]]; then
- VERSION3=70
+ VERSION3=72
SOURCE22=topal-package-$VERSION3.tgz
SOURCE23=topal-package-$VERSION3.tgz.asc

SOURCE22_URL[0]=http://homepage.ntlworld.com/phil.brooke/topal/rel-$VERSION3/$SOURCE22
diff --git a/mail/alpine/HISTORY b/mail/alpine/HISTORY
index f94193f..a11c4bc 100644
--- a/mail/alpine/HISTORY
+++ b/mail/alpine/HISTORY
@@ -1,3 +1,7 @@
+2010-03-31 Andraž "ruskie" Levstik <ruskie+f03a580f AT codemages.net>
+ * DETAILS: topal update to 72, fixes bug 15633
+ * PRE_BUILD: fix to build a native mime-tool
+
2009-11-27 Andraž "ruskie" Levstik <ruskie+f03a580f AT codemages.net>
* DETAILS: version update to re-alpine
* PREPARE: updated for patches
diff --git a/mail/alpine/PRE_BUILD b/mail/alpine/PRE_BUILD
index e2f2a2f..f32158c 100755
--- a/mail/alpine/PRE_BUILD
+++ b/mail/alpine/PRE_BUILD
@@ -23,6 +23,8 @@ fi &&
if [[ $ALPINE_TOPAL == y ]]; then
unpack_file 22 &&
patch -p1 < topal-$VERSION3/$SPELL-2.00.patch-1 &&
-patch -p1 < topal-$VERSION3/$SPELL-2.00.patch-2
+patch -p1 < topal-$VERSION3/$SPELL-2.00.patch-2 &&
+rm -f topal-$VERSION3/MIME-tool/mime-tool &&
+sed -i "s:\-Wall \-O2:\-Wall $CFLAGS:" topal-$VERSION3/Makefile
fi

diff --git a/mail/thunderbird/DETAILS b/mail/thunderbird/DETAILS
index fe2cbe6..c3351a8 100755
--- a/mail/thunderbird/DETAILS
+++ b/mail/thunderbird/DETAILS
@@ -1,5 +1,5 @@
SPELL=thunderbird
- VERSION=3.0.3
+ VERSION=3.0.4
SOURCE=$SPELL-$VERSION.source.tar.bz2
SOURCE2=$SOURCE.asc
SOURCE_GPG="mozilla.gpg:$SOURCE2:UPSTREAM_KEY"
@@ -7,7 +7,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION

SOURCE_URL[0]=http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/$VERSION/source/$SOURCE

SOURCE2_URL[0]=http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/$VERSION/source/$SOURCE2
SOURCE2_IGNORE=signature
- SECURITY_PATCH=18
+ SECURITY_PATCH=19
WEB_SITE=http://www.mozilla.org/products/thunderbird/
ENTERED=20041028
LICENSE[0]=MOZILLA
diff --git a/mail/thunderbird/HISTORY b/mail/thunderbird/HISTORY
index 244f195..9227768 100644
--- a/mail/thunderbird/HISTORY
+++ b/mail/thunderbird/HISTORY
@@ -1,3 +1,7 @@
+2010-03-30 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 3.0.4, SECURITY_PATCH=19
+
http://www.mozilla.org/security/known-vulnerabilities/thunderbird30.html
+
2010-03-06 George Sherwood <gsherwood AT sourcemage.org>
* DETAILS: Updated to version 3.0.3

diff --git a/utils/rsyslog/DETAILS b/utils/rsyslog/DETAILS
index 485d0c3..d0ef677 100755
--- a/utils/rsyslog/DETAILS
+++ b/utils/rsyslog/DETAILS
@@ -5,9 +5,9 @@ if [[ "${RSYSLOG_BRANCH}" == "devel" ]]; then
SECURITY_PATCH=1

SOURCE_HASH=sha512:3a95eca64f97322f36723fb8c602e86e54eb0f9d942696b5ff3428774a2741e102cc54562db7a515f2b2da52c85b9138ec63c0fd506f8374e57c21bbf1cc257c
elif [[ "${RSYSLOG_BRANCH}" == "v4stable" ]]; then
- VERSION=4.6.1
+ VERSION=4.6.2
SECURITY_PATCH=1
-
SOURCE_HASH=sha512:17ebf2e4901753d15c52665c18f89be75057138d4ce180b550fe35e8871c538cd892eaf6079c816b59cb94bdd11820d33a454ff01e21ee8d5ee63d7aa08bc1af
+
SOURCE_HASH=sha512:dde7af9121c618d6477281d0932e79bb961b0149031c124242f2c6755e5244655c620b064123b85523dbbf5562477c305179c52a2f7a9565b96ffc856a931d8c
elif [[ "${RSYSLOG_BRANCH}" == "v5stable" ]]; then
VERSION=5.4.0

SOURCE_HASH=sha512:3c34b55817d44787fc872f89d356ec4a248992047f563dc432ba46e4c22ae04f97f5b95df64eec3fb3cecdeafd2b315750dcc33ea200f2e7985b43301d850ad3
diff --git a/utils/rsyslog/HISTORY b/utils/rsyslog/HISTORY
index 57850ea..e4f181d 100644
--- a/utils/rsyslog/HISTORY
+++ b/utils/rsyslog/HISTORY
@@ -1,3 +1,6 @@
+2010-03-30 Sukneet Basuta <sukneet AT sourcemage.org>
+ * DETAILS: updated v4stable to 4.6.2
+
2010-03-19 Sukneet Basuta <sukneet AT sourcemage.org>
* PREPARE: added migration of old RSYSLOG_BRANCH name to new
stable => v4stable, v4beta => v4stable, v5beta => v5stable
diff --git a/utils/unetbootin/DETAILS b/utils/unetbootin/DETAILS
index 316c2f1..0f9f783 100755
--- a/utils/unetbootin/DETAILS
+++ b/utils/unetbootin/DETAILS
@@ -1,8 +1,9 @@
SPELL=unetbootin
- VERSION=408
+ VERSION=424
SOURCE="${SPELL}-source-${VERSION}.tar.gz"
+ SOURCE_GPG="gurus.gpg:$SOURCE.sig:WORKS_FOR_ME"
SOURCE_URL[0]=$SOURCEFORGE_URL/${SPELL}/${SOURCE}
-
SOURCE_HASH=sha512:d0279b6d70db598be8a1e869dc51ecf9181ad56e2e7157bc4f28dc008f6de80d8df0a94930af7def35a77a0efa0dcc90625ccd4524cdc94469630e1ef776f783
+#
SOURCE_HASH=sha512:d0279b6d70db598be8a1e869dc51ecf9181ad56e2e7157bc4f28dc008f6de80d8df0a94930af7def35a77a0efa0dcc90625ccd4524cdc94469630e1ef776f783
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
WEB_SITE="http://unetbootin.sourceforge.net/";
LICENSE[0]=GPL
diff --git a/utils/unetbootin/HISTORY b/utils/unetbootin/HISTORY
index cf4d5d0..658dfc5 100644
--- a/utils/unetbootin/HISTORY
+++ b/utils/unetbootin/HISTORY
@@ -1,3 +1,6 @@
+2010-03-31 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: Updated to 424
+
2010-02-28 Arjan Bouter <abouter AT sourcemage.org>
* DETAILS: updated version to 408

diff --git a/utils/unetbootin/unetbootin-source-424.tar.gz.sig
b/utils/unetbootin/unetbootin-source-424.tar.gz.sig
new file mode 100644
index 0000000..8e23fdd
Binary files /dev/null and
b/utils/unetbootin/unetbootin-source-424.tar.gz.sig differ
diff --git a/xorg-driver/xf86-input-synaptics/DETAILS
b/xorg-driver/xf86-input-synaptics/DETAILS
index c378238..049c617 100755
--- a/xorg-driver/xf86-input-synaptics/DETAILS
+++ b/xorg-driver/xf86-input-synaptics/DETAILS
@@ -1,5 +1,5 @@
SPELL=xf86-input-synaptics
- VERSION=1.2.1
+ VERSION=1.2.2
SOURCE=$SPELL-$VERSION.tar.bz2

SOURCE_URL[0]=http://xorg.freedesktop.org/archive/individual/driver/$SOURCE
SOURCE_GPG="gurus.gpg:$SOURCE.sig:UPSTREAM_HASH"
diff --git a/xorg-driver/xf86-input-synaptics/HISTORY
b/xorg-driver/xf86-input-synaptics/HISTORY
index 87cf768..d6dbed5 100644
--- a/xorg-driver/xf86-input-synaptics/HISTORY
+++ b/xorg-driver/xf86-input-synaptics/HISTORY
@@ -1,3 +1,7 @@
+2010-03-30 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: Updated to 1.2.2
+ SOURCE matches upstream posted SHA1
+
2009-12-17 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: Updated to 1.2.1
SOURCE matches upstream posted SHA1
diff --git
a/xorg-driver/xf86-input-synaptics/xf86-input-synaptics-1.2.1.tar.bz2.sig
b/xorg-driver/xf86-input-synaptics/xf86-input-synaptics-1.2.1.tar.bz2.sig
deleted file mode 100644
index d411b31..0000000
Binary files
a/xorg-driver/xf86-input-synaptics/xf86-input-synaptics-1.2.1.tar.bz2.sig and
/dev/null differ
diff --git
a/xorg-driver/xf86-input-synaptics/xf86-input-synaptics-1.2.2.tar.bz2.sig
b/xorg-driver/xf86-input-synaptics/xf86-input-synaptics-1.2.2.tar.bz2.sig
new file mode 100644
index 0000000..faa12e3
Binary files /dev/null and
b/xorg-driver/xf86-input-synaptics/xf86-input-synaptics-1.2.2.tar.bz2.sig
differ
diff --git a/xorg-driver/xf86-video-intel/DETAILS
b/xorg-driver/xf86-video-intel/DETAILS
index 1a31d35..7cce2be 100755
--- a/xorg-driver/xf86-video-intel/DETAILS
+++ b/xorg-driver/xf86-video-intel/DETAILS
@@ -1,5 +1,5 @@
SPELL=xf86-video-intel
- VERSION=2.10.0
+ VERSION=2.11.0
#
SOURCE_HASH=sha512:e2dd500afdc729449a6354c31d47a57ff9a4150be694a55a43e0798b5eba442aaa0a790b33e29f1fd73110ea94f3deeadb47584fd7fe1791787a29305ead858a
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_GPG="gurus.gpg:$SOURCE.sig:UPSTREAM_HASH"
diff --git a/xorg-driver/xf86-video-intel/HISTORY
b/xorg-driver/xf86-video-intel/HISTORY
index 54525c0..38b4760 100644
--- a/xorg-driver/xf86-video-intel/HISTORY
+++ b/xorg-driver/xf86-video-intel/HISTORY
@@ -1,3 +1,7 @@
+2010-03-30 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: Updated to 2.11.0
+ SOURCE matches upstream posted SHA1
+
2010-01-19 Eric Sandall <sandalle AT sourcemage.org>
* DEPENDS: Depends on libdrm built with Intel KMS API
Fixes one issue found in Bug #15547
diff --git a/xorg-driver/xf86-video-intel/xf86-video-intel-2.10.0.tar.bz2.sig
b/xorg-driver/xf86-video-intel/xf86-video-intel-2.10.0.tar.bz2.sig
deleted file mode 100644
index f8fec35..0000000
Binary files
a/xorg-driver/xf86-video-intel/xf86-video-intel-2.10.0.tar.bz2.sig and
/dev/null differ
diff --git a/xorg-driver/xf86-video-intel/xf86-video-intel-2.11.0.tar.bz2.sig
b/xorg-driver/xf86-video-intel/xf86-video-intel-2.11.0.tar.bz2.sig
new file mode 100644
index 0000000..e3b4602
Binary files /dev/null and
b/xorg-driver/xf86-video-intel/xf86-video-intel-2.11.0.tar.bz2.sig differ

[SM-Commit] GIT changes to devel-gnome-2.30 grimoire by Vasil Yonkov (b2ff43a947862cf3ee4618d0264c558e8a939dba), Vasil Yonkov, 03/31/2010