Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to devel-gnome grimoire by Robin Cook (680e1321809753a4d2ed606f0950330dd9ccfd04)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Robin Cook <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to devel-gnome grimoire by Robin Cook (680e1321809753a4d2ed606f0950330dd9ccfd04)
  • Date: Sun, 8 Mar 2009 16:24:13 -0500

GIT changes to devel-gnome grimoire by Robin Cook <rcook AT wyrms.net>:

ChangeLog |
8
audio-soft/mediatomb/DEPENDS |
50 +
audio-soft/mediatomb/DETAILS |
22
audio-soft/mediatomb/HISTORY |
3
audio-soft/mediatomb/PRE_BUILD |
7
dev/null
|binary
devel/bobcat/BUILD |
1
devel/bobcat/DETAILS |
4
devel/bobcat/HISTORY |
4
devel/qdevelop/DETAILS |
4
devel/qdevelop/HISTORY |
3
disk/partimage-ng/DETAILS |
2
disk/partimage-ng/HISTORY |
3
doc/evince/DETAILS |
2
doc/evince/HISTORY |
3
doc/evince/evince-2.24.2.tar.bz2.sig |
0
doc/evince/evince-2.25.92.tar.bz2.sig
|binary
fonts-x11/dejavu-ttf/DETAILS |
4
fonts-x11/dejavu-ttf/HISTORY |
3
ftp/mldonkey/DETAILS |
4
ftp/mldonkey/HISTORY |
3
gnome2-apps/alacarte/DETAILS |
2
gnome2-apps/alacarte/HISTORY |
3
gnome2-apps/alacarte/alacarte-0.11.6.tar.bz2.sig |
0
gnome2-apps/alacarte/alacarte-0.11.9.tar.bz2.sig
|binary
gnome2-apps/deskbar-applet/DETAILS |
2
gnome2-apps/deskbar-applet/HISTORY |
3
gnome2-apps/deskbar-applet/deskbar-applet-2.24.2.tar.bz2.sig |
0
gnome2-apps/deskbar-applet/deskbar-applet-2.25.92.tar.bz2.sig
|binary
gnome2-apps/eog2/DETAILS |
2
gnome2-apps/eog2/HISTORY |
3
gnome2-apps/eog2/eog-2.24.2.tar.bz2.sig |
0
gnome2-apps/eog2/eog-2.25.92.tar.bz2.sig
|binary
gnome2-apps/epiphany-extensions/DETAILS |
2
gnome2-apps/epiphany-extensions/HISTORY |
3
gnome2-apps/epiphany-extensions/epiphany-extensions-2.24.1.tar.bz2.sig |
0
gnome2-apps/epiphany-extensions/epiphany-extensions-2.25.91.tar.bz2.sig
|binary
gnome2-apps/epiphany/DETAILS |
2
gnome2-apps/epiphany/HISTORY |
3
gnome2-apps/epiphany/epiphany-2.24.3.tar.bz2.sig |
0
gnome2-apps/epiphany/epiphany-2.25.91.tar.bz2.sig
|binary
gnome2-apps/evolution/DETAILS |
2
gnome2-apps/evolution/HISTORY |
3
gnome2-apps/evolution/evolution-2.24.4.tar.bz2.sig |
0
gnome2-apps/evolution/evolution-2.25.92.tar.bz2.sig
|binary
gnome2-apps/file-roller/DETAILS |
2
gnome2-apps/file-roller/HISTORY |
3
gnome2-apps/file-roller/file-roller-2.24.2.tar.gz.sig |
0
gnome2-apps/file-roller/file-roller-2.25.92.tar.gz.sig
|binary
gnome2-apps/gramps/DETAILS |
4
gnome2-apps/gramps/HISTORY |
3
gnome2-libs/evolution-exchange/DETAILS |
2
gnome2-libs/evolution-exchange/HISTORY |
3
gnome2-libs/evolution-exchange/evolution-exchange-2.24.2.tar.bz2.sig |
0
gnome2-libs/evolution-exchange/evolution-exchange-2.25.92.tar.bz2.sig
|binary
http/lighttpd/DETAILS |
4
http/lighttpd/HISTORY |
3
kernels/kqemu/BUILD |
4
kernels/kqemu/DETAILS |
30
kernels/kqemu/HISTORY |
7
kernels/kqemu/INSTALL |
10
kernels/kqemu/PRE_BUILD |
9
kernels/kqemu/ftbfs-linux-2.6.22.patch |
15
kernels/kqemu/kqemu-1.3.0pre11.tar.gz.sig |
0
kernels/kqemu/kqemu-1.3.0pre11_linux-2.6.22.patch |
16
kernels/kqemu/kqemu-1.4.0pre1.tar.gz.sig
|binary
libs/libidn/DETAILS |
2
libs/libidn/HISTORY |
3
libs/readline/DETAILS |
13
libs/readline/HISTORY |
7
libs/readline/INSTALL |
16
libs/readline/PRE_BUILD |
18
libs/readline/REPAIR^3004ba79eee5283ad792e3c6899d71e4^POST_REMOVE |
1
libs/readline/readline52-001 |
30
libs/readline/readline52-002 |
49 -
libs/readline/readline52-003 |
37 -
libs/readline/readline52-004 |
70 --
libs/readline/readline52-005 |
328 ----------
libs/readline/readline52-006 |
62 -
libs/readline/readline52-007 |
65 -
libs/readline/readline52-008 |
70 --
libs/readline/readline52-009 |
45 -
libs/readline/readline52-010 |
47 -
libs/readline/readline52-011 |
32
libs/readline/readline52-012 |
150 ----
libs/xalan-c/BUILD |
18
libs/xalan-c/DEPENDS |
4
libs/xalan-c/DETAILS |
14
libs/xalan-c/HISTORY |
12
libs/xalan-c/INSTALL |
2
libs/xalan-c/PREPARE |
2
libs/xalan-c/PRE_BUILD |
6
libs/xerces-c/BUILD |
17
libs/xerces-c/DEPENDS |
10
libs/xerces-c/DETAILS |
8
libs/xerces-c/HISTORY |
6
libs/xerces-c/INSTALL |
6
lua-forge/luafilesystem/DETAILS |
16
lua-forge/luafilesystem/HISTORY |
3
net/iptables/HISTORY |
6
net/iptables/PRE_BUILD |
3
net/iptables/iptables-xtables-compile-fix.patch |
11
net/shorewall-common/DETAILS |
2
net/shorewall-common/HISTORY |
3
net/shorewall-docs-html/DETAILS |
2
net/shorewall-docs-html/HISTORY |
3
net/shorewall-docs-xml/DETAILS |
2
net/shorewall-docs-xml/HISTORY |
3
net/shorewall-lite/DETAILS |
2
net/shorewall-lite/HISTORY |
3
net/shorewall-perl/DETAILS |
4
net/shorewall-perl/HISTORY |
3
net/shorewall-shell/DETAILS |
2
net/shorewall-shell/HISTORY |
3
net/shorewall/DEPENDS |
2
net/shorewall/DETAILS |
2
net/shorewall/HISTORY |
3
net/shorewall6-lite/BUILD |
1
net/shorewall6-lite/CONFLICTS |
1
net/shorewall6-lite/DEPENDS |
3
net/shorewall6-lite/DETAILS |
37 +
net/shorewall6-lite/HISTORY |
3
net/shorewall6-lite/INSTALL |
1
net/shorewall6-lite/PRE_BUILD |
6
net/shorewall6-lite/init.d/shorewall6 |
47 +
net/shorewall6-lite/init.d/shorewall6.conf |
5
net/shorewall6/BUILD |
1
net/shorewall6/DEPENDS |
7
net/shorewall6/DETAILS |
37 +
net/shorewall6/HISTORY |
2
net/shorewall6/INSTALL |
1
net/shorewall6/PRE_BUILD |
6
printer/gv/DETAILS |
5
printer/gv/HISTORY |
3
python-pypi/bzrtools/DETAILS |
2
python-pypi/bzrtools/HISTORY |
3
shell-term-fm/bash/DETAILS |
4
shell-term-fm/bash/HISTORY |
3
utils/qemu/BUILD |
15
utils/qemu/CONFIGURE |
29
utils/qemu/DEPENDS |
21
utils/qemu/DETAILS |
21
utils/qemu/HISTORY |
8
utils/qemu/PRE_BUILD |
2
utils/qemu/archs |
47 -
utils/qemu/qemu-0.9.1.tar.gz.sig |
0
utils/qemu/qemu.gpg
|binary
utils/qemulator/BUILD |
1
utils/qemulator/DEPENDS |
2
utils/qemulator/DETAILS |
20
utils/qemulator/HISTORY |
2
utils/qemulator/INSTALL |
1
utils/sysstat/DETAILS |
4
utils/sysstat/HISTORY |
3
x11-libs/wine/BUILD |
7
x11-libs/wine/HISTORY |
4
156 files changed, 660 insertions(+), 1208 deletions(-)

New commits:
commit 680e1321809753a4d2ed606f0950330dd9ccfd04
Author: Robin Cook <rcook AT wyrms.net>
Commit: Robin Cook <rcook AT wyrms.net>

file-roller: updated to 2.25.92

commit 5efc1507283a514bf33d8c82003189934377c4bc
Author: Robin Cook <rcook AT wyrms.net>
Commit: Robin Cook <rcook AT wyrms.net>

evince: updated to 2.25.92

commit 33f8cc6f4400cb19b84aecb1994988c4a6d70e39
Author: Robin Cook <rcook AT wyrms.net>
Commit: Robin Cook <rcook AT wyrms.net>

epiphany-extensions: updated to 2.25.91

commit ba581e5fa937c4d38621191df5e0514cba15aee8
Author: Robin Cook <rcook AT wyrms.net>
Commit: Robin Cook <rcook AT wyrms.net>

evolution-exchange: updated to 2.25.92

commit 0e678f045786b3a5a61918eabc2922fec4e3459d
Author: Robin Cook <rcook AT wyrms.net>
Commit: Robin Cook <rcook AT wyrms.net>

epiphany: updated to 2.25.91

commit 3501106175a551ba006a1d2dd610028c07df6d4e
Author: Robin Cook <rcook AT wyrms.net>
Commit: Robin Cook <rcook AT wyrms.net>

aborts the commit.

evolution: updated to 2.25.92

commit e42a89704016296c723df4a8428237f14d60a80d
Author: Robin Cook <rcook AT wyrms.net>
Commit: Robin Cook <rcook AT wyrms.net>

eog2: updated to 2.25.92

commit 5567c8a8e7404ee6793434023fe59425116a2e6d
Author: Robin Cook <rcook AT wyrms.net>
Commit: Robin Cook <rcook AT wyrms.net>

deskbar-applet: updated to 2.25.92

commit 33c12f05926ffb7433489ab8014c4a7a60f382b8
Author: Robin Cook <rcook AT wyrms.net>
Commit: Robin Cook <rcook AT wyrms.net>

alacarte: updated to 0.11.9

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

libidn 1.13

commit 2da6f86450e2314d7b2bd71aa45ce033cd16d9dd
Author: Ladislav Hagara <ladislav.hagara AT unob.cz>
Commit: Ladislav Hagara <ladislav.hagara AT unob.cz>

sysstat 9.0.1

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

dejavu-ttf: => 2.29

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

shorewall6-lite: new spell, shorewall-lite for IPv6

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

shorewall6: new spell, IPv6 shorewall

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

shorewall-perl: version 4.2.6.2

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

shorewall-shell: version 4.2.6

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

shorewall-lite: version 4.2.6

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

shorewall-docs-xml: version 4.2.6

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

shorewall-docs-html: version 4.2.6

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

shorewall-common: version 4.2.6

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

shorewall: version 4.2.6

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

mediatomb: new spell, upnp media server

commit 80755587f9b36e48ed34d61127d21318282a4f6c
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

Revert "Revert "bash: => 4.0, post-3.2.48 release""

testing hasn't shown any regressions

This reverts commit 79a514844f286363da97c139e0e5869e4efb6ef4.

commit 9b5d335ea0cb8b3d9b537df753c7f57024c80770
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

Revert "Revert "readline: => 6.0""

testing hasn't shown any regressions

This reverts commit 30254680f6d602c765801a142179903b04a34700.

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

mldonkey: => 3.0.0

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

bzrtools: => 1.12.0

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

luafilesystem: => 1.4.2

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

wine: Hopefully final fix for the GCC bug triggered in WINE Bug #17024,
use -fno-guess-branch-probability if using -O3 in CFLAGS

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

lighttpd: => 1.4.22

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

qdevelop: => 0.27.4

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

qemulator: new spell, comfortable GUI for the qemu virtual engine

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

qemu: => 0.10.0

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

kqemu: => 1.4.0pre1

commit 59f00e2d98333477c56223ea6af8a0be5ad12eca
Author: George Sherwood <gsherwood AT sourcemage.org>
Commit: George Sherwood <gsherwood AT sourcemage.org>

pan: +x DETAILS. Bug 15017

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

partimage-ng - new website

commit b1ad34989bdff091acf05ef9cf990ba9acab4d4d
Author: Remko van der Vossen <wich AT sourcemage.org>
Commit: Remko van der Vossen <wich AT sourcemage.org>

gv: version 3.6.6

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

bobcat-2.01.1

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

xalan-c - fix install of symlinks

commit d2887a34132c0d803f0255f30a7fcb660c914fda
Author: Remko van der Vossen <wich AT yuugen.jp>
Commit: Remko van der Vossen <wich AT yuugen.jp>

iptables: xtables compile fix, fixes bug 15015.

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

gramps: => 3.1.0

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

xalan-c-svn

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

xerces-c: => 3.0.1

diff --git a/ChangeLog b/ChangeLog
index 47777bc..39f3349 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2009-03-08 Arjan Bouter <abouter AT sourcemage.org>
+ * audio-soft/mediatomb: new spell, upnp media server
+ * net/shorewall6: new spell, shorewall IPv6
+ * net/shorewall6-lite: new spell, shorewall-lite for IPv6
+
+2009-03-07 Vlad Glagolev <stealth AT sourcemage.org>
+ * utils/qemulator: new spell, comfortable GUI for the qemu virtual
engine
+
2009-03-05 Julien "_kaze_" ROZO <julien AT rozo.org>
* kde4-apps/bibletime4: new spell, kde4 version of bibletime

diff --git a/audio-soft/mediatomb/DEPENDS b/audio-soft/mediatomb/DEPENDS
new file mode 100755
index 0000000..62d96f0
--- /dev/null
+++ b/audio-soft/mediatomb/DEPENDS
@@ -0,0 +1,50 @@
+message "MediaTomb requires either sqlite or mysql to store it's db"
+optional_depends sqlite \
+ "--enable-sqlite" \
+ "--disable-sqlite" \
+ "to store the media db in sqlite" &&
+optional_depends mysql \
+ "--enable-mysql" \
+ "--disable-mysql" \
+ "store the media db in mysql" &&
+optional_depends expat \
+ "--enable-expat" \
+ "--disable-expat" \
+ "use the expat XML parser" &&
+optional_depends zlib \
+ "" \
+ "" \
+ "for auto creation of the media db" &&
+optional_depends file \
+ "--enable-libmagic" \
+ "--disable-libmagic" \
+ "file type recognition" &&
+optional_depends spidermonkey \
+ "--enable-libjs" \
+ "--disable-libjs" \
+ "personalized virtual containers" &&
+message "mediatomb depends on either taglib or id3lib, but NOT both" &&
+optional_depends taglib \
+ "--enable-taglib" \
+ "--disable-taglib" \
+ "to parse id3 tags" &&
+optional_depends id3lib \
+ "--enable-id3lib" \
+ "--disable-id3lib" \
+ "to parse id3 tags" &&
+optional_depends libexif \
+ "--enable-libexif" \
+ "--disable-libexif" \
+ "to gather metadata from JPEG files" &&
+optional_depends curl \
+ "--enable-curl" \
+ "--disable-curl" \
+ "to fetch content from the web" &&
+optional_depends libextractor \
+ "--enable-libextractor" \
+ "--disable-libextractor" \
+ "to gather metadata from various files (NOT recommended)" &&
+optional_depends LIBAVCODEC \
+ "--enable-ffmpeg --with-ffmpeg-h=/usr/include/libavformat" \
+ "--disable-ffmpeg" \
+ "to gather metadata from video files"
diff --git a/audio-soft/mediatomb/DETAILS b/audio-soft/mediatomb/DETAILS
new file mode 100755
index 0000000..53d0378
--- /dev/null
+++ b/audio-soft/mediatomb/DETAILS
@@ -0,0 +1,22 @@
+ SPELL=mediatomb
+ VERSION=0.11.0
+ SOURCE="${SPELL}-${VERSION}.tar.gz"
+ SOURCE_URL[0]=$SOURCEFORGE_URL/${SPELL}/${SOURCE}
+
SOURCE_HASH=sha512:52e6fccbbda16edc778044ac591c1f3b80941edafbd80170ef4d10297fca051421976003566609db7461faa4c0efd74337943e10b802e57072525a2e5e74036b
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
+ WEB_SITE="http://mediatomb.cc";
+ LICENSE[0]=GPL
+ ENTERED=20090308
+ SHORT="open source media server"
+cat << EOF
+MediaTomb is an open source (GPL) UPnP MediaServer with a nice web user
interface,
+it allows you to stream your digital media through your home network and
+listen to/watch it on a variety of UPnP compatible devices.
+MediaTomb implements the UPnP MediaServer V 1.0 specification that can be
found on
+http://www.upnp.org/. The current implementation focuses on parts that are
required
+by the specification, however we look into extending the functionality to
cover the
+optional parts of the spec as well.
+MediaTomb should work with any UPnP compliant MediaRenderer, please tell us
if you
+experience difficulties with particular models, also take a look at the
Supported
+Devices list for more information.
+EOF
diff --git a/audio-soft/mediatomb/HISTORY b/audio-soft/mediatomb/HISTORY
new file mode 100644
index 0000000..01bcbd7
--- /dev/null
+++ b/audio-soft/mediatomb/HISTORY
@@ -0,0 +1,3 @@
+2009-03-08 Arjan Bouter <abouter AT sourcemage.org>
+ * DEPENDS, DETAILS, PRE_BUILD: spell created
+
diff --git a/audio-soft/mediatomb/PRE_BUILD b/audio-soft/mediatomb/PRE_BUILD
new file mode 100755
index 0000000..1ea7218
--- /dev/null
+++ b/audio-soft/mediatomb/PRE_BUILD
@@ -0,0 +1,7 @@
+default_pre_build &&
+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
diff --git a/devel/bobcat/BUILD b/devel/bobcat/BUILD
index 43a00d9..19e437f 100755
--- a/devel/bobcat/BUILD
+++ b/devel/bobcat/BUILD
@@ -1,2 +1,3 @@
echo -e "\n\n" | ./build libraries &&
+./build lcgen &&
./build man
diff --git a/devel/bobcat/DETAILS b/devel/bobcat/DETAILS
index a873fbc..aa5b3b9 100755
--- a/devel/bobcat/DETAILS
+++ b/devel/bobcat/DETAILS
@@ -1,6 +1,6 @@
SPELL=bobcat
- VERSION=2.00.1
-
SOURCE_HASH=sha512:2211e724bdfe55da46fd3d5ad71b90e7df8a0a98862401133cb3611ead4287e5483af8173e0bbb84dadaacdbe5991f36a15c5eea1eb4356d1ebf020cd794cee6
+ VERSION=2.01.1
+
SOURCE_HASH=sha512:ca4bcf0d1030901703fbcfedf9b13cef866c9b119502bf056eae083c1802e0e1fc5b384b1594189d1c5f980bafa769cb1a22771b5dcbd0c75ea63087c455e2fb
SOURCE=${SPELL}_${VERSION}.orig.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
diff --git a/devel/bobcat/HISTORY b/devel/bobcat/HISTORY
index c820ae2..32d8d67 100644
--- a/devel/bobcat/HISTORY
+++ b/devel/bobcat/HISTORY
@@ -1,3 +1,7 @@
+2009-03-07 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 2.01.1
+ * BUILD: also build lcgen (needed during install)
+
2008-12-19 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 2.00.1

diff --git a/devel/qdevelop/DETAILS b/devel/qdevelop/DETAILS
index 5a1be5c..82576f8 100755
--- a/devel/qdevelop/DETAILS
+++ b/devel/qdevelop/DETAILS
@@ -1,6 +1,6 @@
SPELL=qdevelop
- VERSION=0.27.2
-
SOURCE_HASH=sha512:0a2162f491c02103ca461b5e88c1148de1ab70a982d423d81970408fff6d4302df5bd4e9a56317df7083ce3e29052df20e76aa0a2a8d54e2c5cd739726d0bc6c
+ VERSION=0.27.4
+
SOURCE_HASH=sha512:fb44f06e82d20b354a7e01fe3a0776cd954222597b3ff41a9679165b249a1172da745be8a00c4f4726b1a0eacf14b4001b85a4f44210da866b316e2b9f4d04ff
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
diff --git a/devel/qdevelop/HISTORY b/devel/qdevelop/HISTORY
index 6bd4c60..a118d7d 100644
--- a/devel/qdevelop/HISTORY
+++ b/devel/qdevelop/HISTORY
@@ -1,3 +1,6 @@
+2009-03-07 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.27.4
+
2009-02-27 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.27.2
spell created
diff --git a/disk/partimage-ng/DETAILS b/disk/partimage-ng/DETAILS
index 49f5910..f79d9aa 100755
--- a/disk/partimage-ng/DETAILS
+++ b/disk/partimage-ng/DETAILS
@@ -12,7 +12,7 @@ else

SOURCE_URL[0]=http://launchpad.net/partimage-ng/devel/$VERSION/+download/$SOURCE
fi
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL
- WEB_SITE=http://partimage-ng.org
+ WEB_SITE=http://launchpad.net/partimage-ng
LICENSE[0]=GPL
ENTERED=20080224
KEYWORDS="disk"
diff --git a/disk/partimage-ng/HISTORY b/disk/partimage-ng/HISTORY
index aa6d488..c55e933 100644
--- a/disk/partimage-ng/HISTORY
+++ b/disk/partimage-ng/HISTORY
@@ -1,3 +1,6 @@
+2009-03-07 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: new website, previous one was usurped
+
2008-12-11 Treeve Jelbert <treeve AT sourcemage.org>
* TRIGGERS: added, for ntfs-3g

diff --git a/doc/evince/DETAILS b/doc/evince/DETAILS
index 5de1277..7ecb54b 100755
--- a/doc/evince/DETAILS
+++ b/doc/evince/DETAILS
@@ -1,5 +1,5 @@
SPELL=evince
- VERSION=2.24.2
+ VERSION=2.25.92
BRANCH=$(echo $VERSION | cut -d. -f1,2)
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/doc/evince/HISTORY b/doc/evince/HISTORY
index 31c5342..5997466 100644
--- a/doc/evince/HISTORY
+++ b/doc/evince/HISTORY
@@ -1,3 +1,6 @@
+2009-03-08 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 2.25.92
+
2008-11-25 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 2.24.2

diff --git a/doc/evince/evince-2.24.2.tar.bz2.sig
b/doc/evince/evince-2.24.2.tar.bz2.sig
deleted file mode 100644
index b00b111..0000000
Binary files a/doc/evince/evince-2.24.2.tar.bz2.sig and /dev/null differ
diff --git a/doc/evince/evince-2.25.92.tar.bz2.sig
b/doc/evince/evince-2.25.92.tar.bz2.sig
new file mode 100644
index 0000000..7dcd9f2
Binary files /dev/null and b/doc/evince/evince-2.25.92.tar.bz2.sig differ
diff --git a/fonts-x11/dejavu-ttf/DETAILS b/fonts-x11/dejavu-ttf/DETAILS
index 377ea47..604aa9a 100755
--- a/fonts-x11/dejavu-ttf/DETAILS
+++ b/fonts-x11/dejavu-ttf/DETAILS
@@ -1,8 +1,8 @@
SPELL=dejavu-ttf
SPELLX=dejavu-fonts-ttf
PACKAGE=${SPELL%-*}
- VERSION=2.28
-
SOURCE_HASH=sha512:c6f8ee02fc274c4c316dad2da0fce22cdacb5d1c2f04411d7a6a34102a5f870c71bb79f992bd16ae3a701a1d412f8caf347187245d98f4b206accfed1d577c21
+ VERSION=2.29
+
SOURCE_HASH=sha512:0db11d61c997f1bab3f595d7b434fce9034614bb9bc822df72b77a5e8d9ed7741c5cd8175299d89ac466ba9591f9ec883f9e9fed17e38075cdf7090ee49a6345
SOURCE=$SPELLX-$VERSION.tar.bz2
DOCS="README LICENSE AUTHORS NEWS BUGS *.txt"
SOURCE_URL[0]=$SOURCEFORGE_URL/$PACKAGE/$SOURCE
diff --git a/fonts-x11/dejavu-ttf/HISTORY b/fonts-x11/dejavu-ttf/HISTORY
index 67efe95..b19fd25 100644
--- a/fonts-x11/dejavu-ttf/HISTORY
+++ b/fonts-x11/dejavu-ttf/HISTORY
@@ -1,3 +1,6 @@
+2009-03-08 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 2.29
+
2009-01-30 Eric Sandall <sandalle AT sourcemage.org>
* POST_REMOVE: Removed, default_post_remove is now defined in
SECTION_DIRECTORY/FUNCTIONS
diff --git a/ftp/mldonkey/DETAILS b/ftp/mldonkey/DETAILS
index f22dac4..a66ec78 100755
--- a/ftp/mldonkey/DETAILS
+++ b/ftp/mldonkey/DETAILS
@@ -1,6 +1,6 @@
SPELL=mldonkey
- VERSION=2.9.7
-
SOURCE_HASH=sha512:2a30283464fdc565b8f05518e67f956afe8d67ab10c8727a52f1d46d503a3739387e847df593c06c6ecd4ece83086dc8c95a3b2d6afb8862d90daf996353f76a
+ VERSION=3.0.0
+
SOURCE_HASH=sha512:93d8c21508f2a2340503d0c4b68acbf7d85316bc48d25f9c4da05d14480321288b3b260cb3eaf9416dbd699162f03239636f7b961430b9ece710378ea800a860
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=${SOURCEFORGE_URL}/${SPELL}/${SOURCE}
diff --git a/ftp/mldonkey/HISTORY b/ftp/mldonkey/HISTORY
index e4e7040..dbd8f0d 100644
--- a/ftp/mldonkey/HISTORY
+++ b/ftp/mldonkey/HISTORY
@@ -1,3 +1,6 @@
+2009-03-08 Treeve Jelbert <treeve AT sourcemage.org
+ * DETAILS: version 3.0.0
+
2009-01-21 Treeve Jelbert <treeve AT sourcemage.org
* DETAILS: version 2.9.7

diff --git a/gnome2-apps/alacarte/DETAILS b/gnome2-apps/alacarte/DETAILS
index 9b3ff6b..7fb4666 100755
--- a/gnome2-apps/alacarte/DETAILS
+++ b/gnome2-apps/alacarte/DETAILS
@@ -1,5 +1,5 @@
SPELL=alacarte
- VERSION=0.11.6
+ VERSION=0.11.9
BRANCH=`echo ${VERSION}|cut -d . -f 1,2`
SOURCE=${SPELL}-${VERSION}.tar.bz2
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
diff --git a/gnome2-apps/alacarte/HISTORY b/gnome2-apps/alacarte/HISTORY
index 591ab98..79227ac 100644
--- a/gnome2-apps/alacarte/HISTORY
+++ b/gnome2-apps/alacarte/HISTORY
@@ -1,3 +1,6 @@
+2009-03-08 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 0.11.9
+
2008-10-05 Robin Cook <rcook AT wyrms.net>
* DETAILS: updated VERSION to 0.11.6

diff --git a/gnome2-apps/alacarte/alacarte-0.11.6.tar.bz2.sig
b/gnome2-apps/alacarte/alacarte-0.11.6.tar.bz2.sig
deleted file mode 100644
index 76ad584..0000000
Binary files a/gnome2-apps/alacarte/alacarte-0.11.6.tar.bz2.sig and /dev/null
differ
diff --git a/gnome2-apps/alacarte/alacarte-0.11.9.tar.bz2.sig
b/gnome2-apps/alacarte/alacarte-0.11.9.tar.bz2.sig
new file mode 100644
index 0000000..bb9f47f
Binary files /dev/null and b/gnome2-apps/alacarte/alacarte-0.11.9.tar.bz2.sig
differ
diff --git a/gnome2-apps/deskbar-applet/DETAILS
b/gnome2-apps/deskbar-applet/DETAILS
index 2bcf08b..6e56703 100755
--- a/gnome2-apps/deskbar-applet/DETAILS
+++ b/gnome2-apps/deskbar-applet/DETAILS
@@ -1,5 +1,5 @@
SPELL=deskbar-applet
- VERSION=2.24.2
+ VERSION=2.25.92
BRANCH=`echo $VERSION|cut -d . -f 1,2`
SOURCE=$SPELL-$VERSION.tar.bz2

SOURCE_URL[0]=http://ftp.gnome.org/pub/GNOME/sources/$SPELL/$BRANCH/$SOURCE
diff --git a/gnome2-apps/deskbar-applet/HISTORY
b/gnome2-apps/deskbar-applet/HISTORY
index 3c6f9ee..6747e7d 100644
--- a/gnome2-apps/deskbar-applet/HISTORY
+++ b/gnome2-apps/deskbar-applet/HISTORY
@@ -1,3 +1,6 @@
+2009-03-08 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 2.25.92
+
2008-11-30 Robin Cook <rcook AT wyrms.net>
* DETAILS: updated VERSION to 2.24.2

diff --git a/gnome2-apps/deskbar-applet/deskbar-applet-2.24.2.tar.bz2.sig
b/gnome2-apps/deskbar-applet/deskbar-applet-2.24.2.tar.bz2.sig
deleted file mode 100644
index 82955a8..0000000
Binary files a/gnome2-apps/deskbar-applet/deskbar-applet-2.24.2.tar.bz2.sig
and /dev/null differ
diff --git a/gnome2-apps/deskbar-applet/deskbar-applet-2.25.92.tar.bz2.sig
b/gnome2-apps/deskbar-applet/deskbar-applet-2.25.92.tar.bz2.sig
new file mode 100644
index 0000000..edaf1a7
Binary files /dev/null and
b/gnome2-apps/deskbar-applet/deskbar-applet-2.25.92.tar.bz2.sig differ
diff --git a/gnome2-apps/eog2/DETAILS b/gnome2-apps/eog2/DETAILS
index da779e5..4ebe7e1 100755
--- a/gnome2-apps/eog2/DETAILS
+++ b/gnome2-apps/eog2/DETAILS
@@ -1,5 +1,5 @@
SPELL=eog2
- VERSION=2.24.2
+ VERSION=2.25.92
BRANCH=`echo $VERSION|cut -d . -f 1,2`
SOURCE=eog-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/eog-$VERSION
diff --git a/gnome2-apps/eog2/HISTORY b/gnome2-apps/eog2/HISTORY
index 3cf68b3..4bc8f83 100644
--- a/gnome2-apps/eog2/HISTORY
+++ b/gnome2-apps/eog2/HISTORY
@@ -1,3 +1,6 @@
+2009-03-08 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 2.25.92
+
2008-11-30 Robin Cook <rcook AT wyrms.net>
* DETAILS: updated VERSION to 2.24.2

diff --git a/gnome2-apps/eog2/eog-2.24.2.tar.bz2.sig
b/gnome2-apps/eog2/eog-2.24.2.tar.bz2.sig
deleted file mode 100644
index f7fd21e..0000000
Binary files a/gnome2-apps/eog2/eog-2.24.2.tar.bz2.sig and /dev/null differ
diff --git a/gnome2-apps/eog2/eog-2.25.92.tar.bz2.sig
b/gnome2-apps/eog2/eog-2.25.92.tar.bz2.sig
new file mode 100644
index 0000000..8f2d5ef
Binary files /dev/null and b/gnome2-apps/eog2/eog-2.25.92.tar.bz2.sig differ
diff --git a/gnome2-apps/epiphany-extensions/DETAILS
b/gnome2-apps/epiphany-extensions/DETAILS
index ead4c9f..34ff7ff 100755
--- a/gnome2-apps/epiphany-extensions/DETAILS
+++ b/gnome2-apps/epiphany-extensions/DETAILS
@@ -1,5 +1,5 @@
SPELL=epiphany-extensions
- VERSION=2.24.1
+ VERSION=2.25.91
BRANCH=$(echo $VERSION|cut -d . -f 1,2)
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/gnome2-apps/epiphany-extensions/HISTORY
b/gnome2-apps/epiphany-extensions/HISTORY
index 671e726..fd46f83 100644
--- a/gnome2-apps/epiphany-extensions/HISTORY
+++ b/gnome2-apps/epiphany-extensions/HISTORY
@@ -1,3 +1,6 @@
+2009-03-08 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 2.25.91
+
2009-01-03 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* DEPENDS: added missing && and uppercased the subdep #15000

diff --git
a/gnome2-apps/epiphany-extensions/epiphany-extensions-2.24.1.tar.bz2.sig
b/gnome2-apps/epiphany-extensions/epiphany-extensions-2.24.1.tar.bz2.sig
deleted file mode 100644
index 2ff31ac..0000000
Binary files
a/gnome2-apps/epiphany-extensions/epiphany-extensions-2.24.1.tar.bz2.sig and
/dev/null differ
diff --git
a/gnome2-apps/epiphany-extensions/epiphany-extensions-2.25.91.tar.bz2.sig
b/gnome2-apps/epiphany-extensions/epiphany-extensions-2.25.91.tar.bz2.sig
new file mode 100644
index 0000000..d56f1da
Binary files /dev/null and
b/gnome2-apps/epiphany-extensions/epiphany-extensions-2.25.91.tar.bz2.sig
differ
diff --git a/gnome2-apps/epiphany/DETAILS b/gnome2-apps/epiphany/DETAILS
index 1d1f2e1..113cb9b 100755
--- a/gnome2-apps/epiphany/DETAILS
+++ b/gnome2-apps/epiphany/DETAILS
@@ -1,5 +1,5 @@
SPELL=epiphany
- VERSION=2.24.3
+ VERSION=2.25.91
BRANCH=$(echo $VERSION|cut -d . -f 1,2)
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/gnome2-apps/epiphany/HISTORY b/gnome2-apps/epiphany/HISTORY
index 45acb16..a6b1455 100644
--- a/gnome2-apps/epiphany/HISTORY
+++ b/gnome2-apps/epiphany/HISTORY
@@ -1,3 +1,6 @@
+2009-03-08 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 2.25.91
+
2009-01-13 George Sherwood <gsherwood AT sourcemage.org>
* DETAILS: Updated to version 2.24.3

diff --git a/gnome2-apps/epiphany/epiphany-2.24.3.tar.bz2.sig
b/gnome2-apps/epiphany/epiphany-2.24.3.tar.bz2.sig
deleted file mode 100644
index 1d602ab..0000000
Binary files a/gnome2-apps/epiphany/epiphany-2.24.3.tar.bz2.sig and /dev/null
differ
diff --git a/gnome2-apps/epiphany/epiphany-2.25.91.tar.bz2.sig
b/gnome2-apps/epiphany/epiphany-2.25.91.tar.bz2.sig
new file mode 100644
index 0000000..cfb19d4
Binary files /dev/null and
b/gnome2-apps/epiphany/epiphany-2.25.91.tar.bz2.sig differ
diff --git a/gnome2-apps/evolution/DETAILS b/gnome2-apps/evolution/DETAILS
index 76026a8..f1ddd5e 100755
--- a/gnome2-apps/evolution/DETAILS
+++ b/gnome2-apps/evolution/DETAILS
@@ -1,5 +1,5 @@
SPELL=evolution
- VERSION=2.24.4
+ VERSION=2.25.92
BRANCH=${VERSION:0:4}
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/gnome2-apps/evolution/HISTORY b/gnome2-apps/evolution/HISTORY
index e8f2c60..b2029e1 100644
--- a/gnome2-apps/evolution/HISTORY
+++ b/gnome2-apps/evolution/HISTORY
@@ -1,3 +1,6 @@
+2009-03-08 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 2.25.92
+
2009-03-02 Eric Sandall <sandalle AT sourcemage.org>
* DEPENDS: Links against avahi if it's available

diff --git a/gnome2-apps/evolution/evolution-2.24.4.tar.bz2.sig
b/gnome2-apps/evolution/evolution-2.24.4.tar.bz2.sig
deleted file mode 100644
index f0cbaff..0000000
Binary files a/gnome2-apps/evolution/evolution-2.24.4.tar.bz2.sig and
/dev/null differ
diff --git a/gnome2-apps/evolution/evolution-2.25.92.tar.bz2.sig
b/gnome2-apps/evolution/evolution-2.25.92.tar.bz2.sig
new file mode 100644
index 0000000..3046e72
Binary files /dev/null and
b/gnome2-apps/evolution/evolution-2.25.92.tar.bz2.sig differ
diff --git a/gnome2-apps/file-roller/DETAILS b/gnome2-apps/file-roller/DETAILS
index 69f1171..128766d 100755
--- a/gnome2-apps/file-roller/DETAILS
+++ b/gnome2-apps/file-roller/DETAILS
@@ -1,5 +1,5 @@
SPELL=file-roller
- VERSION=2.24.2
+ VERSION=2.25.92
BRANCH=`echo $VERSION | cut -d . -f 1,2`
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/gnome2-apps/file-roller/HISTORY b/gnome2-apps/file-roller/HISTORY
index a3a9e88..db11a91 100644
--- a/gnome2-apps/file-roller/HISTORY
+++ b/gnome2-apps/file-roller/HISTORY
@@ -1,3 +1,6 @@
+2009-03-08 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 2.25.92
+
2008-11-30 Robin Cook <rcook AT wyrms.net>
* DETAILS: updated VERSION to 2.24.2

diff --git a/gnome2-apps/file-roller/file-roller-2.24.2.tar.gz.sig
b/gnome2-apps/file-roller/file-roller-2.24.2.tar.gz.sig
deleted file mode 100644
index 043d275..0000000
Binary files a/gnome2-apps/file-roller/file-roller-2.24.2.tar.gz.sig and
/dev/null differ
diff --git a/gnome2-apps/file-roller/file-roller-2.25.92.tar.gz.sig
b/gnome2-apps/file-roller/file-roller-2.25.92.tar.gz.sig
new file mode 100644
index 0000000..c7677d1
Binary files /dev/null and
b/gnome2-apps/file-roller/file-roller-2.25.92.tar.gz.sig differ
diff --git a/gnome2-apps/gramps/DETAILS b/gnome2-apps/gramps/DETAILS
index 029b7ef..b246c07 100755
--- a/gnome2-apps/gramps/DETAILS
+++ b/gnome2-apps/gramps/DETAILS
@@ -1,6 +1,6 @@
SPELL=gramps
- VERSION=3.0.4
-
SOURCE_HASH=sha512:d071880f05fd1d7fef94f01ce9f29b444840b8704cec7e464b6ea7dc69a5fd23a2399f758191e2efc0c0c46be20927b054ad084a3f862c761a64dc3c360fbd1d
+ VERSION=3.1.0
+
SOURCE_HASH=sha512:db5f259fd12b76dade5a356b2d2d6e0f4f4c55b6622d8c39d0dbd14d55f5ebee6a3a449361315660eb09ba66100ba0450679a5831fc5111e81957ebdf41aaf31
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
diff --git a/gnome2-apps/gramps/HISTORY b/gnome2-apps/gramps/HISTORY
index 7555fa5..b6cad8f 100644
--- a/gnome2-apps/gramps/HISTORY
+++ b/gnome2-apps/gramps/HISTORY
@@ -1,3 +1,6 @@
+2009-03-07 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 3.1.0
+
2009-02-10 Treeve Jelbert <treeve AT sourcemage.org>
* DEPENDS: add freefont-ttf, xdg-utils
add kgraphviewer4, gnome-python-desktop
diff --git a/gnome2-apps/pan/DETAILS b/gnome2-apps/pan/DETAILS
old mode 100644
new mode 100755
diff --git a/gnome2-libs/evolution-exchange/DETAILS
b/gnome2-libs/evolution-exchange/DETAILS
index 8ea611d..98f794d 100755
--- a/gnome2-libs/evolution-exchange/DETAILS
+++ b/gnome2-libs/evolution-exchange/DETAILS
@@ -1,5 +1,5 @@
SPELL=evolution-exchange
- VERSION=2.24.2
+ VERSION=2.25.92
BRANCH=`echo $VERSION | cut -d . -f 1,2`
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/gnome2-libs/evolution-exchange/HISTORY
b/gnome2-libs/evolution-exchange/HISTORY
index 5e03124..62f32e6 100644
--- a/gnome2-libs/evolution-exchange/HISTORY
+++ b/gnome2-libs/evolution-exchange/HISTORY
@@ -1,3 +1,6 @@
+2009-03-08 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 2.25.92
+
2009-03-02 Eric Sandall <sandalle AT sourcemage.org>
* DEPENDS: Links against avahi if it's available

diff --git
a/gnome2-libs/evolution-exchange/evolution-exchange-2.24.2.tar.bz2.sig
b/gnome2-libs/evolution-exchange/evolution-exchange-2.24.2.tar.bz2.sig
deleted file mode 100644
index c46f7b2..0000000
Binary files
a/gnome2-libs/evolution-exchange/evolution-exchange-2.24.2.tar.bz2.sig and
/dev/null differ
diff --git
a/gnome2-libs/evolution-exchange/evolution-exchange-2.25.92.tar.bz2.sig
b/gnome2-libs/evolution-exchange/evolution-exchange-2.25.92.tar.bz2.sig
new file mode 100644
index 0000000..7c7c9b4
Binary files /dev/null and
b/gnome2-libs/evolution-exchange/evolution-exchange-2.25.92.tar.bz2.sig differ
diff --git a/http/lighttpd/DETAILS b/http/lighttpd/DETAILS
index 5555231..d39ef52 100755
--- a/http/lighttpd/DETAILS
+++ b/http/lighttpd/DETAILS
@@ -1,6 +1,6 @@
SPELL=lighttpd
- VERSION=1.4.21
-
SOURCE_HASH=sha512:13d74af135cb85c47b1b4ed890ac9dd55b81cc252c4f452817c475758574a18faa1cae89f3e1b2d28ca1d7144b84e0442f6a248b64ae156f2a57edb56128c2a7
+ VERSION=1.4.22
+
SOURCE_HASH=sha512:e45d55fb7c2f46eaa4033730030dad9a5e5ce9a0bf1f22673f0167bef8f51ccf8ce4e837ac812ba494f8a6e3e66bb7b4c07ee4abda478b82268c04c5b4d11465
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_URL[0]=http://www.lighttpd.net/download/$SOURCE
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/http/lighttpd/HISTORY b/http/lighttpd/HISTORY
index 8d59292..8740c4a 100644
--- a/http/lighttpd/HISTORY
+++ b/http/lighttpd/HISTORY
@@ -1,3 +1,6 @@
+2009-03-08 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 1.4.22
+
2009-02-17 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 1.4.21
* DEPENDS: quoting opts
diff --git a/kernels/kqemu/BUILD b/kernels/kqemu/BUILD
index 2fe79df..6a1a8c1 100755
--- a/kernels/kqemu/BUILD
+++ b/kernels/kqemu/BUILD
@@ -1,4 +1,6 @@
OPTS="--kernel-path=$INSTALL_ROOT/usr/src/linux-$(get_kernel_version) \
$OPTS" &&

-default_build
+make_single &&
+default_build &&
+make_normal
diff --git a/kernels/kqemu/DETAILS b/kernels/kqemu/DETAILS
index 8d39c3c..fd78d3f 100755
--- a/kernels/kqemu/DETAILS
+++ b/kernels/kqemu/DETAILS
@@ -1,27 +1,27 @@
SPELL=kqemu
- VERSION=1.3.0pre11
+ VERSION=1.4.0pre1
SOURCE=$SPELL-$VERSION.tar.gz
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/kqemu-$VERSION
- SOURCE_URL[0]=http://bellard.org/qemu/${SOURCE}
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
+ SOURCE_URL[0]=http://www.nongnu.org/qemu/$SOURCE
DISTCC_HOSTS=
- SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
- LICENSE[0]=GPL2
- WEB_SITE=http://bellard.org/qemu/
+ SOURCE_GPG=gurus.gpg:$SOURCE.sig
+ LICENSE[0]=GPL
+ WEB_SITE=http://www.nongnu.org/qemu/
ENTERED=20060126
- SHORT="QEMU is a generic and open source processor emulator"
+ SHORT="QEMU accelerator module"
cat << EOF
QEMU achieves a good emulation speed by using dynamic translation.
QEMU has two operating modes:

- * Full system emulation. In this mode, QEMU emulates a full system
- (for example a PC), including a processor and various peripherials.
- It can be used to launch different Operating Systems without
- rebooting the PC or to debug system code.
- * User mode emulation (Linux host only). In this mode, QEMU can
- launch Linux processes compiled for one CPU on another CPU.
+* Full system emulation. In this mode, QEMU emulates a full system (for
example
+ a PC), including a processor and various peripherials. It can be used to
+ launch different Operating Systems without rebooting the PC or to debug
system
+ code.
+* User mode emulation (Linux host only). In this mode, QEMU can launch Linux
+ processes compiled for one CPU on another CPU.

-KQEMU is the kernel accelerator module for qemu. Substantially improves
-performance.
+KQEMU is the kernel accelerator module for qemu.
+Substantially improves performance.

Emulator : Typical Slowdown Ratio
QEMU : between 5 and 10
diff --git a/kernels/kqemu/HISTORY b/kernels/kqemu/HISTORY
index a5d87fa..ab6101f 100644
--- a/kernels/kqemu/HISTORY
+++ b/kernels/kqemu/HISTORY
@@ -1,3 +1,9 @@
+2009-03-07 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 1.4.0pre1; cleaned up
+ * BUILD: fixed multijob build
+ * PRE_BUILD: `uname -r' is still more correct
+ * ftbfs-linux-2.6.22.patch: renamed to
+
2008-08-10 Julien "_kaze_" ROZO <julien AT rozo.org>
* DETAILS: fixed SOURCE_URL[0] and WEB_SITE

@@ -64,4 +70,3 @@

2005-11-02 Andreas van Ruth <avr AT gnulinux.nl>
* BUILD, DEPENDS, DETAILS, HISTORY: created
-
diff --git a/kernels/kqemu/INSTALL b/kernels/kqemu/INSTALL
index d920e42..fead378 100755
--- a/kernels/kqemu/INSTALL
+++ b/kernels/kqemu/INSTALL
@@ -1,5 +1,7 @@
-default_install &&
-#not everyone uses udev
-if spell_installed udev ; then
-echo 'KERNEL=="kqemu", NAME="%k", MODE="0666"' >
${INSTALL_ROOT}/etc/udev/rules.d/60-kqemu.rules
+default_install &&
+
+# not everyone uses udev
+if spell_installed udev; then
+ echo 'KERNEL=="kqemu", NAME="%k", MODE="0666"' > \
+ "$INSTALL_ROOT/etc/udev/rules.d/60-kqemu.rules"
fi
diff --git a/kernels/kqemu/PRE_BUILD b/kernels/kqemu/PRE_BUILD
index 98f551b..fd3e2d1 100755
--- a/kernels/kqemu/PRE_BUILD
+++ b/kernels/kqemu/PRE_BUILD
@@ -1,5 +1,4 @@
-default_pre_build
&&
-cd "$SOURCE_DIRECTORY"
&&
-patch -Np1 < "$SCRIPT_DIRECTORY/kqemu-1.3.0pre11_linux-2.6.22.patch"
&&
-sedit "s:\`uname -r\`:$(get_kernel_version):" $SOURCE_DIRECTORY/install.sh
&&
-sedit "s:depmod -a:& $(get_kernel_version):" $SOURCE_DIRECTORY/install.sh
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+
+patch -p0 < "$SPELL_DIRECTORY/ftbfs-linux-2.6.22.patch"
diff --git a/kernels/kqemu/ftbfs-linux-2.6.22.patch
b/kernels/kqemu/ftbfs-linux-2.6.22.patch
new file mode 100644
index 0000000..1f220c1
--- /dev/null
+++ b/kernels/kqemu/ftbfs-linux-2.6.22.patch
@@ -0,0 +1,15 @@
+## From Debian's kqemu-source package:
+## 03-2.5.22.dpatch by Samuel Tardieu <sam AT rfc1149.net>
+##
+## DP: Fix FTBFS with linux 2.6.22 (Closes: #434031).
+
+--- kqemu-linux.c.orig 2007-02-06 21:02:00.000000000 +0000
++++ kqemu-linux.c 2007-07-24 05:41:14.000000000 +0000
+@@ -26,6 +26,7 @@
+ #include <linux/ioctl.h>
+ #include <linux/smp_lock.h>
+ #include <linux/miscdevice.h>
++#include <linux/sched.h>
+ #include <asm/atomic.h>
+ #include <asm/processor.h>
+ #include <asm/uaccess.h>
diff --git a/kernels/kqemu/kqemu-1.3.0pre11.tar.gz.sig
b/kernels/kqemu/kqemu-1.3.0pre11.tar.gz.sig
deleted file mode 100644
index 4e1330f..0000000
Binary files a/kernels/kqemu/kqemu-1.3.0pre11.tar.gz.sig and /dev/null differ
diff --git a/kernels/kqemu/kqemu-1.3.0pre11_linux-2.6.22.patch
b/kernels/kqemu/kqemu-1.3.0pre11_linux-2.6.22.patch
deleted file mode 100644
index 9735d2c..0000000
--- a/kernels/kqemu/kqemu-1.3.0pre11_linux-2.6.22.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-## From Debian's kqemu-source package:
-## 03-2.5.22.dpatch by Samuel Tardieu <sam AT rfc1149.net>
-##
-## DP: Fix FTBFS with linux 2.6.22 (Closes: #434031).
-
-diff -Naur kqemu-1.3.0pre11.orig/kqemu-linux.c kqemu-1.3.0pre11/kqemu-linux.c
---- kqemu-1.3.0pre11.orig/kqemu-linux.c 2007-02-06 21:02:00.000000000
+0000
-+++ kqemu-1.3.0pre11/kqemu-linux.c 2007-07-24 05:41:14.000000000 +0000
-@@ -26,6 +26,7 @@
- #include <linux/ioctl.h>
- #include <linux/smp_lock.h>
- #include <linux/miscdevice.h>
-+#include <linux/sched.h>
- #include <asm/atomic.h>
- #include <asm/processor.h>
- #include <asm/uaccess.h>
diff --git a/kernels/kqemu/kqemu-1.4.0pre1.tar.gz.sig
b/kernels/kqemu/kqemu-1.4.0pre1.tar.gz.sig
new file mode 100644
index 0000000..06011d7
Binary files /dev/null and b/kernels/kqemu/kqemu-1.4.0pre1.tar.gz.sig differ
diff --git a/libs/libidn/DETAILS b/libs/libidn/DETAILS
index b2f968a..ba6af73 100755
--- a/libs/libidn/DETAILS
+++ b/libs/libidn/DETAILS
@@ -1,5 +1,5 @@
SPELL=libidn
- VERSION=1.12
+ VERSION=1.13
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SOURCE.sig
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/libs/libidn/HISTORY b/libs/libidn/HISTORY
index 87a5edb..ce64c69 100644
--- a/libs/libidn/HISTORY
+++ b/libs/libidn/HISTORY
@@ -1,3 +1,6 @@
+2009-03-08 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 1.13
+
2009-02-15 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.12

diff --git a/libs/readline/DETAILS b/libs/readline/DETAILS
index 5a88cff..762d57e 100755
--- a/libs/readline/DETAILS
+++ b/libs/readline/DETAILS
@@ -1,20 +1,21 @@
SPELL=readline
- VERSION=5.2
+ VERSION=6.0
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SOURCE.sig
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=$GNU_URL/$SPELL/$SOURCE
- SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
SOURCE_URL[1]=ftp://ftp.gnu.org/pub/gnu/$SPELL/$SOURCE
SOURCE_URL[2]=ftp://ftp.cwru.edu/pub/bash/$SOURCE
- SOURCE_GPG=gnu.gpg:$SOURCE2:UPSTREAM_KEY
+ SOURCE2_URL[0]=$SOURCE_URL.sig
+ SOURCE2_URL[1]=${SOURCE_URL[1]}.sig
+ SOURCE2_URL[2]=${SOURCE_URL[2]}.sig
SOURCE2_IGNORE=signature
+ SOURCE_GPG=gnu.gpg:$SOURCE2:UPSTREAM_KEY
LICENSE[0]=GPL
WEB_SITE=http://cnswww.cns.cwru.edu/php/chet/readline/rltop.html
ENTERED=20010922
- PATCHLEVEL=5
KEYWORDS="libs"
- SHORT="readline lets users edit command lines as they are typed
in."
+ SHORT="lets users edit command lines as they are typed in"
cat << EOF
readline - Lets users edit command lines as they are typed in
The Readline library provides a set of functions for use by applications
diff --git a/libs/readline/HISTORY b/libs/readline/HISTORY
index ee5e099..ef52941 100644
--- a/libs/readline/HISTORY
+++ b/libs/readline/HISTORY
@@ -1,3 +1,10 @@
+2009-02-21 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 6.0; quoting paths; added missing mirrors
+ for sigs; fixed desc
+ * readline52-0[01-12]: removed
+ * PRE_BUILD: removed patches' applying; quoting paths
+ * INSTALL: quoting paths; added verbosity; 5 -> 6
+
2009-01-16 George Sherwood <gsherwood AT sourcemage.org>
* PRE_REMOVE: Added to delete info entries from dir
* POST_REMOVE: Deleted
diff --git a/libs/readline/INSTALL b/libs/readline/INSTALL
index 4868707..a3aaf2b 100755
--- a/libs/readline/INSTALL
+++ b/libs/readline/INSTALL
@@ -1,13 +1,13 @@
-make install DESTDIR=$INSTALL_ROOT &&
+make install DESTDIR="$INSTALL_ROOT" &&
# symlink those so that bash still works after the update
-ln -sf $TRACK_ROOT/lib/libreadline.so.5 $INSTALL_ROOT/lib/libreadline.so.4
&&
-ln -sf $TRACK_ROOT/lib/libhistory.so.5 $INSTALL_ROOT/lib/libhistory.so.4 &&
+ln -vsf "$TRACK_ROOT/lib/libreadline.so.6"
"$INSTALL_ROOT/lib/libreadline.so.5" &&
+ln -vsf "$TRACK_ROOT/lib/libhistory.so.6"
"$INSTALL_ROOT/lib/libhistory.so.5" &&

# install inputrc stuff to have better key mappings in console
if [[ "$INSTALL_INPUTRC" == y ]]; then
- install_config_file $SCRIPT_DIRECTORY/etc/inputrc \
- $INSTALL_ROOT/etc/inputrc &&
- mkdir -p $INSTALL_ROOT/etc/profile.d/ &&
- install -m 755 $SCRIPT_DIRECTORY/etc/profile.d/readline.sh \
- $INSTALL_ROOT/etc/profile.d/
+ install_config_file "$SPELL_DIRECTORY/etc/inputrc" \
+ "$INSTALL_ROOT/etc/inputrc" &&
+ mkdir -p "$INSTALL_ROOT/etc/profile.d" &&
+ install -vm 755 "$SPELL_DIRECTORY/etc/profile.d/readline.sh" \
+ "$INSTALL_ROOT/etc/profile.d"
fi
diff --git a/libs/readline/PRE_BUILD b/libs/readline/PRE_BUILD
index 33368a4..0317ede 100755
--- a/libs/readline/PRE_BUILD
+++ b/libs/readline/PRE_BUILD
@@ -1,19 +1,5 @@
default_pre_build &&
-cd $SOURCE_DIRECTORY &&
-
-patch -p0 < $SCRIPT_DIRECTORY/readline52-001 &&
-patch -p0 < $SCRIPT_DIRECTORY/readline52-002 &&
-patch -p0 < $SCRIPT_DIRECTORY/readline52-003 &&
-patch -p0 < $SCRIPT_DIRECTORY/readline52-004 &&
-patch -p0 < $SCRIPT_DIRECTORY/readline52-005 &&
-patch -p0 < $SCRIPT_DIRECTORY/readline52-006 &&
-patch -p0 < $SCRIPT_DIRECTORY/readline52-007 &&
-patch -p0 < $SCRIPT_DIRECTORY/readline52-008 &&
-patch -p0 < $SCRIPT_DIRECTORY/readline52-009 &&
-patch -p0 < $SCRIPT_DIRECTORY/readline52-010 &&
-patch -p0 < $SCRIPT_DIRECTORY/readline52-011 &&
-patch -p0 < $SCRIPT_DIRECTORY/readline52-012 &&
-
+cd "$SOURCE_DIRECTORY" &&

# Dynamically link against termcap or ncurses
-sedit "s/SHLIB_LIBS =/SHLIB_LIBS = @TERMCAP_LIB@/" shlib/Makefile.in
+sed -i "s/SHLIB_LIBS =/SHLIB_LIBS = @TERMCAP_LIB@/" shlib/Makefile.in
diff --git
a/libs/readline/REPAIR^3004ba79eee5283ad792e3c6899d71e4^POST_REMOVE
b/libs/readline/REPAIR^3004ba79eee5283ad792e3c6899d71e4^POST_REMOVE
index 21b7248..6a2f6bd 100755
--- a/libs/readline/REPAIR^3004ba79eee5283ad792e3c6899d71e4^POST_REMOVE
+++ b/libs/readline/REPAIR^3004ba79eee5283ad792e3c6899d71e4^POST_REMOVE
@@ -2,4 +2,3 @@ install-info --delete history --info-dir
${INSTALL_ROOT}/usr/share/info
install-info --delete readline --info-dir ${INSTALL_ROOT}/usr/share/info
install-info --delete rluserman --info-dir ${INSTALL_ROOT}/usr/share/info
true
-
diff --git a/libs/readline/readline52-001 b/libs/readline/readline52-001
deleted file mode 100644
index 0bec9a2..0000000
--- a/libs/readline/readline52-001
+++ /dev/null
@@ -1,30 +0,0 @@
- READLINE PATCH REPORT
- =====================
-
-Readline-Release: 5.2
-Patch-ID: readline52-001
-
-Bug-Reported-by: ebb9 AT byu.net
-Bug-Reference-ID: <45540862.9030900 AT byu.net>
-Bug-Reference-URL:
http://lists.gnu.org/archive/html/bug-bash/2006-11/msg00017.html
-
http://lists.gnu.org/archive/html/bug-bash/2006-11/msg00016.html
-
-Bug-Description:
-
-In some cases, code that is intended to be used in the presence of multibyte
-characters is called when no such characters are present, leading to
incorrect
-display position calculations and incorrect redisplay.
-
-Patch:
-
-*** ../readline-5.2/display.c Thu Sep 14 14:20:12 2006
---- display.c Mon Nov 13 17:55:57 2006
-***************
-*** 2381,2384 ****
---- 2409,2414 ----
- if (end <= start)
- return 0;
-+ if (MB_CUR_MAX == 1 || rl_byte_oriented)
-+ return (end - start);
-
- memset (&ps, 0, sizeof (mbstate_t));
diff --git a/libs/readline/readline52-002 b/libs/readline/readline52-002
deleted file mode 100644
index b0d8c92..0000000
--- a/libs/readline/readline52-002
+++ /dev/null
@@ -1,49 +0,0 @@
- READLINE PATCH REPORT
- =====================
-
-Readline-Release: 5.2
-Patch-ID: readline52-002
-
-Bug-Reported-by: Magnus Svensson <msvensson AT mysql.com>
-Bug-Reference-ID: <45BDC44D.80609 AT mysql.com>
-Bug-Reference-URL:
http://lists.gnu.org/archive/html/bug-readline/2007-01/msg00002.html
-
-Bug-Description:
-
-Readline neglects to reallocate the array it uses to keep track of wrapped
-screen lines when increasing its size. This will eventually result in
-segmentation faults when given sufficiently long input.
-
-Patch:
-
-*** ../readline-5.2-patched/display.c Thu Sep 14 14:20:12 2006
---- display.c Fri Feb 2 20:23:17 2007
-***************
-*** 561,574 ****
---- 561,586 ----
- wrap_offset = prompt_invis_chars_first_line = 0;
- }
-
-+ #if defined (HANDLE_MULTIBYTE)
- #define CHECK_INV_LBREAKS() \
- do { \
- if (newlines >= (inv_lbsize - 2)) \
- { \
- inv_lbsize *= 2; \
- inv_lbreaks = (int *)xrealloc (inv_lbreaks, inv_lbsize * sizeof
(int)); \
-+ _rl_wrapped_line = (int *)xrealloc (_rl_wrapped_line, inv_lbsize
* sizeof (int)); \
- } \
- } while (0)
-+ #else
-+ #define CHECK_INV_LBREAKS() \
-+ do { \
-+ if (newlines >= (inv_lbsize - 2)) \
-+ { \
-+ inv_lbsize *= 2; \
-+ inv_lbreaks = (int *)xrealloc (inv_lbreaks, inv_lbsize * sizeof
(int)); \
-+ } \
-+ } while (0)
-+ #endif /* HANDLE_MULTIBYTE */
-
- #if defined (HANDLE_MULTIBYTE)
- #define CHECK_LPOS() \
diff --git a/libs/readline/readline52-003 b/libs/readline/readline52-003
deleted file mode 100644
index 06916b3..0000000
--- a/libs/readline/readline52-003
+++ /dev/null
@@ -1,37 +0,0 @@
- READLINE PATCH REPORT
- =====================
-
-Readline-Release: 5.2
-Patch-ID: readline52-003
-
-Bug-Reported-by: Peter Volkov <torre_cremata AT mail.ru>
-Bug-Reference-ID: <1171795523.8021.18.camel@localhost>
-Bug-Reference-URL:
http://lists.gnu.org/archive/html/bug-bash/2007-02/msg00054.html
-
-Bug-Description:
-
-When moving the cursor, bash sometimes misplaces the cursor when the prompt
-contains two or more multibyte characters. The particular circumstance that
-uncovered the problem was having the (multibyte) current directory name in
-the prompt string.
-
-Patch:
-
-*** ../readline-5.2.2/display.c Fri Jan 19 13:34:50 2007
---- display.c Sat Mar 10 17:25:44 2007
-***************
-*** 1745,1749 ****
- {
- dpos = _rl_col_width (data, 0, new);
-! if (dpos > prompt_last_invisible) /* XXX - don't use
woff here */
- {
- dpos -= woff;
---- 1745,1752 ----
- {
- dpos = _rl_col_width (data, 0, new);
-! /* Use NEW when comparing against the last invisible character in the
-! prompt string, since they're both buffer indices and DPOS is a
-! desired display position. */
-! if (new > prompt_last_invisible) /* XXX - don't use
woff here */
- {
- dpos -= woff;
diff --git a/libs/readline/readline52-004 b/libs/readline/readline52-004
deleted file mode 100644
index b165ad9..0000000
--- a/libs/readline/readline52-004
+++ /dev/null
@@ -1,70 +0,0 @@
- READLINE PATCH REPORT
- =====================
-
-Readline-Release: 5.2
-Patch-ID: readline52-004
-
-Bug-Reported-by: Peter Volkov <torre_cremata AT mail.ru>
-Bug-Reference-ID: <1173636022.7039.36.camel@localhost>
-Bug-Reference-URL:
http://lists.gnu.org/archive/html/bug-bash/2007-03/msg00039.html
-
-Bug-Description:
-
-When restoring the original prompt after finishing an incremental search,
-bash sometimes places the cursor incorrectly if the primary prompt contains
-invisible characters.
-
-Patch:
-
-*** ../readline-5.2.3/display.c Fri Apr 20 13:30:16 2007
---- display.c Fri Apr 20 15:17:01 2007
-***************
-*** 1599,1604 ****
- if (temp > 0)
- {
- _rl_output_some_chars (nfd, temp);
-! _rl_last_c_pos += _rl_col_width (nfd, 0, temp);;
- }
- }
---- 1599,1618 ----
- if (temp > 0)
- {
-+ /* If nfd begins at the prompt, or before the invisible
-+ characters in the prompt, we need to adjust _rl_last_c_pos
-+ in a multibyte locale to account for the wrap offset and
-+ set cpos_adjusted accordingly. */
- _rl_output_some_chars (nfd, temp);
-! if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
-! {
-! _rl_last_c_pos += _rl_col_width (nfd, 0, temp);
-! if (current_line == 0 && wrap_offset && ((nfd - new) <=
prompt_last_invisible))
-! {
-! _rl_last_c_pos -= wrap_offset;
-! cpos_adjusted = 1;
-! }
-! }
-! else
-! _rl_last_c_pos += temp;
- }
- }
-***************
-*** 1608,1613 ****
---- 1622,1639 ----
- if (temp > 0)
- {
-+ /* If nfd begins at the prompt, or before the invisible
-+ characters in the prompt, we need to adjust _rl_last_c_pos
-+ in a multibyte locale to account for the wrap offset and
-+ set cpos_adjusted accordingly. */
- _rl_output_some_chars (nfd, temp);
- _rl_last_c_pos += col_temp; /* XXX */
-+ if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
-+ {
-+ if (current_line == 0 && wrap_offset && ((nfd - new) <=
prompt_last_invisible))
-+ {
-+ _rl_last_c_pos -= wrap_offset;
-+ cpos_adjusted = 1;
-+ }
-+ }
- }
- lendiff = (oe - old) - (ne - new);
diff --git a/libs/readline/readline52-005 b/libs/readline/readline52-005
deleted file mode 100644
index d192ac1..0000000
--- a/libs/readline/readline52-005
+++ /dev/null
@@ -1,328 +0,0 @@
- READLINE PATCH REPORT
- =====================
-
-Readline-Release: 5.2
-Patch-ID: readline52-005
-
-Bug-Reported-by: Thomas Loeber <ifp AT loeber1.de>
-Bug-Reference-ID: <200703082223.08919.ifp AT loeber1.de>
-Bug-Reference-URL:
http://lists.gnu.org/archive/html/bug-bash/2007-03/msg00036.html
-
-Bug-Description:
-
-When rl_read_key returns -1, indicating that readline's controlling terminal
-has been invalidated for some reason (e.g., receiving a SIGHUP), the error
-status was not reported correctly to the caller. This could cause input
-loops.
-
-Patch:
-
-*** ../readline-5.2/complete.c Fri Jul 28 11:35:49 2006
---- complete.c Tue Mar 13 08:50:16 2007
-***************
-*** 429,433 ****
- if (c == 'n' || c == 'N' || c == RUBOUT)
- return (0);
-! if (c == ABORT_CHAR)
- _rl_abort_internal ();
- if (for_pager && (c == NEWLINE || c == RETURN))
---- 440,444 ----
- if (c == 'n' || c == 'N' || c == RUBOUT)
- return (0);
-! if (c == ABORT_CHAR || c < 0)
- _rl_abort_internal ();
- if (for_pager && (c == NEWLINE || c == RETURN))
-*** ../readline-5.2/input.c Wed Aug 16 15:15:16 2006
---- input.c Wed May 2 16:07:59 2007
-***************
-*** 514,518 ****
- int size;
- {
-! int mb_len = 0;
- size_t mbchar_bytes_length;
- wchar_t wc;
---- 522,526 ----
- int size;
- {
-! int mb_len, c;
- size_t mbchar_bytes_length;
- wchar_t wc;
-***************
-*** 521,531 ****
- memset(&ps, 0, sizeof (mbstate_t));
- memset(&ps_back, 0, sizeof (mbstate_t));
-!
- while (mb_len < size)
- {
- RL_SETSTATE(RL_STATE_MOREINPUT);
-! mbchar[mb_len++] = rl_read_key ();
- RL_UNSETSTATE(RL_STATE_MOREINPUT);
-
- mbchar_bytes_length = mbrtowc (&wc, mbchar, mb_len, &ps);
- if (mbchar_bytes_length == (size_t)(-1))
---- 529,545 ----
- memset(&ps, 0, sizeof (mbstate_t));
- memset(&ps_back, 0, sizeof (mbstate_t));
-!
-! mb_len = 0;
- while (mb_len < size)
- {
- RL_SETSTATE(RL_STATE_MOREINPUT);
-! c = rl_read_key ();
- RL_UNSETSTATE(RL_STATE_MOREINPUT);
-
-+ if (c < 0)
-+ break;
-+
-+ mbchar[mb_len++] = c;
-+
- mbchar_bytes_length = mbrtowc (&wc, mbchar, mb_len, &ps);
- if (mbchar_bytes_length == (size_t)(-1))
-***************
-*** 565,569 ****
- c = first;
- memset (mb, 0, mlen);
-! for (i = 0; i < mlen; i++)
- {
- mb[i] = (char)c;
---- 579,583 ----
- c = first;
- memset (mb, 0, mlen);
-! for (i = 0; c >= 0 && i < mlen; i++)
- {
- mb[i] = (char)c;
-*** ../readline-5.2/isearch.c Mon Dec 26 17:18:53 2005
---- isearch.c Fri Mar 9 14:30:59 2007
-***************
-*** 328,333 ****
-
- f = (rl_command_func_t *)NULL;
-!
-! /* Translate the keys we do something with to opcodes. */
- if (c >= 0 && _rl_keymap[c].type == ISFUNC)
- {
---- 328,340 ----
-
- f = (rl_command_func_t *)NULL;
-!
-! if (c < 0)
-! {
-! cxt->sflags |= SF_FAILED;
-! cxt->history_pos = cxt->last_found_line;
-! return -1;
-! }
-!
-! /* Translate the keys we do something with to opcodes. */
- if (c >= 0 && _rl_keymap[c].type == ISFUNC)
- {
-*** ../readline-5.2/misc.c Mon Dec 26 17:20:46 2005
---- misc.c Fri Mar 9 14:44:11 2007
-***************
-*** 147,150 ****
---- 147,152 ----
- rl_clear_message ();
- RL_UNSETSTATE(RL_STATE_NUMERICARG);
-+ if (key < 0)
-+ return -1;
- return (_rl_dispatch (key, _rl_keymap));
- }
-*** ../readline-5.2/readline.c Wed Aug 16 15:00:36 2006
---- readline.c Fri Mar 9 14:47:24 2007
-***************
-*** 646,649 ****
---- 669,677 ----
- {
- nkey = _rl_subseq_getchar (cxt->okey);
-+ if (nkey < 0)
-+ {
-+ _rl_abort_internal ();
-+ return -1;
-+ }
- r = _rl_dispatch_subseq (nkey, cxt->dmap, cxt->subseq_arg);
- cxt->flags |= KSEQ_DISPATCHED;
-*** ../readline-5.2/text.c Fri Jul 28 11:55:27 2006
---- text.c Sun Mar 25 13:41:38 2007
-***************
-*** 858,861 ****
---- 864,870 ----
- RL_UNSETSTATE(RL_STATE_MOREINPUT);
-
-+ if (c < 0)
-+ return -1;
-+
- #if defined (HANDLE_SIGNALS)
- if (RL_ISSTATE (RL_STATE_CALLBACK) == 0)
-***************
-*** 1521,1524 ****
---- 1530,1536 ----
- mb_len = _rl_read_mbchar (mbchar, MB_LEN_MAX);
-
-+ if (mb_len <= 0)
-+ return -1;
-+
- if (count < 0)
- return (_rl_char_search_internal (-count, bdir, mbchar, mb_len));
-***************
-*** 1537,1540 ****
---- 1549,1555 ----
- RL_UNSETSTATE(RL_STATE_MOREINPUT);
-
-+ if (c < 0)
-+ return -1;
-+
- if (count < 0)
- return (_rl_char_search_internal (-count, bdir, c));
-*** ../readline-5.2/vi_mode.c Sat Jul 29 16:42:28 2006
---- vi_mode.c Fri Mar 9 15:02:11 2007
-***************
-*** 887,890 ****
---- 887,897 ----
- c = rl_read_key ();
- RL_UNSETSTATE(RL_STATE_MOREINPUT);
-+
-+ if (c < 0)
-+ {
-+ *nextkey = 0;
-+ return -1;
-+ }
-+
- *nextkey = c;
-
-***************
-*** 903,906 ****
---- 910,918 ----
- c = rl_read_key (); /* real command */
- RL_UNSETSTATE(RL_STATE_MOREINPUT);
-+ if (c < 0)
-+ {
-+ *nextkey = 0;
-+ return -1;
-+ }
- *nextkey = c;
- }
-***************
-*** 1225,1236 ****
- _rl_callback_generic_arg *data;
- {
- #if defined (HANDLE_MULTIBYTE)
-! _rl_vi_last_search_mblen = _rl_read_mbchar (_rl_vi_last_search_mbchar,
MB_LEN_MAX);
- #else
- RL_SETSTATE(RL_STATE_MOREINPUT);
-! _rl_vi_last_search_char = rl_read_key ();
- RL_UNSETSTATE(RL_STATE_MOREINPUT);
- #endif
-
- _rl_callback_func = 0;
- _rl_want_redisplay = 1;
---- 1243,1262 ----
- _rl_callback_generic_arg *data;
- {
-+ int c;
- #if defined (HANDLE_MULTIBYTE)
-! c = _rl_vi_last_search_mblen = _rl_read_mbchar
(_rl_vi_last_search_mbchar, MB_LEN_MAX);
- #else
- RL_SETSTATE(RL_STATE_MOREINPUT);
-! c = rl_read_key ();
- RL_UNSETSTATE(RL_STATE_MOREINPUT);
- #endif
-
-+ if (c <= 0)
-+ return -1;
-+
-+ #if !defined (HANDLE_MULTIBYTE)
-+ _rl_vi_last_search_char = c;
-+ #endif
-+
- _rl_callback_func = 0;
- _rl_want_redisplay = 1;
-***************
-*** 1248,1251 ****
---- 1274,1278 ----
- int count, key;
- {
-+ int c;
- #if defined (HANDLE_MULTIBYTE)
- static char *target;
-***************
-*** 1294,1302 ****
- {
- #if defined (HANDLE_MULTIBYTE)
-! _rl_vi_last_search_mblen = _rl_read_mbchar
(_rl_vi_last_search_mbchar, MB_LEN_MAX);
- #else
- RL_SETSTATE(RL_STATE_MOREINPUT);
-! _rl_vi_last_search_char = rl_read_key ();
- RL_UNSETSTATE(RL_STATE_MOREINPUT);
- #endif
- }
---- 1321,1335 ----
- {
- #if defined (HANDLE_MULTIBYTE)
-! c = _rl_read_mbchar (_rl_vi_last_search_mbchar, MB_LEN_MAX);
-! if (c <= 0)
-! return -1;
-! _rl_vi_last_search_mblen = c;
- #else
- RL_SETSTATE(RL_STATE_MOREINPUT);
-! c = rl_read_key ();
- RL_UNSETSTATE(RL_STATE_MOREINPUT);
-+ if (c < 0)
-+ return -1;
-+ _rl_vi_last_search_char = c;
- #endif
- }
-***************
-*** 1468,1471 ****
---- 1501,1507 ----
- RL_UNSETSTATE(RL_STATE_MOREINPUT);
-
-+ if (c < 0)
-+ return -1;
-+
- #if defined (HANDLE_MULTIBYTE)
- if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
-***************
-*** 1486,1489 ****
---- 1522,1528 ----
- _rl_vi_last_replacement = c = _rl_vi_callback_getchar (mb, MB_LEN_MAX);
-
-+ if (c < 0)
-+ return -1;
-+
- _rl_callback_func = 0;
- _rl_want_redisplay = 1;
-***************
-*** 1517,1520 ****
---- 1556,1562 ----
- _rl_vi_last_replacement = c = _rl_vi_callback_getchar (mb, MB_LEN_MAX);
-
-+ if (c < 0)
-+ return -1;
-+
- return (_rl_vi_change_char (count, c, mb));
- }
-***************
-*** 1651,1655 ****
- RL_UNSETSTATE(RL_STATE_MOREINPUT);
-
-! if (ch < 'a' || ch > 'z')
- {
- rl_ding ();
---- 1693,1697 ----
- RL_UNSETSTATE(RL_STATE_MOREINPUT);
-
-! if (ch < 0 || ch < 'a' || ch > 'z') /* make test against 0
explicit */
- {
- rl_ding ();
-***************
-*** 1703,1707 ****
- return 0;
- }
-! else if (ch < 'a' || ch > 'z')
- {
- rl_ding ();
---- 1745,1749 ----
- return 0;
- }
-! else if (ch < 0 || ch < 'a' || ch > 'z') /* make test against 0
explicit */
- {
- rl_ding ();
diff --git a/libs/readline/readline52-006 b/libs/readline/readline52-006
deleted file mode 100644
index d739143..0000000
--- a/libs/readline/readline52-006
+++ /dev/null
@@ -1,62 +0,0 @@
- READLINE PATCH REPORT
- =====================
-
-Readline-Release: 5.2
-Patch-ID: readline52-006
-
-Bug-Reported-by: Peter Volkov <torre_cremata AT mail.ru>
-Bug-Reference-ID: <1178376645.9063.25.camel@localhost>
-Bug-Reference-URL: http://bugs.gentoo.org/177095
-
-Bug-Description:
-
-The readline display code miscalculated the screen position when performing
-a redisplay in which the new text occupies more screen space that the old,
-but takes fewer bytes to do so (e.g., when replacing a shorter string
-containing multibyte characters with a longer one containing only ASCII).
-
-Patch:
-
-*** ../readline-5.2/display.c Thu Apr 26 11:38:22 2007
---- display.c Thu Jul 12 23:10:10 2007
-***************
-*** 1519,1527 ****
- /* Non-zero if we're increasing the number of lines. */
- int gl = current_line >= _rl_vis_botlin && inv_botlin >
_rl_vis_botlin;
- /* Sometimes it is cheaper to print the characters rather than
- use the terminal's capabilities. If we're growing the number
- of lines, make sure we actually cause the new line to wrap
- around on auto-wrapping terminals. */
-! if (_rl_terminal_can_insert && ((2 * col_temp) >= col_lendiff ||
_rl_term_IC) && (!_rl_term_autowrap || !gl))
- {
- /* If lendiff > prompt_visible_length and _rl_last_c_pos == 0 and
---- 1568,1596 ----
- /* Non-zero if we're increasing the number of lines. */
- int gl = current_line >= _rl_vis_botlin && inv_botlin >
_rl_vis_botlin;
-+ /* If col_lendiff is > 0, implying that the new string takes up more
-+ screen real estate than the old, but lendiff is < 0, meaning that it
-+ takes fewer bytes, we need to just output the characters starting
-+ from the first difference. These will overwrite what is on the
-+ display, so there's no reason to do a smart update. This can really
-+ only happen in a multibyte environment. */
-+ if (lendiff < 0)
-+ {
-+ _rl_output_some_chars (nfd, temp);
-+ _rl_last_c_pos += _rl_col_width (nfd, 0, temp);
-+ /* If nfd begins before any invisible characters in the prompt,
-+ adjust _rl_last_c_pos to account for wrap_offset and set
-+ cpos_adjusted to let the caller know. */
-+ if (current_line == 0 && wrap_offset && ((nfd - new) <=
prompt_last_invisible))
-+ {
-+ _rl_last_c_pos -= wrap_offset;
-+ cpos_adjusted = 1;
-+ }
-+ return;
-+ }
- /* Sometimes it is cheaper to print the characters rather than
- use the terminal's capabilities. If we're growing the number
- of lines, make sure we actually cause the new line to wrap
- around on auto-wrapping terminals. */
-! else if (_rl_terminal_can_insert && ((2 * col_temp) >= col_lendiff
|| _rl_term_IC) && (!_rl_term_autowrap || !gl))
- {
- /* If lendiff > prompt_visible_length and _rl_last_c_pos == 0 and
diff --git a/libs/readline/readline52-007 b/libs/readline/readline52-007
deleted file mode 100644
index f75f53f..0000000
--- a/libs/readline/readline52-007
+++ /dev/null
@@ -1,65 +0,0 @@
- READLINE PATCH REPORT
- =====================
-
-Readline-Release: 5.2
-Patch-ID: readline52-007
-
-Bug-Reported-by: Tom Bjorkholm <tom.bjorkholm AT ericsson.com>
-Bug-Reference-ID:
<AEA1A32F001C6B4F98614B5B80D7647D01C075E9 AT esealmw115.eemea.ericsson.se>
-Bug-Reference-URL:
http://lists.gnu.org/archive/html/bug-readline/2007-04/msg00004.html
-
-
-Bug-Description:
-
-An off-by-one error in readline's input buffering caused readline to drop
-each 511th character of buffered input (e.g., when pasting a large amount
-of data into a terminal window).
-
-Patch:
-
-*** ../readline-5.2/input.c Wed Aug 16 15:15:16 2006
---- input.c Tue Jul 17 09:24:21 2007
-***************
-*** 134,139 ****
-
- *key = ibuffer[pop_index++];
-!
- if (pop_index >= ibuffer_len)
- pop_index = 0;
-
---- 134,142 ----
-
- *key = ibuffer[pop_index++];
-! #if 0
- if (pop_index >= ibuffer_len)
-+ #else
-+ if (pop_index > ibuffer_len)
-+ #endif
- pop_index = 0;
-
-***************
-*** 251,255 ****
- {
- k = (*rl_getc_function) (rl_instream);
-! rl_stuff_char (k);
- if (k == NEWLINE || k == RETURN)
- break;
---- 254,259 ----
- {
- k = (*rl_getc_function) (rl_instream);
-! if (rl_stuff_char (k) == 0)
-! break; /* some problem; no more room */
- if (k == NEWLINE || k == RETURN)
- break;
-***************
-*** 374,378 ****
---- 378,386 ----
- }
- ibuffer[push_index++] = key;
-+ #if 0
- if (push_index >= ibuffer_len)
-+ #else
-+ if (push_index > ibuffer_len)
-+ #endif
- push_index = 0;
-
diff --git a/libs/readline/readline52-008 b/libs/readline/readline52-008
deleted file mode 100644
index 1d7f327..0000000
--- a/libs/readline/readline52-008
+++ /dev/null
@@ -1,70 +0,0 @@
- READLINE PATCH REPORT
- =====================
-
-Readline-Release: 5.2
-Patch-ID: readline52-008
-
-Bug-Reported-by: dAniel hAhler <ubuntu AT thequod.de>
-Bug-Reference-ID: <4702ED8A.5000503 AT thequod.de>
-Bug-Reference-URL:
https://bugs.launchpad.net/ubuntu/+source/bash/+bug/119938
-
-Bug-Description:
-
-When updating the display after displaying, for instance, a list of possible
-completions, readline will place the cursor at the wrong position if the
-prompt contains invisible characters and a newline.
-
-Patch:
-
-*** ../readline-5.2-patched/display.c Mon Aug 6 14:26:29 2007
---- display.c Wed Oct 10 22:43:58 2007
-***************
-*** 1049,1053 ****
- else
- tx = nleft;
-! if (_rl_last_c_pos > tx)
- {
- _rl_backspace (_rl_last_c_pos - tx); /* XXX */
---- 1049,1053 ----
- else
- tx = nleft;
-! if (tx >= 0 && _rl_last_c_pos > tx)
- {
- _rl_backspace (_rl_last_c_pos - tx); /* XXX */
-***************
-*** 1205,1209 ****
- {
- register char *ofd, *ols, *oe, *nfd, *nls, *ne;
-! int temp, lendiff, wsatend, od, nd;
- int current_invis_chars;
- int col_lendiff, col_temp;
---- 1205,1209 ----
- {
- register char *ofd, *ols, *oe, *nfd, *nls, *ne;
-! int temp, lendiff, wsatend, od, nd, o_cpos;
- int current_invis_chars;
- int col_lendiff, col_temp;
-***************
-*** 1466,1469 ****
---- 1466,1471 ----
- }
-
-+ o_cpos = _rl_last_c_pos;
-+
- /* When this function returns, _rl_last_c_pos is correct, and an absolute
- cursor postion in multibyte mode, but a buffer index when not in a
-***************
-*** 1475,1479 ****
- invisible characters in the prompt string. Let's see if setting this
when
- we make sure we're at the end of the drawn prompt string works. */
-! if (current_line == 0 && MB_CUR_MAX > 1 && rl_byte_oriented == 0 &&
_rl_last_c_pos == prompt_physical_chars)
- cpos_adjusted = 1;
- #endif
---- 1477,1483 ----
- invisible characters in the prompt string. Let's see if setting this
when
- we make sure we're at the end of the drawn prompt string works. */
-! if (current_line == 0 && MB_CUR_MAX > 1 && rl_byte_oriented == 0 &&
-! (_rl_last_c_pos > 0 || o_cpos > 0) &&
-! _rl_last_c_pos == prompt_physical_chars)
- cpos_adjusted = 1;
- #endif
diff --git a/libs/readline/readline52-009 b/libs/readline/readline52-009
deleted file mode 100644
index af9e381..0000000
--- a/libs/readline/readline52-009
+++ /dev/null
@@ -1,45 +0,0 @@
- READLINE PATCH REPORT
- =====================
-
-Readline-Release: 5.2
-Patch-ID: readline52-009
-
-Bug-Reported-by: dAniel hAhler <ubuntu AT thequod.de>
-Bug-Reference-ID:
-Bug-Reference-URL:
-
-Bug-Description:
-
-Under some circumstances, readline will incorrectly display a prompt string
-containing invisible characters after the final newline.
-
-Patch:
-
-*** ../readline-5.2-patched/display.c 2007-08-25 13:47:08.000000000 -0400
---- display.c 2007-11-10 17:51:29.000000000 -0500
-***************
-*** 392,396 ****
- local_prompt = expand_prompt (p, &prompt_visible_length,
- &prompt_last_invisible,
-! (int *)NULL,
- &prompt_physical_chars);
- c = *t; *t = '\0';
---- 420,424 ----
- local_prompt = expand_prompt (p, &prompt_visible_length,
- &prompt_last_invisible,
-! &prompt_invis_chars_first_line,
- &prompt_physical_chars);
- c = *t; *t = '\0';
-***************
-*** 399,403 ****
- local_prompt_prefix = expand_prompt (prompt, &prompt_prefix_length,
- (int *)NULL,
-!
&prompt_invis_chars_first_line,
- (int *)NULL);
- *t = c;
---- 427,431 ----
- local_prompt_prefix = expand_prompt (prompt, &prompt_prefix_length,
- (int *)NULL,
-! (int *)NULL,
- (int *)NULL);
- *t = c;
diff --git a/libs/readline/readline52-010 b/libs/readline/readline52-010
deleted file mode 100644
index ee5c026..0000000
--- a/libs/readline/readline52-010
+++ /dev/null
@@ -1,47 +0,0 @@
- READLINE PATCH REPORT
- =====================
-
-Readline-Release: 5.2
-Patch-ID: readline52-010
-
-Bug-Reported-by: Miroslav Lichvar <mlichvar AT redhat.com>
-Bug-Reference-ID: Fri, 02 Nov 2007 14:07:45 +0100
-Bug-Reference-URL:
http://lists.gnu.org/archive/html/bug-readline/2007-11/msg00000.html
-
-Bug-Description:
-
-In certain cases when outputting characters at the end of the line,
-e.g., when displaying the prompt string, readline positions the cursor
-incorrectly if the prompt string contains invisible characters and the
-text being drawn begins before the last invisible character in the line.
-
-Patch:
-
-*** ../readline-5.2-patched/display.c 2007-08-25 13:47:08.000000000 -0400
---- display.c 2007-11-10 17:51:29.000000000 -0500
-***************
-*** 1566,1574 ****
- else
- {
-- /* We have horizontal scrolling and we are not inserting at
-- the end. We have invisible characters in this line. This
-- is a dumb update. */
- _rl_output_some_chars (nfd, temp);
- _rl_last_c_pos += col_temp;
- return;
- }
---- 1619,1632 ----
- else
- {
- _rl_output_some_chars (nfd, temp);
- _rl_last_c_pos += col_temp;
-+ /* If nfd begins before any invisible characters in the prompt,
-+ adjust _rl_last_c_pos to account for wrap_offset and set
-+ cpos_adjusted to let the caller know. */
-+ if (current_line == 0 && wrap_offset && ((nfd - new) <=
prompt_last_invisible))
-+ {
-+ _rl_last_c_pos -= wrap_offset;
-+ cpos_adjusted = 1;
-+ }
- return;
- }
diff --git a/libs/readline/readline52-011 b/libs/readline/readline52-011
deleted file mode 100644
index a1197ed..0000000
--- a/libs/readline/readline52-011
+++ /dev/null
@@ -1,32 +0,0 @@
- READLINE PATCH REPORT
- =====================
-
-Readline-Release: 5.2
-Patch-ID: readline52-011
-
-Bug-Reported-by: Uwe Doering <gemini AT geminix.org>
-Bug-Reference-ID: <46F3DD72.2090801 AT geminix.org>
-Bug-Reference-URL:
http://lists.gnu.org/archive/html/bug-bash/2007-09/msg00102.html
-
-Bug-Description:
-
-There is an off-by-one error in the code that buffers characters received
-very quickly in succession, causing characters to be dropped.
-
-Patch:
-
-*** ../readline-5.2-patched/input.c 2007-08-25 13:47:10.000000000 -0400
---- input.c 2007-10-12 22:55:25.000000000 -0400
-***************
-*** 155,159 ****
- pop_index--;
- if (pop_index < 0)
-! pop_index = ibuffer_len - 1;
- ibuffer[pop_index] = key;
- return (1);
---- 155,159 ----
- pop_index--;
- if (pop_index < 0)
-! pop_index = ibuffer_len;
- ibuffer[pop_index] = key;
- return (1);
diff --git a/libs/readline/readline52-012 b/libs/readline/readline52-012
deleted file mode 100644
index 7b37024..0000000
--- a/libs/readline/readline52-012
+++ /dev/null
@@ -1,150 +0,0 @@
- READLINE PATCH REPORT
- =====================
-
-Readline-Release: 5.2
-Patch-ID: readline52-012
-
-Bug-Reported-by: Chet Ramey <chet.ramey AT case.edu>
-Bug-Reference-ID:
-Bug-Reference-URL:
-
-Bug-Description:
-
-This updates the options required to create shared libraries on several
-systems, including Mac OS X 10.5 (darwin9.x), FreeBSD, NetBSD, OpenBSD,
-AIX, and HP/UX.
-
-Patch:
-
-*** ../readline-5.2-patched/support/shobj-conf 2006-04-11 09:15:43.000000000
-0400
---- support/shobj-conf 2007-12-06 23:46:41.000000000 -0500
-***************
-*** 11,15 ****
- # chet AT po.cwru.edu
-
-! # Copyright (C) 1996-2002 Free Software Foundation, Inc.
- #
- # This program is free software; you can redistribute it and/or modify
---- 11,15 ----
- # chet AT po.cwru.edu
-
-! # Copyright (C) 1996-2007 Free Software Foundation, Inc.
- #
- # This program is free software; you can redistribute it and/or modify
-***************
-*** 115,119 ****
- ;;
-
-! freebsd2* | netbsd*)
- SHOBJ_CFLAGS=-fpic
- SHOBJ_LD=ld
---- 115,119 ----
- ;;
-
-! freebsd2*)
- SHOBJ_CFLAGS=-fpic
- SHOBJ_LD=ld
-***************
-*** 126,130 ****
- # FreeBSD-3.x ELF
- freebsd[3-9]*|freebsdelf[3-9]*|freebsdaout[3-9]*|dragonfly*)
-! SHOBJ_CFLAGS=-fpic
- SHOBJ_LD='${CC}'
-
---- 126,130 ----
- # FreeBSD-3.x ELF
- freebsd[3-9]*|freebsdelf[3-9]*|freebsdaout[3-9]*|dragonfly*)
-! SHOBJ_CFLAGS=-fPIC
- SHOBJ_LD='${CC}'
-
-***************
-*** 143,147 ****
-
- # Darwin/MacOS X
-! darwin8*)
- SHOBJ_STATUS=supported
- SHLIB_STATUS=supported
---- 143,147 ----
-
- # Darwin/MacOS X
-! darwin[89]*)
- SHOBJ_STATUS=supported
- SHLIB_STATUS=supported
-***************
-*** 154,158 ****
- SHLIB_LIBSUFF='dylib'
-
-! SHOBJ_LDFLAGS='-undefined dynamic_lookup'
- SHLIB_XLDFLAGS='-dynamiclib -arch_only `/usr/bin/arch` -install_name
$(libdir)/$@ -current_version $(SHLIB_MAJOR)$(SHLIB_MINOR)
-compatibility_version $(SHLIB_MAJOR) -v'
-
---- 154,158 ----
- SHLIB_LIBSUFF='dylib'
-
-! SHOBJ_LDFLAGS='-dynamiclib -dynamic -undefined dynamic_lookup
-arch_only `/usr/bin/arch`'
- SHLIB_XLDFLAGS='-dynamiclib -arch_only `/usr/bin/arch` -install_name
$(libdir)/$@ -current_version $(SHLIB_MAJOR)$(SHLIB_MINOR)
-compatibility_version $(SHLIB_MAJOR) -v'
-
-***************
-*** 172,176 ****
-
- case "${host_os}" in
-! darwin[78]*) SHOBJ_LDFLAGS=''
- SHLIB_XLDFLAGS='-dynamiclib -arch_only
`/usr/bin/arch` -install_name $(libdir)/$@ -current_version
$(SHLIB_MAJOR)$(SHLIB_MINOR) -compatibility_version $(SHLIB_MAJOR) -v'
- ;;
---- 172,176 ----
-
- case "${host_os}" in
-! darwin[789]*) SHOBJ_LDFLAGS=''
- SHLIB_XLDFLAGS='-dynamiclib -arch_only
`/usr/bin/arch` -install_name $(libdir)/$@ -current_version
$(SHLIB_MAJOR)$(SHLIB_MINOR) -compatibility_version $(SHLIB_MAJOR) -v'
- ;;
-***************
-*** 183,187 ****
- ;;
-
-! openbsd*)
- SHOBJ_CFLAGS=-fPIC
- SHOBJ_LD='${CC}'
---- 183,187 ----
- ;;
-
-! openbsd*|netbsd*)
- SHOBJ_CFLAGS=-fPIC
- SHOBJ_LD='${CC}'
-***************
-*** 248,252 ****
- ;;
-
-! aix4.[2-9]*-*gcc*) # lightly tested by jik AT cisco.com
- SHOBJ_CFLAGS=-fpic
- SHOBJ_LD='ld'
---- 248,252 ----
- ;;
-
-! aix4.[2-9]*-*gcc*|aix[5-9].*-*gcc*) # lightly tested by
jik AT cisco.com
- SHOBJ_CFLAGS=-fpic
- SHOBJ_LD='ld'
-***************
-*** 259,263 ****
- ;;
-
-! aix4.[2-9]*)
- SHOBJ_CFLAGS=-K
- SHOBJ_LD='ld'
---- 259,263 ----
- ;;
-
-! aix4.[2-9]*|aix[5-9].*)
- SHOBJ_CFLAGS=-K
- SHOBJ_LD='ld'
-***************
-*** 330,334 ****
- # if you have problems linking here, moving the `-Wl,+h,$@' from
- # SHLIB_XLDFLAGS to SHOBJ_LDFLAGS has been reported to work
-! SHOBJ_LDFLAGS='-shared -Wl,-b -Wl,+s'
-
- SHLIB_XLDFLAGS='-Wl,+h,$@ -Wl,+b,$(libdir)'
---- 330,334 ----
- # if you have problems linking here, moving the `-Wl,+h,$@' from
- # SHLIB_XLDFLAGS to SHOBJ_LDFLAGS has been reported to work
-! SHOBJ_LDFLAGS='-shared -fpic -Wl,-b -Wl,+s'
-
- SHLIB_XLDFLAGS='-Wl,+h,$@ -Wl,+b,$(libdir)'
diff --git a/libs/xalan-c/BUILD b/libs/xalan-c/BUILD
index d4370d4..4eac159 100755
--- a/libs/xalan-c/BUILD
+++ b/libs/xalan-c/BUILD
@@ -1,7 +1,19 @@
-cd c &&
+if [[ $XAL_VER == release ]];then
+ cd c
+fi &&
+export XALANCROOT=$PWD &&

-export XALANCROOT="$SOURCE_DIRECTORY/c" &&
-./runConfigure -p linux -c gcc -P /usr &&
+if [[ "${SMGL_COMPAT_ARCHS[1]}" == "x86_64" ]]; then
+ ARCH=64
+else
+ ARCH=32
+fi &&
+
+if is_depends_enabled $SPELL icu; then
+ export ICUROOT=$INSTALL_ROOT/usr
+fi &&
+
+./runConfigure -p linux -b $ARCH -c gcc $OPTS -P $INSTALL_ROOT/usr &&

make_single &&
make &&
diff --git a/libs/xalan-c/DEPENDS b/libs/xalan-c/DEPENDS
index 914a7b8..dedee59 100755
--- a/libs/xalan-c/DEPENDS
+++ b/libs/xalan-c/DEPENDS
@@ -1 +1,3 @@
-depends xerces-c
+depends g++ &&
+depends xerces-c &&
+optional_depends icu '-t icu' '' 'Unicode support'
diff --git a/libs/xalan-c/DETAILS b/libs/xalan-c/DETAILS
index c2091dc..e549f17 100755
--- a/libs/xalan-c/DETAILS
+++ b/libs/xalan-c/DETAILS
@@ -1,9 +1,19 @@
SPELL=xalan-c
+if [[ $XAL_VER == svn ]];then
+
+ VERSION=svn
+ SOURCE_IGNORE=volatile
+ FORCE_DOWNLOAD=on
+ SOURCE=xalan-c-svn.tar.bz2
+ SOURCE_URL[0]=svn_http://svn.apache.org/repos/asf/xalan/c/trunk:$SPELL
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/xalan-c-svn
+else
VERSION=1_10_0
+
SOURCE_HASH=sha512:6a025ac4a21d0c1dd4100a7e93673c528427fa091c2fcb1895a3730bc4eefa7a27b28034f04be1e91db22abbbfd21eb275bcf09b0e3d35b18dd1fddb99e70d30
SOURCE=Xalan-C_${VERSION}-src.tar.gz
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/xml-xalan
SOURCE_URL[0]=http://www.apache.org/dist/xml/xalan-c/$SOURCE
-
SOURCE_HASH=sha512:6a025ac4a21d0c1dd4100a7e93673c528427fa091c2fcb1895a3730bc4eefa7a27b28034f04be1e91db22abbbfd21eb275bcf09b0e3d35b18dd1fddb99e70d30
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/xml-xalan
+fi
LICENSE[0]=APACHE
WEB_SITE=http://xml.apache.org/xalan-c/
ENTERED=20070530
diff --git a/libs/xalan-c/HISTORY b/libs/xalan-c/HISTORY
index da1f307..0e5e5ef 100644
--- a/libs/xalan-c/HISTORY
+++ b/libs/xalan-c/HISTORY
@@ -1,3 +1,15 @@
+2009-03-06 Treeve Jelbert <treeve AT sourcemage.org>
+ * PREPARE: added, for svn support
+ * DETAILS: add svn support
+ * DEPENDS: add g++
+ add optional icu
+ * BUILD: add option for 64 bit build
+ add icu support
+ adjust for svn support
+ * PRE_BUILD: svn version does not need patch
+ * INSTALL: added, their install tries to overwrite icu
+ preserve symlinks for libraries
+
2008-07-14 Juuso Alasuutari <iuso AT sourcemage.org>
* BUILD: Force single-job build.

diff --git a/libs/xalan-c/INSTALL b/libs/xalan-c/INSTALL
new file mode 100755
index 0000000..fc23b35
--- /dev/null
+++ b/libs/xalan-c/INSTALL
@@ -0,0 +1,2 @@
+cp -a lib/* $INSTALL_ROOT/usr/lib &&
+install bin/* $INSTALL_ROOT/usr/bin
diff --git a/libs/xalan-c/PREPARE b/libs/xalan-c/PREPARE
new file mode 100755
index 0000000..dfa82de
--- /dev/null
+++ b/libs/xalan-c/PREPARE
@@ -0,0 +1,2 @@
+config_query_list XAL_VER 'which version of xalan?' release svn
+
diff --git a/libs/xalan-c/PRE_BUILD b/libs/xalan-c/PRE_BUILD
index 34cce88..a2b530f 100755
--- a/libs/xalan-c/PRE_BUILD
+++ b/libs/xalan-c/PRE_BUILD
@@ -1,3 +1,7 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&
-patch -p1 < $SCRIPT_DIRECTORY/gcc43.patch
+if [[ $XAL_VER == release ]];then
+ patch -p1 < $SCRIPT_DIRECTORY/gcc43.patch
+else
+ rm -r Projects/Win32
+fi
diff --git a/libs/xerces-c/BUILD b/libs/xerces-c/BUILD
deleted file mode 100755
index a0e294c..0000000
--- a/libs/xerces-c/BUILD
+++ /dev/null
@@ -1,17 +0,0 @@
-export XERCESCROOT=$SOURCE_DIRECTORY
-
-if echo $OPTS | grep -q 'ticu'; then
- export ICUROOT=/usr
-fi &&
-
-cd src/xercesc &&
-autoconf &&
-
-chmod u+x runConfigure configure install-sh
-./runConfigure -plinux -cgcc -xg++ -minmem \
- -nsocket -rpthread \
- $OPTS \
- -P /usr &&
-
-make_single &&
-make
diff --git a/libs/xerces-c/DEPENDS b/libs/xerces-c/DEPENDS
index c7651a2..4273c19 100755
--- a/libs/xerces-c/DEPENDS
+++ b/libs/xerces-c/DEPENDS
@@ -1,7 +1,5 @@
-depends autoconf &&
+#depends autoconf &&
depends g++ &&
-
-optional_depends "icu" \
- "-ticu" \
- "" \
- "to build xerces-c with ICU (unicode support) [recomended]"
+depends pkgconfig &&
+optional_depends curl '-with-curl' '' '' &&
+optional_depends icu '--with-icu' '' 'ICU (unicode support)'
diff --git a/libs/xerces-c/DETAILS b/libs/xerces-c/DETAILS
index 965d2cd..30f6d58 100755
--- a/libs/xerces-c/DETAILS
+++ b/libs/xerces-c/DETAILS
@@ -1,8 +1,8 @@
SPELL=xerces-c
- VERSION=2_8_0
- SOURCE=$SPELL-src_$VERSION.tar.gz
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-src_$VERSION
- SOURCE_URL[0]=$APACHE_URL/${SPELL//-c}/c/2/sources/$SOURCE
+ VERSION=3.0.1
+ SOURCE=$SPELL-$VERSION.tar.gz
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+ SOURCE_URL[0]=$APACHE_URL/${SPELL//-c}/c/3/sources/$SOURCE
SOURCE2=$SOURCE.asc
SOURCE2_URL[0]=${SOURCE_URL[0]}.asc
SOURCE_GPG=xerces.gpg:$SOURCE.asc:UPSTREAM_KEY
diff --git a/libs/xerces-c/HISTORY b/libs/xerces-c/HISTORY
index 153a54a..d4ebf75 100644
--- a/libs/xerces-c/HISTORY
+++ b/libs/xerces-c/HISTORY
@@ -1,3 +1,9 @@
+2009-03-06 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 3.0.1
+ * DEPENDS: add curl
+ change option for icu
+ * BUILD, INSTALL: deleted
+
2008-11-22 George Sherwood <gsherwood AT sourcemage.org>
* DETAILS: Updated SOURCE_URL

diff --git a/libs/xerces-c/INSTALL b/libs/xerces-c/INSTALL
deleted file mode 100755
index f4a49ce..0000000
--- a/libs/xerces-c/INSTALL
+++ /dev/null
@@ -1,6 +0,0 @@
-make_normal &&
-default_install &&
-
-# needed for libpathan
-mkdir -p /usr/include/xercesc/dom/impl &&
-cp dom/impl/*.hpp /usr/include/xercesc/dom/impl
diff --git a/lua-forge/luafilesystem/DETAILS b/lua-forge/luafilesystem/DETAILS
index 2792e7b..bae19bf 100755
--- a/lua-forge/luafilesystem/DETAILS
+++ b/lua-forge/luafilesystem/DETAILS
@@ -1,16 +1,16 @@
SPELL=luafilesystem
- VERSION=1.4.1
+ VERSION=1.4.2
SOURCE=$SPELL-$VERSION.tar.gz
- SOURCE_URL[0]=http://luaforge.net/frs/download.php/3345/$SOURCE
-
SOURCE_HASH=sha512:383d0fa584366aed26627bf5d19bd404199c7d1b819d2e2ebdeab204f73a2aafa2b236b86cc9792bf0655659eda8be2bfd509b7fa19a91f868ae2b36bbef0919
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+ SOURCE_URL[0]=http://luaforge.net/frs/download.php/3931/$SOURCE
+
SOURCE_HASH=sha512:a03ea5cb406bccd3a173fc465b536a8e922d4c1fc1b82f1a1661c656b789cdb4df106cd30e8f8aaeb77731a8ac4c728f1f7f46c546d22e3ccd22de9bc605f50a
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
WEB_SITE=http://www.keplerproject.org/luafilesystem/
LICENSE[0]=MIT
ENTERED=20080110
SHORT="File System Library for the Lua Programming Language"
cat << EOF
-LuaFileSystem (lfs) is a Lua library developed to complement the set
-of functions related to file systems offered by the standard Lua
-distribution. LuaFileSystem offers a portable way to access the
-underlying directory structure and file attributes.
+LuaFileSystem (lfs) is a Lua library developed to complement the set of
+functions related to file systems offered by the standard Lua distribution.
+LuaFileSystem offers a portable way to access the underlying directory
structure
+and file attributes.
EOF
diff --git a/lua-forge/luafilesystem/HISTORY b/lua-forge/luafilesystem/HISTORY
index 5a51fca..39f6893 100644
--- a/lua-forge/luafilesystem/HISTORY
+++ b/lua-forge/luafilesystem/HISTORY
@@ -1,3 +1,6 @@
+2009-03-08 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 1.4.2
+
2008-05-09 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 1.4.1

diff --git a/net/iptables/HISTORY b/net/iptables/HISTORY
index c87cd93..4135211 100644
--- a/net/iptables/HISTORY
+++ b/net/iptables/HISTORY
@@ -1,3 +1,9 @@
+2009-03-07 Remko van der Vossen <wich AT sourcemage.org>
+ * PRE_BUILD, iptables-xtables-compile-fix.patch: fixed compilation,
+ patch in include for netinet/in.h which defines the proper
+ identifiers, makeing the #ifndefs work as intended, taken from the
+ iptables git repo. Fixes bug 15015.
+
2008-10-14 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 1.4.2; renewed desc
* PRE_BUILD: fixed compilation (SCTP is already defined in the
headers)
diff --git a/net/iptables/PRE_BUILD b/net/iptables/PRE_BUILD
index 7e6ab59..823807b 100755
--- a/net/iptables/PRE_BUILD
+++ b/net/iptables/PRE_BUILD
@@ -1,5 +1,4 @@
default_pre_build &&
cd "$SOURCE_DIRECTORY" &&

-# fixed compilation with SCTP (check in next release)
-sed -i "11,13d" include/xtables.h.in
+patch -p1 < "$SPELL_DIRECTORY/iptables-xtables-compile-fix.patch"
diff --git a/net/iptables/iptables-xtables-compile-fix.patch
b/net/iptables/iptables-xtables-compile-fix.patch
new file mode 100644
index 0000000..4c775ce
--- /dev/null
+++ b/net/iptables/iptables-xtables-compile-fix.patch
@@ -0,0 +1,11 @@
+diff -Naur iptables-1.4.2.orig/include/xtables.h.in
iptables-1.4.2/include/xtables.h.in
+--- iptables-1.4.2.orig/include/xtables.h.in 2008-10-08 18:31:58.000000000
+0200
++++ iptables-1.4.2/include/xtables.h.in 2009-03-07 15:37:49.000000000
+0100
+@@ -4,6 +4,7 @@
+ #include <sys/socket.h> /* PF_* */
+ #include <sys/types.h>
+ #include <stdbool.h>
++#include <netinet/in.h>
+ #include <net/if.h>
+ #include <linux/types.h>
+ #include <linux/netfilter/x_tables.h>
diff --git a/net/shorewall-common/DETAILS b/net/shorewall-common/DETAILS
index 67c2a0f..7562d37 100755
--- a/net/shorewall-common/DETAILS
+++ b/net/shorewall-common/DETAILS
@@ -1,5 +1,5 @@
SPELL=shorewall-common
- VERSION=4.0.14
+ VERSION=4.2.6
MAINVER=${VERSION:0:3}
RELEASE=shorewall-$VERSION
SOURCE=$SPELL-$VERSION.tar.bz2
diff --git a/net/shorewall-common/HISTORY b/net/shorewall-common/HISTORY
index 9978605..84ef5ea 100644
--- a/net/shorewall-common/HISTORY
+++ b/net/shorewall-common/HISTORY
@@ -1,3 +1,6 @@
+2009-03-08 Arjan Bouter <abouter AT sourcemage.org>
+ * DETAILS: updated to 4.2.6
+
2008-09-30 Elisamuel Resto <ryuji AT sourcemage.org>
* DETAILS: updated to 4.0.14

diff --git a/net/shorewall-docs-html/DETAILS b/net/shorewall-docs-html/DETAILS
index a301d82..db6ae3d 100755
--- a/net/shorewall-docs-html/DETAILS
+++ b/net/shorewall-docs-html/DETAILS
@@ -1,5 +1,5 @@
SPELL=shorewall-docs-html
- VERSION=4.0.14
+ VERSION=4.2.6
MAINVER=${VERSION:0:3}
RELEASE=shorewall-$VERSION
SOURCE=$SPELL-$VERSION.tar.bz2
diff --git a/net/shorewall-docs-html/HISTORY b/net/shorewall-docs-html/HISTORY
index 9eabcad..1f39704 100644
--- a/net/shorewall-docs-html/HISTORY
+++ b/net/shorewall-docs-html/HISTORY
@@ -1,3 +1,6 @@
+2009-03-08 Arjan Bouter <abouter AT sourcemage.org>
+ * DETAILS: updated to 4.2.6
+
2008-09-30 Elisamuel Resto <ryuji AT sourcemage.org>
* DETAILS: updated to 4.0.14

diff --git a/net/shorewall-docs-xml/DETAILS b/net/shorewall-docs-xml/DETAILS
index 98a559d..b3a007f 100755
--- a/net/shorewall-docs-xml/DETAILS
+++ b/net/shorewall-docs-xml/DETAILS
@@ -1,5 +1,5 @@
SPELL=shorewall-docs-xml
- VERSION=4.0.14
+ VERSION=4.2.6
MAINVER=${VERSION:0:3}
RELEASE=shorewall-$VERSION
SOURCE=$SPELL-$VERSION.tar.bz2
diff --git a/net/shorewall-docs-xml/HISTORY b/net/shorewall-docs-xml/HISTORY
index 9eabcad..0add037 100644
--- a/net/shorewall-docs-xml/HISTORY
+++ b/net/shorewall-docs-xml/HISTORY
@@ -1,3 +1,6 @@
+2009-03-08 Arjan Bouter <abouter AT sourcemage.org>
+ * DETAILS: updated to 4.2.6
+
2008-09-30 Elisamuel Resto <ryuji AT sourcemage.org>
* DETAILS: updated to 4.0.14

diff --git a/net/shorewall-lite/DETAILS b/net/shorewall-lite/DETAILS
index d66942c..b4d58f8 100755
--- a/net/shorewall-lite/DETAILS
+++ b/net/shorewall-lite/DETAILS
@@ -1,5 +1,5 @@
SPELL=shorewall-lite
- VERSION=4.0.14
+ VERSION=4.2.6
MAINVER=${VERSION:0:3}
RELEASE=shorewall-$VERSION
SOURCE=$SPELL-$VERSION.tar.bz2
diff --git a/net/shorewall-lite/HISTORY b/net/shorewall-lite/HISTORY
index 803fb7b..3c73ecf 100644
--- a/net/shorewall-lite/HISTORY
+++ b/net/shorewall-lite/HISTORY
@@ -1,3 +1,6 @@
+2009-03-08 Arjan Bouter <abouter AT sourcemage.org>
+ * DETAILS: updated to 4.2.6
+
2008-09-30 Elisamuel Resto <ryuji AT sourcemage.org>
* DETAILS: updated to 4.0.14

diff --git a/net/shorewall-perl/DETAILS b/net/shorewall-perl/DETAILS
index 78b794b..6cfdfa1 100755
--- a/net/shorewall-perl/DETAILS
+++ b/net/shorewall-perl/DETAILS
@@ -1,7 +1,7 @@
SPELL=shorewall-perl
- VERSION=4.0.14
+ VERSION=4.2.6.2
MAINVER=${VERSION:0:3}
- RELEASE=shorewall-${VERSION}
+ RELEASE=shorewall-${VERSION:0:5}
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE2=$SPELL-$VERSION.tar.bz2.asc

SOURCE_URL[0]=ftp://slovakia.shorewall.net/mirror/shorewall/$MAINVER/$RELEASE/$SOURCE
diff --git a/net/shorewall-perl/HISTORY b/net/shorewall-perl/HISTORY
index ee3805c..612edcb 100644
--- a/net/shorewall-perl/HISTORY
+++ b/net/shorewall-perl/HISTORY
@@ -1,3 +1,6 @@
+2009-03-08 Arjan Bouter <abouter AT sourcemage.org>
+ * DETAILS: updated to 4.2.6.2
+
2008-09-30 Elisamuel Resto <ryuji AT sourcemage.org>
* DETAILS: updated to 4.0.14

diff --git a/net/shorewall-shell/DETAILS b/net/shorewall-shell/DETAILS
index e9d9c14..79e857c 100755
--- a/net/shorewall-shell/DETAILS
+++ b/net/shorewall-shell/DETAILS
@@ -1,5 +1,5 @@
SPELL=shorewall-shell
- VERSION=4.0.14
+ VERSION=4.2.6
MAINVER=${VERSION:0:3}
RELEASE=shorewall-${VERSION}
SOURCE=$SPELL-$VERSION.tar.bz2
diff --git a/net/shorewall-shell/HISTORY b/net/shorewall-shell/HISTORY
index ee3805c..ebd0435 100644
--- a/net/shorewall-shell/HISTORY
+++ b/net/shorewall-shell/HISTORY
@@ -1,3 +1,6 @@
+2009-03-08 Arjan Bouter <abouter AT sourcemage.org>
+ * DETAILS: updated to 4.2.6
+
2008-09-30 Elisamuel Resto <ryuji AT sourcemage.org>
* DETAILS: updated to 4.0.14

diff --git a/net/shorewall/DEPENDS b/net/shorewall/DEPENDS
index b0d7f0c..8d60a0f 100755
--- a/net/shorewall/DEPENDS
+++ b/net/shorewall/DEPENDS
@@ -1,3 +1,5 @@
depends shorewall-common &&
+optional_depends shorewall6 "" "" "for IPv6" &&
+optional_depends shorewall-docs-html "" "" "for html documentation" &&
optional_depends shorewall-docs-html "" "" "for html documentation" &&
optional_depends shorewall-docs-xml "" "" "for xml documentation"
diff --git a/net/shorewall/DETAILS b/net/shorewall/DETAILS
index bbb361d..1d7d036 100755
--- a/net/shorewall/DETAILS
+++ b/net/shorewall/DETAILS
@@ -1,5 +1,5 @@
SPELL=shorewall
- VERSION=4.0.14
+ VERSION=4.2.6
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
LICENSE[0]=GPL
KEYWORDS="firewall net"
diff --git a/net/shorewall/HISTORY b/net/shorewall/HISTORY
index 9ccdc76..2f45582 100644
--- a/net/shorewall/HISTORY
+++ b/net/shorewall/HISTORY
@@ -1,3 +1,6 @@
+2009-03-08 Arjan Bouter <abouter AT sourcemage.org>
+ * DETAILS: updated to 4.2.6
+
2008-09-30 Elisamuel Resto <ryuji AT sourcemage.org>
* DETAILS: updated to 4.0.14

diff --git a/net/shorewall6-lite/BUILD b/net/shorewall6-lite/BUILD
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/net/shorewall6-lite/BUILD
@@ -0,0 +1 @@
+true
diff --git a/net/shorewall6-lite/CONFLICTS b/net/shorewall6-lite/CONFLICTS
new file mode 100755
index 0000000..bc392f7
--- /dev/null
+++ b/net/shorewall6-lite/CONFLICTS
@@ -0,0 +1 @@
+conflicts shorewall-common
diff --git a/net/shorewall6-lite/DEPENDS b/net/shorewall6-lite/DEPENDS
new file mode 100755
index 0000000..dbeb825
--- /dev/null
+++ b/net/shorewall6-lite/DEPENDS
@@ -0,0 +1,3 @@
+depends iproute2 &&
+depends iptables &&
+depends SYSTEM-LOGGER
diff --git a/net/shorewall6-lite/DETAILS b/net/shorewall6-lite/DETAILS
new file mode 100755
index 0000000..c6e7fc9
--- /dev/null
+++ b/net/shorewall6-lite/DETAILS
@@ -0,0 +1,37 @@
+ SPELL=shorewall6-lite
+ VERSION=4.2.6
+ MAINVER=${VERSION:0:3}
+ RELEASE=shorewall-$VERSION
+ SOURCE=$SPELL-$VERSION.tar.bz2
+ SOURCE2=$SPELL-$VERSION.tar.bz2.asc
+
SOURCE_URL[0]=ftp://slovakia.shorewall.net/mirror/shorewall/$MAINVER/$RELEASE/$SOURCE
+
SOURCE_URL[1]=ftp://www.shorewall.net/pub/shorewall/$MAINVER/$RELEASE/$SOURCE
+ SOURCE_URL[2]=http://shorewall.de/pub/shorewall/$MAINVER/$RELEASE/$SOURCE
+
SOURCE_URL[3]=ftp://www1.shorewall.net/pub/shorewall/$MAINVER/$RELEASE/$SOURCE
+
SOURCE2_URL[0]=ftp://slovakia.shorewall.net/mirror/shorewall/$MAINVER/$RELEASE/$SOURCE2
+
SOURCE2_URL[1]=ftp://www.shorewall.net/pub/shorewall/$MAINVER/$RELEASE/$SOURCE2
+ SOURCE2_URL[2]=http://shorewall.de/pub/shorewall/$MAINVER/$RELEASE/$SOURCE2
+
SOURCE2_URL[3]=ftp://www1.shorewall.net/pub/shorewall/$MAINVER/$RELEASE/$SOURCE2
+ SOURCE2_IGNORE=signature
+ SOURCE_GPG="shorewall.gpg:${SOURCE2}"
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+ WEB_SITE=http://www.shorewall.net/
+ ENTERED=20070902
+ LICENSE[0]=GPL
+ KEYWORDS="firewall net"
+ SHORT="A high-level tool for configuring Netfilter."
+cat << EOF
+This is the shorewall-lite package. It can function on its own, but only to
run
+compiled scripts. The scripts must be compiled on a different machine.
+Ref: http://www.shorewall.net/CompiledPrograms.html#Lite
+
+The Shoreline Firewall, more commonly known as "Shorewall", is a high-level
+tool for configuring Netfilter. You describe your firewall/gateway
+requirements using entries in a set of configuration files. Shorewall reads
+those configuration files and with the help of the iptables utility,
Shorewall
+configures Netfilter to match your requirements. Shorewall can be used on a
+dedicated firewall system, a multi-function gateway/router/server or on a
+standalone GNU/Linux system. Shorewall does not use Netfilter's ipchains
+compatibility mode and can thus take advantage of Netfilter's connection
state
+tracking capabilities.
+EOF
diff --git a/net/shorewall6-lite/HISTORY b/net/shorewall6-lite/HISTORY
new file mode 100644
index 0000000..364d7ca
--- /dev/null
+++ b/net/shorewall6-lite/HISTORY
@@ -0,0 +1,3 @@
+2009-03-08 Arjan Bouter <abouter AT sourcemage.org>
+ * BUILD,CONFLICTS,DEPENDS,DETAILS,HISTORY,INSTALL,PRE_BUILD:
+ created spell, version 4.2.6
diff --git a/net/shorewall6-lite/INSTALL b/net/shorewall6-lite/INSTALL
new file mode 100755
index 0000000..b816bbc
--- /dev/null
+++ b/net/shorewall6-lite/INSTALL
@@ -0,0 +1 @@
+PREFIX="$INSTALL_ROOT" ./install.sh
diff --git a/net/shorewall6-lite/PRE_BUILD b/net/shorewall6-lite/PRE_BUILD
new file mode 100755
index 0000000..c7a1074
--- /dev/null
+++ b/net/shorewall6-lite/PRE_BUILD
@@ -0,0 +1,6 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+
+# Disable init script install
+sed -i "s/install_file_with_backup init.*/true/" install.sh &&
+sed -i "s/ln -s.*init.*/true/" install.sh
diff --git a/net/shorewall6-lite/init.d/shorewall6
b/net/shorewall6-lite/init.d/shorewall6
new file mode 100644
index 0000000..1f2f194
--- /dev/null
+++ b/net/shorewall6-lite/init.d/shorewall6
@@ -0,0 +1,47 @@
+#!/bin/bash
+
+RUNLEVEL=3
+PROGRAM=/sbin/shorewall6
+NEEDS="+network +remote_fs"
+
+. /etc/init.d/smgl_init
+. /etc/sysconfig/shorewall6
+
+start()
+{
+ # Shorewall needs /var/log/messages to exist
+ if [[ ! -f /var/log/messages ]]
+ then
+ touch /var/log/messages
+ fi &&
+ # Create shorewall log file if it doesn't exist
+ if [[ ! -f $SHOREWALL_LOG ]]
+ then
+ touch $SHOREWALL_LOG
+ fi &&
+ # Shorewall needs subsys
+ if [[ ! -d /var/lock/subsys/ ]]
+ then
+ mkdir -p /var/lock/subsys/
+ fi &&
+ echo Starting Shorewall... &&
+ ( unset -f echo; date "$DATE_FORMAT" >> $SHOREWALL_LOG 2>&1 ; ) &&
+ ( unset -f echo; ${PROGRAM} start >> $SHOREWALL_LOG 2>&1 ; )
+}
+
+stop()
+{
+ echo Stopping Shorewall... &&
+ ( unset -f echo; date "$DATE_FORMAT" >> $SHOREWALL_LOG 2>&1 ; ) &&
+ ( unset -f echo; ${PROGRAM} stop >> $SHOREWALL_LOG 2>&1 ; )
+}
+
+status()
+{
+ ( unset -f echo; ${PROGRAM} status ; )
+}
+
+reload()
+{
+ ( unset -f echo; ${PROGRAM} refresh ; )
+}
diff --git a/net/shorewall6-lite/init.d/shorewall6.conf
b/net/shorewall6-lite/init.d/shorewall6.conf
new file mode 100644
index 0000000..e1b712f
--- /dev/null
+++ b/net/shorewall6-lite/init.d/shorewall6.conf
@@ -0,0 +1,5 @@
+# Full path to the log file.
+SHOREWALL_LOG=/var/log/shorewall.log
+
+# As described in 'man date'. The value must begin with a + symbol.
+DATE_FORMAT="+%F %T"
diff --git a/net/shorewall6/BUILD b/net/shorewall6/BUILD
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/net/shorewall6/BUILD
@@ -0,0 +1 @@
+true
diff --git a/net/shorewall6/DEPENDS b/net/shorewall6/DEPENDS
new file mode 100755
index 0000000..3d38422
--- /dev/null
+++ b/net/shorewall6/DEPENDS
@@ -0,0 +1,7 @@
+message "You need one of the compilers" &&
+optional_depends shorewall-perl "" "" "for the perl compiler (reccomended)"
&&
+optional_depends shorewall-shell "" "" "for the shell compiler" &&
+depends shorewall-common &&
+depends iproute2 &&
+depends iptables &&
+depends SYSTEM-LOGGER
diff --git a/net/shorewall6/DETAILS b/net/shorewall6/DETAILS
new file mode 100755
index 0000000..f25d888
--- /dev/null
+++ b/net/shorewall6/DETAILS
@@ -0,0 +1,37 @@
+ SPELL=shorewall6
+ VERSION=4.2.6
+ MAINVER=${VERSION:0:3}
+ RELEASE=shorewall-$VERSION
+ SOURCE=$SPELL-$VERSION.tar.bz2
+ SOURCE2=$SPELL-$VERSION.tar.bz2.asc
+
SOURCE_URL[0]=ftp://slovakia.shorewall.net/mirror/shorewall/$MAINVER/$RELEASE/$SOURCE
+
SOURCE_URL[1]=ftp://www.shorewall.net/pub/shorewall/$MAINVER/$RELEASE/$SOURCE
+ SOURCE_URL[2]=http://shorewall.de/pub/shorewall/$MAINVER/$RELEASE/$SOURCE
+
SOURCE_URL[3]=ftp://www1.shorewall.net/pub/shorewall/$MAINVER/$RELEASE/$SOURCE
+
SOURCE2_URL[0]=ftp://slovakia.shorewall.net/mirror/shorewall/$MAINVER/$RELEASE/$SOURCE2
+
SOURCE2_URL[1]=ftp://www.shorewall.net/pub/shorewall/$MAINVER/$RELEASE/$SOURCE2
+ SOURCE2_URL[2]=http://shorewall.de/pub/shorewall/$MAINVER/$RELEASE/$SOURCE2
+
SOURCE2_URL[3]=ftp://www1.shorewall.net/pub/shorewall/$MAINVER/$RELEASE/$SOURCE2
+ SOURCE2_IGNORE=signature
+ SOURCE_GPG="shorewall.gpg:${SOURCE2}"
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+ WEB_SITE=http://www.shorewall.net/
+ ENTERED=20070902
+ LICENSE[0]=GPL
+ KEYWORDS="firewall net"
+ SHORT="A high-level tool for configuring Netfilter."
+cat << EOF
+This is the shorewall-lite package. It can function on its own, but only to
run
+compiled scripts. The scripts must be compiled on a different machine.
+Ref: http://www.shorewall.net/CompiledPrograms.html#Lite
+
+The Shoreline Firewall, more commonly known as "Shorewall", is a high-level
+tool for configuring Netfilter. You describe your firewall/gateway
+requirements using entries in a set of configuration files. Shorewall reads
+those configuration files and with the help of the iptables utility,
Shorewall
+configures Netfilter to match your requirements. Shorewall can be used on a
+dedicated firewall system, a multi-function gateway/router/server or on a
+standalone GNU/Linux system. Shorewall does not use Netfilter's ipchains
+compatibility mode and can thus take advantage of Netfilter's connection
state
+tracking capabilities.
+EOF
diff --git a/net/shorewall6/HISTORY b/net/shorewall6/HISTORY
new file mode 100644
index 0000000..83c6a3c
--- /dev/null
+++ b/net/shorewall6/HISTORY
@@ -0,0 +1,2 @@
+2009-03-08 Arjan Bouter <abouter AT sourcemage.org>
+ * DETAILS,DEPENDS,HISTORY,BUILD,PRE_BUILD,INSTALL: created spell,
version 4.2.6
diff --git a/net/shorewall6/INSTALL b/net/shorewall6/INSTALL
new file mode 100755
index 0000000..b816bbc
--- /dev/null
+++ b/net/shorewall6/INSTALL
@@ -0,0 +1 @@
+PREFIX="$INSTALL_ROOT" ./install.sh
diff --git a/net/shorewall6/PRE_BUILD b/net/shorewall6/PRE_BUILD
new file mode 100755
index 0000000..c7a1074
--- /dev/null
+++ b/net/shorewall6/PRE_BUILD
@@ -0,0 +1,6 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+
+# Disable init script install
+sed -i "s/install_file_with_backup init.*/true/" install.sh &&
+sed -i "s/ln -s.*init.*/true/" install.sh
diff --git a/printer/gv/DETAILS b/printer/gv/DETAILS
index 8da9966..bbaa819 100755
--- a/printer/gv/DETAILS
+++ b/printer/gv/DETAILS
@@ -1,12 +1,11 @@
SPELL=gv
- VERSION=3.6.5
-
SOURCE_HASH=sha512:8b5364d627aa8b00dc8c767b3415c46d02c70b776fd2d4881b89ff33de3f80a92ce3836b4effd6207ad2475aeedec487859bc20259bc5c4dad0b079a515e78b9
+ VERSION=3.6.6
+
SOURCE_HASH=sha512:d66b8b9803652a565dad93dfe39a722197eedcfd0633e52634400380399e2af7d4a4e5e135ff2f4d7fe6c784ae6b2eb0366381399e391ee6b8ce1f29693c8c62
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$GNU_URL/gv/$SOURCE
WEB_SITE=http://www.gnu.org/software/gv
LICENSE[0]=GPL
-# SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
ENTERED=20020415
KEYWORDS="pdf postscript printer"
SHORT="gv is a PDF and PostScript viewer program"
diff --git a/printer/gv/HISTORY b/printer/gv/HISTORY
index 8da0c81..abfbca7 100644
--- a/printer/gv/HISTORY
+++ b/printer/gv/HISTORY
@@ -1,3 +1,6 @@
+2009-03-07 Remko van der Vossen <wich AT sourcemage.org>
+ * DETAILS: 3.6.6
+
2008-08-04 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 3.6.5

diff --git a/python-pypi/bzrtools/DETAILS b/python-pypi/bzrtools/DETAILS
index 601b1cd..64783c7 100755
--- a/python-pypi/bzrtools/DETAILS
+++ b/python-pypi/bzrtools/DETAILS
@@ -1,5 +1,5 @@
SPELL=bzrtools
- VERSION=1.10.0
+ VERSION=1.12.0
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SOURCE.sig
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL
diff --git a/python-pypi/bzrtools/HISTORY b/python-pypi/bzrtools/HISTORY
index 8b9574e..514cbca 100644
--- a/python-pypi/bzrtools/HISTORY
+++ b/python-pypi/bzrtools/HISTORY
@@ -1,3 +1,6 @@
+2009-03-08 Treeve Jelbert <treeve AT souremage.org>
+ * DETAILS: version 1.12.0
+
2008-12-06 Treeve Jelbert <treeve AT souremage.org>
* DETAILS: version 1.10.0
new url
diff --git a/shell-term-fm/bash/DETAILS b/shell-term-fm/bash/DETAILS
index c5ccd03..e46b0d5 100755
--- a/shell-term-fm/bash/DETAILS
+++ b/shell-term-fm/bash/DETAILS
@@ -1,8 +1,8 @@
SPELL=bash
- VERSION=3.2.48
+ VERSION=4.0
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SOURCE.sig
- SOURCE3=$SPELL-doc-${VERSION%.*}.tar.gz
+ SOURCE3=$SPELL-doc-3.2.tar.gz
SOURCE4=$SOURCE3.sig
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=$GNU_URL/$SPELL/$SOURCE
diff --git a/shell-term-fm/bash/HISTORY b/shell-term-fm/bash/HISTORY
index e43c56b..362da22 100644
--- a/shell-term-fm/bash/HISTORY
+++ b/shell-term-fm/bash/HISTORY
@@ -1,3 +1,6 @@
+2009-02-21 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 4.0; use doc from 3.2
+
2009-01-16 George Sherwood <gsherwood AT sourcemage.org>
* POST_REMOVE: Removed entries to delete from info dir
* PRE_REMOVE: Added entries to delete from info dir
diff --git a/utils/qemu/BUILD b/utils/qemu/BUILD
index cc57713..385683b 100755
--- a/utils/qemu/BUILD
+++ b/utils/qemu/BUILD
@@ -1,4 +1,4 @@
-message "Target list:$QEMU_ARCHS" &&
+message "Target list: $QEMU_ARCHS" &&

#
# Disable PIC if building soft MMU targets
@@ -6,7 +6,8 @@ message "Target list:$QEMU_ARCHS" &&
# generally shrinking march down to pentium-mmx
#
if grep -q softmmu <<< "$QEMU_ARCHS"; then
- message "${MESSAGE_COLOR}Qemu 0.9 has a build problem with advanced
CFLAGS.${DEFAULT_COLOR}" &&
+ # we need to check does 0.10 act the same way
+ message "${MESSAGE_COLOR}QEMU 0.9 has a build problem with advanced
CFLAGS.${DEFAULT_COLOR}" &&
message "${MESSAGE_COLOR}Trying to make it work, starting with removal of
any sse flags.${DEFAULT_COLOR}" &&
# sse seems to be bad; -march=pentium -m3dnow worked, though
list_remove CFLAGS -msse -msse2 -msse3 -mfpmath=sse &&
@@ -30,12 +31,8 @@ if grep -q softmmu <<< "$QEMU_ARCHS"; then
disable_pic
fi &&

-
-./configure --prefix=$INSTALL_ROOT/usr \
- --target-list="$QEMU_ARCHS" \
- $OPTS &&
-# --build=$BUILD \
-# --sysconfdir=$INSTALL_ROOT/etc \
-# --localstatedir=$INSTALL_ROOT/var \
+./configure --prefix="$INSTALL_ROOT/usr" \
+ --target-list="$QEMU_ARCHS" \
+ $OPTS &&

make
diff --git a/utils/qemu/CONFIGURE b/utils/qemu/CONFIGURE
index b061430..1f14d85 100755
--- a/utils/qemu/CONFIGURE
+++ b/utils/qemu/CONFIGURE
@@ -1,18 +1,21 @@
- local QEMU_ARCH_LIST &&
- persistent_add QEMU_ARCHS &&
- QEMU_ARCH_LIST=`cat $SCRIPT_DIRECTORY/archs` &&
- BACKTITLE="Qemu Archs Configuration" &&
- TITLE="Arch Selection" &&
- HELP="Select Arch you want to build qemu" &&
+local QEMU_ARCH_LIST=`cat $SPELL_DIRECTORY/archs` &&
+
+persistent_add QEMU_ARCHS &&
+
+BACKTITLE="Qemu Archs Configuration" &&
+ TITLE="Arch Selection" &&
+ HELP="Select Arch you want to build qemu" &&
+
# deliberately uses query, see locale CONFIGURE note
if query "Handpick architectures to emulate (y/n)?" n; then
- QEMU_ARCHS=`dialog --backtitle "$BACKTITLE" \
- --title "$TITLE" \
- --stdout \
- --checklist "$HELP" \
- 0 0 0 \
- $QEMU_ARCH_LIST`
+ QEMU_ARCHS=`dialog --backtitle "$BACKTITLE" \
+ --title "$TITLE" \
+ --stdout \
+ --checklist "$HELP" \
+ 0 0 0 \
+ $QEMU_ARCH_LIST`
fi &&
+
if [[ -z $QEMU_ARCHS ]]; then
- QEMU_ARCHS=$(cut -f 1 $SCRIPT_DIRECTORY/archs | sed -e 's/^/"/' -e
's/\s*$/"/' | tr '\n' ' ')
+ QEMU_ARCHS=$(cut -f 1 $SPELL_DIRECTORY/archs | sed -e 's/^/"/' -e
's/\s*$/"/' | tr '\n' ' ')
fi
diff --git a/utils/qemu/DEPENDS b/utils/qemu/DEPENDS
index 1afe8ca..1aa6dfc 100755
--- a/utils/qemu/DEPENDS
+++ b/utils/qemu/DEPENDS
@@ -1,12 +1,11 @@
-depends gcc34 &&
-depends sdl &&
+optional_depends sdl \
+ "" "--disable-sdl" \
+ "for SDL support" &&

-optional_depends alsa-lib \
- '--enable-alsa' \
- '--disable-alsa' \
- 'for Advanced Linux Sound Architecture driver support' &&
-# Qemu configure script doesn't accept --enable-kqemu .
-optional_depends kqemu \
- '' \
- '--disable-kqemu' \
- 'for kernel acceleration support'
+optional_depends bluez \
+ "" "--disable-bluez" \
+ "for Bluetooth support" &&
+
+optional_depends kqemu \
+ "" "--disable-kqemu" \
+ "for kernel acceleration support"
diff --git a/utils/qemu/DETAILS b/utils/qemu/DETAILS
index 9d8fccb..6ba4fb7 100755
--- a/utils/qemu/DETAILS
+++ b/utils/qemu/DETAILS
@@ -1,19 +1,22 @@
SPELL=qemu
- VERSION=0.9.1
+ VERSION=0.10.0
SOURCE=$SPELL-$VERSION.tar.gz
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- SOURCE_URL[0]=http://bellard.org/qemu/$SOURCE
- SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
-# SOURCE_HASH=sha512:
+ SOURCE2=$SOURCE.sig
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
+ SOURCE_URL[0]=http://download.savannah.gnu.org/releases/$SPELL/$SOURCE
+ SOURCE2_URL[0]=$SOURCE_URL.sig
+ SOURCE_GPG=qemu.gpg:$SOURCE2:UPSTREAM_KEY
+ SOURCE2_IGNORE=signature
DISTCC_HOSTS=
- GCC_VERSION=3.4
- LICENSE[0]=GPL/LGPL
- WEB_SITE=http://bellard.org/qemu/
+ LICENSE[0]=GPL
+ LICENSE[1]=LGPL
+ WEB_SITE=http://www.nongnu.org/qemu/
KEYWORDS="emulator utils"
ENTERED=20051102
- SHORT="QEMU is a generic and open source processor emulator"
+ SHORT="generic and open source processor emulator"
cat << EOF
QEMU achieves a good emulation speed by using dynamic translation.
+
QEMU has two operating modes:

* Full system emulation. In this mode, QEMU emulates a full system
diff --git a/utils/qemu/HISTORY b/utils/qemu/HISTORY
index b89e044..b7f46e6 100644
--- a/utils/qemu/HISTORY
+++ b/utils/qemu/HISTORY
@@ -1,3 +1,11 @@
+2009-03-07 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: 0.10.0; switched to upstream pgp key; cleaned up
+ * DEPENDS: sdl _is_ optional; gcc dep is useless; added missing deps;
+ cleaned up
+ * BUILD, CONFIGURE: cleaned up
+ * PRE_BUILD: removed
+ * archs: updated arch specs
+
2008-06-15 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: new url & website

diff --git a/utils/qemu/PRE_BUILD b/utils/qemu/PRE_BUILD
deleted file mode 100755
index 5750a71..0000000
--- a/utils/qemu/PRE_BUILD
+++ /dev/null
@@ -1,2 +0,0 @@
-default_pre_build &&
-invoke_gcc
diff --git a/utils/qemu/archs b/utils/qemu/archs
index c0edfd8..1b295fe 100644
--- a/utils/qemu/archs
+++ b/utils/qemu/archs
@@ -1,15 +1,32 @@
-i386-linux-user i386 on
-arm-linux-user arm on
-armeb-linux-user armeb on
-m68k-linux-user m68k on
-mips-linux-user mips on
-mipsel-linux-user mipsel on
-ppc-linux-user ppc on
-sparc-linux-user sparc on
-i386-softmmu i386-sofmmu on
-ppc-softmmu ppc-softmmu on
-sparc-softmmu sparc-softmmu on
-x86_64-softmmu x86_64-softmmu on
-mips-softmmu mips-softmmu on
-mipsel-softmmu mipsel-softmmu on
-arm-softmmu arm-softmmu on
+alpha-linux-user alpha on
+i386-linux-user i386 on
+arm-linux-user arm on
+armeb-linux-user armeb on
+cris-linux-user cris on
+m68k-linux-user m68k on
+mips-linux-user mips on
+mipsel-linux-user mipsel on
+ppc-linux-user ppc on
+ppc64-linux-user ppc64 on
+ppc64abi32-linux-user ppc64abi32 on
+sparc-linux-user sparc on
+sparc32plus-linux-user sparc32plus on
+sparc64-linux-user sparc64 on
+sh4-linux-user sh4 on
+sh4eb-linux-user sh4eb on
+x86_64-linux-user x86_64 on
+i386-softmmu i386-sofmmu on
+ppc-softmmu ppc-softmmu on
+ppcemb-softmmu ppcemb-softmmu on
+ppc64-softmmu ppc64-softmmu on
+sparc-softmmu sparc-softmmu on
+x86_64-softmmu x86_64-softmmu on
+mips-softmmu mips-softmmu on
+mipsel-softmmu mipsel-softmmu on
+mips64-softmmu mips64-softmmu on
+mips64el-softmmu mips64el-softmmu on
+arm-softmmu arm-softmmu on
+m68k-softmmu m68k-softmmu on
+cris-softmmu cris-softmmu on
+sh4-softmmu sh4-softmmu on
+sh4eb-softmmu sh4eb-softmmu on
diff --git a/utils/qemu/qemu-0.9.1.tar.gz.sig
b/utils/qemu/qemu-0.9.1.tar.gz.sig
deleted file mode 100644
index b84972f..0000000
Binary files a/utils/qemu/qemu-0.9.1.tar.gz.sig and /dev/null differ
diff --git a/utils/qemu/qemu.gpg b/utils/qemu/qemu.gpg
new file mode 100644
index 0000000..aa9da3d
Binary files /dev/null and b/utils/qemu/qemu.gpg differ
diff --git a/utils/qemulator/BUILD b/utils/qemulator/BUILD
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/utils/qemulator/BUILD
@@ -0,0 +1 @@
+true
diff --git a/utils/qemulator/DEPENDS b/utils/qemulator/DEPENDS
new file mode 100755
index 0000000..7853ee1
--- /dev/null
+++ b/utils/qemulator/DEPENDS
@@ -0,0 +1,2 @@
+depends qemu &&
+depends pygtk2
diff --git a/utils/qemulator/DETAILS b/utils/qemulator/DETAILS
new file mode 100755
index 0000000..0d67cc1
--- /dev/null
+++ b/utils/qemulator/DETAILS
@@ -0,0 +1,20 @@
+ SPELL=qemulator
+ VERSION=0.5
+ SOURCE=Qemulator-$VERSION.tar.gz
+ SOURCE_URL[0]=http://qemulator.createweb.de/downloads/$SOURCE
+
SOURCE_HASH=sha512:7bda884662061dbddfaaee82352c3b16f7da39fb6bd9970b019361b0c8f9a651f434dcac3c6bbbac62c6389fcfbaef41d4424cc9b4b9ea8dcef1d37ed4b58551
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/Qemulator-$VERSION"
+ WEB_SITE=http://qemulator.createweb.de/
+ LICENSE[0]=GPL
+ ENTERED=20090307
+ SHORT="comfortable GUI for the qemu virtual engine"
+cat << EOF
+Qemulator is a full featured emulation suite for the qemu virtual engine,
+with on demand job control. Qemulator provides an easy and fast to use image
+and device management, a "My machines" list and interactive job control.
+
+It comes with a list of all running jobs from where you can open the contol
+panel for each job and performing on demand action. Full interaction for
+mounted volumes, usb devices, keyboard and mouse interaction, screenshots,
+wave capture and save/restore machine state and open vnc viewer is provided.
+EOF
diff --git a/utils/qemulator/HISTORY b/utils/qemulator/HISTORY
new file mode 100644
index 0000000..d014ff3
--- /dev/null
+++ b/utils/qemulator/HISTORY
@@ -0,0 +1,2 @@
+2009-03-07 Vlad Glagolev <stealth AT sourcemage.org>
+ * BUILD, DEPENDS, DETAILS, INSTALL: spell created
diff --git a/utils/qemulator/INSTALL b/utils/qemulator/INSTALL
new file mode 100755
index 0000000..082fbaf
--- /dev/null
+++ b/utils/qemulator/INSTALL
@@ -0,0 +1 @@
+cp -av usr/local/* "$INSTALL_ROOT/usr"
diff --git a/utils/sysstat/DETAILS b/utils/sysstat/DETAILS
index 00bed8c..54aa884 100755
--- a/utils/sysstat/DETAILS
+++ b/utils/sysstat/DETAILS
@@ -1,9 +1,9 @@
SPELL=sysstat
- VERSION=9.0.0
+ VERSION=9.0.1
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://perso.wanadoo.fr/sebastien.godard/$SOURCE
-
SOURCE_HASH=sha512:fc6701e3cdf3d6159329a3c969495be2c227c76ed5bb65a87d531cd0789019d6d5a4a790a7b516d6a5090d145730faa431f4908c956f6f7b9c9b37d105368a84
+
SOURCE_HASH=sha512:adb91cbabd466af569a3d8279c42593fde9e1ab618e56ef03ac9b32d839c54776e88490abdc89a6b45dcdbf6ae0006c65009821efc06099a8c098557cda193ce
WEB_SITE=http://perso.wanadoo.fr/sebastien.godard/
ENTERED=20050506
LICENSE[0]="GPL"
diff --git a/utils/sysstat/HISTORY b/utils/sysstat/HISTORY
index 107f457..a59e5bc 100644
--- a/utils/sysstat/HISTORY
+++ b/utils/sysstat/HISTORY
@@ -1,3 +1,6 @@
+2009-03-08 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 9.0.1
+
2009-03-02 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 9.0.0

diff --git a/x11-libs/wine/BUILD b/x11-libs/wine/BUILD
index 7f37556..8124c38 100755
--- a/x11-libs/wine/BUILD
+++ b/x11-libs/wine/BUILD
@@ -4,8 +4,11 @@ touch programs/winetest/tests.rc &&
#
# Fixes http://bugs.winehq.com/show_bug.cgi?id=17406
#
-CFLAGS="-fno-inline $CFLAGS" &&
-CXXFLAGS="-fno-inline $CXXFLAGS" &&
+if grep -q "\-O3" <<< $CFLAGS; then
+ CFLAGS="-fno-guess-branch-probability $CFLAGS" &&
+ CXXFLAGS="-fno-guess-branch-probability $CXXFLAGS"
+fi &&
+
default_build &&

if is_depends_enabled $SPELL docbook-utils; then
diff --git a/x11-libs/wine/HISTORY b/x11-libs/wine/HISTORY
index f517c70..d64d0fc 100644
--- a/x11-libs/wine/HISTORY
+++ b/x11-libs/wine/HISTORY
@@ -1,3 +1,7 @@
+2009-03-07 Eric Sandall <sandalle AT sourcemage.org>
+ * BUILD: Hopefully final fix for the GCC bug triggered in WINE Bug
#17024, use
+ -fno-guess-branch-probability if using -O3 in CFLAGS
+
2009-03-06 Eric Sandall <sandalle AT sourcemage.org>
* BUILD: A better fix for WINE Bug #17024, add -fno-inline to CFLAGS
and
CXXFLAGS. Now -O3 works again.



  • [SM-Commit] GIT changes to devel-gnome grimoire by Robin Cook (680e1321809753a4d2ed606f0950330dd9ccfd04), Robin Cook, 03/08/2009

Archive powered by MHonArc 2.6.24.

Top of Page