Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to stable-0.15 grimoire by Eric Sandall (6508227a2779c0ad774e310ae562a9e90d1b4b43)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Eric Sandall <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to stable-0.15 grimoire by Eric Sandall (6508227a2779c0ad774e310ae562a9e90d1b4b43)
  • Date: Wed, 5 Dec 2007 23:24:16 -0600

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

Rebased ref, commits from common ancestor:
commit 6508227a2779c0ad774e310ae562a9e90d1b4b43
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

apache2: Finish fixing Bug #13989 (necessary patch removed)

commit 72e2a07799757b0228ca19a8b2cb2725051ca2e0
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

madwifi: upped SECURITY_PATCH
(cherry picked from commit 9244a8fe92ee491b2da5335187b157b45cf262e6)

commit 81bf9e6be40e4cf64c098390694968cdc8891a0e
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

madwifi: version bump to 0.9.3.3
(cherry picked from commit a5f9f131d53fc12c4c768459b173189453842e04)

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

VERSION: 0.15-2

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

xosview: Remove custom snprintf, breaks with glibc 2.6 (Bug #14141)
(cherry picked from commit 55cefcaa3d12d729f33e6ccdf603922153e20d03)

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

ruby-glib2: Compile again with glib2 > 2.14.1 (Bug #14114)
(cherry picked from commit f53370367cb0b2a28ff4382c616af5aed7dc9e39)

commit f56aa26e4b2d0998bfef456ba879b9491c9776f7
Author: Remko van der Vossen <wich AT stack.nl>
Commit: Eric Sandall <sandalle AT sourcemage.org>

graphics/imagemagick: Added 3 mirrors, fixes bug 14121

commit 9b3f76a150e6ea7dde55cb3e44af7aef49365e94
Author: Arwed von Merkatz <v.merkatz AT gmx.net>
Commit: Eric Sandall <sandalle AT sourcemage.org>

avifile: removed non-working parts
(cherry picked from commit d152dad5cec09831eb611d48c8d06be01d0ecb2f)

commit c0f12badeee3ec6242444ebb0374e6cdd21ed587
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

firefox: updated to 2.0.0.11(cherry picked from commit
3b3cb74443aceef0972c8f5c5b261bc94014ee76)

commit 70763f52792236f87923b09db011c09d33a78551
Author: George Sherwood <gsherwood AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

seamonkey: Updated to version 1.1.7. SECURITY_PATCH++(cherry picked from
commit 4854a7d9524965743be4325134fb02167c8217bb)

commit 9a9c7bebd8cd0de7679d0cc237c05983705f8680
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

xine-lib - fix bug #14090
(cherry picked from commit 15dfc78d4568cf2414c26d920d528e2258a58508)

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

gnome-speech: Tarball changed upstream, just some cleanups for latest
release (Bug #14009)
(cherry picked from commit f05da540ac38eff85ae7922ff687c6284c376952)

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

VERSION: 0.15-1

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

openal: Fix Bug #14126 (gcc42.patch fails for snapshot)

commit a97dd18a3e4e7c4b6eaec5b27d200661c3f8d23d
Author: George Sherwood <gsherwood AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

firefox: Updated to version 2.0.0.10. SECURITY_PATCH++ Removed
patch incorporated upstream.

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

libpaper: Woah, not that many times, thanks Ladislav
(cherry picked from commit 23597cdbecebb93456104befde5289e2cca1dba5)

commit 3db0b65cc179994f13a3d0fedd43c1ac795254e2
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

nss_ldap: doh! about covers it...
(cherry picked from commit dd49ea0d7388e5e4d47f7233a0ea084319febbf4)

commit 7dc0a6fa3f245dc33aedbffa440de53734813a50
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

nss_ldap: my bad, i thought security patch was reset on version bumps.
sorry
(cherry picked from commit 47b0e1aef3fb01b18a3223c5c70463f21ae8e34e)

commit 05469f6055a8b127fffe8db133e61982a48ebc76
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

nss_ldap: security update to 2.5.9, fixes CVE-2007-5794
http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2007-5794
(cherry picked from commit c124934e5f2a94d7a1764319d69a5c99c86ddffe)

commit e600a1c1ea430e02b6a8052b9e84803a8431ff3f
Author: Ladislav Hagara <ladislav.hagara AT unob.cz>
Commit: Eric Sandall <sandalle AT sourcemage.org>

phpmyadmin 2.11.2.2, SECURITY_PATCH=10
(cherry picked from commit 65d9142932c62bbde1b0a76c00dc1cfbb23bb5f5)

commit 55dfe9bfe13658fddf754790e520fa23b46ea563
Author: Ladislav Hagara <ladislav.hagara AT unob.cz>
Commit: Eric Sandall <sandalle AT sourcemage.org>

samba 3.0.27a, SECURITY_PATCH=6, CVE-2007-4572
(cherry picked from commit 8dca345ecd8626247fa8047d0d5b8d096e32d21c)

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

libpaper: Added a simple paper size library

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

vlc: support latest ffmpeg-svn
(cherry picked from commit 04c9d7df085ec6033993ce25e9d0f8aa67682609)

commit 79ec793f65892e2eb914e768e6c0cb95759b7895
Author: George Sherwood <gsherwood AT sourcemage.org>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>

liferea: Updated to version 1.4.8. SECURITY_PATCH++.
Fixed problem with last HISTORY entry although I disagree
some with the change. Only part of gnome required is
gconf2 which doesn't bring in that many libs.

commit 001c280ca13e8a497af42c56e53d4f99eacccfbb
Author: Arwed von Merkatz <v.merkatz AT gmx.net>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>

ffmpeg-svn: always pass swscale options

commit 9ffecc8f4d98a4f53f5478140d48b30c17aa4663
Author: Arwed von Merkatz <v.merkatz AT gmx.net>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>

ffmpeg-svn: removed arm support as it's broken

commit 32112ce3c54c8b5c4fd5252eb7f2d3b51523789c
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>

video/ffmpeg-svn: fixed a header file

commit 0867be2cc86dacf9305fec3b227d3ab65c8ba346
Author: Arwed von Merkatz <v.merkatz AT gmx.net>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>

ffmpeg-svn: fixed libvorbis configure switch for latest version

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

VERSION: 0.15-0

commit 2ebd91b94230ac73825ef1d5ee7dab8726a03eea
Author: Ladislav Hagara <ladislav.hagara AT unob.cz>
Commit: Eric Sandall <sandalle AT sourcemage.org>

thunderbird 2.0.0.9

commit 014947324f144e1397c0a5505620d4110bf3033f
Author: Ladislav Hagara <ladislav.hagara AT unob.cz>
Commit: Eric Sandall <sandalle AT sourcemage.org>

thunderbird 0.95.5

commit 35a14079a0b1fd9197c25636d885566e10f8c431
Author: George Sherwood <gsherwood AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

samba: Updated to version 3.0.27. SECURITY_PATCH++

commit 45b6dcb2b0cae68be6ac7c13e63f807cfabe7df1
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

as mentioned in the ml:
Revert "reetype2-2.3.5"

This reverts commit 772a6e815bdf4b53f49e3930a4b30bbe8e1ed5c4.

commit 4abb033369a49319a0f100e3a2e6f3a4f6a3b8f8
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

openal: fix runtime gcc 4.2 brokeness
fix source* for scm version (switch to svn)
(cherry picked from commit ffff4bd3b39a0cdcbc7497d1cb068fda98861f23)

commit 98da6c90c8736bcfa93e6523e77450d501cea7f2
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

hal: added a force_depends on glibc, needs newer kernel headers than those
that came with glibc 2.4 #14080
(cherry picked from commit ea55a114457eebe25080f8e3709effc50b47f55e)

commit 051b4083843f37fcd9387df57d4226e00a1de1aa
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

hal-info: force_depends on older hal versions, needs 0.5.10+ #14079
other part of the bug
(cherry picked from commit 2fef37cc35fd8a2d15b80037cc9ddd303c5f102d)

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

Revert "hal-info: correction for enable/disable WLAN killswitch support :
removed DEPENDS to avoid a circular dependency, added a config_query_option
in CONFIGURE instead"

This reverts commit 76222f7353a77cefa5c524948310a028c4431efb.
(cherry picked from commit 49b18996c7d413013bf6a328b07def5a9198444e)

commit 9112ab2bb3aa1c6872736de872b1f96f8d25d332
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

hal: removed hal-info #14079 (circular dependency and wrong)
(cherry picked from commit 11385724c82e11b7886133d3e8662bfe2780203c)

commit c9e3609b8af7bba5750c39f8b847f840712b88c2
Author: Robin Cook <rcook AT wyrms.net>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

svgalib: add patch to compile with 2.6.23 kernel
(cherry picked from commit c30e04b1e1903ee31ddfd97f82b5c978247a7141)

commit 5acdfab4fa6adc982dd672c3186d3e680c1bc200
Author: Ladislav Hagara <ladislav.hagara AT unob.cz>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

phpmyadmin 2.11.2.1, SECURITY_PATCH=9
(cherry picked from commit 29feaf541a0fb96ed8c9f20149fa4722802b3384)

commit 2a91cac86ecbd66e34ac428eff8ec3dcfcd5e17c
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

poppler-0.6.2 forgotten files
(cherry picked from commit 3f7a3956b42d3dca3ea42ec3bd665ad0f432f84e)

commit f11d82b8e7ef54fb16d88cc81412b03f90f7f9e8
Author: George Sherwood <gsherwood AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

php: Updated to version 5.2.5. SECURITY_PATCH++(cherry picked from commit
a7b8b5b8792311949588da99f51998836fdd4ec1)

commit f1b3887db48159cf0be373a777dd12deec3c04ff
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

kdegraphics - secrity fix #14089
(cherry picked from commit e34a627f28528886475ee58ba01452e56ae4c717)

commit cfbf720130f9d4a8c99bbd4238056db010bde6b6
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

koffice - security update
(cherry picked from commit f6e59095654134f506789badf9662ae497f99f67)

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

VERSION: 0.15-rc

commit d049145f057133a9e1bdd4fa2c64e5947a99f2bd
Author: Bearcat Sandor <sourcemage AT feline-soul.com>
Commit: Bearcat Sandor <sourcemage AT feline-soul.com>

Fixed typo in DEPENDS so it found the kde4 directory

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

imagemagick: Updated to version 6.3.6-8

commit 433fbe75ac1df63227e8ec825454086d03849bad
Author: George Sherwood <gsherwood AT sourcemage.org>
Commit: George Sherwood <gsherwood AT sourcemage.org>

seamonkey: Updated to version 1.1.6

commit cf43f10ebb98b59d0ce08cc3647deb07db95fa51
Author: Andraž Levstik <ruskie AT mages.ath.cx>
Commit: Andraž Levstik <ruskie AT mages.ath.cx>

otpw: remove stack-protector

commit 3ec7f7777d90c96a34cf7fba50fe57d8cc4e4485
Author: Andraž Levstik <ruskie AT mages.ath.cx>
Commit: Andraž Levstik <ruskie AT mages.ath.cx>

security-libs/otpw: new spell, A one-time password login package

commit eaabdc2dee0698e636f5baea1394a53515823b1d
Author: Andraž Levstik <ruskie AT mages.ath.cx>
Commit: Andraž Levstik <ruskie AT mages.ath.cx>

groups: minor fix

commit ea3632ed68a8d7bd3fd9e0b2c05a2cf84af7125f
Author: Andraž Levstik <ruskie AT mages.ath.cx>
Commit: Andraž Levstik <ruskie AT mages.ath.cx>

pam_sotp: new spell, a simple One Time Password PAM module

commit 8f5596e4d5afa317a8d6b4dbc76cb60792e56ef1
Author: Andraž Levstik <ruskie AT mages.ath.cx>
Commit: Andraž Levstik <ruskie AT mages.ath.cx>

groups: added shadow group

commit 3bf9960dc87b1080dc73d78f322d099b3fd8a768
Author: Andraž Levstik <ruskie AT mages.ath.cx>
Commit: Andraž Levstik <ruskie AT mages.ath.cx>

monit: update to 4.10

commit c652c1610597f2df256a9379b4f2f8285189f672
Author: Andraž Levstik <ruskie AT mages.ath.cx>
Commit: Andraž Levstik <ruskie AT mages.ath.cx>

anubis: version update 4.1

commit b4679928bd515b75ee866a91ec6e238bb1298edc
Author: Andraž Levstik <ruskie AT mages.ath.cx>
Commit: Andraž Levstik <ruskie AT mages.ath.cx>

monit: update to 4.10

commit 3837e1262af6a648822f0b06a96018c823442556
Author: Andraž Levstik <ruskie AT mages.ath.cx>
Commit: Andraž Levstik <ruskie AT mages.ath.cx>

anubis: version update 4.1

commit 04f3a65304c15741670cf4da405a1080c570b341
Author: David Brown <dmlb2000 AT gmail.com>
Commit: David Brown <dmlb2000 AT gmail.com>

linux updated misc maintenance patches

commit 402567b8f66e2070c407e8f8bb2f63ce04acf3a9
Author: David Brown <dmlb2000 AT gmail.com>
Commit: David Brown <dmlb2000 AT gmail.com>

linux updated realtime preempt patches

commit 30c26561edb9ced80e84ca9040e664f970880716
Author: George Sherwood <gsherwood AT sourcemage.org>
Commit: George Sherwood <gsherwood AT sourcemage.org>

sqlite: Updated to version 3.5.2. Updated SOURC_URL and WEB_SITE

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

alsaplayer 0.99.80

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

xsensors 0.60

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

ksquirrel-libs-0.7.4

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

ksquirrel-0.7.4

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

xmltv-0.5.50

commit 9b86022c4fd48b216caec9f4e8f75a29c653c36a
Author: Philippe Caseiro <puppet_master AT else-projects.org>
Commit: Puppet_Master <puppetmaster.e17 AT gmail.com>

Fixing my name on HISTORY file :D

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

x264-20071104-2245

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

version-0.74

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

ntfs-3g-1.1104

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

vlock: updated to newest stable and spent some QuAlity time with it

commit 798c57bb53703ecc3bc32abb04ebade19c8e2fcd
Author: Juuso Alasuutari <iuso AT sourcemage.org>
Commit: Juuso Alasuutari <iuso AT sourcemage.org>

pkgconfig: Optionally depend on glib2 to use system GLib. Build takes
only 1/10th of the time and executable is half the
size than with included glib.

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

xaralx-0.7r1783

commit bef9c9f27c8a68edd010f16293c07e5fa016ad18
Author: Vlad Glagolev <codex AT sourcemage.org>
Commit: Vlad Glagolev <codex AT sourcemage.org>

thunar: dep-fixes
libxfcegui4: dep-fixes
ChangeLog: 'new spells' log for my previous commits (sorry)

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

openfst-beta-20070801

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

evolution: it installs unversioned schemas now

commit 96492f68a20a35bb9f60f16eec89ce86128531c0
Author: David Brown <dmlb2000 AT gmail.com>
Commit: David Brown <dmlb2000 AT gmail.com>

kvm fixed install of bad target

commit c5fe08882423806f72146936ab2df502e8d2a9dc
Author: Vlad Glagolev <codex AT sourcemage.org>
Commit: Vlad Glagolev <codex AT sourcemage.org>

tkdvd: GUI for dvd+rw-tools written in TCL/Tk. added (4.0.7).

commit 3e51ac34c6c66104cd5a4040f17fafe00a78838d
Author: David Brown <dmlb2000 AT gmail.com>
Commit: David Brown <dmlb2000 AT gmail.com>

kvm updated to 50

commit 0efea2bb45d72aafa68af933328cb0bf955197bd
Author: Vlad Glagolev <codex AT sourcemage.org>
Commit: Vlad Glagolev <codex AT sourcemage.org>

asunder: simple GTK+2 CD ripper and encoder. added (0.9).

commit 3fefb3c1c71a81a2924a93f4e201c82bb931c9dd
Author: Vlad Glagolev <codex AT sourcemage.org>
Commit: Vlad Glagolev <codex AT sourcemage.org>

transmission: fast and powerful BitTorrent client. added (0.91).

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

gnumeric: updated devel to 1.7.14

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

dri: added mach64 support

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

sdl_mixer: fixed (lib)mikmod depends

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

xmms2: fixed ecore_config naming

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

goffice-0.5: updated to 0.5.2

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

audio_burn: made cdrecord and vorbistools optional and cleaned up DEPENDS

commit 6e792de06e7c820212b816715c4a4925b5f7c135
Author: Philippe Caseiro <puppet_master AT else-projects.org>
Commit: Puppet_Master <puppetmaster.e17 AT gmail.com>

Fixing deluge spell with new SOURCE-DIRECTORY value

commit 124ef760b4477a6b52237ec57afc6a168a47d37e
Author: Philippe Caseiro <puppet_master AT else-projects.org>
Commit: Puppet_Master <puppetmaster.e17 AT gmail.com>

Updating deluge spell to version 0.5.6.2

commit 21d2f2e5e2b2afe697323ca7ad5d42e301b6b06e
Author: George Sherwood <gsherwood AT sourcemage.org>
Commit: George Sherwood <gsherwood AT sourcemage.org>

qca-openssl: Updated to version 2.0.0-beta1. Added compilation
and build fix.

commit b63ea3cd53e2be573369358ed6424215d793c2ae
Author: Julien ROZO <julien AT rozo.org>
Commit: Julien ROZO <julien AT rozo.org>

links: casted on openssl update only if HTTPS support is enabled

commit ee9c0a11ce80c8b86e008e6fd95dd03bc339cb85
Author: Julien ROZO <julien AT rozo.org>
Commit: Julien ROZO <julien AT rozo.org>

ntp: added a TRIGGERS script, making ntp to be casted on openssl update,
if crypto support is enabled

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

gtk-recordmydesktop: 0.3.6

commit 1585bd0ad080a351a5ad781389957f80821e6b39
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

recordmydesktop: 0.3.6

commit 09f631df54203f686c9e206370658c9939f6ea2c
Author: Julien ROZO <julien AT rozo.org>
Commit: Julien ROZO <julien AT rozo.org>

virtualbox-module: moved from utils to kernels; added an INSTALL script
with udev rule to put the right permissions on /dev/vboxdrv

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

kphotoalbum-3.0.2

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

psi: Updated to version 0.11

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

faad2-2.6.1

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

faac-1.26

commit 42149257b25acdf828fb0157cf6e6ce3d9e5b138
Author: Vlad Glagolev <codex AT sourcemage.org>
Commit: Vlad Glagolev <codex AT sourcemage.org>

poedit: delete sig of the previous source

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

kpowersave-0.7.3

commit 2436e18af7e37101091fdffc5991b5b70e71bacf
Author: Vlad Glagolev <codex AT sourcemage.org>
Commit: Vlad Glagolev <codex AT sourcemage.org>

added my key

commit 9f26180884400f84fa510f5680fcdead97e7d5ab
Author: Vlad Glagolev <codex AT sourcemage.org>
Commit: Vlad Glagolev <codex AT sourcemage.org>

poedit: updated to 1.3.7
added myself to gurus.gpg

commit b1915e7b40e695c30f11c3ce85968dddfcea7f00
Author: Alexander Tsamutali <astsmtl AT gmail.com>
Commit: Alexander Tsamutali <astsmtl AT gmail.com>

corrected small typos in previous commits

commit 04ca38cced7b09cd395aaeb3e153c53471c22c08
Author: George Sherwood <gsherwood AT sourcemage.org>
Commit: George Sherwood <gsherwood AT sourcemage.org>

gnomeicu: Updated to version 0.99.14

commit 9f8af6aeb65d7aee151ac0934471accf73e96a83
Author: Alexander Tsamutali <astsmtl AT gmail.com>
Commit: Alexander Tsamutali <astsmtl AT gmail.com>

kde-apps/kdevelop: now depends on ghc instead of GHC

commit de2c5c4948bbdd7a961cda56ebc949c6bccbda96
Author: Alexander Tsamutali <astsmtl AT gmail.com>
Commit: Alexander Tsamutali <astsmtl AT gmail.com>

devel/haddock: now depends on ghc instead of GHC

commit aba8d80380fd4da2f7419c914be91cd0a852c9c6
Author: Alexander Tsamutali <astsmtl AT gmail.com>
Commit: Alexander Tsamutali <astsmtl AT gmail.com>

devel/darcs: now depends on ghc instead of GHC

commit f1bad5133a967fcce0193c49bc0dfaa62bfcee24
Author: Alexander Tsamutali <astsmtl AT gmail.com>
Commit: Alexander Tsamutali <astsmtl AT gmail.com>

Revert "changing all haskell spells to depend on GHC rather than ghc"

This reverts commit 8c8b65815ed5729fe0e407c6e50e3a4023cba522.

commit af05537b31db80a61c46864f04333c066bde26ef
Author: Andraž Levstik <ruskie AT mages.ath.cx>
Commit: Andraž Levstik <ruskie AT mages.ath.cx>

dovecot: managesieve patch update 8.3

commit 7c19b98cb3a7fbc20e74e817959665c1126ca4db
Author: Andraž Levstik <ruskie AT mages.ath.cx>
Commit: Andraž Levstik <ruskie AT mages.ath.cx>

dovecot: managesieve patch update 8.3

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

psmisc-22.6

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

ksquirrel-0.7.3

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

ksquirrel-libs-0.7.3

commit 222c9cced3f43c5acc04cd624072284df6ef14b5
Author: George Sherwood <gsherwood AT sourcemage.org>
Commit: George Sherwood <gsherwood AT sourcemage.org>

imagemagick: Updated to version 6.3.6-6

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

pavucontrol: added lynx as optional depends

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

paprefs: added lynx as optional depends

commit 27516d56c97c0672554e7990fab0d3af98d01aea
Author: Vlad Glagolev <codex AT sourcemage.org>
Commit: Vlad Glagolev <codex AT sourcemage.org>

xlockmore: update to 5.25 + cleanup

commit e6f768477de4a8ac5f1bc1bb69aa9792ecd7f5ff
Author: Vlad Glagolev <codex AT sourcemage.org>
Commit: Vlad Glagolev <codex AT sourcemage.org>

rapidsvn: updated to 0.9.4 + lots of fixes

commit 595ce105483dffe4999120ce4f53aa666232b70a
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

libs/gloox: moved to chat-libs

commit 1d39f8916942695cede1434a3f1ff605546187c9
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

gnome2-apps/alexandria: GNOME app for managing book collections #14077
spell by Cathal Mc Ginley

Somegne please test cast, this pulls a lot of gnomes with it!

commit 9511b8b4b61879082ae1b67affc5d6740e03a3d1
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

libs/gloox: added a missing dependency, fixed another and improved the
description.

commit 3bea3b801e709f4bd9cc9fb9329ed984c71866c7
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

a Ruby binding to the ZOOM toolkit #14076

spell by Cathal Mc Ginley

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

devel/yaz:
A toolkit for Z39.50/SRW/SRU clients and servers

spell by Cathal Mc Ginley

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

libs/ruby-amazon: lib for fetching data from Amazon Web Services #14074

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

libs/ruby-gettext: native Language Support library and tools for Ruby
#14073
spell by Cathal Mc Ginley

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

sptk-3.5.6

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

dabo-0.8.2

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

elixir 0.4.0

commit 8c6f62393d821c742cb075e108361db1e9260db5
Author: Vlad Glagolev <codex AT sourcemage.org>
Commit: Vlad Glagolev <codex AT sourcemage.org>

tagtool: updated to 0.12.3

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

odbcjdbc-beta-2.0.0144

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

gst-pulse: added lynx as optional depends

commit 0019206104896c1c1e493b2accf4414553520c6d
Author: Alexander Tsamutali <astsmtl AT gmail.com>
Commit: Alexander Tsamutali <astsmtl AT gmail.com>

python-devel/ipython: updated to 0.8.1

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

gnomint 0.3.2

commit 9ad611260eca7a25ac9ba2a75157eb2ba4d326fd
Author: Vlad Glagolev <codex AT sourcemage.org>
Commit: Vlad Glagolev <codex AT sourcemage.org>

leafpad: update to 0.8.12

commit 770d5e563859e8e2a3c7e946acf31f7b8ef0c728
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

links: 1.00pre21

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

links: update #14022
patch from Martin Klein

commit a12430f4b7d5eea2ab5f19389efd25977c17c23e
Author: Vlad Glagolev <codex AT sourcemage.org>
Commit: Vlad Glagolev <codex AT sourcemage.org>

acpid: fixed history for PRE_BUILD

commit 939c3e6b3e3860e861ae26066a35d7359dfd0250
Author: Vlad Glagolev <codex AT sourcemage.org>
Commit: Vlad Glagolev <codex AT sourcemage.org>

acpid: updated to version 1.0.6

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

k3b-i18n-1.0.4

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

k3b-1.0.4

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

phpmyadmin: Updated to version 2.11.2

commit 660d986c09b36bfd3eeac927ed8bf7f999350f1f
Author: George Sherwood <gsherwood AT sourcemage.org>
Commit: George Sherwood <gsherwood AT sourcemage.org>

doxygen: Updated to version 1.5.4

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

synce-libsynce: re-added the long description

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

firefox: Updated to version 2.0.0.9. Patch updated also.

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

gnomint 0.3.1

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

turbogears - adjust depends

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

module-init-tools-3.4

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

xml-sax-0.16

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

xml-sax-expat-0.39

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

xml-simple-2.18

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

photoprint 0.3.6

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

imagemagick: Updated to version 6.3.6-5

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

libs/gloox: new spell

commit 2b50ab4af61d084ee5ab3737da1fd75d3838eaa8
Author: Elisamuel Resto <ryuji AT mages.ath.cx>
Commit: Elisamuel Resto <ryuji AT mages.ath.cx>

python-devel/bittorrent-bencode: add setuptools to DEPENDS

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

digikam-0.9.3-beta2

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

simplejson-1.7.3

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

setuptools-0.6c7

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

turbogears-1.0.4b2

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

pastedeploy-1.3.1

commit 3bc2152394a9cc3d0e68f1cdeaa3163f66edccce
Author: Andraž Levstik <ruskie AT mages.ath.cx>
Commit: Andraž Levstik <ruskie AT mages.ath.cx>

libburn-pykix: update to 0.4.0

commit 57223a4aad8a62a0814e0de1e3c20fba18544cef
Author: Andraž Levstik <ruskie AT mages.ath.cx>
Commit: Andraž Levstik <ruskie AT mages.ath.cx>

libburn-pykix: update to 0.4.0

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

turbojson-1.1.1

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

git-1.5.3.5

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

gst-pulse: updated to 0.9.5

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

xmms-pulse: updated to 0.9.4

commit 1245c7c909d686a2996b965991c60fc0196b542d
Author: Arwed von Merkatz <v.merkatz AT gmx.net>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>

paprefs: updated to 0.9.6

commit 79ce2ec5602003949b0ca7fa66c0f340e2fec761
Author: Arwed von Merkatz <v.merkatz AT gmx.net>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>

pavucontrol: updated to 0.9.5

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

pulseaudio: updated to 0.9.7

commit 2aad7717e2a1524f0106ed0c2fe01cd9a9b642ac
Author: Arwed von Merkatz <v.merkatz AT gmx.net>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>

gimp: updated to 2.4.1

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

util-linux-2.13.0.1

commit 280a69cd47798da4e4ed1512b7f8c024bb6079c1
Author: Julien ROZO <julien AT rozo.org>
Commit: Julien ROZO <julien AT rozo.org>

k9copy: updated spell to 1.2.0

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

synce-serial: version 0.10.0

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

synce-rra: version 0.10.0

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

synce-librapi2: version 0.10.0

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

synce-vdccm, synce-odccm: added PROVIDES for dccm split

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

synce-dccm: split of *dccm spells

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

synce-odccm, synce-vdccm: new spells, synce-dccm is split

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

synce-libsynce: version 0.10.0

commit 68d46866c6679210da3cfd71e6efae28e59659e7
Author: David Brown <dmlb2000 AT gmail.com>
Commit: David Brown <dmlb2000 AT gmail.com>

coreutils glibc 2.7 as well as 2.6 internalize futimens

commit 8fd3b11260d702f6bc75dc97fff4df286841fc42
Author: David Kowis <dkowis AT shlrm.org>
Commit: David Kowis <dkowis AT shlrm.org>

thunderbird: removing unnecessary depends on gnome-panel
Pulling the entire gnome tree in for thunderbird is t3h 3v1l!

commit 77430b49a1f7c16d377de61c08c99dbe7fa37caa
Author: Julien ROZO <julien AT rozo.org>
Commit: Julien ROZO <julien AT rozo.org>

bluez-libs: updated to version 3.22

commit 01379b5ec4601d2863e872fd333dcbca504f97fe
Author: Julien ROZO <julien AT rozo.org>
Commit: Julien ROZO <julien AT rozo.org>

bluez-utils: updated to version 3.22

commit 76222f7353a77cefa5c524948310a028c4431efb
Author: Julien ROZO <julien AT rozo.org>
Commit: Julien ROZO <julien AT rozo.org>

hal-info: correction for enable/disable WLAN killswitch support : removed
DEPENDS to avoid a circular dependency, added a config_query_option in
CONFIGURE instead

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

cups 1.3.4

commit d84bb36d03d54d2ed870e3e215202cf25a1a4895
Author: Pol Vinogradov <vin.public AT gmail.com>
Commit: Pol Vinogradov <vin.public AT gmail.com>

graphics-libs/rmagick:

DETAILS: updated to 2.0.0-beta5

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

kdeaccessibility4-3.95.0

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

kdebindings4-3.95.0

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

kdepim4-3.95.0

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

kde4 - update depends

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

kdesdk4-3.95.0

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

kdetoys4-3.95.0

commit 05c3de84721eca1dd841f71c707d6392e0073f86
Author: Andraž Levstik <ruskie AT mages.ath.cx>
Commit: Andraž Levstik <ruskie AT mages.ath.cx>

tor: update devel and stable

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

kdebase-workspace4 - update kde4.sh

commit 013fc2cb917521906e8b46d48998beb25546cd85
Author: Elisamuel Resto <ryuji AT mages.ath.cx>
Commit: Elisamuel Resto <ryuji AT mages.ath.cx>

archive/par2cmdline: fix for gcc4

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

kdeedu4-3.95.0

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

kdeutils4-3.95.0

commit 4864ea80b4e67b0db6f35e850906904fa4cc417a
Author: Andraž Levstik <ruskie AT mages.ath.cx>
Commit: Andraž Levstik <ruskie AT mages.ath.cx>

alpine: minor cleanup of BUILD and moving stuff to DEPENDS

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

kdenetwork4-3.95.0

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

kdemultimedia4-3.95.0

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

kdeadmin4-3.95.0

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

kdebase-workspace4 - fix syntax

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

kde4/KDE_DEPENDS - update depends

commit c8b100522d3f5be82919df740e6b6579c73a0480
Author: Andraž Levstik <ruskie AT mages.ath.cx>
Commit: Andraž Levstik <ruskie AT mages.ath.cx>

dovecot: updated managesieve patch

commit 7867834b3ce96848242b6e09fc6730a87c72cec6
Author: Elisamuel Resto <ryuji AT mages.ath.cx>
Commit: Elisamuel Resto <ryuji AT mages.ath.cx>

net/shorewall and related spells: fix HISTORY file for last update, entry
got added to bottom

commit 3495285de6dac17b6395c5addf333b9a0882404c
Author: Elisamuel Resto <ryuji AT mages.ath.cx>
Commit: Elisamuel Resto <ryuji AT mages.ath.cx>

python-devel/hellanzb: new spell, python usenet file downloader

commit 38b3058a620031938766b66ce29c8342a6fb2ba8
Author: Elisamuel Resto <ryuji AT mages.ath.cx>
Commit: Elisamuel Resto <ryuji AT mages.ath.cx>

mail/alpine: new spell, lightweight terminal mail reader like pine

commit 4fdcb60350ccd1a9e041c5d45b138b035c1b6f11
Author: Julien ROZO <julien AT rozo.org>
Commit: Julien ROZO <julien AT rozo.org>

hal-info: oops ! I forgot to commit modified HISTORY

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

kdegraphics4-3.95.0

commit a4e05b0dda3e497670a975e8482251a6dce03f32
Author: Julien ROZO <julien AT rozo.org>
Commit: Julien ROZO <julien AT rozo.org>

hal-info: optionally depends on hal (>= 0.5.10) for WLAN killswitch
support

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

kdegames4-3.95.~

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

kde4-profile-3.95.0

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

kde4-l10n-3.95.0

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

kdebase4-runtime-3.95.0

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

kdebase4-3.95.0

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

plasma-3.95.0

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

kdebase-workspace4-3.95.0

commit 4170e782bc9e193f736a67775f17c97fd883e8af
Author: Andraž Levstik <ruskie AT mages.ath.cx>
Commit: Andraž Levstik <ruskie AT mages.ath.cx>

kazehakase: version update 0.5.0

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

kdepimlibs4-3.95.0

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

kdelibs-3.95.0

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

dbus-python-0.82.3

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

hal-info-20071030

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

hal-0.5.10

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

sofia-sip-1.12.7

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

telepathy-sofiasip-0.4.3

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

redland - db is optional

commit 04535b97bd2d8e986ad6e1a78a158639c05464c9
Author: Alexander Tsamutali <astsmtl AT gmail.com>
Commit: Alexander Tsamutali <astsmtl AT gmail.com>

python-devel/rabbyt: new spell, fast sprite library for Python

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

gdb-6.7.1

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

strigi-0.5.7

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

tmsnc: Updated to version 0.3.2

commit b741dbfcd94453c24cfee69e0129e619bb219db7
Author: Pol Vinogradov <vin.public AT gmail.com>
Commit: Pol Vinogradov <vin.public AT gmail.com>

disk/hdparm:

init.d/hdparm.conf: made it work through sysfs interface

commit 3f18d04ef713225cdad675199308a71b907fdb73
Author: George Sherwood <gsherwood AT sourcemage.org>
Commit: George Sherwood <gsherwood AT sourcemage.org>

liferea: Updated to version 1.4.6

commit 9747d2d2c6a84e53a7b00653e89ec0cdd343845b
Author: Elisamuel Resto <ryuji AT mages.ath.cx>
Commit: Elisamuel Resto <ryuji AT mages.ath.cx>

utils/which: version bump 2.16 -> 2.18

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

kdebase-workspace4 - fix typo

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

kdebase-workspace4 - update desktop settings

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

add kde4 group

commit aa534a2f0a76c5cf00ec0e44d57d3446c5eb6088
Author: Alexander Tsamutali <astsmtl AT gmail.com>
Commit: Alexander Tsamutali <astsmtl AT gmail.com>

devel/ghc: added option for quick unoptimised build

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

links-twibright 2.1pre31

commit 7666348eb2fd44b35e8bbf32ab9617eb6bada56e
Author: Andraž Levstik <ruskie AT mages.ath.cx>
Commit: Andraž Levstik <ruskie AT mages.ath.cx>

dovecot: 1.0.7 update

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

libgpg-error 1.6

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

ntfs-3g-1.1030

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

seems like this section has a history of its own

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

kde4/FUNCTIONS: factorised common code, indented, fixed update_databases

commit 1a01ebac53b090b999a6758c8ed889fb42d1a7b9
Author: George Sherwood <gsherwood AT sourcemage.org>
Commit: George Sherwood <gsherwood AT sourcemage.org>

gnumeric: Updated DEPENDS to all gnumeric devel to build without
all the gnome libs. For gnumeric prints also seems to work
without gnome.

commit 365d2968e5296ee875d2b4d6b24cfb45a070c0da
Author: David Brown <dmlb2000 AT gmail.com>
Commit: David Brown <dmlb2000 AT gmail.com>

kvm updated to 49

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

e_dbus: SOURCE_URL was changed

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

gimp-help-2: updated to 0.13

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

curl 7.17.1

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

orca: updated to 2.20.1

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

libsoup: updated to 2.2.103

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

poppler-data: updated to 0.1.1

commit ef0b60a614d0d729d2d7d2d6901b57a823097e3f
Author: Pol Vinogradov <vin.public AT gmail.com>
Commit: Pol Vinogradov <vin.public AT gmail.com>

http/iceweasel:

DETAILS, iceweasel.gpg: added GPG upstream signature

commit 37b0f5f3c3579c21d51ccd5bb8118286c470cf37
Author: Philippe Caseiro <puppet_master AT else-projects.org>
Commit: Puppet_Master <puppetmaster.e17 AT gmail.com>

Updating deluge's HISTORY

commit b662244721ff66b9113a29312805d805d1695c00
Author: Philippe Caseiro <puppet_master AT else-projects.org>
Commit: Puppet_Master <puppetmaster.e17 AT gmail.com>

Updating deluge's DETAILS to version 0.5.6.1

commit 0ca5a18f442280800721a9a79dade3f7a767d881
Author: Mathieu Lonjaret <lejatorn AT sourcemage.org>
Commit: Mathieu Lonjaret <lejatorn AT sourcemage.org>

libixp: created DEPENDS, added mercurial dep

commit 1a07a6bad00312418d1aecc2dcb5635a94c68f2c
Author: George Sherwood <gsherwood AT sourcemage.org>
Commit: George Sherwood <gsherwood AT sourcemage.org>

goffice-0.5: Added depends libart_lgpl

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

licq: Updated to version 1.3.5

commit 641084f1482d9f834d95c484432c819b48ad8048
Author: George Sherwood <gsherwood AT sourcemage.org>
Commit: George Sherwood <gsherwood AT sourcemage.org>

abiword: Cleaned up DEPENDS. Can now build devel version without
gnomelibs, but with no printing.

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

dejavu-ttf-2.21

commit 0558b7446a6fafbfe23936b42dbf48e594c51f44
Author: Mathieu Lonjaret <lejatorn AT sourcemage.org>
Commit: Mathieu Lonjaret <lejatorn AT sourcemage.org>

wmii: update to 20071003, libixp dep, plan9port opt dep

commit b82d0aac5bed4009f7fc338ffef66448cb41bdfa
Author: Andraž Levstik <ruskie AT mages.ath.cx>
Commit: Andraž Levstik <ruskie AT mages.ath.cx>

mail/exim: added support for demime

commit 635fc8c48a69eebb126e3e43dc80dc44c26f7f9c
Author: Andraž Levstik <ruskie AT mages.ath.cx>
Commit: Andraž Levstik <ruskie AT mages.ath.cx>

mobile/libopensync-plugin-evolution2; fixup source urls, version updates

commit 05048369c5755e02c744fad9e4fe9e15afadd44d
Author: Andraž Levstik <ruskie AT mages.ath.cx>
Commit: Andraž Levstik <ruskie AT mages.ath.cx>

mobile/libopensync-plugin-file; fixup source urls, version updates

commit 524f2d958337666b1e8a6bd63e2a5d4dbbc43dda
Author: Andraž Levstik <ruskie AT mages.ath.cx>
Commit: Andraž Levstik <ruskie AT mages.ath.cx>

mobile/libopensync-plugin-gnokii; fixup source urls, version updates

commit d4ca0f28c41954ac2704fb68fa067a95927c1333
Author: Andraž Levstik <ruskie AT mages.ath.cx>
Commit: Andraž Levstik <ruskie AT mages.ath.cx>

mobile/libopensync-plugin-google-calendar; fixup source urls, version
updates

commit 7b9fe748621f61b123b7ebda490ade50fd1ed2b5
Author: Andraž Levstik <ruskie AT mages.ath.cx>
Commit: Andraž Levstik <ruskie AT mages.ath.cx>

mobile/libopensync-plugin-gpe; fixup source urls, version updates

commit dd878a163482b887f9f59354b46b809880ceb756
Author: Andraž Levstik <ruskie AT mages.ath.cx>
Commit: Andraž Levstik <ruskie AT mages.ath.cx>

mobile/libopensync-plugin-irmc; fixup source urls, version updates

commit 178f72ae6d0f57747a750bfccd210e4f7c6566ed
Author: Andraž Levstik <ruskie AT mages.ath.cx>
Commit: Andraž Levstik <ruskie AT mages.ath.cx>

mobile/libopensync-plugin-kdepim; fixup source urls, version updates

commit dccb5ade34bfc952ce2eb89c7bdd107892591d9d
Author: Andraž Levstik <ruskie AT mages.ath.cx>
Commit: Andraž Levstik <ruskie AT mages.ath.cx>

mobile/libopensync-plugin-moto; fixup source urls, version updates

commit 9e27426c6381b1f09a53020e7439d3dd3f0450cf
Author: Andraž Levstik <ruskie AT mages.ath.cx>
Commit: Andraž Levstik <ruskie AT mages.ath.cx>

mobile/libopensync-plugin-opie; fixup source urls, version updates

commit ef069eac2d36c5f48f9d78d43e3afd70f8a5b249
Author: Andraž Levstik <ruskie AT mages.ath.cx>
Commit: Andraž Levstik <ruskie AT mages.ath.cx>

mobile/libopensync-plugin-palm; fixup source urls, version updates

commit 95c006265ec6f651630fb3b5b895a2e474f40ffe
Author: Andraž Levstik <ruskie AT mages.ath.cx>
Commit: Andraž Levstik <ruskie AT mages.ath.cx>

mobile/libopensync-plugin-python; fixup source urls, version updates

commit c9fa7b3e6eda81f7a372f4c4f275882b97ff1889
Author: Andraž Levstik <ruskie AT mages.ath.cx>
Commit: Andraž Levstik <ruskie AT mages.ath.cx>

mobile/libopensync-plugin-sunbird; fixup source urls, version updates

commit 24d4e5db7e930f06124205765995b1234398a61c
Author: Andraž Levstik <ruskie AT mages.ath.cx>
Commit: Andraž Levstik <ruskie AT mages.ath.cx>

mobile/libopensync-plugin-synce; fixup source urls, version updates

commit cb311d4bc1888a100c901b2f03591d5eeb863ef2
Author: Andraž Levstik <ruskie AT mages.ath.cx>
Commit: Andraž Levstik <ruskie AT mages.ath.cx>

mobile/libopensync-plugin-syncml; fixup source urls, version updates

commit 54f20292664d6fec82184f815e2f7e627646a70b
Author: Andraž Levstik <ruskie AT mages.ath.cx>
Commit: Andraž Levstik <ruskie AT mages.ath.cx>

mobile/libopensync; fixup source urls, version updates

commit c1b251d2b2d024570ce046f9ebdceeea326c484e
Author: Andraž Levstik <ruskie AT mages.ath.cx>
Commit: Andraž Levstik <ruskie AT mages.ath.cx>

mobile/libsyncml; fixup source urls, version updates

commit 75477f230cdc505bad8518d4bdbbc0e87abeada0
Author: Andraž Levstik <ruskie AT mages.ath.cx>
Commit: Andraž Levstik <ruskie AT mages.ath.cx>

mobile/gnokii: version update

commit 105e1fa0766c6854805f34904be5133fca9b99d3
Author: Andraž Levstik <ruskie AT mages.ath.cx>
Commit: Andraž Levstik <ruskie AT mages.ath.cx>

mail/dovecot: version update

commit c255e1fed0bbc82f97c32bd0e7f445ebddb5a8a9
Author: Andraž Levstik <ruskie AT mages.ath.cx>
Commit: Andraž Levstik <ruskie AT mages.ath.cx>

ftp/aria2: version update

commit 5de19a3dcd1716a3302eab9b23d0d062e96f2ca8
Author: David Brown <dmlb2000 AT gmail.com>
Commit: David Brown <dmlb2000 AT gmail.com>

drm do the depmod against the kernel version in question

commit 3f3fcd3886f2445f9d4e76fdd57fa08c24d86216
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

fluxbox: 1.0

commit dba35384802986ce15a443f78e8a79ee9ec15336
Author: Mathieu Lonjaret <lejatorn AT sourcemage.org>
Commit: Mathieu Lonjaret <lejatorn AT sourcemage.org>

wmii: explanation for dmenu depends

commit 7521853ffbe722f6adc645fc7f3aaa2420996ebb
Author: Pol Vinogradov <vin.public AT gmail.com>
Commit: Pol Vinogradov <vin.public AT gmail.com>

shell-term-fm/mc:

BUILD, CONFIGURE: added charset feature

commit 2bd1cdb4359236304ad32e723c3fcb77f3454c9e
Author: Lalo Martins <lalo AT sourcemage.org>
Commit: Lalo Martins <lalo AT sourcemage.org>

oops, seems I committed some debugging output yesterday -- how
embarrassing

commit 1944b07d9be8ea48b49c18fd4e23c69c61cd331d
Author: David Brown <dmlb2000 AT gmail.com>
Commit: David Brown <dmlb2000 AT gmail.com>

kvm updated to 48

commit 43f3befff99111c828e7dbe74cfdecf0c9112a19
Author: David Brown <dmlb2000 AT gmail.com>
Commit: David Brown <dmlb2000 AT gmail.com>

linux updated realtime preempt patchset

commit 7eca9efb44fbd3d3c0c9b41516a6ba74e52a0328
Author: Philippe Caseiro <puppet_master AT else-projects.org>
Commit: Puppet_Master <puppetmaster.e17 AT gmail.com>

Updating deluge spell to version 0.5.6

commit 03bcc63c0bcac3cc1fa6367d90b777984e28dd9d
Author: Mathieu Lonjaret <lejatorn AT sourcemage.org>
Commit: Mathieu Lonjaret <lejatorn AT sourcemage.org>

libixp: added devel version pulled with hg

commit 3e3a9d05249bda71184f75258e118e3113c267cc
Author: George Sherwood <gsherwood AT sourcemage.org>
Commit: George Sherwood <gsherwood AT sourcemage.org>

devede: Updated to version 3.3

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

kdeutils4 - extra depends

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

libzip-0.8

commit 479bafea246f7b0492ebe4e64ac804ace6acfec1
Author: George Sherwood <gsherwood AT sourcemage.org>
Commit: George Sherwood <gsherwood AT sourcemage.org>

licq: Updated to version 1.3.5-rc3

commit 1b1f0fa04800c2c60192dbd269a7ed34f1e7f842
Author: George Sherwood <gsherwood AT sourcemage.org>
Commit: George Sherwood <gsherwood AT sourcemage.org>

miau: Updated to version 0.6.5

commit 4f9c731ecbecab20c8269157140f4d6fe56118eb
Author: George Sherwood <gsherwood AT sourcemage.org>
Commit: George Sherwood <gsherwood AT sourcemage.org>

ircd-hybrid: Updated to version 7.2.3

commit 0813a784e8cce70fb3cbb0f0876aff9164eec071
Author: Arwed von Merkatz <v.merkatz AT gmx.net>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>

man: fixed man paths so it doesn't take 5+ seconds to launch man

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

mercurial-0.9.5

commit 6ef558628378bd4dd8a263bf61aab7dc16b936e6
Author: Lalo Martins <lalo AT sourcemage.org>
Commit: Lalo Martins <lalo AT sourcemage.org>

new spell: devel/spidermonkey

commit 75ab7daded424bc4a88af4d052f560415f6d01b8
Author: Lalo Martins <lalo AT sourcemage.org>
Commit: Lalo Martins <lalo AT sourcemage.org>

disk/gnomebaker -> 0.6.2

commit 8c8b65815ed5729fe0e407c6e50e3a4023cba522
Author: Lalo Martins <lalo AT sourcemage.org>
Commit: Lalo Martins <lalo AT sourcemage.org>

changing all haskell spells to depend on GHC rather than ghc

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

kmplayer-0.10.0a

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

paste-1.5

commit 1b8604db86b5f4e110fae8e9b5907163b99fc4f6
Author: Lalo Martins <lalo AT sourcemage.org>
Commit: Lalo Martins <lalo AT sourcemage.org>

Fixed xulrunner on non-ia32

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

wine-0.9.48

commit 7f88fd39d57372e3879785641b5c1c85ce736404
Author: Andraž Levstik <ruskie AT mages.ath.cx>
Commit: Andraž Levstik <ruskie AT mages.ath.cx>

editors/nedit/: openmotif depends now on z-rejected

commit d32bed978628be3f034f0378a7c2de3010a6502c
Author: Andraž Levstik <ruskie AT mages.ath.cx>
Commit: Andraž Levstik <ruskie AT mages.ath.cx>

audio-creation/ceres3/: openmotif depends now on z-rejected

commit 2e8392573f1063effd078804716fbb6055d7f953
Author: Andraž Levstik <ruskie AT mages.ath.cx>
Commit: Andraž Levstik <ruskie AT mages.ath.cx>

audio-creation/snd/: openmotif depends now on z-rejected

commit 01c708428357b4cf8a63bf6027931983158bd42d
Author: Andraž Levstik <ruskie AT mages.ath.cx>
Commit: Andraž Levstik <ruskie AT mages.ath.cx>

openmotif: moving to z-rejejcted, non-Free license

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

lm_sensors 2.10.5

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

gawk 3.1.6

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

db: Updated to verison 4.6.21

commit 56ccc6f5c49bdba86f04c5cac1a32f92b8fccea1
Author: Mathieu Lonjaret <lejatorn AT sourcemage.org>
Commit: Mathieu Lonjaret <lejatorn AT sourcemage.org>

rtorrent: 0.7.9 (and dht disabled)

commit ff3994dcb1328997a83f816326947d6d931ae4d3
Author: Mathieu Lonjaret <lejatorn AT sourcemage.org>
Commit: Mathieu Lonjaret <lejatorn AT sourcemage.org>

libtorrent: 0.11.9 (and dht disabled, no patch for this version available
yet)

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

koffice: added which, needed for kexi docs script #14063

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

sox 14.0.0

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

kde4/FUNCTIONS

commit 3f886b6af0399e46708918b4138efb7d010c2353
Author: Remko van der Vossen <wich AT stack.nl>
Commit: Remko van der Vossen <wich AT stack.nl>

disk/cdlabelgen: add default_pre_build back into PRE_BUILD

commit e2f84481b8c3b379d5d3f35c5a22f719dadc836f
Author: Remko van der Vossen <wich AT stack.nl>
Commit: Remko van der Vossen <wich AT stack.nl>

disk/cdlabelgen: moved Makefile fix to PRE_BUILD

commit d2a0c2a14d2afcee84d9c247089cabc1efd272f2
Author: Remko van der Vossen <wich AT stack.nl>
Commit: Remko van der Vossen <wich AT stack.nl>

disk/cdlabelgen: 4.0.0 and made man pages install in $BASEDIR/share/man

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

imlib2 -fix bug #14062

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

anjuta: updated to 2.2.2

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

glibmm: updated to 2.14.2

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

mergeant: updated to 0.67

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

libgnomedb3: updated to 3.1.2

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

libgda3: updated to 3.1.2

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

clisp: unset fix no longer required

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

clisp: Updated to 2.42 (new, unverified upstream key)

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

gnu.gpg: Imported FDAA9CC7 Sam Steingold <sam.steingold AT gmail.com> from
ftp://ftp.gnu.org/gnu/gnu-keyring.gpg for clisp 2.42

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

libsigsegv: Updated to 2.4 (fixes sigalstack check in ./configure with
gcc 4.2 and glibc 2.6)

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

libcdio: Updated to 0.78.2 and use upstream gnu.gpg key

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

pidgin: Updated to version 2.2.2

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

cdfs: version 2.6.23, still does not build here

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

synce-usb-rndis-lite: new spell usb rndis driver

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

Changelog: I never forget ChangeLog...

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

orange: new spell, creates installable cab files

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

usbutils 0.73

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

dynamite: new spell, pkware extraction libs and tools

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

Changelog: I didn't forget the changelog entry for libsmbios. It was on my
todo-list. really! ;)

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

libsmbios: added spell

commit 10d04947c3d65f95f174fe52474f3a16396a68b0
Author: Elisamuel Resto <ryuji AT mages.ath.cx>
Commit: Elisamuel Resto <ryuji AT mages.ath.cx>

net/shorewall-shell: updated to 4.0.5

commit 36102ba3d88d8dd8479cabd851539ff870b552fa
Author: Elisamuel Resto <ryuji AT mages.ath.cx>
Commit: Elisamuel Resto <ryuji AT mages.ath.cx>

net/shorewall-perl: updated to 4.0.5

commit 440bbb34a5f776f33fd7adab218037d0c8cbcf5a
Author: Elisamuel Resto <ryuji AT mages.ath.cx>
Commit: Elisamuel Resto <ryuji AT mages.ath.cx>

net/shorewall-lite: updated to 4.0.5

commit 4dc757969b99895ca83b0f372dd5c7cee1c844cc
Author: Elisamuel Resto <ryuji AT mages.ath.cx>
Commit: Elisamuel Resto <ryuji AT mages.ath.cx>

net/shorewall-docs-xml: updated to 4.0.5

commit c3c5ca0182cf99df4c439645bbb983537158f8f8
Author: Elisamuel Resto <ryuji AT mages.ath.cx>
Commit: Elisamuel Resto <ryuji AT mages.ath.cx>

net/shorewall-docs-html: updated to 4.0.5

commit b9c566b6c855cf9a11c2020daa006db008061afb
Author: Elisamuel Resto <ryuji AT mages.ath.cx>
Commit: Elisamuel Resto <ryuji AT mages.ath.cx>

net/shorewall-common: updated to 4.0.5

commit cdc599f734bec264c542e44375954be91473c73a
Author: Elisamuel Resto <ryuji AT mages.ath.cx>
Commit: Elisamuel Resto <ryuji AT mages.ath.cx>

net/shorewall: updated to 4.0.5

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

wxgtk: self-conflict #14031

commit 96e479ad01a38aba94bb79755d5141bede94e14f
Author: Elisamuel Resto <ryuji AT mages.ath.cx>
Commit: Elisamuel Resto <ryuji AT mages.ath.cx>

net/bind: DEPENDS removed, DETAILS changed to not require gcc34

commit 2be183ed1f1746cf5149a7805bd8fa044652b9ca
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

gwenview: added arts for disabling #14039

commit 0dad9f453bac55290ad1efe869e7ca955cd3d539
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

kipi-plugins: added arts for disabling #14038

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

xdialog: made gtk+2 required #14043

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

xdialog: fixed up and simplified

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

centerim: Updated to version 20071022

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

cpan: 1.9203 #14051

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

enchant: 1.3.0

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

bzr: made bzrtools suggested to avoid a circular dependency

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

bzrtools: 0.91.0 #14045

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

bzr: 0.91 #14045
partial patch from Arvid Norlander

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

qt4pas-V1.54_Qt4.3.1

commit 77d6007fad3f733cf6be6c61c7e1bf29dccc92cc
Author: Lalo Martins <lalo AT sourcemage.org>
Commit: Lalo Martins <lalo AT sourcemage.org>

ChangeLog update for bittorrent-bencode (retroactive)

commit 6172f2278fa44fc45c9b7c154c96d568eddcb009
Author: Lalo Martins <lalo AT sourcemage.org>
Commit: Lalo Martins <lalo AT sourcemage.org>

ChangeLog update for linuxdcpp

commit 22c3f67b80f01f2de543bc0d6f02a747e6bc66a7
Author: George Sherwood <gsherwood AT sourcemage.org>
Commit: George Sherwood <gsherwood AT sourcemage.org>

kdevelop: Updated to version 3.5.0

commit f72f9b842c137789cf73a16fbad0976014bffdf0
Author: Lalo Martins <lalo AT sourcemage.org>
Commit: Lalo Martins <lalo AT sourcemage.org>

new spell: linuxdcpp

commit 0f1f104b6374633d560ef52cc20a4e7f8ff77e2b
Author: David Brown <dmlb2000 AT gmail.com>
Commit: David Brown <dmlb2000 AT gmail.com>

dvd+rw-tools fixed undefined INT_MAX from newer glibc headers

commit e075252c67ce56151c6ba2a4acf628ad9612897c
Author: Julien ROZO <julien AT rozo.org>
Commit: Julien ROZO <julien AT rozo.org>

bluez-hcidump : updated version to 1.40, fix bug 14059

commit 5af17e3784554165ec02feadde97de2b355deed3
Author: Julien ROZO <julien AT rozo.org>
Commit: Julien ROZO <julien AT rozo.org>

bluez-utils : updated version to 3.20

commit 93ef1eb623e7c95e2489073340d324138ac78cea
Author: Julien ROZO <julien AT rozo.org>
Commit: Julien ROZO <julien AT rozo.org>

bluez-libs : updated version to 3.20

commit 8a25f2eb473cb60a64191e1950142211a9e59655
Author: Julien ROZO <julien AT rozo.org>
Commit: Julien ROZO <julien AT rozo.org>

ntfsprogs : depends on libconfig if crypto is enabled

commit 1205b5c7eec64493704be0a1137914d8981645ce
Author: Julien ROZO <julien AT rozo.org>
Commit: Julien ROZO <julien AT rozo.org>

libconfig : new spell, version 1.2

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

newt-0.52.7-4.fc8

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

kdesdk4-3.94.0

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

kdeaccessibility4-3.94.0

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

sword-1.5.10

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

clucene - fix install of config.h

commit 60888b1ba31214bcbbd74dfacb229986ba9e4a44
Author: David Brown <dmlb2000 AT gmail.com>
Commit: David Brown <dmlb2000 AT gmail.com>

linux updated pre 2.6 kernel patches to 2.6.24-rc1

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

gimp: Updated to version 2.4.0. Cleaned up DEPENDS for version
2.4.0

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

wired: version 0.5

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

ffmpeg-svn: added forgotten CONFIGURE, sorry!

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

gnomint 0.1.5, new spell, a certification authority management tool

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

koffice2-1.9.94

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

xca 0.6.4

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

tar: Updated to version 1.19. Removed upstream incorporated
patch.

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

thunderbird: ENIGMAIL 0.95.4

commit 31cba7326f9729b221985f337da4dd2af6b4d38b
Author: George Sherwood <gsherwood AT sourcemage.org>
Commit: George Sherwood <gsherwood AT sourcemage.org>

lynx: Upstream uses releases, but also links it to an unversioned
tarball. Changed spell to use released tagged tarball. Too
many failed hashes.

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

qca2: Updated to version 2.0.0. Fixed SOURCE_URL

commit 3a1e7085faef1bf46ddd8cb12872a349c2ba8e69
Author: George Sherwood <gsherwood AT sourcemage.org>
Commit: George Sherwood <gsherwood AT sourcemage.org>

imagemagick: Updated to version 6.3.6-3

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

opencdk: make 0.6 default OPENCDK_BRANCH

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

gnutls 2.0.2, make 2.0 default GNUTLS_BRANCH

commit 62c3b6703cd18ed8b8da6048aa7037d3e6762015
Author: George Sherwood <gsherwood AT sourcemage.org>
Commit: George Sherwood <gsherwood AT sourcemage.org>

xfwm4: Added upstream patch to fix xfce4 lockups. PATCHLEVEL++

commit 251ecd22bc63bb03dd1c3a855930cab705ab7656
Author: Pol Vinogradov <vin.public AT gmail.com>
Commit: Pol Vinogradov <vin.public AT gmail.com>

utils/watchdog:

DETAILS: updated to 5.4
BUILD, watchdog-gcc33.patch: removed, not needed anymore

commit c624912ac2caa9c17a34f68c2da1bac5a698d50f
Author: Pol Vinogradov <vin.public AT gmail.com>
Commit: Pol Vinogradov <vin.public AT gmail.com>

video/vlc:

BUILD: install_rootifying paths, added iceweasel support

commit a8db0bd38055ad3b02667bc683be548d9c3d5117
Author: Pol Vinogradov <vin.public AT gmail.com>
Commit: Pol Vinogradov <vin.public AT gmail.com>

gnome2-libs/librsvg2:

BUILD: install_rootifying nspr include path, added
iceweasel support

commit d9ee11a11bac56015064d1240896597180b90353
Author: Pol Vinogradov <vin.public AT gmail.com>
Commit: Pol Vinogradov <vin.public AT gmail.com>

http/gnash:

INSTALL: added iceweasel{,-bin} support

commit dd1cabe801f7aa58006474f5e161ed51a8f5a1c8
Author: Pol Vinogradov <vin.public AT gmail.com>
Commit: Pol Vinogradov <vin.public AT gmail.com>

http/iceweasel: new spell, the GNU version of the Firefox browser

commit e4b6128cd56e667629f3d8a7746be4e024094d7d
Author: Juuso Alasuutari <iuso AT sourcemage.org>
Commit: Juuso Alasuutari <iuso AT sourcemage.org>

kdelibs4: fixed bug #14053

commit 79dc6238209a25c24dd7a1ae47aa76a3aa6d73f5
Author: Andraž Levstik <ruskie AT mages.ath.cx>
Commit: Andraž Levstik <ruskie AT mages.ath.cx>

osmo: update to 0.1.1

commit 706f5055fee722f74ce4149bc577a2c99278440d
Author: Alexander Tsamutali <astsmtl AT gmail.com>
Commit: Alexander Tsamutali <astsmtl AT gmail.com>

windowmanagers/xmonad: updated to 0.4

commit 310489ccc8de9642b0c9ca65428ea577c7ef5990
Author: Alexander Tsamutali <astsmtl AT gmail.com>
Commit: Alexander Tsamutali <astsmtl AT gmail.com>

haskell/haskell-x11-extras: updated to 0.4

commit f608a5e064a3bdea09d2a9121465d7437c7d8c20
Author: Alexander Tsamutali <astsmtl AT gmail.com>
Commit: Alexander Tsamutali <astsmtl AT gmail.com>

haskell/haskell-x11: updated to 1.2.3

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

dhcpcd 3.1.7

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

keychayn 2.6.8

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

gnumeric: updated devel version to 1.7.13

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

crypto/gpgdir: new spell, recursively encrypts/decrypts directories using
a GPG key

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

jigdo: actually delete PRE_BUILD

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

jigdo: updated to 0.7.3

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

goffice-0.5: updated to 0.5.1

commit 1948a23982bd006296ff62995ba23721cd72dbb6
Author: Juuso Alasuutari <iuso AT sourcemage.org>
Commit: Juuso Alasuutari <iuso AT sourcemage.org>

jack-keyboard: New spell, virtual keyboard that uses JACK MIDI.

commit 166f4739bdea6f62c37dcf7d5a83f743cae27d4c
Author: Lalo Martins <lalo AT sourcemage.org>
Commit: Lalo Martins <lalo AT sourcemage.org>

new spell: bittorrent-bencode

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

glibc: remove /usr/include/{asm,asm-generic,linux} symlinks on install

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

pciutils 2.2.8

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

Revert "Revert "firefox 2.0.0.8, SECURITY_PATCH=12""

This reverts commit 7c94368e0507ed8183131b6d320eed70d4ecc846.

Also added a fix for the installed files permissions so it runs as
non-root.

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

Revert "firefox 2.0.0.8, SECURITY_PATCH=12"

This reverts commit fbcbee4e4600baa98cbcd2b141202818f6090592.

Reverting until we can get this working

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

iwlwifi: Make that 2.6.23, as that's what I tested with

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

iwlwifi: Check for CONFIG_FW_LOADER and CONFIG_MAC80211

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

iwlwifi: 2.6.22+ now includes mac80211 required for iwlwifi

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

java-access-bridge: added missing depends at-spi and libbonobo

commit 74ee31dc3b2bb90199bc00755b913c5fee156ddd
Author: Pol Vinogradov <vin.public AT gmail.com>
Commit: Pol Vinogradov <vin.public AT gmail.com>

utils/watchdog:

init.d/watchdog: fixed paths for devices files, make
/dev/temperature existance check optional, added -f key to lns

commit 5bf8f432fb39b9e325b44bffef432843d3fc5b1d
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

chat-im/{micq,climm}: deprecated micq in favour of climm

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

libgnomecanvas: updated to 2.20.1.1

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

gnome-pilot: changed control-center2 to gnome-control-center

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

crypto/paperkey: new spell, an OpenPGP key archiver

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

seamonkey 1.1.5, SECURITY_PATCH=8

commit 7aef52d37f738efec66f9c36f3bb422f38a8627a
Author: Julien ROZO <kaze AT maxikaze.KAZE>
Commit: Julien ROZO <kaze AT maxikaze.KAZE>

kdesvn: spell updated to version 0.14.0, now builds with cmake

commit 06cb85e6b2b17340aead8ad9507eb6a259e82c45
Author: Juuso Alasuutari <iuso AT sourcemage.org>
Commit: Juuso Alasuutari <iuso AT sourcemage.org>

qjackctl: Added CVS version.

commit 3fee29f6a1ded4eaee8b0744415e1e10830d6a9c
Author: Juuso Alasuutari <iuso AT sourcemage.org>
Commit: Juuso Alasuutari <iuso AT sourcemage.org>

kdebase: Removed warning about paths in kdmrc, they have been made
xorg-modular-compliant.

commit 44b287961d66d42032aabff1a0cee415c84ded5e
Author: David Brown <dmlb2000 AT gmail.com>
Commit: David Brown <dmlb2000 AT gmail.com>

gcc added location of linker change when compiling on lib64 systems

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

kdebindings4-3.94.0

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

kdepim4-3.94.0

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

kdebase4-3.94.0

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

gnupg-interface 0.36

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

lftp 3.5.15

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

kvm: Hasn't needed gcc34 for a while (thanks arachnist)

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

locale - fixed character maps [Bug 14044]

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

objc: updated to 4.2.1

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

gcj: updated to 4.2.1

commit 9567a34a9231366739736184a2fc3969788a638d
Author: Arwed von Merkatz <v.merkatz AT gmx.net>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>

gcc: updated to 4.2.1

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

g++: updated to 4.2.1

commit 10d53454c9b6d92b8b74aef13506db676059de07
Author: Arwed von Merkatz <v.merkatz AT gmx.net>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>

fortran: updated to 4.2.1

commit 275affdab098014213bf15baf18debe461df00ca
Author: Arwed von Merkatz <v.merkatz AT gmx.net>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>

ada: updated to 4.2.1

commit 437c35a7d87d46774a0156f5057d00c29ed5cbcd
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>

gcj: add some new depends

commit 0dadd305539c5e794a8e06a1f56e28bb1269e4d0
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>

gcj: 4.2.0

commit 0a28db6de90af6c53dae3a00d7a46fc558e1f524
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>

ada: 4.2.0

commit 67dff844beb4d68af9b152fdbec769e948414c90
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>

objc: 4.2.0

commit 330b8fa93e2ec70dad0e668a2ebba175dba46abc
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>

fortran: 4.2.0

commit 4493ecd437cdf9fd56a4a3622854df93ba0f3545
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>

g++: 4.2.0

commit d46dabd1186b16db72a4d5018198fd19760f71ad
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>

gcc: 4.2.0
g++ and fortran in the queue

commit bf97b85ef459a1a0371029d69f2a0ce8c6f87f5d
Author: Mathieu Lonjaret <lejatorn AT sourcemage.org>
Commit: Mathieu Lonjaret <lejatorn AT sourcemage.org>

rtorrent: added xmlrpc-c opt dep

commit 1ef732094042c8cee70331d999a03e61181505db
Author: Pol Vinogradov <vin.public AT gmail.com>
Commit: Pol Vinogradov <vin.public AT gmail.com>

utils/watchdog:

DETAILS: removed UPDATED, PATCHLEVEL++
watchdog-gcc3.patch: updated so it builds with gcc 4.x

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

phpmyadmin 2.11.1.2

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

tea 17.3.5

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

virtualbox-module 1.5.2

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

virtualbox 1.5.2

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

bmpx 0.40.13

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

kde4/plasma - new spell

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

thomas.leonard.gpg: Moved from rox to section for other Rox apps

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

Revert "thomas.leonard.gpg: Moved to section level for other Rox apps"

This reverts commit a799a32f8eac2e0d0c14650443060334e92a9f0f.

Conflicts:

ChangeLog

Accidently committed ndiswrapper change

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

openssl 0.9.8g

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

kdenetwork4-3.94.0

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

splix-1.0.2

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

kdeadmin4-3.94.0

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

kdetoys4-3.94.0

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

kdeutils-3.94.0

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

kdemultimedia4-3.94.0

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

kdeedu4-3.94.0

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

kde4 - section files

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

typo3: version bump and depends fix

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

ffmpeg-svn: added swscale option

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

rt2500_driver: fixed source dir for cvs builds

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

directfb: various fixes

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

putty: added desktopfiles

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

gramps-2.2.9

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

firefox 2.0.0.8, SECURITY_PATCH=12
I can run it only as root, as a normal user I have some problem.
Only my problem?

commit d60b619b2a8098ff94e7f7aa0a5f66b8be3b50d1
Author: Andraž Levstik <ruskie AT mages.ath.cx>
Commit: Andraž Levstik <ruskie AT mages.ath.cx>

gnump3d: version update 3.0

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

strigi - update profile script

commit 4399c4a807d3fffd6b58668c7eec25d0ec75a441
Author: Andraž Levstik <ruskie AT mages.ath.cx>
Commit: Andraž Levstik <ruskie AT mages.ath.cx>

audio-players/mp3splt: version update, slpits into libmp3splt

commit bd822d596d9aee82a545b6c9e353a28ee7cbf6d5
Author: Andraž Levstik <ruskie AT mages.ath.cx>
Commit: Andraž Levstik <ruskie AT mages.ath.cx>

audio-libs/libmp3splt: new spell, library to split mp3/ogg files

commit 85a5bdfb6f89acbfbfc3ca68308acef71b7b8640
Author: Andraž Levstik <ruskie AT mages.ath.cx>
Commit: Andraž Levstik <ruskie AT mages.ath.cx>

xmlrpc-c: cleaned up the spell and updated to latest stable version

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

rox-video-thumbnail: Added ROX-App for video thumbnails via mplayer

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

rox-lib2: Added ROX-Apps shared code library

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

thomas.leonard.gpg: Moved to section level for other Rox apps

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

avahi: Create netdev group See
https://bugzilla.redhat.com/show_bug.cgi?id=219218
Increment PATCHLEVEL to apply fix

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

groups: Added netdev:160: for avahi (See
https://bugzilla.redhat.com/show_bug.cgi?id=219218)

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

sound-juicer: updated to 2.20.1

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

evince: updated to 2.20.1

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

evolution-exchange: updated to 2.12.1

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

epiphany-extensions: updated to 2.20.1

commit 74af335df7831c89b65f8349dadd36d5f2af36fc
Author: Arwed von Merkatz <v.merkatz AT gmx.net>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>

totem: updated to 2.20.1

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

epiphany: updated to 2.20.1

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

gedit: updatedto 2.20.3

commit 047f0ee04373a5dc5765c2e4533de63b86b01394
Author: David Brown <dmlb2000 AT gmail.com>
Commit: David Brown <dmlb2000 AT gmail.com>

kvm updated to version 47

commit 34e86df6bbdb065091682b96177bd98da4286993
Author: Arwed von Merkatz <v.merkatz AT gmx.net>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>

mplayer: dependency fixes for live, polypaudio and pulseaudio

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

pulseaudio: deleted old sig

commit 25ddc8dd898a32262159bf3aacc1d3b476583c7d
Author: David Brown <dmlb2000 AT gmail.com>
Commit: David Brown <dmlb2000 AT gmail.com>

glibc updated kernel headers to new version of kernel

commit b677bef141b8a525d14cdc92fc7d2d7d2e30906d
Author: David Brown <dmlb2000 AT gmail.com>
Commit: David Brown <dmlb2000 AT gmail.com>

Revert "glibc updated glibc kernel headers to the new version"

This reverts commit c50decb0ff8f42d62d60dda24d099757a6dd2f02.

commit 9cfe219df052b339f2d22f8b66a011445e6c3306
Author: David Brown <dmlb2000 AT gmail.com>
Commit: David Brown <dmlb2000 AT gmail.com>

Revert "forgot a syntax error in FUNCTIONS file"

This reverts commit ddce127f25d04ec21aa7195b2d6e6468abf2296d.

commit a8a1598f61b50ac8aa04cface54b06fe811ae0ab
Author: David Brown <dmlb2000 AT gmail.com>
Commit: David Brown <dmlb2000 AT gmail.com>

Revert "output correct sum format so cast will detect it"

This reverts commit 0bd6fb4d1dbb9872e10d07b26730692efb413cc0.

commit 94a2012078db9d1daf5d04bec5f485f4aeb1c216
Author: David Brown <dmlb2000 AT gmail.com>
Commit: David Brown <dmlb2000 AT gmail.com>

Revert "playing around with the api SOURCEN isn't exported when its set
in DETAILS so it didn't work at all before"

This reverts commit c9468831340baafd415ad537c3fb3240109ebfe4.

commit c9468831340baafd415ad537c3fb3240109ebfe4
Author: David Brown <dmlb2000 AT gmail.com>
Commit: David Brown <dmlb2000 AT gmail.com>

playing around with the api SOURCEN isn't exported when its set in
DETAILS so it didn't work at all before

commit 0bd6fb4d1dbb9872e10d07b26730692efb413cc0
Author: David Brown <dmlb2000 AT gmail.com>
Commit: David Brown <dmlb2000 AT gmail.com>

output correct sum format so cast will detect it

commit ddce127f25d04ec21aa7195b2d6e6468abf2296d
Author: David Brown <dmlb2000 AT gmail.com>
Commit: David Brown <dmlb2000 AT gmail.com>

forgot a syntax error in FUNCTIONS file

commit c50decb0ff8f42d62d60dda24d099757a6dd2f02
Author: David Brown <dmlb2000 AT gmail.com>
Commit: David Brown <dmlb2000 AT gmail.com>

glibc updated glibc kernel headers to the new version

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

flamerobin - missing BUILD

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

kdegames - fix hash

commit 8ef7e98260fcc499694d736692b4da2a10b6ba18
Author: Mathieu Lonjaret <lejatorn AT sourcemage.org>
Commit: Mathieu Lonjaret <lejatorn AT sourcemage.org>

xmlrpc-c: bogus configure for unicode

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

kdebase - fix install

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

flamerobin-0.8.1

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

kdegraphics4-3.94.0

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

kdegames4-3.94.0

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

kdebase-workspace4

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

kde4-profile

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

kde4-l10n

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

kdepimlibs4-3.94.0

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

kdelibs4-3.94.0

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

Revert "shadow 4.0.18.1"

This reverts commit cf7af0e2dd51622e0eeb28acdebe7d737ce8b4eb.

Breaks useradd (See Bug #13601)

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

laptop-mode-tools: Fix comparing integer to string

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

laptop-mode-tools: Don't look in /usr/local for modules

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

laptop-mode-tools: Remove force-reload, causes bootup errors

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

acpi-support: Change LICENSE -> LICENSE[0]

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

acpi-support: Remove force-reload(), it's causing errors doing boot

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

hdparm: By default have init be quiet, just like our other scripts

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

hdparm: Check if the file exists before using it, print the starting tag
and the return value

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

laptop-mode-tools: Cleanup strange characters in init script and cleanup
provided install script to not muck with services

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

gthumb2: updated to 2.10.7

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

eog2: updated to 2.20.1

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

gedit: updated to 2.20.2

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

file-roller: 2.20.1

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

deskbar-applet: updated to 2.20.1

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

tomboy: updated to 0.8.1

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

gcalctool: updated to 5.20.2

commit 7b1f7f6ba9ce21d4a7626e1e3ad96f15747f9182
Author: David Brown <dmlb2000 AT gmail.com>
Commit: David Brown <dmlb2000 AT gmail.com>

linux fixed syntax error in build file

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

gok: updated to 1.3.7

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

accerciser: updated to 1.0.1

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

libgnomeui: updated to 2.20.1.1

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

libgnome: updated to 2.20.1.1

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

gtksourceview: updated to 2.0.1

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

gtk+2: updated to 2.12.1

commit 9d3f54e2d005132012c92d4201ef1349afc7be04
Author: David Brown <dmlb2000 AT gmail.com>
Commit: David Brown <dmlb2000 AT gmail.com>

linux updated build process to call out to the linux makefile only twice
instead of several places

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

vbetool: x86_64 requires CONFIG_IA32_EMULATION and --with-x86emu

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

sqlalchemy-0.4.0

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

kdegames - missing hash

commit d1900f6ca63d889e501a87f7d34ea3e1e9473bbc
Author: Pol Vinogradov <vin.public AT gmail.com>
Commit: Pol Vinogradov <vin.public AT gmail.com>

video/vlc:

DEPENDS: swittched to libdca instead of libdts

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

firebird-2.1.0.16780-Beta2

commit 58be64d2aa27faa69dc9b958fa211d667436413f
Author: Andraž Levstik <ruskie AT mages.ath.cx>
Commit: Andraž Levstik <ruskie AT mages.ath.cx>

mobile/acpi-support: missing depends on radeontool

commit 52d8fb3b97efb315789a615cccc274b882078fee
Author: Andraž Levstik <ruskie AT mages.ath.cx>
Commit: Andraž Levstik <ruskie AT mages.ath.cx>

gnu/objc: update to 4.2.2

commit f06d69860e0dacf0b0c51417665af84fb9978b10
Author: Andraž Levstik <ruskie AT mages.ath.cx>
Commit: Andraž Levstik <ruskie AT mages.ath.cx>

gnu/gcj: update to 4.2.2

commit ac25ddb4813b70f7bdce44ec73d0ccefac5c0685
Author: Andraž Levstik <ruskie AT mages.ath.cx>
Commit: Andraž Levstik <ruskie AT mages.ath.cx>

gnu/gcc: update to 4.2.2

commit 9979e87959b083709e0cb0a74789204c578bdde6
Author: Andraž Levstik <ruskie AT mages.ath.cx>
Commit: Andraž Levstik <ruskie AT mages.ath.cx>

gnu/g++: update to 4.2.2

commit 66b6f1b8c1fc47a67fa5e6ce5ccc6b3180167a20
Author: Andraž Levstik <ruskie AT mages.ath.cx>
Commit: Andraž Levstik <ruskie AT mages.ath.cx>

gnu/fortran: update to 4.2.2

commit bcc2e501f7cca28cb714d1c1ffd353cc73b043d5
Author: Andraž Levstik <ruskie AT mages.ath.cx>
Commit: Andraž Levstik <ruskie AT mages.ath.cx>

gnu/ada: update to 4.2.2

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

evolution: updated to 2.12.1

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

gnome-panel: updated to 2.20.1

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

gnome-games2: updated to 2.20.1

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

gtk-engines2: updated to 2.12.2

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

libwnck: updated to 2.20.1

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

gdm2: updated to 2.20.1

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

dasher: updated to 4.6.1

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

gnome-desktop: updated to 2.20.1

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

gnome-session: updated to 2.20.1

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

gnome-menus: updated to 2.20.1

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

gnome-system-monitor: updated to 2.20.1

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

gnome-control-center: updated to 2.20.1

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

gnome-keyring: updated to 2.20.1

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

gnome-themes: updated to 2.20.1

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

at-spi: updated to 1.20.1

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

gnome-spell: updated to 1.0.8

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

vino: 2.20.1

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

evolution-data-server: updated to 1.12.1

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

gtkhtml2: updated to 3.16.1

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

gconf2: updated to 2.20.1

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

libsoup: updated to 2.2.102

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

libbonobo: 2.20.1

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

libgnomeui: updated to 2.20.1

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

libgnome: updated to 2.20.1

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

gail: update to 1.20.1

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

pango: updated to 1.18.3

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

glib2: updated to 2.14.2

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

orbit2: updated to 2.14.10

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

libgnomecanvas: updated to 2.20.1

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

gnome2-user-docs: upated to 2.20.1

commit dc1f71b88cd273e4285e5bcc00d39f3ec5b83015
Author: Pol Vinogradov <vin.public AT gmail.com>
Commit: Pol Vinogradov <vin.public AT gmail.com>

libs/ode:

DETAILS: updated to 0.9

commit 699d0a183e0c838ecf59c88a4b8698dcd232a3d0
Author: Pol Vinogradov <vin.public AT gmail.com>
Commit: Pol Vinogradov <vin.public AT gmail.com>

audio-drivers/pyalsa:

DETAILS: updated to 1.0.15

commit 0b7f64d95daed80038bfa39a07fdd716a02b15d6
Author: Pol Vinogradov <vin.public AT gmail.com>
Commit: Pol Vinogradov <vin.public AT gmail.com>

audio-drivers/alsa-utils:

DETAILS: updated to 1.0.15

commit 177a4ce8b33c6700c5f2b11b0f9c97f38f6300e9
Author: Pol Vinogradov <vin.public AT gmail.com>
Commit: Pol Vinogradov <vin.public AT gmail.com>

audio-drivers/alsa-tools:

DETAILS: updated to 1.0.15

commit 3f510f68062b487e3cae6fec027efc37fcfa94ca
Author: Pol Vinogradov <vin.public AT gmail.com>
Commit: Pol Vinogradov <vin.public AT gmail.com>

audio-drivers/alsa-plugins:

DETAILS: updated to 1.0.15

commit 4d0535f477b9e6bf9bb0d6d5438f9effd7241c92
Author: Pol Vinogradov <vin.public AT gmail.com>
Commit: Pol Vinogradov <vin.public AT gmail.com>

audio-drivers/alsa-oss:

DETAILS: updated to 1.0.15

commit 1f92e35e47a48c9abb76bec858f3596585adcd4b
Author: Pol Vinogradov <vin.public AT gmail.com>
Commit: Pol Vinogradov <vin.public AT gmail.com>

audio-drivers/alsa-lib:

DETAILS: updated to 1.0.15

commit 81cdeeeb199a481d2bd1e7b46b6d4e1edfb19a28
Author: Pol Vinogradov <vin.public AT gmail.com>
Commit: Pol Vinogradov <vin.public AT gmail.com>

audio-drivers/alsa-firmware:

DETAILS: updated to 1.0.15

commit f53140fd7c5b043663dac2137b7db89f389bfbfa
Author: Pol Vinogradov <vin.public AT gmail.com>
Commit: Pol Vinogradov <vin.public AT gmail.com>

audio-drivers/alsa-driver:

DETAILS: updated to 1.0.15

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

shadow 4.0.18.1

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

fuse-2.7.1

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

seahorse 2.20.1

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

gv 3.6.3

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

xine-lib: added optional_depends on pulseaudio

commit 1447a9fa3ea5621f5cdadaa7efbef0056d8245eb
Author: Arwed von Merkatz <v.merkatz AT gmx.net>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>

gst-pulse: new spell

commit 7ef36247870a665195176b96c6f43d1c9288f100
Author: Arwed von Merkatz <v.merkatz AT gmx.net>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>

xmms-pulse: new spell

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

pavucontrol: new spell

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

alsa-plugins: added optional_depends on pulseaudio

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

paprefs: new spell

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

pulseaudio: updated to 0.9.6

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

libatomic_ops: new spell

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

qdbm-1.8.76

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

imagemagick: Updated to version 6.3.6-2

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

kdegames-3.5.8

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

kdegraphics-3.5.8

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

kdeutils-3.5.8

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

kdewebdev-3.5.8

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

kdetoys-3.5.8

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

kdesdk-3.5.8

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

kdemultimedia-3.5.8

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

kdeedu-3.5.8

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

kdebindings-3.5.8

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

kdeartwork-3.5.8

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

kdeaddons-3.5.8

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

kdeaccessibility-3.5.8

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

kdepim-3.5.8

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

qt4 - update snapshot version

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

kdenetwork-3.5.8

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

kdeadmin-3.5.8

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

kdebase-3.5.8

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

kde-profile-3.5.8

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

kde-i18n-3.5.8

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

kdelibs-3.5.8

commit 076a69225dc404c33ef77c5914192b7d6b8a30b8
Author: Andraž Levstik <ruskie AT mages.ath.cx>
Commit: Andraž Levstik <ruskie AT mages.ath.cx>

mobile/laptop-mode-tools: update, bug #13995

commit b413b3b8ef7bc34918f9d8a2687a3c10dccd1024
Author: Andraž Levstik <ruskie AT mages.ath.cx>
Commit: Andraž Levstik <ruskie AT mages.ath.cx>

mobile/acpi-support: new spell, various acpi scripts for laptops,
bug #13998

commit f4f8bd7d37f8b034aaccec29d2ad153e2a5640f3
Author: Andraž Levstik <ruskie AT mages.ath.cx>
Commit: Andraž Levstik <ruskie AT mages.ath.cx>

mobile/laptop-detect: new spell, detect if running on a laptop, bug #13997

commit a2eea052b6bcd20223b05fd3a8eefe7f2341e0e4
Author: Andraž Levstik <ruskie AT mages.ath.cx>
Commit: Andraž Levstik <ruskie AT mages.ath.cx>

forgot ChangeLog

commit d85fcfb92c53dc58cc62880c0037529193b5aa45
Author: Andraž Levstik <ruskie AT mages.ath.cx>
Commit: Andraž Levstik <ruskie AT mages.ath.cx>

mobile/powermgmt-base: added spell, basic powermanagment tools from
debian bug #13996

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

arts-1.5.8

commit 2b428fc5840c2ca980c34e8db617b6a298a6f49c
Author: Julien ROZO <kaze AT maxikaze.KAZE>
Commit: Julien ROZO <kaze AT maxikaze.KAZE>

libmal : updated to version 0.44, corrected licence to MPL

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

wtf 20071004

commit 3764a96debccc4c537a5998d1161aa6d163b55ec
Author: Remko van der Vossen <wich AT stack.nl>
Commit: Remko van der Vossen <wich AT stack.nl>

chat-im/centerim: Forgot signature file in commit
a497588837633d3ee42cb0fa34bbca8c4fd7126a

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

ntfs-3g-1.1004

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

cupsddk-1.2.3

commit a497588837633d3ee42cb0fa34bbca8c4fd7126a
Author: Remko van der Vossen <wich AT stack.nl>
Commit: Remko van der Vossen <wich AT stack.nl>

chat-im/centerim: 20071003

commit 9f332c7f4f30eb2f1d7d4a779f5c72fe90d4d304
Author: Remko van der Vossen <wich AT stack.nl>
Commit: Remko van der Vossen <wich AT stack.nl>

Added my key (Remko van der Vossen/1ccf3307) to the gurus keyring

commit 72d015a637ab4f267f28816e73a3ab2b7f46970c
Author: Juuso Alasuutari <iuso AT sourcemage.org>
Commit: Juuso Alasuutari <iuso AT sourcemage.org>

mplayer: Removed redundant and broken libdts dependency. Apparently
libdca is the _same_
library with a new name: libdts and libdca have the same WEBSITE and the
site doesn't
mention libdts. In any case mplayer now uses libdca for DTS support.

commit dc2b5b95e7fbf8a298b973a5a973567aef22cc0b
Author: Lalo Martins <lalo AT sourcemage.org>
Commit: Lalo Martins <lalo AT sourcemage.org>

updating pidgin-encryption urls, and adding purple-plugin-pack

commit 3a68b6d4426786a1d36a7aa271fefb4a102883a8
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

windowmanagers/fvwm: removed the patchset, fetch it directly

commit 5cdb29952a6776636f1e3f52e56dc5b3968b0dc4
Author: Remko van der Vossen <wich AT stack.nl>
Commit: Remko van der Vossen <wich AT stack.nl>

perl-cpan/class-methodmaker: 2.0.8

commit 376434274b1de7515d2842313897a08e42e3ecf9
Author: Remko van der Vossen <wich AT stack.nl>
Commit: Remko van der Vossen <wich AT stack.nl>

crypto/signing-party: 4.0.12

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

kipi-plugins - remove imlib2 dependency

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

perl-glib-1.161

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

perl-gtk2-1.161

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

ecryptfs-utils 26

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

pktstat 1.8.4

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

lshw B.02.12.01

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

udev 116

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

ntfsprogs-2.0.0

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

tea 17.3.3

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

camorama 0.19

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

ucview 0.16

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

unicap 0.2.17

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

dazuko-2.3.4

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

perl-cairo-1.043

commit d3003399d918861b16e21021f6d0be6054e826ec
Author: David Brown <dmlb2000 AT gmail.com>
Commit: David Brown <dmlb2000 AT gmail.com>

linux added updated smgl-logo patch

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

m2crypto 0.18.2

commit 11df45a5bc3bffd2e3ac7057c8f8de089e8d6986
Author: David Brown <dmlb2000 AT gmail.com>
Commit: David Brown <dmlb2000 AT gmail.com>

linux updated various maintenance patches

commit 36c243e563c24dd945224423ca6382f78f60c467
Author: David Brown <dmlb2000 AT gmail.com>
Commit: David Brown <dmlb2000 AT gmail.com>

linux updated reiser4 patches

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

libquicktime-1.0.1

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

qt4pas-V1.53_Qt4.3.1

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

libpng 1.2.22

commit 32284a00e7477536246882293c99646696867f01
Author: George Sherwood <gsherwood AT sourcemage.org>
Commit: George Sherwood <gsherwood AT sourcemage.org>

qt4: Updated to version 4.3.2. Removed incoporated patch.

commit 65c51816047377adcfaef8dde9f16b6aa1984fe3
Author: David Brown <dmlb2000 AT gmail.com>
Commit: David Brown <dmlb2000 AT gmail.com>

fixed signature url

commit 8873e9daf210f7ef19aaf3f1c385ea8a7e968ef2
Author: David Brown <dmlb2000 AT gmail.com>
Commit: David Brown <dmlb2000 AT gmail.com>

fixed url for realtime patches

commit cd465166f8cead71ebf3d71ce6e2149d9a98237d
Author: David Brown <dmlb2000 AT gmail.com>
Commit: David Brown <dmlb2000 AT gmail.com>

linux updated realtime preempt patches

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

gringotts: updated to 1.2.9pre2

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

partimage-0.6.7_beta2

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

windowmanagers/fvwm: updated to 2.5.23

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

ksquirrel-0.7.2

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

ksquirrel-libs-0.7.2

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

libiodbc-3.52.6

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

gdb-6.7

commit 8b55775e4c26c28592d3f5db35417e6e611153e8
Author: George Sherwood <gsherwood AT sourcemage.org>
Commit: George Sherwood <gsherwood AT sourcemage.org>

irssi: Updated to version 0.8.12

commit 67f89709583adf065a7ba41efdf06778d2dc9dce
Author: George Sherwood <gsherwood AT sourcemage.org>
Commit: George Sherwood <gsherwood AT sourcemage.org>

db: Updated to version 4.6.19

commit 8a5649c7681afec7ca3e23ae7dfc1e73cd449276
Author: George Sherwood <gsherwood AT sourcemage.org>
Commit: George Sherwood <gsherwood AT sourcemage.org>

proftpd: Updated to version 1.3.1. Removed old multi-version code
from DETAILS.

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

poppler-0.6.1

commit 0acb07db12ae188d515bd6458fd72d9438545e34
Author: George Sherwood <gsherwood AT sourcemage.org>
Commit: George Sherwood <gsherwood AT sourcemage.org>

snort: Updated to version 2.8.0. Updated with new signing key.

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

cheetah-2.0

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

less 409

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

sudo: Updated to 1.6.9p6

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

madwifi: SVN URL changed

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

smgl-fhs: Use TRACK_ROOT for symlinks (thanks Jaka :))

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

smgl-fhs: fhs_mkdir already applies INSTALL_ROOT

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

code-browser: Updated to version 2.18

commit 17e53df2c52d806dd55115f793cc322c1e991216
Author: George Sherwood <gsherwood AT sourcemage.org>
Commit: George Sherwood <gsherwood AT sourcemage.org>

hunspell: Updated to version 1.1.12

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

geany: Updated to version 0.12

commit d35eb084848e98604af4238d0dcfffcc80aa4611
Author: David Brown <dmlb2000 AT gmail.com>
Commit: David Brown <dmlb2000 AT gmail.com>

linux updated mm and maintanence patches

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

smgl-fhs: Fix X11 modules (fixes DRI for me)

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

libgringotts: updated to new site etc.

commit d8041b5166c131871285a72c6564f37ed96b6791
Author: Pol Vinogradov <vin.public AT gmail.com>
Commit: Pol Vinogradov <vin.public AT gmail.com>

kde-apps/kxneur:

DETAILS: updated to 0.8.0, added sourcing of
section-wide KDE_DETAILS
BUILD, CONFIGURE: added for section way of building
DEPENDS: added sourcing of section-wide KDE_DEPENDS

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

smgl-fhs: More fixes to make sure the symlink is not doubled (e.g.
/usr/X11R6/lib/X11/X11)

commit edb996deacd9ec2435a0a80a854c7e2199a32251
Author: Pol Vinogradov <vin.public AT gmail.com>
Commit: Pol Vinogradov <vin.public AT gmail.com>

gnome2-apps/gxneur:

DETAILS: updated to 0.8.0

commit 96f481fe9e535835960ed9eb0b567757df1c0357
Author: Pol Vinogradov <vin.public AT gmail.com>
Commit: Pol Vinogradov <vin.public AT gmail.com>

x11/xneur:

DETAILS: updated to 0.8.0
DEPENDS: added aspell, gstreamer, openal and pcre optionally

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

smgl-fhs: Fix X11 symlinks (commented in Bug #13777)

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

linux-pam 0.99.9.0

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

cracklib 2.8.12

commit e4b971c06cdb3d507dbac5d9381ca8d4f4790fc7
Author: Pol Vinogradov <vin.public AT gmail.com>
Commit: Pol Vinogradov <vin.public AT gmail.com>

disk/fuse:

PRE_BUILD: patch only non-cvs version

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

soprano-1.95.0-beta2

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

kipi-plugins-0.1.5-beta1

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

libkdcraw-0.1.2

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

wine-0.9.47

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

fuse - fix for latest kernel

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

openssl 0.9.8f

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

flamerobin-0.8.0

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

digikam-0.9.3-beta1

commit 3a1d94bdadd8807785fece41a87582a23f6d4057
Author: George Sherwood <gsherwood AT sourcemage.org>
Commit: George Sherwood <gsherwood AT sourcemage.org>

liferea: Updated to version 1.4.5b

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

libidn 1.2

commit ea8e0e6b306ffad2aa80e8b876b45597053d6642
Author: Martin Spitzbarth <m.spitzbarth AT gmx.de>
Commit: Martin Spitzbarth <m.spitzbarth AT gmx.de>

asterisk: Updated to 1.4.13, SECURITY_PATCH++, Bug 14035

commit 1d5930dd52849d6a3186cc16a6117f630e41e5aa
Author: Martin Spitzbarth <m.spitzbarth AT gmx.de>
Commit: Martin Spitzbarth <m.spitzbarth AT gmx.de>

asterisk: forgot to remove a patch file from the grimoire

commit d2dbb978dd13c292841108b6cccd29db4fc91a86
Author: Andraž Levstik <ruskie AT mages.ath.cx>
Commit: Andraž Levstik <ruskie AT mages.ath.cx>

dovecot: update to 1.0.5, update to the patches and sieve

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

mplayer: use TRACK_ROOT for confdir

commit 38bbbb5edefad558cdefc4e0e8ff51cc11ba4ed7
Author: David Brown <dmlb2000 AT gmail.com>
Commit: David Brown <dmlb2000 AT gmail.com>

kvm updated to 46

commit 4c547259a0f5e2d510e161dc367cd6afd35eba99
Author: Martin Spitzbarth <m.spitzbarth AT gmx.de>
Commit: Martin Spitzbarth <m.spitzbarth AT gmx.de>

audacity: added INSTALL_ROOT, fixed path for manpages

commit a0bce474481374b0be5eead886d1dd346765329b
Author: Martin Spitzbarth <m.spitzbarth AT gmx.de>
Commit: Martin Spitzbarth <m.spitzbarth AT gmx.de>

squid: added INSTALL_ROOT, fixed path for manpages

commit 171a545b2a8d183cb669de6d5a7f5d7aefcd73a9
Author: Martin Spitzbarth <m.spitzbarth AT gmx.de>
Commit: Martin Spitzbarth <m.spitzbarth AT gmx.de>

klibc: fixed path for manpages

commit da6a90d4c0761c657659ac81c5f528dff65a5802
Author: Martin Spitzbarth <m.spitzbarth AT gmx.de>
Commit: Martin Spitzbarth <m.spitzbarth AT gmx.de>

hnb: added INSTALL_ROOT, fixed path for manpages

commit ed3849511ab19344ebd16826259e7bb4d5eb7ac1
Author: Martin Spitzbarth <m.spitzbarth AT gmx.de>
Commit: Martin Spitzbarth <m.spitzbarth AT gmx.de>

cpufrequtils: added use of INSTALL_ROOT, minor changes

changed mandir to usr/share/man, using make_single

commit b5e439097183d478d88bdf35879c929d0b5d03c4
Author: Martin Spitzbarth <m.spitzbarth AT gmx.de>
Commit: Martin Spitzbarth <m.spitzbarth AT gmx.de>

dosfstools: Updated to 2.11

commit 62e7c9284ab1d6e8cb80dc88b78d0f5cb49a4b39
Author: George Sherwood <gsherwood AT sourcemage.org>
Commit: George Sherwood <gsherwood AT sourcemage.org>

lyx: Updated to version 1.5.2

commit f4b5af917fb8c04927410de1401202e57d73813d
Author: Elisamuel Resto <ryuji AT mages.ath.cx>
Commit: Elisamuel Resto <ryuji AT mages.ath.cx>

mail/postfix: updated to 2.4.5 (VDA-ng 2.4.5)

commit 464b43ae324332eb6b478edf5e8c1661b1f9bbcb
Author: George Sherwood <gsherwood AT sourcemage.org>
Commit: George Sherwood <gsherwood AT sourcemage.org>

sqlite: Updated to version 3.5.1

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

imagemagick: Updated to version 6.3.6-1

commit 48eb768730fc1f7d3513f1181809a8641805cd7e
Author: Mathieu Lonjaret <lejatorn AT sourcemage.org>
Commit: Mathieu Lonjaret <lejatorn AT sourcemage.org>

rtorrent: dht patch defaults to no, depends on automake-1.9

commit f35185dcbcb652bdf773836b700eed8ca08a57e3
Author: Mathieu Lonjaret <lejatorn AT sourcemage.org>
Commit: Mathieu Lonjaret <lejatorn AT sourcemage.org>

libtorrent: dht patch defaults to no, explanation for openssl

commit b64a376236be8a556a5c38132aec062cb8ded8b8
Author: David Brown <dmlb2000 AT gmail.com>
Commit: David Brown <dmlb2000 AT gmail.com>

linux updated to latest 2.6.23

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

iwlwifi: Does *not* need ieee80211, it was a fluke that fixed it

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

ieee80211: Added correct linux .config modfication code to BUILD

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

man-pages 2.66

commit 140172da863654b558212fd9b1e2fc0709524e10
Author: Andraž Levstik <ruskie AT mages.ath.cx>
Commit: Andraž Levstik <ruskie AT mages.ath.cx>

exim: update to 4.68

commit d5294a60ad682ff4cf15357b6bf57b06db62cf01
Author: Pol Vinogradov <vin.public AT gmail.com>
Commit: Pol Vinogradov <vin.public AT gmail.com>

video/mplayer:

DETAILS: updated to 1.0rc2
BUILD: added disable_pic, install_rootifying all
DEPENDS; fixed option for win32codecs, added libdca
optionally
PRE_BUILD, Makefile.patch: removed as it's fixed by upstream

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

orca: updated to 2.20.0.1

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

bug-buddy2: updated to 2.20.1

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

devhelp: updated to 0.16.1

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

galculator: updated to 1.3.1

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

iwlwifi: Also depends on ieee80211 to work properly

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

iwlwifi: Submit correct HISTORY file

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

ieee80211: Removed extraneous spaces at end of lines

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

ieee80211: Remove BUILD code copied from mac80211

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

iwlwifi: Added Intel's new wireless driver (unlike ipw3945, no userspace
daemon is used)

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

mac80211: Added Intel's modified mac80211 wireless subsystem

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

ieee80211: Moved from z-rejected (not removed from z-rejected until
2007-12-07)

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

FUNCTIONS: Copied get_kernel_config and friends from z-rejected/FUNCTIONS

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

qtparted: Fails install with multiple make jobs

commit cce3e334b8c454ddbb6f2868702839aa32acecab
Author: Pol Vinogradov <vin.public AT gmail.com>
Commit: Pol Vinogradov <vin.public AT gmail.com>

libs/sdl_gfx:

DETAILS: updated to 2.0.16

commit 12d33c9c4535c138f10025e468b56b4d4bdc7ca3
Author: Pol Vinogradov <vin.public AT gmail.com>
Commit: Pol Vinogradov <vin.public AT gmail.com>

http/gnash:

CONFIGURE: swapped list items for GNASH_RENDERER
so that opengl goes first and default

commit 17b7aeeee259a3db00c4da9388343bb255a26a52
Author: Andraž Levstik <ruskie AT mages.ath.cx>
Commit: Andraž Levstik <ruskie AT mages.ath.cx>

wxgtk-no-unicode: various patches from gentoo that just make it work a
lot better, if anyone wants to see if any are optional/not needed feel
free to do so

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

libsoup: updated to 2.2.101

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

gtkmm2: updated to 2.12.1

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

glibmm: updated to 2.14.1

commit caa2e319c072487684e440edfdb93f6256d6dc64
Author: Pol Vinogradov <vin.public AT gmail.com>
Commit: Pol Vinogradov <vin.public AT gmail.com>

http/gnash:

CONFIGURE: added GNASH_RENDERER query list
DEPENDS: added one more renderer (agg), fixed libmad
flags, install_rootifying qt paths

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

iso-codes 1.5

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

kdenlive: Fix the install by using the 0.5-1 source tarball; now depends
on unsermake.

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

unsermake: switch to a mirrored tarball; SVN is dead

commit 1b2c6d7b539e85c1329bc5cfc469ebf4873ebffb
Author: Andraž Levstik <ruskie AT mages.ath.cx>
Commit: Andraž Levstik <ruskie AT mages.ath.cx>

audio-soft/gnupod: version update

commit 7ae6ed6df4e86e521b4da85213dd99914b8d739f
Author: Andraž Levstik <ruskie AT mages.ath.cx>
Commit: Andraž Levstik <ruskie AT mages.ath.cx>

mobile/gnokii: version update

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

libwpg: new spell

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

libwpd: corrected keywords

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

libwps: new spell

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

libwpd: new spell

commit 1672a25fd361c44a609dbb3551dbe72461a4b2b6
Author: Mathieu Lonjaret <lejatorn AT sourcemage.org>
Commit: Mathieu Lonjaret <lejatorn AT sourcemage.org>

alsaplayer: 0.99.90-rc3

commit df720d0bf1307d4071ad756db09ec0bd2fb44abb
Author: Bearcat Sandor <sourcemage AT feline-soul.com>
Commit: Bearcat Sandor <sourcemage AT feline-soul.com>

updated for new spell sndpeek

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

e16 0.16.8.10

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

pciutils 2.2.7
now provides "make install-lib", I use it
it don't install some .h files, I hope we don't need them
(i386-io-linux.h, internal.h, pread.h, sysdep.h)

commit eccc80573aa45892e470daed71ff95b6b959aa6d
Author: Martin Spitzbarth <m.spitzbarth AT gmx.de>
Commit: Martin Spitzbarth <m.spitzbarth AT gmx.de>

asterisk-addons: Updated to 1.4.3

commit 99987e9f7672b529906ab22a382ac2ee4d8d6a3f
Author: Martin Spitzbarth <m.spitzbarth AT gmx.de>
Commit: Martin Spitzbarth <m.spitzbarth AT gmx.de>

asterisk.gpg: added key 64FAEBC5 to the keyring

The key was signed by 5 of the 8 already existing keys of the keyring

commit 269e1709cde6c8ccf8e5b66957966e1d8c17b7c2
Author: Martin Spitzbarth <m.spitzbarth AT gmx.de>
Commit: Martin Spitzbarth <m.spitzbarth AT gmx.de>

asterisk: Updated to 1.4.12.1

commit 5a4574d4ae7ef6296f44c1c1794da25dd0874dae
Author: Andraž Levstik <ruskie AT mages.ath.cx>
Commit: Andraž Levstik <ruskie AT mages.ath.cx>

jpilot: update to 0.99.9 and upstream gpg

commit 487b49ec77b1c6b311f608a8a2625648108dfdf4
Author: Mathieu Lonjaret <lejatorn AT sourcemage.org>
Commit: Mathieu Lonjaret <lejatorn AT sourcemage.org>

libixp: 0.3

commit c59ca543abc4693cca0ff616d04863355839670d
Author: Mathieu Lonjaret <lejatorn AT sourcemage.org>
Commit: Mathieu Lonjaret <lejatorn AT sourcemage.org>

dwm: 4.5

commit 0538a341c36f225a177df8433f8c7917a0f944ef
Author: Mathieu Lonjaret <lejatorn AT sourcemage.org>
Commit: Mathieu Lonjaret <lejatorn AT sourcemage.org>

dmenu: 3.3

commit 8f3bfefe3fdcf013daa536b89276b148b8307c73
Author: Pol Vinogradov <vin.public AT gmail.com>
Commit: Pol Vinogradov <vin.public AT gmail.com>

xfce/xfburn: new spell, a GUI CD burning frontend for XFCE

commit f2afea8e7cdde2bfc657800607c256f270b4c99d
Author: Mathieu Lonjaret <lejatorn AT sourcemage.org>
Commit: Mathieu Lonjaret <lejatorn AT sourcemage.org>

fspclient: update to 0.91.0

commit fa7aee9166cf5dbb15cc559eb131a58df7683328
Author: Mathieu Lonjaret <lejatorn AT sourcemage.org>
Commit: Mathieu Lonjaret <lejatorn AT sourcemage.org>

fsp: update to 2.8.1b24, added conf file and docs

commit 33f4f98ff28d11e09f8ecd748f8bd126c7fa87de
Author: Mathieu Lonjaret <lejatorn AT sourcemage.org>
Commit: Mathieu Lonjaret <lejatorn AT sourcemage.org>

proftpd: 1.3.1rc3

commit fc496ec6c54cceebc517b399fd058cc93d0fc174
Author: Mathieu Lonjaret <lejatorn AT sourcemage.org>
Commit: Mathieu Lonjaret <lejatorn AT sourcemage.org>

rtorrent: added dht support

commit 74fc0fbca2978a7a79ce00c24c0f06f8956bd0f0
Author: Mathieu Lonjaret <lejatorn AT sourcemage.org>
Commit: Mathieu Lonjaret <lejatorn AT sourcemage.org>

libtorrent: added dht support, openssl optional, cleaned out stuff

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

passepartout: New Spell

commit 6cfaa27d34728944b3b7e3e0212b5368bb5c2283
Author: Bearcat Sandor <sourcemage AT feline-soul.com>
Commit: Bearcat Sandor <sourcemage AT feline-soul.com>

Initial spell for sndpeak version 1.3. I set it up as compiling for
alsa. You can compile it for jack, but the make command is different.

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

git 1.5.3.4

commit 8383c96efffcbd463b60ec42f95f122460b51a6f
Author: Julien ROZO <kaze AT maxikaze.KAZE>
Commit: Julien ROZO <kaze AT maxikaze.KAZE>

obexftp : corrected WEB_SITE

commit d61040e8b04e73c379ad902eb24e8d7aa2166a74
Author: Julien ROZO <kaze AT maxikaze.KAZE>
Commit: Julien ROZO <kaze AT maxikaze.KAZE>

openobex : corrected WEB_SITE

commit 980627b4f92d63cee6b791f403c26e57fed42961
Author: Julien ROZO <kaze AT maxikaze.KAZE>
Commit: Julien ROZO <kaze AT maxikaze.KAZE>

kmobiletools : corrected sha512 sum

commit fcda43e6e3500704b3a1260f17a8df93d8abbaa0
Author: Julien ROZO <kaze AT maxikaze.KAZE>
Commit: Julien ROZO <kaze AT maxikaze.KAZE>

kdebluetooth : updated spell to 1.0_beta8, added depends obexftp

commit 7386641d4c602d8ef2d442a5077f805ceb26c34f
Author: Mathieu Lonjaret <lejatorn AT sourcemage.org>
Commit: Mathieu Lonjaret <lejatorn AT sourcemage.org>

bittorrent: 5.0.9

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

libpng 1.2.21

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

sylpheed 2.4.7

commit 34d95927ac38f644362d314b9ac5c40e74d03177
Author: David Brown <dmlb2000 AT gmail.com>
Commit: David Brown <dmlb2000 AT gmail.com>

updated kvm to 45

commit 4cef4fead758fe9b08348102a0f783e9106ac219
Author: David Brown <dmlb2000 AT gmail.com>
Commit: David Brown <dmlb2000 AT gmail.com>

linux updated latest pre 2.6 kernel to rc9

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

claws-mail-extra-plugins: fixed WEB_SITE

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

http://www.virtualbox.org/wiki/Linux%20build%20instructions
virtualbox needs bcc and bcc is only a part of our dev86.
bin86 doesn't provide it.
https://lists.ibiblio.org/sympa/arc/sm-commit/2007-September/012707.html

Revert "According to the website for Virtualbox bin86 and dev86 work
equally well, so i changed the "dev86" to LD86."

This reverts commit e7ae3ff7d8ca4e7e269fed6c93085bcad4e433ab.

commit 4cebbb49b292a00981f885850ab002b117bb92dd
Author: George Sherwood <gsherwood AT sourcemage.org>
Commit: George Sherwood <gsherwood AT sourcemage.org>

gscan2pdf: Updated to version 0.9.17

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

devede: update to 3.2, also fixing checksum failure

commit 0f87e5ea53caaa0fffbab3e60b47d508ddf11dd8
Author: Arwed von Merkatz <v.merkatz AT gmx.net>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>

pwlib: fixed to work without alsa, bug 14029

commit 46257a9abe0bdc8a94620e34e5c67f800dc50763
Author: Arwed von Merkatz <v.merkatz AT gmx.net>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>

goggles: updated to 0.9.1

commit 6a419cb9d0e4c9901aa5c7d1547f2287601b5751
Author: Arwed von Merkatz <v.merkatz AT gmx.net>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>

howl: forgot to commit the removed BUILD

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

xawtv: fixed to work with xorg-modular, bug 13014

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

howl: fixed compile with current kernel headers, bug 14028

commit ce85f6e42dee7dc70294609929e333bfe3241947
Author: Juuso Alasuutari <iuso AT sourcemage.org>
Commit: Juuso Alasuutari <iuso AT sourcemage.org>

jackdmp: corrected WEB_SITE

commit 66c706687c0fa9c879b0bde457d727efbc05fc53
Author: George Sherwood <gsherwood AT sourcemage.org>
Commit: George Sherwood <gsherwood AT sourcemage.org>

imagemagick: Updated to version 6.3.6-0

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

telepathy-glib: remove unneccessary sig file

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

telepathy-mission-control: updated to 4.42

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

telepathy-glib: updated to 0.6.0

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

libtelepathy: removed sig file accidently added.

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

telepathy: updated to 0.2.0

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

gcalctool: updated to 5.20.1

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

gtk-doc: updated to 1.9

commit d4b88c38d640fbfaba91cde532b340a65e7cda12
Author: Julien ROZO <kaze AT maxikaze.KAZE>
Commit: Julien ROZO <kaze AT maxikaze.KAZE>

smartmontools : there was a missing "p" in the init.d/smartd script, in
the phrase "Stopping smartd"

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

claws-mail 3.0.2

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

conky: Optionally depends on wireless_tools for WLAN support

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

meld: Updated to 1.1.5.1

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

less 408

commit 426c183bf24d42c48921df718941ea99fc9c7879
Author: Julien ROZO <kaze AT maxikaze.KAZE>
Commit: Julien ROZO <kaze AT maxikaze.KAZE>

bluez-gnome : updated version to 0.14 by applying patch from bug 14025
(http://bugs.sourcemage.org/show_bug.cgi?id=14025)

commit 1be6f95faf50808cb6596a3d204105d1df5860b8
Author: Julien ROZO <kaze AT maxikaze.KAZE>
Commit: Julien ROZO <kaze AT maxikaze.KAZE>

bluez-utils : updated version to 3.19 by applying patch from bug 14024
(http://bugs.sourcemage.org/show_bug.cgi?id=14024), corrected WEB_SITE

commit 23a26bcff7193c9518a0bdbc74d1b315edc75706
Author: Julien ROZO <kaze AT maxikaze.KAZE>
Commit: Julien ROZO <kaze AT maxikaze.KAZE>

bluez-libs : updated version to 3.19 by applying patch from bug 14023
(http://bugs.sourcemage.org/show_bug.cgi?id=14023), corrected WEB_SITE

commit 65a848abc40efe46b9ba5b76a074235f02cce8be
Author: Julien ROZO <kaze AT maxikaze.KAZE>
Commit: Julien ROZO <kaze AT maxikaze.KAZE>

kmobiletools : updated version to 0.5.0-beta3, corrected WEB_SITE

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

conky: Updated to 1.4.7

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

VERSION: 0.15-test

commit 5f6b7b97371bf1a379cabc677d95ee0c4da44799
Author: Alexander Tsamutali <astsmtl AT gmail.com>
Commit: Alexander Tsamutali <astsmtl AT gmail.com>

x11-toolkits/kiwi: updated to 1.9.18

diff --git a/ChangeLog b/ChangeLog
index 88022a5..09dec8a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,165 @@
+2007-11-26 Eric Sandall <sandalle AT sourcemage.org>
+ * libs/libpaper: Added a simple paper size library
+
+2007-11-06 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
+ * groups: added shadow, corrected
+ * security-libs/pam_sotp: new spell, a simple One Time Password
+ module for PAM
+ * security-libs/otpw: new spell, A one-time password login package
+
+2007-11-05 Vlad Glagolev <codex AT sourcemage.org>
+ * ftp/transmission: new spell, gtk+2 BitTorrent client
+ * audio-soft/asunder: new spell, gtk+2 ripper
+ * disk/tkdvd: new spell, Tk frontend for dvd+rw-tools
+
+2007-11-05 Treeve Jelbert <treeve AT sourcemage.org>
+ * devel/openfst: new spell, pattern recognition
+
+2007-11-04 Julien "_kaze_" ROZO <julien AT rozo.org>
+ * utils/virtualbox-module: moved to kernels
+
+2007-11-04 Vlad Glagolev <codex AT sourcemage.org>
+ * gurus.gpg: added my key
+
+2007-11-03 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * libs/gloox: moved to chat-libs
+
+2007-11-03 Treeve Jelbert <treeve AT sourcemage.org>
+ * python-devel/elixir: new spell, front end to slqalchemy
+
+2007-11-03 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * libs/ruby-gettext: native Language Support lib and tools for Ruby
#14073
+ * libs/ruby-amazon: lib for fetching data from Amazon Web Services
#14074
+ * devel/yaz: toolkit for Z39.50/SRW/SRU clients and servers #14075
+ * libs/ruby-zoom: a Ruby binding to the ZOOM toolkit #14076
+ * gnome2-apps/alexandria: GNOME app for managing book collections
#14077
+
+2007-11-02 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * libs/gloox: new spell, C++ jabber library
+
+2007-11-01 Treeve Jelbert <treeve AT sourcemage.org>
+ * python-devel/pastedeploy: new spell
+
+2007-10-30 Elisamuel Resto <ryuji AT mages.ath.cx>
+ * mail/alpine: new spell, lightweight terminal mail reader like pine
+ * python-devel/hellanzb: new spell, python usenet file downloader
+
+2007-10-30 Treeve Jelbert <treeve AT sourcemage.org>
+ * kde4/kdebase4-runtime: new spell
+
+2007-10-30 Alexander Tsamutali <astsmtl AT gmail.com>
+ * python-devel/rabbyt: new spell, a fast sprite library for Python
+
+2007-10-30 Treeve Jelbert <treeve AT sourcemage.org>
+ * groups: add kde4
+
+2007-10-27 Treeve Jelbert <treeve AT sourcemage.org>
+ * archive-libs/libzip: new spell, manipulate zip archives
+
+2007-10-27 Lalo Martins <lalo AT sourcemage.org>
+ * devel/spidermonkey: new spell
+ the Mozilla JavaScript engine, stand-alone package
+
+2007-10-26 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
+ * x11-toolkits/openmotif: non-Free license moving to z-rejected
+
+2007-10-24 Arjan Bouter <abouter AT sourcemage.org>
+ * libs/libsmbios: new spell, DELL bios libs and tools
+ * archive/dynamite: new spell, pkware extraction libs and tools
+ * archive/orange: new spell, creates installable MS cab files
+ * mobile/synce-usb-rndis-lite: new spell, usb rndis driver
+
+2007-10-24 Eric Sandall <sandalle AT sourcemage.org>
+ * gnu.gpg: Imported FDAA9CC7 Sam Steingold <sam.steingold AT gmail.com>
+ from ftp://ftp.gnu.org/gnu/gnu-keyring.gpg for clisp 2.42
+
+2007-10-24 Lalo Martins <lalo AT sourcemage.org>
+ * ftp/linuxdcpp: new spell
+ a DC++ client using gtk+
+
+2007-10-24 Julien "_kaze_" ROZO <julien AT rozo.org>
+ * libs/libconfig: new spell
+ a simple library to manipulate structured configuration files
+
+2007-10-23 Ladislav Hagara <hgr AT vabo.cz>
+ * crypto/gnomint: new spell
+ a certification authority management tool for GTK/GNOME
+
+2007-10-22 Pol Vinogradov <vin.public AT gmail.com>
+ * http/iceweasel: new spell, the GNU version of the Firefox browser
+
+2007-10-21 Lalo Martins <lalo AT sourcemage.org>
+ * python-devel/bittorrent-bencode: new spell
+ The BitTorrent bencode module as leight-weight, standalone package
+
+2007-10-21 Ladislav Hagara <hgr AT vabo.cz>
+ * crypto/gpgdir: new spell
+ recursively encrypts/decrypts directories using a GPG key
+
+2007-10-21 Juuso Alasuutari <iuso AT sourcemage.org>
+ * audio-creation/jack-keyboard: New spell, virtual keyboard that
+ uses JACK MIDI.
+
+2007-10-20 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * chat-im/micq, chat-im/climm: the micq project has been renamed
+ to climm, therefore deprecating micq in favour of climm
+
+2007-10-20 Ladislav Hagara <hgr AT vabo.cz>
+ * crypto/paperkey: new spell, an OpenPGP key archiver
+
+2007-10-19 Treeve Jelbert <treeve AT sourcemage.org>
+ * kde/plasma: new spell, may only be temporary
+
+2007-10-19 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
+ * audio-libs/libmp3splt: added new spell, library to split mp3/ogg
files
+
+2007-10-18 Eric Sandall <sandalle AT sourcemage.org>
+ * groups: Added netdev:160: for avahi (See
+ https://bugzilla.redhat.com/show_bug.cgi?id=219218)
+ * shell-term-fm/rox/thomas.leonard.gpg: Moved from rox to section for
+ other Rox apps
+ * shell-term-fm/rox-lib2: Added package for ROX-Apps shared code
+ * shell-term-fm/rox-video-thumbnail: Added ROX-App for video
+ thumbnails
+
+2007-10-16 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * libs/libatomic_ops: new spell, atomic memory updates
+ * audio-drivers/paprefs: new spell, preferences for pulseaudio
+ * audio-drivers/pavucontrol: new spell, volume control for pulseaudio
+ * audio-plugins/xmms-pulse: new spell, xmms plugin using pulseaudio
+ * audio-plugins/gst-pulse: new spell, gstreamer plugin using
+ pulseaudio
+
+2007-10-16 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
+ * mobile/powermgmt-base: added spell for debian powermanagemnt tools
+ bug #13996
+ * mobile/laptop-detect: added spell, detect if running on a laptop,
+ bug #13997
+ * mobile/acpi-support: added spell, various scripts for laptops,
+ bug #13998
+
+2007-10-07 Eric Sandall <sandalle AT sourcemage.org>
+ * FUNCTIONS: Copied get_kernel_config and friends from
+ z-rejected/FUNCTIONS
+ * kernels/ieee80211: Copied from z-rejected, this is GPL'd
+ Remove from z-rejected on 2007-12-07
+ * kernels/mac80211: Added Intel's modified MAC80211 wireless subsystem
+ * kernels/iwlwifi: Added Intel's new Intel Wireless driver
+
+2007-10-06 Robin Cook <rcook AT wyrms.net>
+ * libs/libwpd new spell
+ * libs/libwps new spell
+ * libs/libwpg new spell
+
+2007-10-05 Robin Cook <rcook AT wyrms.net>
+ * gnome2-apps/passepartout new spell
+
+2007-10-05 Pol Vinogradov <vin.public AT gmail.com>
+ * xfce/xfburn: new spell, a GUI CD burning frontend for XFCE
+
+2007-10-04 Bearcat M. Sandor <sourcemage AT feline-soul.com>
+ * sndpeek: new spell, a program for real-time audio visualization
+
2007-09-29 David Brown <dmlb2000 AT gmail.com>
* python-devel/cobbler: new spell dhcp manager
* python-devel/koan: virtual machine manager
diff --git a/FUNCTIONS b/FUNCTIONS
index 81e91bc..6c73d4a 100755
--- a/FUNCTIONS
+++ b/FUNCTIONS
@@ -529,3 +529,116 @@ function build_qt3_or_4()
qmake &&
make
}
+
+#-------------------------------------------------------------------------
+## Print the version of the running kernel.
+#-------------------------------------------------------------------------
+function get_running_kernel_version()
+{
+ # Try the proc interface first because it returns the version of the
+ # running kernel even when unamechange is invoked.
+ [[ -f /proc/sys/kernel/osrelease ]] && cat /proc/sys/kernel/osrelease ||
+ uname -r
+}
+
+#-------------------------------------------------------------------------
+## Print the version of the installed linux spell or, lacking that, "-1".
+## This is just a wrapper for 'installed_version linux' with the exception
+## that this will always print something and not return false.
+#-------------------------------------------------------------------------
+function get_sorcery_kernel_version()
+{
+ installed_version linux || echo "-1"
+}
+
+#-------------------------------------------------------------------------
+## Print the version of the kernel defined in USE_KERNEL_VERSION or,
+## lacking that, the version of either the installed linux spell or the
+## running kernel.
+#-------------------------------------------------------------------------
+function get_kernel_version()
+{
+ if [[ $USE_KERNEL_VERSION ]]
+ then
+ echo "$USE_KERNEL_VERSION"
+ else
+ installed_version linux || get_running_kernel_version
+ fi
+}
+
+#-----------------------------------------------------------------------
+## Print the kernel config status of the running kernel for the option
+## defined in $1.
+## If a configure file is found print the requested config status (if
+## any) and return 0, otherwise return 1.
+#-----------------------------------------------------------------------
+function get_running_kernel_config()
+{
+ if [[ -f /proc/config.gz ]]
+ then
+ zgrep "^$1=" /proc/config.gz | cut -d= -f2
+ else
+ local KVER="$(get_running_kernel_version)"
+ if [[ -f "/boot/config-$KVER" ]]
+ then
+ grep "^$1=" "/boot/config-$KVER" | cut -d= -f2
+ elif [[ -f "/usr/src/linux-$KVER/.config" ]]
+ then
+ grep "^$1=" "/usr/src/linux-$KVER/.config" | cut -d= -f2
+ else
+ return 1
+ fi
+ fi
+}
+
+#-----------------------------------------------------------------------
+## Print the kernel config status of the installed linux spell for the
+## option defined in $1.
+## If the linux spell is installed and a configure file is found print
+## the requested config status (if any) and return 0, otherwise return
+## 1.
+#-----------------------------------------------------------------------
+function get_sorcery_kernel_config()
+{
+ local KVER="$(installed_version linux)"
+ if [[ $KVER ]]
+ then
+ if [[ -f "/boot/config-$KVER" ]]
+ then
+ grep "^$1=" "/boot/config-$KVER" | cut -d= -f2
+ elif [[ -f "/usr/src/linux-$KVER/.config" ]]
+ then
+ grep "^$1=" "/usr/src/linux-$KVER/.config" | cut -d= -f2
+ else
+ return 1
+ fi
+ else
+ return 1
+ fi
+}
+
+#-----------------------------------------------------------------------
+## Print the kernel config status for the option defined in $1 from the
+## kernel defined in USE_KERNEL_VERSION or, lacking that, from either
+## the installed linux spell or the running kernel.
+## If a configure file is found print the requested config status (if
+## any) and return 0, otherwise return 1.
+#-----------------------------------------------------------------------
+function get_kernel_config()
+{
+ if [[ $USE_KERNEL_VERSION ]]
+ then
+ if [[ -f "/boot/config-$USE_KERNEL_VERSION" ]]
+ then
+ grep "^$1=" "/boot/config-$USE_KERNEL_VERSION" | cut -d= -f2
+ elif [[ -f "/usr/src/linux-$USE_KERNEL_VERSION/.config" ]]
+ then
+ grep "^$1=" "/usr/src/linux-$USE_KERNEL_VERSION/.config" | cut -d= -f2
+ else
+ return 1
+ fi
+ else
+ get_sorcery_kernel_config "$1" || get_running_kernel_config "$1"
+ fi
+}
+
diff --git a/VERSION b/VERSION
index 3dc89b5..c959a6d 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.14-test
+0.15-2
diff --git a/archive-libs/libzip/DETAILS b/archive-libs/libzip/DETAILS
new file mode 100755
index 0000000..e9243dc
--- /dev/null
+++ b/archive-libs/libzip/DETAILS
@@ -0,0 +1,17 @@
+ SPELL=libzip
+ VERSION=0.8
+
SOURCE_HASH=sha512:c9fbb8f5bd9fcda7c9077d1fa3fab86d5b8bd7d6073078a63302f750e3ebd3c2aaeebc4ccb2f56beebdf17e0868d6d420431112018c2213af7cf0e11c1f6373a
+ SOURCE=$SPELL-$VERSION.tar.gz
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+ WEB_SITE=http://www.nih.at/libzip
+ SOURCE_URL[0]=$WEB_SITE/$SOURCE
+ LICENSE[0]=GPL
+ ENTERED=20071027
+ KEYWORDS="zip library"
+ SHORT="manipulate zip archives"
+cat << EOF
+libzip is a C library for reading, creating, and modifying zip archives.
+Files can be added from data buffers, files, or compressed data copied
directly
+from other zip archives. Changes made without closing the archive can be
+reverted. The API is documented by man pages.
+EOF
diff --git a/archive-libs/libzip/HISTORY b/archive-libs/libzip/HISTORY
new file mode 100644
index 0000000..ebc231a
--- /dev/null
+++ b/archive-libs/libzip/HISTORY
@@ -0,0 +1,4 @@
+2007-10-27 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.8
+ spell created
+
diff --git a/archive/dynamite/DETAILS b/archive/dynamite/DETAILS
new file mode 100755
index 0000000..1ab3f3b
--- /dev/null
+++ b/archive/dynamite/DETAILS
@@ -0,0 +1,13 @@
+ SPELL=dynamite
+ VERSION=0.1
+ SOURCE=$SPELL-$VERSION.tar.gz
+
SOURCE_HASH=sha512:c75dfa9fec3cd06373c99ac52f9f4d891f27786ae352b4a10c601a44d485f6f4068e07b8d7be71f051b4b373985d7f17f9ede507fbe704a4ff394433e9585453
+ SOURCE_URL[0]=$SOURCEFORGE_URL/synce/${SOURCE}
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+ WEB_SITE=http://www.synce.org
+ ENTERED=20071024
+ LICENSE[0]=GPL
+ SHORT="PKware extraction utility"
+cat << EOF
+Dynamite is a tool and library for decompressing data compressed with PKWARE
Data Compression Library
+EOF
diff --git a/archive/dynamite/HISTORY b/archive/dynamite/HISTORY
new file mode 100644
index 0000000..c0a5ec7
--- /dev/null
+++ b/archive/dynamite/HISTORY
@@ -0,0 +1,3 @@
+2007-10-24 Arjan Bouter <abouter AT sourcemage.org>
+ * DETAILS,HISTORY: created spell
+
diff --git a/archive/orange/DEPENDS b/archive/orange/DEPENDS
new file mode 100755
index 0000000..ee9918a
--- /dev/null
+++ b/archive/orange/DEPENDS
@@ -0,0 +1,7 @@
+depends synce-libsynce &&
+depends dynamite &&
+depends unshield &&
+optional_depends libole2 \
+ "--with-libole2" \
+ "" \
+ "Build against libole2?"
diff --git a/archive/orange/DETAILS b/archive/orange/DETAILS
new file mode 100755
index 0000000..bd2c919
--- /dev/null
+++ b/archive/orange/DETAILS
@@ -0,0 +1,14 @@
+ SPELL=orange
+ VERSION=0.3
+ SOURCE=$SPELL-$VERSION.tar.gz
+
SOURCE_HASH=sha512:606a96aef0d21e03ecb439fc145b2372d0819e53b51a1c6e65ffdd7f683f6e9a3b3f32a5f9114f411d57958f53f50e7a37b205553710f6f75e9f2a3032da8a89
+ SOURCE_URL[0]=$SOURCEFORGE_URL/synce/${SOURCE}
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+ WEB_SITE=http://www.synce.org
+ ENTERED=20071024
+ LICENSE[0]=GPL
+ SHORT="cab file creator"
+cat << EOF
+Orange is a tool and library for squeezing out juicy installable Microsoft
Cabinet Files from
+self-extracting installers for Microsoft Windows and some other installer
file formats.
+EOF
diff --git a/archive/orange/HISTORY b/archive/orange/HISTORY
new file mode 100644
index 0000000..38dbb7b
--- /dev/null
+++ b/archive/orange/HISTORY
@@ -0,0 +1,3 @@
+2007-10-24 Arjan Bouter <abouter AT sourcemage.org>
+ * DETAILS,DEPENDS,HISTORY: created spell
+
diff --git a/archive/par2cmdline/HISTORY b/archive/par2cmdline/HISTORY
index e624809..8346fa4 100644
--- a/archive/par2cmdline/HISTORY
+++ b/archive/par2cmdline/HISTORY
@@ -1,3 +1,6 @@
+2007-10-30 Elisamuel Resto <ryuji AT mages.ath.cx>
+ * PRE_BUILD, par2cmdline-0.4-gcc4.patch: fix for gcc4
+
2006-10-03 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: [automated] Removed UPDATED.

diff --git a/archive/par2cmdline/PRE_BUILD b/archive/par2cmdline/PRE_BUILD
new file mode 100755
index 0000000..b49b864
--- /dev/null
+++ b/archive/par2cmdline/PRE_BUILD
@@ -0,0 +1,5 @@
+default_pre_build &&
+
+if [ "$(installed_version gcc | cut -d. -f1)" == "4" ]; then
+ patch -p0 < ${SCRIPT_DIRECTORY}/par2cmdline-0.4-gcc4.patch
+fi
diff --git a/archive/par2cmdline/par2cmdline-0.4-gcc4.patch
b/archive/par2cmdline/par2cmdline-0.4-gcc4.patch
new file mode 100644
index 0000000..c6da267
--- /dev/null
+++ b/archive/par2cmdline/par2cmdline-0.4-gcc4.patch
@@ -0,0 +1,62 @@
+Fix compilation with gcc-4.
+
+Patch by Dirk-Jan Heijs.
+
+http://bugs.gentoo.org/102391
+http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=287904
+
+--- par2cmdline-0.4/reedsolomon.cpp
++++ par2cmdline-0.4/reedsolomon.cpp
+@@ -51,7 +51,7 @@
+ }
+ }
+
+-bool ReedSolomon<Galois8>::SetInput(const vector<bool> &present)
++template <> bool ReedSolomon<Galois8>::SetInput(const vector<bool> &present)
+ {
+ inputcount = (u32)present.size();
+
+@@ -80,7 +80,7 @@
+ return true;
+ }
+
+-bool ReedSolomon<Galois8>::SetInput(u32 count)
++template <> bool ReedSolomon<Galois8>::SetInput(u32 count)
+ {
+ inputcount = count;
+
+@@ -101,7 +101,7 @@
+ return true;
+ }
+
+-bool ReedSolomon<Galois8>::Process(size_t size, u32 inputindex, const void
*inputbuffer, u32 outputindex, void *outputbuffer)
++template <> bool ReedSolomon<Galois8>::Process(size_t size, u32 inputindex,
const void *inputbuffer, u32 outputindex, void *outputbuffer)
+ {
+ // Look up the appropriate element in the RS matrix
+ Galois8 factor = leftmatrix[outputindex * (datapresent + datamissing) +
inputindex];
+@@ -189,7 +189,7 @@
+
+ // Set which of the source files are present and which are missing
+ // and compute the base values to use for the vandermonde matrix.
+-bool ReedSolomon<Galois16>::SetInput(const vector<bool> &present)
++template <> bool ReedSolomon<Galois16>::SetInput(const vector<bool>
&present)
+ {
+ inputcount = (u32)present.size();
+
+@@ -233,7 +233,7 @@
+
+ // Record that the specified number of source files are all present
+ // and compute the base values to use for the vandermonde matrix.
+-bool ReedSolomon<Galois16>::SetInput(u32 count)
++template <> bool ReedSolomon<Galois16>::SetInput(u32 count)
+ {
+ inputcount = count;
+
+@@ -267,7 +267,7 @@
+ return true;
+ }
+
+-bool ReedSolomon<Galois16>::Process(size_t size, u32 inputindex, const void
*inputbuffer, u32 outputindex, void *outputbuffer)
++template <> bool ReedSolomon<Galois16>::Process(size_t size, u32
inputindex, const void *inputbuffer, u32 outputindex, void *outputbuffer)
+ {
+ // Look up the appropriate element in the RS matrix
diff --git a/archive/tar/DETAILS b/archive/tar/DETAILS
index ff4c9c3..cf824ec 100755
--- a/archive/tar/DETAILS
+++ b/archive/tar/DETAILS
@@ -1,5 +1,5 @@
SPELL=tar
- VERSION=1.18
+ VERSION=1.19
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE2=$SOURCE.sig
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/archive/tar/HISTORY b/archive/tar/HISTORY
index 390b600..be0afe6 100644
--- a/archive/tar/HISTORY
+++ b/archive/tar/HISTORY
@@ -1,3 +1,8 @@
+2007-10-23 George Sherwood <george AT beernabeer.com>
+ * DETAILS: Updated to version 1.19
+ * PRE_BUILD: Removed patch incorproated upstream
+ * contains_dot_dot.diff: Removed. Incorporated
+
2007-08-28 Martin Spitzbarth <m.spitzbarth AT gmx.de>
* DETAILS: SECURITY_PATCH++, Bug 13957
* PRE_BUILD: apply upstream patch
diff --git a/archive/tar/PRE_BUILD b/archive/tar/PRE_BUILD
index d6cb202..ce89b8d 100755
--- a/archive/tar/PRE_BUILD
+++ b/archive/tar/PRE_BUILD
@@ -7,7 +7,4 @@ if is_depends_enabled $SPELL lzma-utils; then
patch -p1 < $SPELL_DIRECTORY/tar_lzma.diff
fi &&

-# The following patch is for bug 13957 and is probably included in 1.19
-cd $SOURCE_DIRECTORY/src &&
-patch -p0 < $SPELL_DIRECTORY/contains_dot_dot.diff &&
cd $SOURCE_DIRECTORY
diff --git a/archive/tar/contains_dot_dot.diff
b/archive/tar/contains_dot_dot.diff
deleted file mode 100644
index c457c10..0000000
--- a/archive/tar/contains_dot_dot.diff
+++ /dev/null
@@ -1,15 +0,0 @@
---- names.c 2007/06/27 13:30:15 1.63
-+++ names.c 2007/08/12 08:25:00 1.64
-@@ -1012,11 +1012,10 @@
- if (p[0] == '.' && p[1] == '.' && (ISSLASH (p[2]) || !p[2]))
- return 1;
-
-- do
-+ while (! ISSLASH (*p))
- {
- if (! *p++)
- return 0;
- }
-- while (! ISSLASH (*p));
- }
- }
diff --git a/asterisk.gpg b/asterisk.gpg
index 641c035..ad07a55 100644
Binary files a/asterisk.gpg and b/asterisk.gpg differ
diff --git a/audio-creation/audacity/BUILD b/audio-creation/audacity/BUILD
index 06224d3..8f38679 100755
--- a/audio-creation/audacity/BUILD
+++ b/audio-creation/audacity/BUILD
@@ -8,11 +8,13 @@ fi &&

OPTS="$AUDACITY_LADSPA $AUDACITY_PORTMIXER $AUDACITY_PORTAUDIO $OPTS" &&

-./configure --prefix=/usr \
- --sysconfdir=/etc \
- --localstatedir=/var \
- --with-lib-preference=system \
- $OPTS &&
+./configure --prefix=${INSTALL_ROOT}/usr \
+ --sysconfdir=${INSTALL_ROOT}/etc \
+ --localstatedir=${INSTALL_ROOT}/var \
+ --mandir=${INSTALL_ROOT}/usr/share/man \
+ --infodir=${INSTALL_ROOT}/usr/share/info \
+ --with-lib-preference=system \
+ $OPTS &&

make_single &&
make &&
diff --git a/audio-creation/audacity/HISTORY b/audio-creation/audacity/HISTORY
index 8481c8d..f87e5e3 100644
--- a/audio-creation/audacity/HISTORY
+++ b/audio-creation/audacity/HISTORY
@@ -1,3 +1,6 @@
+2007-10-10 Martin Spitzbarth <m.spitzbarth AT gmx.de>
+ * BUILD: Added INSTALL_ROOT, fixed the path for manpages
+
2007-05-19 George Sherwood <george AT beernabeer.com>
* DETAILS: Updated beta to 1.3.3

diff --git a/audio-creation/ceres3/DEPENDS b/audio-creation/ceres3/DEPENDS
index 2b95631..890225f 100755
--- a/audio-creation/ceres3/DEPENDS
+++ b/audio-creation/ceres3/DEPENDS
@@ -1,2 +1,2 @@
-depends openmotif
+depends openmotif "" "" z-rejected

diff --git a/audio-creation/ceres3/HISTORY b/audio-creation/ceres3/HISTORY
index b1659b7..ed59906 100644
--- a/audio-creation/ceres3/HISTORY
+++ b/audio-creation/ceres3/HISTORY
@@ -1,3 +1,6 @@
+2007-10-26 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
+ * DEPENDS: openmotif now in z-rejected
+
2007-03-24 David Kowis <dkowis AT shlrm.org>
* DETAILS: fixed bug #11943
* DETAILS: Cleaned up the file so it's now pretty
diff --git a/audio-creation/jack-keyboard/BUILD
b/audio-creation/jack-keyboard/BUILD
new file mode 100755
index 0000000..8f58e6d
--- /dev/null
+++ b/audio-creation/jack-keyboard/BUILD
@@ -0,0 +1 @@
+make
diff --git a/audio-creation/jack-keyboard/DEPENDS
b/audio-creation/jack-keyboard/DEPENDS
new file mode 100755
index 0000000..e463671
--- /dev/null
+++ b/audio-creation/jack-keyboard/DEPENDS
@@ -0,0 +1,6 @@
+depends gtk+2 &&
+
+#
+# can't depend on provider JACK before jackdmp gets MIDI support
+#
+depends jack
diff --git a/audio-creation/jack-keyboard/DETAILS
b/audio-creation/jack-keyboard/DETAILS
new file mode 100755
index 0000000..68d865c
--- /dev/null
+++ b/audio-creation/jack-keyboard/DETAILS
@@ -0,0 +1,15 @@
+ SPELL=jack-keyboard
+ VERSION=1.8r2
+ SOURCE=$SPELL-$VERSION.tar.gz
+ SOURCE_URL[0]=http://pin.if.uz.zgora.pl/~trasz/$SPELL/$SOURCE
+
SOURCE_HASH=sha512:6c92e311ae37bd7521b32e63bec8429180fd4aeb0fd8f38f828c0faa8500475fad0a747e5e32a478524ebfd839be897f4c8d630abeed40d2444f8d95adcb3908
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
+ WEB_SITE=http://pin.if.uz.zgora.pl/~trasz/jack-keyboard/
+ ENTERED=20071021
+ LICENSE[0]=PD
+ KEYWORDS="tools audio"
+ SHORT="A virtual keyboard that uses JACK MIDI."
+cat << EOF
+jack-keyboard is a virtual keyboard that allows you
+to send JACK MIDI events using your PC keyboard.
+EOF
diff --git a/audio-creation/jack-keyboard/HISTORY
b/audio-creation/jack-keyboard/HISTORY
new file mode 100644
index 0000000..c9447bd
--- /dev/null
+++ b/audio-creation/jack-keyboard/HISTORY
@@ -0,0 +1,2 @@
+2007-10-21 Juuso Alasuutari <iuso AT sourcemage.org>
+ * DETAILS, DEPENDS, BUILD, INSTALL: Created spell.
diff --git a/audio-creation/jack-keyboard/INSTALL
b/audio-creation/jack-keyboard/INSTALL
new file mode 100755
index 0000000..af835d5
--- /dev/null
+++ b/audio-creation/jack-keyboard/INSTALL
@@ -0,0 +1,2 @@
+cp jack-keyboard.1 "$INSTALL_ROOT/usr/share/man/man1/" &&
+cp jack-keyboard "$INSTALL_ROOT/usr/bin/"
diff --git a/audio-creation/snd/DEPENDS b/audio-creation/snd/DEPENDS
index 30fbd1e..616adb4 100755
--- a/audio-creation/snd/DEPENDS
+++ b/audio-creation/snd/DEPENDS
@@ -4,7 +4,7 @@ then
then
depends gtk+2 "--with-gtk --without-motif"
else
- depends openmotif "--with-motif --without-gtk"
+ depends openmotif "--with-motif --without-gtk" "" z-rejected
fi
fi &&

diff --git a/audio-creation/snd/HISTORY b/audio-creation/snd/HISTORY
index 42b930b..2505465 100644
--- a/audio-creation/snd/HISTORY
+++ b/audio-creation/snd/HISTORY
@@ -1,3 +1,6 @@
+2007-10-26 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
+ * DEPENDS: openmotif now in z-rejected
+
2007-04-24 Arwed v. Merkatz <v.merkatz AT gmx.net>
* DETAILS: updated to 8.9
* CONFIGURE: removed warning about guile
diff --git a/audio-creation/wired/DETAILS b/audio-creation/wired/DETAILS
index 3b8fc71..f228f44 100755
--- a/audio-creation/wired/DETAILS
+++ b/audio-creation/wired/DETAILS
@@ -1,9 +1,9 @@
SPELL=wired
- VERSION=0.3.1
+ VERSION=0.5
SOURCE=$SPELL-$VERSION.tar.gz
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
-
SOURCE_HASH=sha512:54da9099389890dd55e792846f42dd7113eb2255c1131766373285c0e4ac0e00a2e6accd18d1f40020422f26329a21d5431f0c0f4030b150f5eecbdc7054b1c6
+
SOURCE_HASH=sha512:4ee1d2a159c0b3e2d7976ca956fadc1a2f2086ec267c3bf0e7bd7eca56b9b889d8374ff6f76b4f2c444a3095fb140c296772714a8568f43f63f05a4734f69a35
WEB_SITE=http://wired.epitech.net
ENTERED=20060725
LICENSE[0]=GPL
diff --git a/audio-creation/wired/HISTORY b/audio-creation/wired/HISTORY
index 4ece883..009eebd 100644
--- a/audio-creation/wired/HISTORY
+++ b/audio-creation/wired/HISTORY
@@ -1,3 +1,6 @@
+2007-10-24 Arjan Bouter <abouter AT sourcemage.org>
+ * DETAILS: version bumped to 0.5
+
2006-12-16 Arjan Bouter <abouter AT sourcemage.org>
* DETAILS: version bumped to 0.3.1
* desktop/wired.desktop: added
diff --git a/audio-drivers/alsa-driver/DETAILS
b/audio-drivers/alsa-driver/DETAILS
index b22853c..204dbbf 100755
--- a/audio-drivers/alsa-driver/DETAILS
+++ b/audio-drivers/alsa-driver/DETAILS
@@ -1,5 +1,5 @@
SPELL=alsa-driver
- VERSION=1.0.15rc2
+ VERSION=1.0.15
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=ftp://ftp.alsa-project.org/pub/driver/$SOURCE
diff --git a/audio-drivers/alsa-driver/HISTORY
b/audio-drivers/alsa-driver/HISTORY
index 6fd6dd9..1c7c833 100644
--- a/audio-drivers/alsa-driver/HISTORY
+++ b/audio-drivers/alsa-driver/HISTORY
@@ -1,3 +1,6 @@
+2007-10-17 Pol Vinogradov <vin.public AT gmail.com>
+ * DETAILS: updated to 1.0.15
+
2007-09-23 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: Updated to 1.015rc2 (fixes my hda-intel sound)

diff --git a/audio-drivers/alsa-driver/alsa-driver-1.0.15.tar.bz2.sig
b/audio-drivers/alsa-driver/alsa-driver-1.0.15.tar.bz2.sig
new file mode 100644
index 0000000..3efb744
Binary files /dev/null and
b/audio-drivers/alsa-driver/alsa-driver-1.0.15.tar.bz2.sig differ
diff --git a/audio-drivers/alsa-driver/alsa-driver-1.0.15rc2.tar.bz2.sig
b/audio-drivers/alsa-driver/alsa-driver-1.0.15rc2.tar.bz2.sig
deleted file mode 100644
index 56061f5..0000000
Binary files a/audio-drivers/alsa-driver/alsa-driver-1.0.15rc2.tar.bz2.sig
and /dev/null differ
diff --git a/audio-drivers/alsa-firmware/DETAILS
b/audio-drivers/alsa-firmware/DETAILS
index 8c7c08f..5e281cf 100755
--- a/audio-drivers/alsa-firmware/DETAILS
+++ b/audio-drivers/alsa-firmware/DETAILS
@@ -1,9 +1,9 @@
SPELL=alsa-firmware
- VERSION=1.0.15rc1
+ VERSION=1.0.15
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=ftp://ftp.alsa-project.org/pub/firmware/$SOURCE
-
SOURCE_HASH=sha512:21c4c21dd8d6004ad92de593754f63dc5e4d895794e2a2bad0c9ba6cafedb62740574851699eb30bfef48c0398dcde3afed79762d8ea356a519f826c87a7148b
+
SOURCE_HASH=sha512:bb80a1e39a2bc5236f35aaa2778d3f6f82f5ee770701ea9e209db42501b83d24ba233d8721674f2ab8272e81df8b9f78a84dd936c7c7ed9f7e9aacf87a30f1a3
WEB_SITE=http://www.alsa-project.org/
ENTERED=20031205
ARCHIVE="off"
diff --git a/audio-drivers/alsa-firmware/HISTORY
b/audio-drivers/alsa-firmware/HISTORY
index 7aaa856..13daa91 100644
--- a/audio-drivers/alsa-firmware/HISTORY
+++ b/audio-drivers/alsa-firmware/HISTORY
@@ -1,3 +1,6 @@
+2007-10-17 Pol Vinogradov <vin.public AT gmail.com>
+ * DETAILS: updated to 1.0.15
+
2007-09-03 Pol Vinogradov <vin.public AT gmail.com>
* DETAILS: updated to 1.0.15rc1

diff --git a/audio-drivers/alsa-lib/DETAILS b/audio-drivers/alsa-lib/DETAILS
index cb203b4..52af558 100755
--- a/audio-drivers/alsa-lib/DETAILS
+++ b/audio-drivers/alsa-lib/DETAILS
@@ -1,5 +1,5 @@
SPELL=alsa-lib
- VERSION=1.0.15rc2
+ VERSION=1.0.15
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=ftp://ftp.alsa-project.org/pub/lib/$SOURCE
diff --git a/audio-drivers/alsa-lib/HISTORY b/audio-drivers/alsa-lib/HISTORY
index 74055b3..9b0eaa8 100644
--- a/audio-drivers/alsa-lib/HISTORY
+++ b/audio-drivers/alsa-lib/HISTORY
@@ -1,3 +1,6 @@
+2007-10-17 Pol Vinogradov <vin.public AT gmail.com>
+ * DETAILS: updated to 1.0.15
+
2007-09-23 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: Updated to 1.0.15rc2 (fixes my hda-intel card)

diff --git a/audio-drivers/alsa-lib/alsa-lib-1.0.15.tar.bz2.sig
b/audio-drivers/alsa-lib/alsa-lib-1.0.15.tar.bz2.sig
new file mode 100644
index 0000000..c5faeaa
Binary files /dev/null and
b/audio-drivers/alsa-lib/alsa-lib-1.0.15.tar.bz2.sig differ
diff --git a/audio-drivers/alsa-lib/alsa-lib-1.0.15rc2.tar.bz2.sig
b/audio-drivers/alsa-lib/alsa-lib-1.0.15rc2.tar.bz2.sig
deleted file mode 100644
index 3e47a92..0000000
Binary files a/audio-drivers/alsa-lib/alsa-lib-1.0.15rc2.tar.bz2.sig and
/dev/null differ
diff --git a/audio-drivers/alsa-oss/DETAILS b/audio-drivers/alsa-oss/DETAILS
index 8ecfd71..0330daf 100755
--- a/audio-drivers/alsa-oss/DETAILS
+++ b/audio-drivers/alsa-oss/DETAILS
@@ -1,9 +1,9 @@
SPELL=alsa-oss
- VERSION=1.0.14
+ VERSION=1.0.15
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=ftp://ftp.alsa-project.org/pub/oss-lib/$SOURCE
-
SOURCE_HASH=sha512:a50ca6ae364813b8f5e7135f7340f055f710d4350a13e3830eafade58e92001cbffe90a7136dda3be2bf158a3a77fc66a5a4b666fbafeacee86cf653f7f226c3
+
SOURCE_HASH=sha512:fd6b6b0518ad0340c2dd45b90a4ccee892e17db1b08a3b581651289c2c0de1c06b482eae4731746c696f63a63f4a5a2820b8c0d5b56f5731a708e2d53d95b61f
WEB_SITE=http://www.alsa-project.org/
ENTERED=20041026
LICENSE[0]=LGPL
diff --git a/audio-drivers/alsa-oss/HISTORY b/audio-drivers/alsa-oss/HISTORY
index fb37bd6..7404439 100644
--- a/audio-drivers/alsa-oss/HISTORY
+++ b/audio-drivers/alsa-oss/HISTORY
@@ -1,3 +1,6 @@
+2007-10-17 Pol Vinogradov <vin.public AT gmail.com>
+ * DETAILS: updated to 1.0.15
+
2007-06-12 Pol Vinogradov <vin.public AT gmail.com>
* DETAILS: updated to 1.0.14

diff --git a/audio-drivers/alsa-plugins/DEPENDS
b/audio-drivers/alsa-plugins/DEPENDS
index 49914b9..4c780b7 100755
--- a/audio-drivers/alsa-plugins/DEPENDS
+++ b/audio-drivers/alsa-plugins/DEPENDS
@@ -13,4 +13,9 @@ optional_depends JACK-DRIVER \
optional_depends libsamplerate \
"" \
"" \
- "for samplerate plugin"
+ "for samplerate plugin" &&
+
+optional_depends pulseaudio \
+ "" \
+ "" \
+ "for pulseaudio plugin"
diff --git a/audio-drivers/alsa-plugins/DETAILS
b/audio-drivers/alsa-plugins/DETAILS
index bc6cf26..59c3f26 100755
--- a/audio-drivers/alsa-plugins/DETAILS
+++ b/audio-drivers/alsa-plugins/DETAILS
@@ -1,9 +1,9 @@
SPELL=alsa-plugins
- VERSION=1.0.15rc1
+ VERSION=1.0.15
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=ftp://ftp.alsa-project.org/pub/plugins/$SOURCE
-
SOURCE_HASH=sha512:d277f19f093a3d9798a1e2b7299483f76891ed8e2ebffe73f4135f622d0808c91c4d8d1dc4ac6187e1427f10b6907809d174ffeaf9bed2cb8aaa4c54a09ecaf9
+
SOURCE_HASH=sha512:2421190a6e1bfe7604c607042bf1c5456a68b3619520eba6d26a4565e5a754002491a1770b0dd36b295a26db1a9931139bfa85772170bee3225b31ffd07b03d2
WEB_SITE=http://www.alsa-project.org/
ENTERED=20061001
LICENSE[0]=GPL
diff --git a/audio-drivers/alsa-plugins/HISTORY
b/audio-drivers/alsa-plugins/HISTORY
index 65bc6b0..e5a1372 100644
--- a/audio-drivers/alsa-plugins/HISTORY
+++ b/audio-drivers/alsa-plugins/HISTORY
@@ -1,3 +1,9 @@
+2007-10-17 Pol Vinogradov <vin.public AT gmail.com>
+ * DETAILS: updated to 1.0.15
+
+2007-10-16 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * DEPENDS: added optional_depends on pulseaudio
+
2007-09-03 Pol Vinogradov <vin.public AT gmail.com>
* DETAILS: updated to 1.0.15rc1

diff --git a/audio-drivers/alsa-tools/DETAILS
b/audio-drivers/alsa-tools/DETAILS
index 3b5276d..c80e2bf 100755
--- a/audio-drivers/alsa-tools/DETAILS
+++ b/audio-drivers/alsa-tools/DETAILS
@@ -1,9 +1,9 @@
SPELL=alsa-tools
- VERSION=1.0.14
+ VERSION=1.0.15
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=ftp://ftp.alsa-project.org/pub/tools/$SOURCE
-
SOURCE_HASH=sha512:29e840392bec94cf448046a11d2816a89d606c8568ceb1a4ccc4995d261fd779bc90c77eb7476820b0e0027eaf04eebb55f520b2b12c418afaa85b4852ddf77a
+
SOURCE_HASH=sha512:468fa7510e4eb5fff64152d99498b20e726f1f3811a574623a39d080af75373df96f097e12be8a892efc51e361530a3007e5c29511b8ad0d790c1f7650702d77
WEB_SITE=http://www.alsa-project.org/
ENTERED=20040525
LICENSE[0]=GPL
diff --git a/audio-drivers/alsa-tools/HISTORY
b/audio-drivers/alsa-tools/HISTORY
index f5c03d6..fa81606 100644
--- a/audio-drivers/alsa-tools/HISTORY
+++ b/audio-drivers/alsa-tools/HISTORY
@@ -1,3 +1,6 @@
+2007-10-17 Pol Vinogradov <vin.public AT gmail.com>
+ * DETAILS: updated to 1.0.15
+
2007-06-12 Pol Vinogradov <vin.public AT gmail.com>
* DETAILS: updated to 1.0.14

diff --git a/audio-drivers/alsa-utils/DETAILS
b/audio-drivers/alsa-utils/DETAILS
index fa4adcd..4a26542 100755
--- a/audio-drivers/alsa-utils/DETAILS
+++ b/audio-drivers/alsa-utils/DETAILS
@@ -1,6 +1,6 @@
SPELL=alsa-utils
- VERSION=1.0.15rc1
-
SOURCE_HASH=sha512:541b320cf10b5db39969ee00dc2f96eecd1f27bad0639640e2e09023d53954268ca45928ae1e9da20d4ec2b43f4307d296955ed6584231528568c7b8c313da5d
+ VERSION=1.0.15
+
SOURCE_HASH=sha512:0b958af2a08740479579cdc30b86621f23b0f5c9ff630aba585743c659515ca4f26b6872af1f8d1bbeda579aef5913abeb8abf4acbf31b275e0790b4de3ff250
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=ftp://ftp.alsa-project.org/pub/utils/$SOURCE
diff --git a/audio-drivers/alsa-utils/HISTORY
b/audio-drivers/alsa-utils/HISTORY
index 629cf0b..d8a7914 100644
--- a/audio-drivers/alsa-utils/HISTORY
+++ b/audio-drivers/alsa-utils/HISTORY
@@ -1,3 +1,6 @@
+2007-10-17 Pol Vinogradov <vin.public AT gmail.com>
+ * DETAILS: updated to 1.0.15
+
2007-09-03 Pol Vinogradov <vin.public AT gmail.com>
* DETAILS: updated to 1.0.15rc1

diff --git a/audio-drivers/jackdmp/DETAILS b/audio-drivers/jackdmp/DETAILS
index 0b6711e..296695a 100755
--- a/audio-drivers/jackdmp/DETAILS
+++ b/audio-drivers/jackdmp/DETAILS
@@ -4,7 +4,7 @@
SOURCE_DIRECTORY="$BUILD_DIRECTORY/${SPELL}_$VERSION"
SOURCE_URL[0]=http://www.grame.fr/~letz/$SOURCE

SOURCE_HASH=sha512:ca2cafbfbd51e2ee7b7703272b8b0bb54ae76f4841863b93f43db28418bf096007e209525500df53bf93dc85a5c4723fdd510f6b068d602061309aefb48c1a06
- WEB_SITE=http://www.grame.fr/~letz/
+ WEB_SITE=http://www.grame.fr/~letz/jackdmp.html
ENTERED=20070319
LICENSE[0]=GPL
KEYWORDS="drivers audio"
diff --git a/audio-drivers/jackdmp/HISTORY b/audio-drivers/jackdmp/HISTORY
index 86a56f0..eb30391 100644
--- a/audio-drivers/jackdmp/HISTORY
+++ b/audio-drivers/jackdmp/HISTORY
@@ -1,3 +1,6 @@
+2007-10-03 Juuso Alasuutari <iuso AT sourcemage.org>
+ * DETAILS: Corrected WEB_SITE.
+
2007-09-28 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: Updated to 0.66.

diff --git a/audio-drivers/paprefs/DEPENDS b/audio-drivers/paprefs/DEPENDS
new file mode 100755
index 0000000..6c34946
--- /dev/null
+++ b/audio-drivers/paprefs/DEPENDS
@@ -0,0 +1,8 @@
+depends gtkmm2 &&
+depends libglademm &&
+depends gconfmm &&
+
+optional_depends lynx \
+ "--enable-lynx" \
+ "--disable-lynx" \
+ "Use lynx for documentation generation?"
diff --git a/audio-drivers/paprefs/DETAILS b/audio-drivers/paprefs/DETAILS
new file mode 100755
index 0000000..163628f
--- /dev/null
+++ b/audio-drivers/paprefs/DETAILS
@@ -0,0 +1,14 @@
+ SPELL=paprefs
+ VERSION=0.9.6
+ SOURCE=$SPELL-$VERSION.tar.gz
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+ SOURCE_URL[0]=http://0pointer.de/lennart/projects/paprefs/$SOURCE
+ WEB_SITE=http://0pointer.de/lennart/projects/paprefs/
+ SOURCE_GPG=gurus.gpg:$SOURCE.sig:WORKS_FOR_ME
+ LICENSE[0]=GPL
+ ENTERED=20071016
+ SHORT="a simple GTK based configuration dialog for the PulseAudio
sound server"
+cat << EOF
+PulseAudio Preferences (paprefs) is a simple GTK based configuration dialog
for
+the PulseAudio sound server.
+EOF
diff --git a/audio-drivers/paprefs/HISTORY b/audio-drivers/paprefs/HISTORY
new file mode 100644
index 0000000..e8fff32
--- /dev/null
+++ b/audio-drivers/paprefs/HISTORY
@@ -0,0 +1,9 @@
+2007-11-03 Robin Cook <rcook AT wyrms.net>
+ * DEPENDS: added lynx as optional depends
+
+2007-11-01 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * DETAILS: updated to 0.9.6
+
+2007-10-16 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * DEPENDS, DETAILS, HISTORY: created this spell
+
diff --git a/audio-drivers/paprefs/paprefs-0.9.6.tar.gz.sig
b/audio-drivers/paprefs/paprefs-0.9.6.tar.gz.sig
new file mode 100644
index 0000000..ef3e705
Binary files /dev/null and b/audio-drivers/paprefs/paprefs-0.9.6.tar.gz.sig
differ
diff --git a/audio-drivers/pavucontrol/DEPENDS
b/audio-drivers/pavucontrol/DEPENDS
new file mode 100755
index 0000000..328eadb
--- /dev/null
+++ b/audio-drivers/pavucontrol/DEPENDS
@@ -0,0 +1,9 @@
+depends libglademm &&
+depends gtkmm2 &&
+depends pulseaudio &&
+
+optional_depends lynx \
+ "--enable-lynx" \
+ "--disable-lynx" \
+ "Use lynx for documentation generation?"
+
diff --git a/audio-drivers/pavucontrol/DETAILS
b/audio-drivers/pavucontrol/DETAILS
new file mode 100755
index 0000000..cce32bd
--- /dev/null
+++ b/audio-drivers/pavucontrol/DETAILS
@@ -0,0 +1,16 @@
+ SPELL=pavucontrol
+ VERSION=0.9.5
+ SOURCE=$SPELL-$VERSION.tar.gz
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+ SOURCE_URL[0]=http://0pointer.de/lennart/projects/pavucontrol/$SOURCE
+ WEB_SITE=http://0pointer.de/lennart/projects/pavucontrol/
+ SOURCE_GPG=gurus.gpg:$SOURCE.sig:WORKS_FOR_ME
+ LICENSE[0]=GPL
+ ENTERED=20071016
+ SHORT="a simple GTK based volume control tool for the PulseAudio
sound server"
+cat << EOF
+PulseAudio Volume Control (pavucontrol) is a simple GTK based volume control
+tool ("mixer") for the PulseAudio sound server. In contrast to classic mixer
+tools this one allows you to control both the volume of hardware devices and
of
+each playback stream seperately.
+EOF
diff --git a/audio-drivers/pavucontrol/HISTORY
b/audio-drivers/pavucontrol/HISTORY
new file mode 100644
index 0000000..4915e95
--- /dev/null
+++ b/audio-drivers/pavucontrol/HISTORY
@@ -0,0 +1,9 @@
+2007-11-03 Robin Cook <rcook AT wyrms.net>
+ * DEPENDS: added lynx as optional depends
+
+2007-11-01 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * DETAILS: updated to 0.9.5
+
+2007-10-16 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * DEPENDS, DETAILS, HISTORY: created this spell
+
diff --git a/audio-drivers/pavucontrol/pavucontrol-0.9.5.tar.gz.sig
b/audio-drivers/pavucontrol/pavucontrol-0.9.5.tar.gz.sig
new file mode 100644
index 0000000..3f0ca8e
Binary files /dev/null and
b/audio-drivers/pavucontrol/pavucontrol-0.9.5.tar.gz.sig differ
diff --git a/audio-drivers/pulseaudio/DEPENDS
b/audio-drivers/pulseaudio/DEPENDS
index 164f821..53cfd8d 100755
--- a/audio-drivers/pulseaudio/DEPENDS
+++ b/audio-drivers/pulseaudio/DEPENDS
@@ -1,6 +1,7 @@
depends liboil &&
depends libsamplerate &&
depends libsndfile &&
+depends libatomic_ops &&
optional_depends hal \
"--enable-hal" \
"--disable-hal" \
diff --git a/audio-drivers/pulseaudio/DETAILS
b/audio-drivers/pulseaudio/DETAILS
index da74490..728e7ad 100755
--- a/audio-drivers/pulseaudio/DETAILS
+++ b/audio-drivers/pulseaudio/DETAILS
@@ -1,5 +1,5 @@
SPELL=pulseaudio
- VERSION=0.9.5
+ VERSION=0.9.7
SOURCE=${SPELL}-${VERSION}.tar.gz
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
SOURCE_URL=http://0pointer.de/lennart/projects/${SPELL}/${SOURCE}
diff --git a/audio-drivers/pulseaudio/HISTORY
b/audio-drivers/pulseaudio/HISTORY
index fa34aa6..65b53e2 100644
--- a/audio-drivers/pulseaudio/HISTORY
+++ b/audio-drivers/pulseaudio/HISTORY
@@ -1,2 +1,9 @@
+2007-11-01 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * DETAILS: updated to 0.9.7
+
+2007-10-16 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * DETAILS: updated to 0.9.6
+ * DEPENDS: added libatomic_ops
+
2007-05-04 Pieter Lenaerts <e-type AT sourcemage.org>
* DETAILS, DEPENDS, HISTORY: created spell
diff --git a/audio-drivers/pulseaudio/pulseaudio-0.9.5.tar.gz.sig
b/audio-drivers/pulseaudio/pulseaudio-0.9.5.tar.gz.sig
deleted file mode 100644
index b93e29d..0000000
Binary files a/audio-drivers/pulseaudio/pulseaudio-0.9.5.tar.gz.sig and
/dev/null differ
diff --git a/audio-drivers/pulseaudio/pulseaudio-0.9.7.tar.gz.sig
b/audio-drivers/pulseaudio/pulseaudio-0.9.7.tar.gz.sig
new file mode 100644
index 0000000..78c28ec
Binary files /dev/null and
b/audio-drivers/pulseaudio/pulseaudio-0.9.7.tar.gz.sig differ
diff --git a/audio-drivers/pyalsa/DETAILS b/audio-drivers/pyalsa/DETAILS
index 061ecc5..49de36d 100755
--- a/audio-drivers/pyalsa/DETAILS
+++ b/audio-drivers/pyalsa/DETAILS
@@ -1,9 +1,9 @@
SPELL=pyalsa
- VERSION=1.0.15rc1
+ VERSION=1.0.15
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=ftp://ftp.alsa-project.org/pub/$SPELL/$SOURCE
-
SOURCE_HASH=sha512:c14d739be9e2aa11603b112362776a8438f8f10cb3807e4f291d9ad18520f9ad4c5797a9dff8a88775688e62a5fcda226a958604ae44e59d84abe1345f910155
+
SOURCE_HASH=sha512:88aa8c26f9a96be4cbfa02f2234e48539fae8f79b30f4fcbb2a978e89c4759c3ae029478652327217709d9df3a9a54575ea3dea920a2e37107aa704ef2e9fbe7
WEB_SITE=http://www.alsa-project.org/
ENTERED=20070612
LICENSE[0]=GPL
diff --git a/audio-drivers/pyalsa/HISTORY b/audio-drivers/pyalsa/HISTORY
index 40c66e0..095d3ec 100644
--- a/audio-drivers/pyalsa/HISTORY
+++ b/audio-drivers/pyalsa/HISTORY
@@ -1,3 +1,6 @@
+2007-10-17 Pol Vinogradov <vin.public AT gmail.com>
+ * DETAILS: updated to 1.0.15
+
2007-09-03 Pol Vinogradov <vin.public AT gmail.com>
* DETAILS: updated to 1.0.15rc1

diff --git a/audio-libs/faac/DETAILS b/audio-libs/faac/DETAILS
index a5b03c1..e52ad66 100755
--- a/audio-libs/faac/DETAILS
+++ b/audio-libs/faac/DETAILS
@@ -1,9 +1,9 @@
SPELL=faac
- VERSION=1.24
+ VERSION=1.26
+
SOURCE_HASH=sha512:b765af2b61cd56468c635c2973f5addec5a0fa6e47bb677e82f14bf4669b3028d74bcb3b62e4f281a9c7c6fd27e2848bcb291beb6ffb4626eae7b34e9e61f7ca
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL
SOURCE_URL[0]=${SOURCEFORGE_URL}/faac/$SOURCE
-
SOURCE_HASH=sha512:56d66d65a433a69c5c294ec3a50cde4900dbd8fd1242f5091e8e1213c572f654ae58ff1d9f39aa726dd7ca59322da6e09410b670eb8965f023820a364370b068
WEB_SITE=http://www.audiocoding.com/
LICENSE[0]=LGPL
ENTERED=20060801
diff --git a/audio-libs/faac/HISTORY b/audio-libs/faac/HISTORY
index 1d0baae..77ffa01 100644
--- a/audio-libs/faac/HISTORY
+++ b/audio-libs/faac/HISTORY
@@ -1,2 +1,5 @@
+2007-11-04 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.26
+
2006-07-31 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: new WEB_SITE
diff --git a/audio-libs/faad2/DETAILS b/audio-libs/faad2/DETAILS
index d4e9b64..196fbe9 100755
--- a/audio-libs/faad2/DETAILS
+++ b/audio-libs/faad2/DETAILS
@@ -11,15 +11,13 @@ if [ "$FAAD_CVS" = "y" ]; then
FORCE_DOWNLOAD=on
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-cvs
else
- VERSION=2.0
+ VERSION=2.6.1
+
SOURCE_HASH=sha512:19d0158f22e49de0337850bf9ecd2497e84c33a6aa341c0db4cec31ab4f3b612320054abab414a77a34f928aedc1dfc9d3dc8a18efb82e5dfc1dbce961e4cb0a
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL
SOURCE_URL[0]=${SOURCEFORGE_URL}/faac/$SOURCE
-
SOURCE_HASH=sha512:b4e027df5a5f4bd464307d79c56e81f98f956635107407a01f4eb2138fd7a6b6b91651bbe4d888e3c6aa6b0a57981f36627ef208d947c2d4d1d4573432d2fbe8
-# GCC_VERSION=3.4
fi
WEB_SITE=http://www.audiocoding.com/
-# GCC_VERSION=3.4
LICENSE[0]=GPL
ENTERED=20030203
KEYWORDS="iso audio libs"
diff --git a/audio-libs/faad2/HISTORY b/audio-libs/faad2/HISTORY
index 14004d0..4acb6dc 100644
--- a/audio-libs/faad2/HISTORY
+++ b/audio-libs/faad2/HISTORY
@@ -1,3 +1,8 @@
+2007-11-04 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 2.6.1
+ * PRE_BUILD: disable some patching
+ * mk.diff: deleted
+
2007-09-29 Arwed v. Merkatz <v.merkatz AT gmx.net>
* CONFLICTS: conflict with self, otherwise it fails when it was
previously built using gcc 3.4
diff --git a/audio-libs/faad2/PRE_BUILD b/audio-libs/faad2/PRE_BUILD
index 8710950..321a97b 100755
--- a/audio-libs/faad2/PRE_BUILD
+++ b/audio-libs/faad2/PRE_BUILD
@@ -1,11 +1,4 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&
-if [ "$FAAD_CVS" = "n" ]; then
-# patch -p0 < ${SCRIPT_DIRECTORY}/Makefile.am.patch &&
-# patch -p0 < ${SCRIPT_DIRECTORY}/gcc-3.4.patch
- patch -p1 < ${SCRIPT_DIRECTORY}/mk.diff
-else
- patch -p1 < ${SCRIPT_DIRECTORY}/faad2-enable-drm.patch &&
- sedit '45i#include <stdarg.h>' frontend/main.c
-fi &&
+patch -p1 < ${SCRIPT_DIRECTORY}/faad2-enable-drm.patch &&
/bin/sh ./bootstrap
diff --git a/audio-libs/faad2/mk.diff b/audio-libs/faad2/mk.diff
deleted file mode 100644
index 9539860..0000000
--- a/audio-libs/faad2/mk.diff
+++ /dev/null
@@ -1,76 +0,0 @@
-diff -uNr faad2/common/mp4ff/mp4ff.c faad2.cp/common/mp4ff/mp4ff.c
---- faad2/common/mp4ff/mp4ff.c 2004-01-11 16:52:18.000000000 +0100
-+++ faad2.cp/common/mp4ff/mp4ff.c 2006-07-31 22:47:13.000000000 +0200
-@@ -87,7 +87,7 @@
- if (ff) free(ff);
- }
-
--static void mp4ff_track_add(mp4ff_t *f)
-+void mp4ff_track_add(mp4ff_t *f)
- {
- f->total_tracks++;
-
-diff -uNr faad2/common/mp4v2/mp4property.h
faad2.cp/common/mp4v2/mp4property.h
---- faad2/common/mp4v2/mp4property.h 2003-06-29 23:41:00.000000000 +0200
-+++ faad2.cp/common/mp4v2/mp4property.h 2006-07-31 22:44:42.000000000
+0200
-@@ -58,7 +58,7 @@
- return m_name;
- }
-
-- virtual MP4PropertyType GetType() = NULL;
-+ virtual MP4PropertyType GetType() = 0;
-
- bool IsReadOnly() {
- return m_readOnly;
-@@ -74,17 +74,17 @@
- m_implicit = value;
- }
-
-- virtual u_int32_t GetCount() = NULL;
-- virtual void SetCount(u_int32_t count) = NULL;
-+ virtual u_int32_t GetCount() = 0;
-+ virtual void SetCount(u_int32_t count) = 0;
-
- virtual void Generate() { /* default is a no-op */ };
-
-- virtual void Read(MP4File* pFile, u_int32_t index = 0) = NULL;
-+ virtual void Read(MP4File* pFile, u_int32_t index = 0) = 0;
-
-- virtual void Write(MP4File* pFile, u_int32_t index = 0) = NULL;
-+ virtual void Write(MP4File* pFile, u_int32_t index = 0) = 0;
-
- virtual void Dump(FILE* pFile, u_int8_t indent,
-- bool dumpImplicits, u_int32_t index = 0) = NULL;
-+ bool dumpImplicits, u_int32_t index = 0) = 0;
-
- virtual bool FindProperty(const char* name,
- MP4Property** ppProperty, u_int32_t* pIndex = NULL);
-diff -uNr faad2/common/mp4v2/rtphint.h faad2.cp/common/mp4v2/rtphint.h
---- faad2/common/mp4v2/rtphint.h 2003-06-29 23:41:00.000000000 +0200
-+++ faad2.cp/common/mp4v2/rtphint.h 2006-07-31 22:44:42.000000000 +0200
-@@ -35,8 +35,8 @@
- return m_pPacket;
- }
-
-- virtual u_int16_t GetDataSize() = NULL;
-- virtual void GetData(u_int8_t* pDest) = NULL;
-+ virtual u_int16_t GetDataSize() = 0;
-+ virtual void GetData(u_int8_t* pDest) = 0;
-
- MP4Track* FindTrackFromRefIndex(u_int8_t refIndex);
-
-diff -uNr faad2/Makefile.am faad2.cp/Makefile.am
---- faad2/Makefile.am 2004-02-06 17:04:39.000000000 +0100
-+++ faad2.cp/Makefile.am 2006-07-31 22:44:34.000000000 +0200
-@@ -2,7 +2,7 @@
-
- EXTRA_DIST = faad2.spec
-
--rpm: Makefile
-- make dist
-- $(RPMBUILD) -ta $(PACKAGE)-$(VERSION).tar.gz
-- rm $(PACKAGE)-$(VERSION).tar.gz
-+rpm: Makefile
-+ make dist
-+ $(RPMBUILD) -ta $(PACKAGE)-$(VERSION).tar.gz
-+ rm $(PACKAGE)-$(VERSION).tar.gz
diff --git a/audio-libs/libmp3splt/DEPENDS b/audio-libs/libmp3splt/DEPENDS
new file mode 100755
index 0000000..6fe3ed5
--- /dev/null
+++ b/audio-libs/libmp3splt/DEPENDS
@@ -0,0 +1,13 @@
+depends libmad &&
+optional_depends libogg \
+ "--enable-ogg" \
+ "--disable-ogg" \
+ "Enable Ogg/Vorbis support" &&
+. $GRIMOIRE/is_depends_enabled.function
+if is_depends_enabled $SPELL libogg ; then
+depends libvorbis
+fi &&
+optional_depends libid3tag \
+ "--enable-id3tag" \
+ "--disable-id3tag" \
+ "Enable id3tag support(to preserve tags)"
diff --git a/audio-libs/libmp3splt/DETAILS b/audio-libs/libmp3splt/DETAILS
new file mode 100755
index 0000000..41872e1
--- /dev/null
+++ b/audio-libs/libmp3splt/DETAILS
@@ -0,0 +1,13 @@
+ SPELL=libmp3splt
+ VERSION=0.4_rc1
+ SOURCE="${SPELL}-${VERSION}.tar.gz"
+ SOURCE_URL[0]=$SOURCEFORGE_URL/mp3splt/${SOURCE}
+
SOURCE_HASH=sha512:9595541d3b329c12c20090d33a745f7a3d5ef7d7de80762add2a94c1ca755113ee503584041e1563753f68e068ebb0cbd79893f3c4b3f428a8a77d0c90dd6e7a
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
+ WEB_SITE="http://mp3splt.sourceforge.net/";
+ LICENSE[0]=GPL
+ ENTERED=20071018
+ SHORT="Libmp3splt is a library created from mp3splt version 2.1c."
+cat << EOF
+Libmp3splt is a library created from mp3splt version 2.1c.
+EOF
diff --git a/audio-libs/libmp3splt/HISTORY b/audio-libs/libmp3splt/HISTORY
new file mode 100644
index 0000000..ec26c23
--- /dev/null
+++ b/audio-libs/libmp3splt/HISTORY
@@ -0,0 +1,2 @@
+2007-10-18 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
+ * DETAILS, DEPENDS, HISTORY: created spell
diff --git a/audio-libs/openal/BUILD b/audio-libs/openal/BUILD
index cae4399..15203e4 100755
--- a/audio-libs/openal/BUILD
+++ b/audio-libs/openal/BUILD
@@ -1,4 +1,6 @@
-if [[ $OPENAL_VERSION != release ]]; then
-cd linux
+if [[ $OPENAL_VERSION == snapshot ]]; then
+ cd linux
+elif [[ $OPENAL_VERSION == scm ]]; then
+ cd OpenAL-Sample
fi &&
default_build
diff --git a/audio-libs/openal/DEPENDS b/audio-libs/openal/DEPENDS
index e1fb913..4fcdce1 100755
--- a/audio-libs/openal/DEPENDS
+++ b/audio-libs/openal/DEPENDS
@@ -1,5 +1,5 @@
if [[ "$OPENAL_VERSION" == "scm" ]] ; then
-depends CVS
+ depends subversion
fi &&
depends autoconf &&
depends automake &&
diff --git a/audio-libs/openal/DETAILS b/audio-libs/openal/DETAILS
index 0a3d385..812f7be 100755
--- a/audio-libs/openal/DETAILS
+++ b/audio-libs/openal/DETAILS
@@ -5,9 +5,9 @@ if [[ "$OPENAL_VERSION" == "scm" ]] ; then
else
VERSION=scm
fi
- SOURCE=${SPELL}_cvs-src.tar.bz2
-SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}_cvs-src
-
SOURCE_URL[0]=cvs://:pserver:guest:guest AT opensource.creative.com:/usr/local/cvs-repository:openal
+ SOURCE=${SPELL}_svn-src.tar.bz2
+SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}_svn-src
+ SOURCE_URL[0]=svn_http://www.openal.org/repos/openal/trunk:openal
SOURCE_IGNORE=volatile
FORCE_DOWNLOAD=1
elif [[ "$OPENAL_VERSION" == "release" ]]; then
@@ -23,7 +23,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELL}-${VERSION}
SOURCE_URL[0]=http://download.sourcemage.org/mirror/${SOURCE}
SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
fi
- PATCHLEVEL=1
+ PATCHLEVEL=2
WEB_SITE=http://www.openal.org/
LICENSE[0]=LGPL
ENTERED=20030508
diff --git a/audio-libs/openal/HISTORY b/audio-libs/openal/HISTORY
index 69c9594..669a529 100644
--- a/audio-libs/openal/HISTORY
+++ b/audio-libs/openal/HISTORY
@@ -1,3 +1,14 @@
+2007-11-28 Eric Sandall <sandalle AT sourcemage.org>
+ * PRE_BUILD: Only apply gcc42.patch for $OPENAL_VERSION=release
+ See Bug #14126
+
+2007-11-11 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * PRE_BUILD, gcc42.patch: fix gcc 4.2 problem
+ * BUILD, PRE_BUILD: cd to the correct dir
+ * DEPENDS: cvs -> subversion
+ * DETAILS: fixed SOURCE*, they moved to svn
+ PATCHLEVEL++
+
2007-04-22 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
* PREPARE: pick 3 different versions
* BUILD: support for 3 versions
diff --git a/audio-libs/openal/PRE_BUILD b/audio-libs/openal/PRE_BUILD
index bda55a1..1d69f5c 100755
--- a/audio-libs/openal/PRE_BUILD
+++ b/audio-libs/openal/PRE_BUILD
@@ -1,7 +1,14 @@
default_pre_build &&
-if [[ $OPENAL_VERSION != release ]] ; then
-cd ${SOURCE_DIRECTORY} &&
-rm -rf `find -type d -name CVS` &&
-cd linux &&
-NOCONFIGURE=Y ./autogen.sh
+cd $SOURCE_DIRECTORY &&
+if [[ $OPENAL_VERSION == snapshot ]]; then
+ rm -rf `find -type d -name CVS` &&
+ cd linux &&
+ NOCONFIGURE=Y ./autogen.sh
+elif [[ $OPENAL_VERSION == scm ]]; then
+ rm -rf `find -type d -name .svn` &&
+ cd OpenAL-Sample &&
+ NOCONFIGURE=Y ./autogen.sh
+fi &&
+if [[ $OPENAL_VERSION == release ]]; then
+ patch -p1 < $SCRIPT_DIRECTORY/gcc42.patch
fi
diff --git a/audio-libs/openal/gcc42.patch b/audio-libs/openal/gcc42.patch
new file mode 100644
index 0000000..b921e8c
--- /dev/null
+++ b/audio-libs/openal/gcc42.patch
@@ -0,0 +1,21 @@
+diff -Naur openal-0.0.8-orig/common/include/AL/alc.h
openal-0.0.8/common/include/AL/alc.h
+--- openal-0.0.8-orig/common/include/AL/alc.h 2006-02-11 03:36:55.000000000
-0600
++++ openal-0.0.8/common/include/AL/alc.h 2007-02-13 14:33:57.000000000
-0600
+@@ -187,7 +187,7 @@
+
+ ALC_API void ALC_APIENTRY alcDestroyContext( ALCcontext *context
);
+
+-ALC_API ALCcontext * ALC_APIENTRY alcGetCurrentContext( ALCvoid );
++ALC_API ALCcontext * ALC_APIENTRY alcGetCurrentContext( void );
+
+ ALC_API ALCdevice* ALC_APIENTRY alcGetContextsDevice( ALCcontext
*context );
+
+@@ -248,7 +248,7 @@
+ typedef void (ALC_APIENTRY *LPALCPROCESSCONTEXT)( ALCcontext
*context );
+ typedef void (ALC_APIENTRY *LPALCSUSPENDCONTEXT)( ALCcontext
*context );
+ typedef void (ALC_APIENTRY *LPALCDESTROYCONTEXT)( ALCcontext
*context );
+-typedef ALCcontext * (ALC_APIENTRY *LPALCGETCURRENTCONTEXT)( ALCvoid );
++typedef ALCcontext * (ALC_APIENTRY *LPALCGETCURRENTCONTEXT)( void );
+ typedef ALCdevice * (ALC_APIENTRY *LPALCGETCONTEXTSDEVICE)( ALCcontext
*context );
+ typedef ALCdevice * (ALC_APIENTRY *LPALCOPENDEVICE)( const ALCchar
*devicename );
+ typedef ALCboolean (ALC_APIENTRY *LPALCCLOSEDEVICE)( ALCdevice *device
);
diff --git a/audio-players/alsaplayer/DEPENDS
b/audio-players/alsaplayer/DEPENDS
index abd9a3c..e0b2c96 100755
--- a/audio-players/alsaplayer/DEPENDS
+++ b/audio-players/alsaplayer/DEPENDS
@@ -45,7 +45,7 @@ optional_depends flac \
"--disable-flac" \
"to play flac files" &&

-. "$GRIMOIRE/is_depends_enabled.function" &&
+#. "$GRIMOIRE/is_depends_enabled.function" &&
if is_depends_enabled $SPELL flac
then
config_query_option APLAYER_OGGFLAC \
diff --git a/audio-players/alsaplayer/DETAILS
b/audio-players/alsaplayer/DETAILS
index 5bbc13b..d9c01bc 100755
--- a/audio-players/alsaplayer/DETAILS
+++ b/audio-players/alsaplayer/DETAILS
@@ -1,9 +1,9 @@
SPELL=alsaplayer
- VERSION=0.99.79
+ VERSION=0.99.80
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
- SOURCE_URL[0]=http://www.alsaplayer.org/$SOURCE
-
SOURCE_HASH=sha512:fae3f896e22c8c5c037f42e4999be9cc8038b6084bd7bb1a6bcb4c68b3329bf1865df2933272e0753f700c0a33e9b63ed7b2205ba39cbfbf4d99f3323b84d28a
+ SOURCE_URL[0]=$SOURCEFORGE_URL/alsaplayer/$SOURCE
+
SOURCE_HASH=sha512:e15ff98a1c2f40a39dda68629dd0c3be91a15793baaa6fa3a5db65a1f40626e0ba0faca5c732203a6ac20de2f31af8cba7e85e398c1880864779f30ed51e7740
WEB_SITE=http://www.alsaplayer.org
ENTERED=20010922
LICENSE[0]=GPL
diff --git a/audio-players/alsaplayer/HISTORY
b/audio-players/alsaplayer/HISTORY
index fee287d..22ee4d7 100644
--- a/audio-players/alsaplayer/HISTORY
+++ b/audio-players/alsaplayer/HISTORY
@@ -1,3 +1,9 @@
+2007-11-06 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 0.99.80
+
+2007-10-07 Mathieu Lonjaret <lejatorn AT sourcemage.org>
+ * DETAILS: 0.99.80-rc3
+
2007-05-22 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 0.99.79

diff --git a/audio-players/bmpx/DETAILS b/audio-players/bmpx/DETAILS
index b0f1bcd..2b2839c 100755
--- a/audio-players/bmpx/DETAILS
+++ b/audio-players/bmpx/DETAILS
@@ -1,10 +1,10 @@
SPELL=bmpx
- VERSION=0.40.10
+ VERSION=0.40.13
BRANCH=`echo ${VERSION}|cut -d . -f 1,2`
SOURCE=bmpx-${VERSION}.tar.bz2
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}

SOURCE_URL[0]=http://files.beep-media-player.org/releases/${BRANCH}/${SOURCE}
-
SOURCE_HASH=sha512:9d8738d55100320256324b5961654f0694450254db7845e8b702c3022e5c79dc79f0b8c8cf4e391071f00fd97864c9357f38f47a3ab4411dfbc13afd01271805
+
SOURCE_HASH=sha512:f90f391d14d4c76d81e3f56e9c37bb049c51a0ac607c1bce1ea36aea2a12988ac3afe4966cc48b3ade5642dfc1d070c98417c4576e265440d1c438d13a27cc72
# SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
LICENSE[0]=GPL
WEB_SITE=http://beep-media-player.org/index.php/BMPx_Homepage
diff --git a/audio-players/bmpx/HISTORY b/audio-players/bmpx/HISTORY
index 45e3465..12e15df 100644
--- a/audio-players/bmpx/HISTORY
+++ b/audio-players/bmpx/HISTORY
@@ -1,3 +1,6 @@
+2007-10-19 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 0.40.13
+
2007-10-01 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 0.40.10

diff --git a/audio-players/mp3splt/DEPENDS b/audio-players/mp3splt/DEPENDS
index b6de5d0..bf52b67 100755
--- a/audio-players/mp3splt/DEPENDS
+++ b/audio-players/mp3splt/DEPENDS
@@ -1,4 +1 @@
-depends gcc34 &&
-depends libogg &&
-depends libvorbis &&
-depends libmad
+depends libmp3splt
diff --git a/audio-players/mp3splt/DETAILS b/audio-players/mp3splt/DETAILS
index 668ce49..4caf485 100755
--- a/audio-players/mp3splt/DETAILS
+++ b/audio-players/mp3splt/DETAILS
@@ -1,12 +1,11 @@
SPELL=mp3splt
- VERSION=2.1
- GCC_VERSION=34
- SOURCE=${SPELL}-${VERSION}-src.tar.gz
+ VERSION=2.2_rc1
+ SOURCE=${SPELL}-${VERSION}.tar.gz
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
SOURCE_URL[0]=${SOURCEFORGE_URL}/${SPELL}/${SOURCE}
WEB_SITE=http://mp3splt.sourceforge.net/
ENTERED=20050118
-
SOURCE_HASH=sha512:196059a609ad5cd65c5e2c7cd8c4ffe4050d8ace3e6920442d5e31bc515a5589143b737ce8fc5e0e8cd239272737eb84f955b63c8bad56431a002d8a23a26179
+
SOURCE_HASH=sha512:af1b2f883990b5dded597c38ba406413942b1d310c1d6b5f2b1db58b7080e070c70a6a4fb0a40b12dc7ec9f3df7ff9d526370c98d3a98f5e5137a6500ef2bd42
LICENSE[0]=GPL
KEYWORDS="players audio"
SHORT="split large mp3/ogg to make smaller files or to split
entire albums"
diff --git a/audio-players/mp3splt/HISTORY b/audio-players/mp3splt/HISTORY
index 2f55d0b..77ac667 100644
--- a/audio-players/mp3splt/HISTORY
+++ b/audio-players/mp3splt/HISTORY
@@ -1,3 +1,8 @@
+2007-10-18 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
+ * DETAILS: Fixed SOURCE_URL[0]
+ updated spell to 2.2_rc1
+ * DEPENDS: depen on libmp3splt
+
2006-10-03 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: [automated] Removed UPDATED.

diff --git a/audio-players/sound-juicer/DETAILS
b/audio-players/sound-juicer/DETAILS
index 25b4119..337185b 100755
--- a/audio-players/sound-juicer/DETAILS
+++ b/audio-players/sound-juicer/DETAILS
@@ -1,5 +1,5 @@
SPELL=sound-juicer
- VERSION=2.20.0
+ VERSION=2.20.1
BRANCH=$(echo $VERSION|cut -d. -f1,2)
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/audio-players/sound-juicer/HISTORY
b/audio-players/sound-juicer/HISTORY
index 197f1c1..b91a69d 100644
--- a/audio-players/sound-juicer/HISTORY
+++ b/audio-players/sound-juicer/HISTORY
@@ -1,3 +1,6 @@
+2007-10-18 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 2.20.1
+
2007-09-21 Robin Cook <rcook AT wyrms.net>
* DETAILS: updated VERSION to 2.20.0

diff --git a/audio-players/sound-juicer/sound-juicer-2.20.0.tar.gz.sig
b/audio-players/sound-juicer/sound-juicer-2.20.0.tar.gz.sig
deleted file mode 100644
index 8831391..0000000
Binary files a/audio-players/sound-juicer/sound-juicer-2.20.0.tar.gz.sig and
/dev/null differ
diff --git a/audio-players/sound-juicer/sound-juicer-2.20.1.tar.gz.sig
b/audio-players/sound-juicer/sound-juicer-2.20.1.tar.gz.sig
new file mode 100644
index 0000000..f0e84ca
Binary files /dev/null and
b/audio-players/sound-juicer/sound-juicer-2.20.1.tar.gz.sig differ
diff --git a/audio-players/xmms2/HISTORY b/audio-players/xmms2/HISTORY
index 51b6d6d..c4a7860 100644
--- a/audio-players/xmms2/HISTORY
+++ b/audio-players/xmms2/HISTORY
@@ -1,3 +1,6 @@
+2007-11-04 Arjan Bouter <abouter AT sourcemage.org>
+ * PRE_BUILD: fixed ecore_config naming
+
2007-05-21 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
* DETAILS: final version update to 0.2DrJekyll

diff --git a/audio-players/xmms2/PRE_BUILD b/audio-players/xmms2/PRE_BUILD
index 4735a7e..4e55e54 100755
--- a/audio-players/xmms2/PRE_BUILD
+++ b/audio-players/xmms2/PRE_BUILD
@@ -4,4 +4,4 @@ unpack_file &&
cd xmms* &&
sedit "230s:.*: conf.env[\"CCFLAGS\"] =
Utils.to_list(conf.env[\"CFLAGS\"]):" wscript
sedit "231s:.*: conf.env[\"CXXFLAGS\"] =
Utils.to_list(conf.env[\"CXXFLAGS\"]):" wscript
-
+sedit 's#ecore-config#ecore_config#' src/clients/lib/xmmsclient-ecore/wscript
diff --git a/audio-plugins/gst-pulse/DEPENDS b/audio-plugins/gst-pulse/DEPENDS
new file mode 100755
index 0000000..ad0b387
--- /dev/null
+++ b/audio-plugins/gst-pulse/DEPENDS
@@ -0,0 +1,8 @@
+depends pulseaudio &&
+depends gst-plugins-base &&
+
+optional_depends lynx \
+ "--enable-lynx" \
+ "--disable-lynx" \
+ "Use lynx for documentation generation?"
+
diff --git a/audio-plugins/gst-pulse/DETAILS b/audio-plugins/gst-pulse/DETAILS
new file mode 100755
index 0000000..01aa359
--- /dev/null
+++ b/audio-plugins/gst-pulse/DETAILS
@@ -0,0 +1,13 @@
+ SPELL=gst-pulse
+ VERSION=0.9.5
+ SOURCE=$SPELL-$VERSION.tar.gz
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+ SOURCE_URL[0]=http://0pointer.de/lennart/projects/gst-pulse/$SOURCE
+ WEB_SITE=http://0pointer.de/lennart/projects/gst-pulse/
+ SOURCE_GPG=gurus.gpg:$SOURCE.sig:WORKS_FOR_ME
+ LICENSE[0]=GPL
+ ENTERED=20071016
+ SHORT="a GStreamer 0.10 plugin for the PulseAudio sound server"
+cat << EOF
+gst-pulse is a GStreamer 0.10 plugin for the PulseAudio sound server.
+EOF
diff --git a/audio-plugins/gst-pulse/HISTORY b/audio-plugins/gst-pulse/HISTORY
new file mode 100644
index 0000000..f921da3
--- /dev/null
+++ b/audio-plugins/gst-pulse/HISTORY
@@ -0,0 +1,9 @@
+2007-11-03 Robin Cook <rcook AT wyrms.net>
+ * DEPENDS: added lynx as optional depends
+
+2007-11-01 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * DETAILS: updated to 0.9.5
+
+2007-10-16 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * DEPENDS, DETAILS, HISTORY: created this spell
+
diff --git a/audio-plugins/gst-pulse/gst-pulse-0.9.5.tar.gz.sig
b/audio-plugins/gst-pulse/gst-pulse-0.9.5.tar.gz.sig
new file mode 100644
index 0000000..0c76c02
Binary files /dev/null and
b/audio-plugins/gst-pulse/gst-pulse-0.9.5.tar.gz.sig differ
diff --git a/audio-plugins/xmms-pulse/DEPENDS
b/audio-plugins/xmms-pulse/DEPENDS
new file mode 100755
index 0000000..db4f9fd
--- /dev/null
+++ b/audio-plugins/xmms-pulse/DEPENDS
@@ -0,0 +1,2 @@
+depends xmms &&
+depends pulseaudio
diff --git a/audio-plugins/xmms-pulse/DETAILS
b/audio-plugins/xmms-pulse/DETAILS
new file mode 100755
index 0000000..0eff9cb
--- /dev/null
+++ b/audio-plugins/xmms-pulse/DETAILS
@@ -0,0 +1,13 @@
+ SPELL=xmms-pulse
+ VERSION=0.9.4
+ SOURCE=$SPELL-$VERSION.tar.gz
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+ SOURCE_URL[0]=http://0pointer.de/lennart/projects/xmms-pulse/$SOURCE
+ WEB_SITE=http://0pointer.de/lennart/projects/xmms-pulse/
+ SOURCE_GPG=gurus.gpg:$SOURCE.sig:WORKS_FOR_ME
+ LICENSE[0]=GPL
+ ENTERED=20071016
+ SHORT="a XMMS output plugin for the PulseAudio sound server"
+cat << EOF
+xmms-pulse is a XMMS output plugin for the PulseAudio sound server.
+EOF
diff --git a/audio-plugins/xmms-pulse/HISTORY
b/audio-plugins/xmms-pulse/HISTORY
new file mode 100644
index 0000000..2f87229
--- /dev/null
+++ b/audio-plugins/xmms-pulse/HISTORY
@@ -0,0 +1,6 @@
+2007-11-01 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * DETAILS: updated to 0.9.4
+
+2007-10-16 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * DEPENDS, DETAILS, HISTORY: created this spell
+
diff --git a/audio-plugins/xmms-pulse/xmms-pulse-0.9.4.tar.gz.sig
b/audio-plugins/xmms-pulse/xmms-pulse-0.9.4.tar.gz.sig
new file mode 100644
index 0000000..2c4a412
Binary files /dev/null and
b/audio-plugins/xmms-pulse/xmms-pulse-0.9.4.tar.gz.sig differ
diff --git a/audio-soft/asunder/DEPENDS b/audio-soft/asunder/DEPENDS
new file mode 100755
index 0000000..2d07718
--- /dev/null
+++ b/audio-soft/asunder/DEPENDS
@@ -0,0 +1,16 @@
+depends gtk+2 &&
+depends cdparanoia &&
+depends libcddb &&
+
+optional_depends lame \
+ "" \
+ "" \
+ "for mp3 encoding support" &&
+optional_depends flac \
+ "" \
+ "" \
+ "for FLAC encoding support" &&
+optional_depends vorbis-tools \
+ "" \
+ "" \
+ "for Ogg Vorbis encoding support"
diff --git a/audio-soft/asunder/DETAILS b/audio-soft/asunder/DETAILS
new file mode 100755
index 0000000..68cdd63
--- /dev/null
+++ b/audio-soft/asunder/DETAILS
@@ -0,0 +1,17 @@
+ SPELL=asunder
+ VERSION=0.9
+ SOURCE="${SPELL}-${VERSION}.tar.gz"
+ SOURCE_URL[0]=http://littlesvr.ca/${SPELL}/releases/${SOURCE}
+
SOURCE_HASH=sha512:8f5bef21b77334b5538c334a8a934c783f690582d1371ea241337dbd68922711306a3c51c9dbd8ee6b9da4d15908f4608d1f81f6f21c82e9dab46ad6894fe197
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
+ WEB_SITE="http://littlesvr.ca/asunder/";
+ LICENSE[0]=GPL
+ ENTERED=20071105
+ SHORT="simple GTK+2 CD ripper and encoder"
+cat << EOF
+Asunder is a graphical CD ripper and encoder.
+ * Support for WAV, MP3, Ogg Vorbis, and FLAC audio files * Uses CDDB to
+ name and tag each track * Can encode to multiple formats in one session *
+ Creates M3U playlists * Allows for each track to be by a different artist *
+ Does not require a specific desktop environment
+EOF
diff --git a/audio-soft/asunder/HISTORY b/audio-soft/asunder/HISTORY
new file mode 100644
index 0000000..aff753c
--- /dev/null
+++ b/audio-soft/asunder/HISTORY
@@ -0,0 +1,2 @@
+2007-11-05 Vlad Glagolev <codex AT sourcemage.org>
+ * DEPENDS, DETAILS, HISTORY: spell created
diff --git a/audio-soft/gnump3d/DETAILS b/audio-soft/gnump3d/DETAILS
index 71af1e7..e7dc4ad 100755
--- a/audio-soft/gnump3d/DETAILS
+++ b/audio-soft/gnump3d/DETAILS
@@ -1,5 +1,5 @@
SPELL=gnump3d
- VERSION=2.9final
+ VERSION=3.0
SOURCE="${SPELL}-${VERSION}.tar.bz2"
SOURCE2=$SOURCE.sig
SOURCE_URL[0]=http://savannah.gnu.org/download/${SPELL}/${SOURCE}
diff --git a/audio-soft/gnump3d/HISTORY b/audio-soft/gnump3d/HISTORY
index 932558b..d9fdf3c 100644
--- a/audio-soft/gnump3d/HISTORY
+++ b/audio-soft/gnump3d/HISTORY
@@ -1,3 +1,6 @@
+2007-10-19 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
+ * DETAILS: updated spell to 3.0
+
2007-07-22 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
* DETAILS: converted to upstream signature checking
* init.d/gnump3d: added
diff --git a/audio-soft/gnupod/DETAILS b/audio-soft/gnupod/DETAILS
index 0f2f6c2..e4d33b4 100755
--- a/audio-soft/gnupod/DETAILS
+++ b/audio-soft/gnupod/DETAILS
@@ -1,5 +1,5 @@
SPELL=gnupod
- VERSION=0.99.4
+ VERSION=0.99.5
SOURCE="${SPELL}-${VERSION}.tgz"
SOURCE2=$SOURCE.asc
SOURCE_URL[0]=http://www.blinkenlights.ch/${SPELL}-dist/stable/${SOURCE}
diff --git a/audio-soft/gnupod/HISTORY b/audio-soft/gnupod/HISTORY
index a0f7dbd..06e900a 100644
--- a/audio-soft/gnupod/HISTORY
+++ b/audio-soft/gnupod/HISTORY
@@ -1,3 +1,6 @@
+2007-10-07 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
+ * DETAILS: updated spell to 0.99.5
+
2007-09-22 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
* DETAILS: updated spell to 0.99.4

diff --git a/audio-soft/qjackctl/DEPENDS b/audio-soft/qjackctl/DEPENDS
index 83d9aff..0a0feeb 100755
--- a/audio-soft/qjackctl/DEPENDS
+++ b/audio-soft/qjackctl/DEPENDS
@@ -1,5 +1,5 @@
#
-# only needed for qt4_bin_path_fix.diff
+# only needed for qt4_bin_path_fix.diff and cvs version
#
depends autoconf &&

@@ -14,6 +14,11 @@ then
depends libxext
fi &&

+if [[ $QJCTL_VCS == y ]]
+then
+ depends CVS
+fi &&
+
depends JACK-DRIVER &&

optional_depends alsa-lib \
diff --git a/audio-soft/qjackctl/DETAILS b/audio-soft/qjackctl/DETAILS
index d04fc20..c5b76aa 100755
--- a/audio-soft/qjackctl/DETAILS
+++ b/audio-soft/qjackctl/DETAILS
@@ -1,9 +1,24 @@
SPELL=qjackctl
+if [[ $QJCTL_VCS == y ]]
+then
+ if [[ $QJCTL_VCS_AUTOUPDATE == y ]]
+ then
+ VERSION=$(date +%Y%m%d)
+ else
+ VERSION=cvs
+ fi
+ SOURCE=$SPELL-cvs.tar.bz2
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-cvs"
+
SOURCE_URL[0]=cvs://:pserver:anonymous AT qjackctl.cvs.sourceforge.net:/cvsroot/qjackctl:qjackctl
+ SOURCE_IGNORE=volatile
+ FORCE_DOWNLOAD=on
+else
VERSION=0.3.1a
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE

SOURCE_HASH=sha512:0b6863b30e600d689e43832416083a6d020963c174adb02f2585e295420259c1d5bcf10bc0c3d787d889658780ff541d1d1736375149733a5cce1d108fc4bd7e
+fi
WEB_SITE=http://qjackctl.sf.net
ENTERED=20031215
LICENSE[0]=GPL
@@ -19,4 +34,3 @@ which are properly saved between sessions, and a way
control of the status
of the audio server daemon. With time, this primordial interface has become
richer by including a enhanced patchbay and connection control features.
EOF
-
diff --git a/audio-soft/qjackctl/HISTORY b/audio-soft/qjackctl/HISTORY
index f91ce36..8d6d210 100644
--- a/audio-soft/qjackctl/HISTORY
+++ b/audio-soft/qjackctl/HISTORY
@@ -1,3 +1,7 @@
+2007-10-20 Juuso Alasuutari <iuso AT sourcemage.org>
+ * DETAILS, DEPENDS, PRE_BUILD: Added cvs version.
+ * PREPARE: Added, for cvs version query.
+
2007-09-21 Juuso Alasuutari <iuso AT sourcemage.org>
* PRE_BUILD: Replaced sed hack with patch from upstream.
* qt4_bin_path_fix.diff: Added.
diff --git a/audio-soft/qjackctl/PREPARE b/audio-soft/qjackctl/PREPARE
new file mode 100755
index 0000000..d008945
--- /dev/null
+++ b/audio-soft/qjackctl/PREPARE
@@ -0,0 +1,7 @@
+config_query QJCTL_VCS "Build latest version from development tree?" n &&
+
+if [[ $QJCTL_VCS == y ]]
+then
+ config_query QJCTL_VCS_AUTOUPDATE \
+ "Update automatically on every system update?" n
+fi
diff --git a/audio-soft/qjackctl/PRE_BUILD b/audio-soft/qjackctl/PRE_BUILD
index 38c9fcb..b4033a3 100755
--- a/audio-soft/qjackctl/PRE_BUILD
+++ b/audio-soft/qjackctl/PRE_BUILD
@@ -1,8 +1,16 @@
default_pre_build &&
cd "$SOURCE_DIRECTORY" &&

-#
-# fix ./configure not finding Qt4 build utils
-#
-patch -p0 < "$SCRIPT_DIRECTORY/qt4_bin_path_fix.diff" &&
-autoconf
+if [[ $QJCTL_VCS != y ]]
+then
+ #
+ # fix ./configure not finding Qt4 build utils
+ #
+ patch -p0 < "$SCRIPT_DIRECTORY/qt4_bin_path_fix.diff" &&
+ autoconf
+else
+ #
+ # prepare cvs version build
+ #
+ make -f Makefile.cvs
+fi
diff --git a/audio-soft/sndpeek/BUILD b/audio-soft/sndpeek/BUILD
new file mode 100755
index 0000000..3d87eef
--- /dev/null
+++ b/audio-soft/sndpeek/BUILD
@@ -0,0 +1,3 @@
+cd $SOURCE_DIRECTORY/src/sndpeek &&
+make linux-alsa
+
diff --git a/audio-soft/sndpeek/DEPENDS b/audio-soft/sndpeek/DEPENDS
new file mode 100755
index 0000000..0f7b907
--- /dev/null
+++ b/audio-soft/sndpeek/DEPENDS
@@ -0,0 +1,2 @@
+depends GLUT &&
+depends libsndfile
diff --git a/audio-soft/sndpeek/DETAILS b/audio-soft/sndpeek/DETAILS
new file mode 100755
index 0000000..596b087
--- /dev/null
+++ b/audio-soft/sndpeek/DETAILS
@@ -0,0 +1,19 @@
+ SPELL=sndpeek
+ VERSION=1.3
+ SOURCE="${SPELL}-${VERSION}.tgz"
+
SOURCE_URL[0]=http://www.cs.princeton.edu/sound/software/${SPELL}/files/${SOURCE}
+
SOURCE_HASH=sha512:0642400f8e806ab8ffac73b2cd92593feb5032c63b825899982b7ebafd770d53bb43b940a74d8fa0962ddd730b404bf8c842114a9f64234adddee5ae990ae9d4
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
+ WEB_SITE="http://www.cs.princeton.edu/sound/software/sndpeek/";
+ LICENSE[0]=GPL
+ ENTERED=20071004
+ SHORT="real-time audio visualization"
+cat << EOF
+sndpeek is just what it sounds (and looks) like:
+ real-time 3D animated display/playback can use mic-input or
+ wav/aiff/snd/raw/mat file (with playback) time-domain waveform FFT magnitude
+ spectrum 3D waterfall plot lissajous! (interchannel correlation) rotatable
+ and scalable display freeze frame! (for didactic purposes) real-time
spectral
+ feature extraction (centroid, rms, flux, rolloff) available on MacOS X,
+ Linux, and Windows under GPL part of the sndtools distribution.
+EOF
diff --git a/audio-soft/sndpeek/HISTORY b/audio-soft/sndpeek/HISTORY
new file mode 100644
index 0000000..af5b4d9
--- /dev/null
+++ b/audio-soft/sndpeek/HISTORY
@@ -0,0 +1,3 @@
+2007-10-04 Bearcat M. Sandor <sourcemage AT feline-soul.com>
+ * DEPENDS, DETAILS, HISTORY: spell created
+
diff --git a/audio-soft/sox/DETAILS b/audio-soft/sox/DETAILS
index e21c0a6..b4a1f9d 100755
--- a/audio-soft/sox/DETAILS
+++ b/audio-soft/sox/DETAILS
@@ -1,12 +1,11 @@
SPELL=sox
- VERSION=12.18.1
-
SOURCE_HASH='sha512:4dd23e5b263c47a1166bfe186abbbf069117ca67f4fe8b114f2d0cf89f18454e1cb1d594744a42fc3756b80b0d42e83eab8fc958bd72129fb68f5eb52b34dca9'
+ VERSION=14.0.0
+
SOURCE_HASH='sha512:7e6595a73c2df7d2ae21935a888d1715b7ff128e3b18db54fb927575bd3831746954d569576f06438faa26a374a21904306dc1f2f7e8b8d45e05eb1b068ebd41'
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
WEB_SITE=http://sox.sourceforge.net
ENTERED=20010922
- UPDATED=20040730
LICENSE[0]=LGPL
KEYWORDS="tools audio"
SHORT="SOX is the Swiss Army knife of sound processing tools."
diff --git a/audio-soft/sox/HISTORY b/audio-soft/sox/HISTORY
index d1483d9..f259eef 100644
--- a/audio-soft/sox/HISTORY
+++ b/audio-soft/sox/HISTORY
@@ -1,3 +1,7 @@
+2007-10-25 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 14.0.0
+ * INSTALL: removed
+
2006-09-21 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: [automated] Removed BUILD_API=2.

diff --git a/audio-soft/sox/INSTALL b/audio-soft/sox/INSTALL
deleted file mode 100755
index fbd4743..0000000
--- a/audio-soft/sox/INSTALL
+++ /dev/null
@@ -1,3 +0,0 @@
-make install &&
-make install-play &&
-make install-lib
diff --git a/chat-im/centerim/DETAILS b/chat-im/centerim/DETAILS
index 7613f73..2c53b4d 100755
--- a/chat-im/centerim/DETAILS
+++ b/chat-im/centerim/DETAILS
@@ -1,8 +1,8 @@
SPELL=centerim
- VERSION=20070625
+ VERSION=20071022
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-4.22.1
- SOURCE_URL[0]=http://www.centerim.org/download/$SOURCE
+ SOURCE_URL[0]=http://www.centerim.org/download/snapshots/$SOURCE
SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
WEB_SITE=http://www.centerim.org/index.php/Main_Page
ENTERED=20070609
diff --git a/chat-im/centerim/HISTORY b/chat-im/centerim/HISTORY
index 2863174..461d9f7 100644
--- a/chat-im/centerim/HISTORY
+++ b/chat-im/centerim/HISTORY
@@ -1,3 +1,9 @@
+2007-10-24 George Sherwood <george AT beernabeer.com>
+ * DETAILS: Updated to version 20071022. Updated SOURCE_URL.
+
+2007-10-15 Remko van der Vossen <wich AT soucemage.org>
+ * DETAILS: Version bumped to 20071003
+
2007-09-15 George Sherwood <george AT beernabeer.com>
* DETAILS: Updated to version 20070625

diff --git a/chat-im/centerim/centerim-20070625.tar.gz.sig
b/chat-im/centerim/centerim-20070625.tar.gz.sig
deleted file mode 100644
index 7a2837f..0000000
Binary files a/chat-im/centerim/centerim-20070625.tar.gz.sig and /dev/null
differ
diff --git a/chat-im/centerim/centerim-20071022.tar.gz.sig
b/chat-im/centerim/centerim-20071022.tar.gz.sig
new file mode 100644
index 0000000..89f2961
Binary files /dev/null and b/chat-im/centerim/centerim-20071022.tar.gz.sig
differ
diff --git a/chat-im/climm/CONFLICTS b/chat-im/climm/CONFLICTS
new file mode 100755
index 0000000..a9f4c5a
--- /dev/null
+++ b/chat-im/climm/CONFLICTS
@@ -0,0 +1 @@
+conflicts micq y
diff --git a/chat-im/climm/DEPENDS b/chat-im/climm/DEPENDS
new file mode 100755
index 0000000..7fec647
--- /dev/null
+++ b/chat-im/climm/DEPENDS
@@ -0,0 +1,8 @@
+optional_depends gnutls \
+ "" \
+ "--disable-ssl" \
+ "for encrypted connection support" &&
+optional_depends libotr \
+ "" \
+ "--disable-otr" \
+ "for encrypted connversations"
diff --git a/chat-im/climm/DETAILS b/chat-im/climm/DETAILS
new file mode 100755
index 0000000..c459613
--- /dev/null
+++ b/chat-im/climm/DETAILS
@@ -0,0 +1,14 @@
+ SPELL=climm
+ VERSION=0.6.1
+ SOURCE=$SPELL-$VERSION.tgz
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+ WEB_SITE=http://www.${SPELL}.org/
+ SOURCE_URL[0]=${WEB_SITE}/source/$SOURCE
+ SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
+ ENTERED=20071020
+ LICENSE[0]=GPL
+ KEYWORDS="icq messaging chat"
+ SHORT="climm is a small, text mode ICQ client"
+cat << EOF
+climm (formerly micq) is a small, text mode ICQ client
+EOF
diff --git a/chat-im/climm/HISTORY b/chat-im/climm/HISTORY
new file mode 100644
index 0000000..54f6418
--- /dev/null
+++ b/chat-im/climm/HISTORY
@@ -0,0 +1,57 @@
+2007-10-20 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * climm-0.6.1.tgz.sig, CONFLICTS, DEPENDS, DETAILS, HISTORY:
+ deprecated micq in favour of this spell, created this spell.
+ The micq project has been renamed to climm.
+
+2007-07-22 George Sherwood <george AT beernabeer.com>
+ * DETAILS: updated spell to 0.5.4.2
+
+2007-06-23 George Sherwood <george AT beernabeer.com>
+ * DETAILS: updated spell to 0.5.4.1
+
+2007-06-09 George Sherwood <george AT beernabeer.com>
+ * DETAILS: updated spell to 0.5.4
+ * DEPENDS: Added optional_depends libotr
+
+2007-04-27 George Sherwood <george AT beernabeer.com>
+ * DETAILS: updated spell to 0.5.3
+
+2006-11-12 George Sherwood <george AT beernabeer.com>
+ * DETAILS: Updated to 0.5.2.
+
+2006-10-03 Juuso Alasuutari <iuso AT sourcemage.org>
+ * DETAILS: [automated] Removed UPDATED.
+
+2006-03-12 Karsten Behrmann <BearPerson AT sourcemage.org>
+ * DETAILS: (automated) Add KEYWORDS
+
+2006-01-19 George Sherwood <george AT beernabeer.com>
+ * DETAILS: Updated to 0.5.1. Removed BUILD_API=2
+
+2005-11-29 Seth Woolley <seth AT tautology.org>
+ * DETAILS: MD5 -> SHA512
+
+2005-06-06 George Sherwood <george AT beernabeer.com>
+ * DETAILS: Updated to 0.5.0.4
+
+2005-04-28 George Sherwood <george AT beernabeer.com>
+ * DETAILS: Updated to 0.5.0.3
+
+2005-04-26 George Sherwood <george AT beernabeer.com>
+ * DETAILS: Updated to 0.5.0.2
+
+2005-02-28 George Sherwood <george AT beernabeer.com>
+ * DETAILS: Updated to 0.5.0.1
+
+2005-02-16 George Sherwood <george AT beernabeer.com>
+ * DETAILS: Updated to 0.5
+
+2004-11-25 George Sherwood <george AT beernabeer.com>
+ * DETAILS: Updated to BUILD_API=2
+
+2004-11-15 George Sherwood <george AT beernabeer.com>
+ * DETAILS: Update to version 0.4.12
+
+2004-02-07 Ladislav Hagara <hgr AT vabo.cz>
+ * created this spell, version 0.4.11
+
diff --git a/chat-im/climm/climm-0.6.1.tgz.sig
b/chat-im/climm/climm-0.6.1.tgz.sig
new file mode 100644
index 0000000..509dedc
Binary files /dev/null and b/chat-im/climm/climm-0.6.1.tgz.sig differ
diff --git a/chat-im/gnomeicu/DETAILS b/chat-im/gnomeicu/DETAILS
index da4c019..736025d 100755
--- a/chat-im/gnomeicu/DETAILS
+++ b/chat-im/gnomeicu/DETAILS
@@ -1,5 +1,5 @@
SPELL=gnomeicu
- VERSION=0.99.12
+ VERSION=0.99.14
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
diff --git a/chat-im/gnomeicu/HISTORY b/chat-im/gnomeicu/HISTORY
index d117922..3e29f0d 100644
--- a/chat-im/gnomeicu/HISTORY
+++ b/chat-im/gnomeicu/HISTORY
@@ -1,3 +1,6 @@
+2007-11-04 George Sherwood <george AT beernabeer.com>
+ * DETAILS: Updated to version 0.99.14
+
2007-02-06 George Sherwood <george AT beernabeer.com>
* DETAILS: Updated to version 0.99.12. Removed UPDATED.

diff --git a/chat-im/gnomeicu/gnomeicu-0.99.12.tar.bz2.sig
b/chat-im/gnomeicu/gnomeicu-0.99.12.tar.bz2.sig
deleted file mode 100644
index 65e30a8..0000000
Binary files a/chat-im/gnomeicu/gnomeicu-0.99.12.tar.bz2.sig and /dev/null
differ
diff --git a/chat-im/gnomeicu/gnomeicu-0.99.14.tar.bz2.sig
b/chat-im/gnomeicu/gnomeicu-0.99.14.tar.bz2.sig
new file mode 100644
index 0000000..7b2c798
Binary files /dev/null and b/chat-im/gnomeicu/gnomeicu-0.99.14.tar.bz2.sig
differ
diff --git a/chat-im/licq/DETAILS b/chat-im/licq/DETAILS
index b460c4c..061a2a1 100755
--- a/chat-im/licq/DETAILS
+++ b/chat-im/licq/DETAILS
@@ -34,7 +34,7 @@ fi
FORCE_DOWNLOAD=on
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-svn
else
- VERSION=1.3.4
+ VERSION=1.3.5
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
diff --git a/chat-im/licq/HISTORY b/chat-im/licq/HISTORY
index f5c1f23..030ae45 100644
--- a/chat-im/licq/HISTORY
+++ b/chat-im/licq/HISTORY
@@ -1,3 +1,9 @@
+2007-10-29 George Sherwood <george AT beernabeer.com>
+ * DETAILS: Updated to version 1.3.5
+
+2007-10-27 George Sherwood <george AT beernabeer.com>
+ * DETAILS: Updated to version 1.3.5-RC3
+
2006-10-15 George Sherwood <george AT beernabeer.com>
* DETAILS: Updated to 1.3.4

diff --git a/chat-im/licq/licq-1.3.4.tar.bz2.sig
b/chat-im/licq/licq-1.3.4.tar.bz2.sig
deleted file mode 100644
index 225ef7e..0000000
Binary files a/chat-im/licq/licq-1.3.4.tar.bz2.sig and /dev/null differ
diff --git a/chat-im/licq/licq-1.3.5.tar.bz2.sig
b/chat-im/licq/licq-1.3.5.tar.bz2.sig
new file mode 100644
index 0000000..c5d7b44
Binary files /dev/null and b/chat-im/licq/licq-1.3.5.tar.bz2.sig differ
diff --git a/chat-im/micq/BUILD b/chat-im/micq/BUILD
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/chat-im/micq/BUILD
@@ -0,0 +1 @@
+true
diff --git a/chat-im/micq/DEPENDS b/chat-im/micq/DEPENDS
index 7fec647..841949c 100755
--- a/chat-im/micq/DEPENDS
+++ b/chat-im/micq/DEPENDS
@@ -1,8 +1 @@
-optional_depends gnutls \
- "" \
- "--disable-ssl" \
- "for encrypted connection support" &&
-optional_depends libotr \
- "" \
- "--disable-otr" \
- "for encrypted connversations"
+depends climm
diff --git a/chat-im/micq/DETAILS b/chat-im/micq/DETAILS
index b672ee3..090986b 100755
--- a/chat-im/micq/DETAILS
+++ b/chat-im/micq/DETAILS
@@ -1,10 +1,11 @@
SPELL=micq
VERSION=0.5.4.2
- SOURCE=$SPELL-$VERSION.tgz
+# SOURCE=$SPELL-$VERSION.tgz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- SOURCE_URL[0]=http://www.micq.org/source/$SOURCE
- SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
+# SOURCE_URL[0]=http://www.micq.org/source/$SOURCE
+# SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
WEB_SITE=http://www.micq.org/
+ PATCHLEVEL=1
ENTERED=20040207
LICENSE[0]=GPL
KEYWORDS="icq messaging chat"
diff --git a/chat-im/micq/HISTORY b/chat-im/micq/HISTORY
index 81046cb..d9d308d 100644
--- a/chat-im/micq/HISTORY
+++ b/chat-im/micq/HISTORY
@@ -1,3 +1,6 @@
+2007-10-20 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * deprecated in favour of climm. project has been renamed.
+
2007-07-22 George Sherwood <george AT beernabeer.com>
* DETAILS: updated spell to 0.5.4.2

diff --git a/chat-im/micq/INSTALL b/chat-im/micq/INSTALL
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/chat-im/micq/INSTALL
@@ -0,0 +1 @@
+true
diff --git a/chat-im/micq/PRE_BUILD b/chat-im/micq/PRE_BUILD
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/chat-im/micq/PRE_BUILD
@@ -0,0 +1 @@
+true
diff --git a/chat-im/micq/TRIGGERS b/chat-im/micq/TRIGGERS
new file mode 100755
index 0000000..d40582c
--- /dev/null
+++ b/chat-im/micq/TRIGGERS
@@ -0,0 +1 @@
+on_cast micq dispel_self
diff --git a/chat-im/micq/micq-0.5.4.2.tgz.sig
b/chat-im/micq/micq-0.5.4.2.tgz.sig
deleted file mode 100644
index 0dfb5ec..0000000
Binary files a/chat-im/micq/micq-0.5.4.2.tgz.sig and /dev/null differ
diff --git a/chat-im/pidgin-encryption/DETAILS
b/chat-im/pidgin-encryption/DETAILS
index 0500f8e..16d4d3f 100755
--- a/chat-im/pidgin-encryption/DETAILS
+++ b/chat-im/pidgin-encryption/DETAILS
@@ -2,20 +2,21 @@
if [ "$PE_CVS" == "y" ]; then
VERSION=cvs
SOURCE=$SPELL-$VERSION.tar.bz2
-
SOURCE_URL[0]=cvs://:pserver:anonymous AT gaim-encryption.cvs.sourceforge.net:/cvsroot/gaim-encryption:encrypt
+
SOURCE_URL[0]=svn://:pserver:anonymous AT pidgin-encrypt.cvs.sourceforge.net:/svnroot/pidgin-encrypt/trunk:encrypt
FORCE_DOWNLOAD=1
SOURCE_IGNORE=volatile
else
VERSION=3.0
SOURCE=$SPELL-$VERSION.tar.gz
- SOURCE_URL[0]=$SOURCEFORGE_URL/gaim-encryption/$SOURCE
+ SOURCE_URL[0]=$SOURCEFORGE_URL/pidgin-encrypt/$SOURCE
SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
fi
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- WEB_SITE=http://gaim-encryption.sourceforge.net/
+ WEB_SITE=http://pidgin-encrypt.sourceforge.net/
LICENSE[0]=GPL
CCACHE=off
ENTERED=20040627
+ PATCHLEVEL=1
KEYWORDS="im chat pidgin encryption"
SHORT="uses NSS to provide RSA encryption as a Gaim plugin."
cat << EOF
diff --git a/chat-im/pidgin-encryption/HISTORY
b/chat-im/pidgin-encryption/HISTORY
index d3cbe2c..a82dfe6 100644
--- a/chat-im/pidgin-encryption/HISTORY
+++ b/chat-im/pidgin-encryption/HISTORY
@@ -1,3 +1,6 @@
+2007-10-15 Lalo Martins <lalo AT sourcemage.org>
+ * DETAILS, CONFIGURE: updating urls, and cvs->svn
+
2007-05-07 George Sherwood <george AT beernabeer.com>
* ALL: Created new spell from gaim-encryption due to name change

diff --git a/chat-im/pidgin-encryption/PREPARE
b/chat-im/pidgin-encryption/PREPARE
index 5cde567..0b58727 100755
--- a/chat-im/pidgin-encryption/PREPARE
+++ b/chat-im/pidgin-encryption/PREPARE
@@ -1 +1 @@
-config_query PE_CVS "Would you like to build the latest cvs version?" n
+config_query PE_CVS "Would you like to build the latest subversion
version?" n
diff --git a/chat-im/pidgin/DETAILS b/chat-im/pidgin/DETAILS
index f1f7559..0814370 100755
--- a/chat-im/pidgin/DETAILS
+++ b/chat-im/pidgin/DETAILS
@@ -1,5 +1,5 @@
SPELL=pidgin
- VERSION=2.2.1
+ VERSION=2.2.2
SECURITY_PATCH=1
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
diff --git a/chat-im/pidgin/HISTORY b/chat-im/pidgin/HISTORY
index 17b34e8..e9fd96c 100644
--- a/chat-im/pidgin/HISTORY
+++ b/chat-im/pidgin/HISTORY
@@ -1,3 +1,6 @@
+2007-10-25 George Sherwood <george AT beernabeer.com>
+ * DETAILS: Udated to version 2.2.2
+
2007-09-30 George Sherwood <george AT beernabeer.com>
* DETAILS: Updated to version 2.2.1. SECURITY_PATCH++

diff --git a/chat-im/pidgin/pidgin-2.2.1.tar.bz2.sig
b/chat-im/pidgin/pidgin-2.2.1.tar.bz2.sig
deleted file mode 100644
index a694455..0000000
Binary files a/chat-im/pidgin/pidgin-2.2.1.tar.bz2.sig and /dev/null differ
diff --git a/chat-im/pidgin/pidgin-2.2.2.tar.bz2.sig
b/chat-im/pidgin/pidgin-2.2.2.tar.bz2.sig
new file mode 100644
index 0000000..90018fc
Binary files /dev/null and b/chat-im/pidgin/pidgin-2.2.2.tar.bz2.sig differ
diff --git a/chat-im/psi/BUILD b/chat-im/psi/BUILD
index c90531e..b0f50e5 100755
--- a/chat-im/psi/BUILD
+++ b/chat-im/psi/BUILD
@@ -1,11 +1,5 @@
- if [ "$DEVEL" == "y" ]; then
- QTDIR=/usr &&
- PATH=$QTDIR/bin/qt4:$PATH
- else
- if [ -d /usr/lib/kde3 ];then
- export KDEDIR=/usr/lib/kde3
- fi
- fi &&
+ QTDIR=/usr &&
+ PATH=$QTDIR/bin/qt4:$PATH
export QTDIR=/usr &&
./configure --prefix=/usr $OPTS &&
sedit "s/QTDIR)\/include/QTDIR)\/include\/qt/g" Makefile &&
diff --git a/chat-im/psi/DEPENDS b/chat-im/psi/DEPENDS
index 2af4c41..152e07b 100755
--- a/chat-im/psi/DEPENDS
+++ b/chat-im/psi/DEPENDS
@@ -1,15 +1,9 @@
-if [ "$DEVEL" == "y" ]; then
depends qt4 &&
-depends qca2 &&
+optional_depends qca2 \
+ "--disable-bundled-qca" \
+ "" \
+ "to use system qca2" &&
optional_depends "qca-openssl" \
"" \
"" \
- "for SSL encrypted sessions"
-else
-depends qt-x11 &&
-depends qca &&
-optional_depends "qca-tls" \
- "" \
- "" \
- "for SSL encrypted sessions"
-fi
+ "for SSL encrypted sessions"
diff --git a/chat-im/psi/DETAILS b/chat-im/psi/DETAILS
index 18955ce..013fd0d 100755
--- a/chat-im/psi/DETAILS
+++ b/chat-im/psi/DETAILS
@@ -1,12 +1,12 @@
SPELL=psi
if [ "$DEVEL" == "y" ]; then
- VERSION=0.11-RC2
+ VERSION=0.11
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
SOURCE_URL[0]=${SOURCEFORGE_URL}/${SPELL}/${SOURCE}
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
else
- VERSION=0.10
+ VERSION=0.11
SOURCE=${SPELL}-${VERSION}.tar.bz2
SOURCE_URL[0]=$SOURCEFORGE_URL/${SPELL}/${SOURCE}
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
diff --git a/chat-im/psi/HISTORY b/chat-im/psi/HISTORY
index 81181cc..5ae8ad5 100644
--- a/chat-im/psi/HISTORY
+++ b/chat-im/psi/HISTORY
@@ -1,3 +1,9 @@
+2007-11-04 George Sherwood <george AT beernabeer.com>
+ * DETAILS: Updated to version 0.11
+ * DEPENDS: Adjusted for 0.11 using old devel depends
+ * INSTALL: using default_install
+ * BUILD: Updated to most recent build for deve and qt4
+
2007-07-17 George Sherwood <george AT beernabeer.com>
* DETAILS: Updated devel to 0.11-RC2
* BUILD: Updated to work with qt4
diff --git a/chat-im/psi/INSTALL b/chat-im/psi/INSTALL
deleted file mode 100755
index b894350..0000000
--- a/chat-im/psi/INSTALL
+++ /dev/null
@@ -1,26 +0,0 @@
-if [ "$DEVEL" == "y" ]; then
- make install
-else
-cd $SOURCE_DIRECTORY &&
-mkdir -p /usr/lib/kde3/share/applink/Internet &&
-cp -v psi.desktop /usr/lib/kde3/share/applink/Internet &&
-mkdir -p /usr/lib/kde3/share/icons/hicolor/16x16/apps &&
-cp -v iconsets/system/default/icon_16.png
/usr/lib/kde3/share/icons/hicolor/16x16/apps/icon.png &&
-mkdir -p /usr/lib/kde3/share/icons/hicolor/32x32/apps &&
-cp -v iconsets/system/default/icon_32.png
/usr/lib/kde3/share/icons/hicolor/32x32/apps/icon.png &&
-mkdir -p /usr/lib/kde3/share/icons/hicolor/48x48/apps &&
-cp -v iconsets/system/default/icon_48.png
/usr/lib/kde3/share/icons/hicolor/48x48/apps/icon.png &&
-mkdir -p /usr/share/doc/psi &&
-cp -v ./README /usr/share/doc/psi &&
-cp -v ./COPYING /usr/share/doc/psi &&
-mkdir -p /usr/share/psi/certs &&
-cp -v certs/README /usr/share/psi/certs &&
-cp -v certs/rootcert.xml /usr/share/psi/certs &&
-mkdir -p /usr/share/psi/iconsets/ &&
-cp -v -r iconsets/* /usr/share/psi/iconsets &&
-mkdir -p /usr/share/psi/sound &&
-cp -v sound/* /usr/share/psi/sound &&
-mkdir -p /usr/share/psi/designer &&
-cp -v libpsi/psiwidgets/libpsiwidgets.so /usr/share/psi/designer &&
-cp -v src/psi /usr/bin
-fi
diff --git a/chat-im/psi/psi-0.10.tar.bz2.sig
b/chat-im/psi/psi-0.10.tar.bz2.sig
deleted file mode 100644
index 6b517b6..0000000
Binary files a/chat-im/psi/psi-0.10.tar.bz2.sig and /dev/null differ
diff --git a/chat-im/psi/psi-0.11-RC2.tar.bz2.sig
b/chat-im/psi/psi-0.11-RC2.tar.bz2.sig
deleted file mode 100644
index a2a9869..0000000
Binary files a/chat-im/psi/psi-0.11-RC2.tar.bz2.sig and /dev/null differ
diff --git a/chat-im/psi/psi-0.11.tar.bz2.sig
b/chat-im/psi/psi-0.11.tar.bz2.sig
new file mode 100644
index 0000000..800c757
Binary files /dev/null and b/chat-im/psi/psi-0.11.tar.bz2.sig differ
diff --git a/chat-im/purple-plugin-pack/DEPENDS
b/chat-im/purple-plugin-pack/DEPENDS
new file mode 100755
index 0000000..2ef895c
--- /dev/null
+++ b/chat-im/purple-plugin-pack/DEPENDS
@@ -0,0 +1 @@
+depends pidgin
diff --git a/chat-im/purple-plugin-pack/DETAILS
b/chat-im/purple-plugin-pack/DETAILS
new file mode 100755
index 0000000..c36ee45
--- /dev/null
+++ b/chat-im/purple-plugin-pack/DETAILS
@@ -0,0 +1,16 @@
+ SPELL=purple-plugin-pack
+ VERSION=2.1.1
+ SOURCE="purple-plugin_pack-${VERSION}.tar.bz2"
+
SOURCE_URL[0]=http://downloads.guifications.org/plugins/Plugin%20Pack/${SOURCE}
+
SOURCE_HASH=sha512:1d004826ca3f7d127ab3aafee02e3662ca21b197f4d74084433da9017557a19fd38502fa1165943e242e02088d23090bba931f2b037c27de2cae76dabdd14688
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/purple-plugin_pack-${VERSION}"
+ WEB_SITE="http://plugins.guifications.org/trac/wiki/PluginPack";
+ LICENSE[0]=GPL
+ ENTERED=20071015
+ SHORT="Many plugins providing extra functionality for Pidgin and
libprpl"
+cat << EOF
+The Purple Plugin Pack was originally created by Gary Kramlich and Stu
+Tomlinson as a way to distribute their ever growing lists of simple Pidgin
+plugins. It has since grown from its origins of about 6 plugins to over
+30. Also, many more developers have continued to add to it.
+EOF
diff --git a/chat-im/purple-plugin-pack/HISTORY
b/chat-im/purple-plugin-pack/HISTORY
new file mode 100644
index 0000000..fcf1f8b
--- /dev/null
+++ b/chat-im/purple-plugin-pack/HISTORY
@@ -0,0 +1,2 @@
+2007-10-15 Lalo Martins <lalo AT sourcemage.org>
+ * DETAILS, DEPENDS, HISTORY: created spell
diff --git a/chat-im/tmsnc/DETAILS b/chat-im/tmsnc/DETAILS
index ca06e22..f500ea7 100755
--- a/chat-im/tmsnc/DETAILS
+++ b/chat-im/tmsnc/DETAILS
@@ -1,5 +1,5 @@
SPELL=tmsnc
- VERSION=0.3.1
+ VERSION=0.3.2
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION

SOURCE_URL[0]=http://superb-east.dl.sourceforge.net/sourceforge/tmsnc/$SOURCE
diff --git a/chat-im/tmsnc/HISTORY b/chat-im/tmsnc/HISTORY
index 48cd8d8..6b74b2b 100644
--- a/chat-im/tmsnc/HISTORY
+++ b/chat-im/tmsnc/HISTORY
@@ -1,3 +1,6 @@
+2007-10-30 George Sherwood <george AT beernabeer.com>
+ * DETAILS: Updated to version 0.3.2
+
2006-08-12 George Sherwood <george AT beernabeer.com>
* DETAILS: Removed BUILD_API=2. GPG Checking. Added KEYWORDS

diff --git a/chat-im/tmsnc/tmsnc-0.3.1.tar.gz.sig
b/chat-im/tmsnc/tmsnc-0.3.1.tar.gz.sig
deleted file mode 100644
index f692d17..0000000
Binary files a/chat-im/tmsnc/tmsnc-0.3.1.tar.gz.sig and /dev/null differ
diff --git a/chat-im/tmsnc/tmsnc-0.3.2.tar.gz.sig
b/chat-im/tmsnc/tmsnc-0.3.2.tar.gz.sig
new file mode 100644
index 0000000..efa7404
Binary files /dev/null and b/chat-im/tmsnc/tmsnc-0.3.2.tar.gz.sig differ
diff --git a/chat-irc/ircd-hybrid/DETAILS b/chat-irc/ircd-hybrid/DETAILS
index ec8f5af..ec18f8b 100755
--- a/chat-irc/ircd-hybrid/DETAILS
+++ b/chat-irc/ircd-hybrid/DETAILS
@@ -1,5 +1,5 @@
SPELL=ircd-hybrid
- VERSION=7.2.2
+ VERSION=7.2.3
SOURCE=$SPELL-$VERSION.tgz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
diff --git a/chat-irc/ircd-hybrid/HISTORY b/chat-irc/ircd-hybrid/HISTORY
index c9d9a93..33059c3 100644
--- a/chat-irc/ircd-hybrid/HISTORY
+++ b/chat-irc/ircd-hybrid/HISTORY
@@ -1,3 +1,6 @@
+2007-10-27 George Sherwood <george AT beernabeer.com>
+ * DETAILS: Updated to version 7.2.3
+
2006-10-03 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: [automated] Removed UPDATED.

diff --git a/chat-irc/ircd-hybrid/ircd-hybrid-7.2.2.tgz.sig
b/chat-irc/ircd-hybrid/ircd-hybrid-7.2.2.tgz.sig
deleted file mode 100644
index 67d540f..0000000
Binary files a/chat-irc/ircd-hybrid/ircd-hybrid-7.2.2.tgz.sig and /dev/null
differ
diff --git a/chat-irc/ircd-hybrid/ircd-hybrid-7.2.3.tgz.sig
b/chat-irc/ircd-hybrid/ircd-hybrid-7.2.3.tgz.sig
new file mode 100644
index 0000000..13754d1
Binary files /dev/null and b/chat-irc/ircd-hybrid/ircd-hybrid-7.2.3.tgz.sig
differ
diff --git a/chat-irc/irssi/DETAILS b/chat-irc/irssi/DETAILS
index 33aef1c..58ba983 100755
--- a/chat-irc/irssi/DETAILS
+++ b/chat-irc/irssi/DETAILS
@@ -14,7 +14,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=svn://svn.irssi.org/repos/irssi/trunk:irssi-svn
SOURCE_IGNORE=volatile
else
- VERSION=0.8.11
+ VERSION=0.8.12
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://www.irssi.org/files/${SOURCE}
diff --git a/chat-irc/irssi/HISTORY b/chat-irc/irssi/HISTORY
index 5bed22f..3fe98a7 100644
--- a/chat-irc/irssi/HISTORY
+++ b/chat-irc/irssi/HISTORY
@@ -1,3 +1,6 @@
+2007-10-13 George Sherwood <george AT beernabeer.com>
+ * DETAILS: Updated to version 0.8.12
+
2007-04-26 George Sherwood <george AT beernabeer.com>
* DETAILS: Updated to version 0.8.11
* PRE_BUILD: Removed patch
diff --git a/chat-irc/miau/DETAILS b/chat-irc/miau/DETAILS
index 9541c43..500a032 100755
--- a/chat-irc/miau/DETAILS
+++ b/chat-irc/miau/DETAILS
@@ -1,5 +1,5 @@
SPELL=miau
- VERSION=0.6.4
+ VERSION=0.6.5
SOURCE=${SPELL}-${VERSION}.tar.bz2
SOURCE_URL[0]=${SOURCEFORGE_URL}/${SPELL}/${SOURCE}
SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
diff --git a/chat-irc/miau/HISTORY b/chat-irc/miau/HISTORY
index ab13deb..edaf450 100644
--- a/chat-irc/miau/HISTORY
+++ b/chat-irc/miau/HISTORY
@@ -1,3 +1,6 @@
+2007-10-27 George Sherwood <george AT beernabeer.com>
+ * DETAILS: Updated to version 0.6.5
+
2007-04-15 George Sherwood <george AT beernabeer.com>
* DETAILS: Updated to 0.6.4

diff --git a/chat-irc/miau/miau-0.6.4.tar.bz2.sig
b/chat-irc/miau/miau-0.6.4.tar.bz2.sig
deleted file mode 100644
index cc151f4..0000000
Binary files a/chat-irc/miau/miau-0.6.4.tar.bz2.sig and /dev/null differ
diff --git a/chat-irc/miau/miau-0.6.5.tar.bz2.sig
b/chat-irc/miau/miau-0.6.5.tar.bz2.sig
new file mode 100644
index 0000000..9c2d814
Binary files /dev/null and b/chat-irc/miau/miau-0.6.5.tar.bz2.sig differ
diff --git a/chat-libs/gloox/DEPENDS b/chat-libs/gloox/DEPENDS
new file mode 100755
index 0000000..f1aa03c
--- /dev/null
+++ b/chat-libs/gloox/DEPENDS
@@ -0,0 +1,8 @@
+depends g++ &&
+depends gnutls &&
+depends openssl &&
+depends libidn &&
+optional_depends zlib \
+ "--enable-zlib" \
+ "--disable-zlib" \
+ "for Stream Compression"
diff --git a/chat-libs/gloox/DETAILS b/chat-libs/gloox/DETAILS
new file mode 100755
index 0000000..bd8518f
--- /dev/null
+++ b/chat-libs/gloox/DETAILS
@@ -0,0 +1,21 @@
+ SPELL=gloox
+ VERSION=0.9.6.1
+ SOURCE="${SPELL}-${VERSION}.tar.bz2"
+ SOURCE_URL[0]=http://camaya.net/download/${SOURCE}
+
SOURCE_HASH=sha512:7cd1162f4947e3d8464e444174aed61e90a77598660757cfa685b7b1cffbc32765aaeb2bedbef84bc20aa14efabae4074c3a32f70bf52856542dd0a89159b2eb
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
+ WEB_SITE="http://camaya.net";
+ LICENSE[0]=GPL
+ ENTERED=20071102
+ SHORT="a C++ library for the jabber instant messaging protocol"
+cat << EOF
+Gloox is a C++ library for the jabber instant messaging protocol. It
+is fully compliant to XMPP Core and almost fully compliant to XMPP IM.
+The following are some of the supported features:
+* TLS and SASL
+* roster management
+* privacy lists
+* SRV lookups
+* server certificate verification
+* support for xml:lang i18n
+EOF
diff --git a/chat-libs/gloox/HISTORY b/chat-libs/gloox/HISTORY
new file mode 100644
index 0000000..2f2a7d0
--- /dev/null
+++ b/chat-libs/gloox/HISTORY
@@ -0,0 +1,7 @@
+2007-11-02 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: improved the long description
+ * DEPENDS: added g++ as a dependency, fixed the dependency on
+ zlib
+2007-11-02 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DEPENDS, DETAILS, HISTORY: spell created
+
diff --git a/chat-libs/pwlib/DEPENDS b/chat-libs/pwlib/DEPENDS
index efad625..abd2c66 100755
--- a/chat-libs/pwlib/DEPENDS
+++ b/chat-libs/pwlib/DEPENDS
@@ -1,4 +1,5 @@
depends g++ &&
+depends autoconf &&

optional_depends "openldap" \
"--enable-openldap" \
diff --git a/chat-libs/pwlib/HISTORY b/chat-libs/pwlib/HISTORY
index 3db1184..476b836 100644
--- a/chat-libs/pwlib/HISTORY
+++ b/chat-libs/pwlib/HISTORY
@@ -1,3 +1,8 @@
+2007-10-03 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * PRE_BUILD: fix plugins/configure.in to not fail if alsa is disabled,
+ bug #14029
+ * DEPENDS: added autoconf
+
2007-09-18 George Sherwood <george AT beernabeer.com>
* DETAILS: Updated to 1.10.10. Fixed SOURCE_URL[0].
Removed SOURCE_URL[1]
diff --git a/chat-libs/pwlib/PRE_BUILD b/chat-libs/pwlib/PRE_BUILD
new file mode 100755
index 0000000..c699048
--- /dev/null
+++ b/chat-libs/pwlib/PRE_BUILD
@@ -0,0 +1,5 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+cd plugins &&
+sed -i '4iAC_PROG_CC' configure.in &&
+autoconf
diff --git a/collab/rapidsvn/DEPENDS b/collab/rapidsvn/DEPENDS
index 25b40f8..6c83233 100755
--- a/collab/rapidsvn/DEPENDS
+++ b/collab/rapidsvn/DEPENDS
@@ -1,27 +1,44 @@
-depends apr &&
-depends apr-util &&
-depends neon &&
-depends subversion &&
-depends wxgtk &&
-depends libxslt &&
-depends graphviz &&
-
-optional_depends libxslt \
- '' \
- '' \
- 'to generate manpages' &&
-
-optional_depends docbook-xsl \
- '' \
-
'--with-docbook-xsl=/usr/share/xml/docbook/xsl-stylesheets-1.65' \
- 'to generate manpages' &&
-
-optional_depends doxygen \
- '' \
- '' \
- 'for C++ subversion api documentation' &&
-
-optional_depends cppunit \
- '' \
- '' \
- 'for RapidSVN regression test execution'
+depends subversion &&
+depends apr-util &&
+depends wxgtk &&
+depends neon &&
+depends apr &&
+
+# dockbook's dir
+local DB_VER=$(installed_version docbook-xsl | cut -c -4)
+local DB_DIR="/usr/share/xml/docbook/xsl-stylesheets-${DB_VER}"
+
+optional_depends graphviz \
+ "" \
+ "" \
+ "for code documentation" &&
+
+optional_depends libxslt \
+ "" \
+ "" \
+ "for manpage creation" &&
+
+optional_depends docbook-xsl \
+
"--with-docbook-xsl-manpages=${DB_DIR}/manpages/docbook.xsl" \
+ "" \
+ "to generate manpages" &&
+
+optional_depends doxygen \
+ "" \
+ "" \
+ "for code documentation" &&
+
+optional_depends cppunit \
+ "" \
+ "" \
+ "for the regression tests" &&
+
+optional_depends db \
+ "" \
+ "" \
+ "for DBD repository access" &&
+
+optional_depends openssl \
+ "" \
+ "" \
+ "for OpenSSL support"
diff --git a/collab/rapidsvn/DETAILS b/collab/rapidsvn/DETAILS
index c687425..55b1a4d 100755
--- a/collab/rapidsvn/DETAILS
+++ b/collab/rapidsvn/DETAILS
@@ -1,13 +1,13 @@
SPELL=rapidsvn
- VERSION=0.6.0
+ VERSION=0.9.4
SOURCE=$SPELL-$VERSION.tar.gz
- MD5[0]='53cb182f4607f07428ddfd34e2cc7947'
- LICENSE[0]=APACHE
+ SOURCE_URL[0]=http://www.rapidsvn.org/download/release/$VERSION/$SOURCE
+
SOURCE_HASH=sha512:41c197e1aec1e27052f0700fffbd392e0b9c343898f78f17395e807b3ce3e68559720156e7dd32cc92b9cf4aaca1068f7ba418aa31121ce931c31fa84aa80ecf
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- SOURCE_URL[0]=http://www.rapidsvn.org/download/$SOURCE
- WEB_SITE=http://rapidsvn.tigris.org/
+ LICENSE[0]=GPL
+ LICENCE[1]=LGPL
+ WEB_SITE=http://www.rapidsvn.org/
ENTERED=20021016
- UPDATED=20031205
SHORT='RapidSVN is wxWindows-based Subversion client'
cat << EOF
RapidSVN is a cross-platform GUI front-end for the Subversion revision system
diff --git a/collab/rapidsvn/HISTORY b/collab/rapidsvn/HISTORY
index 89fea2f..9087319 100644
--- a/collab/rapidsvn/HISTORY
+++ b/collab/rapidsvn/HISTORY
@@ -1,3 +1,9 @@
+2007-11-04 Vlad Glagolev <codex AT sourcemage.org>
+ * DETAILS: updated to 0.9.4, added sha512, cleaned up
+ * DEPENDS: fixed depends, added db, openssl
+ * PRE_BUILD: added ability to be built with wxGTK 2.8
+ via official patches (from my OpenBSD port)
+
2007-02-04 Tommy Boatman <tboatman2 AT houston.rr.com>
* DEPENDS: lowercased wxgtk - bug 11074

diff --git a/collab/rapidsvn/PRE_BUILD b/collab/rapidsvn/PRE_BUILD
new file mode 100755
index 0000000..7d3f5df
--- /dev/null
+++ b/collab/rapidsvn/PRE_BUILD
@@ -0,0 +1,8 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+
+if [[ $(installed_version wxgtk | cut -c -3) == 2.8 ]]; then
+ for p in $(ls ${SCRIPT_DIRECTORY}/patches); do
+ patch -p0 < ${SCRIPT_DIRECTORY}/patches/$p
+ done
+fi
diff --git a/collab/rapidsvn/patches/patch-src_add_action_cpp
b/collab/rapidsvn/patches/patch-src_add_action_cpp
new file mode 100644
index 0000000..fdb2972
--- /dev/null
+++ b/collab/rapidsvn/patches/patch-src_add_action_cpp
@@ -0,0 +1,18 @@
+$OpenBSD: patch-src_add_action_cpp,v 1.1 2007/10/08 20:38:17 steven Exp $
+--- src/add_action.cpp.orig Fri Dec 8 18:47:07 2006
++++ src/add_action.cpp Mon Oct 8 13:01:47 2007
+@@ -23,11 +23,11 @@
+ * ====================================================================
+ */
+
+-// svncpp
+-#include "svncpp/client.hpp"
+-
+ // wxWidgets
+ #include "wx/intl.h"
++
++// svncpp
++#include "svncpp/client.hpp"
+
+ // app
+ #include "ids.hpp"
diff --git a/collab/rapidsvn/patches/patch-src_checkout_dlg_cpp
b/collab/rapidsvn/patches/patch-src_checkout_dlg_cpp
new file mode 100644
index 0000000..416339a
--- /dev/null
+++ b/collab/rapidsvn/patches/patch-src_checkout_dlg_cpp
@@ -0,0 +1,11 @@
+$OpenBSD: patch-src_checkout_dlg_cpp,v 1.1 2007/10/08 20:38:17 steven Exp $
+--- src/checkout_dlg.cpp.orig Fri Dec 8 18:47:07 2006
++++ src/checkout_dlg.cpp Mon Oct 8 13:01:47 2007
+@@ -256,7 +256,6 @@ struct CheckoutDlg::Data (public)
+
+ BEGIN_EVENT_TABLE (CheckoutDlg, wxDialog)
+ EVT_BUTTON (ID_BUTTON_BROWSE, CheckoutDlg::OnBrowse)
+- EVT_BUTTON (wxID_OK, CheckoutDlg::OnOK)
+ EVT_CHECKBOX (ID_USELATEST, CheckoutDlg::OnUseLatest)
+ EVT_TEXT (-1, CheckoutDlg::OnText)
+ // EVT_BUTTON (wxID_HELP, CheckoutDlg::OnHelp)
diff --git a/collab/rapidsvn/patches/patch-src_export_dlg_cpp
b/collab/rapidsvn/patches/patch-src_export_dlg_cpp
new file mode 100644
index 0000000..1c15da6
--- /dev/null
+++ b/collab/rapidsvn/patches/patch-src_export_dlg_cpp
@@ -0,0 +1,11 @@
+$OpenBSD: patch-src_export_dlg_cpp,v 1.1 2007/10/08 20:38:17 steven Exp $
+--- src/export_dlg.cpp.orig Fri Dec 8 18:47:07 2006
++++ src/export_dlg.cpp Mon Oct 8 13:01:47 2007
+@@ -295,7 +295,6 @@ struct ExportDlg::Data (public)
+
+ BEGIN_EVENT_TABLE (ExportDlg, wxDialog)
+ EVT_BUTTON (ID_BUTTON_BROWSE, ExportDlg::OnBrowse)
+- EVT_BUTTON (wxID_OK, ExportDlg::OnOK)
+ EVT_CHECKBOX (ID_USE_LATEST, ExportDlg::OnUseLatest)
+ EVT_CHECKBOX (ID_NOT_SPECIFIED, ExportDlg::OnNotSpecified)
+ EVT_COMBOBOX (ID_NATIVE_EOL, ExportDlg::OnNativeEol)
diff --git a/collab/rapidsvn/patches/patch-src_import_dlg_cpp
b/collab/rapidsvn/patches/patch-src_import_dlg_cpp
new file mode 100644
index 0000000..ecf8e61
--- /dev/null
+++ b/collab/rapidsvn/patches/patch-src_import_dlg_cpp
@@ -0,0 +1,12 @@
+$OpenBSD: patch-src_import_dlg_cpp,v 1.1 2007/10/08 20:38:17 steven Exp $
+--- src/import_dlg.cpp.orig Mon Oct 8 13:03:12 2007
++++ src/import_dlg.cpp Mon Oct 8 13:03:33 2007
+@@ -196,7 +196,7 @@ ImportDlg::OnOk (wxCommandEvent &event)
+ }
+ }
+
+- wxDialog::OnOK(event);
++ wxDialog::EndModal (wxID_OK);
+ }
+
+ void
diff --git a/collab/rapidsvn/patches/patch-src_listener_cpp
b/collab/rapidsvn/patches/patch-src_listener_cpp
new file mode 100644
index 0000000..2ae1a37
--- /dev/null
+++ b/collab/rapidsvn/patches/patch-src_listener_cpp
@@ -0,0 +1,12 @@
+$OpenBSD: patch-src_listener_cpp,v 1.1 2007/10/08 20:38:17 steven Exp $
+--- src/listener.cpp.orig Fri Dec 8 18:47:07 2006
++++ src/listener.cpp Mon Oct 8 13:01:47 2007
+@@ -253,7 +253,7 @@ struct Listener::Data (public)
+ void
+ handleEvent (wxCommandEvent & event)
+ {
+- switch (event.m_id)
++ switch (event.GetId ())
+ {
+ case SIG_GET_LOG_MSG:
+ callbackGetLogMessage ();
diff --git a/collab/rapidsvn/patches/patch-src_log_dlg_cpp
b/collab/rapidsvn/patches/patch-src_log_dlg_cpp
new file mode 100644
index 0000000..ce71f89
--- /dev/null
+++ b/collab/rapidsvn/patches/patch-src_log_dlg_cpp
@@ -0,0 +1,11 @@
+$OpenBSD: patch-src_log_dlg_cpp,v 1.1 2007/10/08 20:38:17 steven Exp $
+--- src/log_dlg.cpp.orig Fri Dec 8 18:47:07 2006
++++ src/log_dlg.cpp Mon Oct 8 13:01:47 2007
+@@ -32,6 +32,7 @@
+ #include "wx/valgen.h"
+ #include "wx/listctrl.h"
+ #include "wx/splitter.h"
++#include "wx/notebook.h"
+
+
+ // svncpp
diff --git a/collab/rapidsvn/patches/patch-src_merge_dlg_cpp
b/collab/rapidsvn/patches/patch-src_merge_dlg_cpp
new file mode 100644
index 0000000..79e9e78
--- /dev/null
+++ b/collab/rapidsvn/patches/patch-src_merge_dlg_cpp
@@ -0,0 +1,12 @@
+$OpenBSD: patch-src_merge_dlg_cpp,v 1.1 2007/10/08 20:38:17 steven Exp $
+--- src/merge_dlg.cpp.orig Mon Oct 8 13:03:19 2007
++++ src/merge_dlg.cpp Mon Oct 8 13:03:33 2007
+@@ -113,7 +113,7 @@ MergeDlg::OnOK (wxCommandEvent & event)
+ }
+ }
+
+- wxDialog::OnOK(event);
++ wxDialog::EndModal (wxID_OK);
+ }
+
+ void
diff --git a/collab/rapidsvn/patches/patch-src_preferences_dlg_cpp
b/collab/rapidsvn/patches/patch-src_preferences_dlg_cpp
new file mode 100644
index 0000000..5d7cef4
--- /dev/null
+++ b/collab/rapidsvn/patches/patch-src_preferences_dlg_cpp
@@ -0,0 +1,16 @@
+$OpenBSD: patch-src_preferences_dlg_cpp,v 1.1 2007/10/08 20:38:17 steven Exp
$
+--- src/preferences_dlg.cpp.orig Mon Oct 8 13:03:28 2007
++++ src/preferences_dlg.cpp Mon Oct 8 13:03:33 2007
+@@ -114,10 +114,8 @@ class ProgramsPanel : public wxPanel (public)
+ */
+ bool SelectExecutable (const wxString & title, wxTextCtrl * textCtrl)
+ {
+- wxFileDialog dlg (this, title);
+-
+- dlg.SetStyle (wxHIDE_READONLY | wxOPEN);
+- dlg.SetWildcard (EXECUTABLE_WILDCARD);
++ wxFileDialog dlg (this, title, wxEmptyString, wxEmptyString,
++ EXECUTABLE_WILDCARD, wxOPEN);
+ dlg.SetPath (textCtrl->GetValue ());
+
+ if (dlg.ShowModal () != wxID_OK)
diff --git a/collab/rapidsvn/patches/patch-src_rapidsvn_frame_cpp
b/collab/rapidsvn/patches/patch-src_rapidsvn_frame_cpp
new file mode 100644
index 0000000..c3a4913
--- /dev/null
+++ b/collab/rapidsvn/patches/patch-src_rapidsvn_frame_cpp
@@ -0,0 +1,47 @@
+$OpenBSD: patch-src_rapidsvn_frame_cpp,v 1.1 2007/10/08 20:38:17 steven Exp $
+--- src/rapidsvn_frame.cpp.orig Fri Dec 8 18:47:07 2006
++++ src/rapidsvn_frame.cpp Mon Oct 8 13:01:47 2007
+@@ -1150,7 +1150,7 @@ RapidSvnFrame::OnColumnReset (wxCommandEvent &)
+ void
+ RapidSvnFrame::OnColumn (wxCommandEvent & event)
+ {
+- int eventId = event.m_id;
++ int eventId = event.GetId ();
+ int col = 0;
+ while (col < FileListCtrl::COL_COUNT &&
+ m->ColumnList[col].id != eventId)
+@@ -1192,7 +1192,7 @@ void
+ RapidSvnFrame::OnColumnSorting (wxCommandEvent & event)
+ {
+ // we dont want to list FileListCtrl::COL_NAME/COL_PATH/... here
+- int col = event.m_id - ID_ColumnSort_Name;
++ int col = event.GetId () - ID_ColumnSort_Name;
+
+ m->listCtrl->SetSortColumn (col);
+ m->listCtrl->SetSortAscending (true);
+@@ -1294,7 +1294,7 @@ RapidSvnFrame::OnInfo (wxCommandEvent & WXUNUSED (even
+ void
+ RapidSvnFrame::OnUpdateCommand (wxUpdateUIEvent & updateUIEvent)
+ {
+- updateUIEvent.Enable (ValidateIDActionFlags (updateUIEvent.m_id,
GetSelectionActionFlags ()));
++ updateUIEvent.Enable (ValidateIDActionFlags (updateUIEvent.GetId (),
GetSelectionActionFlags ()));
+ }
+
+ void
+@@ -1514,13 +1514,13 @@ RapidSvnFrame::OnFileCommand (wxCommandEvent & event)
+ {
+ Action* action = NULL;
+
+- if ((event.m_id >= ID_Verb_Min) && (event.m_id <= ID_Verb_Max))
++ if ((event.GetId () >= ID_Verb_Min) && (event.GetId () <= ID_Verb_Max))
+ {
+- action = new ExternalProgramAction (this, event.m_id - ID_Verb_Min,
false);
++ action = new ExternalProgramAction (this, event.GetId () - ID_Verb_Min,
false);
+ }
+ else
+ {
+- switch (event.m_id)
++ switch (event.GetId ())
+ {
+ case ID_Explore:
+ action = new ExternalProgramAction (this, -1, true);
diff --git a/collab/rapidsvn/patches/patch-src_resolve_action_cpp
b/collab/rapidsvn/patches/patch-src_resolve_action_cpp
new file mode 100644
index 0000000..5ce1921
--- /dev/null
+++ b/collab/rapidsvn/patches/patch-src_resolve_action_cpp
@@ -0,0 +1,18 @@
+$OpenBSD: patch-src_resolve_action_cpp,v 1.1 2007/10/08 20:38:17 steven Exp $
+--- src/resolve_action.cpp.orig Fri Dec 8 18:47:07 2006
++++ src/resolve_action.cpp Mon Oct 8 13:01:47 2007
+@@ -23,11 +23,11 @@
+ * ====================================================================
+ */
+
+-// svncpp
+-#include "svncpp/client.hpp"
+-
+ // wxWidgets
+ #include "wx/intl.h"
++
++// svncpp
++#include "svncpp/client.hpp"
+
+ // app
+ #include "resolve_action.hpp"
diff --git a/collab/typo3/DEPENDS b/collab/typo3/DEPENDS
index 20ebaa1..f9aed14 100755
--- a/collab/typo3/DEPENDS
+++ b/collab/typo3/DEPENDS
@@ -1,3 +1,3 @@
-depends php4 &&
+depends PHP &&

optional_depends imagemagick '' '' 'for imaging tasks'
diff --git a/collab/typo3/DETAILS b/collab/typo3/DETAILS
index 46a4fff..e582ada 100755
--- a/collab/typo3/DETAILS
+++ b/collab/typo3/DETAILS
@@ -1,17 +1,11 @@
SPELL=typo3
- VERSION=3.8.0
-
SOURCE_HASH=sha512:0232b6adc173a84e21c7bd5ee8b7b92e859f3d1c4b6bb0f0641cd7a71b26109a619d3fd0bceb1aeafd60a03533b88b4a71ba67589bada7c0b36e4813af24105c
-
SOURCE2_HASH=sha512:11dfd22feb34b00b45eea2e8fdca065fcf5a2bc2ad5f53740d859dddaba81c58de2f92df07fce0e18acb6b3fd0f9b65b94821415cceceba7502997b22d40a419
-
SOURCE3_HASH=sha512:12d0ba174b5ae92052912e5279fff7bedd1394c7315d02f1aa071eb81005727c7112111c713ae2be4791420595d924b47e456852156030c6b9f0a3a3353d9956
-
SOURCE4_HASH=sha512:cf09645c7d1b1585a6dc5edbab962eac45c621310da9f66366657bd90cd478c91d436a5d96eef6d39662695e3d41da7a591a81af4ebb52f6027d1cb22199b65a
+ VERSION=4.1.2
+
SOURCE_HASH=sha512:7840a17c3341ca1fdf6f1db23aeb6b560dca8b7d4e0f12fe69d118719805d9825ece732cdaf414dca237f66e7de67c425dba34a336490291857ce10ee5745680
+
SOURCE2_HASH=sha512:e6fe4ebcc6faebbe6afc5b70956478ec79773b9dec17996da23a370a751b2cd72c10c9712d0891b767bc2fe88077cf25e3b00dad4578ef4be576f537ba9a92a7
SOURCE="${SPELL}_src-$VERSION.tar.gz"
SOURCE2="dummy-$VERSION.tar.gz"
- SOURCE3="quickstart-$VERSION.tar.gz"
- SOURCE4="testsite-$VERSION.tar.gz"
SOURCE_URL[0]="$SOURCEFORGE_URL/$SPELL/$SOURCE"
SOURCE2_URL[0]="$SOURCEFORGE_URL/$SPELL/$SOURCE2"
- SOURCE3_URL[0]="$SOURCEFORGE_URL/$SPELL/$SOURCE3"
- SOURCE4_URL[0]="$SOURCEFORGE_URL/$SPELL/$SOURCE4"
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
WEB_SITE="http://$SPELL.org/";
FRESHMEAT_URL="http://freshmeat.net/projects/$SPELL/";
diff --git a/collab/typo3/HISTORY b/collab/typo3/HISTORY
index 17077e0..a486817 100644
--- a/collab/typo3/HISTORY
+++ b/collab/typo3/HISTORY
@@ -1,3 +1,7 @@
+2007-10-19 Arjan Bouter <abouter AT sourcemage.org>
+ * DETAILS: version 4.1.2
+ * DEPENDS: php4 -> PHP
+
2006-09-21 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: [automated] Removed BUILD_API=2.

diff --git a/crypto/ecryptfs-utils/DETAILS b/crypto/ecryptfs-utils/DETAILS
index af28e00..1a42d87 100755
--- a/crypto/ecryptfs-utils/DETAILS
+++ b/crypto/ecryptfs-utils/DETAILS
@@ -1,9 +1,9 @@
SPELL=ecryptfs-utils
- VERSION=20
+ VERSION=26
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$SOURCEFORGE_URL/ecryptfs/$SOURCE
-
SOURCE_HASH=sha512:be241842ea1e3707a5069d078b1aa421e0288ebda0e1b18398f8624b2396d3df2df33a6eafc5eb525996e13932f9b8ba446c19e87ad0714d6fed12e835e2d826
+
SOURCE_HASH=sha512:200bfeac8d6a3a1fe61bddd2236c1c9e7663383fed725fef73a09785490b774ae68141f47ecedba86f8eaba2cc19fbdc51a737daa9f018dcccb43d99763206df
LICENSE[0]=GPL
WEB_SITE=http://ecryptfs.sourceforge.net/
ENTERED=20061130
diff --git a/crypto/ecryptfs-utils/HISTORY b/crypto/ecryptfs-utils/HISTORY
index 9b3546e..683ca06 100644
--- a/crypto/ecryptfs-utils/HISTORY
+++ b/crypto/ecryptfs-utils/HISTORY
@@ -1,3 +1,6 @@
+2007-10-14 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 26
+
2007-08-03 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 20

diff --git a/crypto/gnomint/DEPENDS b/crypto/gnomint/DEPENDS
new file mode 100755
index 0000000..cdd9cb3
--- /dev/null
+++ b/crypto/gnomint/DEPENDS
@@ -0,0 +1,3 @@
+depends libgnomeui &&
+depends sqlite &&
+depends gnutls
diff --git a/crypto/gnomint/DETAILS b/crypto/gnomint/DETAILS
new file mode 100755
index 0000000..a703dc8
--- /dev/null
+++ b/crypto/gnomint/DETAILS
@@ -0,0 +1,19 @@
+ SPELL=gnomint
+ VERSION=0.3.2
+ SOURCE=$SPELL-$VERSION.tar.gz
+ SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
+
SOURCE_HASH=sha512:adc0a9233d5a4c09dccd91232b74a2fe197ea3b122d5fd807605ad3a422fe167785f0e11d093694b34ec02dc62f75b217df1a203aa9ea2c849ddec5f7e4db062
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+ WEB_SITE=http://gnomint.sourceforge.net/
+ LICENSE[0]=GPL
+ ENTERED=20071023
+ SHORT="a certification authority management tool for GTK/GNOME"
+cat << EOF
+gnoMint is a tool for easily creating and managing certification
+authorities. It provides fancy visualization of all the pieces of information
+that pertain to a CA, such as x509 certificates, CSRs, and CRLs. gnoMint is
+currently capable of managing a CA that emits certificates that are able to
+authenticate people or machines in VPNs (IPSec or other protocols), secure
+HTTP communications with SSL/TLS, authenticate and cipher HTTP communications
+through Web-client certificates, and sign or crypt email messages.
+EOF
diff --git a/crypto/gnomint/HISTORY b/crypto/gnomint/HISTORY
new file mode 100644
index 0000000..28fa24b
--- /dev/null
+++ b/crypto/gnomint/HISTORY
@@ -0,0 +1,9 @@
+2007-11-03 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 0.3.2
+
+2007-11-02 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 0.3.1
+
+2007-10-23 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS, DEPENDS, HISTORY: created this spell, version 1.5
+
diff --git a/crypto/gnutls/DETAILS b/crypto/gnutls/DETAILS
index d890286..625d420 100755
--- a/crypto/gnutls/DETAILS
+++ b/crypto/gnutls/DETAILS
@@ -15,7 +15,7 @@ fi


if [ -z "$GNUTLS_BRANCH" ] || [ "$GNUTLS_BRANCH" == "DEFAULT" ]; then
- GNUTLS_BRANCH="1.6"
+ GNUTLS_BRANCH="2.0"
fi

case $GNUTLS_BRANCH in
@@ -40,9 +40,9 @@ case $GNUTLS_BRANCH in

SOURCE_HASH=sha512:9e610752f14d9fe02d8ef7e9d7bb7ad7c61d68215284e98d8d297a0234dd73a1d8318bf3fda92d2b4df748a42f20fa16beb996d23d3659f15e3dbfeeade837ba
;;
2.0)
- VERSION=2.0.1
+ VERSION=2.0.2
SOURCE=$SPELL-$VERSION.tar.bz2
-
SOURCE_HASH=sha512:3a799cf02bd834281cdb31b3983008c64f3cba21b611b644ae07edf9a9c439bb6b7be8f665da69d8a9545829990d173896df67cb4982c74f8f5ce950b25e77de
+
SOURCE_HASH=sha512:762f2e7d7ba498ecafef8a37ecd2f210c06fea8b035632fc21d10caa204dc09b37af914bda65c41bd67a8cffac5d4f0f0ba7d57fee496566dff03a32c0178063
;;
esac

diff --git a/crypto/gnutls/HISTORY b/crypto/gnutls/HISTORY
index a16f9f0..b5e334d 100644
--- a/crypto/gnutls/HISTORY
+++ b/crypto/gnutls/HISTORY
@@ -1,3 +1,6 @@
+2007-10-23 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 2.0.2, make 2.0 default GNUTLS_BRANCH
+
2007-09-22 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 2.0.1

diff --git a/crypto/gpgdir/BUILD b/crypto/gpgdir/BUILD
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/crypto/gpgdir/BUILD
@@ -0,0 +1 @@
+true
diff --git a/crypto/gpgdir/DEPENDS b/crypto/gpgdir/DEPENDS
new file mode 100755
index 0000000..2431c61
--- /dev/null
+++ b/crypto/gpgdir/DEPENDS
@@ -0,0 +1,3 @@
+depends class-methodmaker &&
+depends gnupg-interface &&
+depends term-readkey
diff --git a/crypto/gpgdir/DETAILS b/crypto/gpgdir/DETAILS
new file mode 100755
index 0000000..b214b65
--- /dev/null
+++ b/crypto/gpgdir/DETAILS
@@ -0,0 +1,18 @@
+ SPELL=gpgdir
+ VERSION=1.5
+ SOURCE=$SPELL-$VERSION.tar.bz2
+ SOURCE_URL[0]=http://www.cipherdyne.org/gpgdir/download/$SOURCE
+
SOURCE_HASH=sha512:31b7c6f4d14c9198afb043326fdb4eb9161ec525e6914f247f7b62512eec5842353059ad3c61f02fd7636fc26e7a0678cb1f8b7123ec4806bc87be4d5ea45424
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+ WEB_SITE=http://www.cipherdyne.org/gpgdir/
+ LICENSE[0]=GPL
+ ENTERED=20071021
+ SHORT="recursively encrypts/decrypts directories using a GPG key"
+cat << EOF
+gpgdir is a Perl script that uses the CPAN GnuPG module to encrypt and
decrypt
+directories using a GPG key specified in ~/.gpgdirrc. It supports recursively
+descending through a directory in order to make sure it encrypts or decrypts
+every file in a directory and all of its subdirectories. All file mtime and
+atime values are preserved across encryption and decryption operations. In
+addition, gpgdir is careful not to encrypt hidden files and directories.
+EOF
diff --git a/crypto/gpgdir/HISTORY b/crypto/gpgdir/HISTORY
new file mode 100644
index 0000000..e0be78b
--- /dev/null
+++ b/crypto/gpgdir/HISTORY
@@ -0,0 +1,3 @@
+2007-10-21 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS, DEPENDS, BUILD, INSTALL, HISTORY: created this spell,
version 1.5
+
diff --git a/crypto/gpgdir/INSTALL b/crypto/gpgdir/INSTALL
new file mode 100755
index 0000000..c05b045
--- /dev/null
+++ b/crypto/gpgdir/INSTALL
@@ -0,0 +1 @@
+./install.pl
diff --git a/crypto/gringotts/BUILD b/crypto/gringotts/BUILD
index fb461e8..9f16871 100755
--- a/crypto/gringotts/BUILD
+++ b/crypto/gringotts/BUILD
@@ -1,9 +1,4 @@
-if [ "$ROOT_FILTER" == "y" ]; then
- OPTS="$OPTS --enable-root-filter"
-fi &&
-if [ "$ENV_CHECK" == "n" ]; then
- OPTS="$OPTS --disable-env-check"
-fi &&
+OPTS="${GRINGOTTS_ENV_CHECK} ${GRINGOTTS_ROOT_FILTER}
${GRINGOTTS_ATTACH_LIMIT} ${OPTS}"

make_single &&
default_build &&
diff --git a/crypto/gringotts/CONFIGURE b/crypto/gringotts/CONFIGURE
index 38958d5..4e29605 100755
--- a/crypto/gringotts/CONFIGURE
+++ b/crypto/gringotts/CONFIGURE
@@ -1,2 +1,6 @@
-config_query ROOT_FILTER "Strictly forbid access to the root user?" y
-config_query ENV_CHECK "Reset environment on startup? (disable this if it
refuses to start)" y
+config_query_option GRINGOTTS_ROOT_FILTER "Strictly forbid access to the
root user?" n \
+ "--enable-root-filter" "--disable-root-filter" &&
+config_query_option GRINGOTTS_ENV_CHECK "Reset environment on startup?
(disable this if it refuses to start)" y \
+ "--enable-env-check" "--disable-env-check" &&
+config_query_option GRINGOTTS_ATTACH_LIMIT "Enable 2Mb limit for attached
files?" y \
+ "--enable-attach-limit" "--disable-attach-limit"
diff --git a/crypto/gringotts/DETAILS b/crypto/gringotts/DETAILS
index 64d5251..9904961 100755
--- a/crypto/gringotts/DETAILS
+++ b/crypto/gringotts/DETAILS
@@ -1,20 +1,11 @@
SPELL=gringotts
- VERSION=1.2.9pre1
- PATCHLEVEL=1
-
- SOURCE=${SPELL}_1.2.8+${VERSION}.orig.tar.gz
- SOURCE_URL[0]=ftp://ftp.debian.org/debian/pool/main/g/gringotts/${SOURCE}
-
SOURCE_HASH=sha512:b8f118668793e5e77dc9719b3f047d1a3a3ea8938cc496ee6b5374776d9bf8217682cc4a1d1bdc5408fd427c06b994b106815332a8a0fda75b607835a84f816c
-
- SOURCE2=gringotts-shlomif-patch-0.4.4.diff
-
SOURCE2_URL[0]=http://www.shlomifish.org/open-source/bits-and-bobs/gringotts-patch/$SOURCE2
-
SOURCE2_HASH=sha512:e0ccb4833b28cccab1ed3a216177457488e35c0249532b19d76631b3a74cc33abd2d0ed64f3c8551cfa7dcd84891f01caf6a349424f9ab091bff4fa2d50d8ea1
-
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-# SOURCE_URL[0]=http://mano.homelinux.org/$SOURCE
-#
SOURCE_URL[0]=http://devel.pluto.linux.it/projects/Gringotts/current/$SOURCE
+ VERSION=1.2.9pre2
+ SOURCE=${SPELL}-${VERSION}.tar.gz
+SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
+ SOURCE_URL[0]=http://download.berlios.de/${SPELL}/${SOURCE}
+ SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
LICENSE[0]=GPL
- WEB_SITE=http://packages.debian.org/stable/admin/gringotts
+ WEB_SITE=http://gringotts.berlios.de/
ENTERED=20020820
KEYWORDS="crypto"
SHORT="Utility that allows you to secure sensitive data"
diff --git a/crypto/gringotts/HISTORY b/crypto/gringotts/HISTORY
index ae3a9e1..6a06941 100644
--- a/crypto/gringotts/HISTORY
+++ b/crypto/gringotts/HISTORY
@@ -1,3 +1,11 @@
+2007-10-12 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 1.2.9pre2
+ changed SOURCE, SOURCE_URL, and WEB_SITE
+ * PRE_BUILD: removed as patch now included upstream.
+ * CONFIGURE: changed config_query to config_query_option
+ added ATTACH_LIMIT
+ * BUILD: changed to use config_query_option
+
2007-01-01 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS, PRE_BUILD: gringotts-shlomif-patch updated to 0.4.4
added it as SOURCE2
diff --git a/crypto/gringotts/PRE_BUILD b/crypto/gringotts/PRE_BUILD
deleted file mode 100755
index 46b4756..0000000
--- a/crypto/gringotts/PRE_BUILD
+++ /dev/null
@@ -1,6 +0,0 @@
-default_pre_build &&
-cd ${SOURCE_DIRECTORY} &&
-unpack_file 2 &&
-
-patch --posix -p0 < ${SOURCE_CACHE}/$SOURCE2
-
diff --git a/crypto/gringotts/gringotts-1.2.9pre2.tar.gz.sig
b/crypto/gringotts/gringotts-1.2.9pre2.tar.gz.sig
new file mode 100644
index 0000000..0b9f521
Binary files /dev/null and b/crypto/gringotts/gringotts-1.2.9pre2.tar.gz.sig
differ
diff --git a/crypto/keychain/DETAILS b/crypto/keychain/DETAILS
index 5944f9d..1019f5b 100755
--- a/crypto/keychain/DETAILS
+++ b/crypto/keychain/DETAILS
@@ -1,9 +1,10 @@
SPELL=keychain
- VERSION=2.6.2
+ VERSION=2.6.8
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://dev.gentoo.org/~agriffis/keychain/$SOURCE
-
SOURCE_HASH=sha512:e1447472a3f21562f3060a2d2df88d71d3e9ee34ee728b8bb3c536bed72ba8dfccf04cffe60c0602793cfed1aa59cc2388d1767351c739ab59cf2d3068ababe7
+ SOURCE_URL[1]=ftp://ftp.freebsd.org/pub/FreeBSD/ports/distfiles/$SOURCE
+
SOURCE_HASH=sha512:bb84ce62b106c785bab98ab3aa7a0ee9b372d0cca0a32bd59be049d47a5b1188521c31a36b5dfa97c8a3782c9ef6789dc72899a01b056c6e5624215309cd3ea9
WEB_SITE=http://www.gentoo.org/proj/en/keychain.xml
ENTERED=20020310
LICENSE[0]=GPL
diff --git a/crypto/keychain/HISTORY b/crypto/keychain/HISTORY
index ad9f529..3690e3c 100644
--- a/crypto/keychain/HISTORY
+++ b/crypto/keychain/HISTORY
@@ -1,3 +1,6 @@
+2007-10-21 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 2.6.8, added SOURCE_URL[1]
+
2006-10-03 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: [automated] Removed UPDATED.

diff --git a/crypto/libgpg-error/DETAILS b/crypto/libgpg-error/DETAILS
index 9b5e406..dedbcb4 100755
--- a/crypto/libgpg-error/DETAILS
+++ b/crypto/libgpg-error/DETAILS
@@ -1,5 +1,5 @@
SPELL=libgpg-error
- VERSION=1.5
+ VERSION=1.6

SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_URL[0]=ftp://ftp.gnupg.org/gcrypt/libgpg-error/$SOURCE
diff --git a/crypto/libgpg-error/HISTORY b/crypto/libgpg-error/HISTORY
index 8cd657b..0f0c4a6 100644
--- a/crypto/libgpg-error/HISTORY
+++ b/crypto/libgpg-error/HISTORY
@@ -1,3 +1,6 @@
+2007-10-29 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 1.6
+
2006-12-01 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.5

diff --git a/crypto/libgringotts/DETAILS b/crypto/libgringotts/DETAILS
index 02fde36..f5a2cc7 100755
--- a/crypto/libgringotts/DETAILS
+++ b/crypto/libgringotts/DETAILS
@@ -1,11 +1,11 @@
SPELL=libgringotts
VERSION=1.2.1
- SOURCE=${SPELL}_${VERSION}.orig.tar.gz
+ SOURCE=${SPELL}-${VERSION}.tar.bz2
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
-
SOURCE_URL[0]=ftp://ftp.debian.org/debian/pool/main/libg/libgringotts/${SOURCE}
+ SOURCE_URL[0]=http://download.berlios.de/gringotts/${SOURCE}
SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
LICENSE[0]=GPL
- WEB_SITE=http://packages.qa.debian.org/libg/libgringotts.html
+ WEB_SITE=http://gringotts.berlios.de/
ENTERED=20021023
KEYWORDS="crypto"
SHORT="libgringotts - library originally developed for Gringotts"
diff --git a/crypto/libgringotts/HISTORY b/crypto/libgringotts/HISTORY
index 79501d0..a4fb9c7 100644
--- a/crypto/libgringotts/HISTORY
+++ b/crypto/libgringotts/HISTORY
@@ -1,3 +1,6 @@
+2007-10-12 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: changed SOURCE, SOURCE_URL, and WEB_SITE
+
2006-07-06 Robin Cook <rcook AT wyrms.net>
* DETAILS: Updated SOURCE, SOURCE_URL[0], WEB_SITE
Removed SOURCE_URL[1], UPDATED, MAINTAINER
diff --git a/crypto/libgringotts/libgringotts-1.2.1.tar.bz2.sig
b/crypto/libgringotts/libgringotts-1.2.1.tar.bz2.sig
new file mode 100644
index 0000000..4ff51a9
Binary files /dev/null and
b/crypto/libgringotts/libgringotts-1.2.1.tar.bz2.sig differ
diff --git a/crypto/libgringotts/libgringotts_1.2.1.orig.tar.gz.sig
b/crypto/libgringotts/libgringotts_1.2.1.orig.tar.gz.sig
deleted file mode 100644
index 70f121a..0000000
Binary files a/crypto/libgringotts/libgringotts_1.2.1.orig.tar.gz.sig and
/dev/null differ
diff --git a/crypto/opencdk/DETAILS b/crypto/opencdk/DETAILS
index d1a1a3c..e6007b8 100755
--- a/crypto/opencdk/DETAILS
+++ b/crypto/opencdk/DETAILS
@@ -1,7 +1,7 @@
SPELL=opencdk

if [ -z "$OPENCDK_BRANCH" ] || [ "$OPENCDK_BRANCH" == "DEFAULT" ]; then
- OPENCDK_BRANCH="0.5"
+ OPENCDK_BRANCH="0.6"
fi

case $OPENCDK_BRANCH in
diff --git a/crypto/opencdk/HISTORY b/crypto/opencdk/HISTORY
index 02bb006..88d0c4b 100644
--- a/crypto/opencdk/HISTORY
+++ b/crypto/opencdk/HISTORY
@@ -1,3 +1,6 @@
+2007-10-23 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: make 0.6 default OPENCDK_BRANCH
+
2007-09-04 Ladislav Hagara <hgr AT vabo.cz>
* PREPARE, DETAILS: added support for new 0.6 branch (0.6.4)
* opencdk.gpg: added, 0.6.4 is signed by key ID BF3DF9B4
diff --git a/crypto/openssl/DETAILS b/crypto/openssl/DETAILS
index 6fb0266..435d9dd 100755
--- a/crypto/openssl/DETAILS
+++ b/crypto/openssl/DETAILS
@@ -1,6 +1,6 @@
SPELL=openssl
- VERSION=0.9.8e
- PATCHLEVEL=1
+ VERSION=0.9.8g
+ PATCHLEVEL=0
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://www.openssl.org/source/$SOURCE
@@ -8,7 +8,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION

SOURCE_URL[2]=ftp://ftp.funet.fi/pub/crypt/cryptography/libs/openssl/source/$SOURCE
SOURCE_URL[3]=ftp://ftp.mirror.ac.uk/sites/ftp.openssl.org/source/$SOURCE
SOURCE_URL[4]=ftp://sunsite.uio.no/pub/security/openssl/source/$SOURCE
-
SOURCE_HASH=sha512:e62f3269b7016e2803d95ccb71b2ef0eadb68d2efb0d9195348b9642b5bc22ceedd8efea2e094c84a51947193e267aefcc24c56be7125baad982068a33411309
+
SOURCE_HASH=sha512:d69a5ea4f95f82845fe75fee98c03cebde20f0fd89442bcd886b4a135f9df9ee2853aa8fb7a037d797a8c2a8c110dd7133913088cafe96b77838f0ae8409794f
WEB_SITE=http://www.openssl.org
ENTERED=20010922
SECURITY_PATCH=2
diff --git a/crypto/openssl/HISTORY b/crypto/openssl/HISTORY
index 19fbe2c..9489408 100644
--- a/crypto/openssl/HISTORY
+++ b/crypto/openssl/HISTORY
@@ -1,3 +1,10 @@
+2007-10-19 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 0.9.8g
+
+2007-10-12 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 0.9.8f
+ * PRE_BUILD, evp_lib.c.diff: removed patch
+
2007-06-19 Thomas Orgis <sobukus AT orgis.org>
* PRE_BUILD: sed the retarded config for not issuing -march=ev6;
fixes alpha
* BUILD: exclude alpha arch from the -O hack, as it is an arch with a
diff --git a/crypto/openssl/PRE_BUILD b/crypto/openssl/PRE_BUILD
index 390c349..8c1bf56 100755
--- a/crypto/openssl/PRE_BUILD
+++ b/crypto/openssl/PRE_BUILD
@@ -1,5 +1,4 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&
# braindead openssl 0.9.8e config: -march=evXX is _not_ valid
-sed -i -e 's/ -march=ev5//' -e 's/ -march=ev56//' -e 's/ -march=ev6//'
config &&
-patch crypto/evp/evp_lib.c < $SPELL_DIRECTORY/evp_lib.c.diff
+sed -i -e 's/ -march=ev5//' -e 's/ -march=ev56//' -e 's/ -march=ev6//' config
diff --git a/crypto/openssl/evp_lib.c.diff b/crypto/openssl/evp_lib.c.diff
deleted file mode 100644
index 416e77d..0000000
--- a/crypto/openssl/evp_lib.c.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- evp_lib.c 2006/11/29 20:47:13 1.10.2.1
-+++ evp_lib.c 2007/02/27 18:42:52 1.10.2.2
-@@ -225,7 +225,7 @@
-
- int EVP_CIPHER_CTX_key_length(const EVP_CIPHER_CTX *ctx)
- {
-- return ctx->cipher->key_len;
-+ return ctx->key_len;
- }
-
- int EVP_CIPHER_nid(const EVP_CIPHER *cipher)
diff --git a/crypto/paperkey/DETAILS b/crypto/paperkey/DETAILS
new file mode 100755
index 0000000..e1a316b
--- /dev/null
+++ b/crypto/paperkey/DETAILS
@@ -0,0 +1,22 @@
+ SPELL=paperkey
+ VERSION=0.7
+ SOURCE=$SPELL-$VERSION.tar.gz
+ SOURCE_URL[0]=http://www.jabberwocky.com/software/$SPELL/$SOURCE
+
SOURCE_HASH=sha512:5cbe80cefced673c5e811521ffdbe03e94b17e0afa5d09da843b68d223105fec04f1dbd21f5a3e26b7768a2fc1a14a41cf7b7ce583c2efd2d2a460fd0a4c81a6
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+ WEB_SITE=http://www.jabberwocky.com/software/paperkey/
+ LICENSE[0]=GPL
+ ENTERED=20071020
+ SHORT="an OpenPGP key archiver"
+cat << EOF
+A reasonable way to achieve a long term backup of OpenPGP (GnuPG, PGP,
+etc) keys is to print them out on paper. Due to metadata and redundancy,
+OpenPGP secret keys are significantly larger than just the "secret
+bits". In fact, the secret key contains a complete copy of the public
+key. Since the public key generally doesn't need to be backed up in this way
+(most people have many copies of it on various keyservers, Web pages, etc),
+only extracting the secret parts can be a real advantage. Paperkey extracts
+just those secret bytes and prints them. To reconstruct, you re-enter those
+bytes (whether by hand or via OCR), and paperkey can use them to transform
+your existing public key into a secret key.
+EOF
diff --git a/crypto/paperkey/HISTORY b/crypto/paperkey/HISTORY
new file mode 100644
index 0000000..380fcc6
--- /dev/null
+++ b/crypto/paperkey/HISTORY
@@ -0,0 +1,3 @@
+2007-10-20 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS, HISTORY: created this spell, version 0.7
+
diff --git a/crypto/putty/DETAILS b/crypto/putty/DETAILS
index 00016dd..d83253c 100755
--- a/crypto/putty/DETAILS
+++ b/crypto/putty/DETAILS
@@ -6,6 +6,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION

SOURCE_HASH=sha512:c557b3f7104b0c8c0ae21b278fbe61880cc43288e2ceb3bf1f155b7b9c70cb2063e3b3212e4c43c88a207b0aa9f9aec10763a353513a9302e0fc97be09ca27d0
WEB_SITE=http://www.chiark.greenend.org.uk/~sgtatham/putty/
ENTERED=20040721
+ PATCHLEVEL=1
LICENSE[0]=MIT
KEYWORDS="telnet ssh crypto"
SHORT="Telnet and SSH client"
diff --git a/crypto/putty/HISTORY b/crypto/putty/HISTORY
index bb70aa7..e1a0009 100644
--- a/crypto/putty/HISTORY
+++ b/crypto/putty/HISTORY
@@ -1,3 +1,7 @@
+2007-10-10 Arjan Bouter <abouter AT sourcemage.org>
+ * desktop/pterm, desktop/putty: added
+ * DETAILS: patchlevel=1
+
2007-04-30 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 0.60

diff --git a/crypto/putty/desktop/pterm.desktop
b/crypto/putty/desktop/pterm.desktop
new file mode 100755
index 0000000..455b41c
--- /dev/null
+++ b/crypto/putty/desktop/pterm.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=Pterm
+Exec=pterm
+Icon=xterm.png
+Terminal=false
+Type=Application
+Categories=Application;XTerminals;
diff --git a/crypto/putty/desktop/putty.desktop
b/crypto/putty/desktop/putty.desktop
new file mode 100755
index 0000000..fe22792
--- /dev/null
+++ b/crypto/putty/desktop/putty.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=PuTTY
+Exec=putty
+Icon=xterm.png
+Terminal=false
+Type=Application
+Categories=Application;Network;
diff --git a/crypto/qca-openssl/BUILD b/crypto/qca-openssl/BUILD
index 52e037b..6472954 100755
--- a/crypto/qca-openssl/BUILD
+++ b/crypto/qca-openssl/BUILD
@@ -1,4 +1,5 @@
-sed -i -e "s:bin/qmake:bin/qt4/qmake:g" $SOURCE_DIRECTORY/configure &&
+QTDIR=/usr &&
+PATH=$QTDIR/bin/qt4:$PATH &&
./configure $OPTS &&
make_single &&
make &&
diff --git a/crypto/qca-openssl/DETAILS b/crypto/qca-openssl/DETAILS
index 69289ac..14dc1cf 100755
--- a/crypto/qca-openssl/DETAILS
+++ b/crypto/qca-openssl/DETAILS
@@ -1,9 +1,9 @@
SPELL=qca-openssl
- VERSION=0.1-20070508
- SOURCE=$SPELL-$VERSION.tar.bz2
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- SOURCE_URL[0]=http://delta.affinix.com/download/qca/2.0/beta5/$SOURCE
-
SOURCE_HASH=sha512:597c3de8c06b8dd93005fb80fb4a8fcece76761f19bf6b646372b8f68bbfd0f0fbf4efa2eb77da95a4c3739af9dd5ef3bda60f1a4baa488db1cd70b59638f9e8
+ VERSION=2.0.0-beta1
+ SOURCE=qca-ossl-$VERSION.tar.bz2
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/qca-ossl-$VERSION
+ SOURCE_URL[0]=http://delta.affinix.com/download/qca/2.0/plugins/$SOURCE
+
SOURCE_HASH=sha512:9825358c547e53bb6b60e27e6b965777b6c68f5e8f17a2e2bb6960c647dd6c0c73572fa968c57915d6d30a7075c3dd09277880a9c1502c3b1319454301680194
LICENSE[0]=GPL
WEB_SITE=http://delta.affinix.com/qca
ENTERED=20050101
diff --git a/crypto/qca-openssl/HISTORY b/crypto/qca-openssl/HISTORY
index 40ae693..7096c7e 100644
--- a/crypto/qca-openssl/HISTORY
+++ b/crypto/qca-openssl/HISTORY
@@ -1,3 +1,9 @@
+2007-11-04 George Sherwood <george AT beernabeer.com>
+ * DETAILS: Updated to version 2.0.0-beta1.
+ * BUILD: Added code to detect qt4.
+ * PRE_BUILD: Added to apply patch.
+ * qca-ossl_fix.patch: Added to fix compilation problem.
+
2007-05-13 George Sherwood <george AT beernabeer.com>
* DETAILS: Updated to version 0.1-20070508

diff --git a/crypto/qca-openssl/PRE_BUILD b/crypto/qca-openssl/PRE_BUILD
new file mode 100755
index 0000000..3ef8b6b
--- /dev/null
+++ b/crypto/qca-openssl/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+patch -p0 < $SCRIPT_DIRECTORY/qca-ossl_fix.patch
diff --git a/crypto/qca-openssl/qca-ossl_fix.patch
b/crypto/qca-openssl/qca-ossl_fix.patch
new file mode 100644
index 0000000..3e34431
--- /dev/null
+++ b/crypto/qca-openssl/qca-ossl_fix.patch
@@ -0,0 +1,10 @@
+--- qca-ossl.cpp.orig 2007-11-04 21:30:46.000000000 +0400
++++ qca-ossl.cpp 2007-11-04 21:31:04.000000000 +0400
+@@ -19,6 +19,7 @@
+ */
+
+ #include <QtCrypto>
++#include <qcaprovider.h>
+
+ #include <QDebug>
+ #include <QtCore/qplugin.h>
diff --git a/crypto/qca2/DETAILS b/crypto/qca2/DETAILS
index 0deaf54..bdfd6c6 100755
--- a/crypto/qca2/DETAILS
+++ b/crypto/qca2/DETAILS
@@ -1,9 +1,9 @@
SPELL=qca2
- VERSION=2.0.0-test4
-
SOURCE_HASH=sha512:1ba92b313e473457d9b80ea0ca895d77ef9a98c21e9ec69e1bdfcd9862760a6e5c66101ed123eae9ee9f6bf81935c1fca62841f7b80dd994c328bd7fdb00d1e1
+ VERSION=2.0.0
+
SOURCE_HASH=sha512:51558a840677a34af4f671785e2a92033193272e6cd4eccb19da499ad69c9f18dc6972de60cdb58cd8c69567685649d09e9490c89e19abf10c8003df1148ee5a
SOURCE=qca-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/qca-$VERSION
- SOURCE_URL[0]=http://delta.affinix.com/download/qca/2.0/test4/$SOURCE
+ SOURCE_URL[0]=http://delta.affinix.com/download/qca/2.0/$SOURCE
LICENSE[0]=GPL
WEB_SITE=http://delta.affinix.com/qca
ENTERED=20050101
diff --git a/crypto/qca2/HISTORY b/crypto/qca2/HISTORY
index 71b7af5..0152c87 100644
--- a/crypto/qca2/HISTORY
+++ b/crypto/qca2/HISTORY
@@ -1,3 +1,6 @@
+2007-10-23 George Sherwood <george AT beernabeer.com>
+ * DETAILS: Updated to version 2.0.0. Fixed SOURCE_URL
+
2007-09-12 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: 2.0.0-test4

diff --git a/crypto/seahorse/DETAILS b/crypto/seahorse/DETAILS
index 4938cdb..9b60a55 100755
--- a/crypto/seahorse/DETAILS
+++ b/crypto/seahorse/DETAILS
@@ -1,13 +1,13 @@
SPELL=seahorse

if [ "$SEAHORSE_DEVEL" == "y" ];then
- VERSION=2.20.0
+ VERSION=2.20.1
SOURCE=$SPELL-$VERSION.tar.bz2
-
SOURCE_HASH=sha512:0b4690878639078250b5e77349d7b1eca1ed852e9b984a704b3545437022dddd536a3ed286d63d2e1182ec0dc33f68204f48aeaa334ffd5d5ab56cf79ab13cd1
+
SOURCE_HASH=sha512:296ed65dc50e3d69a5ceb0c83db59f29119a671eb6d0cf063767be94436eedbf53b4264058ff82cd54d0dbf1c5f70a8d1249930737d0b0db8741ee0c46b7baee
else
- VERSION=2.20.0
+ VERSION=2.20.1
SOURCE=$SPELL-$VERSION.tar.bz2
-
SOURCE_HASH=sha512:0b4690878639078250b5e77349d7b1eca1ed852e9b984a704b3545437022dddd536a3ed286d63d2e1182ec0dc33f68204f48aeaa334ffd5d5ab56cf79ab13cd1
+
SOURCE_HASH=sha512:296ed65dc50e3d69a5ceb0c83db59f29119a671eb6d0cf063767be94436eedbf53b4264058ff82cd54d0dbf1c5f70a8d1249930737d0b0db8741ee0c46b7baee
fi

BRANCH=`echo $VERSION|cut -d . -f 1,2`
diff --git a/crypto/seahorse/HISTORY b/crypto/seahorse/HISTORY
index 52b403e..0aa4199 100644
--- a/crypto/seahorse/HISTORY
+++ b/crypto/seahorse/HISTORY
@@ -1,3 +1,6 @@
+2007-10-16 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 2.20.1 (both stable and devel)
+
2007-09-27 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 2.20.0 (both stable and devel)

diff --git a/crypto/signing-party/DETAILS b/crypto/signing-party/DETAILS
index 4edd5e0..41ea704 100755
--- a/crypto/signing-party/DETAILS
+++ b/crypto/signing-party/DETAILS
@@ -1,8 +1,8 @@
SPELL=signing-party
- VERSION=0.4.7
+ VERSION=0.4.12
SOURCE=${SPELL}_$VERSION.orig.tar.gz

SOURCE_URL[0]=http://ftp.debian.org/debian/pool/main/s/signing-party/$SOURCE
-
SOURCE_HASH=sha512:269ee92e0a0346d9c3929123a56a9961fdd90179353f89627d99a8eaa9c9095e5ea1757ac4e86e2c47180dbec9b78ea6c838749627f4fb40e336c562af878d00
+
SOURCE_HASH=sha512:9011cf609f28a98e3266ec908e48e8f5bf0250f79c57032880f5cf72e5255bdb7a749f02835a2a87ead05a23432a29edd45ddd7a26d6e2da6ccb7690986872e5
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
WEB_SITE=http://pgp-tools.alioth.debian.org/
ENTERED=20061004
diff --git a/crypto/signing-party/HISTORY b/crypto/signing-party/HISTORY
index 7ca5f6f..9cf29d9 100644
--- a/crypto/signing-party/HISTORY
+++ b/crypto/signing-party/HISTORY
@@ -1,3 +1,6 @@
+2007-10-15 Remko van der Vossen <wich AT sourcemage.org>
+ * DETAILS: Version bumped to 0.4.12
+
2006-10-04 Ladislav Hagara <hgr AT vabo.cz>
* *: created this spell, version 0.4.7

diff --git a/crypto/xca/BUILD b/crypto/xca/BUILD
index 3ba82a9..86dcb71 100755
--- a/crypto/xca/BUILD
+++ b/crypto/xca/BUILD
@@ -2,9 +2,11 @@ sedit 's:for lib in lib out:for lib in "" lib out:'
configure &&
sedit 's:/local::' configure &&

sedit 's:mandir=man:mandir=share/man:' doc/Makefile &&
+sedit 's:QTDIR/bin/:QTDIR/bin/qt4:' configure &&
+sedit 's:/qt/Qt /qt4/Qt:/Qt:' configure &&

-export QTDIR="/usr/lib/qt4" &&
-export PATH=${TRACK_ROOT}/usr/bin/qt4:$PATH &&
+export QTDIR="/usr" &&
+export PATH=${TRACK_ROOT}/usr/bin/qt4:$PATH &&

-./configure &&
+./configure &&
make
diff --git a/crypto/xca/DETAILS b/crypto/xca/DETAILS
index b0a5fb8..04939fa 100755
--- a/crypto/xca/DETAILS
+++ b/crypto/xca/DETAILS
@@ -1,9 +1,9 @@
SPELL=xca
- VERSION=0.6.2
+ VERSION=0.6.4
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$SOURCEFORGE_URL/xca/$SOURCE
-
SOURCE_HASH=sha512:9d25c13ee6b6bde6142b144260208416fea4dd0d1b2f8699dee76f9b32468e402b14f45b61c7fdc6d86fc9b2c03fc38b6fb020973970b7ac9f547366e465e34a
+
SOURCE_HASH=sha512:747b23105198c3c6252120e238358ae066f11bdacc9515604d623053a486214b2c109c6e461e659f41960e5520c3f2f7be99209a22fc16f206dca6890c06ac48
LICENSE[0]=BSD
WEB_SITE=http://www.hohnstaedt.de/xca.html
ENTERED=20070205
diff --git a/crypto/xca/HISTORY b/crypto/xca/HISTORY
index b069219..8c07a35 100644
--- a/crypto/xca/HISTORY
+++ b/crypto/xca/HISTORY
@@ -1,3 +1,7 @@
+2007-10-23 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 0.6.4
+ * BUILD: updated
+
2007-04-10 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 0.6.2

diff --git a/database/db/DETAILS b/database/db/DETAILS
index 516559e..3610dc5 100755
--- a/database/db/DETAILS
+++ b/database/db/DETAILS
@@ -1,6 +1,6 @@
SPELL=db
- VERSION=4.6.18
-
SOURCE_HASH=sha512:3721e15b098505549b13e915483e41565d67af16b22de25bf9dd2386aa88826567c20b753473dca4c05d00714f5e7170317718a504dd63d37a77d7c286c0f99a
+ VERSION=4.6.21
+
SOURCE_HASH=sha512:8118218e2eaf9d22e445e551ef184f4610406b81f9257794d14f637d9d12a51a007166b48bf820140c5be287ef61d22a62a16f7702f0d29f385108c40b11ce43
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://download.oracle.com/berkeley-db/$SOURCE
diff --git a/database/db/HISTORY b/database/db/HISTORY
index a3cbe30..da6162d 100644
--- a/database/db/HISTORY
+++ b/database/db/HISTORY
@@ -1,3 +1,9 @@
+2007-10-26 George Sherwood <george AT beernabeer.com>
+ * DETAILS: Updated to version 4.6.21
+
+2007-10-13 George Sherwood <george AT beernabeer.com>
+ * DETAILS: Updated to version 4.6.19
+
2007-08-02 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 4.6.18
note that the format of the logfile has changed
diff --git a/database/firebird/BUILD b/database/firebird/BUILD
index 8dff05a..0c95b1a 100755
--- a/database/firebird/BUILD
+++ b/database/firebird/BUILD
@@ -20,6 +20,10 @@ fi &&
OPTS="${OPTS} ${FB_STAT}" &&
LDFLAGS="$LDFLAGS -lpthread" &&

+#strip -O3 from optimisations, gcc-4.2.2 problem
+ CFLAGS="${CFLAGS/-O3/-O2}" &&
+ CXXFLAGS="${CXXFLAGS/-O3/-O2}" &&
+
./configure \
--prefix=$FB_PREFIX \
$OPTS &&
diff --git a/database/firebird/DETAILS b/database/firebird/DETAILS
index 9d7dfae..94aa7d1 100755
--- a/database/firebird/DETAILS
+++ b/database/firebird/DETAILS
@@ -9,9 +9,9 @@ case $FB_VER in
# FORCE_DOWNLOAD=on
#;;
2.1)
- VERSION=2.1.0.15999-Beta1
+ VERSION=2.1.0.16780-Beta2
SOURCE=${SPELL/f/F}-$VERSION.tar.bz2
-
SOURCE_HASH=sha512:fe6dfc42fb01ed1cc83c02cbbf49bcc5541c638d76a29eed405cea1185a45fa560e7d8df6364304d7c7304c870cdd05e86d38a2234dd058d15fa302c49df416f
+
SOURCE_HASH=sha512:ada26223d237cb1abc0797ad1dd780be1c9190da0b51089175177eb9e47eb44fcff1160427ccd27918e66ef91b5f4c671a4e12f2fe0a542436d3c5d9d6d14aa4
SOURCE_URL[0]=http://firebirdsql.org/download/prerelease/source/$SOURCE
# SOURCE_URL[0]=$SOURCEFORGE_URL/firebird/$SOURCE
SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELL/f/F}-${VERSION}
diff --git a/database/firebird/HISTORY b/database/firebird/HISTORY
index ebec5ac..5d85d5b 100644
--- a/database/firebird/HISTORY
+++ b/database/firebird/HISTORY
@@ -1,3 +1,8 @@
+2007-10-17 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 2.1.0.16780-Beta2
+ * BUILD: strip -O3 from optimisations, gcc-4.2.2 problem
+ * fb2.1.patch.bz2: updated
+
2007-09-26 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 2.0.3.12981-1
* REPAIR*: delete obsolete files
diff --git a/database/firebird/fb2.1.patch.bz2
b/database/firebird/fb2.1.patch.bz2
index f32c6e5..b5def3a 100644
Binary files a/database/firebird/fb2.1.patch.bz2 and
b/database/firebird/fb2.1.patch.bz2 differ
diff --git a/database/flamerobin/BUILD b/database/flamerobin/BUILD
index 2b14e7f..43227d8 100755
--- a/database/flamerobin/BUILD
+++ b/database/flamerobin/BUILD
@@ -1,3 +1,4 @@
+chmod u+x configure &&
OPTS="--enable-shared $OPTS" &&
mkdir release &&
cd release &&
diff --git a/database/flamerobin/DETAILS b/database/flamerobin/DETAILS
index 876214e..37502b3 100755
--- a/database/flamerobin/DETAILS
+++ b/database/flamerobin/DETAILS
@@ -1,6 +1,6 @@
SPELL=flamerobin
- VERSION=0.7.6
-
SOURCE_HASH=sha512:1ae794dea0e7f44d69796e01d94b8113f458baf5b8f596e13983a04907dd789de0cc2635dc73e2840417080fc146c2d3cd805f343d1c2929ec27c7d5dd1a5b60
+ VERSION=0.8.1
+
SOURCE_HASH=sha512:2468b6598f3d0346204654c72454ae2472105c27e0271e30cd3cd3f9a03f86e453c75a760b46c620751d2dbe6ece5695c9b37eaa8fd5fda863e4fc7aa816473e
SOURCE=$SPELL-$VERSION-src.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION-src
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
diff --git a/database/flamerobin/HISTORY b/database/flamerobin/HISTORY
index 62b531d..8622a28 100644
--- a/database/flamerobin/HISTORY
+++ b/database/flamerobin/HISTORY
@@ -1,3 +1,10 @@
+2007-10-18 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.8.1
+ * BUILD: make configure executable
+
+2007-10-11 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.8.0
+
2006-11-22 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.7.6

diff --git a/database/libiodbc/DEPENDS b/database/libiodbc/DEPENDS
index 04a1cff..1d77975 100755
--- a/database/libiodbc/DEPENDS
+++ b/database/libiodbc/DEPENDS
@@ -1 +1 @@
-optional_depends gtk+ "--enable-gui" "--disable-gui" "create GUI installer?"
+optional_depends gtk+2 "--enable-gui" "--disable-gui" "create GUI installer?"
diff --git a/database/libiodbc/DETAILS b/database/libiodbc/DETAILS
index ded5f7a..79b208d 100755
--- a/database/libiodbc/DETAILS
+++ b/database/libiodbc/DETAILS
@@ -1,6 +1,6 @@
SPELL=libiodbc
- VERSION=3.52.5
-
SOURCE_HASH=sha512:f181c2fd59cae3faaeb642d7d01227d91a0142d12968e61ad5f848ccbbd416ca889e7bc0e7864dbfff94107a7894e4170044507093e59a7bf4834d5059a434a4
+ VERSION=3.52.6
+
SOURCE_HASH=sha512:9cd2faba9bf9a7b016e908d2354996c30b98a3baf43e0b08d9a53c537785ac098724e5b184a3ffb302c36b95164509b6e7e18040a97a992d5fb611a1f60b5f7a
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_URL[1]=$SOURCEFORGE_URL/iodbc/$SOURCE
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/database/libiodbc/HISTORY b/database/libiodbc/HISTORY
index f474c0d..5a3e980 100644
--- a/database/libiodbc/HISTORY
+++ b/database/libiodbc/HISTORY
@@ -1,3 +1,7 @@
+2007-10-13 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 3.52.6
+ * DEPENDS: add gtk+2, remove gtk+
+
2007-08-02 Robin Cook <rcook AT wyrms.net>
* BUILD: add make_single

diff --git a/database/qdbm/DETAILS b/database/qdbm/DETAILS
index 7580665..c40df64 100755
--- a/database/qdbm/DETAILS
+++ b/database/qdbm/DETAILS
@@ -1,6 +1,6 @@
SPELL=qdbm
- VERSION=1.8.75
-
SOURCE_HASH=sha512:e0a05ab963e3b45a77435adc65ecb47a85f6a345330e395c6e1f22c7c4a9ba454ce33ecd47f9669ec8a9f0f4fa1b6c80521a34d6ec2f0fb4ae94a9984b2e7d69
+ VERSION=1.8.76
+
SOURCE_HASH=sha512:6d071d5bf12d5f28cd5356ceed40e1cb55320a387197ecfd565e245d7ee0034d4c0b8b92396f1acdf1fa93cfcd214873d544fb7fe235f5df98032436cc771097
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://qdbm.sourceforge.net/$SOURCE
diff --git a/database/qdbm/HISTORY b/database/qdbm/HISTORY
index 09f1ccd..42a2eb9 100644
--- a/database/qdbm/HISTORY
+++ b/database/qdbm/HISTORY
@@ -1,3 +1,6 @@
+2007-10-16 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.8.76
+
2007-03-05 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.8.75

diff --git a/database/sqlite/DETAILS b/database/sqlite/DETAILS
index b4d7f94..88c48e2 100755
--- a/database/sqlite/DETAILS
+++ b/database/sqlite/DETAILS
@@ -1,11 +1,11 @@
SPELL=sqlite
- VERSION=3.4.2
-
SOURCE_HASH=sha512:377a1493d7c9a9c39867a2abd50f7546f19fea5e2e8bb816bc8c20f3987d23816782770f423127f11b769907c8e7014198365a1f807ec2882e12016893195eed
+ VERSION=3.5.2
+
SOURCE_HASH=sha512:976b68d7e1353a151099a50360d437f5cd0ac50a5dffdeab71a473c1cc8528fa111c8cb40e1f797c512febd87ed08f19ac73173a0abfd74f22ca761a2eb55865
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE=$SPELL-$VERSION.tar.gz
- SOURCE_URL[0]=http://www.hwaci.com/sw/sqlite/$SOURCE
+ SOURCE_URL[0]=http://sqlite.org/$SOURCE
LICENSE[0]=PD
- WEB_SITE=http://www.hwaci.com/sw/sqlite/
+ WEB_SITE=http://www.sqlite.org
ENTERED=20011016
KEYWORDS="sql database"
SHORT='An SQL engine in a C library'
diff --git a/database/sqlite/HISTORY b/database/sqlite/HISTORY
index bce9cab..e015559 100644
--- a/database/sqlite/HISTORY
+++ b/database/sqlite/HISTORY
@@ -1,3 +1,10 @@
+2007-11-06 George Sherwood <george AT beernabeer.com>
+ * DETAILS: Updated to verison 3.5.2
+ Updated SOURCE_URL and WEB_SITE
+
+2007-10-10 George Sherwood <george AT beernabeer.com>
+ * DETAILS: Updated to version 3.5.1
+
2007-08-14 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 3.4.2

diff --git a/devel/anjuta/DETAILS b/devel/anjuta/DETAILS
index 29d7b11..908c48e 100755
--- a/devel/anjuta/DETAILS
+++ b/devel/anjuta/DETAILS
@@ -8,8 +8,7 @@ then
SOURCE_URL[0]=cvs://:pserver:anonymous AT anoncvs.gnome.org:/cvs/gnome:anjuta
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-cvs
else
- SPELL=anjuta
- VERSION=2.2.1
+ VERSION=2.2.2
BRANCH=`echo $VERSION|cut -d . -f 1,2`
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_URL[0]=$GNOME_URL/sources/$SPELL/$BRANCH/$SOURCE
diff --git a/devel/anjuta/HISTORY b/devel/anjuta/HISTORY
index 6d73b5f..aa48935 100644
--- a/devel/anjuta/HISTORY
+++ b/devel/anjuta/HISTORY
@@ -1,3 +1,7 @@
+2007-10-24 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 2.2.2
+ removed redundent SPELL
+
2007-09-25 David Brown <dmlb2000 AT gmail.com>
* DETAILS: updated to 2.2.1

diff --git a/devel/anjuta/anjuta-2.2.1.tar.bz2.sig
b/devel/anjuta/anjuta-2.2.1.tar.bz2.sig
deleted file mode 100644
index 10dd8fc..0000000
Binary files a/devel/anjuta/anjuta-2.2.1.tar.bz2.sig and /dev/null differ
diff --git a/devel/anjuta/anjuta-2.2.2.tar.bz2.sig
b/devel/anjuta/anjuta-2.2.2.tar.bz2.sig
new file mode 100644
index 0000000..d39a2e6
Binary files /dev/null and b/devel/anjuta/anjuta-2.2.2.tar.bz2.sig differ
diff --git a/devel/clisp/BUILD b/devel/clisp/BUILD
index d239b0a..8da9282 100755
--- a/devel/clisp/BUILD
+++ b/devel/clisp/BUILD
@@ -1,24 +1,3 @@
-#
-# This unset is needed to fix:
-# configure: loading cache ../config.cache
-# configure: error: `CFLAGS' has changed since the previous run:
-# configure: former value: -O -march=pentium4 -mmmx -mfpmath=sse -msse
-# -msse2 -pipe -DPIC -fPIC -Os
-# configure: current value: -W -Wswitch -Wcomment -Wpointer-arith
-Wimplicit
-# -Wreturn-type -Wmissing-declarations -Wno-sign-compare -O2
-# -fexpensive-optimizations -DUNICODE -DDYNAMIC_FFI -I.
-# configure: error: changes in the environment can compromise the build
-# configure: error: run `make distclean' and/or `rm ../config.cache' and
start
-# over
-#
-# The prior symlink below to fix it started causing problems with clisp 2.37
-# and libsigsegv support.
-#
-#ln -sf /dev/null src/config.cache &&
-#
-
-unset CFLAGS &&
-
./configure --prefix=$INSTALL_ROOT/usr \
--with-dynamic-ffi \
$OPTS &&
diff --git a/devel/clisp/DETAILS b/devel/clisp/DETAILS
index 71f96c1..37c2719 100755
--- a/devel/clisp/DETAILS
+++ b/devel/clisp/DETAILS
@@ -1,5 +1,5 @@
SPELL=clisp
- VERSION=2.41a
+ VERSION=2.42
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE2=$SOURCE.sig
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-${VERSION//a/}
@@ -7,7 +7,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-${VERSION//a/}
SOURCE2_URL[0]=$GNU_URL/$SPELL/release/${VERSION//a/}/$SOURCE2
SOURCE2_IGNORE=signature
LICENSE[0]=GPL
- SOURCE_GPG=gnu-verified.gpg:$SOURCE2:VERIFIED_UPSTREAM_KEY
+ SOURCE_GPG=gnu.gpg:$SOURCE2:UPSTREAM_KEY
WEB_SITE=http://clisp.sourceforge.net/
KEYWORDS="lisp devel"
ENTERED=20020730
diff --git a/devel/clisp/HISTORY b/devel/clisp/HISTORY
index b1905b1..fa55837 100644
--- a/devel/clisp/HISTORY
+++ b/devel/clisp/HISTORY
@@ -1,3 +1,10 @@
+2007-10-24 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: Updated to 2.42
+ New key FDAA9CC7 Sam Steingold <sam.steingold AT gmail.com> has not
+ been verified other than coming from
+ ftp://ftp.gnu.org/gnu/gnu-keyring.gpg
+ * BUILD: unset fix no longer required
+
2007-05-04 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: Fixed typo in SOURCE2_URL which broke downloading (double
//)
Bug #13755
diff --git a/devel/darcs/DEPENDS b/devel/darcs/DEPENDS
index 7fdfd6b..490d4f4 100755
--- a/devel/darcs/DEPENDS
+++ b/devel/darcs/DEPENDS
@@ -1,4 +1,4 @@
-depends GHC &&
+depends ghc &&
depends haskell-quickcheck &&
depends haskell-mtl &&
depends haskell-html
diff --git a/devel/darcs/HISTORY b/devel/darcs/HISTORY
index 20bc7f9..8569493 100644
--- a/devel/darcs/HISTORY
+++ b/devel/darcs/HISTORY
@@ -1,3 +1,6 @@
+2007-11-04 Alexander Tsamutali <astsmtl AT gmail.com>
+ * DEPENDS: Now depends on ghc instead of GHC
+
2007-08-31 Alexander Tsamutali <astsmtl AT gmail.com>
* DETAILS: Updated to 1.0.9
* DEPENDS: Added some missing dependencies
diff --git a/devel/doxygen/DETAILS b/devel/doxygen/DETAILS
index f0e395b..3a8db38 100755
--- a/devel/doxygen/DETAILS
+++ b/devel/doxygen/DETAILS
@@ -1,5 +1,5 @@
SPELL=doxygen
- VERSION=1.5.3
+ VERSION=1.5.4
SOURCE=$SPELL-$VERSION.src.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=ftp://ftp.stack.nl/pub/users/dimitri/$SOURCE
diff --git a/devel/doxygen/HISTORY b/devel/doxygen/HISTORY
index 8010a21..ab5b905 100644
--- a/devel/doxygen/HISTORY
+++ b/devel/doxygen/HISTORY
@@ -1,3 +1,6 @@
+2007-11-02 George Sherwood <george AT beernabeer.com>
+ * DETAILS: Updated to version 1.5.4
+
2007-07-28 George Sherwood <george AT beernabeer.com>
* DETAILS: updated spell to 1.5.3

diff --git a/devel/doxygen/doxygen-1.5.3.src.tar.gz.sig
b/devel/doxygen/doxygen-1.5.3.src.tar.gz.sig
deleted file mode 100644
index 8703bce..0000000
Binary files a/devel/doxygen/doxygen-1.5.3.src.tar.gz.sig and /dev/null differ
diff --git a/devel/doxygen/doxygen-1.5.4.src.tar.gz.sig
b/devel/doxygen/doxygen-1.5.4.src.tar.gz.sig
new file mode 100644
index 0000000..3bc4e73
Binary files /dev/null and b/devel/doxygen/doxygen-1.5.4.src.tar.gz.sig differ
diff --git a/devel/gdb/BUILD b/devel/gdb/BUILD
index 3557b9e..f1f546b 100755
--- a/devel/gdb/BUILD
+++ b/devel/gdb/BUILD
@@ -2,4 +2,5 @@ if [[ ${SMGL_COMPAT_ARCHS[1]} == x86_64 ]]
then
OPTS="--host=x86_64-pc-linux-gnu $OPTS"
fi &&
+OPTS="$OPTS --disable-werror" &&
default_build
diff --git a/devel/gdb/DETAILS b/devel/gdb/DETAILS
index 879017c..6c82787 100755
--- a/devel/gdb/DETAILS
+++ b/devel/gdb/DETAILS
@@ -1,5 +1,5 @@
SPELL=gdb
- VERSION=6.6
+ VERSION=6.7.1
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE2=$SOURCE.sig
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/devel/gdb/HISTORY b/devel/gdb/HISTORY
index 3dc8033..69cd89d 100644
--- a/devel/gdb/HISTORY
+++ b/devel/gdb/HISTORY
@@ -1,3 +1,10 @@
+2007-10-30 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 6.7.1
+
+2007-10-13 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 6.7
+ * BUILD: add --disable-werror
+
2007-03-01 Treeve Jelbert <treeve AT sourcemage.org>
* INSTALL: added, also install libgdb.a (needed by fpc)

diff --git a/devel/geany/DETAILS b/devel/geany/DETAILS
index ba575a2..9b38bad 100755
--- a/devel/geany/DETAILS
+++ b/devel/geany/DETAILS
@@ -1,9 +1,9 @@
SPELL=geany
- VERSION=0.11
+ VERSION=0.12
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
-
SOURCE_HASH=sha512:5818af4c50b5de1472dd83af50a5120dab88ed4c4e0aab9a74a6c969988b7fea33a41decd2977f2a1fcf800e9d85e91e7b7b6f5e8709904dd2d87fc3995acefc
+
SOURCE_HASH=sha512:26e98b6ea620260edca26ddd72fcf2566e6baf75f3c6fcda89b584c75fd5151e37394e6319ef1a9c94776615629b6b34aa4439570903da98958137ed950b1161
LICENSE[0]=GPL
WEB_SITE=http://geany.uvena.de/
ENTERED=20051121
diff --git a/devel/geany/HISTORY b/devel/geany/HISTORY
index 071ada1..a317d0c 100644
--- a/devel/geany/HISTORY
+++ b/devel/geany/HISTORY
@@ -1,3 +1,6 @@
+2007-10-13 George Sherwood <george AT beernabeer.com>
+ * DETAILS: Updated to version 0.12
+
2007-05-22 George Sherwood <george AT beernabeer.com>
* DETAILS: updated spell to 0.11

diff --git a/devel/ghc/BUILD b/devel/ghc/BUILD
index 723163d..6ff4305 100755
--- a/devel/ghc/BUILD
+++ b/devel/ghc/BUILD
@@ -8,7 +8,7 @@ if [[ $SOURCE2 != "" ]] ; then
cd ghc-bin &&
./configure &&
if [ "$(uname -m)" == x86_64 ]; then
- echo 'SplitObjs=NO' > ../$SPELL-$VERSION/mk/build.mk
+ echo 'SplitObjs = NO' >> ../$SPELL-$VERSION/mk/build.mk
fi &&
make in-place &&
GHC_DIR=$PWD/bin/$ARCH-unknown-linux/ghc &&
diff --git a/devel/ghc/CONFIGURE b/devel/ghc/CONFIGURE
new file mode 100755
index 0000000..8bfa193
--- /dev/null
+++ b/devel/ghc/CONFIGURE
@@ -0,0 +1,4 @@
+message "${MESSAGE_COLOR}GHC's build procedure takes a fair amount of time.
+It's possible to speed up build by disabling optimisations,
+but the resulting compiler will be slower!${DEFAULT_COLOR}"
+config_query GHC_NO_OPTS "Disable optimisations?" n
diff --git a/devel/ghc/HISTORY b/devel/ghc/HISTORY
index 3f50438..5373575 100644
--- a/devel/ghc/HISTORY
+++ b/devel/ghc/HISTORY
@@ -1,3 +1,7 @@
+2007-10-30 Alexander Tsamutali <astsmtl AT gmail.com>
+ * CONFIGURE, PRE_BUILD, build.mk.no-opts:
+ Added option for quick unoptimised build
+
2007-08-25 Alexander Tsamutali <astsmtl AT gmail.com>
* PRE_RESURRECT, POST_RESURRECT: Added to protect package.conf

diff --git a/devel/ghc/PRE_BUILD b/devel/ghc/PRE_BUILD
index 133f2bf..122200e 100755
--- a/devel/ghc/PRE_BUILD
+++ b/devel/ghc/PRE_BUILD
@@ -6,4 +6,8 @@ if [[ $SOURCE2 != "" ]] ; then
mv $SPELL-$VERSION ghc-bin
fi &&

-unpack_file
+unpack_file &&
+
+if [[ $GHC_NO_OPTS == "y" ]] ; then
+ cp -v ${SCRIPT_DIRECTORY}/build.mk.no-opts
${SOURCE_DIRECTORY}/${SPELL}-${VERSION}/mk/build.mk
+fi
diff --git a/devel/ghc/build.mk.no-opts b/devel/ghc/build.mk.no-opts
new file mode 100644
index 0000000..6b93e49
--- /dev/null
+++ b/devel/ghc/build.mk.no-opts
@@ -0,0 +1,6 @@
+# Provides options for very quick unoptimised build.
+
+SRC_HC_OPTS = -H64m -O0
+GhcLibHcOpts = -O -fasm
+GhcLibWays =
+SplitObjs = NO
diff --git a/devel/git/DETAILS b/devel/git/DETAILS
index 770a18a..a97c3a5 100755
--- a/devel/git/DETAILS
+++ b/devel/git/DETAILS
@@ -1,5 +1,5 @@
SPELL=git
- VERSION=1.5.3.3
+ VERSION=1.5.3.5
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE2=$SOURCE.sign
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/devel/git/HISTORY b/devel/git/HISTORY
index 0763b05..add9c25 100644
--- a/devel/git/HISTORY
+++ b/devel/git/HISTORY
@@ -1,3 +1,9 @@
+2007-11-01 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.5.3.5
+
+2007-10-04 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 1.5.3.4
+
2007-09-30 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.5.3.3

diff --git a/devel/haddock/DEPENDS b/devel/haddock/DEPENDS
index d1930b6..8eace53 100755
--- a/devel/haddock/DEPENDS
+++ b/devel/haddock/DEPENDS
@@ -1 +1 @@
-depends GHC
+depends ghc
diff --git a/devel/haddock/HISTORY b/devel/haddock/HISTORY
index 3cad0f5..8946a00 100644
--- a/devel/haddock/HISTORY
+++ b/devel/haddock/HISTORY
@@ -1,3 +1,6 @@
+2007-11-04 Alexander Tsamutali <astsmtl AT gmail.com>
+ * DEPENDS: Now depends on ghc instead of GHC
+
2006-10-03 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: [automated] Removed UPDATED.

diff --git a/devel/meld/DETAILS b/devel/meld/DETAILS
index 20590fd..799c03f 100755
--- a/devel/meld/DETAILS
+++ b/devel/meld/DETAILS
@@ -1,15 +1,16 @@
SPELL=meld
- VERSION=1.1.4
+ VERSION=1.1.5.1
BRANCH=$(echo $VERSION|cut -d. -f1,2)
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$GNOME_URL/sources/$SPELL/$BRANCH/$SOURCE
-
SOURCE_HASH=sha512:f663945a8161508e77fb09efcabf2356d27b47371b4df065dcf8bdebe07f112c7123665f03c13eb3e2531994366823a888947a6a89ea15db2522bd938d4824b2
+ SOURCE_GPG="gurus.gpg:$SOURCE.sig:WORKS_FOR_ME"
+#
SOURCE_HASH=sha512:f663945a8161508e77fb09efcabf2356d27b47371b4df065dcf8bdebe07f112c7123665f03c13eb3e2531994366823a888947a6a89ea15db2522bd938d4824b2
+ LICENSE[0]=GPL
+ KEYWORDS="gnome devel"
WEB_SITE=http://meld.sourceforge.net/
ENTERED=20030805
DOCS="changelog AUTHORS COPYING TODO.txt"
- LICENSE[0]=GPL
- KEYWORDS="gnome devel"
SHORT='Meld is a GNOME 2 visual diff and merge tool'
cat << EOF
Meld is a GNOME 2 visual diff and merge tool. It integrates especially
diff --git a/devel/meld/HISTORY b/devel/meld/HISTORY
index 34a6361..75c4260 100644
--- a/devel/meld/HISTORY
+++ b/devel/meld/HISTORY
@@ -1,3 +1,6 @@
+2007-10-02 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: Updated to 1.1.5.1
+
2006-10-09 Anton Brondz <dinolinux AT sourcemage.org>
* DETAILS: updated to 1.1.4

diff --git a/devel/meld/meld-1.1.5.1.tar.bz2.sig
b/devel/meld/meld-1.1.5.1.tar.bz2.sig
new file mode 100644
index 0000000..240d66f
Binary files /dev/null and b/devel/meld/meld-1.1.5.1.tar.bz2.sig differ
diff --git a/devel/openfst/BUILD b/devel/openfst/BUILD
new file mode 100755
index 0000000..c01dff1
--- /dev/null
+++ b/devel/openfst/BUILD
@@ -0,0 +1,7 @@
+
+cd fst &&
+make
+# default_build
+# ./configure --prefix=${INSTALL_ROOT}/usr $OPTS &&
+# make
+
diff --git a/devel/openfst/DEPENDS b/devel/openfst/DEPENDS
new file mode 100755
index 0000000..33f8005
--- /dev/null
+++ b/devel/openfst/DEPENDS
@@ -0,0 +1,2 @@
+depends g++
+
diff --git a/devel/openfst/DETAILS b/devel/openfst/DETAILS
new file mode 100755
index 0000000..2ec02fb
--- /dev/null
+++ b/devel/openfst/DETAILS
@@ -0,0 +1,31 @@
+ SPELL=openfst
+ SPELLX=OpenFst
+ VERSION=beta-20070801
+
SOURCE_HASH=sha512:842b0bf5c97f8ce19338cda0896d21d265e935f4dae9a53f502a7499a25f60e99ce0f2331f8f5b8042b0b2da4147b8847ca3b36103df7bdcb083ba3553f5c8e7
+ SOURCE=$SPELLX-$VERSION.tgz
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX
+ WEB_SITE=http://www.openfst.org/
+
SOURCE_URL[0]=http://128.122.80.210/~openfst/twiki/pub/FST/FstDownload/$SOURCE
+ LICENSE[0]=APACHE
+ ENTERED=20071101
+ KEYWORDS="library pattern"
+ SHORT="Weighted finite-state transducers"
+cat << EOF
+OpenFst is a library for constructing, combining, optimizing, and searching
+weighted finite-state transducers (FSTs). Weighted finite-state transducers
+are automata where each transition has an input label, an output label, and
+a weight. The more familiar finite-state acceptor is represented as a
+transducer with each transition's input and output label equal. Finite-state
+acceptors are used to represent sets of strings (specifically, regular or
+rational sets); finite-state transducers are used to represent binary
relations
+between pairs of strings (specifically, rational transductions). The weights
+can be used to represent the cost of taking a particular transition.
+ FSTs have key applications in speech recognition and synthesis, machine
+translation, optical character recognition, pattern matching, string
+processing, machine learning, information extraction and retrieval among
+others. Often a weighted transducer is used to represent a probabilistic
model
+(e.g., an n-gram model, pronunciation model). FSTs can be optimized by
+determinization and minimization, models can be applied to hypothesis sets
+(also represented as automata) or cascaded by finite-state composition, and
the
+best results can be selected by shortest-path algorithms.
+EOF
diff --git a/devel/openfst/HISTORY b/devel/openfst/HISTORY
new file mode 100644
index 0000000..bcbdc01
--- /dev/null
+++ b/devel/openfst/HISTORY
@@ -0,0 +1,4 @@
+2007-11-01 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version -beta-20070801
+ spell created
+
diff --git a/devel/openfst/INSTALL b/devel/openfst/INSTALL
new file mode 100755
index 0000000..7e5c955
--- /dev/null
+++ b/devel/openfst/INSTALL
@@ -0,0 +1,12 @@
+#default_install
+cd $SOURCE_DIRECTORY/fst &&
+cp lib/fstlib.h $INSTALL_ROOT/usr/include &&
+#DEST=$INSTALL_ROOT/usr/lib/fst &&
+#mkdir -p $DEST &&
+cp {bin,lib}/*.so $INSTALL_ROOT/usr/lib &&
+for FF in bin/fst*; do
+ if [ -x $FF ]; then
+# ls -l $FF
+ cp $FF $INSTALL_ROOT/usr/bin
+ fi
+done
diff --git a/devel/phpmyadmin/DETAILS b/devel/phpmyadmin/DETAILS
index bd4d513..b39489f 100755
--- a/devel/phpmyadmin/DETAILS
+++ b/devel/phpmyadmin/DETAILS
@@ -1,7 +1,7 @@
SPELL=phpmyadmin
- VERSION=2.11.1
- SECURITY_PATCH=7
-
SOURCE_HASH=sha512:c47f529e0f4de9bdf38633a1fff15c9a0f8f27a2ccd30f93a46a447f7df29f578291787ef3f6199b976c207d148a8495e3584b5a2ce9bf4f932b99c09028303c
+ VERSION=2.11.2.2
+ SECURITY_PATCH=10
+
SOURCE_HASH=sha512:38239b623e094adb9e83857861c8824bc62a9ab7f72619d698bd9dd1deb33ee8bb94415383d4e412aff4fbd45e67c7ab12071a9440e56e8903f5d8b27d1d2af8
SOURCE=phpMyAdmin-$VERSION-all-languages.tar.bz2
# SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
SOURCE_DIRECTORY=$BUILD_DIRECTORY/phpMyAdmin-$VERSION-all-languages
diff --git a/devel/phpmyadmin/HISTORY b/devel/phpmyadmin/HISTORY
index 271bbab..ae6e047 100644
--- a/devel/phpmyadmin/HISTORY
+++ b/devel/phpmyadmin/HISTORY
@@ -1,3 +1,19 @@
+2007-11-21 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 2.11.2.2, SECURITY_PATCH=10
+ http://www.phpmyadmin.net/home_page/security.php?issue=PMASA-2007-8
+
+2007-11-11 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 2.11.2.1, SECURITY_PATCH=9
+ http://www.phpmyadmin.net/home_page/security.php?issue=PMASA-2007-7
+
+2007-11-02 George Sherwood <george AT beernabeer.com>
+ * DETAILS: Updated to version 2.11.2
+
+2007-10-19 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 2.11.1.2, SECURITY_PATCH=8
+ http://www.phpmyadmin.net/home_page/security.php?issue=PMASA-2007-5
+ http://www.phpmyadmin.net/home_page/security.php?issue=PMASA-2007-6
+
2007-09-21 George Sherwood <george AT beernabeer.com>
* DETAILS: Updated to version 2.11.1

diff --git a/devel/pkgconfig/DEPENDS b/devel/pkgconfig/DEPENDS
new file mode 100755
index 0000000..ba12e96
--- /dev/null
+++ b/devel/pkgconfig/DEPENDS
@@ -0,0 +1,4 @@
+optional_depends glib2 \
+ "--with-installed-glib" \
+ "--without-installed-glib" \
+ "to use system GLib"
diff --git a/devel/pkgconfig/HISTORY b/devel/pkgconfig/HISTORY
index 06c2e12..04854f7 100644
--- a/devel/pkgconfig/HISTORY
+++ b/devel/pkgconfig/HISTORY
@@ -1,3 +1,6 @@
+2007-11-05 Juuso Alasuutari <iuso AT sourcemage.org>
+ * DEPENDS: Added, optionally depend on glib2 for system GLib.
+
2007-08-29 Arwed v. Merkatz <v.merkatz AT gmx.net>
* BUILD, INSTALL, profile.d/pkgconfig.sh: removed, the default pc-path
works now and those simply break it
diff --git a/devel/qt4pas/DETAILS b/devel/qt4pas/DETAILS
index bdec680..0773811 100755
--- a/devel/qt4pas/DETAILS
+++ b/devel/qt4pas/DETAILS
@@ -1,6 +1,6 @@
SPELL=qt4pas
- VERSION=V1.51_Qt4.3.1
-
SOURCE_HASH=sha512:3cdb5b5db3a1d1649c727cd34e321c7a12ae4c17940c406c2e094e411bccaccdd989210369c31208c29eccf94516def7f23762ad2534e68e0f966a4854f1d3d9
+ VERSION=V1.54_Qt4.3.1
+
SOURCE_HASH=sha512:c889a0cd38f10bb42a2183327803b9456658897d38435227de8022e1009543888ba8c4d554ea0f063404aa957744d98f404fd08e05f016280f4f45ac6d9fb5fd
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://users.pandora.be/Jan.Van.hijfte/qtforfpc/$SOURCE
diff --git a/devel/qt4pas/HISTORY b/devel/qt4pas/HISTORY
index 0cf1511..97a7b9b 100644
--- a/devel/qt4pas/HISTORY
+++ b/devel/qt4pas/HISTORY
@@ -1,3 +1,9 @@
+2007-10-24 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version V1.54_Qt4.3.1
+
+2007-10-14 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version V1.53_Qt4.3.1
+
2007-09-25 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version V1.51_Qt4.3.1

diff --git a/devel/spidermonkey/BUILD b/devel/spidermonkey/BUILD
new file mode 100755
index 0000000..8df9d5d
--- /dev/null
+++ b/devel/spidermonkey/BUILD
@@ -0,0 +1,2 @@
+cd src &&
+make -f Makefile.ref BUILD_OPT=1
diff --git a/devel/spidermonkey/DEPENDS b/devel/spidermonkey/DEPENDS
new file mode 100755
index 0000000..4bf6394
--- /dev/null
+++ b/devel/spidermonkey/DEPENDS
@@ -0,0 +1 @@
+depends nspr
diff --git a/devel/spidermonkey/DETAILS b/devel/spidermonkey/DETAILS
new file mode 100755
index 0000000..2522c31
--- /dev/null
+++ b/devel/spidermonkey/DETAILS
@@ -0,0 +1,15 @@
+ SPELL=spidermonkey
+ VERSION=1.7.0
+ SOURCE="js-${VERSION}.tar.gz"
+ SOURCE_URL[0]=http://ftp.mozilla.org/pub/mozilla.org/js/${SOURCE}
+
SOURCE_HASH=sha512:9d9fbd9c1dae969ca19ddb0f977ac56f3e0479ec393b859de252fcdd8b7fc325e80399073540884ed365ce56a3219be34c0db9300d5e50f32969660c90527e51
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/js"
+ WEB_SITE="http://www.mozilla.org/js/spidermonkey/";
+ LICENSE[0]=MPL
+ ENTERED=20071027
+ SHORT="Mozilla's C implementation of JavaScript."
+cat << EOF
+The embeddable JavaScript engine from the Mozilla project (used among others
+by the Mozilla, Galeon, Netscape6 browsers as well as by the iPlanet
WebServer)
+called SpiderMonkey.
+EOF
diff --git a/devel/spidermonkey/HISTORY b/devel/spidermonkey/HISTORY
new file mode 100644
index 0000000..7fc0524
--- /dev/null
+++ b/devel/spidermonkey/HISTORY
@@ -0,0 +1,2 @@
+2007-10-27 Lalo Martins <lalo AT sourcemage.org>
+ * DETAILS, DEPENDS, BUILD, INSTALL, HISTORY: created spell
diff --git a/devel/spidermonkey/INSTALL b/devel/spidermonkey/INSTALL
new file mode 100755
index 0000000..86ebd53
--- /dev/null
+++ b/devel/spidermonkey/INSTALL
@@ -0,0 +1,15 @@
+BUILD_DIR=Linux_All_OPT.OBJ &&
+version=1.7 &&
+major=1 &&
+
+install -m 755 -o root -g root ${BUILD_DIR}/js /usr/bin/ &&
+
+install -m 644 -o root -g root ${BUILD_DIR}/libjs.so
/usr/lib/libjs.so.${version} &&
+ln -sf libjs.so.${version} /usr/lib/libjs.so.${major} &&
+ln -sf libjs.so.${version} /usr/lib/libjs.so &&
+
+install -m 644 -o root -g root ${BUILD_DIR}/libjs.a /usr/lib/ &&
+
+mkdir /usr/include/js &&
+install -m 644 -o root -g root *.h /usr/include/js/ &&
+install -m 644 -o root -g root ${BUILD_DIR}/*.h /usr/include/js/
\ No newline at end of file
diff --git a/devel/unsermake/DEPENDS b/devel/unsermake/DEPENDS
index 144cba7..867b4d4 100755
--- a/devel/unsermake/DEPENDS
+++ b/devel/unsermake/DEPENDS
@@ -1,2 +1 @@
-depends subversion &&
depends python
diff --git a/devel/unsermake/DETAILS b/devel/unsermake/DETAILS
index 706895d..2de8485 100755
--- a/devel/unsermake/DETAILS
+++ b/devel/unsermake/DETAILS
@@ -1,20 +1,17 @@
SPELL=unsermake
-if [[ $SVN_AUTOUPDATE = y ]]; then
- VERSION=$(date +%Y%m%d)
-else
- VERSION=svn
-fi
- SOURCE=$SPELL-$VERSION.tar.bz2
- SOURCE_IGNORE=volatile
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL
-
SOURCE_URL[0]=svn://anonsvn.kde.org/home/kde/trunk/kdenonbeta/$SPELL:$SPELL
- FORCE_DOWNLOAD=on
+ VERSION=20051117
+ SOURCE=$SPELL-$VERSION.tar.gz
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+
SOURCE_HASH=sha512:9535178e2383d0aa0d9410d501f4f2a01d3f072aa2a85340cf730616e683004dcccf689520d272cd21cfe689196ae5033832a937ac680af690741e275aa080a0
+ SOURCE_URL[0]=http://sobukus.de/smgl/$SOURCE
WEB_SITE=http://wiki.kde.org/unsermake
LICENSE[0]=GPL
DOCS="doc/*.{txt,pdf,sxi}"
ENTERED=20050730
KEYWORDS="kde devel"
- SHORT="a replacement for automake, used by the KDE project"
+ SHORT="a replacement for automake, (been) used by the KDE project"
cat << EOF
-a replacement for automake, used by the KDE project
+Unsermake is a replacement for automake, written for use by the KDE project.
+Please note that it is unmaintained and just here to support build of spells
+still needing it.
EOF
diff --git a/devel/unsermake/DOWNLOAD b/devel/unsermake/DOWNLOAD
deleted file mode 100755
index b21c982..0000000
--- a/devel/unsermake/DOWNLOAD
+++ /dev/null
@@ -1,43 +0,0 @@
-function url_r_svn_crack() {
-
- URL=`url_strip_prefix "$1" svn`
- R_SVN_ROOT=`echo $URL | sed "s#\(^[^/]*[^:]*\):.*#\1#"`
- local R_SVN_MODULE_TAG=`echo $URL | sed "s#^[^/]*[^:]*\(.*\)#\1#"`
- R_SVN_MODULE=`echo $R_SVN_MODULE_TAG | cut -d : -f2`
- local R_SVN_TAGNAME=`echo $R_SVN_MODULE_TAG | cut -d : -f3`
- R_SVN_TAG=${R_SVN_TAGNAME:-HEAD}
-
-}
-
-url_r_svn_crack ${SOURCE_URL}
&&
-message "${MESSAGE_COLOR}Starting SVN checkout of"
\
- "${FILE_COLOR}${SOURCE}${MESSAGE_COLOR}...${DEFAULT_COLOR}"
&&
-if [[ -f $SOURCE_CACHE/${SOURCE} ]]
-then
- message "${MESSAGE_COLOR}Previous source found
unpacking...${DEFAULT_COLOR}" &&
- tar -jxf $SOURCE_CACHE/${SOURCE}
&&
- cd $R_SVN_MODULE
&&
- message "${MESSAGE_COLOR}Running SVN update...${DEFAULT_COLOR}"
&&
- svn
\
- --non-interactive
\
- update
\
- -r${R_SVN_TAG}
&&
- cd ..
&&
- message "${MESSAGE_COLOR}Done...${DEFAULT_COLOR}"
-else
- message "${MESSAGE_COLOR}Running initial SVN checkout...${DEFAULT_COLOR}"
&&
- svn
\
- --non-interactive
\
- checkout
\
- -r${R_SVN_TAG}
\
- svn://${R_SVN_ROOT}
\
- ${R_SVN_MODULE}
&&
- message "${MESSAGE_COLOR}Done...${DEFAULT_COLOR}"
-fi
&&
-message "${MESSAGE_COLOR}Generating tarball...${DEFAULT_COLOR}"
&&
-tar -jcf
\
- ${SOURCE}
\
- ${R_SVN_MODULE}
&&
-cp ${SOURCE} ${SOURCE_CACHE}/${SOURCE}
&&
-rm ${SOURCE}
&&
-message "${MESSAGE_COLOR}SVN Checkout complete...${DEFAULT_COLOR}"
diff --git a/devel/unsermake/HISTORY b/devel/unsermake/HISTORY
index 0065a85..7c3f66b 100644
--- a/devel/unsermake/HISTORY
+++ b/devel/unsermake/HISTORY
@@ -1,3 +1,10 @@
+2007-10-07 Thomas Orgis <sobukus AT sourcemage.org>
+ * DETAILS, DOWNLOAD, DEPENDS, PREPARE: switch to a mirrored tarball
+ (initially pulled from http://ftp.de.debian.org/debian/pool/main/
+ u/unsermake/unsermake_20051117.dfsg.orig.tar.gz) since svn repo is
dead.
+ Unsermake seems to be dead, but there is at least one spell
(kdenlive)
+ needing unsermake, so let's keep it.
+
2006-07-09 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: Switched entirely to use svn, removed BUILD_API &
UPDATED, fixed WEB_SITE.
diff --git a/devel/unsermake/PREPARE b/devel/unsermake/PREPARE
deleted file mode 100755
index f17a48d..0000000
--- a/devel/unsermake/PREPARE
+++ /dev/null
@@ -1 +0,0 @@
-config_query SVN_AUTOUPDATE "Update to the latest version on every cast?"
n
diff --git a/devel/yaz/DETAILS b/devel/yaz/DETAILS
new file mode 100755
index 0000000..d89c68e
--- /dev/null
+++ b/devel/yaz/DETAILS
@@ -0,0 +1,15 @@
+ SPELL=yaz
+ VERSION=3.0.14
+ SOURCE="$SPELL-$VERSION.tar.gz"
+ SOURCE_URL[0]=http://ftp.indexdata.dk/pub/$SPELL/$SOURCE
+
SOURCE_HASH=sha512:1c94430f5d53943462bc07d7e7e5429a548575c5389d04f47c5b13c52ebc0c60b5fbb0428038b77ab5d7f77e1d62761247bed391c0c3d996f55cb0ebfa082710
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
+ WEB_SITE=http://www.indexdata.dk/yaz/
+ LICENSE[0]=BSD
+ ENTERED=20071103
+ SHORT="A toolkit for Z39.50/SRW/SRU clients and servers."
+cat << EOF
+YAZ is a programmers' toolkit supporting the development of
+Z39.50/SRW/SRU clients and servers. Z39.50-2003 (version 3) as well as
+SRW/SRU version 1.1 are supported in both the client and server roles.
+EOF
diff --git a/devel/yaz/HISTORY b/devel/yaz/HISTORY
new file mode 100644
index 0000000..dcdbdd4
--- /dev/null
+++ b/devel/yaz/HISTORY
@@ -0,0 +1,2 @@
+2007-11-03 Cathal Mc Ginley <cathal.magus AT gnostai.org>
+ * DETAILS, HISTORY: created this spell
diff --git a/disk/audio_burn/DEPENDS b/disk/audio_burn/DEPENDS
index 57a381b..b562e87 100755
--- a/disk/audio_burn/DEPENDS
+++ b/disk/audio_burn/DEPENDS
@@ -1,5 +1,29 @@
-depends cdrtools &&
-depends vorbis-tools &&
-optional_depends "mpg321" "" "--disable-mpg321" "for mp3 support" &&
-optional_depends "sox" "" "--disable-sox" "for resampling support" &&
-optional_depends "normalize" "" "--disable-normalize" "for normalize
support"
+optional_depends cdrtools \
+ "--enable-cdrecord" \
+ "--disable-cdrecord" \
+ "for MP3 support" &&
+
+optional_depends normalize \
+ "--enable-normalize" \
+ "--disable-normalize" \
+ "for ogg support" &&
+
+optional_depends mpg321 \
+ "--enable-mpg312" \
+ "--disable-mpg321" \
+ "for MP3 support" &&
+
+optional_depends sox \
+ "--enable-sox" \
+ "--disable-sox" \
+ "for resampling support" &&
+
+optional_depends libogg \
+ "--enable-ogg" \
+ "--disable-ogg" \
+ "for ogg support" &&
+
+optional_depends libvorbis \
+ "--enable-vorbis" \
+ "--disable-vorbis" \
+ "for vorbis support"
diff --git a/disk/audio_burn/HISTORY b/disk/audio_burn/HISTORY
index 6231982..eb7392b 100644
--- a/disk/audio_burn/HISTORY
+++ b/disk/audio_burn/HISTORY
@@ -1,3 +1,7 @@
+2007-11-04 Arjan Bouter <abouter AT sourceage.org>
+ * DEPENDS: made cdrecord optional
+ made vorbistools optional
+
2006-10-03 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: [automated] Removed UPDATED.

diff --git a/disk/cdlabelgen/DETAILS b/disk/cdlabelgen/DETAILS
index 436a3e7..2e4f5dd 100755
--- a/disk/cdlabelgen/DETAILS
+++ b/disk/cdlabelgen/DETAILS
@@ -1,12 +1,11 @@
SPELL=cdlabelgen
- VERSION=3.0.0
+ VERSION=4.0.0
SOURCE=$SPELL-$VERSION.tgz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- SOURCE_URL[0]=http://www.aczone.com/pub/tools/$SOURCE
-
SOURCE_HASH=sha512:f898a65220bfb2cb6793ee28a7e4e7ddb0a7f59e8d1b7238cbf5d9009c18d3bc388459337059a6a43a488844fae31a21b8d6899294964e2310431a6ed42315e6
- WEB_SITE=http://www.aczone.com/tools/cdinsert/
+ SOURCE_URL[0]=http://www.aczoom.com/pub/tools/$SOURCE
+
SOURCE_HASH=sha512:a1b92f3c3f3b012003f42eaea111fc7802098833937459e6287cc98aa9b4338ee1cb2e10e3e6c821e7edbd1ab57bb22ec2f644c8e2fe9a152788374507876c9b
+ WEB_SITE=http://www.aczoom.com/tools/cdinsert/
ENTERED=20011104
- UPDATED=20020902
LICENSE[0]=GPL
KEYWORDS="disk"
SHORT="cdlabelgen is a program for generating frontcards and
traycards for CDs"
diff --git a/disk/cdlabelgen/HISTORY b/disk/cdlabelgen/HISTORY
index 39b7b1d..dd18dcb 100644
--- a/disk/cdlabelgen/HISTORY
+++ b/disk/cdlabelgen/HISTORY
@@ -1,3 +1,7 @@
+2007-10-25 Remko van der Vossen <wich AT stack.nl>
+ * DETAILS: Bumped to version 4.0.0, removed UPDATED
+ * PRE_BUILD: Fix Makefile to install manpages into $BASEDIR/share/man
+
2006-03-12 Karsten Behrmann <BearPerson AT sourcemage.org>
* DETAILS: (automated) Add KEYWORDS

diff --git a/disk/cdlabelgen/PRE_BUILD b/disk/cdlabelgen/PRE_BUILD
new file mode 100755
index 0000000..028643b
--- /dev/null
+++ b/disk/cdlabelgen/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+sed -i -e 's;$(BASE_DIR)/man;$(BASE_DIR)/share/man;' Makefile
diff --git a/disk/devede/DETAILS b/disk/devede/DETAILS
index 231629d..df2ab4b 100755
--- a/disk/devede/DETAILS
+++ b/disk/devede/DETAILS
@@ -1,10 +1,11 @@
SPELL=devede
- VERSION=3.01
+ VERSION=3.3
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://www.rastersoft.com/descargas/$SOURCE
WEB_SITE=http://www.rastersoft.com/programas/devede.html
-
SOURCE_HASH=sha512:80fc79dcb96114ecebb37bd4dbd137f2ad261a2b42046e89018c82987cd6f25afa3d9472c0b193049cb5888a785e8c3876c2baa2d94aaaf88ae5df069bc2f0d3
+
+
SOURCE_HASH=sha512:1cd6ad692b28ce73e973a148dcec227db22d1efa49b2c82c03c81c86c0f2a178876e25df98be0e3c11289d5ba2f452b9d5cf9df8b9c8890783d33ca973225abd
ENTERED=20061231
KEYWORDS="dvd authoring"
SHORT="DeVeDe is a program to create video DVDs and CDs"
diff --git a/disk/devede/HISTORY b/disk/devede/HISTORY
index 110daa0..2ffd1e3 100644
--- a/disk/devede/HISTORY
+++ b/disk/devede/HISTORY
@@ -1,3 +1,9 @@
+2007-10-27 George Sherwood <george AT beernabeer.com>
+ * DETAILS: Updated to version 3.3
+
+2007-10-03 Thomas Orgis <sobukus AT sourcemage.org>
+ * DETAILS: updated to 3.2 (also fixing hash mismatch with old version)
+
2007-06-30 George Sherwood <george AT beernabeer.com>
* DETAILS: updated spell to 3.01

diff --git a/disk/dosfstools/BUILD b/disk/dosfstools/BUILD
index 989810e..8f58e6d 100755
--- a/disk/dosfstools/BUILD
+++ b/disk/dosfstools/BUILD
@@ -1,2 +1 @@
-patch -p1 < $SCRIPT_DIRECTORY/linux-2.6.patch &&
make
diff --git a/disk/dosfstools/DETAILS b/disk/dosfstools/DETAILS
index 285904b..ff7be5c 100755
--- a/disk/dosfstools/DETAILS
+++ b/disk/dosfstools/DETAILS
@@ -1,13 +1,12 @@
SPELL=dosfstools
- VERSION=2.10
+ VERSION=2.11
SOURCE=$SPELL-$VERSION.src.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=ftp://ftp.uni-erlangen.de/pub/Linux/LOCAL/dosfstools/$SOURCE
-
SOURCE_HASH=sha512:c0e523ca6ff360a03d20215603f5326734d61eaca42b5fe5fac51f734138c04c2500a9b311a95a889954f6f7968373aa10ebf6b0a7620f88360ec0ac1365a588
+
SOURCE_HASH=sha512:eb0ee6ea11f1f3c0642722bde9f53ceec6ea085ad2ee4f3df4f4f61d6734132e0d24b8144b5a29593be8f2c40ce407ec5ac0da7749e126f4390568bd66ed28b3
WEB_SITE=ftp://ftp.uni-erlangen.de/pub/Linux/LOCAL/dosfstools/
LICENSE[0]=GPL
ENTERED=20011217
- UPDATED=20040127
KEYWORDS="disk"
SHORT="Utilities to create and check MS-DOS filesystems under
Linux"

diff --git a/disk/dosfstools/HISTORY b/disk/dosfstools/HISTORY
index b651abf..e33ee24 100644
--- a/disk/dosfstools/HISTORY
+++ b/disk/dosfstools/HISTORY
@@ -1,3 +1,9 @@
+2007-10-10 Martin Spitzbarth <m.spitzbarth AT gmx.de>
+ * PRE_BUILD: created the file, honour INSTALL_ROOT,
+ fchanged MANDIR to usr/share/man
+ * BUILD, linux-2.6.patch: removed the patch
+ * DETAILS: updated spell to 2.11
+
2006-09-21 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: [automated] Removed MAINTAINER.

diff --git a/disk/dosfstools/PRE_BUILD b/disk/dosfstools/PRE_BUILD
new file mode 100755
index 0000000..2fd465e
--- /dev/null
+++ b/disk/dosfstools/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+sedit "s:PREFIX =:PREFIX = $INSTALL_ROOT:" Makefile &&
+sedit "s:/usr/man:/usr/share/man:" Makefile
diff --git a/disk/dosfstools/linux-2.6.patch b/disk/dosfstools/linux-2.6.patch
deleted file mode 100644
index e21e94c..0000000
--- a/disk/dosfstools/linux-2.6.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-diff -Nur dosfstools-2.10/dosfsck/boot.c dosfstools-2.10-fixed/dosfsck/boot.c
---- dosfstools-2.10/dosfsck/boot.c 2003-06-14 22:03:20.000000000 +0200
-+++ dosfstools-2.10-fixed/dosfsck/boot.c 2004-02-11 21:15:48.000000000
+0100
-@@ -14,6 +14,9 @@
- #include "io.h"
- #include "boot.h"
-
-+#ifndef MSDOS_FAT12
-+# define MSDOS_FAT12 4084 /* taken from 2.4 linux/msdos_fs.h */
-+#endif
-
- #define ROUND_TO_MULTIPLE(n,m) ((n) && (m) ? (n)+(m)-1-((n)-1)%(m) : 0)
- /* don't divide by zero */
-diff -Nur dosfstools-2.10/dosfsck/common.h
dosfstools-2.10-fixed/dosfsck/common.h
---- dosfstools-2.10/dosfsck/common.h 1998-04-28 13:14:25.000000000 +0200
-+++ dosfstools-2.10-fixed/dosfsck/common.h 2004-02-11 21:15:01.000000000
+0100
-@@ -6,6 +6,9 @@
- #ifndef _COMMON_H
- #define _COMMON_H
-
-+#include <asm/types.h>
-+#include <asm/byteorder.h>
-+
- void die(char *msg,...) __attribute((noreturn));
-
- /* Displays a prinf-style message and terminates the program. */
-diff -Nur dosfstools-2.10/dosfsck/file.c dosfstools-2.10-fixed/dosfsck/file.c
---- dosfstools-2.10/dosfsck/file.c 2003-06-14 22:03:20.000000000 +0200
-+++ dosfstools-2.10-fixed/dosfsck/file.c 2004-02-11 21:13:53.000000000
+0100
-@@ -15,9 +15,9 @@
- #define _LINUX_STAT_H /* hack to avoid inclusion of <linux/stat.h>
*/
- #define _LINUX_STRING_H_ /* hack to avoid inclusion of
<linux/string.h>*/
- #define _LINUX_FS_H /* hack to avoid inclusion of <linux/fs.h>
*/
-+#include "common.h"
- #include <linux/msdos_fs.h>
-
--#include "common.h"
- #include "file.h"
-
-
-diff -Nur dosfstools-2.10/dosfsck/io.c dosfstools-2.10-fixed/dosfsck/io.c
---- dosfstools-2.10/dosfsck/io.c 2003-06-14 22:03:20.000000000 +0200
-+++ dosfstools-2.10-fixed/dosfsck/io.c 2004-02-11 21:14:24.000000000 +0100
-@@ -21,8 +21,8 @@
- #include <fcntl.h>
- #include <linux/fd.h>
-
--#include "dosfsck.h"
- #include "common.h"
-+#include "dosfsck.h"
- #include "io.h"
-
-
-diff -Nur dosfstools-2.10/mkdosfs/mkdosfs.c
dosfstools-2.10-fixed/mkdosfs/mkdosfs.c
---- dosfstools-2.10/mkdosfs/mkdosfs.c 2003-06-14 22:07:08.000000000 +0200
-+++ dosfstools-2.10-fixed/mkdosfs/mkdosfs.c 2004-02-11 21:13:09.000000000
+0100
-@@ -62,6 +62,7 @@
- #include <sys/ioctl.h>
- #include <sys/stat.h>
- #include <sys/types.h>
-+#include <asm/types.h>
- #include <unistd.h>
- #include <time.h>
- #include <errno.h>
diff --git a/disk/dvd+rw-tools/HISTORY b/disk/dvd+rw-tools/HISTORY
index 0c0acab..7be2039 100644
--- a/disk/dvd+rw-tools/HISTORY
+++ b/disk/dvd+rw-tools/HISTORY
@@ -1,3 +1,7 @@
+2007-10-24 David Brown <dmlb2000 AT gmail.com>
+ * PRE_BUILD: added for patching
+ * linux-2.6.23-headers.patch: added to fix undefined INT_MAX
+
2006-09-28 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 7.0

diff --git a/disk/dvd+rw-tools/PRE_BUILD b/disk/dvd+rw-tools/PRE_BUILD
new file mode 100755
index 0000000..1858e23
--- /dev/null
+++ b/disk/dvd+rw-tools/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+patch -p1 < $SPELL_DIRECTORY/linux-2.6.23-headers.patch
diff --git a/disk/dvd+rw-tools/linux-2.6.23-headers.patch
b/disk/dvd+rw-tools/linux-2.6.23-headers.patch
new file mode 100644
index 0000000..fad8914
--- /dev/null
+++ b/disk/dvd+rw-tools/linux-2.6.23-headers.patch
@@ -0,0 +1,20 @@
+--- a/growisofs.c 2007-10-24 07:40:22.000000000 -0700
++++ b/growisofs.c 2007-10-24 07:39:33.000000000 -0700
+@@ -560,6 +560,7 @@
+ #if defined(__linux)
+
+ #include <linux/types.h>
++#include <limits.h>
+ #include <linux/cdrom.h>
+ #include <sys/ioctl.h>
+ #include <sys/prctl.h>
+--- a/transport.hxx 2007-10-24 07:40:57.000000000 -0700
++++ b/transport.hxx 2007-10-24 07:39:54.000000000 -0700
+@@ -132,6 +132,7 @@
+ #if defined(__linux)
+
+ #include <sys/ioctl.h>
++#include <limits.h>
+ #include <linux/cdrom.h>
+ #include <mntent.h>
+ #include <sys/wait.h>
diff --git a/disk/fuse/DETAILS b/disk/fuse/DETAILS
index c3c1e51..7930328 100755
--- a/disk/fuse/DETAILS
+++ b/disk/fuse/DETAILS
@@ -1,7 +1,7 @@
SPELL=fuse
if [ "$CVS" != "y" ]; then
- VERSION=2.7.0
-
SOURCE_HASH=sha512:05cc14abbc31eb1a16a31d8807494f88d7d49b7c157b523c9b51717bc2a7761db5c40a749d278897cfa993661e35693a859e1816cb4ff967e158e09a3a050753
+ VERSION=2.7.1
+
SOURCE_HASH=sha512:1fbf5719faf205edc8846a0a1f0d053edca625eb036ba73e14cca5781c7b34f845fac0576ffe29590a5f06b4283d13c820529d5781d7b58476c36bc0429fd0ec
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/disk/fuse/HISTORY b/disk/fuse/HISTORY
index 9d0d430..74ad1d1 100644
--- a/disk/fuse/HISTORY
+++ b/disk/fuse/HISTORY
@@ -1,3 +1,15 @@
+2007-10-16 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 2.7.1
+ * PRE_BUILD: don't apply patch
+ * fuse-2.7.0-kernel-2.6.23.patch: deleted
+
+2007-10-13 Pol Vinogradov <vin.public AT gmail.com>
+ * PRE_BUILD: patch only non-cvs version
+
+2007-10-12 Treeve Jelbert <treeve AT sourcemage.org>
+ * fuse-2.7.0-kernel-2.6.23.patch: added
+ * PRE_BUILD: apply upstream patch
+
2007-07-03 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 2.7.0

diff --git a/disk/fuse/PRE_BUILD b/disk/fuse/PRE_BUILD
index 7b43709..4387110 100755
--- a/disk/fuse/PRE_BUILD
+++ b/disk/fuse/PRE_BUILD
@@ -3,7 +3,5 @@ default_pre_build &&
cd "$SOURCE_DIRECTORY" &&

if [ "$CVS" = "y" ]; then
-
./makeconf.sh
-
fi
diff --git a/disk/gnomebaker/DETAILS b/disk/gnomebaker/DETAILS
index cb57e0a..7cf0c4c 100755
--- a/disk/gnomebaker/DETAILS
+++ b/disk/gnomebaker/DETAILS
@@ -1,5 +1,5 @@
SPELL=gnomebaker
- VERSION=0.6.0
+ VERSION=0.6.2
SOURCE=${SPELL}-${VERSION}.tar.gz
SOURCE_URL[0]=${SOURCEFORGE_URL}/${SPELL}/${SOURCE}
SOURCE_GPG="gurus.gpg:${SOURCE}.sig:WORKS_FOR_ME"
diff --git a/disk/gnomebaker/HISTORY b/disk/gnomebaker/HISTORY
index 47cd3aa..a551558 100644
--- a/disk/gnomebaker/HISTORY
+++ b/disk/gnomebaker/HISTORY
@@ -1,3 +1,6 @@
+2007-10-27 Lalo Martins <lalo AT sourcemage.org>
+ * DETAILS: Updated to 0.6.2
+
2006-09-17 Flavien Bridault <vlaaad AT sourcemage.org>
* DETAILS: Updated to 0.6.0
* CONFIGURE: Added to prompt for the backend
diff --git a/disk/gnomebaker/gnomebaker-0.6.2.tar.gz.sig
b/disk/gnomebaker/gnomebaker-0.6.2.tar.gz.sig
new file mode 100644
index 0000000..a9476d3
Binary files /dev/null and b/disk/gnomebaker/gnomebaker-0.6.2.tar.gz.sig
differ
diff --git a/disk/hdparm/DETAILS b/disk/hdparm/DETAILS
index bf42090..71f4262 100755
--- a/disk/hdparm/DETAILS
+++ b/disk/hdparm/DETAILS
@@ -4,11 +4,11 @@
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
- WEB_SITE=http://sourceforge.net/projects/hdparm/
- PATCHLEVEL=1
+ PATCHLEVEL=2
LICENSE[0]=BSD
- ENTERED=20010922
+ WEB_SITE=http://sourceforge.net/projects/hdparm/
KEYWORDS="disk"
+ ENTERED=20010922
SHORT="A utility to access/tune Linux's EIDE drivers."
cat << EOF
hdparm is a shell utility to access/tune ioctl features of the Linux
diff --git a/disk/hdparm/HISTORY b/disk/hdparm/HISTORY
index bf10495..0bf5259 100644
--- a/disk/hdparm/HISTORY
+++ b/disk/hdparm/HISTORY
@@ -1,3 +1,13 @@
+2007-10-30 Pol Vinogradov <vin.public AT gmail.com>
+ * init.d/hdparm.conf: made it work through sysfs interface
+
+2007-10-17 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: Incremented PATCHLEVEL=2
+ * init.d/hdparm: Check if a directory exists before cating it
+ Print that we're starting hdparm and print the return value
+ * init.d/hdparm.conf: By default be quiet, just like the rest of our
+ scripts
+
2007-09-04 Pol Vinogradov <vin.public AT gmail.com>
* DETAILS: PATCHLEVEL++
* INSTALL: install_rootifying
diff --git a/disk/hdparm/init.d/hdparm b/disk/hdparm/init.d/hdparm
index 9dcc370..a37b692 100755
--- a/disk/hdparm/init.d/hdparm
+++ b/disk/hdparm/init.d/hdparm
@@ -9,6 +9,7 @@ RUNLEVEL=1

start()
{
+ echo "Starting hdparm..."
# SCSI/SATA
for drive in sd{a..z}; do
if [[ -b "/dev/$drive" ]]; then
@@ -19,14 +20,18 @@ start()
# PATA
for drive in hd{a..z}; do
if [[ -b "/dev/$drive" ]]; then
- if [[ "$(cat /proc/ide/$drive/media)" == "cdrom" ]];
+ if [[ -f /sys/block/$drive/device/media ]];
then
- $PROGRAM $common_params $pata_cdrom_params
$pata_params "/dev/$drive"
- else
- $PROGRAM $common_params $disk_params
$pata_disk_params $pata_params "/dev/$drive"
+ if [[ "$(cat /sys/block/$drive/device/media)"
== "cdrom" ]];
+ then
+ $PROGRAM $common_params
$pata_cdrom_params $pata_params "/dev/$drive"
+ else
+ $PROGRAM $common_params $disk_params
$pata_disk_params $pata_params "/dev/$drive"
+ fi
fi
fi
done
+ evaluate_retval
}

stop()
diff --git a/disk/hdparm/init.d/hdparm.conf b/disk/hdparm/init.d/hdparm.conf
index ab4754a..1523043 100644
--- a/disk/hdparm/init.d/hdparm.conf
+++ b/disk/hdparm/init.d/hdparm.conf
@@ -1,6 +1,6 @@
# parameters that apply to all drives
#common_params="-K 1"
-common_params=""
+common_params="-q "

# parameters that apply only to harddrives
#disk_params="-A 1 -W 1 -a 2048"
@@ -21,4 +21,3 @@ pata_disk_params=""
# parameters that only apply to pata cdroms
pata_cdrom_params=""

-
diff --git a/disk/k3b-i18n/DETAILS b/disk/k3b-i18n/DETAILS
index e54ca96..9e048fa 100755
--- a/disk/k3b-i18n/DETAILS
+++ b/disk/k3b-i18n/DETAILS
@@ -1,6 +1,6 @@
SPELL=k3b-i18n
- VERSION=1.0.3
-
SOURCE_HASH=sha512:b81fcf6d7669988d0e2e7cef5c386085f4b93d82f460e0cc3e44a4e39096be1f9b05f4c709968f0f61b5591740c10c9100e1f3c5c8d82e8405fe97575082c26d
+ VERSION=1.0.4
+
SOURCE_HASH=sha512:eee7d3735d62b0a4278e753d8c78ec1734646627ee9930a39c28eed4b3e42ffd7424ba1612c3c9d65d9f53641d136d11ff6a91f3a5fb29659251d22a6f22bc7b
SOURCE=k3b-i18n-$VERSION.tar.bz2
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/k3b-i18n-$VERSION
SOURCE_URL[0]=${SOURCEFORGE_URL}/k3b/${SOURCE}
diff --git a/disk/k3b-i18n/HISTORY b/disk/k3b-i18n/HISTORY
index 6880c26..d28420f 100644
--- a/disk/k3b-i18n/HISTORY
+++ b/disk/k3b-i18n/HISTORY
@@ -1,3 +1,6 @@
+2007-22-03 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.0.4
+
2007-07-23 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.0.3

diff --git a/disk/k3b/DETAILS b/disk/k3b/DETAILS
index bf035f3..54bd8f0 100755
--- a/disk/k3b/DETAILS
+++ b/disk/k3b/DETAILS
@@ -1,6 +1,6 @@
SPELL=k3b
- VERSION=1.0.3
-
SOURCE_HASH=sha512:9b5454ef18f6a42617d3a3e5d3a66a60801a2cc32a5ef5d32b612c41ea1703b575b7aa31e498f72ef75225e893a95b9aeb164cf89d0691dd980aeec9d5485d04
+ VERSION=1.0.4
+
SOURCE_HASH=sha512:3e97df23abd319eb4aed71393a93a3924054130986426ae7eb44be4a4878cdfb1f0274e9c53ac0686d5c029792717005d3fbcfcd6188f885ff8d5c117cd0ce2a
SOURCE=${SPELL}-${VERSION}.tar.bz2
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
SOURCE_URL[0]=${SOURCEFORGE_URL}/k3b/${SOURCE}
diff --git a/disk/k3b/HISTORY b/disk/k3b/HISTORY
index 568cdab..2555a6a 100644
--- a/disk/k3b/HISTORY
+++ b/disk/k3b/HISTORY
@@ -1,3 +1,6 @@
+2007-11-03Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: Updated to 1.0.4
+
2007-07-23 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: Updated to 1.0.3

diff --git a/disk/libburn-pykix/DETAILS b/disk/libburn-pykix/DETAILS
index 41dd573..d467fb2 100755
--- a/disk/libburn-pykix/DETAILS
+++ b/disk/libburn-pykix/DETAILS
@@ -12,8 +12,8 @@ if [ "$LIBBURN_SVN" == "y" ]; then
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-svn
SOURCE_IGNORE=volatile
else
- VERSION=0.3.8
-
SOURCE_HASH=sha512:881aaebbd824ab5b18e959dbffe866d55d95137dddc3dbc379074f4059f5913dcb25a3d4860e49949942d0bad1b44f8b76f8cbe6191ee8e4730fda75302b65bd
+ VERSION=0.4.0
+
SOURCE_HASH=sha512:d002d83b6a4756fac72227f63c2069a2ed3b318f1f4777c72c35894c154d991720286f6717fd719cd42487dd95d9afc19e23a7e4452b6658f7541f0a70ff5a43
PKG=libburn
SOURCE=${PKG}-${VERSION}.tar.gz
SOURCE_URL[0]=http://libburnia-download.pykix.org/releases/$SOURCE
@@ -24,6 +24,6 @@ fi
LICENSE[0]=GPL
SHORT="Fork of the original libburn"
cat << EOF
-This is a fork of the freedesktops libburn library.
-Libburn is an open-source library for reading, mastering and writing optical
discs.
+This is a fork of the freedesktops libburn library. Libburn is an
open-source
+library for reading, mastering and writing optical discs.
EOF
diff --git a/disk/libburn-pykix/HISTORY b/disk/libburn-pykix/HISTORY
index 9dc5db1..dbf0963 100644
--- a/disk/libburn-pykix/HISTORY
+++ b/disk/libburn-pykix/HISTORY
@@ -1,3 +1,7 @@
+2007-11-01 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
+ * DETAILS: updated spell to 0.4.0
+ fixed long description wrap
+
2007-07-31 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.3.8

diff --git a/disk/ntfs-3g/DETAILS b/disk/ntfs-3g/DETAILS
index fb260c4..93d1635 100755
--- a/disk/ntfs-3g/DETAILS
+++ b/disk/ntfs-3g/DETAILS
@@ -1,6 +1,6 @@
SPELL=ntfs-3g
- VERSION=1.913
-
SOURCE_HASH=sha512:ff57a639d7361116efe20e62c5af38d0521b7cbe234305636e64b04d05967e567dcd94a57a27c0939f040d92e952c73402a454c1c89f7ab1f4dbcaa9b5a4b194
+ VERSION=1.1104
+
SOURCE_HASH=sha512:b6f28c317700863fd1894358ff726b05129d05db792c13d2f22f3155e62638faadedb867b898eabf991656fdc6968ee45fb60768e268387e17d1168e33134a93
SOURCE=$SPELL-$VERSION.tgz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
WEB_SITE=http://www.ntfs-3g.org/
diff --git a/disk/ntfs-3g/HISTORY b/disk/ntfs-3g/HISTORY
index a988152..ca6a124 100644
--- a/disk/ntfs-3g/HISTORY
+++ b/disk/ntfs-3g/HISTORY
@@ -1,3 +1,12 @@
+2007-11-05 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.1104
+
+2007-10-29 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.1030
+
+2007-10-15 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.1004
+
2007-09-13 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.913

diff --git a/disk/ntfsprogs/DEPENDS b/disk/ntfsprogs/DEPENDS
index 725ae57..da5fae4 100755
--- a/disk/ntfsprogs/DEPENDS
+++ b/disk/ntfsprogs/DEPENDS
@@ -9,4 +9,6 @@ optional_depends gnome-vfs2
\
optional_depends fuse \
"" \
"" \
- "to compile FUSE module"
+ "to compile FUSE module" &&
+# libconfig is a dependency if crypto is enabled
+if is_depends_enabled $SPELL gnutls; then depends libconfig; fi
diff --git a/disk/ntfsprogs/DETAILS b/disk/ntfsprogs/DETAILS
index 3c38b2b..07a45cc 100755
--- a/disk/ntfsprogs/DETAILS
+++ b/disk/ntfsprogs/DETAILS
@@ -1,9 +1,10 @@
SPELL=ntfsprogs
- VERSION=1.13.1
+ VERSION=2.0.0
+
SOURCE_HASH=sha512:5dc09a205bf4f9b9cc51b51799623a5e71e5be00f879abf1b4e1a5bb10be2671f8fbcb49c59967eb635acf2f65dd1ec98527d22a08aa5b5e88639eebe92caf67
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$SOURCEFORGE_URL/linux-ntfs/$SOURCE
- SOURCE_GPG="gurus.gpg:${SOURCE}.sig:WORKS_FOR_ME"
+# SOURCE_GPG="gurus.gpg:${SOURCE}.sig:WORKS_FOR_ME"
WEB_SITE=http://linux-ntfs.org
LICENSE[0]=GPL
ENTERED=20030930
diff --git a/disk/ntfsprogs/HISTORY b/disk/ntfsprogs/HISTORY
index 6ea43b8..6af5c2e 100644
--- a/disk/ntfsprogs/HISTORY
+++ b/disk/ntfsprogs/HISTORY
@@ -1,3 +1,9 @@
+2007-10-24 Julien "_kaze_" ROZO <julien AT rozo.org>
+ * DEPENDS: depends on libconfig if crypto is enabled
+
+2007-09-29 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: 2.0.0
+
2006-06-21 Flavien Bridault <vlaaad AT sourcemage.org>
* DETAILS: Updated to 1.13.1
* DEPENDS: Added optional fuse, replaced libcrypt by gnutls
diff --git a/disk/partimage/DETAILS b/disk/partimage/DETAILS
index 4e6fdea..a4979c6 100755
--- a/disk/partimage/DETAILS
+++ b/disk/partimage/DETAILS
@@ -1,6 +1,6 @@
SPELL=partimage
- VERSION=0.6.7_beta1
-
SOURCE_HASH=sha512:c7c20b09de7a95b41320bac6e3cff88f6b8d6c94e388955c69551b76c7150391a02063c19838a06839acb255f00c21eee0df1537913045d1f59dc882378e1c20
+ VERSION=0.6.7_beta2
+
SOURCE_HASH=sha512:e2d14da8ee0b6c36ed44a6dd74a69724a5be4f77ba82ff285e2e7aea1713651d7e1f3fe7841bd927524a5aee7eed954cf1588b677137cee728d5b487003bb171
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
diff --git a/disk/partimage/HISTORY b/disk/partimage/HISTORY
index ca1ef7d..655cd18 100644
--- a/disk/partimage/HISTORY
+++ b/disk/partimage/HISTORY
@@ -1,3 +1,6 @@
+2007-10-13 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.6.7_beta2
+
2007-09-17 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.6.7_beta1

diff --git a/disk/qtparted/HISTORY b/disk/qtparted/HISTORY
index 2bc3c93..9fd3bc1 100644
--- a/disk/qtparted/HISTORY
+++ b/disk/qtparted/HISTORY
@@ -1,3 +1,6 @@
+2007-10-07 Eric Sandall <sandalle AT sourcemage.org>
+ * INSTALL: Fails with multiple make jobs
+
2006-12-01 Flavien Bridault <vlaaad AT sourcemage.org>
* DETAILS: Updated to 0.4.5 (fix bug #10426)
* qtparted-0.4.5-PED_SECTOR_SIZE.patch: added to fix compiling
diff --git a/disk/qtparted/INSTALL b/disk/qtparted/INSTALL
new file mode 100755
index 0000000..1988708
--- /dev/null
+++ b/disk/qtparted/INSTALL
@@ -0,0 +1,2 @@
+make_single &&
+default_install
diff --git a/disk/tkdvd/BUILD b/disk/tkdvd/BUILD
new file mode 100755
index 0000000..1a72529
--- /dev/null
+++ b/disk/tkdvd/BUILD
@@ -0,0 +1 @@
+./configure --prefix=/usr/bin
diff --git a/disk/tkdvd/DEPENDS b/disk/tkdvd/DEPENDS
new file mode 100755
index 0000000..5c7f0e4
--- /dev/null
+++ b/disk/tkdvd/DEPENDS
@@ -0,0 +1,3 @@
+depends tk &&
+depends CD-BURN-UTILITY &&
+depends dvd+rw-tools
diff --git a/disk/tkdvd/DETAILS b/disk/tkdvd/DETAILS
new file mode 100755
index 0000000..6f28edc
--- /dev/null
+++ b/disk/tkdvd/DETAILS
@@ -0,0 +1,26 @@
+ SPELL=tkdvd
+ VERSION=4.0.7
+ SOURCE="${SPELL}-${VERSION}.tar.gz"
+ SOURCE_URL[0]=http://regis.damongeot.free.fr/${SPELL}/dl/${SOURCE}
+
SOURCE_HASH=sha512:8da0fd166b0d04ad194339b9834c31f5ed5d04e866b38a3b9f6ada9a9e39147853d81293a823237bf8c5c25ec1d78e9f7bc7a6ec571219222fc9fa7f6a3c3b1c
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}"
+ WEB_SITE="http://regis.damongeot.free.fr/tkdvd/";
+ LICENSE[0]=GPL
+ ENTERED=20071105
+ SHORT="GUI for dvd+rw-tools written in TCL/Tk"
+cat << EOF
+It allows burnning CDs and DVDs easily.
+
+Features:
+ * View the current command line that will be used to burn the CD/DVD
+ * Burn CD/DVD from iso images
+ * Create ISO images from files and CD/DVD
+ * CD/DVD Copy
+ * Can overburn CD/DVD
+ * Support multi-sessions DVD
+ * Add/delete/exclude file/directories and show current used space
+ * Can keep directory structure
+ * Options to choose iso9660 filesystem extension (like Joliet or RockRidge
extensions)
+ * Prevent burning if used space > DVDR/RW capacity
+ * Show output of growisofs/mkisofs to view burned % and estimated remaining
time
+EOF
diff --git a/disk/tkdvd/HISTORY b/disk/tkdvd/HISTORY
new file mode 100644
index 0000000..f65d904
--- /dev/null
+++ b/disk/tkdvd/HISTORY
@@ -0,0 +1,2 @@
+2007-11-05 Vlad Glagolev <codex AT sourcemage.org>
+ * BUILD, DEPENDS, DETAILS, INSTALL, HISTORY: spell created
diff --git a/disk/tkdvd/INSTALL b/disk/tkdvd/INSTALL
new file mode 100755
index 0000000..902f103
--- /dev/null
+++ b/disk/tkdvd/INSTALL
@@ -0,0 +1,3 @@
+./install.tcl &&
+install -m 755 tkdvd-install.sh /usr/bin/tkdvd &&
+install -m 644 icons/*.png /usr/share/pixmaps
diff --git a/disk/udev/DETAILS b/disk/udev/DETAILS
index 8a1980d..c171c3a 100755
--- a/disk/udev/DETAILS
+++ b/disk/udev/DETAILS
@@ -1,6 +1,6 @@
SPELL=udev
- VERSION=115
- PATCHLEVEL=1
+ VERSION=116
+ PATCHLEVEL=0
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE2=$SOURCE.sign
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/disk/udev/HISTORY b/disk/udev/HISTORY
index d4cc29a..20f854d 100644
--- a/disk/udev/HISTORY
+++ b/disk/udev/HISTORY
@@ -1,3 +1,6 @@
+2007-10-14 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 116
+
2007-08-26 Arwed v. Merkatz <v.merkatz AT gmx.net>
* init.d/coldplug: only run the coldplugging stuff if udev is used for
/dev management, bug #13807
diff --git a/display/directfb/BUILD b/display/directfb/BUILD
index fa9cd72..d12211a 100755
--- a/display/directfb/BUILD
+++ b/display/directfb/BUILD
@@ -1,11 +1,20 @@
-if [ -f /usr/include/linux/fusion.h ]; then
+if [[ -f /usr/include/linux/fusion.h ]]; then
OPTS="$OPTS --enable-multi"
fi &&

-OPTS="--enable-linux-input \
- --with-gfxdrivers=$gfxdrivers \
- $OPTS" &&
+OPTS="--with-inputdrivers=$inputdrivers \
+ --with-gfxdrivers=$gfxdrivers \
+ $DFB_DEBUG $DFB_NETWORK $DFB_VOODOO \
+ $DFB_UNIQUE $DFB_V4L $DFB_V4L2 $DFB_TESTS \
+ $OPTS" &&

-export CPPFLAGS="$CPPFLAGS -I/usr/include/libmpeg3/" &&
+#
+## Remove this after is_depends_enabled is integrated to stable sorcery.
+#
+source "$GRIMOIRE/is_depends_enabled.function" &&
+
+if is_depends_enabled $SPELL libmpeg3; then
+ export CPPFLAGS="$CPPFLAGS -I/usr/include/libmpeg3/"
+fi &&

default_build
diff --git a/display/directfb/CONFIGURE b/display/directfb/CONFIGURE
index fe88b36..383d476 100755
--- a/display/directfb/CONFIGURE
+++ b/display/directfb/CONFIGURE
@@ -12,12 +12,15 @@ make_gfxdrivers_checklist() {
add_status `cat $SCRIPT_DIRECTORY/gfxdrivers`
}

+make_inputdrivers_checklist() {
+ add_status `cat $SCRIPT_DIRECTORY/inputdrivers`
+}

-get_gfx() {

+get_gfx() {
BACKTITLE="DirectFB GFXDRIVER Configuration"
TITLE="Chipset Manufacturer selection"
- HELP="Choose the chiipset your card uses, don't bother with any
others if you don't have the
+ HELP="Choose the chipset your card uses, don't bother with any others
if you don't have the
hardware. If none are selected then all will be installed."

dialog --backtitle "$BACKTITLE" \
@@ -30,8 +33,22 @@ hardware. If none are selected then all will be installed."

}

+get_input() {
+ BACKTITLE="DirectFB INPUTDRIVER Configuration"
+ TITLE="Input device selection"
+ HELP="Choose the input devices your box uses, don't bother with any
others. If none are selected then all will be installed."
+ dialog --backtitle "$BACKTITLE" \
+ --title "$TITLE" \
+ --stdout \
+ --separate-output \
+ --checklist "$HELP" \
+ 0 0 0 \
+ `make_inputdrivers_checklist`
+
+}
+
if ! grep -q "gfxdrivers" $SPELL_CONFIG ;then
- if query "select gfxdrivers to compile ?" n
+ if query "select gfxdrivers to compile?" n
then
gfxdrivers=all
OLD_IFS=$IFS
@@ -42,4 +59,52 @@ if ! grep -q "gfxdrivers" $SPELL_CONFIG ;then
export IFS=$OLD_IFS
else echo gfxdrivers=all >> $SPELL_CONFIG
fi
-fi
+fi &&
+
+if ! grep -q "inputdrivers" $SPELL_CONFIG ;then
+ if query "select inputdrivers to compile?" n
+ then
+ inputdrivers=all
+ OLD_IFS=$IFS
+ export IFS="
+"
+ inputdrivers=`get_input | tr '\n' ','`
+ echo "inputdrivers=$inputdrivers" >> $SPELL_CONFIG
+ export IFS=$OLD_IFS
+ else echo inputdrivers=all >> $SPELL_CONFIG
+ fi
+fi &&
+
+config_query_option DFB_DEBUG 'Compile in debug support? (This will slow DFB
down a lot)' \
+ 'n' \
+ '--enable-debug --enable-debug-support' \
+ '--disable-debug --disable-debug-support' &&
+
+config_query_option DFB_NETWORK 'Compile in networking support?' 'y' \
+ '--enable-network' \
+ '--disable-network' &&
+
+config_query_option DFB_VOODOO 'Compile in Voodoo support? (networking)' \
+ 'n' \
+ '--enable-voodoo' \
+ '--disable-voodoo' &&
+
+config_query_option DFB_UNIQUE 'Compile in Unique? (Window management
module)' \
+ 'n' \
+ '--enable-unique' \
+ '--disable-unique' &&
+
+config_query_option DFB_V4L 'Enable the v4l video provider?' \
+ 'y' \
+ '--enable-video4linux' \
+ '--disable-video4linux' &&
+
+config_query_option DFB_V4L2 'Enable the v4l2 support?' \
+ 'n' \
+ '--enable-video4linux2' \
+ '--disable-video4linux2' &&
+
+config_query_option DFB_TESTS 'Build test programs?' \
+ 'n' \
+ '--with-tests' \
+ '--with-tests'
diff --git a/display/directfb/DEPENDS b/display/directfb/DEPENDS
index 68acaf2..ffce9bb 100755
--- a/display/directfb/DEPENDS
+++ b/display/directfb/DEPENDS
@@ -28,8 +28,8 @@ optional_depends zlib \

optional_depends sdl \
'--enable-sdl' \
- '--enable-sdl=no' \
- 'build with SDL support' &&
+ '--disable-sdl' \
+ 'build with SDL support (Experimental, intended for DFB
devs)' &&

optional_depends X11-SERVER \
'--enable-x11' \
@@ -54,4 +54,9 @@ optional_depends gpm \
optional_depends sysfsutils \
'--enable-sysfs' \
'--disable-sysfs' \
- 'for Linux 2.6+ SysFS support'
+ 'for Linux 2.6+ SysFS support' &&
+
+optional_depends libvncserver \
+ '--enable-vnc' \
+ '--disable-vnc' \
+ 'for vnc support'
diff --git a/display/directfb/HISTORY b/display/directfb/HISTORY
index 1a95650..94a44d9 100644
--- a/display/directfb/HISTORY
+++ b/display/directfb/HISTORY
@@ -1,3 +1,11 @@
+2007-09-23 Arjan Bouter <abouter AT sourcemage.org>
+ * CONFIGURE: fixed typo
+ * DEPENDS: added warning for SDL, added libvncserver
+ * CONFIGURE: added queries for debugging, networking,
+ tests, v4l, inputdrivers and unique
+ * inputdrivers: added
+ * BUILD: added DFB_x options to OPTS
+
2006-10-03 Arjan Bouter <abouter AT sourcemage.org>
* DETAILS: version 1.0.0-rc1
updated download url to match website
diff --git a/display/directfb/inputdrivers b/display/directfb/inputdrivers
new file mode 100644
index 0000000..79b7ec2
--- /dev/null
+++ b/display/directfb/inputdrivers
@@ -0,0 +1,16 @@
+dbox2remote Dreambox2 remote
+dreamboxremote Dreambox remote
+dynapro ?
+elo-input ?
+gunze ?
+h3600_ts ?
+joystick Joystick
+keyboard Keyboard
+linuxinput Linux input
+lirc Lirc infra-red
+mutouch Mutouch touch-screen
+penmount ?
+ps2mouse PS/2 mouse
+serialmouse Serial mouse
+sonypijogdial Sony jog dial
+wm97xx WM97xx touch-screen
diff --git a/display/svgalib/HISTORY b/display/svgalib/HISTORY
index b43f68d..5c72579 100644
--- a/display/svgalib/HISTORY
+++ b/display/svgalib/HISTORY
@@ -1,3 +1,8 @@
+2007-11-10 Robin Cook <rcook AT wyrms.net>
+ * PRE_BUILD: added to apply patch for 2.6.23
+
http://groups.google.com/group/svgalib/browse_thread/thread/367b73b209a0bb77
+
http://groups.google.com/group/svgalib/browse_thread/thread/77a6f8362845b862
+
2006-12-27 Robin Cook <rcook AT wyrms.net>
* PRE_BUILD: added to apply patch for 2.6.19

diff --git a/display/svgalib/PRE_BUILD b/display/svgalib/PRE_BUILD
index 72b73ef..8f3b0f9 100755
--- a/display/svgalib/PRE_BUILD
+++ b/display/svgalib/PRE_BUILD
@@ -10,7 +10,9 @@ sedit "s:\$(shell uname -r):$KER:g"
\

# Apply patchs for kernel versions 2.6.15* and newer
KER=${KER:0:6} &&
-if [ ${KER//\./} > 2619 ]; then
+if [ ${KER//\./} > 2623 ]; then
+ patch -p1 < ${SCRIPT_DIRECTORY}/svgalib_helper-2.6.23.diff
+elif [ ${KER//\./} > 2619 ]; then
patch -p0 < ${SCRIPT_DIRECTORY}/svgalib_helper-2.6.19.diff
elif [ ${KER//\./} > 2617 ]; then
patch -p1 < ${SCRIPT_DIRECTORY}/svgalib_helper-2.6.18.diff
diff --git a/display/svgalib/svgalib_helper-2.6.23.diff
b/display/svgalib/svgalib_helper-2.6.23.diff
new file mode 100644
index 0000000..dc60739
--- /dev/null
+++ b/display/svgalib/svgalib_helper-2.6.23.diff
@@ -0,0 +1,72 @@
+diff -u -r svgalib-1.9.25.orig/kernel/svgalib_helper/kernel26compat.h
svgalib-1.9.25.mod/kernel/svgalib_helper/kernel26compat.h
+--- svgalib-1.9.25.orig/kernel/svgalib_helper/kernel26compat.h 2007-11-10
20:03:01.000000000 -0600
++++ svgalib-1.9.25.mod/kernel/svgalib_helper/kernel26compat.h 2007-11-10
20:16:58.000000000 -0600
+@@ -31,6 +31,7 @@
+ #else /* Kernel 2.6 */
+
+ #define NO_TASK
++#include <linux/fs.h>
+
+ # ifndef KERNEL_2_6
+ # define KERNEL_2_6
+@@ -77,7 +78,8 @@
+ }
+ static inline int devfs_unregister_chrdev (unsigned int major,const char
*name)
+ {
+- return unregister_chrdev (major, name);
++ unregister_chrdev (major, name);
++ return 0;
+ }
+ #endif
+
+diff -u -r svgalib-1.9.25.orig/kernel/svgalib_helper/main.c
svgalib-1.9.25.mod/kernel/svgalib_helper/main.c
+--- svgalib-1.9.25.orig/kernel/svgalib_helper/main.c 2007-11-10
20:03:01.000000000 -0600
++++ svgalib-1.9.25.mod/kernel/svgalib_helper/main.c 2007-11-10
20:13:07.000000000 -0600
+@@ -1,5 +1,7 @@
+-#include <linux/config.h>
+-
++#ifndef AUTOCONF_INCLUDED
++# include <linux/config.h>
++#endif
++
+ #if defined (CONFIG_MODVERSIONS) && !defined (MODVERSIONS)
+ # define MODVERSIONS
+ #endif
+@@ -17,7 +19,9 @@
+ #include <linux/ioport.h>
+ #include <linux/interrupt.h>
+ #include <linux/pci.h>
+-#include <linux/devfs_fs_kernel.h>
++#ifndef AUTOCONF_INCLUDED
++# include <linux/devfs_fs_kernel.h>
++#endif
+ #include <linux/mm.h>
+ #include <linux/thread_info.h>
+ #include <linux/smp.h>
+@@ -98,7 +102,7 @@
+ static volatile int vsync=0;
+ static wait_queue_head_t vsync_wait;
+
+-static irqreturn_t vsync_interrupt(int irq, void *dev_id, struct pt_regs
*regs)
++static irqreturn_t vsync_interrupt(int irq, void *dev_id)
+ {
+ struct sh_pci_device *dev = (struct sh_pci_device *)dev_id;
+
+@@ -355,7 +359,7 @@
+ vsync=1;
+ i=0;
+ while(irqs[i]!=-1)
+- request_irq(irqs[i++], vsync_interrupt, SA_SHIRQ,
"svgalib_helper", sdev_id);
++ request_irq(irqs[i++], vsync_interrupt, IRQF_SHARED,
"svgalib_helper", sdev_id);
+ vga_enable_vsync((void *)sdev_id);
+ wait_event_interruptible(vsync_wait, !vsync);
+ i=0;
+@@ -443,7 +447,7 @@
+ int i=sh_pci_devs[minor]->dev->irq;
+ sh_pci_devs[minor]->opencount++;
+ if(sh_pci_devs[minor]->opencount==1 && i!=0 && i!=-1 &&
i!=255)
+- request_irq(i, vsync_interrupt, SA_SHIRQ,
"svgalib_helper", sh_pci_devs[minor]);
++ request_irq(i, vsync_interrupt, IRQF_SHARED,
"svgalib_helper", sh_pci_devs[minor]);
+ }
+
+ #ifndef KERNEL_2_6
diff --git a/doc/devhelp/DETAILS b/doc/devhelp/DETAILS
index 49179c0..062b385 100755
--- a/doc/devhelp/DETAILS
+++ b/doc/devhelp/DETAILS
@@ -1,5 +1,5 @@
SPELL=devhelp
- VERSION=0.16
+ VERSION=0.16.1
BRANCH=`echo $VERSION | cut -d . -f 1,2`
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/doc/devhelp/HISTORY b/doc/devhelp/HISTORY
index 2c7d674..288dea0 100644
--- a/doc/devhelp/HISTORY
+++ b/doc/devhelp/HISTORY
@@ -1,3 +1,6 @@
+2007-10-08 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 0.16.1
+
2007-09-19 Robin Cook <rcook AT wyrms.net>
* DETAILS: updated VERSION to 0.16

diff --git a/doc/devhelp/devhelp-0.16.1.tar.bz2.sig
b/doc/devhelp/devhelp-0.16.1.tar.bz2.sig
new file mode 100644
index 0000000..5ac7c93
Binary files /dev/null and b/doc/devhelp/devhelp-0.16.1.tar.bz2.sig differ
diff --git a/doc/devhelp/devhelp-0.16.tar.bz2.sig
b/doc/devhelp/devhelp-0.16.tar.bz2.sig
deleted file mode 100644
index a9d0a79..0000000
Binary files a/doc/devhelp/devhelp-0.16.tar.bz2.sig and /dev/null differ
diff --git a/doc/evince/DETAILS b/doc/evince/DETAILS
index 1cc8334..c2c6bad 100755
--- a/doc/evince/DETAILS
+++ b/doc/evince/DETAILS
@@ -1,5 +1,5 @@
SPELL=evince
- VERSION=2.20.0
+ VERSION=2.20.1
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 533ffb7..4499f9a 100644
--- a/doc/evince/HISTORY
+++ b/doc/evince/HISTORY
@@ -1,3 +1,6 @@
+2007-10-18 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 2.20.1
+
2007-09-21 Robin Cook <rcook AT wyrms.net>
* DETAILS: updated VERSION to 2.20.0

diff --git a/doc/evince/evince-2.20.0.tar.bz2.sig
b/doc/evince/evince-2.20.0.tar.bz2.sig
deleted file mode 100644
index a33b4c1..0000000
Binary files a/doc/evince/evince-2.20.0.tar.bz2.sig and /dev/null differ
diff --git a/doc/evince/evince-2.20.1.tar.bz2.sig
b/doc/evince/evince-2.20.1.tar.bz2.sig
new file mode 100644
index 0000000..47e23a9
Binary files /dev/null and b/doc/evince/evince-2.20.1.tar.bz2.sig differ
diff --git a/doc/man-pages/DETAILS b/doc/man-pages/DETAILS
index 8993a02..63f6af3 100755
--- a/doc/man-pages/DETAILS
+++ b/doc/man-pages/DETAILS
@@ -1,5 +1,5 @@
SPELL=man-pages
- VERSION=2.65
+ VERSION=2.66
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SOURCE.sign
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/doc/man-pages/HISTORY b/doc/man-pages/HISTORY
index 7f959bf..d2745d5 100644
--- a/doc/man-pages/HISTORY
+++ b/doc/man-pages/HISTORY
@@ -1,3 +1,6 @@
+2007-10-09 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 2.66
+
2007-09-19 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 2.65

diff --git a/doc/man/BUILD b/doc/man/BUILD
index 5f28f09..7b347d4 100755
--- a/doc/man/BUILD
+++ b/doc/man/BUILD
@@ -1,6 +1,4 @@
./configure $OPTS -d +lang all &&
make_single &&
make &&
-make_normal &&
-
-patch -p 0 < $SCRIPT_DIRECTORY/man.conf.patch
+make_normal
diff --git a/doc/man/DETAILS b/doc/man/DETAILS
index d539532..5c2b1fb 100755
--- a/doc/man/DETAILS
+++ b/doc/man/DETAILS
@@ -1,6 +1,6 @@
SPELL=man
VERSION=1.6e
- PATCHLEVEL=1
+ PATCHLEVEL=2

SOURCE_HASH=sha512:8604b37798f807eb74c7947d483212c394f5e13293e064dc615a9fd28c60f5733c4033d293c75bb10be1a18c9f45c80e3fbe170f34bc7e1382c0a9e2c29a4a2e
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/doc/man/HISTORY b/doc/man/HISTORY
index ed145ea..152e6d8 100644
--- a/doc/man/HISTORY
+++ b/doc/man/HISTORY
@@ -1,3 +1,11 @@
+2007-10-27 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * BUILD, PRE_BUILD: moved man.conf patching to PRE_BUILD
+ * DETAILS: PATCHLEVEL++
+ * man.conf.patch: added j2sdk and perl man paths, removed the
+ /usr/share/*/man and /usr/lib/*/man paths as they cause man to
+ open 3000+ files on every run, delaying it by several seconds,
+ any paths missing should be added explicitly instead
+
2006-11-21 George Sherwood <george AT beernabeer.com>
* DETAILS: Updated to 1.6e

diff --git a/doc/man/PRE_BUILD b/doc/man/PRE_BUILD
new file mode 100755
index 0000000..3c25769
--- /dev/null
+++ b/doc/man/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+patch -p0 < $SCRIPT_DIRECTORY/man.conf.patch
diff --git a/doc/man/man.conf.patch b/doc/man/man.conf.patch
index 4e076c8..37ae880 100644
--- a/doc/man/man.conf.patch
+++ b/doc/man/man.conf.patch
@@ -1,6 +1,6 @@
---- src/man.conf.old 2005-04-29 10:57:05.000000000 +0200
-+++ src/man.conf 2005-04-29 11:10:45.000000000 +0200
-@@ -40,7 +40,7 @@
+--- src/man.conf.in.old 2007-10-27 13:29:07.000000000 +0200
++++ src/man.conf.in 2007-10-27 13:31:00.000000000 +0200
+@@ -36,11 +36,14 @@
#
# Every automatically generated MANPATH includes these fields
#
@@ -9,18 +9,14 @@
MANPATH /usr/share/man
MANPATH /usr/local/man
MANPATH /usr/local/share/man
-@@ -49,8 +49,8 @@
- # Uncomment if you want to include one of these by default
+ MANPATH /usr/X11R6/man
++MANPATH /usr/lib/j2sdk/man
++MANPATH /usr/share/site_perl/man
++MANPATH /usr/share/vendor_perl/man
#
- # MANPATH /opt/*/man
--# MANPATH /usr/lib/*/man
--# MANPATH /usr/share/*/man
-+MANPATH /usr/lib/*/man
-+MANPATH /usr/share/*/man
- # MANPATH /usr/kerberos/man
+ # Uncomment if you want to include one of these by default
#
- # Set up PATH to MANPATH mapping
-@@ -75,7 +75,7 @@
+@@ -71,7 +74,7 @@
# NOAUTOPATH keeps man from automatically adding directories that look like
# manual page directories to the path.
#
diff --git a/e/e16/DETAILS b/e/e16/DETAILS
index 623c89c..8e918c4 100755
--- a/e/e16/DETAILS
+++ b/e/e16/DETAILS
@@ -11,12 +11,12 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-0.16-cvs

SOURCE_URL[0]=cvs://:pserver:anonymous AT anoncvs.enlightenment.org:/var/cvs/e:$SPELL/e
SOURCE_IGNORE=volatile
else
- VERSION=0.16.8.9
+ VERSION=0.16.8.10
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-${VERSION%-*}
SOURCE_URL[0]=$SOURCEFORGE_URL/enlightenment/$SOURCE

-
SOURCE_HASH=sha512:bc9c253138dcd482a4320eba8d842632be64982299103f566f365861cacc57f10046a8757d7b476e16629340ef580b5b16ec7e9798618081c08d1a4e3f3e7513
+
SOURCE_HASH=sha512:75bab67a22ffeea05c64c2bfb3a067c7c87cd36c1e396750d48d3483001075a1cf4c0a20890e0e98672e04c37f3311a9838ca0f4637c13d2e58dc436b6b04dc0
# SOURCE_GPG="gurus.gpg:${SOURCE}.sig"

fi
diff --git a/e/e16/HISTORY b/e/e16/HISTORY
index 37d4f9e..ec2846a 100644
--- a/e/e16/HISTORY
+++ b/e/e16/HISTORY
@@ -1,3 +1,6 @@
+2007-10-06 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 0.16.8.10
+
2007-08-11 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 0.16.8.9

diff --git a/e/e_dbus/DETAILS b/e/e_dbus/DETAILS
index c15de61..d0af3a3 100755
--- a/e/e_dbus/DETAILS
+++ b/e/e_dbus/DETAILS
@@ -1,11 +1,12 @@
SPELL=e_dbus
+ PATCHLEVEL=1
if [[ "$E_DBUS_CVS_AUTOUPDATE" == "y" ]]; then
VERSION=$(date +%Y%m%d)
else
VERSION=cvs
fi
SOURCE=$SPELL-cvs.tar.bz2
-
SOURCE_URL[0]=cvs://:pserver:anonymous AT anoncvs.enlightenment.org:/var/cvs/e:e17/proto/${SPELL}
+
SOURCE_URL[0]=cvs://:pserver:anonymous AT anoncvs.enlightenment.org:/var/cvs/e:e17/libs/${SPELL}
SOURCE_IGNORE=volatile
FORCE_DOWNLOAD="on"
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-cvs
diff --git a/e/e_dbus/HISTORY b/e/e_dbus/HISTORY
index 3a43143..47adf3a 100644
--- a/e/e_dbus/HISTORY
+++ b/e/e_dbus/HISTORY
@@ -1,6 +1,10 @@
+2007-10-30 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: SOURCE_URL's fix, e17/proto -> e17/libs
+ * PRE_BUILD: sources from old SOURCE_URL must be removed
+
2007-09-22 Eric Sandall <sandalle AT sourcemage.org>
* DEPENDS: Depends on ecore

-2006-06-17 Philippe "Puppet_Master" Caseirol <puppetmaster AT sourcemage.org>
+2006-06-17 Philippe "Puppet_Master" Caseiro <puppetmaster AT sourcemage.org>
* PREPARE, DETAILS, DEPENDS, PRE_BUILD: Created

diff --git a/e/e_dbus/PRE_BUILD b/e/e_dbus/PRE_BUILD
index bab7906..25927c6 100755
--- a/e/e_dbus/PRE_BUILD
+++ b/e/e_dbus/PRE_BUILD
@@ -1,5 +1,12 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&
+
+if grep proto CVS/Repository > /dev/null; then
+message "${PROBLEM_COLOR}SOURCE_URL of $SPELL has been changed.
+Please remove old /var/spool/sorcery/$SPELL-cvs.tar.bz2${DEFAULT_COLOR}" &&
+return 1
+fi &&
+
#
# No longer complaing about missing unneeded config.rpath
#
diff --git a/e/imlib2/DEPENDS b/e/imlib2/DEPENDS
index df36ca4..646c217 100755
--- a/e/imlib2/DEPENDS
+++ b/e/imlib2/DEPENDS
@@ -1,13 +1,25 @@
depends libtool &&
-depends tiff &&
-depends libpng &&
depends zlib &&
-depends jpeg &&
-depends LIBGIF &&
depends freetype2 &&
depends X11-LIBS &&

if [ "$IMLIB2_CVS" == "y" ]; then
depends CVS &&
depends automake-1.9
-fi
+fi &&
+optional_depends 'tiff' \
+ '--with-tiff' \
+ '--without-tiff' \
+ 'TIFF image loader' &&
+optional_depends 'libpng' \
+ '--with-png' \
+ '--without-png' \
+ 'PNG image loader' &&
+optional_depends 'jpeg' \
+ '--with-jpeg' \
+ '--without-jpeg' \
+ 'JPEG image loader' &&
+optional_depends 'LIBGIF' \
+ '--with-gif' \
+ '--without-gif' \
+ 'GIF image loader'
diff --git a/e/imlib2/HISTORY b/e/imlib2/HISTORY
index 44974ae..587ad6d 100644
--- a/e/imlib2/HISTORY
+++ b/e/imlib2/HISTORY
@@ -1,3 +1,7 @@
+2007-01-25 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: make all image formats optional
+ fixes bug #14062
+
2007-05-06 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.4.0

diff --git a/editors/code-browser/BUILD b/editors/code-browser/BUILD
index ac08cdc..299acf1 100755
--- a/editors/code-browser/BUILD
+++ b/editors/code-browser/BUILD
@@ -1 +1,3 @@
-make
\ No newline at end of file
+make_single &&
+make &&
+make_normal
diff --git a/editors/code-browser/DETAILS b/editors/code-browser/DETAILS
index 436a102..e129815 100755
--- a/editors/code-browser/DETAILS
+++ b/editors/code-browser/DETAILS
@@ -1,5 +1,5 @@
SPELL=code-browser
- VERSION=2.15
+ VERSION=2.18
SOURCE=${SPELL}-${VERSION}-src.tar.gz
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
SOURCE_URL[0]=${SOURCEFORGE_URL}/${SPELL}/${SOURCE}
diff --git a/editors/code-browser/HISTORY b/editors/code-browser/HISTORY
index 15728b5..ecf322d 100644
--- a/editors/code-browser/HISTORY
+++ b/editors/code-browser/HISTORY
@@ -1,3 +1,7 @@
+2007-10-13 George Sherwood <george AT beernabeer.com>
+ * DETAILS: updated to version 2.18
+ * BUILD: make_single
+
2007-05-26 Pieter Lenaerts <e-type AT sourcemage.org>
* DETAILS: updated to 2.15

diff --git a/editors/code-browser/code-browser-2.15-src.tar.gz.sig
b/editors/code-browser/code-browser-2.15-src.tar.gz.sig
deleted file mode 100644
index 5da02bd..0000000
Binary files a/editors/code-browser/code-browser-2.15-src.tar.gz.sig and
/dev/null differ
diff --git a/editors/code-browser/code-browser-2.18-src.tar.gz.sig
b/editors/code-browser/code-browser-2.18-src.tar.gz.sig
new file mode 100644
index 0000000..86e1ac9
Binary files /dev/null and
b/editors/code-browser/code-browser-2.18-src.tar.gz.sig differ
diff --git a/editors/gawk/DETAILS b/editors/gawk/DETAILS
index 2949848..c77c4ec 100755
--- a/editors/gawk/DETAILS
+++ b/editors/gawk/DETAILS
@@ -1,5 +1,5 @@
SPELL=gawk
- VERSION=3.1.5
+ VERSION=3.1.6
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SOURCE.sig
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
@@ -10,7 +10,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
WEB_SITE=http://www.gnu.org/software/gawk/gawk.html
LICENSE[0]=GPL
ENTERED=20010922
- PATCHLEVEL=1
+ PATCHLEVEL=0
KEYWORDS="editors"
SHORT="gawk is a free version of awk."
cat << EOF
diff --git a/editors/gawk/HISTORY b/editors/gawk/HISTORY
index 2bde4d1..50c1a5c 100644
--- a/editors/gawk/HISTORY
+++ b/editors/gawk/HISTORY
@@ -1,3 +1,7 @@
+2007-10-26 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 3.1.6
+ * PRE_BUILD, invalid-free.patch: removed
+
2006-09-21 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: [automated] Removed BUILD_API=2.

diff --git a/editors/gawk/PRE_BUILD b/editors/gawk/PRE_BUILD
deleted file mode 100755
index 9531635..0000000
--- a/editors/gawk/PRE_BUILD
+++ /dev/null
@@ -1,3 +0,0 @@
-default_pre_build &&
-cd $SOURCE_DIRECTORY &&
-patch -p0 < $SCRIPT_DIRECTORY/invalid-free.patch
diff --git a/editors/gawk/invalid-free.patch b/editors/gawk/invalid-free.patch
deleted file mode 100644
index 2ae30ca..0000000
--- a/editors/gawk/invalid-free.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-Fri Aug 12 13:10:33 2005 Arnold D. Robbins <arnold AT skeeve.com>
-
- * io.c (iop_alloc): Only free `iop' if it was malloc'ed in
- the first place.
-
---- ../gawk-3.1.5/io.c 2005-07-26 21:07:43.000000000 +0300
-+++ io.c 2005-08-12 13:10:28.000000000 +0300
-@@ -2480,9 +2480,12 @@
- {
- struct stat sbuf;
- struct open_hook *oh;
-+ int iop_malloced = FALSE;
-
-- if (iop == NULL)
-+ if (iop == NULL) {
- emalloc(iop, IOBUF *, sizeof(IOBUF), "iop_alloc");
-+ iop_malloced = TRUE;
-+ }
- memset(iop, '\0', sizeof(IOBUF));
- iop->flag = 0;
- iop->fd = fd;
-@@ -2495,7 +2498,8 @@
- }
-
- if (iop->fd == INVALID_HANDLE) {
-- free(iop);
-+ if (iop_malloced)
-+ free(iop);
- return NULL;
- }
- if (isatty(iop->fd))
-
diff --git a/editors/leafpad/DETAILS b/editors/leafpad/DETAILS
index ef7420c..e675306 100755
--- a/editors/leafpad/DETAILS
+++ b/editors/leafpad/DETAILS
@@ -1,5 +1,5 @@
SPELL=leafpad
- VERSION=0.8.9
+ VERSION=0.8.12
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=${SOURCE}.sig
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/editors/leafpad/HISTORY b/editors/leafpad/HISTORY
index ba678c0..60d986b 100644
--- a/editors/leafpad/HISTORY
+++ b/editors/leafpad/HISTORY
@@ -1,3 +1,6 @@
+2007-11-03 Vlad Glagolev <codex AT sourcemage.org>
+ * DETAILS: updated to 0.8.12
+
2006-10-03 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: [automated] Removed UPDATED.

diff --git a/editors/lyx/DETAILS b/editors/lyx/DETAILS
index bdc37a4..4e0f898 100755
--- a/editors/lyx/DETAILS
+++ b/editors/lyx/DETAILS
@@ -1,5 +1,5 @@
SPELL=lyx
- VERSION=1.5.1
+ VERSION=1.5.2
SOURCE=${SPELL}-${VERSION}.tar.bz2
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
SOURCE_URL[0]=ftp://ftp.lyx.org/pub/lyx/stable/$SOURCE
@@ -7,7 +7,7 @@ SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
SOURCE_URL[2]=ftp://gd.tuwien.ac.at/publishing/tex/lyx/stable/${SOURCE}
SOURCE_URL[3]=http://gd.tuwien.ac.at/publishing/tex/lyx/stable/${SOURCE}
SOURCE_URL[4]=ftp://ftp.lip6.fr/pub/lyx/stable/${SOURCE}
-
SOURCE_HASH=sha512:e701ed98fb0eb7c3189fe7de5a3d206aa6a241ba43bc0d1a968bc8f02403f4335551d30b191addfeb84fe89023806f5a6ecc1b567f7fd471fbf7badd5a1ef868
+
SOURCE_HASH=sha512:6e9d4a8feec728e4c3d4dea4f5372ebe25f1143915a0c21040bd43aa897d4fb1de8fcdf63dffdd77418f427524fbfebe52eff974c983de9da9312bbe81cc1017
WEB_SITE=http://www.lyx.org/
LICENSE[0]=GPL
ENTERED=20020330
diff --git a/editors/lyx/HISTORY b/editors/lyx/HISTORY
index 82de9ba..70c30d7 100644
--- a/editors/lyx/HISTORY
+++ b/editors/lyx/HISTORY
@@ -1,3 +1,6 @@
+2007-10-10 George Sherwood <george AT beernabeer.com>
+ * DETAILS: Updated to version 1.5.2
+
2007-08-17 George Sherwood <george AT beernbeer.com>
* DETAILS: Updated to version 1.5.1
* BUILD: Updated to build correctly with qt4
diff --git a/editors/nedit/DEPENDS b/editors/nedit/DEPENDS
index c598888..10519a8 100755
--- a/editors/nedit/DEPENDS
+++ b/editors/nedit/DEPENDS
@@ -2,4 +2,4 @@
# attempt to copy to unlocked clipboard
# clipboard then unusable until server restart
# plus nedit folks are notorious about lesstif being problematic
-depends openmotif
+depends openmotif "" "" z-rejected
diff --git a/editors/nedit/HISTORY b/editors/nedit/HISTORY
index 0dbe310..d62aecc 100644
--- a/editors/nedit/HISTORY
+++ b/editors/nedit/HISTORY
@@ -1,3 +1,6 @@
+2007-10-26 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
+ * DEPENDS: openmotif now in z-rejected
+
2006-09-27 Thomas Orgis <sobukus AT sourcemage.org>
* DETAILS, INSTALL: changed name of nedit client binary to ncl
to let the youngster netcat use nc
diff --git a/editors/poedit/DETAILS b/editors/poedit/DETAILS
index b6d12b9..1e23729 100755
--- a/editors/poedit/DETAILS
+++ b/editors/poedit/DETAILS
@@ -1,10 +1,10 @@
SPELL=poedit
- VERSION=1.3.6
- SOURCE="$SPELL-$VERSION.tar.gz"
+ VERSION=1.3.7
+ SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
SOURCE_GPG=gurus.gpg:${SOURCE}.sig:WORKS_FOR_ME
-SOURCE_DIRECTORY="${BUILD_DIRECTORY}/$SPELL-$VERSION"
- WEB_SITE=http://www.poedit.org
+SOURCE_DIRECTORY=${BUILD_DIRECTORY}/$SPELL-$VERSION
+ WEB_SITE=http://www.poedit.org/
LICENSE[0]=MIT
ENTERED=20060824
SHORT="gettext translation catalog editor."
diff --git a/editors/poedit/HISTORY b/editors/poedit/HISTORY
index 1a79097..47cfcb6 100644
--- a/editors/poedit/HISTORY
+++ b/editors/poedit/HISTORY
@@ -1,3 +1,6 @@
+2007-11-04 Vlad Glagolev <codex AT sourcemage.org>
+ * DETAILS: updated to 1.3.7, using sig, cleaned up
+
2006-11-29 Pieter Lenaerts <e-type AT sourcemage.org>
* DEPENDS: added optional db and gtkspell dependencies
* DETAILS: updated to 1.3.6, using sig, corrected license
diff --git a/editors/poedit/poedit-1.3.6.tar.gz.sig
b/editors/poedit/poedit-1.3.6.tar.gz.sig
deleted file mode 100644
index 6858500..0000000
Binary files a/editors/poedit/poedit-1.3.6.tar.gz.sig and /dev/null differ
diff --git a/editors/poedit/poedit-1.3.7.tar.gz.sig
b/editors/poedit/poedit-1.3.7.tar.gz.sig
new file mode 100644
index 0000000..2d295a1
Binary files /dev/null and b/editors/poedit/poedit-1.3.7.tar.gz.sig differ
diff --git a/editors/tea/DETAILS b/editors/tea/DETAILS
index ece5a9b..53bd14a 100755
--- a/editors/tea/DETAILS
+++ b/editors/tea/DETAILS
@@ -1,9 +1,9 @@
SPELL=tea
- VERSION=17.2.5
+ VERSION=17.3.5
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL=$SOURCEFORGE_URL/tea-editor/$SOURCE
-
SOURCE_HASH=sha512:2db9cdb393735b84848816dee8b9f845688512653c8e27878d8aacbec4d9aa88e399b9bb0f9bcd8ad350beadb619e0717e10144931384899f198b4f0ad73362b
+
SOURCE_HASH=sha512:ac823572c9f3b54b1459cb350969ea9c1ff33f53f8f7623e1aa92f1284f973212d0db989c51044cc73a770a4a1484050c980a8a10192157ec101c97a9bb2cce9
WEB_SITE=http://tea-editor.sourceforge.net/
ENTERED=20070302
LICENSE[0]=GPL
diff --git a/editors/tea/HISTORY b/editors/tea/HISTORY
index 52e6edf..b1286d6 100644
--- a/editors/tea/HISTORY
+++ b/editors/tea/HISTORY
@@ -1,3 +1,9 @@
+2007-10-19 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 17.3.5
+
+2007-10-14 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 17.3.3
+
2007-09-19 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 17.2.5

diff --git a/fonts/dejavu-ttf/DETAILS b/fonts/dejavu-ttf/DETAILS
index 78f4924..35d3cb1 100755
--- a/fonts/dejavu-ttf/DETAILS
+++ b/fonts/dejavu-ttf/DETAILS
@@ -1,7 +1,7 @@
SPELL=dejavu-ttf
PACKAGE=${SPELL%-*}
- VERSION=2.20
-
SOURCE_HASH=sha512:cfef541811c17cd719f29b8a3a70bfad3350860e686eb2b60150afa473381c5d34564fc06838ab0b05044f14778d480eae83ecf9050a18b63fadf0d53313fdd2
+ VERSION=2.21
+
SOURCE_HASH=sha512:af5346f3c308b86f6087551b087b27014f9cfccba24e1fca1bd7ec2788973ba9d4c1e11a3bc6ad272a99d8bf44e42f9cc0f9231e7cd26266812ac697132bfc12
SOURCE="$SPELL-$VERSION.tar.bz2"
DOCS="README LICENSE AUTHORS NEWS BUGS *.txt"
SOURCE_URL[0]="$SOURCEFORGE_URL/$PACKAGE/$SOURCE"
diff --git a/fonts/dejavu-ttf/HISTORY b/fonts/dejavu-ttf/HISTORY
index 20be136..e9c4938 100644
--- a/fonts/dejavu-ttf/HISTORY
+++ b/fonts/dejavu-ttf/HISTORY
@@ -1,3 +1,6 @@
+2007-10-28 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 2.21
+
2007-09-16 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 2.20

diff --git a/ftp-libs/libtorrent/BUILD b/ftp-libs/libtorrent/BUILD
index 211eb18..8d4cfca 100755
--- a/ftp-libs/libtorrent/BUILD
+++ b/ftp-libs/libtorrent/BUILD
@@ -1,7 +1,3 @@
-# fix problems on amd64 with libtool versions (bug #13943)
-./autogen.sh &&
-# fix configure so our CXXFLAGS get used
-sedit 's/test $CXXFLAGS/test -n "$CXXFLAGS"/' configure &&
# remove -O3 from CXXFLAGS on gcc 4.0.x, leads to wrong code -> segfault
if use_gcc ^4; then
CXXFLAGS="${CXXFLAGS/-O3/-Os}"
diff --git a/ftp-libs/libtorrent/CONFIGURE b/ftp-libs/libtorrent/CONFIGURE
new file mode 100755
index 0000000..9f71ec9
--- /dev/null
+++ b/ftp-libs/libtorrent/CONFIGURE
@@ -0,0 +1,3 @@
+# dht patch disabled for the moment
+#config_query DHT_PATCH "Patch to support dht?" "n"
+
diff --git a/ftp-libs/libtorrent/DEPENDS b/ftp-libs/libtorrent/DEPENDS
index 5480c4d..aee8abb 100755
--- a/ftp-libs/libtorrent/DEPENDS
+++ b/ftp-libs/libtorrent/DEPENDS
@@ -1,4 +1,5 @@
-depends openssl &&
-depends libsigc++3 &&
-depends automake &&
+optional_depends "openssl" "" "--disable-openssl" "Needed for \
+encryption" &&
+depends libsigc++3 &&
+depends automake &&
depends libtool
diff --git a/ftp-libs/libtorrent/DETAILS b/ftp-libs/libtorrent/DETAILS
index b106d18..232817b 100755
--- a/ftp-libs/libtorrent/DETAILS
+++ b/ftp-libs/libtorrent/DETAILS
@@ -1,5 +1,5 @@
SPELL=libtorrent
- VERSION=0.11.8
+ VERSION=0.11.9
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://libtorrent.rakshasa.no/downloads/$SOURCE
@@ -7,7 +7,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
ENTERED=20050117
LICENSE[0]=GPL
BUILD_API=2
-
SOURCE_HASH=sha512:0d01b63b423802c66f4f91d37350bddead345054893e646ac04db532de44e798b77ff961a861e87354fe055bc2920f882d68ab9e5ab52d5ad61b0b369e1f5d90
+
SOURCE_HASH=sha512:179c2cb83c4c4cc43eddbee3a3bd5633a0381b899b9fe40e88a5a387953fa1820681a1007f68b59195ac3ef81b91d65776642ee244a069729227dd2cf37df740
KEYWORDS="bittorrent ftp libs"
SHORT='LibTorrent is a BitTorrent library written in C++ for
*nix.'
cat << EOF
diff --git a/ftp-libs/libtorrent/HISTORY b/ftp-libs/libtorrent/HISTORY
index d578a9d..6eb5103 100644
--- a/ftp-libs/libtorrent/HISTORY
+++ b/ftp-libs/libtorrent/HISTORY
@@ -1,3 +1,19 @@
+2007-10-26 Mathieu Lonjaret <lejatorn AT sourcemage.org>
+ * DETAILS: update to 0.11.9
+ * CONFIGURE, PRE_BUILD: disabled dht patch
+
+2007-10-10 Mathieu Lonjaret <lejatorn AT sourcemage.org>
+ * DEPENDS: better explanation for openssl
+ * CONFIGURE: DHT patch defaults to no
+
+2007-10-06 Mathieu Lonjaret <lejatorn AT sourcemage.org>
+ * BUILD,PRE_BUILD: moved autogen, removed sedit (not needed anymore)
+
+2007-10-03 Mathieu Lonjaret <lejatorn AT sourcemage.org>
+ * DEPENDS: set openssl to optional
+ * DEPENDS, SUB_DEPENDS, CONFIGURE, PRE_SUB_DEPENDS, PRE_BUILD,
+ * dht.diff: added support for dht
+
2007-09-10 Mathieu Lonjaret <lejatorn AT sourcemage.org>
* DETAILS: update to 0.11.8

diff --git a/ftp-libs/libtorrent/PRE_BUILD b/ftp-libs/libtorrent/PRE_BUILD
new file mode 100755
index 0000000..30a7a06
--- /dev/null
+++ b/ftp-libs/libtorrent/PRE_BUILD
@@ -0,0 +1,10 @@
+default_pre_build &&
+cd ${SOURCE_DIRECTORY} &&
+# fix problems on amd64 with libtool versions (bug #13943)
+./autogen.sh
+# dht patch, commented until new patch comes out for this version
+#if [[ ${DHT_PATCH} != n ]]; then
+# cp ${SPELL_DIRECTORY}/dht.diff ${SOURCE_DIRECTORY}/dht.diff &&
+# patch -p1 < dht.diff
+#fi
+
diff --git a/ftp-libs/libtorrent/PRE_SUB_DEPENDS
b/ftp-libs/libtorrent/PRE_SUB_DEPENDS
new file mode 100755
index 0000000..ccf10ca
--- /dev/null
+++ b/ftp-libs/libtorrent/PRE_SUB_DEPENDS
@@ -0,0 +1,6 @@
+case "$THIS_SUB_DEPENDS" in
+ DHT) if [[ $DHT_PATCH == y ]] ; then return 0
+ else return 1
+ fi ;;
+ *) echo "bogus sub_depends: libtorrent $THIS_SUB_DEPENDS"; return 1;;
+esac
diff --git a/ftp-libs/libtorrent/SUB_DEPENDS b/ftp-libs/libtorrent/SUB_DEPENDS
new file mode 100755
index 0000000..c12b35d
--- /dev/null
+++ b/ftp-libs/libtorrent/SUB_DEPENDS
@@ -0,0 +1,4 @@
+case "$THIS_SUB_DEPENDS" in
+ DHT) DHT_PATCH="y" ;;
+ *) echo "bogus sub_depends: libtorrent $THIS_SUB_DEPENDS"; return 1;;
+esac
diff --git a/ftp-libs/libtorrent/dht.diff b/ftp-libs/libtorrent/dht.diff
new file mode 100644
index 0000000..12bac8a
--- /dev/null
+++ b/ftp-libs/libtorrent/dht.diff
@@ -0,0 +1,5112 @@
+Index: libtorrent/scripts/checks.m4
+===================================================================
+--- libtorrent/scripts/checks.m4 (revision 975)
++++ libtorrent/scripts/checks.m4 (working copy)
+@@ -289,7 +289,27 @@
+ ])
+ ])
+
++AC_DEFUN([TORRENT_CHECK_TR1], [
++ AC_LANG_PUSH(C++)
++ AC_MSG_CHECKING(for TR1 support)
+
++ AC_COMPILE_IFELSE(
++ [[#include <tr1/unordered_map>
++ class Foo;
++ typedef std::tr1::unordered_map<Foo*, int> Bar;
++ ]],
++ [
++ AC_MSG_RESULT(yes)
++ AC_DEFINE(HAVE_TR1, 1, Define to 1 if your C++ library supports the
extensions from Technical Report 1)
++ ],
++ [
++ AC_MSG_RESULT(no)
++ ]
++ )
++
++ AC_LANG_POP(C++)
++])
++
+ AC_DEFUN([TORRENT_WITH_FASTCGI], [
+ AC_ARG_WITH(fastcgi,
+ [ --with-fastcgi=PATH Enable FastCGI RPC support. (DO NOT USE)],
+Index: libtorrent/scripts/common.m4
+===================================================================
+--- libtorrent/scripts/common.m4 (revision 975)
++++ libtorrent/scripts/common.m4 (working copy)
+@@ -239,3 +239,18 @@
+ fi
+ ])
+ ])
++
++AC_DEFUN([TORRENT_ENABLE_TR1], [
++ AC_ARG_ENABLE(std_tr1,
++ [ --disable-std_tr1 disable check for support for TR1
[[default=enable]]],
++ [
++ if test "$enableval" = "yes"; then
++ TORRENT_CHECK_TR1()
++ else
++ AC_MSG_CHECKING(for TR1 support)
++ AC_MSG_RESULT(disabled)
++ fi
++ ],[
++ TORRENT_CHECK_TR1()
++ ])
++])
+Index: libtorrent/src/dht/dht_tracker.h
+===================================================================
+--- libtorrent/src/dht/dht_tracker.h (revision 0)
++++ libtorrent/src/dht/dht_tracker.h (revision 0)
+@@ -0,0 +1,84 @@
++// libTorrent - BitTorrent library
++// Copyright (C) 2005-2007, Jari Sundell
++//
++// This program is free software; you can redistribute it and/or modify
++// it under the terms of the GNU General Public License as published by
++// the Free Software Foundation; either version 2 of the License, or
++// (at your option) any later version.
++//
++// This program is distributed in the hope that it will be useful,
++// but WITHOUT ANY WARRANTY; without even the implied warranty of
++// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++// GNU General Public License for more details.
++//
++// You should have received a copy of the GNU General Public License
++// along with this program; if not, write to the Free Software
++// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++//
++// In addition, as a special exception, the copyright holders give
++// permission to link the code of portions of this program with the
++// OpenSSL library under certain conditions as described in each
++// individual source file, and distribute linked combinations
++// including the two.
++//
++// You must obey the GNU General Public License in all respects for
++// all of the code used other than OpenSSL. If you modify file(s)
++// with this exception, you may extend this exception to your version
++// of the file(s), but you are not obligated to do so. If you do not
++// wish to do so, delete this exception statement from your version.
++// If you delete this exception statement from all source files in the
++// program, then also delete it here.
++//
++// Contact: Jari Sundell <jaris AT ifi.uio.no>
++//
++// Skomakerveien 33
++// 3185 Skoppum, NORWAY
++
++#ifndef LIBTORRENT_DHT_TORRENT_H
++#define LIBTORRENT_DHT_TORRENT_H
++
++#include "globals.h"
++
++#include <vector>
++#include <rak/socket_address.h>
++
++#include "download/download_info.h" // for SocketAddressCompact
++
++namespace torrent {
++
++class Object;
++
++// Container for peers tracked in a torrent.
++
++class DhtTracker : private std::vector<SocketAddressCompact> {
++public:
++ typedef std::vector<SocketAddressCompact> base_type;
++
++ // Maximum number of peers we return for a GET_PEERS query (default
value).
++ // Needs to be small enough so that a packet with a payload of
num_peers*6 bytes
++ // does not need fragmentation. Value chosen so that the size is
approximately
++ // equal to a FIND_NODE reply (8*26 bytes).
++ static const unsigned int max_peers = 32;
++
++ // Maximum number of peers we keep track of. For torrents with more peers,
++ // replace random peers with new announces to avoid excessively large peer
++ // tables for active torrents.
++ static const unsigned int max_size = 128;
++
++ using base_type::empty;
++ using base_type::size;
++
++ void add_peer(const rak::socket_address* sa);
++ std::string get_peers(unsigned int maxPeers = max_peers);
++
++ // Remove old announces from the tracker that have not reannounced for
++ // more than the given number of prune calls.
++ void prune(uint32_t maxAge);
++
++private:
++ std::vector<uint32_t> m_lastSeen;
++};
++
++}
++
++#endif
+Index: libtorrent/src/dht/dht_bucket.cc
+===================================================================
+--- libtorrent/src/dht/dht_bucket.cc (revision 0)
++++ libtorrent/src/dht/dht_bucket.cc (revision 0)
+@@ -0,0 +1,191 @@
++// libTorrent - BitTorrent library
++// Copyright (C) 2005-2007, Jari Sundell
++//
++// This program is free software; you can redistribute it and/or modify
++// it under the terms of the GNU General Public License as published by
++// the Free Software Foundation; either version 2 of the License, or
++// (at your option) any later version.
++//
++// This program is distributed in the hope that it will be useful,
++// but WITHOUT ANY WARRANTY; without even the implied warranty of
++// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++// GNU General Public License for more details.
++//
++// You should have received a copy of the GNU General Public License
++// along with this program; if not, write to the Free Software
++// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++//
++// In addition, as a special exception, the copyright holders give
++// permission to link the code of portions of this program with the
++// OpenSSL library under certain conditions as described in each
++// individual source file, and distribute linked combinations
++// including the two.
++//
++// You must obey the GNU General Public License in all respects for
++// all of the code used other than OpenSSL. If you modify file(s)
++// with this exception, you may extend this exception to your version
++// of the file(s), but you are not obligated to do so. If you do not
++// wish to do so, delete this exception statement from your version.
++// If you delete this exception statement from all source files in the
++// program, then also delete it here.
++//
++// Contact: Jari Sundell <jaris AT ifi.uio.no>
++//
++// Skomakerveien 33
++// 3185 Skoppum, NORWAY
++
++#include "config.h"
++
++#include "torrent/exceptions.h"
++
++#include "dht_bucket.h"
++#include "dht_node.h"
++
++namespace torrent {
++
++DhtBucket::DhtBucket(const HashString& begin, const HashString& end) :
++ m_parent(NULL),
++ m_child(NULL),
++
++ m_lastChanged(cachedTime.seconds()),
++
++ m_good(0),
++ m_bad(0),
++
++ m_begin(begin),
++ m_end(end) {
++
++ reserve(num_nodes);
++}
++
++void
++DhtBucket::add_node(DhtNode* n) {
++ push_back(n);
++ touch();
++
++ if (n->is_good())
++ m_good++;
++ else if (n->is_bad())
++ m_bad++;
++}
++
++void
++DhtBucket::remove_node(DhtNode* n) {
++ iterator itr = std::find_if(begin(), end(),
std::bind2nd(std::equal_to<DhtNode*>(), n));
++ if (itr == end())
++ throw internal_error("DhtBucket::remove_node called for node not in
bucket.");
++
++ erase(itr);
++
++ if (n->is_good())
++ m_good--;
++ else if (n->is_bad())
++ m_bad--;
++}
++
++void
++DhtBucket::count() {
++ m_good = std::count_if(begin(), end(), std::mem_fun(&DhtNode::is_good));
++ m_bad = std::count_if(begin(), end(), std::mem_fun(&DhtNode::is_bad));
++}
++
++// Called every 15 minutes for housekeeping.
++void
++DhtBucket::update() {
++ // For now we only update the counts after some nodes have become bad
++ // due to prolonged inactivity.
++ count();
++}
++
++DhtBucket::iterator
++DhtBucket::find_replacement_candidate(bool onlyOldest) {
++ iterator oldest = end();
++ unsigned int oldestTime = std::numeric_limits<unsigned int>::max();
++
++ for (iterator itr = begin(); itr != end(); ++itr) {
++ if ((*itr)->is_bad() && !onlyOldest)
++ return itr;
++
++ if ((*itr)->last_seen() < oldestTime) {
++ oldestTime = (*itr)->last_seen();
++ oldest = itr;
++ }
++ }
++
++ return oldest;
++}
++
++void
++DhtBucket::get_mid_point(HashString* middle) const {
++ *middle = m_end;
++
++ for (unsigned int i=0; i<m_begin.size(); i++)
++ if (m_begin[i] != m_end[i]) {
++ (*middle)[i] = ((uint8_t)m_begin[i] + (uint8_t)m_end[i]) / 2;
++ break;
++ }
++}
++
++void
++DhtBucket::get_random_id(HashString* rand_id) const {
++
++ // Generate a random ID between m_begin and m_end.
++ // Since m_end - m_begin = 2^n - 1, we can do a bitwise AND operation.
++ for (unsigned int i=0; i<(*rand_id).size(); i++)
++ (*rand_id)[i] = m_begin[i] + (random() & (m_end[i] - m_begin[i]));
++
++#ifdef USE_EXTRA_DEBUG
++ if (!is_in_range(*rand_id))
++ throw internal_error("DhtBucket::get_random_id generated an
out-of-range ID.");
++#endif
++}
++
++DhtBucket*
++DhtBucket::split(const HashString& id) {
++ HashString mid_range;
++ get_mid_point(&mid_range);
++
++ DhtBucket* other = new DhtBucket(m_begin, mid_range);
++
++ // Set m_begin = mid_range + 1
++ int carry = 1;
++ for (unsigned int i = mid_range.size(); i>0; i--) {
++ unsigned int sum = (uint8_t)mid_range[i-1] + carry;
++ m_begin[i-1] = (uint8_t)sum;
++ carry = sum >> 8;
++ }
++
++ // Move nodes over to other bucket if they fall in its range, then
++ // delete them from this one.
++ iterator split = std::partition(begin(), end(),
std::bind2nd(std::mem_fun(&DhtNode::is_in_range), this));
++ other->insert(other->end(), split, end());
++ std::for_each(other->begin(), other->end(),
std::bind2nd(std::mem_fun(&DhtNode::set_bucket), other));
++ erase(split, end());
++
++ other->set_time(m_lastChanged);
++ other->count();
++
++ count();
++
++ // Maintain child (adjacent narrower bucket) and parent (adjacent wider
bucket)
++ // so that given router ID is in child.
++ if (other->is_in_range(id)) {
++ // Make other become our new child.
++ m_child = other;
++ other->m_parent = this;
++
++ } else {
++ // We become other's child, other becomes our parent's child.
++ if (parent()) {
++ parent()->m_child = other;
++ other->m_parent = parent();
++ }
++
++ m_parent = other;
++ other->m_child = this;
++ }
++
++ return other;
++}
++
++}
+Index: libtorrent/src/dht/dht_bucket.h
+===================================================================
+--- libtorrent/src/dht/dht_bucket.h (revision 0)
++++ libtorrent/src/dht/dht_bucket.h (revision 0)
+@@ -0,0 +1,183 @@
++// libTorrent - BitTorrent library
++// Copyright (C) 2005-2007, Jari Sundell
++//
++// This program is free software; you can redistribute it and/or modify
++// it under the terms of the GNU General Public License as published by
++// the Free Software Foundation; either version 2 of the License, or
++// (at your option) any later version.
++//
++// This program is distributed in the hope that it will be useful,
++// but WITHOUT ANY WARRANTY; without even the implied warranty of
++// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++// GNU General Public License for more details.
++//
++// You should have received a copy of the GNU General Public License
++// along with this program; if not, write to the Free Software
++// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++//
++// In addition, as a special exception, the copyright holders give
++// permission to link the code of portions of this program with the
++// OpenSSL library under certain conditions as described in each
++// individual source file, and distribute linked combinations
++// including the two.
++//
++// You must obey the GNU General Public License in all respects for
++// all of the code used other than OpenSSL. If you modify file(s)
++// with this exception, you may extend this exception to your version
++// of the file(s), but you are not obligated to do so. If you do not
++// wish to do so, delete this exception statement from your version.
++// If you delete this exception statement from all source files in the
++// program, then also delete it here.
++//
++// Contact: Jari Sundell <jaris AT ifi.uio.no>
++//
++// Skomakerveien 33
++// 3185 Skoppum, NORWAY
++
++#ifndef LIBTORRENT_DHT_BUCKET_H
++#define LIBTORRENT_DHT_BUCKET_H
++
++#include <list>
++
++#include "globals.h"
++
++#include "torrent/hash_string.h"
++
++namespace torrent {
++
++class DhtNode;
++
++// A container holding a small number of nodes that fall in a given binary
++// partition of the 160-bit ID space (i.e. the range ID1..ID2 where
ID2-ID1+1 is
++// a power of 2.)
++class DhtBucket : private std::vector<DhtNode*> {
++public:
++ static const unsigned int num_nodes = 8;
++
++ typedef std::vector<DhtNode*> base_type;
++
++ using base_type::const_iterator;
++ using base_type::iterator;
++
++ using base_type::begin;
++ using base_type::end;
++ using base_type::size;
++ using base_type::empty;
++
++ DhtBucket(const HashString& begin, const HashString& end);
++
++ // Add new node. Does NOT set node's bucket automatically (to allow
adding a
++ // node to multiple buckets, with only one "main" bucket.)
++ void add_node(DhtNode* n);
++
++ void remove_node(DhtNode* n);
++
++ // Bucket's ID range functions.
++ const HashString& id_range_begin() const { return
m_begin; }
++ HashString& id_range_begin() { return
m_begin; }
++ const HashString& id_range_end() const { return
m_end; }
++ HashString& id_range_end() { return
m_end; }
++
++ bool is_in_range(const HashString& id) const { return
m_begin <= id && id <= m_end; }
++
++ // Find middle or random ID in bucket.
++ void get_mid_point(HashString* middle) const;
++ void get_random_id(HashString* rand_id) const;
++
++ // Node counts and bucket stats.
++ bool is_full() const { return
size() >= num_nodes; }
++ bool has_space() const { return
!is_full() || num_bad() > 0; }
++ unsigned int num_good() const { return
m_good; }
++ unsigned int num_bad() const { return
m_bad; }
++
++ unsigned int age() const { return
cachedTime.seconds() - m_lastChanged; }
++ void touch() {
m_lastChanged = cachedTime.seconds(); }
++ void set_time(int time) {
m_lastChanged = time; }
++
++ // Called every 15 minutes after updating nodes.
++ void update();
++
++ // Return candidate for replacement (a bad node or the oldest node); may
++ // return end() unless has_space() is true.
++ iterator find_replacement_candidate(bool onlyOldest = false);
++
++ // Split the bucket in two and redistribute nodes. Returned bucket is the
++ // lower half, "this" bucket keeps the upper half. Sets parent/child so
++ // that the bucket the given ID falls in is the child.
++ DhtBucket* split(const HashString& id);
++
++ // Parent and child buckets. Parent is the adjacent bucket with double
the
++ // ID width, child the adjacent bucket with half the width (except the
very
++ // last child which has the same width.)
++ DhtBucket* parent() const { return
m_parent; }
++ DhtBucket* child() const { return
m_child; }
++
++ // Called by the DhtNode on its bucket to update good/bad node counts.
++ void node_now_good(bool was_bad);
++ void node_now_bad(bool was_good);
++
++private:
++ void count();
++
++ DhtBucket* m_parent;
++ DhtBucket* m_child;
++
++ unsigned int m_lastChanged;
++
++ unsigned int m_good;
++ unsigned int m_bad;
++
++ // These are 40 bytes together, so might as well put them last.
++ HashString m_begin;
++ HashString m_end;
++};
++
++// Helper class to recursively follow a chain of buckets. It first recurses
++// into the bucket's children since they are by definition closer to the
bucket,
++// then continues with the bucket's parents.
++class DhtBucketChain {
++public:
++ DhtBucketChain(const DhtBucket* b) : m_restart(b), m_cur(b) { }
++
++ const DhtBucket* bucket() { return
m_cur; }
++ const DhtBucket* next();
++
++private:
++ const DhtBucket* m_restart;
++ const DhtBucket* m_cur;
++};
++
++inline void
++DhtBucket::node_now_good(bool was_bad) {
++ m_bad -= was_bad;
++ m_good++;
++}
++
++inline void
++DhtBucket::node_now_bad(bool was_good) {
++ m_good -= was_good;
++ m_bad++;
++}
++
++inline const DhtBucket*
++DhtBucketChain::next() {
++ // m_restart is clear when we're done recursing into the children and
++ // follow the parents instead.
++ if (m_restart == NULL) {
++ m_cur = m_cur->parent();
++
++ } else {
++ m_cur = m_cur->child();
++
++ if (!m_cur) {
++ m_cur = m_restart->parent();
++ m_restart = NULL;
++ }
++ }
++
++ return m_cur;
++}
++
++}
++
++#endif
+Index: libtorrent/src/dht/dht_router.cc
+===================================================================
+--- libtorrent/src/dht/dht_router.cc (revision 0)
++++ libtorrent/src/dht/dht_router.cc (revision 0)
+@@ -0,0 +1,646 @@
++// libTorrent - BitTorrent library
++// Copyright (C) 2005-2007, Jari Sundell
++//
++// This program is free software; you can redistribute it and/or modify
++// it under the terms of the GNU General Public License as published by
++// the Free Software Foundation; either version 2 of the License, or
++// (at your option) any later version.
++//
++// This program is distributed in the hope that it will be useful,
++// but WITHOUT ANY WARRANTY; without even the implied warranty of
++// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++// GNU General Public License for more details.
++//
++// You should have received a copy of the GNU General Public License
++// along with this program; if not, write to the Free Software
++// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++//
++// In addition, as a special exception, the copyright holders give
++// permission to link the code of portions of this program with the
++// OpenSSL library under certain conditions as described in each
++// individual source file, and distribute linked combinations
++// including the two.
++//
++// You must obey the GNU General Public License in all respects for
++// all of the code used other than OpenSSL. If you modify file(s)
++// with this exception, you may extend this exception to your version
++// of the file(s), but you are not obligated to do so. If you do not
++// wish to do so, delete this exception statement from your version.
++// If you delete this exception statement from all source files in the
++// program, then also delete it here.
++//
++// Contact: Jari Sundell <jaris AT ifi.uio.no>
++//
++// Skomakerveien 33
++// 3185 Skoppum, NORWAY
++
++#include "config.h"
++#include "globals.h"
++
++#include <sstream>
++#include <rak/functional.h>
++#include <rak/string_manip.h>
++
++#include "torrent/dht_manager.h"
++#include "torrent/exceptions.h"
++#include "utils/sha1.h"
++#include "manager.h"
++
++#include "dht_bucket.h"
++#include "dht_router.h"
++#include "dht_tracker.h"
++#include "dht_transaction.h"
++
++namespace torrent {
++
++HashString DhtRouter::zero_id;
++
++DhtRouter::DhtRouter(const Object& cache, const rak::socket_address* sa) :
++ DhtNode(zero_id, sa), // actual ID is set later
++ m_server(this),
++ m_contacts(NULL),
++ m_numRefresh(0),
++ m_curToken(random()),
++ m_prevToken(random()) {
++
++ HashString ones_id;
++
++ zero_id.clear();
++ ones_id.clear(0xFF);
++
++ if (cache.has_key("self_id")) {
++ assign(cache.get_key_string("self_id").c_str());
++
++ } else {
++ long buffer[size_data];
++
++ for (long* itr = buffer; itr != buffer + size_data; ++itr)
++ *itr = random();
++
++ Sha1 sha;
++ sha.init();
++ sha.update(buffer, sizeof(buffer));
++ sha.final_c(data());
++ }
++
++ set_bucket(new DhtBucket(zero_id, ones_id));
++ m_routingTable.insert(std::make_pair(bucket()->id_range_end(), bucket()));
++
++ if (cache.has_key("nodes")) {
++ Object::map_type nodes = cache.get_key_map("nodes");
++
++ for (Object::map_type::const_iterator itr = nodes.begin(); itr !=
nodes.end(); ++itr) {
++ if (itr->first.length() != HashString::size_data)
++ throw bencode_error("Loading cache: Invalid node hash.");
++
++ add_node_to_bucket(m_nodes.insert(new DhtNode(itr->first,
itr->second)));
++ }
++ }
++
++ if (m_nodes.size() < num_bootstrap_complete)
++ m_contacts = new std::list<rak::socket_address>;
++}
++
++DhtRouter::~DhtRouter() {
++ stop();
++ std::for_each(m_routingTable.begin(), m_routingTable.end(),
rak::on(rak::mem_ref(&DhtBucketList::value_type::second),
rak::call_delete<DhtBucket>()));
++ std::for_each(m_trackers.begin(), m_trackers.end(),
rak::on(rak::mem_ref(&DhtTrackerList::value_type::second),
rak::call_delete<DhtTracker>()));
++ std::for_each(m_nodes.begin(), m_nodes.end(),
rak::on(rak::mem_ref(&DhtNodeList::value_type::second),
rak::call_delete<DhtNode>()));
++}
++
++void
++DhtRouter::start(int port) {
++ m_server.start(port);
++
++ // Set timeout slot and schedule it to be called immediately for initial
bootstrapping if necessary.
++ m_taskTimeout.set_slot(rak::mem_fn(this,
&DhtRouter::receive_timeout_bootstrap));
++ priority_queue_insert(&taskScheduler, &m_taskTimeout, (cachedTime +
rak::timer::from_seconds(1)).round_seconds());
++}
++
++void
++DhtRouter::stop() {
++ priority_queue_erase(&taskScheduler, &m_taskTimeout);
++ m_server.stop();
++}
++
++// Start a DHT get_peers and announce_peer request.
++void
++DhtRouter::announce(DownloadInfo* info, TrackerDht* tracker) {
++ m_server.announce(*find_bucket(info->hash())->second, info->hash(),
tracker);
++}
++
++// Cancel any running requests from the given tracker.
++// If info is not NULL, only cancel those requests.
++void
++DhtRouter::cancel_announce(DownloadInfo* info, const TrackerDht* tracker) {
++ m_server.cancel_announce(info, tracker);
++}
++
++DhtTracker*
++DhtRouter::get_tracker(const HashString& hash, bool create) {
++ DhtTrackerList::accessor itr = m_trackers.find(hash);
++
++ if (itr == m_trackers.end()) {
++ if (!create)
++ return NULL;
++
++ std::pair<DhtTrackerList::accessor, bool> res =
m_trackers.insert(std::make_pair(hash, new DhtTracker()));
++
++ if (!res.second)
++ throw internal_error("DhtRouter::get_tracker did not actually insert
tracker.");
++
++ return res.first.tracker();
++ }
++
++ return itr.tracker();
++}
++
++bool
++DhtRouter::want_node(const HashString& id) {
++ // We don't want to add ourself. Also, too many broken implementations
++ // advertise an ID of 0, which causes collisions, so reject that.
++ if (id == this->id() || id == zero_id)
++ return false;
++
++ // We are always interested in more nodes for our own bucket (causing it
++ // to be split if full); in other buckets only if there's space.
++ DhtBucket* b = find_bucket(id)->second;
++ return b == bucket() || b->has_space();
++}
++
++DhtNode*
++DhtRouter::get_node(const HashString& id) {
++ DhtNodeList::accessor itr = m_nodes.find(&id);
++
++ if (itr == m_nodes.end()) {
++ if (id == this->id())
++ return this;
++ else
++ return NULL;
++ }
++
++ return itr.node();
++}
++
++DhtRouter::DhtBucketList::iterator
++DhtRouter::find_bucket(const HashString& id) {
++ DhtBucketList::iterator itr = m_routingTable.upper_bound(id);
++
++#ifdef USE_EXTRA_DEBUG
++ if (itr == m_routingTable.end())
++ throw internal_error("DHT Buckets not covering entire ID space.");
++
++ if (!itr->second->is_in_range(id))
++ throw internal_error("DhtRouter::find_bucket,
m_routingTable.upper_bound did not find correct bucket.");
++#endif
++
++ return itr;
++}
++
++void
++DhtRouter::contact(const rak::socket_address* sa, bool external) {
++ // For non-external nodes, e.g. those from an explict add_node command
++ // or found via the BT PORT message, contact them immediately if possible.
++ if (!external) {
++ if (is_active())
++ m_server.ping(zero_id, sa);
++
++ } else {
++ // Externally obtained nodes are added to the contact list, but only if
++ // we're still bootstrapping. We don't contact external nodes after
that.
++ if (m_contacts != NULL)
++ m_contacts->push_back(*sa);
++ }
++}
++
++// Received a query from the given node. If it has previously replied
++// to one of our queries, consider it alive and update the bucket mtime,
++// otherwise if we could use it in a bucket, try contacting it.
++DhtNode*
++DhtRouter::node_queried(const HashString& id, const rak::socket_address*
sa) {
++ DhtNode* node = get_node(id);
++
++ if (node == NULL) {
++ if (want_node(id))
++ m_server.ping(id, sa);
++
++ return NULL;
++ }
++
++ // If we know the ID but the address is different, don't set the original
node
++ // active, but neither use this new address to prevent rogue nodes from
polluting
++ // our routing table with fake source addresses.
++ if (node->address()->sa_inet()->address_n() != sa->sa_inet()->address_n())
++ return NULL;
++
++ node->queried();
++ if (node->is_good())
++ node->bucket()->touch();
++
++ return node;
++}
++
++// Received a reply from a node we queried.
++// Check that it matches the information we have, set that it has replied
++// and update the bucket mtime.
++DhtNode*
++DhtRouter::node_replied(const HashString& id, const rak::socket_address*
sa) {
++ DhtNode* node = get_node(id);
++
++ if (node == NULL) {
++ // New node, create it. It's a good node (it replied!) so add it to a
bucket.
++ if (id == this->id() || id == zero_id)
++ return NULL;
++
++ node = m_nodes.insert(new DhtNode(id, sa));
++
++ if (!add_node_to_bucket(node)) // deletes the node if it fails
++ return NULL;
++ }
++
++ if (node->address()->sa_inet()->address_n() != sa->sa_inet()->address_n())
++ return NULL;
++
++ node->replied();
++ node->bucket()->touch();
++
++ return node;
++}
++
++// A node has not replied to one of our queries.
++DhtNode*
++DhtRouter::node_inactive(const HashString& id, const rak::socket_address*
sa) {
++ DhtNodeList::accessor itr = m_nodes.find(&id);
++
++ // If not found add it to some blacklist so we won't try contacting it
again immediately?
++ if (itr == m_nodes.end())
++ return NULL;
++
++ // Check source address. Normally node_inactive is called if we DON'T
receive a reply,
++ // however it can also be called if a node replied with an malformed
response packet,
++ // so check that the address matches so that a rogue node cannot cause
other nodes
++ // to be considered bad by sending malformed packets.
++ if (itr.node()->address()->sa_inet()->address_n() !=
sa->sa_inet()->address_n())
++ return NULL;
++
++ itr.node()->inactive();
++
++ // Old node age normally implies no replies for many consecutive queries,
however
++ // after loading the node cache after a day or more we want to give each
node a few
++ // chances to reply again instead of removing all nodes instantly.
++ if (itr.node()->is_bad() && itr.node()->age() >= timeout_remove_node) {
++ delete_node(itr);
++ return NULL;
++ }
++
++ return itr.node();
++}
++
++// We sent a query to the given node ID, but received a reply from a
different
++// node ID, that means the address of the original ID is invalid now.
++void
++DhtRouter::node_invalid(const HashString& id) {
++ DhtNode* node = get_node(id);
++
++ if (node == NULL || node == this)
++ return;
++
++ delete_node(m_nodes.find(&node->id()));
++}
++
++char*
++DhtRouter::store_closest_nodes(const HashString& id, char* buffer, char*
bufferEnd) {
++ DhtBucketChain chain(find_bucket(id)->second);
++
++ do {
++ for (DhtBucket::const_iterator itr = chain.bucket()->begin(); itr !=
chain.bucket()->end(); ++itr) {
++ if (!(*itr)->is_bad()) {
++ buffer = (*itr)->store_compact(buffer);
++
++ if (buffer > bufferEnd)
++ throw internal_error("DhtRouter::store_closest_nodes wrote past
buffer end.");
++
++ if (buffer == bufferEnd)
++ break;
++ }
++ }
++ } while (buffer != bufferEnd && chain.next());
++
++ return buffer;
++}
++
++Object*
++DhtRouter::store_cache(Object* container) const {
++ container->insert_key("self_id", str());
++
++ // Insert all nodes.
++ Object& nodes = container->insert_key("nodes", Object(Object::TYPE_MAP));
++ for (DhtNodeList::const_accessor itr = m_nodes.begin(); itr !=
m_nodes.end(); ++itr) {
++ if (!itr.node()->is_bad())
++ itr.node()->store_cache(&nodes.insert_key(itr.id().str(),
Object(Object::TYPE_MAP)));
++ }
++
++ return container;
++}
++
++DhtManager::statistics_type
++DhtRouter::get_statistics() const {
++ DhtManager::statistics_type stats(*m_server.upload_throttle()->rate(),
*m_server.download_throttle()->rate());
++
++ if (!m_server.is_active())
++ stats.cycle = 0;
++ else if (m_numRefresh < 2) // still bootstrapping
++ stats.cycle = 1;
++ else
++ stats.cycle = m_numRefresh;
++
++ stats.queries_received = m_server.queries_received();
++ stats.queries_sent = m_server.queries_sent();
++ stats.replies_received = m_server.replies_received();
++
++ stats.num_nodes = m_nodes.size();
++ stats.num_buckets = m_routingTable.size();
++
++ stats.num_peers = 0;
++ stats.max_peers = 0;
++ stats.num_trackers = m_trackers.size();
++
++ for (DhtTrackerList::const_accessor itr = m_trackers.begin(); itr !=
m_trackers.end(); ++itr) {
++ unsigned int peers = itr.tracker()->size();
++ stats.num_peers += peers;
++ stats.max_peers = std::max(peers, stats.max_peers);
++ }
++
++ return stats;
++}
++
++void
++DhtRouter::receive_timeout_bootstrap() {
++ // If we're still bootstrapping, restart the process every 60 seconds
until
++ // we have enough nodes in our routing table. After we have 32 nodes, we
switch
++ // to a less aggressive non-bootstrap mode of collecting nodes that
contact us
++ // and through doing normal torrent announces.
++ if (m_nodes.size() < num_bootstrap_complete) {
++ if (m_contacts == NULL)
++ throw internal_error("DhtRouter::receive_timeout_bootstrap called
without contact list.");
++
++ if (!m_nodes.empty() || !m_contacts->empty())
++ bootstrap();
++
++ // Retry in 60 seconds.
++ priority_queue_insert(&taskScheduler, &m_taskTimeout, (cachedTime +
rak::timer::from_seconds(timeout_bootstrap_retry)).round_seconds());
++ m_numRefresh = 1; // still bootstrapping
++
++ } else {
++ // We won't be needing external contacts after this.
++ if (m_contacts != NULL) {
++ delete m_contacts;
++ m_contacts = NULL;
++ }
++
++ m_taskTimeout.set_slot(rak::mem_fn(this, &DhtRouter::receive_timeout));
++
++ if (!m_numRefresh) {
++ // If we're still in the startup, do the usual refreshing too.
++ receive_timeout();
++
++ } else {
++ // Otherwise just set the 15 minute timer.
++ priority_queue_insert(&taskScheduler, &m_taskTimeout, (cachedTime +
rak::timer::from_seconds(timeout_update)).round_seconds());
++ }
++
++ m_numRefresh = 2;
++ }
++}
++
++void
++DhtRouter::receive_timeout() {
++ priority_queue_insert(&taskScheduler, &m_taskTimeout, (cachedTime +
rak::timer::from_seconds(timeout_update)).round_seconds());
++
++ m_prevToken = m_curToken;
++ m_curToken = random();
++
++ // Do some periodic accounting, refreshing buckets and marking
++ // bad nodes.
++
++ // Update nodes.
++ for (DhtNodeList::accessor itr = m_nodes.begin(); itr != m_nodes.end();
++itr) {
++ if (!itr.node()->bucket())
++ throw internal_error("DhtRouter::receive_timeout has node without
bucket.");
++
++ itr.node()->update();
++
++ // Try contacting nodes we haven't received anything from for a while.
++ // Don't contact repeatedly unresponsive nodes; we keep them in case
they
++ // do send a query, until we find a better node. However, give it a last
++ // chance just before deleting it.
++ if (itr.node()->is_questionable() && (!itr.node()->is_bad() ||
itr.node()->age() >= timeout_remove_node))
++ m_server.ping(itr.node()->id(), itr.node()->address());
++ }
++
++ // If bucket isn't full yet or hasn't received replies/queries from
++ // its nodes for a while, try to find new nodes now.
++ for (DhtBucketList::const_iterator itr = m_routingTable.begin(); itr !=
m_routingTable.end(); ++itr) {
++ itr->second->update();
++
++ if (!itr->second->is_full() || itr->second->age() >
timeout_bucket_bootstrap)
++ bootstrap_bucket(itr->second);
++ }
++
++ // Remove old peers and empty torrents from the tracker.
++ for (DhtTrackerList::accessor itr = m_trackers.begin(); itr !=
m_trackers.end(); ) {
++ itr.tracker()->prune(timeout_peer_announce);
++
++ if (itr.tracker()->empty()) {
++ delete itr.tracker();
++ m_trackers.erase(itr++);
++
++ } else {
++ ++itr;
++ }
++ }
++
++ m_server.update();
++
++ m_numRefresh++;
++}
++
++void
++DhtRouter::generate_token(const rak::socket_address* sa, int token, char
buffer[20]) {
++ Sha1 sha;
++ uint32_t key = sa->sa_inet()->address_n();
++
++ sha.init();
++ sha.update(&token, sizeof(token));
++ sha.update(&key, 4);
++ sha.final_c(buffer);
++}
++
++std::string
++DhtRouter::make_token(const rak::socket_address* sa) {
++ char token[20];
++
++ generate_token(sa, m_curToken, token);
++
++ return std::string(token, size_token);
++}
++
++bool
++DhtRouter::token_valid(const std::string& token, const rak::socket_address*
sa) {
++ if (token.length() != size_token)
++ return false;
++
++ // Compare given token to the reference token.
++ char reference[20];
++
++ // First try current token.
++ generate_token(sa, m_curToken, reference);
++
++ if (std::memcmp(reference, token.c_str(), size_token) == 0)
++ return true;
++
++ // If token recently changed, some clients may be using the older one.
++ // That way a token is valid for 15-30 minutes, instead of 0-15.
++ generate_token(sa, m_prevToken, reference);
++
++ return std::memcmp(reference, token.c_str(), size_token) == 0;
++}
++
++DhtNode*
++DhtRouter::find_node(const rak::socket_address* sa) {
++ for (DhtNodeList::accessor itr = m_nodes.begin(); itr != m_nodes.end();
++itr)
++ if (itr.node()->address()->sa_inet()->address_n() ==
sa->sa_inet()->address_n())
++ return itr.node();
++
++ return NULL;
++}
++
++DhtRouter::DhtBucketList::iterator
++DhtRouter::split_bucket(const DhtBucketList::iterator& itr, DhtNode* node) {
++ // Split bucket. Current bucket keeps the upper half thus keeping the
++ // map key valid, new bucket is the lower half of the original bucket.
++ DhtBucket* newBucket = itr->second->split(id());
++
++ // If our bucket has a child now (the new bucket), move ourself into it.
++ if (bucket()->child() != NULL)
++ set_bucket(bucket()->child());
++
++ if (!bucket()->is_in_range(id()))
++ throw internal_error("DhtRouter::split_bucket router ID ended up in
wrong bucket.");
++
++ // Insert new bucket with iterator hint = just before current bucket.
++ DhtBucketList::iterator other = m_routingTable.insert(itr,
std::make_pair(newBucket->id_range_end(), newBucket));
++
++ // Check that the bucket we're not adding the node to isn't empty.
++ if (other->second->is_in_range(node->id())) {
++ if (itr->second->empty())
++ bootstrap_bucket(itr->second);
++
++ } else {
++ if (other->second->empty())
++ bootstrap_bucket(other->second);
++
++ other = itr;
++ }
++
++ return other;
++}
++
++bool
++DhtRouter::add_node_to_bucket(DhtNode* node) {
++ DhtBucketList::iterator itr = find_bucket(node->id());
++
++ while (itr->second->is_full()) {
++ // Bucket is full. If there are any bad nodes, remove the oldest.
++ DhtBucket::iterator nodeItr = itr->second->find_replacement_candidate();
++ if (nodeItr == itr->second->end())
++ throw internal_error("DhtBucket::find_candidate returned no node.");
++
++ if ((*nodeItr)->is_bad()) {
++ delete_node(m_nodes.find(&(*nodeItr)->id()));
++
++ } else {
++ // Bucket is full of good nodes; if our own ID falls in
++ // range then split the bucket else discard new node.
++ if (itr->second != bucket()) {
++ delete_node(m_nodes.find(&node->id()));
++ return false;
++ }
++
++ itr = split_bucket(itr, node);
++ }
++ }
++
++ itr->second->add_node(node);
++ node->set_bucket(itr->second);
++ return true;
++}
++
++void
++DhtRouter::delete_node(const DhtNodeList::accessor& itr) {
++ if (itr == m_nodes.end())
++ throw internal_error("DhtRouter::delete_node called with invalid
iterator.");
++
++ if (itr.node()->bucket() != NULL)
++ itr.node()->bucket()->remove_node(itr.node());
++
++ delete itr.node();
++
++ m_nodes.erase(itr);
++}
++
++void
++DhtRouter::bootstrap() {
++ // Contact up to 8 nodes from the contact list.
++ for (int count = 0; count < 8 && !m_contacts->empty(); count++) {
++ if (!find_node(&m_contacts->back()))
++ m_server.ping(zero_id, &m_contacts->back());
++
++ m_contacts->pop_back();
++ }
++
++ // Abort unless we already found some nodes for a search.
++ if (m_nodes.empty())
++ return;
++
++ bootstrap_bucket(bucket());
++
++ // Aggressively ping all questionable nodes in our own bucket to weed
++ // out bad nodes as early as possible and make room for fresh nodes.
++ for (DhtBucket::iterator itr = bucket()->begin(); itr != bucket()->end();
++itr)
++ if (!(*itr)->is_good())
++ m_server.ping((*itr)->id(), (*itr)->address());
++
++ // Also bootstrap a random bucket, if there are others.
++ if (m_routingTable.size() < 2)
++ return;
++
++ DhtBucketList::iterator itr = m_routingTable.begin();
++ std::advance(itr, random() % m_routingTable.size());
++
++ if (itr->second != bucket() && itr != m_routingTable.end())
++ bootstrap_bucket(itr->second);
++}
++
++void
++DhtRouter::bootstrap_bucket(const DhtBucket* bucket) {
++ if (!m_server.is_active())
++ return;
++
++ // Do a search for a random ID, or the ID adjacent to our
++ // own when bootstrapping our own bucket. We don't search for
++ // our own exact ID to avoid receiving only our own node info
++ // instead of closest nodes, from nodes that know us already.
++ HashString contactId;
++
++ if (bucket == this->bucket()) {
++ contactId = id();
++ contactId[contactId.size() - 1] ^= 1;
++ } else {
++ bucket->get_random_id(&contactId);
++ }
++
++ m_server.find_node(*bucket, contactId);
++}
++
++}
+Index: libtorrent/src/dht/dht_router.h
+===================================================================
+--- libtorrent/src/dht/dht_router.h (revision 0)
++++ libtorrent/src/dht/dht_router.h (revision 0)
+@@ -0,0 +1,174 @@
++// libTorrent - BitTorrent library
++// Copyright (C) 2005-2007, Jari Sundell
++//
++// This program is free software; you can redistribute it and/or modify
++// it under the terms of the GNU General Public License as published by
++// the Free Software Foundation; either version 2 of the License, or
++// (at your option) any later version.
++//
++// This program is distributed in the hope that it will be useful,
++// but WITHOUT ANY WARRANTY; without even the implied warranty of
++// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++// GNU General Public License for more details.
++//
++// You should have received a copy of the GNU General Public License
++// along with this program; if not, write to the Free Software
++// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++//
++// In addition, as a special exception, the copyright holders give
++// permission to link the code of portions of this program with the
++// OpenSSL library under certain conditions as described in each
++// individual source file, and distribute linked combinations
++// including the two.
++//
++// You must obey the GNU General Public License in all respects for
++// all of the code used other than OpenSSL. If you modify file(s)
++// with this exception, you may extend this exception to your version
++// of the file(s), but you are not obligated to do so. If you do not
++// wish to do so, delete this exception statement from your version.
++// If you delete this exception statement from all source files in the
++// program, then also delete it here.
++//
++// Contact: Jari Sundell <jaris AT ifi.uio.no>
++//
++// Skomakerveien 33
++// 3185 Skoppum, NORWAY
++
++#ifndef LIBTORRENT_DHT_ROUTER_H
++#define LIBTORRENT_DHT_ROUTER_H
++
++#include <rak/priority_queue_default.h>
++#include <rak/socket_address.h>
++
++#include "torrent/dht_manager.h"
++#include "torrent/hash_string.h"
++#include "torrent/object.h"
++
++#include "dht_node.h"
++#include "dht_hash_map.h"
++#include "dht_server.h"
++
++namespace torrent {
++
++class DhtBucket;
++class DhtTracker;
++class TrackerDht;
++
++// Main DHT class, maintains the routing table of known nodes and talks to
the
++// DhtServer object that handles the actual communication.
++
++class DhtRouter : public DhtNode {
++public:
++ // How many bytes to return and verify from the 20-byte SHA token.
++ static const unsigned int size_token = 8;
++
++ static const unsigned int timeout_bootstrap_retry = 60; //
Retry initial bootstrapping every minute.
++ static const unsigned int timeout_update = 15 * 60; //
Regular housekeeping updates every 15 minutes.
++ static const unsigned int timeout_bucket_bootstrap = 15 * 60; //
Bootstrap idle buckets after 15 minutes.
++ static const unsigned int timeout_remove_node = 4 * 60 * 60; //
Remove unresponsive nodes after 4 hours.
++ static const unsigned int timeout_peer_announce = 30 * 60; //
Remove peers which haven't reannounced for 30 minutes.
++
++ // A node ID of all zero.
++ static HashString zero_id;
++
++ DhtRouter(const Object& cache, const rak::socket_address* sa);
++ ~DhtRouter();
++
++ // Start and stop the router. This starts/stops the UDP server as well.
++ void start(int port);
++ void stop();
++
++ bool is_active() { return
m_server.is_active(); }
++
++ // Find peers for given download and announce ourselves.
++ void announce(DownloadInfo* info, TrackerDht* tracker);
++
++ // Cancel any pending transactions related to the given download (or all
if NULL).
++ void cancel_announce(DownloadInfo* info, const TrackerDht*
tracker);
++
++ // Retrieve tracked torrent for the hash.
++ // Returns NULL if not tracking the torrent unless create is true.
++ DhtTracker* get_tracker(const HashString& hash, bool create);
++
++ // Check if we are interested in inserting a new node of the given ID
++ // into our table (i.e. if we have space or bad nodes in the
corresponding bucket).
++ bool want_node(const HashString& id);
++
++ // Contact the given node, or add it to the list of potential contacts
++ // if it was obtained externally from a .torrent file for example.
++ void contact(const rak::socket_address* sa, bool external);
++
++ // Retrieve node of given ID in constant time. Return NULL if not found,
unless
++ // it's our own ID in which case it returns the DhtRouter object.
++ DhtNode* get_node(const HashString& id);
++
++ // Search for node with given address in O(n), disregarding the port.
++ DhtNode* find_node(const rak::socket_address* sa);
++
++ // Whenever a node queries us, replies, or is confirmed inactive (no
reply) or
++ // invalid (reply with wrong ID), we need to update its status.
++ DhtNode* node_queried(const HashString& id, const
rak::socket_address* sa);
++ DhtNode* node_replied(const HashString& id, const
rak::socket_address* sa);
++ DhtNode* node_inactive(const HashString& id, const
rak::socket_address* sa);
++ void node_invalid(const HashString& id);
++
++ // Store compact node information (26 bytes) for nodes closest to the
++ // given ID in the given buffer, return new buffer end.
++ char* store_closest_nodes(const HashString& id, char*
buffer, char* bufferEnd);
++
++ // Store DHT cache in the given container.
++ Object* store_cache(Object* container) const;
++
++ // Create and verify a token. Tokens are valid between 15-30 minutes from
creation.
++ std::string make_token(const rak::socket_address* sa);
++ bool token_valid(const std::string& token, const
rak::socket_address* sa);
++
++ DhtManager::statistics_type get_statistics() const;
++ void reset_statistics() {
m_server.reset_statistics(); }
++
++ DhtServer* server() { return
&m_server; }
++ DhtTrackerList* trackers() { return
&m_trackers; }
++
++private:
++ // Number of nodes we need to consider the bootstrap process complete.
++ static const unsigned int num_bootstrap_complete = 32;
++
++ typedef std::map<const HashString, DhtBucket*> DhtBucketList;
++
++ DhtBucketList::iterator find_bucket(const HashString& id);
++
++ bool add_node_to_bucket(DhtNode* node);
++ void delete_node(const DhtNodeList::accessor& itr);
++
++ DhtBucketList::iterator split_bucket(const DhtBucketList::iterator& itr,
DhtNode* node);
++
++ void bootstrap();
++ void bootstrap_bucket(const DhtBucket* bucket);
++
++ void receive_timeout();
++ void receive_timeout_bootstrap();
++
++ // buffer needs to hold an SHA1 hash (20 bytes), not just the token (8
bytes)
++ void generate_token(const rak::socket_address* sa, int
token, char buffer[20]);
++
++ rak::priority_item m_taskTimeout;
++
++ DhtServer m_server;
++ DhtNodeList m_nodes;
++ DhtBucketList m_routingTable;
++ DhtTrackerList m_trackers;
++
++ std::list<rak::socket_address>* m_contacts;
++
++ int m_numRefresh;
++
++ bool m_networkUp;
++
++ // Secret keys used for generating announce tokens.
++ int m_curToken;
++ int m_prevToken;
++};
++
++}
++
++#endif
+Index: libtorrent/src/dht/dht_hash_map.h
+===================================================================
+--- libtorrent/src/dht/dht_hash_map.h (revision 0)
++++ libtorrent/src/dht/dht_hash_map.h (revision 0)
+@@ -0,0 +1,168 @@
++// libTorrent - BitTorrent library
++// Copyright (C) 2005-2007, Jari Sundell
++//
++// This program is free software; you can redistribute it and/or modify
++// it under the terms of the GNU General Public License as published by
++// the Free Software Foundation; either version 2 of the License, or
++// (at your option) any later version.
++//
++// This program is distributed in the hope that it will be useful,
++// but WITHOUT ANY WARRANTY; without even the implied warranty of
++// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++// GNU General Public License for more details.
++//
++// You should have received a copy of the GNU General Public License
++// along with this program; if not, write to the Free Software
++// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++//
++// In addition, as a special exception, the copyright holders give
++// permission to link the code of portions of this program with the
++// OpenSSL library under certain conditions as described in each
++// individual source file, and distribute linked combinations
++// including the two.
++//
++// You must obey the GNU General Public License in all respects for
++// all of the code used other than OpenSSL. If you modify file(s)
++// with this exception, you may extend this exception to your version
++// of the file(s), but you are not obligated to do so. If you do not
++// wish to do so, delete this exception statement from your version.
++// If you delete this exception statement from all source files in the
++// program, then also delete it here.
++//
++// Contact: Jari Sundell <jaris AT ifi.uio.no>
++//
++// Skomakerveien 33
++// 3185 Skoppum, NORWAY
++
++#ifndef LIBTORRENT_DHT_HASH_MAP_H
++#define LIBTORRENT_DHT_HASH_MAP_H
++
++#include "config.h"
++
++#if HAVE_TR1
++#include <tr1/unordered_map>
++#else
++#include <map>
++#endif
++
++#include "torrent/hash_string.h"
++
++#include "dht_node.h"
++#include "dht_tracker.h"
++
++namespace torrent {
++
++#if HAVE_TR1
++// Hash functions for HashString keys, and dereferencing HashString
pointers.
++// We use the last n bits of the 160-bit ID hash, since in sub-buckets the
++// first few bits are all identical.
++struct hashstring_ptr_hash : public std::unary_function<const HashString*,
size_t> {
++ size_t operator () (const HashString* n) const
++ { return *(size_t*)(n->data() + n->size() - sizeof(size_t)); }
++};
++
++struct hashstring_hash : public std::unary_function<HashString, size_t> {
++ size_t operator () (const HashString& n) const
++ { return *(size_t*)(n.data() + n.size() - sizeof(size_t)); }
++};
++
++// Compare HashString pointers by dereferencing them.
++struct hashstring_ptr_equal : public std::binary_function<const
HashString*, const HashString*, bool> {
++ size_t operator () (const HashString* one, const HashString* two) const
++ { return *one == *two; }
++};
++
++class DhtNodeList : public std::tr1::unordered_map<const HashString*,
DhtNode*, hashstring_ptr_hash, hashstring_ptr_equal> {
++public:
++ typedef std::tr1::unordered_map<const HashString*, DhtNode*,
hashstring_ptr_hash, hashstring_ptr_equal> base_type;
++
++ // Define accessor iterator with more convenient access to the key and
++ // element values. Allows changing the map definition more easily if
needed.
++ template<typename T>
++ struct accessor_wrapper : public T {
++ accessor_wrapper(const T& itr) : T(itr) { }
++
++ const HashString& id() const { return *(**this).first; }
++ DhtNode* node() const { return (**this).second; }
++ };
++
++ typedef accessor_wrapper<const_iterator> const_accessor;
++ typedef accessor_wrapper<iterator> accessor;
++
++ DhtNode* insert(DhtNode* n);
++
++};
++
++class DhtTrackerList : public std::tr1::unordered_map<HashString,
DhtTracker*, hashstring_hash> {
++public:
++ typedef std::tr1::unordered_map<HashString, DhtTracker*, hashstring_hash>
base_type;
++
++ template<typename T>
++ struct accessor_wrapper : public T {
++ accessor_wrapper(const T& itr) : T(itr) { }
++
++ const HashString& id() const { return (**this).first; }
++ DhtTracker* tracker() const { return (**this).second; }
++ };
++
++ typedef accessor_wrapper<const_iterator> const_accessor;
++ typedef accessor_wrapper<iterator> accessor;
++
++};
++
++#else
++
++// Compare HashString pointers by dereferencing them.
++struct hashstring_ptr_less : public std::binary_function<const HashString*,
const HashString*, bool> {
++ size_t operator () (const HashString* one, const HashString* two) const
++ { return *one < *two; }
++};
++
++class DhtNodeList : public std::map<const HashString*, DhtNode*,
hashstring_ptr_less> {
++public:
++ typedef std::map<const HashString*, DhtNode*, hashstring_ptr_less>
base_type;
++
++ // Define accessor iterator with more convenient access to the key and
++ // element values. Allows changing the map definition more easily if
needed.
++ template<typename T>
++ struct accessor_wrapper : public T {
++ accessor_wrapper(const T& itr) : T(itr) { }
++
++ const HashString& id() const { return *(**this).first; }
++ DhtNode* node() const { return (**this).second; }
++ };
++
++ typedef accessor_wrapper<const_iterator> const_accessor;
++ typedef accessor_wrapper<iterator> accessor;
++
++ DhtNode* insert(DhtNode* n);
++
++};
++
++class DhtTrackerList : public std::map<HashString, DhtTracker*> {
++public:
++ typedef std::map<HashString, DhtTracker*> base_type;
++
++ template<typename T>
++ struct accessor_wrapper : public T {
++ accessor_wrapper(const T& itr) : T(itr) { }
++
++ const HashString& id() const { return (**this).first; }
++ DhtTracker* tracker() const { return (**this).second; }
++ };
++
++ typedef accessor_wrapper<const_iterator> const_accessor;
++ typedef accessor_wrapper<iterator> accessor;
++
++};
++#endif // HAVE_TR1
++
++inline
++DhtNode* DhtNodeList::insert(DhtNode* n) {
++ base_type::insert(std::make_pair<const HashString*, DhtNode*>(n, n));
++ return n;
++}
++
++}
++
++#endif
+Index: libtorrent/src/dht/dht_transaction.cc
+===================================================================
+--- libtorrent/src/dht/dht_transaction.cc (revision 0)
++++ libtorrent/src/dht/dht_transaction.cc (revision 0)
+@@ -0,0 +1,287 @@
++// libTorrent - BitTorrent library
++// Copyright (C) 2005-2007, Jari Sundell
++//
++// This program is free software; you can redistribute it and/or modify
++// it under the terms of the GNU General Public License as published by
++// the Free Software Foundation; either version 2 of the License, or
++// (at your option) any later version.
++//
++// This program is distributed in the hope that it will be useful,
++// but WITHOUT ANY WARRANTY; without even the implied warranty of
++// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++// GNU General Public License for more details.
++//
++// You should have received a copy of the GNU General Public License
++// along with this program; if not, write to the Free Software
++// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++//
++// In addition, as a special exception, the copyright holders give
++// permission to link the code of portions of this program with the
++// OpenSSL library under certain conditions as described in each
++// individual source file, and distribute linked combinations
++// including the two.
++//
++// You must obey the GNU General Public License in all respects for
++// all of the code used other than OpenSSL. If you modify file(s)
++// with this exception, you may extend this exception to your version
++// of the file(s), but you are not obligated to do so. If you do not
++// wish to do so, delete this exception statement from your version.
++// If you delete this exception statement from all source files in the
++// program, then also delete it here.
++//
++// Contact: Jari Sundell <jaris AT ifi.uio.no>
++//
++// Skomakerveien 33
++// 3185 Skoppum, NORWAY
++
++#include "config.h"
++
++#include "torrent/exceptions.h"
++#include "torrent/object_stream.h"
++#include "tracker/tracker_dht.h"
++
++#include "dht_bucket.h"
++#include "dht_transaction.h"
++
++namespace torrent {
++
++DhtSearch::DhtSearch(const HashString& target, const DhtBucket& contacts)
++ : base_type(dht_compare_closer(target)),
++ m_pending(0),
++ m_contacted(0),
++ m_replied(0),
++ m_concurrency(3),
++ m_restart(false),
++ m_started(false),
++ m_next(end()) {
++
++ add_contacts(contacts);
++}
++
++DhtSearch::~DhtSearch() {
++ // Make sure transactions were destructed first. Since it is the
destruction
++ // of a transaction that triggers this destructor, that should always be
the
++ // case.
++ if (m_pending)
++ throw internal_error("DhtSearch::~DhtSearch called with pending
transactions.");
++
++ if (m_concurrency != 3)
++ throw internal_error("DhtSearch::~DhtSearch with invalid concurrency
limit.");
++
++ for (accessor itr = begin(); itr != end(); ++itr)
++ delete itr.node();
++}
++
++bool
++DhtSearch::add_contact(const HashString& id, const rak::socket_address* sa)
{
++ DhtNode* n = new DhtNode(id, sa);
++ bool added = insert(std::make_pair(n, this)).second;
++
++ if (!added)
++ delete n;
++ else
++ m_restart = true;
++
++ return added;
++}
++
++void
++DhtSearch::add_contacts(const DhtBucket& contacts) {
++ DhtBucketChain chain(&contacts);
++
++ // Add max_contacts=18 closest nodes, and fill up so we also have at
least 8 good nodes.
++ int needClosest = max_contacts - size();
++ int needGood = DhtBucket::num_nodes;
++
++ for (DhtBucket::const_iterator itr = chain.bucket()->begin(); needClosest
> 0 || needGood > 0; ++itr) {
++ while (itr == chain.bucket()->end()) {
++ if (!chain.next())
++ return;
++
++ itr = chain.bucket()->begin();
++ }
++
++ if ((!(*itr)->is_bad() || needClosest > 0) && add_contact((*itr)->id(),
(*itr)->address())) {
++ needGood -= !(*itr)->is_bad();
++ needClosest--;
++ }
++ }
++}
++
++// Check if a node has been contacted yet. This is the case if it is not
currently
++// being contacted, nor has it been found to be good or bad.
++bool
++DhtSearch::node_uncontacted(const DhtNode* node) const {
++ return !node->is_active() && !node->is_good() && !node->is_bad();
++}
++
++// After more contacts have been added, discard least closest nodes
++// except if node has a transaction pending.
++void
++DhtSearch::trim(bool final) {
++
++ // We keep:
++ // - the max_contacts=18 closest good or unknown nodes and all nodes
closer
++ // than them (to see if further searches find closer ones)
++ // - for announces, also the 8 closest good nodes (i.e. nodes that have
++ // replied) to have at least that many for the actual announce
++ // - any node that currently has transactions pending
++ //
++ // However, after exhausting all search nodes, we only keep good nodes.
++ //
++ // For our purposes, the node status is as follows:
++ // node is bad (contacted but hasn't replied) if is_bad()
++ // node is good (contacted and replied) if is_good()
++ // node is currently being contacted if is_active()
++ // node is new and unknown otherwise
++
++ int needClosest = final ? 0 : max_contacts;
++ int needGood = is_announce() ? DhtBucket::num_nodes : 0;
++
++ // We're done if we can't find any more nodes to contact.
++ m_next = end();
++
++ accessor itr = base_type::begin();
++ while (itr != end()) {
++ // If we have all we need, delete current node unless it is
++ // currently being contacted.
++ if (!itr.node()->is_active() && needClosest <= 0 &&
(!itr.node()->is_good() || needGood <= 0)) {
++ delete itr.node();
++ erase(itr++);
++ continue;
++ }
++
++ // Otherwise adjust needed counts appropriately.
++ needClosest--;
++ needGood -= itr.node()->is_good();
++
++ // Remember the first uncontacted node as the closest one to contact
next.
++ if (m_next == end() && node_uncontacted(itr.node()))
++ m_next = const_accessor(itr);
++
++ ++itr;
++ }
++
++ m_restart = false;
++}
++
++DhtSearch::const_accessor
++DhtSearch::get_contact() {
++ if (m_pending >= m_concurrency)
++ return end();
++
++ if (m_restart)
++ trim(false);
++
++ const_accessor ret = m_next;
++ if (ret == end())
++ return ret;
++
++ set_node_active(ret, true);
++ m_pending++;
++ m_contacted++;
++
++ // Find next node to contact: any node we haven't contacted yet.
++ while (++m_next != end()) {
++ if (node_uncontacted(m_next.node()))
++ break;
++ }
++
++ return ret;
++}
++
++void
++DhtSearch::node_status(const_accessor& n, bool success) {
++ if (n == end() || !n.node()->is_active())
++ throw internal_error("DhtSearch::node_status called for
invalid/inactive node.");
++
++ if (success) {
++ n.node()->set_good();
++ m_replied++;
++
++ } else {
++ n.node()->set_bad();
++ }
++
++ m_pending--;
++ set_node_active(n, false);
++}
++
++DhtSearch::const_accessor
++DhtAnnounce::start_announce() {
++ trim(true);
++
++ if (empty())
++ return end();
++
++ if (!complete() || m_next != end() || size() > DhtBucket::num_nodes)
++ throw internal_error("DhtSearch::start_announce called in inconsistent
state.");
++
++ m_contacted = m_pending = size();
++ m_replied = 0;
++
++ for (const_accessor itr(begin()); itr != end(); ++itr)
++ set_node_active(itr, true);
++
++ return const_accessor(begin());
++}
++
++void
++DhtTransactionPacket::build_buffer(const Object& data) {
++ char buffer[1500]; // If the message would exceed an Ethernet frame,
something went very wrong.
++ object_buffer_t result = object_write_bencode_c(object_write_to_buffer,
NULL, std::make_pair(buffer, buffer + sizeof(buffer)), &data);
++
++ m_length = result.second - buffer;
++ m_data = new char[m_length];
++ memcpy(m_data, buffer, m_length);
++}
++
++DhtTransaction::DhtTransaction(int quick_timeout, int timeout, const
HashString& id, const rak::socket_address* sa)
++ : m_hasQuickTimeout(quick_timeout > 0),
++ m_id(id),
++ m_sa(*sa),
++ m_timeout(cachedTime.seconds() + timeout),
++ m_quickTimeout(cachedTime.seconds() + quick_timeout),
++ m_retry(3),
++ m_packet(NULL) {
++
++}
++
++DhtTransaction::~DhtTransaction() {
++ if (m_packet != NULL)
++ m_packet->set_failed();
++}
++
++void
++DhtTransactionSearch::set_stalled() {
++ if (!m_hasQuickTimeout)
++ throw internal_error("DhtTransactionSearch::set_stalled called on
already stalled transaction.");
++
++ m_hasQuickTimeout = false;
++ m_search->m_concurrency++;
++}
++
++void
++DhtTransactionSearch::complete(bool success) {
++ if (m_node == m_search->end())
++ throw internal_error("DhtTransactionSearch::complete called multiple
times.");
++
++ if (m_node.search() != m_search)
++ throw internal_error("DhtTransactionSearch::complete called for node
from wrong search.");
++
++ if (!m_hasQuickTimeout)
++ m_search->m_concurrency--;
++
++ m_search->node_status(m_node, success);
++ m_node = m_search->end();
++}
++
++DhtTransactionSearch::~DhtTransactionSearch() {
++ if (m_node != m_search->end())
++ complete(false);
++
++ if (m_search->complete())
++ delete m_search;
++}
++
++}
+Index: libtorrent/src/dht/dht_node.cc
+===================================================================
+--- libtorrent/src/dht/dht_node.cc (revision 0)
++++ libtorrent/src/dht/dht_node.cc (revision 0)
+@@ -0,0 +1,89 @@
++// libTorrent - BitTorrent library
++// Copyright (C) 2005-2007, Jari Sundell
++//
++// This program is free software; you can redistribute it and/or modify
++// it under the terms of the GNU General Public License as published by
++// the Free Software Foundation; either version 2 of the License, or
++// (at your option) any later version.
++//
++// This program is distributed in the hope that it will be useful,
++// but WITHOUT ANY WARRANTY; without even the implied warranty of
++// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++// GNU General Public License for more details.
++//
++// You should have received a copy of the GNU General Public License
++// along with this program; if not, write to the Free Software
++// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++//
++// In addition, as a special exception, the copyright holders give
++// permission to link the code of portions of this program with the
++// OpenSSL library under certain conditions as described in each
++// individual source file, and distribute linked combinations
++// including the two.
++//
++// You must obey the GNU General Public License in all respects for
++// all of the code used other than OpenSSL. If you modify file(s)
++// with this exception, you may extend this exception to your version
++// of the file(s), but you are not obligated to do so. If you do not
++// wish to do so, delete this exception statement from your version.
++// If you delete this exception statement from all source files in the
++// program, then also delete it here.
++//
++// Contact: Jari Sundell <jaris AT ifi.uio.no>
++//
++// Skomakerveien 33
++// 3185 Skoppum, NORWAY
++
++#include "config.h"
++#include "globals.h"
++
++#include "torrent/exceptions.h"
++#include "torrent/object.h"
++
++#include "dht_node.h"
++
++namespace torrent {
++
++DhtNode::DhtNode(const HashString& id, const rak::socket_address* sa) :
++ HashString(id),
++ m_socketAddress(*sa),
++ m_lastSeen(0),
++ m_recentlyActive(false),
++ m_recentlyInactive(0),
++ m_bucket(NULL) {
++
++ if (sa->family() != rak::socket_address::af_inet)
++ throw resource_error("Address not af_inet");
++}
++
++DhtNode::DhtNode(const std::string& id, const Object& cache) :
++ HashString(*HashString::cast_from(id.c_str())),
++ m_recentlyActive(false),
++ m_recentlyInactive(0),
++ m_bucket(NULL) {
++
++ rak::socket_address_inet* sa = m_socketAddress.sa_inet();
++ sa->set_family();
++ sa->set_address_h(cache.get_key_value("i"));
++ sa->set_port(cache.get_key_value("p"));
++ m_lastSeen = cache.get_key_value("t");
++ update();
++}
++
++char*
++DhtNode::store_compact(char* buffer) const {
++ HashString::cast_from(buffer)->assign(data());
++ *(uint32_t*) (buffer+20) = address()->sa_inet()->address_n();
++ *(uint16_t*) (buffer+24) = address()->sa_inet()->port_n();
++ return buffer+26;
++}
++
++Object*
++DhtNode::store_cache(Object* container) const {
++ container->insert_key("i", m_socketAddress.sa_inet()->address_h());
++ container->insert_key("p", m_socketAddress.sa_inet()->port());
++ container->insert_key("t", m_lastSeen);
++ return container;
++}
++
++}
+Index: libtorrent/src/dht/dht_server.cc
+===================================================================
+--- libtorrent/src/dht/dht_server.cc (revision 0)
++++ libtorrent/src/dht/dht_server.cc (revision 0)
+@@ -0,0 +1,912 @@
++// libTorrent - BitTorrent library
++// Copyright (C) 2005-2007, Jari Sundell
++//
++// This program is free software; you can redistribute it and/or modify
++// it under the terms of the GNU General Public License as published by
++// the Free Software Foundation; either version 2 of the License, or
++// (at your option) any later version.
++//
++// This program is distributed in the hope that it will be useful,
++// but WITHOUT ANY WARRANTY; without even the implied warranty of
++// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++// GNU General Public License for more details.
++//
++// You should have received a copy of the GNU General Public License
++// along with this program; if not, write to the Free Software
++// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++//
++// In addition, as a special exception, the copyright holders give
++// permission to link the code of portions of this program with the
++// OpenSSL library under certain conditions as described in each
++// individual source file, and distribute linked combinations
++// including the two.
++//
++// You must obey the GNU General Public License in all respects for
++// all of the code used other than OpenSSL. If you modify file(s)
++// with this exception, you may extend this exception to your version
++// of the file(s), but you are not obligated to do so. If you do not
++// wish to do so, delete this exception statement from your version.
++// If you delete this exception statement from all source files in the
++// program, then also delete it here.
++//
++// Contact: Jari Sundell <jaris AT ifi.uio.no>
++//
++// Skomakerveien 33
++// 3185 Skoppum, NORWAY
++
++#include "config.h"
++#include "globals.h"
++
++#include <algorithm>
++#include <sstream>
++#include <rak/error_number.h>
++#include <rak/string_manip.h>
++
++#include "net/throttle_manager.h"
++#include "torrent/exceptions.h"
++#include "torrent/connection_manager.h"
++#include "torrent/object.h"
++#include "torrent/object_stream.h"
++#include "torrent/poll.h"
++#include "tracker/tracker_dht.h"
++
++#include "dht_bucket.h"
++#include "dht_router.h"
++#include "dht_transaction.h"
++
++#include "manager.h"
++
++namespace torrent {
++
++const char* DhtServer::queries[] = {
++ "ping",
++ "find_node",
++ "get_peers",
++ "announce_peer",
++};
++
++// Error in DHT protocol, avoids std::string ctor from communication_error
++class dht_error : public network_error {
++public:
++ dht_error(int code, const char* message) : m_message(message),
m_code(code) {}
++
++ virtual int code() const throw() { return m_code; }
++ virtual const char* what() const throw() { return m_message; }
++
++private:
++ const char* m_message;
++ int m_code;
++};
++
++DhtServer::DhtServer(DhtRouter* router) :
++ m_router(router),
++
++ m_uploadThrottle(60),
++ m_downloadThrottle(60),
++
++ m_networkUp(false) {
++
++ get_fd().clear();
++ reset_statistics();
++
++ // Reserve a socket for the DHT server, even though we don't
++ // actually open it until the server is started, which may not
++ // happen until the first non-private torrent is started.
++ manager->connection_manager()->inc_socket_count();
++}
++
++DhtServer::~DhtServer() {
++ stop();
++
++ std::for_each(m_highQueue.begin(), m_highQueue.end(),
rak::call_delete<DhtTransactionPacket>());
++ std::for_each(m_lowQueue.begin(), m_lowQueue.end(),
rak::call_delete<DhtTransactionPacket>());
++
++ manager->connection_manager()->dec_socket_count();
++}
++
++void
++DhtServer::start(int port) {
++ try {
++ if (!get_fd().open_datagram() || !get_fd().set_nonblock())
++ throw resource_error("Could not allocate datagram socket.");
++
++ if (!get_fd().set_reuse_address(true))
++ throw resource_error("Could not set listening port to reuse
address.");
++
++ rak::socket_address sa = *m_router->address();
++ sa.set_port(port);
++
++ if (!get_fd().bind(sa))
++ throw resource_error("Could not bind datagram socket.");
++
++ } catch (...) {
++ get_fd().close();
++ get_fd().clear();
++ throw;
++ }
++
++ m_taskTimeout.set_slot(rak::mem_fn(this, &DhtServer::receive_timeout));
++
++
m_uploadThrottle.set_list_iterator(manager->upload_throttle()->throttle_list()->end());
++
m_uploadThrottle.slot_activate(rak::make_mem_fun(reinterpret_cast<SocketBase*>(this),
&SocketBase::receive_throttle_up_activate));
++
++
m_downloadThrottle.set_list_iterator(manager->download_throttle()->throttle_list()->end());
++
manager->download_throttle()->throttle_list()->insert(&m_downloadThrottle);
++
++ manager->poll()->open(this);
++ manager->poll()->insert_read(this);
++ manager->poll()->insert_error(this);
++}
++
++void
++DhtServer::stop() {
++ if (!is_active())
++ return;
++
++ clear_transactions();
++
++ priority_queue_erase(&taskScheduler, &m_taskTimeout);
++
++ manager->upload_throttle()->throttle_list()->erase(&m_uploadThrottle);
++ manager->download_throttle()->throttle_list()->erase(&m_downloadThrottle);
++
++ manager->poll()->remove_read(this);
++ manager->poll()->remove_write(this);
++ manager->poll()->remove_error(this);
++ manager->poll()->close(this);
++
++ get_fd().close();
++ get_fd().clear();
++
++ m_networkUp = false;
++}
++
++void
++DhtServer::reset_statistics() {
++ m_queriesReceived = 0;
++ m_queriesSent = 0;
++ m_repliesReceived = 0;
++
++ m_uploadThrottle.rate()->set_total(0);
++ m_downloadThrottle.rate()->set_total(0);
++}
++
++// Ping a node whose ID we know.
++void
++DhtServer::ping(const HashString& id, const rak::socket_address* sa) {
++ // No point pinging a node that we're already contacting otherwise.
++ transaction_itr itr = m_transactions.lower_bound(DhtTransaction::key(sa,
0));
++ if (itr == m_transactions.end() || (itr->first >> 32 !=
DhtTransaction::key(sa, 0) >> 32))
++ add_transaction(new DhtTransactionPing(id, sa), packet_prio_low);
++}
++
++// Contact nodes in given bucket and ask for their nodes closest to target.
++void
++DhtServer::find_node(const DhtBucket& contacts, const HashString& target) {
++ DhtSearch* search = new DhtSearch(target, contacts);
++
++ DhtSearch::const_accessor n;
++ while ((n = search->get_contact()) != search->end())
++ add_transaction(new DhtTransactionFindNode(n), packet_prio_low);
++
++ // This shouldn't happen, it means we had no contactable nodes at all.
++ if (!search->start()) {
++ delete search;
++ return;
++ }
++
++}
++
++void
++DhtServer::announce(const DhtBucket& contacts, const HashString& infoHash,
TrackerDht* tracker) {
++ DhtAnnounce* announce = new DhtAnnounce(infoHash, tracker, contacts);
++
++ DhtSearch::const_accessor n;
++ while ((n = announce->get_contact()) != announce->end())
++ add_transaction(new DhtTransactionFindNode(n), packet_prio_high);
++
++ // This can only happen if all nodes we know are bad.
++ if (!announce->start()) {
++ tracker->receive_failed("No DHT nodes available for peer search.");
++ delete announce;
++ return;
++ }
++
++ tracker->receive_status(announce->num_replied(),
announce->num_contacted(), "Searching");
++}
++
++void
++DhtServer::cancel_announce(DownloadInfo* info, const TrackerDht* tracker) {
++ transaction_itr itr = m_transactions.begin();
++
++ while (itr != m_transactions.end()) {
++ if (itr->second->is_search() &&
itr->second->as_search()->search()->is_announce()) {
++ DhtAnnounce* announce =
reinterpret_cast<DhtAnnounce*>(itr->second->as_search()->search());
++
++ if ((!info || announce->target() == info->hash()) && (!tracker ||
announce->tracker() == tracker)) {
++ itr = cancel_transaction(itr);
++ continue; // itr has been incremented already
++ }
++ }
++
++ ++itr;
++ }
++}
++
++void
++DhtServer::update() {
++ // Reset this every 15 minutes. It'll get set back to true if we receive
++ // any valid packets. This allows detecting when the entire network goes
++ // down, and prevents all nodes from getting removed as unresponsive.
++ m_networkUp = false;
++}
++
++void
++DhtServer::process_query(const Object& transactionId, const HashString& id,
const rak::socket_address* sa, Object& request) {
++ m_queriesReceived++;
++ m_networkUp = true;
++
++ std::string& query = request.get_key_string("q");
++
++ Object& arg = request.get_key("a");
++
++ // Construct reply.
++ Object reply(Object::TYPE_MAP);
++
++ if (query == "find_node")
++ create_find_node_response(arg, reply);
++
++ else if (query == "get_peers")
++ create_get_peers_response(arg, sa, reply);
++
++ else if (query == "announce_peer")
++ create_announce_peer_response(arg, sa, reply);
++
++ else if (query != "ping")
++ throw dht_error(dht_error_bad_method, "Unknown query type.");
++
++ m_router->node_queried(id, sa);
++
++ create_response(transactionId, sa, reply);
++}
++
++void
++DhtServer::create_find_node_response(const Object& arg, Object& reply) {
++ const std::string& target = arg.get_key_string("target");
++
++ if (target.length() < HashString::size_data)
++ throw dht_error(dht_error_protocol, "target string too short");
++
++ char compact[26*8];
++ char* end = m_router->store_closest_nodes(*HashString::cast_from(target),
compact, compact + 26*8);
++
++ if (end == compact)
++ throw dht_error(dht_error_generic, "No nodes");
++
++ reply.insert_key("nodes", std::string(compact, end));
++}
++
++void
++DhtServer::create_get_peers_response(const Object& arg, const
rak::socket_address* sa, Object& reply) {
++ reply.insert_key("token", m_router->make_token(sa));
++
++ const std::string& info_hash_str = arg.get_key_string("info_hash");
++
++ if (info_hash_str.length() < HashString::size_data)
++ throw dht_error(dht_error_protocol, "info hash too short");
++
++ const HashString* info_hash = HashString::cast_from(info_hash_str);
++
++ DhtTracker* tracker = m_router->get_tracker(*info_hash, false);
++
++ // If we're not tracking or have no peers, send closest nodes.
++ if (!tracker || tracker->empty()) {
++ char compact[26*8];
++ char* end = m_router->store_closest_nodes(*info_hash, compact, compact
+ 26*8);
++
++ if (end == compact)
++ throw dht_error(dht_error_generic, "No peers nor nodes");
++
++ reply.insert_key("nodes", std::string(compact, end));
++
++ } else {
++ Object& values = reply.insert_key("values", Object(Object::TYPE_LIST));
++ values.insert_back(tracker->get_peers());
++ }
++}
++
++void
++DhtServer::create_announce_peer_response(const Object& arg, const
rak::socket_address* sa, Object& reply) {
++ const std::string& info_hash_str = arg.get_key_string("info_hash");
++
++ if (info_hash_str.length() < HashString::size_data)
++ throw dht_error(dht_error_protocol, "info hash too short");
++
++ const HashString* info_hash = HashString::cast_from(info_hash_str);
++
++ if (!m_router->token_valid(arg.get_key_string("token"), sa))
++ throw dht_error(dht_error_protocol, "Token invalid.");
++
++ DhtTracker* tracker = m_router->get_tracker(*info_hash, true);
++ rak::socket_address peer = *sa;
++ peer.set_port(arg.get_key_value("port"));
++ tracker->add_peer(&peer);
++}
++
++void
++DhtServer::process_response(int transactionId, const HashString& id, const
rak::socket_address* sa, Object& request) {
++ transaction_itr itr = m_transactions.find(DhtTransaction::key(sa,
transactionId));
++
++ // Response to a transaction we don't have in our table. At this point
it's
++ // impossible to tell whether it used to be a valid transaction but timed
out
++ // or the node did not return the ID we sent it. Best we can do is ignore
the
++ // reply.
++ if (itr == m_transactions.end())
++ return;
++
++ m_repliesReceived++;
++ m_networkUp = true;
++
++ const Object& response = request.get_key("r");
++
++ // If we contact a node but the reply ID or key (address) don't match,
ignore the reply
++ // to prevent interference from rogue nodes.
++ // (But ignore the port for comparison purposes since it may be changed
by NAT.)
++ DhtTransaction* transaction = itr->second;
++ if (DhtTransaction::key(sa, transactionId) !=
transaction->key(transactionId) || (id != transaction->id() &&
transaction->id() != *m_router && transaction->id() != m_router->zero_id))
++ return;
++
++ switch (transaction->type()) {
++ case DhtTransaction::DHT_FIND_NODE:
++ parse_find_node_reply(transaction->as_find_node(),
response.get_key_string("nodes"));
++ break;
++
++ case DhtTransaction::DHT_GET_PEERS:
++ parse_get_peers_reply(transaction->as_get_peers(), response);
++ break;
++
++ // Nothing to do for DHT_PING and DHT_ANNOUNCE_PEER
++ default:
++ break;
++ }
++
++ // Mark node responsive only if all processing was successful, without
errors.
++ m_router->node_replied(id, sa);
++
++ delete itr->second;
++ m_transactions.erase(itr);
++}
++
++void
++DhtServer::process_error(int transactionId, const rak::socket_address* sa,
Object& request) {
++ transaction_itr itr = m_transactions.find(DhtTransaction::key(sa,
transactionId));
++
++ if (itr == m_transactions.end())
++ return;
++
++ m_repliesReceived++;
++ m_networkUp = true;
++
++ // Don't mark node as good (because it replied) or bad (because it
returned an error).
++ // If it consistently returns errors for valid queries it's probably
broken. But a
++ // few error messages are acceptable. So we do nothing and pretend the
query never happened.
++
++ cancel_transaction(itr);
++}
++
++void
++DhtServer::parse_node_info(node_info_list& l, const std::string& n) {
++ if (sizeof(const compact_node_info) != 26)
++ throw internal_error("DhtServer::parse_node_info(...) bad struct
size.");
++
++ std::copy(reinterpret_cast<const compact_node_info*>(n.c_str()),
++ reinterpret_cast<const compact_node_info*>(n.c_str() + n.size()
- n.size() % sizeof(compact_node_info)),
++ std::back_inserter(l));
++}
++
++void
++DhtServer::parse_find_node_reply(DhtTransactionSearch* transaction, const
std::string& nodes) {
++ DhtSearch* search = transaction->search();
++
++ transaction->complete(true);
++
++ node_info_list l;
++ parse_node_info(l, nodes);
++
++ for (node_info_list::iterator itr = l.begin(); itr != l.end(); ++itr) {
++ if (itr->id() != m_router->id()) {
++ rak::socket_address sa = itr->address();
++ search->add_contact(itr->id(), &sa);
++ }
++ }
++
++ find_node_next(transaction);
++}
++
++void
++DhtServer::parse_get_peers_reply(DhtTransactionGetPeers* transaction, const
Object& response) {
++ DhtAnnounce* announce = transaction->announce();
++
++ transaction->complete(true);
++
++ if (response.has_key_list("values"))
++
announce->tracker()->receive_peers((*response.get_key_list("values").begin()).as_string());
++
++ if (response.has_key_string("token"))
++ add_transaction(new DhtTransactionAnnounce(transaction->id(),
transaction->address(), announce->target(),
response.get_key_string("token")), packet_prio_low);
++
++ announce->tracker()->receive_status(announce->num_replied(),
announce->num_contacted(), "Announcing");
++
++ if (!announce->complete())
++ return;
++
++ DhtTracker* torrent =
m_router->get_tracker(transaction->announce()->target(), false);
++ if (torrent != NULL)
++ announce->tracker()->receive_peers(torrent->get_peers());
++
++ announce->tracker()->receive_success();
++}
++
++void
++DhtServer::find_node_next(DhtTransactionSearch* transaction) {
++ DhtSearch::const_accessor node;
++ while ((node = transaction->search()->get_contact()) !=
transaction->search()->end()) {
++ int prio = packet_prio_low;
++ if (transaction->search()->is_announce())
++ prio = packet_prio_high;
++
++ add_transaction(new DhtTransactionFindNode(node), prio);
++ }
++
++ if (transaction->search()->is_announce())
++
reinterpret_cast<DhtAnnounce*>(transaction->search())->tracker()->receive_status(transaction->search()->num_replied(),
transaction->search()->num_contacted(), "Searching");
++
++ if (!transaction->search()->complete())
++ return;
++
++ if (!transaction->search()->is_announce())
++ return;
++
++ // We have found the 8 closest nodes to the info hash. Retrieve peers
++ // from them and announce to them.
++ DhtAnnounce* announce = transaction->as_get_peers()->announce();
++
++ for (node = announce->start_announce(); node != announce->end(); ++node)
++ add_transaction(new DhtTransactionGetPeers(node), packet_prio_high);
++
++ if (announce->complete())
++ return announce->tracker()->receive_failed("DHT search unsuccessful.");
++
++ announce->tracker()->receive_status(announce->num_replied(),
announce->num_contacted(), "Announcing");
++}
++
++void
++DhtServer::add_packet(DhtTransactionPacket* packet, int priority) {
++ switch (priority) {
++ // High priority packets are for important queries, and quite small.
++ // They're added to front of high priority queue and thus will be the
++ // next packets sent.
++ case packet_prio_high:
++ m_highQueue.push_front(packet);
++ break;
++
++ // Low priority query packets are added to the back of the high priority
++ // queue and will be sent when all high priority packets have been
transmitted.
++ case packet_prio_low:
++ m_highQueue.push_back(packet);
++ break;
++
++ // Reply packets will be processed after all of our own packets have
been send.
++ case packet_prio_reply:
++ m_lowQueue.push_back(packet);
++ break;
++
++ default:
++ throw internal_error("DhtServer::add_packet called with invalid
priority.");
++ }
++}
++
++void
++DhtServer::create_query(transaction_itr itr, int tID, const
rak::socket_address* sa, int priority) {
++ if (itr->second->id() == m_router->id()) {
++ delete itr->second;
++ m_transactions.erase(itr);
++ return; // Don't send to ourself.
++ }
++
++ Object query(Object::TYPE_MAP);
++
++ Object q(Object::TYPE_MAP);
++ q.insert_key("id", m_router->str());
++
++ DhtTransaction* transaction = itr->second;
++ switch (transaction->type()) {
++ case DhtTransaction::DHT_PING:
++ // nothing to do
++ break;
++
++ case DhtTransaction::DHT_FIND_NODE:
++ q.insert_key("target",
transaction->as_find_node()->search()->target().str());
++ break;
++
++ case DhtTransaction::DHT_GET_PEERS:
++ q.insert_key("info_hash",
transaction->as_get_peers()->announce()->target().str());
++ break;
++
++ case DhtTransaction::DHT_ANNOUNCE_PEER:
++ q.insert_key("info_hash",
transaction->as_announce()->info_hash().str());
++ q.insert_key("port", manager->connection_manager()->listen_port());
++ q.insert_key("token", transaction->as_announce()->token());
++ break;
++ }
++
++ char trans_id = tID;
++ query.insert_key("t", std::string(&trans_id, 1));
++ query.insert_key("y", "q");
++ query.insert_key("q", queries[transaction->type()]);
++ query.insert_key("a", q);
++ query.insert_key("v", PEER_VERSION);
++
++ DhtTransactionPacket* packet = new
DhtTransactionPacket(transaction->address(), query, tID, transaction);
++ transaction->set_packet(packet);
++ add_packet(packet, priority);
++
++ m_queriesSent++;
++}
++
++void
++DhtServer::create_response(const Object& transactionId, const
rak::socket_address* sa, Object& r) {
++ Object reply(Object::TYPE_MAP);
++ r.insert_key("id", m_router->str());
++
++ reply.insert_key("t", transactionId);
++ reply.insert_key("y", "r");
++ reply.insert_key("r", r);
++ reply.insert_key("v", PEER_VERSION);
++
++ add_packet(new DhtTransactionPacket(sa, reply), packet_prio_reply);
++}
++
++void
++DhtServer::create_error(const Object& transactionId, const
rak::socket_address* sa, int num, const std::string& msg) {
++ Object error(Object::TYPE_MAP);
++
++ error.insert_key("t", transactionId);
++ error.insert_key("y", "e");
++ error.insert_key("v", PEER_VERSION);
++
++ Object& e = error.insert_key("e", Object(Object::TYPE_LIST));
++ e.insert_back(num);
++ e.insert_back(msg);
++
++ add_packet(new DhtTransactionPacket(sa, error), packet_prio_reply);
++}
++
++int
++DhtServer::add_transaction(DhtTransaction* transaction, int priority) {
++ // Try random transaction ID. This is to make it less likely that we reuse
++ // a transaction ID from an earlier transaction which timed out and we
forgot
++ // about it, so that if the node replies after the timeout it's less
likely
++ // that we match the reply to the wrong transaction.
++ //
++ // If there's an existing transaction with the random ID we search for
the next
++ // unused one. Since normally only one or two transactions will be active
per
++ // node, a collision is extremely unlikely, and a linear search for the
first
++ // open one is the most efficient.
++ unsigned int rnd = (uint8_t)random();
++ unsigned int id = rnd;
++
++ transaction_itr insertItr =
m_transactions.lower_bound(transaction->key(rnd));
++
++ // If key matches, keep trying successive IDs.
++ while (insertItr != m_transactions.end() && insertItr->first ==
transaction->key(id)) {
++ ++insertItr;
++ id = (uint8_t)(id + 1);
++
++ // Give up after trying all possible IDs. This should never happen.
++ if (id == rnd) {
++ delete transaction;
++ return -1;
++ }
++
++ // Transaction ID wrapped around, reset iterator.
++ if (id == 0)
++ insertItr = m_transactions.lower_bound(transaction->key(id));
++ }
++
++ // We know where to insert it, so pass that as hint.
++ insertItr = m_transactions.insert(insertItr,
std::make_pair(transaction->key(id), transaction));
++
++ create_query(insertItr, id, transaction->address(), priority);
++
++ start_write();
++
++ return id;
++}
++
++// Transaction received no reply and timed out. Mark node as bad and remove
++// transaction (except if it was only the quick timeout).
++DhtServer::transaction_itr
++DhtServer::failed_transaction(transaction_itr itr, bool quick) {
++ DhtTransaction* transaction = itr->second;
++
++ // If it was a known node, remember that it didn't reply, unless the
transaction
++ // is only stalled (had quick timeout, but not full timeout). Also if the
++ // transaction still has an associated packet, the packet never got sent
due to
++ // throttling, so don't blame the remote node for not replying.
++ // Finally, if we haven't received anything whatsoever so far, assume the
entire
++ // network is down and so we can't blame the node either.
++ if (!quick && m_networkUp && transaction->packet() == NULL &&
transaction->id() != *m_router)
++ m_router->node_inactive(transaction->id(), transaction->address());
++
++ switch (transaction->type()) {
++ case DhtTransaction::DHT_FIND_NODE:
++ if (quick)
++ transaction->as_find_node()->set_stalled();
++ else
++ transaction->as_find_node()->complete(false);
++
++ find_node_next(transaction->as_find_node());
++ break;
++
++ case DhtTransaction::DHT_GET_PEERS:
++ DhtAnnounce* announce;
++ announce = transaction->as_get_peers()->announce();
++ transaction->as_get_peers()->complete(false);
++ if (announce->complete())
++ announce->tracker()->receive_success();
++ break;
++
++ // Nothing to for DHT_PING and DHT_ANNOUNCE_PEER
++ default:
++ break;
++ }
++
++ if (quick) {
++ return ++itr; // don't actually delete the transaction until
the final timeout
++
++ } else {
++ delete itr->second;
++ m_transactions.erase(itr++);
++ return itr;
++ }
++}
++
++// Cancel transaction before the timeout (i.e. we aren't sure if the node
is bad yet).
++DhtServer::transaction_itr
++DhtServer::cancel_transaction(transaction_itr itr) {
++ DhtTransaction* transaction = itr->second;
++
++ // If this was the last transaction of an announce search, notify tracker.
++ if (transaction->is_search() &&
transaction->as_search()->search()->is_announce()) {
++ transaction->as_search()->complete(false);
++
++ DhtAnnounce* announce =
reinterpret_cast<DhtAnnounce*>(transaction->as_search()->search());
++ if (announce->complete()) {
++ // If we got no peers, it's a failure if the announces all failed as
well.
++ // We don't want no peers to be a failure in general since it may
just be
++ // a dead torrent.
++ if (announce->num_replied() == 0 && !announce->tracker()->has_peers())
++ announce->tracker()->receive_failed("Announce failed");
++ else
++ announce->tracker()->receive_success();
++ }
++ }
++
++ delete itr->second;
++ m_transactions.erase(itr++);
++ return itr;
++}
++
++void
++DhtServer::clear_transactions() {
++ std::for_each(m_transactions.begin(), m_transactions.end(),
++ rak::on(rak::mem_ref(&transaction_map::value_type::second),
++ rak::call_delete<DhtTransaction>()));
++ m_transactions.clear();
++}
++
++void
++DhtServer::event_read() {
++ uint32_t total = 0;
++ std::istringstream sstream;
++
++ sstream.imbue(std::locale::classic());
++
++ while (true) {
++ rak::socket_address sa;
++ int type = '?';
++ const Object* transactionId = NULL;
++ const HashString* nodeId = NULL;
++
++ try {
++ char buffer[2048];
++ int32_t read = read_datagram(buffer, sizeof(buffer), &sa);
++
++ if (read < 0)
++ break;
++
++ total += read;
++ sstream.str(std::string(buffer, read));
++
++ Object request;
++ sstream >> request;
++
++ // Could throw dht_error with more descriptive error messages but
++ // we can't return an error unless the packet is valid and we have the
++ // transaction ID anyway. Searching the routing table for the source
++ // address to find the node is too expensive, so just ignore the
packet.
++ if (sstream.fail() || !request.is_map() || !request.has_key("t") ||
!request.has_key_string("y"))
++ continue;
++
++ // Read the items required for proper error handling first.
++ transactionId = &request.get_key("t");
++ if (request.get_key_string("y").length() == 1)
++ type = request.get_key_string("y")[0];
++
++ // Queries and replies have node ID in different dictionaries.
++ if (type == 'r' || type == 'q') {
++ const std::string& nodeIdStr = request.get_key(type == 'q' ? "a" :
"r").get_key_string("id");
++
++ if (nodeIdStr.length() < HashString::size_data)
++ throw dht_error(dht_error_protocol, "id value too short");
++
++ nodeId = HashString::cast_from(nodeIdStr);
++ }
++
++ // Sanity check the returned transaction ID.
++ if ((type == 'r' || type == 'e') &&
++ (!transactionId->is_string() ||
transactionId->as_string().length() != 1))
++ throw dht_error(dht_error_protocol, "Invalid transaction ID
type/length.");
++
++ switch (type) {
++ case 'q':
++ process_query(*transactionId, *nodeId, &sa, request);
++ break;
++
++ case 'r':
++ process_response(((unsigned
char*)transactionId->as_string().c_str())[0], *nodeId, &sa, request);
++ break;
++
++ case 'e':
++ process_error(((unsigned
char*)transactionId->as_string().c_str())[0], &sa, request);
++ break;
++
++ default:
++ throw dht_error(dht_error_bad_method, "Unknown message type.");
++ }
++
++ } catch (bencode_error& e) {
++ if (type == 'q' && transactionId != NULL)
++ create_error(*transactionId, &sa, dht_error_protocol,
std::string("Malformed packet: ") + e.what());
++ else if ((type == 'r' || type == 'e') && nodeId != NULL)
++ m_router->node_inactive(*nodeId, &sa);
++
++ } catch (dht_error& e) {
++ // If node was querying us, reply with error packet, otherwise mark
the node as "query failed",
++ // so that if it repeatedly sends malformed replies we will drop it
instead of propagating it
++ // to other nodes.
++ if (type == 'q' && transactionId != NULL)
++ create_error(*transactionId, &sa, e.code(), e.what());
++ else if ((type == 'r' || type == 'e') && nodeId != NULL)
++ m_router->node_inactive(*nodeId, &sa);
++
++ } catch (network_error& e) {
++
++ }
++ }
++
++
manager->download_throttle()->throttle_list()->node_used_unthrottled(total);
++ start_write();
++}
++
++bool
++DhtServer::process_queue(packet_queue& queue, uint32_t* quota) {
++ uint32_t used = 0;
++
++ while (!queue.empty()) {
++ DhtTransactionPacket* packet = queue.front();
++
++ // Make sure its transaction hasn't timed out yet, if it has/had one
++ // and don't bother sending non-transaction packets after more than
++ // 15 seconds in the queue.
++ if (packet->has_failed() || packet->age() > 15) {
++ delete packet;
++ queue.pop_front();
++ continue;
++ }
++
++ if (packet->length() > *quota) {
++
manager->upload_throttle()->throttle_list()->node_used(&m_uploadThrottle,
used);
++ return false;
++ }
++
++ queue.pop_front();
++
++ try {
++ int written = write_datagram(packet->c_str(), packet->length(),
packet->address());
++
++ if (written == -1)
++ throw network_error();
++
++ used += written;
++ *quota -= written;
++
++ if ((unsigned int)written != packet->length())
++ throw network_error();
++
++ } catch (network_error& e) {
++ // Couldn't write packet, maybe something wrong with node address or
routing, so mark node as bad.
++ if (packet->has_transaction()) {
++ transaction_itr itr =
m_transactions.find(packet->transaction()->key(packet->id()));
++ if (itr == m_transactions.end())
++ throw internal_error("DhtServer::process_queue could not find
transaction.");
++
++ failed_transaction(itr, false);
++ }
++ }
++
++ if (packet->has_transaction())
++ packet->transaction()->set_packet(NULL);
++
++ delete packet;
++ }
++
++ manager->upload_throttle()->throttle_list()->node_used(&m_uploadThrottle,
used);
++ return true;
++}
++
++void
++DhtServer::event_write() {
++ if (m_highQueue.empty() && m_lowQueue.empty())
++ throw internal_error("DhtServer::event_write called but both write
queues are empty.");
++
++ if
(!manager->upload_throttle()->throttle_list()->is_throttled(&m_uploadThrottle))
++ throw internal_error("DhtServer::event_write called while not in
throttle list.");
++
++ uint32_t quota =
manager->upload_throttle()->throttle_list()->node_quota(&m_uploadThrottle);
++
++ if (quota == 0 || !process_queue(m_highQueue, &quota) ||
!process_queue(m_lowQueue, &quota)) {
++ manager->poll()->remove_write(this);
++
manager->upload_throttle()->throttle_list()->node_deactivate(&m_uploadThrottle);
++
++ } else if (m_highQueue.empty() && m_lowQueue.empty()) {
++ manager->poll()->remove_write(this);
++ manager->upload_throttle()->throttle_list()->erase(&m_uploadThrottle);
++ }
++}
++
++void
++DhtServer::event_error() {
++}
++
++void
++DhtServer::start_write() {
++ if ((!m_highQueue.empty() || !m_lowQueue.empty()) &&
!manager->upload_throttle()->throttle_list()->is_throttled(&m_uploadThrottle))
{
++ manager->upload_throttle()->throttle_list()->insert(&m_uploadThrottle);
++ manager->poll()->insert_write(this);
++ }
++
++ if (!m_taskTimeout.is_queued() && !m_transactions.empty())
++ priority_queue_insert(&taskScheduler, &m_taskTimeout, (cachedTime +
rak::timer::from_seconds(5)).round_seconds());
++}
++
++void
++DhtServer::receive_timeout() {
++ transaction_itr itr = m_transactions.begin();
++ while (itr != m_transactions.end()) {
++ if (itr->second->has_quick_timeout() && itr->second->quick_timeout() <
cachedTime.seconds()) {
++ itr = failed_transaction(itr, true);
++
++ } else if (itr->second->timeout() < cachedTime.seconds()) {
++ itr = failed_transaction(itr, false);
++
++ } else {
++ ++itr;
++ }
++ }
++
++ start_write();
++}
++
++}
+Index: libtorrent/src/dht/Makefile.am
+===================================================================
+--- libtorrent/src/dht/Makefile.am (revision 0)
++++ libtorrent/src/dht/Makefile.am (revision 0)
+@@ -0,0 +1,19 @@
++noinst_LTLIBRARIES = libsub_dht.la
++
++libsub_dht_la_SOURCES = \
++ dht_bucket.cc \
++ dht_bucket.h \
++ dht_hash_map.h \
++ dht_node.cc \
++ dht_node.h \
++ dht_router.cc \
++ dht_router.h \
++ dht_server.cc \
++ dht_server.h \
++ dht_size_list.h \
++ dht_tracker.cc \
++ dht_tracker.h \
++ dht_transaction.cc \
++ dht_transaction.h
++
++INCLUDES = -I$(srcdir) -I$(srcdir)/.. -I$(top_srcdir)
+Index: libtorrent/src/dht/dht_transaction.h
+===================================================================
+--- libtorrent/src/dht/dht_transaction.h (revision 0)
++++ libtorrent/src/dht/dht_transaction.h (revision 0)
+@@ -0,0 +1,363 @@
++// libTorrent - BitTorrent library
++// Copyright (C) 2005-2007, Jari Sundell
++//
++// This program is free software; you can redistribute it and/or modify
++// it under the terms of the GNU General Public License as published by
++// the Free Software Foundation; either version 2 of the License, or
++// (at your option) any later version.
++//
++// This program is distributed in the hope that it will be useful,
++// but WITHOUT ANY WARRANTY; without even the implied warranty of
++// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++// GNU General Public License for more details.
++//
++// You should have received a copy of the GNU General Public License
++// along with this program; if not, write to the Free Software
++// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++//
++// In addition, as a special exception, the copyright holders give
++// permission to link the code of portions of this program with the
++// OpenSSL library under certain conditions as described in each
++// individual source file, and distribute linked combinations
++// including the two.
++//
++// You must obey the GNU General Public License in all respects for
++// all of the code used other than OpenSSL. If you modify file(s)
++// with this exception, you may extend this exception to your version
++// of the file(s), but you are not obligated to do so. If you do not
++// wish to do so, delete this exception statement from your version.
++// If you delete this exception statement from all source files in the
++// program, then also delete it here.
++//
++// Contact: Jari Sundell <jaris AT ifi.uio.no>
++//
++// Skomakerveien 33
++// 3185 Skoppum, NORWAY
++
++#ifndef LIBTORRENT_DHT_TRANSACTION_H
++#define LIBTORRENT_DHT_TRANSACTION_H
++
++#include <map>
++
++#include <rak/socket_address.h>
++
++#include "dht/dht_node.h"
++#include "torrent/hash_string.h"
++
++namespace torrent {
++
++class DhtBucket;
++class TrackerDht;
++
++class DhtSearch;
++class DhtTransactionSearch;
++
++class DhtTransaction;
++class DhtTransactionPing;
++class DhtTransactionFindNode;
++class DhtTransactionGetPeers;
++class DhtTransactionAnnounce;
++
++// DhtSearch implements the DHT search algorithm and holds search data
++// that needs to be persistent across multiple find_node transactions.
++//
++// DhtAnnounce is a derived class used for searches that will eventually
++// lead to an announce to the closest nodes.
++
++
++// Compare predicate for ID closeness.
++struct dht_compare_closer : public std::binary_function<const DhtNode*,
const DhtNode*, bool> {
++ dht_compare_closer(const HashString& target) : m_target(target) { }
++
++ bool operator () (const DhtNode* one, const DhtNode* two) const;
++
++ const HashString& target() const { return m_target; }
++
++ HashString m_target;
++};
++
++// DhtSearch contains a list of nodes sorted by closeness to the given
target,
++// and returns what nodes to contact with up to three concurrent
transactions pending.
++// The map element is the DhtSearch object itself to allow the returned
accessors
++// to know which search a given node belongs to.
++class DhtSearch : protected std::map<DhtNode*, DhtSearch*,
dht_compare_closer> {
++ friend class DhtTransactionSearch;
++
++public:
++ typedef std::map<DhtNode*, DhtSearch*, dht_compare_closer> base_type;
++
++ // Number of closest potential contact nodes to keep.
++ static const unsigned int max_contacts = 18;
++
++ DhtSearch(const HashString& target, const DhtBucket& contacts);
++ virtual ~DhtSearch();
++
++ // Wrapper for iterators, allowing more convenient access to the key
++ // and element values, which also makes it easier to change the container
++ // without having to modify much code using iterators.
++ template <typename T>
++ struct accessor_wrapper : public T {
++ accessor_wrapper() { }
++ accessor_wrapper(const T& itr) : T(itr) { }
++
++ DhtNode* node() const { return
(**this).first; }
++ DhtSearch* search() const { return
(**this).second; }
++ };
++
++ typedef accessor_wrapper<base_type::const_iterator> const_accessor;
++ typedef accessor_wrapper<base_type::iterator> accessor;
++
++ // Add a potential node to contact for the search.
++ bool add_contact(const HashString& id, const
rak::socket_address* sa);
++ void add_contacts(const DhtBucket& contacts);
++
++ // Return next node to contact. Up to concurrent_searches nodes are
returned,
++ // and end() after that. Don't advance the accessor to get further
contacts!
++ const_accessor get_contact();
++
++ // Search statistics.
++ int num_contacted() { return
m_contacted; }
++ int num_replied() { return
m_replied; }
++
++ bool start() { m_started =
true; return m_pending; }
++ bool complete() const { return m_started
&& !m_pending; }
++
++ const HashString& target() const { return
key_comp().target(); }
++
++ virtual bool is_announce() const { return false; }
++
++ // Expose the otherwise private end() function but return an accessor,
++ // to allow code checking whether get_contact returned a valid accessor.
++ const_accessor end() const { return
base_type::end(); }
++
++ // Used by the sorting/comparison predicate to see which node is closer.
++ static bool is_closer(const HashString& one, const HashString&
two, const HashString& target);
++
++protected:
++ void trim(bool final);
++ void node_status(const_accessor& n, bool success);
++ void set_node_active(const_accessor& n, bool active);
++
++ // Statistics about contacted nodes.
++ unsigned int m_pending;
++ unsigned int m_contacted;
++ unsigned int m_replied;
++ unsigned int m_concurrency;
++
++ bool m_restart; // If true, trim nodes and reset m_next
on the following get_contact call.
++ bool m_started;
++
++ // Next node to return in get_contact, is end() if we have no more
contactable nodes.
++ const_accessor m_next;
++
++private:
++ DhtSearch(const DhtSearch& s);
++
++ bool node_uncontacted(const DhtNode* node) const;
++};
++
++class DhtAnnounce : public DhtSearch {
++public:
++ DhtAnnounce(const HashString& infoHash, TrackerDht* tracker, const
DhtBucket& contacts)
++ : DhtSearch(infoHash, contacts),
++ m_tracker(tracker) { }
++
++ TrackerDht* tracker() const { return
m_tracker; }
++
++ // Start announce and return final set of nodes in get_contact() calls.
++ // This resets DhtSearch's completed() function, which now
++ // counts announces instead.
++ const_accessor start_announce();
++
++ virtual bool is_announce() const { return true; }
++
++private:
++ TrackerDht* m_tracker;
++};
++
++// Class holding transaction data to be transmitted.
++class DhtTransactionPacket {
++public:
++ // transaction packet
++ DhtTransactionPacket(const rak::socket_address* s, const Object& d,
unsigned int id, DhtTransaction* t)
++ : m_sa(*s), m_id(id), m_transaction(t) { build_buffer(d); };
++
++ // non-transaction packet
++ DhtTransactionPacket(const rak::socket_address* s, const Object& d)
++ : m_sa(*s), m_id(-cachedTime.seconds()), m_transaction(NULL) {
build_buffer(d); };
++
++ ~DhtTransactionPacket() { delete[] m_data; }
++
++ bool has_transaction() const { return m_id >=
-1; }
++ bool has_failed() const { return m_id ==
-1; }
++ void set_failed() { m_id = -1; }
++
++ const rak::socket_address* address() const { return &m_sa; }
++ rak::socket_address* address() { return &m_sa; }
++
++ const char* c_str() const { return m_data; }
++ size_t length() const { return m_length; }
++
++ int id() const { return m_id; }
++ int age() const { return
has_transaction() ? 0 : cachedTime.seconds() + m_id; }
++ const DhtTransaction* transaction() const { return
m_transaction; }
++ DhtTransaction* transaction() { return
m_transaction; }
++
++private:
++ void build_buffer(const Object& data);
++
++ rak::socket_address m_sa;
++ char* m_data;
++ size_t m_length;
++ int m_id;
++ DhtTransaction* m_transaction;
++};
++
++// DHT Transaction classes. DhtTransaction and DhtTransactionSearch
++// are not directly usable with no public constructor, since type()
++// is a pure virtual function.
++class DhtTransaction {
++public:
++ virtual ~DhtTransaction();
++
++ typedef enum {
++ DHT_PING,
++ DHT_FIND_NODE,
++ DHT_GET_PEERS,
++ DHT_ANNOUNCE_PEER,
++ } transaction_type;
++
++ virtual transaction_type type() = 0;
++ virtual bool is_search() { return false; }
++
++ // Key to uniquely identify a transaction with given per-node transaction
id.
++ uint64_t key(int id) const { return key(&m_sa, id);
}
++ static uint64_t key(const rak::socket_address* sa, int id) {
return ((uint64_t)sa->sa_inet()->address_n() << 32) + id; }
++
++ // Node ID and address.
++ const HashString& id() { return m_id; }
++ const rak::socket_address* address() { return &m_sa; }
++
++ int timeout() { return m_timeout; }
++ int quick_timeout() { return m_quickTimeout;
}
++ bool has_quick_timeout() { return
m_hasQuickTimeout; }
++
++ int dec_retry() { return m_retry--; }
++ int retry() { return m_retry; }
++
++ DhtTransactionPacket* packet() { return m_packet; }
++ void set_packet(DhtTransactionPacket* p) {
m_packet = p; }
++
++ // These could (should?) check that the type matches. Or use dynamic cast.
++ DhtTransactionSearch* as_search() { return
reinterpret_cast<DhtTransactionSearch*>(this); }
++ DhtTransactionPing* as_ping() { return
reinterpret_cast<DhtTransactionPing*>(this); }
++ DhtTransactionFindNode* as_find_node() { return
reinterpret_cast<DhtTransactionFindNode*>(this); }
++ DhtTransactionGetPeers* as_get_peers() { return
reinterpret_cast<DhtTransactionGetPeers*>(this); }
++ DhtTransactionAnnounce* as_announce() { return
reinterpret_cast<DhtTransactionAnnounce*>(this); }
++
++protected:
++ DhtTransaction(int quick_timeout, int timeout, const HashString& id,
const rak::socket_address* sa);
++
++ bool m_hasQuickTimeout;
++
++private:
++ DhtTransaction(const DhtTransaction& t);
++
++ HashString m_id;
++ rak::socket_address m_sa;
++ int m_timeout;
++ int m_quickTimeout;
++ int m_retry;
++ DhtTransactionPacket* m_packet;
++};
++
++class DhtTransactionSearch : public DhtTransaction {
++public:
++ virtual ~DhtTransactionSearch();
++
++ virtual bool is_search() { return true; }
++
++ DhtSearch::const_accessor node() { return m_node; }
++ DhtSearch* search() { return
m_search; }
++
++ void set_stalled();
++
++ void complete(bool success);
++
++protected:
++ DhtTransactionSearch(int quick_timeout, int timeout,
DhtSearch::const_accessor& node)
++ : DhtTransaction(quick_timeout, timeout, node.node()->id(),
node.node()->address()),
++ m_node(node),
++ m_search(node.search()) { if (!m_hasQuickTimeout)
m_search->m_concurrency++; }
++
++private:
++ DhtSearch::const_accessor m_node;
++ DhtSearch* m_search;
++};
++
++// Actual transaction classes.
++class DhtTransactionPing : public DhtTransaction {
++public:
++ DhtTransactionPing(const HashString& id, const rak::socket_address* sa)
++ : DhtTransaction(-1, 30, id, sa) { }
++
++ virtual transaction_type type() { return DHT_PING;
}
++};
++
++class DhtTransactionFindNode : public DhtTransactionSearch {
++public:
++ DhtTransactionFindNode(DhtSearch::const_accessor& node)
++ : DhtTransactionSearch(4, 30, node) { }
++
++ virtual transaction_type type() { return
DHT_FIND_NODE; }
++};
++
++class DhtTransactionGetPeers : public DhtTransactionSearch {
++public:
++ DhtTransactionGetPeers(DhtSearch::const_accessor& node)
++ : DhtTransactionSearch(-1, 30, node) { }
++
++ virtual transaction_type type() { return
DHT_GET_PEERS; }
++
++ DhtAnnounce* announce() { return
reinterpret_cast<DhtAnnounce*>(search()); }
++};
++
++class DhtTransactionAnnounce : public DhtTransaction {
++public:
++ DhtTransactionAnnounce(const HashString& id, const rak::socket_address*
sa, const HashString& infoHash, const std::string& token)
++ : DhtTransaction(-1, 30, id, sa),
++ m_infoHash(infoHash),
++ m_token(token) { }
++
++ virtual transaction_type type() { return
DHT_ANNOUNCE_PEER; }
++
++ const HashString& info_hash() { return
m_infoHash; }
++ const std::string& token() { return m_token; }
++
++private:
++ HashString m_infoHash;
++ std::string m_token;
++};
++
++inline bool
++DhtSearch::is_closer(const HashString& one, const HashString& two, const
HashString& target) {
++ for (unsigned int i=0; i<one.size(); i++)
++ if (one[i] != two[i])
++ return (uint8_t)(one[i] ^ target[i]) < (uint8_t)(two[i] ^ target[i]);
++
++ return false;
++}
++
++inline void
++DhtSearch::set_node_active(const_accessor& n, bool active) {
++ n.node()->m_lastSeen = active;
++}
++
++inline bool
++dht_compare_closer::operator () (const DhtNode* one, const DhtNode* two)
const {
++ return DhtSearch::is_closer(*one, *two, m_target);
++}
++
++}
++
++#endif
+Index: libtorrent/src/dht/dht_node.h
+===================================================================
+--- libtorrent/src/dht/dht_node.h (revision 0)
++++ libtorrent/src/dht/dht_node.h (revision 0)
+@@ -0,0 +1,136 @@
++// libTorrent - BitTorrent library
++// Copyright (C) 2005-2007, Jari Sundell
++//
++// This program is free software; you can redistribute it and/or modify
++// it under the terms of the GNU General Public License as published by
++// the Free Software Foundation; either version 2 of the License, or
++// (at your option) any later version.
++//
++// This program is distributed in the hope that it will be useful,
++// but WITHOUT ANY WARRANTY; without even the implied warranty of
++// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++// GNU General Public License for more details.
++//
++// You should have received a copy of the GNU General Public License
++// along with this program; if not, write to the Free Software
++// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++//
++// In addition, as a special exception, the copyright holders give
++// permission to link the code of portions of this program with the
++// OpenSSL library under certain conditions as described in each
++// individual source file, and distribute linked combinations
++// including the two.
++//
++// You must obey the GNU General Public License in all respects for
++// all of the code used other than OpenSSL. If you modify file(s)
++// with this exception, you may extend this exception to your version
++// of the file(s), but you are not obligated to do so. If you do not
++// wish to do so, delete this exception statement from your version.
++// If you delete this exception statement from all source files in the
++// program, then also delete it here.
++//
++// Contact: Jari Sundell <jaris AT ifi.uio.no>
++//
++// Skomakerveien 33
++// 3185 Skoppum, NORWAY
++
++#ifndef LIBTORRENT_DHT_NODE_H
++#define LIBTORRENT_DHT_NODE_H
++
++#include "globals.h"
++
++#include <rak/socket_address.h>
++
++#include "torrent/hash_string.h"
++
++#include "dht_bucket.h"
++
++namespace torrent {
++
++class DhtBucket;
++
++class DhtNode : public HashString {
++ friend class DhtSearch;
++
++public:
++ // A node is considered bad if it failed to reply to this many queries.
++ static const unsigned int max_failed_replies = 5;
++
++ DhtNode(const HashString& id, const rak::socket_address* sa);
++ DhtNode(const std::string& id, const Object& cache);
++
++ const HashString& id() const { return *this; }
++ const rak::socket_address* address() const { return
&m_socketAddress; }
++ void set_address(const rak::socket_address* sa) {
m_socketAddress = *sa; }
++
++ // For determining node quality.
++ unsigned int last_seen() const { return
m_lastSeen; }
++ unsigned int age() const { return
cachedTime.seconds() - m_lastSeen; }
++ bool is_good() const { return
m_recentlyActive; }
++ bool is_questionable() const { return
!m_recentlyActive; }
++ bool is_bad() const { return
m_recentlyInactive >= max_failed_replies; };
++ bool is_active() const { return
m_lastSeen; }
++
++ // Update is called once every 15 minutes.
++ void update() { m_recentlyActive
= age() < 15 * 60; }
++
++ // Called when node replies to us, queries us, or fails to reply.
++ void replied() { set_good(); }
++ void queried() { if (m_lastSeen)
set_good(); }
++ void inactive();
++
++ DhtBucket* bucket() const { return m_bucket;
}
++ DhtBucket* set_bucket(DhtBucket* b) { m_bucket = b;
return b; }
++
++ bool is_in_range(const DhtBucket* b) { return
b->is_in_range(*this); }
++
++ // Store compact node information (26 bytes address, port and ID) in the
given
++ // buffer and return pointer to end of stored information.
++ char* store_compact(char* buffer) const;
++
++ // Store node cache in the given container object and return it.
++ Object* store_cache(Object* container) const;
++
++private:
++ DhtNode();
++
++ void set_good();
++ void set_bad();
++
++ rak::socket_address m_socketAddress;
++ unsigned int m_lastSeen;
++ bool m_recentlyActive;
++ unsigned int m_recentlyInactive;
++ DhtBucket* m_bucket;
++};
++
++inline void
++DhtNode::set_good() {
++ if (m_bucket != NULL && !is_good())
++ m_bucket->node_now_good(is_bad());
++
++ m_lastSeen = cachedTime.seconds();
++ m_recentlyInactive = 0;
++ m_recentlyActive = true;
++}
++
++inline void
++DhtNode::set_bad() {
++ if (m_bucket != NULL && !is_bad())
++ m_bucket->node_now_bad(is_good());
++
++ m_recentlyInactive = max_failed_replies;
++ m_recentlyActive = false;
++}
++
++inline void
++DhtNode::inactive() {
++ if (m_recentlyInactive + 1 == max_failed_replies)
++ set_bad();
++ else
++ m_recentlyInactive++;
++}
++
++}
++
++#endif
+Index: libtorrent/src/dht/dht_server.h
+===================================================================
+--- libtorrent/src/dht/dht_server.h (revision 0)
++++ libtorrent/src/dht/dht_server.h (revision 0)
+@@ -0,0 +1,186 @@
++// libTorrent - BitTorrent library
++// Copyright (C) 2005-2007, Jari Sundell
++//
++// This program is free software; you can redistribute it and/or modify
++// it under the terms of the GNU General Public License as published by
++// the Free Software Foundation; either version 2 of the License, or
++// (at your option) any later version.
++//
++// This program is distributed in the hope that it will be useful,
++// but WITHOUT ANY WARRANTY; without even the implied warranty of
++// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++// GNU General Public License for more details.
++//
++// You should have received a copy of the GNU General Public License
++// along with this program; if not, write to the Free Software
++// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++//
++// In addition, as a special exception, the copyright holders give
++// permission to link the code of portions of this program with the
++// OpenSSL library under certain conditions as described in each
++// individual source file, and distribute linked combinations
++// including the two.
++//
++// You must obey the GNU General Public License in all respects for
++// all of the code used other than OpenSSL. If you modify file(s)
++// with this exception, you may extend this exception to your version
++// of the file(s), but you are not obligated to do so. If you do not
++// wish to do so, delete this exception statement from your version.
++// If you delete this exception statement from all source files in the
++// program, then also delete it here.
++//
++// Contact: Jari Sundell <jaris AT ifi.uio.no>
++//
++// Skomakerveien 33
++// 3185 Skoppum, NORWAY
++
++#ifndef LIBTORRENT_DHT_SERVER_H
++#define LIBTORRENT_DHT_SERVER_H
++
++#include <map>
++#include <deque>
++#include <rak/priority_queue_default.h>
++#include <rak/socket_address.h>
++
++#include "net/socket_datagram.h"
++#include "net/throttle_node.h"
++#include "download/download_info.h" // for SocketAddressCompact
++#include "torrent/hash_string.h"
++
++namespace torrent {
++
++class DhtBucket;
++class DhtNode;
++class DhtRouter;
++
++class DownloadInfo;
++class TrackerDht;
++
++class DhtTransaction;
++class DhtTransactionPacket;
++class DhtTransactionSearch;
++class DhtTransactionGetPeers;
++
++// UDP server that handles the DHT node communications.
++
++class DhtServer : public SocketDatagram {
++public:
++ DhtServer(DhtRouter* self);
++ ~DhtServer();
++
++ void start(int port);
++ void stop();
++ bool is_active() const { return
get_fd().is_valid(); }
++
++ unsigned int queries_received() const { return
m_queriesReceived; }
++ unsigned int queries_sent() const { return
m_queriesSent; }
++ unsigned int replies_received() const { return
m_repliesReceived; }
++ void reset_statistics();
++
++ // Contact a node to see if it replies. Set id=0 if unknown.
++ void ping(const HashString& id, const rak::socket_address*
sa);
++
++ // Do a find_node search with the given contacts as starting point for the
++ // search.
++ void find_node(const DhtBucket& contacts, const
HashString& target);
++
++ // Do DHT announce, starting with the given contacts.
++ void announce(const DhtBucket& contacts, const HashString&
infoHash, TrackerDht* tracker);
++
++ // Cancel given announce for given tracker, or all matching announces if
info/tracker NULL.
++ void cancel_announce(DownloadInfo* info, const TrackerDht*
tracker);
++
++ // Called every 15 minutes.
++ void update();
++
++ ThrottleNode* upload_throttle() { return
&m_uploadThrottle; }
++ const ThrottleNode* upload_throttle() const { return
&m_uploadThrottle; }
++ ThrottleNode* download_throttle() { return
&m_downloadThrottle; }
++ const ThrottleNode* download_throttle() const { return
&m_downloadThrottle; }
++
++ virtual void event_read();
++ virtual void event_write();
++ virtual void event_error();
++
++private:
++ // DHT error codes.
++ static const int dht_error_generic = 201;
++ static const int dht_error_server = 202;
++ static const int dht_error_protocol = 203;
++ static const int dht_error_bad_method = 204;
++
++ typedef std::deque<DhtTransactionPacket*> packet_queue;
++
++ struct compact_node_info {
++ char _id[20];
++ SocketAddressCompact _addr;
++
++ HashString& id() { return
*HashString::cast_from(_id); }
++ rak::socket_address address() { return rak::socket_address(_addr);
}
++ } __attribute__ ((packed));
++ typedef std::list<compact_node_info> node_info_list;
++
++ // Pending transactions (using DhtTransaction::key as key).
++ typedef std::map<uint64_t, DhtTransaction*> transaction_map;
++ typedef transaction_map::iterator transaction_itr;
++
++ // DHT transaction names for given transaction type.
++ static const char* queries[];
++
++ // Priorities for the outgoing packets.
++ static const int packet_prio_high = 2; // For important queries we send
(announces).
++ static const int packet_prio_low = 1; // For (relatively) unimportant
queries we send.
++ static const int packet_prio_reply = 0; // For replies to peer queries.
++
++ void start_write();
++
++ void process_query(const Object& transaction, const
HashString& id, const rak::socket_address* sa, Object& req);
++ void process_response(int transaction, const HashString&
id, const rak::socket_address* sa, Object& req);
++ void process_error(int transaction, const
rak::socket_address* sa, Object& req);
++
++ void parse_node_info(node_info_list& l, const std::string&
n);
++ void parse_find_node_reply(DhtTransactionSearch* t, const
std::string& nodes);
++ void parse_get_peers_reply(DhtTransactionGetPeers* t,
const Object& res);
++
++ void find_node_next(DhtTransactionSearch* t);
++
++ void add_packet(DhtTransactionPacket* packet, int
priority);
++ void create_query(transaction_itr itr, int tID, const
rak::socket_address* sa, int priority);
++ void create_response(const Object& transaction, const
rak::socket_address* sa, Object& r);
++ void create_error(const Object& transaction, const
rak::socket_address* sa, int num, const std::string& msg);
++
++ void create_find_node_response(const Object& arg, Object&
reply);
++ void create_get_peers_response(const Object& arg, const
rak::socket_address* sa, Object& reply);
++ void create_announce_peer_response(const Object& arg,
const rak::socket_address* sa, Object& reply);
++
++ int add_transaction(DhtTransaction* t, int priority);
++
++ // These methods return the iterator after the given one or end()
++ transaction_itr failed_transaction(transaction_itr itr, bool quick);
++ transaction_itr cancel_transaction(transaction_itr itr);
++
++ void clear_transactions();
++
++ bool process_queue(packet_queue& queue, uint32_t* quota);
++ void receive_timeout();
++
++ DhtRouter* m_router;
++ packet_queue m_highQueue;
++ packet_queue m_lowQueue;
++ transaction_map m_transactions;
++
++ rak::priority_item m_taskTimeout;
++
++ ThrottleNode m_uploadThrottle;
++ ThrottleNode m_downloadThrottle;
++
++ unsigned int m_queriesReceived;
++ unsigned int m_queriesSent;
++ unsigned int m_repliesReceived;
++
++ bool m_networkUp;
++};
++
++}
++
++#endif
+Index: libtorrent/src/dht/dht_tracker.cc
+===================================================================
+--- libtorrent/src/dht/dht_tracker.cc (revision 0)
++++ libtorrent/src/dht/dht_tracker.cc (revision 0)
+@@ -0,0 +1,129 @@
++// libTorrent - BitTorrent library
++// Copyright (C) 2005-2007, Jari Sundell
++//
++// This program is free software; you can redistribute it and/or modify
++// it under the terms of the GNU General Public License as published by
++// the Free Software Foundation; either version 2 of the License, or
++// (at your option) any later version.
++//
++// This program is distributed in the hope that it will be useful,
++// but WITHOUT ANY WARRANTY; without even the implied warranty of
++// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++// GNU General Public License for more details.
++//
++// You should have received a copy of the GNU General Public License
++// along with this program; if not, write to the Free Software
++// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++//
++// In addition, as a special exception, the copyright holders give
++// permission to link the code of portions of this program with the
++// OpenSSL library under certain conditions as described in each
++// individual source file, and distribute linked combinations
++// including the two.
++//
++// You must obey the GNU General Public License in all respects for
++// all of the code used other than OpenSSL. If you modify file(s)
++// with this exception, you may extend this exception to your version
++// of the file(s), but you are not obligated to do so. If you do not
++// wish to do so, delete this exception statement from your version.
++// If you delete this exception statement from all source files in the
++// program, then also delete it here.
++//
++// Contact: Jari Sundell <jaris AT ifi.uio.no>
++//
++// Skomakerveien 33
++// 3185 Skoppum, NORWAY
++
++#include "config.h"
++
++#include "torrent/object.h"
++
++#include "dht_tracker.h"
++
++namespace torrent {
++
++void
++DhtTracker::add_peer(const rak::socket_address* sa) {
++ // Should check that sa is an INET address.
++ SocketAddressCompact compact(sa->sa_inet()->address_n(),
sa->sa_inet()->port_n());
++
++ unsigned int oldest = 0;
++ uint32_t minSeen = ~uint32_t();
++
++ // Check if peer exists. If not, find oldest peer.
++ for (unsigned int i = 0; i < size(); i++) {
++ if ((*this)[i].addr == compact.addr) {
++ (*this)[i].port = compact.port;
++ m_lastSeen[i] = cachedTime.seconds();
++ return;
++
++ } else if (m_lastSeen[i] < minSeen) {
++ minSeen = m_lastSeen[i];
++ oldest = i;
++ }
++ }
++
++ // If peer doesn't exist, append to list if the table is not full.
++ if (size() < max_size) {
++ push_back(compact);
++ m_lastSeen.push_back(cachedTime.seconds());
++
++ // Peer doesn't exist and table is full: replace oldest peer.
++ } else {
++ (*this)[oldest] = compact;
++ m_lastSeen[oldest] = cachedTime.seconds();
++ }
++}
++
++// Return compact info (6 bytes) for up to 30 peers, returning different
++// peers for each call if there are more.
++std::string
++DhtTracker::get_peers(unsigned int maxPeers) {
++ iterator first;
++ iterator last;
++
++ // If we have more than max_peers, randomly return block of peers.
++ // The peers in overlapping blocks get picked twice as often, but
++ // that's better than returning fewer peers.
++ if (size() > maxPeers) {
++ unsigned int blocks = (size() + maxPeers - 1) / maxPeers;
++
++ first = begin() + (random() % blocks) * (size() - maxPeers) / (blocks -
1);
++ last = first + maxPeers;
++
++ } else {
++ first = begin();
++ last = end();
++ }
++
++ return std::string(first->c_str(), last->c_str());
++}
++
++// Remove old announces.
++void
++DhtTracker::prune(uint32_t maxAge) {
++ uint32_t minSeen = cachedTime.seconds() - maxAge;
++ unsigned int i;
++
++ for (i = 0; i < size(); i++)
++ if (m_lastSeen[i] <= minSeen)
++ break;
++
++ if (i == size())
++ return; // No old peers found.
++
++ unsigned int index = i;
++
++ for (i++; i < size(); i++) {
++ if (m_lastSeen[i] > minSeen) {
++ m_lastSeen[index] = m_lastSeen[i];
++ (*this)[index] = (*this)[i];
++ index++;
++ }
++ }
++
++ resize(index);
++ m_lastSeen.resize(index);
++}
++
++}
+Index: libtorrent/src/net/throttle_node.h
+===================================================================
+--- libtorrent/src/net/throttle_node.h (revision 975)
++++ libtorrent/src/net/throttle_node.h (working copy)
+@@ -45,13 +45,13 @@
+
+ namespace torrent {
+
+-class PeerConnectionBase;
++class SocketBase;
+
+ class ThrottleNode {
+ public:
+ typedef ThrottleList::iterator iterator;
+ typedef ThrottleList::const_iterator const_iterator;
+- typedef rak::mem_fun0<PeerConnectionBase, void> SlotActivate;
++ typedef rak::mem_fun0<SocketBase, void> SlotActivate;
+
+ ThrottleNode(uint32_t rateSpan) : m_rate(rateSpan) { clear_quota(); }
+
+Index: libtorrent/src/net/socket_base.cc
+===================================================================
+--- libtorrent/src/net/socket_base.cc (revision 975)
++++ libtorrent/src/net/socket_base.cc (working copy)
+@@ -41,6 +41,8 @@
+ #include <sys/socket.h>
+
+ #include "torrent/exceptions.h"
++#include "torrent/poll.h"
++#include "manager.h"
+ #include "socket_base.h"
+
+ namespace torrent {
+@@ -72,4 +74,14 @@
+ return r == 1;
+ }
+
++void
++SocketBase::receive_throttle_down_activate() {
++ manager->poll()->insert_read(this);
++}
++
++void
++SocketBase::receive_throttle_up_activate() {
++ manager->poll()->insert_write(this);
++}
++
+ } // namespace torrent
+Index: libtorrent/src/net/socket_base.h
+===================================================================
+--- libtorrent/src/net/socket_base.h (revision 975)
++++ libtorrent/src/net/socket_base.h (working copy)
+@@ -60,6 +60,9 @@
+ bool read_oob(void* buffer);
+ bool write_oob(const void* buffer);
+
++ void receive_throttle_down_activate();
++ void receive_throttle_up_activate();
++
+ protected:
+ // Disable copying
+ SocketBase(const SocketBase&);
+Index: libtorrent/src/tracker/tracker_control.cc
+===================================================================
+--- libtorrent/src/tracker/tracker_control.cc (revision 975)
++++ libtorrent/src/tracker/tracker_control.cc (working copy)
+@@ -43,6 +43,7 @@
+ #include "net/address_list.h"
+ #include "torrent/exceptions.h"
+ #include "tracker_control.h"
++#include "tracker_dht.h"
+ #include "tracker_http.h"
+ #include "tracker_udp.h"
+
+@@ -73,6 +74,9 @@
+ else if (std::strncmp("udp://", url.c_str(), 6) == 0)
+ t = new TrackerUdp(m_info, url);
+
++ else if (std::strncmp("dht://", url.c_str(), 6) == 0)
++ t = new TrackerDht(m_info, url);
++
+ else
+ // TODO: Error message here?... not really...
+ return;
+@@ -101,7 +105,7 @@
+ m_tries = -1;
+ m_state = s;
+
+- m_itr = m_list.find_enabled(m_itr);
++ m_itr = m_list.find_usable(m_itr);
+
+ if (m_itr != m_list.end())
+ m_itr->second->send_state(m_state,
+Index: libtorrent/src/tracker/tracker_dht.h
+===================================================================
+--- libtorrent/src/tracker/tracker_dht.h (revision 0)
++++ libtorrent/src/tracker/tracker_dht.h (revision 0)
+@@ -0,0 +1,72 @@
++// libTorrent - BitTorrent library
++// Copyright (C) 2005-2007, Jari Sundell
++//
++// This program is free software; you can redistribute it and/or modify
++// it under the terms of the GNU General Public License as published by
++// the Free Software Foundation; either version 2 of the License, or
++// (at your option) any later version.
++//
++// This program is distributed in the hope that it will be useful,
++// but WITHOUT ANY WARRANTY; without even the implied warranty of
++// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++// GNU General Public License for more details.
++//
++// You should have received a copy of the GNU General Public License
++// along with this program; if not, write to the Free Software
++// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++//
++// In addition, as a special exception, the copyright holders give
++// permission to link the code of portions of this program with the
++// OpenSSL library under certain conditions as described in each
++// individual source file, and distribute linked combinations
++// including the two.
++//
++// You must obey the GNU General Public License in all respects for
++// all of the code used other than OpenSSL. If you modify file(s)
++// with this exception, you may extend this exception to your version
++// of the file(s), but you are not obligated to do so. If you do not
++// wish to do so, delete this exception statement from your version.
++// If you delete this exception statement from all source files in the
++// program, then also delete it here.
++//
++// Contact: Jari Sundell <jaris AT ifi.uio.no>
++//
++// Skomakerveien 33
++// 3185 Skoppum, NORWAY
++
++#ifndef LIBTORRENT_TRACKER_TRACKER_DHT_H
++#define LIBTORRENT_TRACKER_TRACKER_DHT_H
++
++#include "net/address_list.h"
++#include "torrent/object.h"
++#include "tracker_base.h"
++
++namespace torrent {
++
++class TrackerDht : public TrackerBase {
++public:
++ TrackerDht(DownloadInfo* info, const std::string& url);
++ ~TrackerDht();
++
++ virtual bool is_busy() const;
++ virtual bool is_usable() const;
++
++ virtual void send_state(DownloadInfo::State state, uint64_t down,
uint64_t up, uint64_t left);
++ virtual void close();
++
++ virtual Type type() const;
++
++ bool has_peers() const { return
!m_peers.empty(); }
++
++ void receive_peers(const std::string& peers);
++ void receive_success();
++ void receive_failed(const std::string& msg);
++ void receive_status(int replied, int contacted, const
char* stage);
++
++private:
++ AddressList m_peers;
++};
++
++}
++
++#endif
+Index: libtorrent/src/tracker/tracker_container.cc
+===================================================================
+--- libtorrent/src/tracker/tracker_container.cc (revision 975)
++++ libtorrent/src/tracker/tracker_container.cc (working copy)
+@@ -47,10 +47,13 @@
+
+ namespace torrent {
+
++struct tracker_usable_t : public
std::unary_function<TrackerContainer::value_type, bool> {
++ bool operator () (const TrackerContainer::value_type& value) const {
return value.second->is_usable(); }
++};
++
+ bool
+-TrackerContainer::has_enabled() const {
+- return std::find_if(begin(), end(),
+- rak::on(rak::mem_ref(&value_type::second),
std::mem_fun(&TrackerBase::is_enabled)))
++TrackerContainer::has_usable() const {
++ return std::find_if(begin(), end(), tracker_usable_t())
+ != end();
+ }
+
+@@ -99,8 +102,8 @@
+ }
+
+ TrackerContainer::iterator
+-TrackerContainer::find_enabled(iterator itr) {
+- while (itr != end() && !itr->second->is_enabled())
++TrackerContainer::find_usable(iterator itr) {
++ while (itr != end() && !tracker_usable_t()(*itr))
+ ++itr;
+
+ return itr;
+Index: libtorrent/src/tracker/tracker_container.h
+===================================================================
+--- libtorrent/src/tracker/tracker_container.h (revision 975)
++++ libtorrent/src/tracker/tracker_container.h (working copy)
+@@ -72,7 +72,7 @@
+
+ ~TrackerContainer() { clear(); }
+
+- bool has_enabled() const;
++ bool has_usable() const;
+
+ void randomize();
+ void clear();
+@@ -82,7 +82,7 @@
+ iterator promote(iterator itr);
+
+ iterator find(TrackerBase* tb);
+- iterator find_enabled(iterator itr);
++ iterator find_usable(iterator itr);
+ const_iterator find_enabled(const_iterator itr) const;
+
+ iterator begin_group(int group);
+Index: libtorrent/src/tracker/tracker_udp.cc
+===================================================================
+--- libtorrent/src/tracker/tracker_udp.cc (revision 975)
++++ libtorrent/src/tracker/tracker_udp.cc (working copy)
+@@ -36,9 +36,6 @@
+
+ #include "config.h"
+
+-#include <sigc++/bind.h>
+-#include <torrent/connection_manager.h>
+-
+ #include "net/address_list.h"
+ #include "torrent/exceptions.h"
+ #include "torrent/connection_manager.h"
+@@ -64,7 +61,7 @@
+
+ close();
+ }
+-
++
+ bool
+ TrackerUdp::is_busy() const {
+ return get_fd().is_valid();
+@@ -91,7 +88,7 @@
+ m_sendUp = up;
+ m_sendLeft = left;
+
+- m_slotResolver = manager->connection_manager()->resolver()(hostname,
PF_INET, SOCK_DGRAM,
++ m_slotResolver = manager->connection_manager()->resolver()(hostname,
(int)rak::socket_address::pf_inet, SOCK_DGRAM,
+
sigc::mem_fun(this, &TrackerUdp::start_announce));
+ }
+
+Index: libtorrent/src/tracker/Makefile.am
+===================================================================
+--- libtorrent/src/tracker/Makefile.am (revision 975)
++++ libtorrent/src/tracker/Makefile.am (working copy)
+@@ -4,6 +4,8 @@
+ tracker_base.h \
+ tracker_control.cc \
+ tracker_control.h \
++ tracker_dht.cc \
++ tracker_dht.h \
+ tracker_http.cc \
+ tracker_http.h \
+ tracker_container.cc \
+Index: libtorrent/src/tracker/tracker_base.h
+===================================================================
+--- libtorrent/src/tracker/tracker_base.h (revision 975)
++++ libtorrent/src/tracker/tracker_base.h (working copy)
+@@ -58,7 +58,8 @@
+ typedef enum {
+ TRACKER_NONE,
+ TRACKER_HTTP,
+- TRACKER_UDP
++ TRACKER_UDP,
++ TRACKER_DHT
+ } Type;
+
+ TrackerBase(DownloadInfo* info, const std::string& url) :
+@@ -69,6 +70,7 @@
+
+ virtual bool is_busy() const = 0;
+ bool is_enabled() const { return
m_enabled; }
++ virtual bool is_usable() const { return
m_enabled; }
+
+ void enable(bool state) { m_enabled =
state; }
+
+@@ -81,6 +83,8 @@
+ const std::string& url() const { return m_url;
}
+ void set_url(const std::string& url) { m_url = url; }
+
++ const std::string& status() const { return
m_status; }
++
+ const std::string& tracker_id() const { return
m_trackerId; }
+ void set_tracker_id(const std::string& id) { m_trackerId =
id; }
+
+@@ -106,6 +110,7 @@
+
+ DownloadInfo* m_info;
+ std::string m_url;
++ std::string m_status;
+
+ std::string m_trackerId;
+
+Index: libtorrent/src/tracker/tracker_dht.cc
+===================================================================
+--- libtorrent/src/tracker/tracker_dht.cc (revision 0)
++++ libtorrent/src/tracker/tracker_dht.cc (revision 0)
+@@ -0,0 +1,151 @@
++// libTorrent - BitTorrent library
++// Copyright (C) 2005-2007, Jari Sundell
++//
++// This program is free software; you can redistribute it and/or modify
++// it under the terms of the GNU General Public License as published by
++// the Free Software Foundation; either version 2 of the License, or
++// (at your option) any later version.
++//
++// This program is distributed in the hope that it will be useful,
++// but WITHOUT ANY WARRANTY; without even the implied warranty of
++// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++// GNU General Public License for more details.
++//
++// You should have received a copy of the GNU General Public License
++// along with this program; if not, write to the Free Software
++// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++//
++// In addition, as a special exception, the copyright holders give
++// permission to link the code of portions of this program with the
++// OpenSSL library under certain conditions as described in each
++// individual source file, and distribute linked combinations
++// including the two.
++//
++// You must obey the GNU General Public License in all respects for
++// all of the code used other than OpenSSL. If you modify file(s)
++// with this exception, you may extend this exception to your version
++// of the file(s), but you are not obligated to do so. If you do not
++// wish to do so, delete this exception statement from your version.
++// If you delete this exception statement from all source files in the
++// program, then also delete it here.
++//
++// Contact: Jari Sundell <jaris AT ifi.uio.no>
++//
++// Skomakerveien 33
++// 3185 Skoppum, NORWAY
++
++#include "config.h"
++
++#include <sstream>
++
++#include "dht/dht_router.h"
++#include "torrent/connection_manager.h"
++#include "torrent/dht_manager.h"
++#include "torrent/exceptions.h"
++
++#include "tracker_dht.h"
++#include "tracker_http.h"
++
++#include "globals.h"
++#include "manager.h"
++
++namespace torrent {
++
++TrackerDht::TrackerDht(DownloadInfo* info, const std::string& url) :
++ TrackerBase(info, url) {
++
++ if (!manager->dht_manager()->is_valid())
++ throw internal_error("Trying to add DHT tracker with no DHT manager.");
++}
++
++TrackerDht::~TrackerDht() {
++ if (is_busy())
++ manager->dht_manager()->router()->cancel_announce(NULL, this);
++}
++
++bool
++TrackerDht::is_busy() const {
++ return !m_status.empty();
++}
++
++bool
++TrackerDht::is_usable() const {
++ return m_enabled && manager->dht_manager()->is_active();
++}
++
++void
++TrackerDht::send_state(DownloadInfo::State state, uint64_t down, uint64_t
up, uint64_t left) {
++ if (m_info == NULL)
++ throw internal_error("TrackerDht::send_state(...) does not have a valid
m_info.");
++
++ if (is_busy()) {
++ manager->dht_manager()->router()->cancel_announce(m_info, this);
++
++ if (is_busy())
++ throw internal_error("TrackerDht::send_state cancel_announce did not
cancel announce.");
++ }
++
++ if (state == DownloadInfo::STOPPED)
++ return;
++
++ m_status = "[Initializing]";
++
++ if (!manager->dht_manager()->is_active())
++ return receive_failed("DHT server not active.");
++
++ manager->dht_manager()->router()->announce(m_info, this);
++
++ set_normal_interval(20 * 60);
++ set_min_interval(0);
++}
++
++void
++TrackerDht::close() {
++ if (is_busy())
++ manager->dht_manager()->router()->cancel_announce(m_info, this);
++}
++
++TrackerDht::Type
++TrackerDht::type() const {
++ return TRACKER_DHT;
++}
++
++void
++TrackerDht::receive_peers(const std::string& peers) {
++ if (!is_busy())
++ throw internal_error("TrackerDht::receive_peers called while not
busy.");
++
++ m_peers.parse_address_compact(peers);
++}
++
++void
++TrackerDht::receive_success() {
++ if (!is_busy())
++ throw internal_error("TrackerDht::receive_success called while not
busy.");
++
++ m_status.clear();
++ m_slotSuccess(this, &m_peers);
++ m_peers.clear();
++}
++
++void
++TrackerDht::receive_failed(const std::string& msg) {
++ if (!is_busy())
++ throw internal_error("TrackerDht::receive_failed called while not
busy.");
++
++ m_status.clear();
++ m_slotFailed(this, msg);
++ m_peers.clear();
++}
++
++void
++TrackerDht::receive_status(int replied, int contacted, const char* stage) {
++ if (!is_busy())
++ throw internal_error("TrackerDht::receive_status called while not
busy.");
++
++ std::stringstream s;
++ s << "[" << stage << ": " << replied << "/" << contacted << " nodes
replied]";
++ m_status = s.str();
++}
++
++}
+Index: libtorrent/src/torrent/tracker.cc
+===================================================================
+--- libtorrent/src/torrent/tracker.cc (revision 975)
++++ libtorrent/src/torrent/tracker.cc (working copy)
+@@ -46,6 +46,11 @@
+ return m_tracker.second->is_enabled();
+ }
+
++bool
++Tracker::is_usable() const {
++ return m_tracker.second->is_usable();
++}
++
+ void
+ Tracker::enable() {
+ m_tracker.second->enable(true);
+@@ -67,6 +72,11 @@
+ }
+
+ const std::string&
++Tracker::status() const {
++ return m_tracker.second->status();
++}
++
++const std::string&
+ Tracker::tracker_id() const {
+ return m_tracker.second->tracker_id();
+ }
+Index: libtorrent/src/torrent/torrent.cc
+===================================================================
+--- libtorrent/src/torrent/torrent.cc (revision 975)
++++ libtorrent/src/torrent/torrent.cc (working copy)
+@@ -165,6 +165,11 @@
+ return manager->connection_manager();
+ }
+
++DhtManager*
++dht_manager() {
++ return manager->dht_manager();
++}
++
+ uint32_t
+ total_handshakes() {
+ return manager->handshake_manager()->size();
+Index: libtorrent/src/torrent/tracker.h
+===================================================================
+--- libtorrent/src/torrent/tracker.h (revision 975)
++++ libtorrent/src/torrent/tracker.h (working copy)
+@@ -58,6 +58,7 @@
+ Tracker(value_type v) : m_tracker(v) {}
+
+ bool is_enabled() const;
++ bool is_usable() const;
+ bool is_open() const;
+
+ void enable();
+@@ -65,6 +66,7 @@
+
+ uint32_t group() const { return m_tracker.first; }
+ const std::string& url() const;
++ const std::string& status() const;
+
+ // The "tracker id" string returned by the tracker.
+ const std::string& tracker_id() const;
+Index: libtorrent/src/torrent/torrent.h
+===================================================================
+--- libtorrent/src/torrent/torrent.h (revision 975)
++++ libtorrent/src/torrent/torrent.h (working copy)
+@@ -65,6 +65,7 @@
+ ChunkManager* chunk_manager() LIBTORRENT_EXPORT;
+ ClientList* client_list() LIBTORRENT_EXPORT;
+ ConnectionManager* connection_manager() LIBTORRENT_EXPORT;
++DhtManager* dht_manager() LIBTORRENT_EXPORT;
+
+ uint32_t total_handshakes() LIBTORRENT_EXPORT;
+
+Index: libtorrent/src/torrent/peer/peer_info.h
+===================================================================
+--- libtorrent/src/torrent/peer/peer_info.h (revision 975)
++++ libtorrent/src/torrent/peer/peer_info.h (working copy)
+@@ -80,6 +80,7 @@
+ uint32_t last_connection() const { return
m_lastConnection; }
+ void set_last_connection(uint32_t tvsec) {
m_lastConnection = tvsec; }
+
++ bool supports_dht() const { return
m_options[7] & 0x01; }
+ bool supports_extensions() const { return
m_options[5] & 0x10; }
+
+ // Internal to libTorrent:
+Index: libtorrent/src/torrent/dht_manager.cc
+===================================================================
+--- libtorrent/src/torrent/dht_manager.cc (revision 0)
++++ libtorrent/src/torrent/dht_manager.cc (revision 0)
+@@ -0,0 +1,119 @@
++// libTorrent - BitTorrent library
++// Copyright (C) 2005-2007, Jari Sundell
++//
++// This program is free software; you can redistribute it and/or modify
++// it under the terms of the GNU General Public License as published by
++// the Free Software Foundation; either version 2 of the License, or
++// (at your option) any later version.
++//
++// This program is distributed in the hope that it will be useful,
++// but WITHOUT ANY WARRANTY; without even the implied warranty of
++// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++// GNU General Public License for more details.
++//
++// You should have received a copy of the GNU General Public License
++// along with this program; if not, write to the Free Software
++// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++//
++// In addition, as a special exception, the copyright holders give
++// permission to link the code of portions of this program with the
++// OpenSSL library under certain conditions as described in each
++// individual source file, and distribute linked combinations
++// including the two.
++//
++// You must obey the GNU General Public License in all respects for
++// all of the code used other than OpenSSL. If you modify file(s)
++// with this exception, you may extend this exception to your version
++// of the file(s), but you are not obligated to do so. If you do not
++// wish to do so, delete this exception statement from your version.
++// If you delete this exception statement from all source files in the
++// program, then also delete it here.
++//
++// Contact: Jari Sundell <jaris AT ifi.uio.no>
++//
++// Skomakerveien 33
++// 3185 Skoppum, NORWAY
++
++#include "config.h"
++
++#include <rak/address_info.h>
++#include <rak/socket_address.h>
++
++#include <torrent/exceptions.h>
++
++#include "manager.h"
++
++#include "dht/dht_router.h"
++#include "dht/dht_server.h"
++#include "dht_manager.h"
++#include "net/throttle_manager.h"
++
++namespace torrent {
++
++DhtManager::~DhtManager() {
++ stop();
++ delete m_router;
++}
++
++void
++DhtManager::initialize(const Object& dhtCache) {
++ if (m_router != NULL)
++ throw internal_error("DhtManager::initialize called with DHT already
active.");
++
++ m_router = new DhtRouter(dhtCache,
rak::socket_address::cast_from(manager->connection_manager()->bind_address()));
++}
++
++void
++DhtManager::start(port_type port) {
++ if (m_router == NULL)
++ throw internal_error("DhtManager::start called without initializing
first.");
++
++ m_router->start(port);
++}
++
++
++void
++DhtManager::stop() {
++ if (m_router != NULL)
++ m_router->stop();
++}
++
++bool
++DhtManager::is_active() const {
++ return m_router != NULL && m_router->is_active();
++}
++
++void
++DhtManager::add_node(const sockaddr* addr, int port, bool external) {
++ if (m_router == NULL)
++ return;
++
++ rak::socket_address sa = *rak::socket_address::cast_from(addr);
++
++ if (sa.family() != rak::socket_address::af_inet)
++ return;
++
++
++ sa.set_port(port);
++ m_router->contact(&sa, external);
++}
++
++Object*
++DhtManager::store_cache(Object* container) const {
++ if (m_router == NULL)
++ throw internal_error("DhtManager::store_cache called but DHT not
initialized.");
++
++ return m_router->store_cache(container);
++}
++
++DhtManager::statistics_type
++DhtManager::get_statistics() const {
++ return m_router->get_statistics();
++}
++
++void
++DhtManager::reset_statistics() {
++ m_router->reset_statistics();
++}
++
++}
+Index: libtorrent/src/torrent/dht_manager.h
+===================================================================
+--- libtorrent/src/torrent/dht_manager.h (revision 0)
++++ libtorrent/src/torrent/dht_manager.h (revision 0)
+@@ -0,0 +1,125 @@
++// libTorrent - BitTorrent library
++// Copyright (C) 2005-2007, Jari Sundell
++//
++// This program is free software; you can redistribute it and/or modify
++// it under the terms of the GNU General Public License as published by
++// the Free Software Foundation; either version 2 of the License, or
++// (at your option) any later version.
++//
++// This program is distributed in the hope that it will be useful,
++// but WITHOUT ANY WARRANTY; without even the implied warranty of
++// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++// GNU General Public License for more details.
++//
++// You should have received a copy of the GNU General Public License
++// along with this program; if not, write to the Free Software
++// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++//
++// In addition, as a special exception, the copyright holders give
++// permission to link the code of portions of this program with the
++// OpenSSL library under certain conditions as described in each
++// individual source file, and distribute linked combinations
++// including the two.
++//
++// You must obey the GNU General Public License in all respects for
++// all of the code used other than OpenSSL. If you modify file(s)
++// with this exception, you may extend this exception to your version
++// of the file(s), but you are not obligated to do so. If you do not
++// wish to do so, delete this exception statement from your version.
++// If you delete this exception statement from all source files in the
++// program, then also delete it here.
++//
++// Contact: Jari Sundell <jaris AT ifi.uio.no>
++//
++// Skomakerveien 33
++// 3185 Skoppum, NORWAY
++
++// Add some helpfull words here.
++
++#ifndef LIBTORRENT_DHT_MANAGER_H
++#define LIBTORRENT_DHT_MANAGER_H
++
++#include <torrent/common.h>
++#include <torrent/connection_manager.h>
++
++namespace torrent {
++
++class ThrottleList;
++
++class LIBTORRENT_EXPORT DhtManager {
++public:
++ typedef ConnectionManager::port_type port_type;
++
++ struct statistics_type {
++ // Cycle; 0=inactive, 1=initial bootstrapping, 2 and up=normal operation
++ unsigned int cycle;
++
++ // UDP transfer rates.
++ const Rate& up_rate;
++ const Rate& down_rate;
++
++ // DHT query statistics.
++ unsigned int queries_received;
++ unsigned int queries_sent;
++ unsigned int replies_received;
++
++ // DHT node info.
++ unsigned int num_nodes;
++ unsigned int num_buckets;
++
++ // DHT tracker info.
++ unsigned int num_peers;
++ unsigned int max_peers;
++ unsigned int num_trackers;
++
++ statistics_type(const Rate& up, const Rate& down) : up_rate(up),
down_rate(down) { }
++ };
++
++ DhtManager() : m_router(NULL), m_portSent(0), m_canReceive(true) { };
++ ~DhtManager();
++
++ void initialize(const Object& dhtCache);
++
++ void start(port_type port);
++ void stop();
++
++ // Store DHT cache in the given container and return the container.
++ Object* store_cache(Object* container) const;
++
++ bool is_valid() const { return
m_router; }
++ bool is_active() const;
++
++ port_type port() const { return
m_port; }
++
++ bool can_receive_queries() const { return
m_canReceive; }
++
++ // Call this after sending the port to a client, so the router knows
++ // that it should be getting requests.
++ void port_sent() {
m_portSent++; }
++
++ // Add a node by address, e.g. from a torrent file (external = true), or
from
++ // explicit add_node commands or the BT PORT message (external = false).
++ void add_node(const sockaddr* addr, int port, bool
external);
++
++ statistics_type get_statistics() const;
++ void reset_statistics();
++
++ // To be called if upon examining the statistics, the client decides that
++ // we can't receive outside requests and therefore shouldn't advertise our
++ // UDP port after the BT handshake.
++ void set_can_receive(bool can) {
m_canReceive = can; }
++
++ // Internal libTorrent use only
++ DhtRouter* router() { return
m_router; }
++
++private:
++ DhtRouter* m_router;
++ port_type m_port;
++
++ int m_portSent;
++ bool m_canReceive;
++};
++
++}
++
++#endif
+Index: libtorrent/src/torrent/hash_string.h
+===================================================================
+--- libtorrent/src/torrent/hash_string.h (revision 975)
++++ libtorrent/src/torrent/hash_string.h (working copy)
+@@ -83,6 +83,10 @@
+
+ const value_type* c_str() const { return m_data; }
+
++ std::string str() const { return
std::string(m_data, size_data); }
++
++ void clear(int v = 0) {
std::memset(data(), v, size()); }
++
+ void assign(const value_type* src) {
std::memcpy(data(), src, size()); }
+
+ bool equal_to(const char* hash) const { return
std::memcmp(m_data, hash, size()) == 0; }
+@@ -93,6 +97,8 @@
+ static const HashString* cast_from(const char* src) { return
(const HashString*)src; }
+ static const HashString* cast_from(const std::string& src) { return
(const HashString*)src.c_str(); }
+
++ static HashString* cast_from(char* src) { return
(HashString*)src; }
++
+ private:
+ char m_data[size_data];
+ };
+@@ -103,10 +109,20 @@
+ }
+
+ inline bool
++operator != (const HashString& one, const HashString& two) {
++ return std::memcmp(one.begin(), two.begin(), HashString::size_data) != 0;
++}
++
++inline bool
+ operator < (const HashString& one, const HashString& two) {
+ return std::memcmp(one.begin(), two.begin(), HashString::size_data) < 0;
+ }
+
++inline bool
++operator <= (const HashString& one, const HashString& two) {
++ return std::memcmp(one.begin(), two.begin(), HashString::size_data) <= 0;
+ }
+
++}
++
+ #endif
+Index: libtorrent/src/torrent/Makefile.am
+===================================================================
+--- libtorrent/src/torrent/Makefile.am (revision 975)
++++ libtorrent/src/torrent/Makefile.am (working copy)
+@@ -12,6 +12,8 @@
+ common.h \
+ connection_manager.cc \
+ connection_manager.h \
++ dht_manager.cc \
++ dht_manager.h \
+ download.cc \
+ download.h \
+ error.cc \
+@@ -54,6 +56,7 @@
+ chunk_manager.h \
+ common.h \
+ connection_manager.h \
++ dht_manager.h \
+ download.h \
+ error.h \
+ exceptions.h \
+Index: libtorrent/src/torrent/common.h
+===================================================================
+--- libtorrent/src/torrent/common.h (revision 975)
++++ libtorrent/src/torrent/common.h (working copy)
+@@ -67,6 +67,8 @@
+ class ClientList;
+ class ConnectionList;
+ class ConnectionManager;
++class DhtManager;
++class DhtRouter;
+ class Download;
+ class DownloadMain;
+ class DownloadWrapper;
+Index: libtorrent/src/manager.cc
+===================================================================
+--- libtorrent/src/manager.cc (revision 975)
++++ libtorrent/src/manager.cc (working copy)
+@@ -50,6 +50,7 @@
+
+ #include "torrent/chunk_manager.h"
+ #include "torrent/connection_manager.h"
++#include "torrent/dht_manager.h"
+ #include "torrent/data/file_manager.h"
+ #include "torrent/peer/client_list.h"
+
+@@ -70,6 +71,7 @@
+ m_chunkManager(new ChunkManager),
+ m_clientList(new ClientList),
+ m_connectionManager(new ConnectionManager),
++ m_dhtManager(new DhtManager),
+
+ m_poll(NULL),
+
+@@ -99,6 +101,7 @@
+ delete m_hashQueue;
+
+ delete m_resourceManager;
++ delete m_dhtManager;
+ delete m_connectionManager;
+ delete m_chunkManager;
+
+Index: libtorrent/src/manager.h
+===================================================================
+--- libtorrent/src/manager.h (revision 975)
++++ libtorrent/src/manager.h (working copy)
+@@ -58,6 +58,7 @@
+ class ChunkManager;
+ class ConnectionManager;
+ class ThrottleManager;
++class DhtManager;
+
+ typedef std::list<std::string> EncodingList;
+
+@@ -75,6 +76,7 @@
+ ChunkManager* chunk_manager() { return
m_chunkManager; }
+ ClientList* client_list() { return
m_clientList; }
+ ConnectionManager* connection_manager() { return
m_connectionManager; }
++ DhtManager* dht_manager() { return
m_dhtManager; }
+
+ Poll* poll() { return
m_poll; }
+ void set_poll(Poll* p) { m_poll =
p; }
+@@ -99,6 +101,7 @@
+ ChunkManager* m_chunkManager;
+ ClientList* m_clientList;
+ ConnectionManager* m_connectionManager;
++ DhtManager* m_dhtManager;
+ Poll* m_poll;
+
+ EncodingList m_encodingList;
+Index: libtorrent/src/protocol/protocol_base.h
+===================================================================
+--- libtorrent/src/protocol/protocol_base.h (revision 975)
++++ libtorrent/src/protocol/protocol_base.h (working copy)
+@@ -62,6 +62,7 @@
+ REQUEST,
+ PIECE,
+ CANCEL,
++ PORT,
+
+ EXTENSION_PROTOCOL = 20,
+
+@@ -108,6 +109,7 @@
+ void write_request(const Piece& p);
+ void write_cancel(const Piece& p);
+ void write_piece(const Piece& p);
++ void write_port(uint16_t port);
+ void write_extension(uint8_t id, uint32_t length);
+
+ static const size_type sizeof_keepalive = 4;
+@@ -122,6 +124,8 @@
+ static const size_type sizeof_cancel_body = 12;
+ static const size_type sizeof_piece = 13;
+ static const size_type sizeof_piece_body = 8;
++ static const size_type sizeof_port = 7;
++ static const size_type sizeof_port_body = 2;
+ static const size_type sizeof_extension = 6;
+ static const size_type sizeof_extension_body=1;
+
+@@ -133,12 +137,14 @@
+ bool can_write_request() const { return
m_buffer.reserved_left() >= sizeof_request; }
+ bool can_write_cancel() const { return
m_buffer.reserved_left() >= sizeof_cancel; }
+ bool can_write_piece() const { return
m_buffer.reserved_left() >= sizeof_piece; }
++ bool can_write_port() const { return
m_buffer.reserved_left() >= sizeof_port; }
+ bool can_write_extension() const { return
m_buffer.reserved_left() >= sizeof_extension; }
+
+ bool can_read_have_body() const { return
m_buffer.remaining() >= sizeof_have_body; }
+ bool can_read_request_body() const { return
m_buffer.remaining() >= sizeof_request_body; }
+ bool can_read_cancel_body() const { return
m_buffer.remaining() >= sizeof_request_body; }
+ bool can_read_piece_body() const { return
m_buffer.remaining() >= sizeof_piece_body; }
++ bool can_read_port_body() const { return
m_buffer.remaining() >= sizeof_port_body; }
+ bool can_read_extension_body() const { return
m_buffer.remaining() >= sizeof_extension_body; }
+
+ protected:
+@@ -223,6 +229,13 @@
+ }
+
+ inline void
++ProtocolBase::write_port(uint16_t port) {
++ m_buffer.write_32(3);
++ write_command(PORT);
++ m_buffer.write_16(port);
++}
++
++inline void
+ ProtocolBase::write_extension(uint8_t id, uint32_t length) {
+ m_buffer.write_32(2 + length);
+ write_command(EXTENSION_PROTOCOL);
+Index: libtorrent/src/protocol/peer_connection_base.cc
+===================================================================
+--- libtorrent/src/protocol/peer_connection_base.cc (revision 975)
++++ libtorrent/src/protocol/peer_connection_base.cc (working copy)
+@@ -51,6 +51,7 @@
+ #include "download/download_main.h"
+ #include "net/socket_base.h"
+ #include "torrent/connection_manager.h"
++#include "torrent/dht_manager.h"
+ #include "torrent/peer/peer_info.h"
+
+ #include "extensions.h"
+@@ -118,10 +119,10 @@
+ m_peerChunks.bitfield()->swap(*bitfield);
+
+
m_peerChunks.upload_throttle()->set_list_iterator(m_download->upload_throttle()->end());
+- m_peerChunks.upload_throttle()->slot_activate(rak::make_mem_fun(this,
&PeerConnectionBase::receive_throttle_up_activate));
++
m_peerChunks.upload_throttle()->slot_activate(rak::make_mem_fun(static_cast<SocketBase*>(this),
&SocketBase::receive_throttle_up_activate));
+
+
m_peerChunks.download_throttle()->set_list_iterator(m_download->download_throttle()->end());
+- m_peerChunks.download_throttle()->slot_activate(rak::make_mem_fun(this,
&PeerConnectionBase::receive_throttle_down_activate));
++
m_peerChunks.download_throttle()->slot_activate(rak::make_mem_fun(static_cast<SocketBase*>(this),
&SocketBase::receive_throttle_down_activate));
+
+ download_queue()->set_delegator(m_download->delegator());
+ download_queue()->set_peer_chunks(&m_peerChunks);
+@@ -323,16 +324,6 @@
+ }
+
+ void
+-PeerConnectionBase::receive_throttle_down_activate() {
+- manager->poll()->insert_read(this);
+-}
+-
+-void
+-PeerConnectionBase::receive_throttle_up_activate() {
+- manager->poll()->insert_write(this);
+-}
+-
+-void
+ PeerConnectionBase::event_error() {
+ m_download->connection_list()->erase(this, 0);
+ }
+Index: libtorrent/src/protocol/peer_connection_base.h
+===================================================================
+--- libtorrent/src/protocol/peer_connection_base.h (revision 975)
++++ libtorrent/src/protocol/peer_connection_base.h (working copy)
+@@ -140,9 +140,6 @@
+
+ void load_up_chunk();
+
+- void receive_throttle_down_activate();
+- void receive_throttle_up_activate();
+-
+ void read_request_piece(const Piece& p);
+ void read_cancel_piece(const Piece& p);
+
+Index: libtorrent/src/protocol/peer_connection_leech.cc
+===================================================================
+--- libtorrent/src/protocol/peer_connection_leech.cc (revision 975)
++++ libtorrent/src/protocol/peer_connection_leech.cc (working copy)
+@@ -45,6 +45,8 @@
+ #include "download/chunk_statistics.h"
+ #include "download/download_info.h"
+ #include "download/download_main.h"
++#include "torrent/dht_manager.h"
++#include "torrent/peer/peer_info.h"
+
+ #include "extensions.h"
+ #include "peer_connection_leech.h"
+@@ -275,6 +277,13 @@
+ read_cancel_piece(m_down->read_request());
+ return true;
+
++ case ProtocolBase::PORT:
++ if (!m_down->can_read_port_body())
++ break;
++
++ manager->dht_manager()->add_node(m_peerInfo->socket_address(),
m_down->buffer()->read_16(), false);
++ return true;
++
+ case ProtocolBase::EXTENSION_PROTOCOL:
+ if (!m_down->can_read_extension_body())
+ break;
+Index: libtorrent/src/protocol/peer_connection_seed.cc
+===================================================================
+--- libtorrent/src/protocol/peer_connection_seed.cc (revision 975)
++++ libtorrent/src/protocol/peer_connection_seed.cc (working copy)
+@@ -43,6 +43,8 @@
+ #include "download/chunk_statistics.h"
+ #include "download/download_info.h"
+ #include "download/download_main.h"
++#include "torrent/dht_manager.h"
++#include "torrent/peer/peer_info.h"
+
+ #include "extensions.h"
+ #include "peer_connection_seed.h"
+@@ -175,6 +177,13 @@
+ read_cancel_piece(m_down->read_request());
+ return true;
+
++ case ProtocolBase::PORT:
++ if (!m_down->can_read_port_body())
++ break;
++
++ manager->dht_manager()->add_node(m_peerInfo->socket_address(),
m_down->buffer()->read_16(), false);
++ return true;
++
+ case ProtocolBase::EXTENSION_PROTOCOL:
+ if (!m_down->can_read_extension_body())
+ break;
+Index: libtorrent/src/protocol/handshake.cc
+===================================================================
+--- libtorrent/src/protocol/handshake.cc (revision 975)
++++ libtorrent/src/protocol/handshake.cc (working copy)
+@@ -38,6 +38,7 @@
+
+ #include "download/download_info.h"
+ #include "download/download_main.h"
++#include "torrent/dht_manager.h"
+ #include "net/throttle_list.h"
+ #include "net/throttle_manager.h"
+ #include "torrent/exceptions.h"
+@@ -522,18 +523,19 @@
+
+ // The download is just starting so we're not sending any
+ // bitfield.
+- if (m_download->file_list()->bitfield()->is_all_unset())
+- prepare_keepalive();
+- else
++ if (m_download->file_list()->bitfield()->is_all_unset()) {
++ prepare_post_handshake(true);
++
++ } else {
+ prepare_bitfield();
+
+- m_state = BITFIELD;
++ // Give some extra time for reading/writing the bitfield.
++ priority_queue_erase(&taskScheduler, &m_taskTimeout);
++ priority_queue_insert(&taskScheduler, &m_taskTimeout, (cachedTime +
rak::timer::from_seconds(120)).round_seconds());
++ }
++
+ manager->poll()->insert_write(this);
+
+- // Give some extra time for reading/writing the bitfield.
+- priority_queue_erase(&taskScheduler, &m_taskTimeout);
+- priority_queue_insert(&taskScheduler, &m_taskTimeout, (cachedTime +
rak::timer::from_seconds(120)).round_seconds());
+-
+ return false;
+ }
+
+@@ -731,6 +733,7 @@
+ goto restart;
+
+ case BITFIELD:
++ case POST_HANDSHAKE:
+ read_bitfield();
+ break;
+
+@@ -864,8 +867,12 @@
+ if (!m_writeBuffer.remaining())
+ throw internal_error("event_write called with empty write buffer.");
+
+- if (m_writeBuffer.consume(write_unthrottled(m_writeBuffer.position(),
m_writeBuffer.remaining())))
+- manager->poll()->remove_write(this);
++ if (m_writeBuffer.consume(write_stream_throws(m_writeBuffer.position(),
m_writeBuffer.remaining()))) {
++ if (m_state == POST_HANDSHAKE)
++ write_done();
++ else
++ manager->poll()->remove_write(this);
++ }
+
+ } catch (handshake_succeeded& e) {
+ m_manager->receive_succeeded(this);
+@@ -948,6 +955,8 @@
+ m_writeBuffer.write_range(m_protocol, m_protocol + 19);
+
+ std::memset(m_writeBuffer.end(), 0, 8);
++ if (manager->dht_manager()->is_active())
++ *(m_writeBuffer.end()+7) |= 0x01; // DHT support, enable PORT message
+ m_writeBuffer.move_end(8);
+
+ m_writeBuffer.write_range(m_download->info()->hash().c_str(),
m_download->info()->hash().c_str() + 20);
+@@ -990,20 +999,50 @@
+ m_encryption.info()->encrypt(m_writeBuffer.end() - 5, 5);
+
+ m_writePos = 0;
++
++ m_state = BITFIELD;
+ }
+
+ void
+-Handshake::prepare_keepalive() {
+- m_writeBuffer.write_32(0);
++Handshake::prepare_post_handshake(bool must_write) {
++ m_state = POST_HANDSHAKE;
+
+- if (m_encryption.info()->is_encrypted())
+- m_encryption.info()->encrypt(m_writeBuffer.end() - 4, 4);
++ // Send PORT message for DHT if enabled and peer supports it.
++ if (m_peerInfo->supports_dht() && manager->dht_manager()->is_active() &&
manager->dht_manager()->can_receive_queries()) {
++ m_writeBuffer.write_32(3);
++ m_writeBuffer.write_8(protocol_port);
++ m_writeBuffer.write_16(manager->dht_manager()->port());
++ manager->dht_manager()->port_sent();
++ if (m_encryption.info()->is_encrypted())
++ m_encryption.info()->encrypt(m_writeBuffer.end() - 7, 7);
+
+- // Skip writting the bitfield.
+- m_writePos = m_download->file_list()->bitfield()->size_bytes();
++ must_write = false;
++ }
++
++ // Send a keep-alive if we still must send something.
++ if (must_write) {
++ m_writeBuffer.write_32(0);
++
++ if (m_encryption.info()->is_encrypted())
++ m_encryption.info()->encrypt(m_writeBuffer.end() - 4, 4);
++ }
++
++ if (!m_writeBuffer.remaining())
++ write_done();
+ }
+
+ void
++Handshake::write_done() {
++ m_writeDone = true;
++ manager->poll()->remove_write(this);
++
++ // Ok to just check m_readDone as the call in event_read() won't
++ // set it before the call.
++ if (m_readDone)
++ throw handshake_succeeded();
++}
++
++void
+ Handshake::write_extension_handshake() {
+ if (m_extensions->is_default())
+ m_extensions = new ProtocolExtension;
+@@ -1059,15 +1098,8 @@
+ }
+ }
+
+- if (m_writePos == bitfield->size_bytes()) {
+- m_writeDone = true;
+- manager->poll()->remove_write(this);
+-
+- // Ok to just check m_readDone as the call in event_read() won't
+- // set it before the call.
+- if (m_readDone)
+- throw handshake_succeeded();
+- }
++ if (m_writePos == bitfield->size_bytes())
++ prepare_post_handshake(false);
+ }
+
+ void
+Index: libtorrent/src/protocol/handshake.h
+===================================================================
+--- libtorrent/src/protocol/handshake.h (revision 975)
++++ libtorrent/src/protocol/handshake.h (working copy)
+@@ -74,6 +74,7 @@
+ INACTIVE,
+ CONNECTING,
+ BITFIELD,
++ POST_HANDSHAKE,
+
+ PROXY_CONNECT,
+ PROXY_DONE,
+@@ -130,6 +131,7 @@
+ void operator = (const Handshake&);
+
+ void read_done();
++ void write_done();
+
+ bool fill_read_buffer(int size);
+
+@@ -151,7 +153,7 @@
+ void prepare_handshake();
+ void prepare_peer_info();
+ void prepare_bitfield();
+- void prepare_keepalive();
++ void prepare_post_handshake(bool must_write);
+
+ void write_extension_handshake();
+ void write_bitfield();
+Index: libtorrent/src/download/download_constructor.cc
+===================================================================
+--- libtorrent/src/download/download_constructor.cc (revision 975)
++++ libtorrent/src/download/download_constructor.cc (working copy)
+@@ -42,6 +42,7 @@
+ #include <rak/string_manip.h>
+
+ #include "download/download_wrapper.h"
++#include "torrent/dht_manager.h"
+ #include "torrent/exceptions.h"
+ #include "torrent/object.h"
+ #include "torrent/data/file.h"
+@@ -50,6 +51,8 @@
+
+ #include "download_constructor.h"
+
++#include "manager.h"
++
+ namespace torrent {
+
+ struct download_constructor_is_single_path {
+@@ -167,9 +170,16 @@
+ else if (b.has_key("announce"))
+ add_tracker_single(b.get_key("announce"), 0);
+
+- else
++ else if (!manager->dht_manager()->is_valid() ||
m_download->info()->is_private())
+ throw bencode_error("Could not find any trackers");
+
++ if (manager->dht_manager()->is_valid() &&
!m_download->info()->is_private())
++ tracker->insert(tracker->group_size(), "dht://");
++
++ if (manager->dht_manager()->is_valid() && b.has_key_list("nodes"))
++ std::for_each(b.get_key_list("nodes").begin(),
b.get_key_list("nodes").end(),
++ rak::make_mem_fun(this,
&DownloadConstructor::add_dht_node));
++
+ tracker->randomize();
+ }
+
+@@ -191,6 +201,35 @@
+ m_download->main()->tracker_manager()->insert(group,
rak::trim_classic(b.as_string()));
+ }
+
++struct call_add_node_t {
++ call_add_node_t(int port) : m_port(port) { }
++
++ void operator() (const sockaddr* sa, int err) {
++ if (sa != NULL)
++ manager->dht_manager()->add_node(sa, m_port, true);
++ }
++
++ int m_port;
++};
++
++void
++DownloadConstructor::add_dht_node(const Object& b) {
++ if (!b.is_list() || b.as_list().size() < 2)
++ return;
++
++ Object::list_type::const_iterator el = b.as_list().begin();
++
++ if (!el->is_string())
++ return;
++
++ const std::string& host = el->as_string();
++
++ if (!(++el)->is_value())
++ return;
++
++ manager->connection_manager()->resolver()(host.c_str(),
(int)rak::socket_address::pf_inet, SOCK_DGRAM,
call_add_node_t(el->as_value()));
++}
++
+ bool
+ DownloadConstructor::is_valid_path_element(const Object& b) {
+ return
+Index: libtorrent/src/download/download_constructor.h
+===================================================================
+--- libtorrent/src/download/download_constructor.h (revision 975)
++++ libtorrent/src/download/download_constructor.h (working copy)
+@@ -67,6 +67,7 @@
+
+ void add_tracker_group(const Object& b);
+ void add_tracker_single(const Object& b, int group);
++ void add_dht_node(const Object& b);
+
+ static bool is_valid_path_element(const Object& b);
+ static bool is_invalid_path_element(const Object& b) { return
!is_valid_path_element(b); }
+Index: libtorrent/src/Makefile.am
+===================================================================
+--- libtorrent/src/Makefile.am (revision 975)
++++ libtorrent/src/Makefile.am (working copy)
+@@ -1,6 +1,7 @@
+ SUBDIRS = \
+ torrent \
+ data \
++ dht \
+ download \
+ net \
+ protocol \
+@@ -15,6 +16,7 @@
+ $(top_srcdir)/src/torrent/data/libsub_torrentdata.la \
+ $(top_srcdir)/src/torrent/peer/libsub_torrentpeer.la \
+ $(top_srcdir)/src/data/libsub_data.la \
++ $(top_srcdir)/src/dht/libsub_dht.la \
+ $(top_srcdir)/src/download/libsub_download.la \
+ $(top_srcdir)/src/net/libsub_net.la \
+ $(top_srcdir)/src/protocol/libsub_protocol.la \
+Index: libtorrent/configure.ac
+===================================================================
+--- libtorrent/configure.ac (revision 975)
++++ libtorrent/configure.ac (working copy)
+@@ -2,6 +2,7 @@
+
+ dnl Find a better way to do this
+ AC_DEFINE(PEER_NAME, "-lt0B80-", Identifier that is part of the default
peer id)
++AC_DEFINE(PEER_VERSION, "lt\x0B\x80", 4 byte client and version identifier
for DHT)
+
+ LIBTORRENT_CURRENT=10
+ LIBTORRENT_REVISION=8
+@@ -32,6 +33,7 @@
+ TORRENT_ENABLE_DEBUG
+ TORRENT_ENABLE_EXTRA_DEBUG
+ TORRENT_ENABLE_WERROR
++TORRENT_ENABLE_TR1
+
+ TORRENT_DISABLE_IPV6
+
+@@ -104,6 +106,7 @@
+ src/torrent/peer/Makefile
+ src/torrent/data/Makefile
+ src/data/Makefile
++ src/dht/Makefile
+ src/download/Makefile
+ src/net/Makefile
+ src/protocol/Makefile
diff --git a/ftp/aria2/DETAILS b/ftp/aria2/DETAILS
index 648b436..9e96bc7 100755
--- a/ftp/aria2/DETAILS
+++ b/ftp/aria2/DETAILS
@@ -1,6 +1,6 @@
SPELL=aria2
- VERSION=0.11.3
-
SOURCE_HASH=sha512:80b78b06b38e961880c3274f16116acb1ac0c4e0f497b47332a1e48e2413747a5520f95817cb75faa40df78f24151157160f7d7fbc9a17780232416d0040d47d
+ VERSION=0.11.4
+
SOURCE_HASH=sha512:cb2e2db7af1d2d25bfb0f6cafaa0f425a26b5fa46da97f217a475288a07c6e325050e4dd664f6b6f6104c4d60c93569f04a3d22810dccdb31afab8a647e9d7a9
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_URL[0]=${SOURCEFORGE_URL}/$SPELL/$SOURCE
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
diff --git a/ftp/aria2/HISTORY b/ftp/aria2/HISTORY
index 1826188..8a290ca 100644
--- a/ftp/aria2/HISTORY
+++ b/ftp/aria2/HISTORY
@@ -1,3 +1,6 @@
+2007-10-28 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
+ * DETAILS: updated spell to 0.11.4
+
2007-09-09 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.11.3

diff --git a/ftp/bittorrent/DETAILS b/ftp/bittorrent/DETAILS
index 30e4fdb..f8a5a1d 100755
--- a/ftp/bittorrent/DETAILS
+++ b/ftp/bittorrent/DETAILS
@@ -1,9 +1,9 @@
SPELL=bittorrent
- VERSION=5.0.7
+ VERSION=5.0.9
SOURCE=BitTorrent-${VERSION}.tar.gz
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/BitTorrent-${VERSION}
SOURCE_URL[0]=http://download.bittorrent.com/dl/$SOURCE
-
SOURCE_HASH=sha512:17ddf01711ddb87d6cfbe19da7bec320be25d4315cc6194a3e76afe97a54b65f01c9eb97eac8aa0efad9c2f0a6426788b76f1669b54e343c62931d4ba2ca4823
+
SOURCE_HASH=sha512:32ec457759d179478e9548c5b397d6df2d2f890142eac0e927f0cad287f658bd2c60a4a6357cb4187fbc13455fdec66578f3f0d26ba7bcc5ba081480df6608a7
WEB_SITE=http://www.bittorrent.com
ENTERED=20030410
LICENSE[0]=http://www.bittorrent.com/license/
diff --git a/ftp/bittorrent/HISTORY b/ftp/bittorrent/HISTORY
index 9830377..5ea1466 100644
--- a/ftp/bittorrent/HISTORY
+++ b/ftp/bittorrent/HISTORY
@@ -1,3 +1,6 @@
+2007-10-06 Mathieu Lonjaret <lejatorn AT sourcemage.org>
+ * DETAILS: updated to 5.0.9
+
2007-03-03 George Sherwood <george AT beernabeer.com>
* DETAILS: updated sepll to 5.0.7

diff --git a/ftp/curl/DETAILS b/ftp/curl/DETAILS
index 8b0c97c..0b1c9d6 100755
--- a/ftp/curl/DETAILS
+++ b/ftp/curl/DETAILS
@@ -1,12 +1,12 @@
SPELL=curl
- VERSION=7.17.0
+ VERSION=7.17.1
SECURITY_PATCH=3
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://curl.haxx.se/download/$SOURCE
SOURCE_URL[1]=ftp://ftp.sunet.se/pub/www/utilities/$SPELL/$SOURCE
SOURCE_URL[2]=ftp://ftp.rge.com/pub/networking/$SPELL/$SOURCE
-
SOURCE_HASH=sha512:969faaa05d583f8b97bd32690f3e062daa140d4284fccd15417e5271373b3edfd394347610f44d7f02d85df0c86e989af99d4c7e7ffd07c1ee9e8e857ed30ee4
+
SOURCE_HASH=sha512:2d056c1b98e2ab657e9c96d8b37374cafcb10e9cb99ac442969cdad81710f0663f8a69bf9ed6440841359817f1b387bbdfa69f769d9db9f94c5a17ccb1993d36
WEB_SITE=http://curl.haxx.se/
ENTERED=20010922
LICENSE[0]=MIT
diff --git a/ftp/curl/HISTORY b/ftp/curl/HISTORY
index 5cb2ea4..809ee9d 100644
--- a/ftp/curl/HISTORY
+++ b/ftp/curl/HISTORY
@@ -1,3 +1,6 @@
+2007-10-29 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 7.17.1
+
2007-09-14 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 7.17.0

diff --git a/ftp/deluge/DEPENDS b/ftp/deluge/DEPENDS
index ce032eb..177f687 100755
--- a/ftp/deluge/DEPENDS
+++ b/ftp/deluge/DEPENDS
@@ -1,4 +1,5 @@
depends pygtk2 &&
+depends dbus-python &&
depends boost &&
sub_depends boost THREAD &&
sub_depends boost FILESYSTEM &&
diff --git a/ftp/deluge/DETAILS b/ftp/deluge/DETAILS
index 95c98e3..92a32d4 100755
--- a/ftp/deluge/DETAILS
+++ b/ftp/deluge/DETAILS
@@ -1,9 +1,9 @@
SPELL=deluge
- VERSION=0.5.1.1
+ VERSION=0.5.6.2
SOURCE=$SPELL-$VERSION.tar.gz
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- SOURCE_URL[0]=http://download.deluge-torrent.org/stable/$SOURCE
-
SOURCE_HASH=sha512:850d9dfba10219d8251b206afb44b96ef0dbc29ac352000054baee12c8ae45dbf37043a27c5a2caa6fb0442a7de70137b9eac664a7e213a4c3874f934921964c
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-torrent-$VERSION
+ SOURCE_URL[0]=http://download.deluge-torrent.org/tarball/$VERSION/$SOURCE
+
SOURCE_HASH=sha512:5988084031d5d040d5f952c5b799d73ea5316e907819d745bec781fa512c228d0d01370b80a2317d22ebd4ed92fab305e1e2a2cb9aef866080e15189db50ed9d
LICENSE[0]=GPL
KEYWORDS="bittorrent client p2p"
WEB_SITE=http://www.deluge-torrent.org
diff --git a/ftp/deluge/HISTORY b/ftp/deluge/HISTORY
index de991cd..3bdc2c6 100644
--- a/ftp/deluge/HISTORY
+++ b/ftp/deluge/HISTORY
@@ -1,3 +1,14 @@
+2007-11-04 Philippe "Puppet_Master" Caseiro <puppetmaster AT sourcemage.org>
+ * DETAILS: Updating version to 0.5.6.2
+ Updating SOURCE_DIRECTORY value with constant '-torrent-'
+
+2007-10-29 Philippe "Puppet_Master" Caseiro <puppetmaster AT sourcemage.org>
+ * DETAILS: Updating version to 0.5.6.1
+
+2007-10-28 Philippe "Puppet_Master" Caseiro <puppetmaster AT sourcemage.org>
+ * DETAILS: Updating version to 0.5.6, changing download url
+ * DEPENDS: Adding dbus-python
+
2007-06-21 Philippe "Puppet_Master" Caseiro <puppetmaster AT sourcemage.org>
* DEPENDS: Adding libtorrent

diff --git a/ftp/fsp/DETAILS b/ftp/fsp/DETAILS
index ae28ce9..3373f32 100755
--- a/ftp/fsp/DETAILS
+++ b/ftp/fsp/DETAILS
@@ -1,13 +1,14 @@
SPELL=fsp
- VERSION=2.8.1b22
+ VERSION=2.8.1b24
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
-
SOURCE_HASH=sha512:1afe99885e8cd4d1bbecaa0bdee896db565985278a123d0ac5433d52d0c252de3a108d22189e6fd6c18bb862d628c41a8bd64893fb13961b84cda8fbdde01b15
+
SOURCE_HASH=sha512:f84869e3d6abad0efaa69d098a4d23ce393551bbf3fca846c96ce46c697facfa90743e3ad6bde7ba765902d1165ed423b5ba582550d59bd4fe7fe3a1e8b39da1
WEB_SITE=http://fsp.sourceforge.net/
ENTERED=20050110
LICENSE[0]=MIT
KEYWORDS="ftp"
+ DOCS="INFO setup.sh setup.csh"
SHORT="File Service Protocol Suite"
cat << EOF
FSP stands for File Service Protocol. It is a very lightweight UDP based
protocol for transferring files. FSP has many benefits over FTP, mainly for
running anonymous archives. FSP protocol is valuable in all kinds of
environments because it is one of the only TCP/IP protocols that is not
aggressive about bandwidth, while still being sufficiently fault tolerant.
diff --git a/ftp/fsp/HISTORY b/ftp/fsp/HISTORY
index ff62cca..14d4bcf 100644
--- a/ftp/fsp/HISTORY
+++ b/ftp/fsp/HISTORY
@@ -1,3 +1,7 @@
+2007-10-06 Mathieu Lonjaret <lejatorn AT sourcemag.org>
+ * DETAILS: added some doc files, update to 2.8.1b24
+ * INSTALL: created this file to add conf file
+
2006-10-03 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: [automated] Removed UPDATED.

diff --git a/ftp/fsp/INSTALL b/ftp/fsp/INSTALL
new file mode 100755
index 0000000..cbd45af
--- /dev/null
+++ b/ftp/fsp/INSTALL
@@ -0,0 +1,4 @@
+default_install &&
+install_config_file ${SOURCE_DIRECTORY}/fspd.conf \
+${INSTALL_ROOT}/etc/fspd.conf
+
diff --git a/ftp/fspclient/DETAILS b/ftp/fspclient/DETAILS
index 0631f8e..86addeb 100755
--- a/ftp/fspclient/DETAILS
+++ b/ftp/fspclient/DETAILS
@@ -1,12 +1,12 @@
SPELL=fspclient
- VERSION=0.90.0
+ VERSION=0.91.0
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
WEB_SITE=http://fspclient.sourceforge.net/
ENTERED=20050105
LICENSE[0]=MIT
-
SOURCE_HASH=sha512:df12dbca608fd4e8a649bd674b285dac89953f4175c1a9892ec2a291fd34c4692ab7dfc872782cf9f76bd9077ba07371811d8e0c85ba7d394f7e2a81b21a71ce
+
SOURCE_HASH=sha512:871778b34cacf73421180f78f41e5007acf48f1e9ef1b1f078955edc53fbdb965b27e4d1d187f846844a451f58f05e9ba0a54743d242420ae7329a9ff614e213
KEYWORDS="ftp"
SHORT="FTP-like interface for File Service Protocol"
cat << EOF
diff --git a/ftp/fspclient/HISTORY b/ftp/fspclient/HISTORY
index ab91f48..1463f7c 100644
--- a/ftp/fspclient/HISTORY
+++ b/ftp/fspclient/HISTORY
@@ -1,3 +1,6 @@
+2007-10-06 Mathieu Lonjaret <lejatorn AT sourcemage.org>
+ * DETAILS: update to 0.91.0
+
2006-10-03 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: [automated] Removed UPDATED.

diff --git a/ftp/lftp/DETAILS b/ftp/lftp/DETAILS
index 9d74502..dbc6eec 100755
--- a/ftp/lftp/DETAILS
+++ b/ftp/lftp/DETAILS
@@ -1,5 +1,5 @@
SPELL=lftp
- VERSION=3.5.14
+ VERSION=3.5.15
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE2=$SOURCE.asc
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/ftp/lftp/HISTORY b/ftp/lftp/HISTORY
index 1942873..079db27 100644
--- a/ftp/lftp/HISTORY
+++ b/ftp/lftp/HISTORY
@@ -1,3 +1,6 @@
+2007-10-20 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 3.5.15
+
2007-09-01 George Sherwood <george AT beernabeer.com>
* DETAILS: Updated to version 3.5.14

diff --git a/ftp/linuxdcpp/BUILD b/ftp/linuxdcpp/BUILD
new file mode 100755
index 0000000..1ce665c
--- /dev/null
+++ b/ftp/linuxdcpp/BUILD
@@ -0,0 +1 @@
+scons release=yes PREFIX=/usr
\ No newline at end of file
diff --git a/ftp/linuxdcpp/DEPENDS b/ftp/linuxdcpp/DEPENDS
new file mode 100755
index 0000000..e41a403
--- /dev/null
+++ b/ftp/linuxdcpp/DEPENDS
@@ -0,0 +1,6 @@
+depends scons &&
+depends g++ &&
+depends pkgconfig &&
+depends gtk+2 &&
+depends glade2 &&
+depends bzip2
diff --git a/ftp/linuxdcpp/DETAILS b/ftp/linuxdcpp/DETAILS
new file mode 100755
index 0000000..b356289
--- /dev/null
+++ b/ftp/linuxdcpp/DETAILS
@@ -0,0 +1,13 @@
+ SPELL=linuxdcpp
+ VERSION=1.0.0
+ SOURCE="${SPELL}-${VERSION}.tar.bz2"
+ SOURCE_URL[0]=http://download.berlios.de/${SPELL}/${SOURCE}
+
SOURCE_HASH=sha512:f9b63cebb25e38a5eabc8c93aa5faf8c23e99246e9d83b1597b4f96c0e04205919abb32ec3e72692b9b8f7b4914ff491146a41b01f6e4a50cc67e9fda4557675
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
+ WEB_SITE="http://linuxdcpp.berlios.de/";
+ LICENSE[0]=GPL
+ ENTERED=20071024
+ SHORT="A port of the DC++ direct connect client to Unix/Linux
using GTK+"
+cat << EOF
+A port of the DC++ direct connect client to Unix/Linux using GTK+
+EOF
diff --git a/ftp/linuxdcpp/HISTORY b/ftp/linuxdcpp/HISTORY
new file mode 100644
index 0000000..2fcb732
--- /dev/null
+++ b/ftp/linuxdcpp/HISTORY
@@ -0,0 +1,2 @@
+2007-10-24 Lalo Martins <lalo AT sourcemage.org>
+ * DETAILS, DEPENDS, BUILD, INSTALL, HISTORY: created spell
diff --git a/ftp/linuxdcpp/INSTALL b/ftp/linuxdcpp/INSTALL
new file mode 100755
index 0000000..b060c7c
--- /dev/null
+++ b/ftp/linuxdcpp/INSTALL
@@ -0,0 +1 @@
+scons release=yes PREFIX=/usr install
\ No newline at end of file
diff --git a/ftp/proftpd/DETAILS b/ftp/proftpd/DETAILS
index 77254e2..d53657f 100755
--- a/ftp/proftpd/DETAILS
+++ b/ftp/proftpd/DETAILS
@@ -1,17 +1,11 @@
SPELL=proftpd
-#if [ "$PROFTPD_DEVEL" == "y" ]; then
-# VERSION=1.3.0
-#
SOURCE_HASH=sha512:3002a8004689655cfbcb069387c06a2e528c8988d9469e8c0ad0db6bfbbf39db6f6f1b8248f078f627a392c31d41089aa833cd6d1c454af5340d96d44acf6b76
-#else
- VERSION=1.3.0a
-
SOURCE_HASH=sha512:a23697a6ea304c09b1f14382bc82e2838394b646695d02f4510420e55612cf1a57f38a19938dd768073099c7c1aad66123913b426213db6b3d088613986602cc
-#fi
+ VERSION=1.3.1
+
SOURCE_HASH=sha512:014d99833a056f64632d952b2feb2aa2f6c5060ea44edf7bad92affc4023f38f5b10cea81845f22b37785b4155a608777d9ead836de8e64f1e14b017e38acc16
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELL}-${VERSION}
SOURCE_URL[0]=ftp://ftp.proftpd.org/distrib/source/$SOURCE
WEB_SITE=http://www.proftpd.org/
ENTERED=20011112
- UPDATED=20040501
LICENSE[0]=GPL
KEYWORDS="ftp"
SHORT="proftpd is a ftp server"
diff --git a/ftp/proftpd/HISTORY b/ftp/proftpd/HISTORY
index 90ab16c..f746f96 100644
--- a/ftp/proftpd/HISTORY
+++ b/ftp/proftpd/HISTORY
@@ -1,3 +1,9 @@
+2007-10-13 George Sherwood <george AT beernabeer.com>
+ * DETAILS: Updated to version 1.3.1. Removed old multi-version code
+
+2007-10-06 Mathieu Lonjaret <lejatorn AT sourcemage.org>
+ * DETAILS: update to 1.3.1rc3
+
2006-12-02 Mathieu Lonjaret <lejatorn AT sourcemage.org>
* DETAILS, CONFIGURE, BUILD, rm PREPARE: update to 1.3.0a

diff --git a/ftp/rtorrent/CONFIGURE b/ftp/rtorrent/CONFIGURE
new file mode 100755
index 0000000..9f71ec9
--- /dev/null
+++ b/ftp/rtorrent/CONFIGURE
@@ -0,0 +1,3 @@
+# dht patch disabled for the moment
+#config_query DHT_PATCH "Patch to support dht?" "n"
+
diff --git a/ftp/rtorrent/DEPENDS b/ftp/rtorrent/DEPENDS
index d4eb638..4cdd7c8 100755
--- a/ftp/rtorrent/DEPENDS
+++ b/ftp/rtorrent/DEPENDS
@@ -1,2 +1,13 @@
-depends libtorrent &&
-depends curl
+# disabling dht patch for the moment
+#if [[ ${DHT_PATCH} != n ]]; then
+# depends -sub DHT libtorrent &&
+# depends automake-1.9
+#else
+depends libtorrent &&
+#fi &&
+depends curl &&
+optional_depends xmlrpc-c \
+ "--with-xmlrpc-c" \
+ "--without-xmlrpc-c" \
+ "for XMLRPC interface"
+
diff --git a/ftp/rtorrent/DETAILS b/ftp/rtorrent/DETAILS
index ca8c4ab..9fea30e 100755
--- a/ftp/rtorrent/DETAILS
+++ b/ftp/rtorrent/DETAILS
@@ -1,5 +1,5 @@
SPELL=rtorrent
- VERSION=0.7.8
+ VERSION=0.7.9
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://libtorrent.rakshasa.no/downloads/$SOURCE
@@ -8,7 +8,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
UPDATED=20050214
LICENSE[0]=GPL
BUILD_API=2
-
SOURCE_HASH=sha512:7c0a7238c1051735b898131c99e385f80de40b71f769b749ef9222561d5c69ad8588fb5c9fb7f487617587b65e5e630ae72ff44d539bca46a026d6aac1731bd9
+
SOURCE_HASH=sha512:d6bcd0a88d16d55f83d7c29b9a9b7b9927a7fbf61dbce2f1adb1733f82562ed3fa29f65b368b5f3c6f33d68c6b696522c87b43455f1e171ace1736074f12ade2
KEYWORDS="bittorrent ftp"
SHORT='Rtorrent is a bittorrent client using libTorrent.'
cat << EOF
diff --git a/ftp/rtorrent/HISTORY b/ftp/rtorrent/HISTORY
index 5004d00..af2920c 100644
--- a/ftp/rtorrent/HISTORY
+++ b/ftp/rtorrent/HISTORY
@@ -1,3 +1,17 @@
+2007-10-26 Mathieu Lonjaret <lejatorn AT sourcemage.org>
+ * DETAILS: 0.7.9
+ * PRE_BUILD, CONFIGURE, DEPENDS: disabled dht until patch available
+
+2007-10-20 Mathieu Lonjaret <lejatorn AT sourcemage.org>
+ * DEPENDS: added optional xmlrpc-c
+
+2007-10-03 Mathieu Lonjaret <lejatorn AT sourcemage.org>
+ * CONFIGURE: dht patch defaults to no
+ * DEPENDS: automake-1.9 if dht patch
+
+2007-10-03 Mathieu Lonjaret <lejatorn AT sourcemage.org>
+ * DEPENDS, CONFIGURE, PRE_BUILD, dht.diff: added support for dht
+
2007-09-10 Mathieu Lonjaret <lejatorn AT sourcemage.org>
* DETAILS: version update to 0.7.8

diff --git a/ftp/rtorrent/PRE_BUILD b/ftp/rtorrent/PRE_BUILD
new file mode 100755
index 0000000..066584e
--- /dev/null
+++ b/ftp/rtorrent/PRE_BUILD
@@ -0,0 +1,8 @@
+default_pre_build
+#dht patch, removed until new version
+#cd ${SOURCE_DIRECTORY} &&
+#if [[ ${DHT_PATCH} != n ]]; then
+# cp ${SPELL_DIRECTORY}/dht.diff ${SOURCE_DIRECTORY}/dht.diff &&
+# patch -p1 < dht.diff
+#fi
+
diff --git a/ftp/rtorrent/dht.diff b/ftp/rtorrent/dht.diff
new file mode 100644
index 0000000..e74c528
--- /dev/null
+++ b/ftp/rtorrent/dht.diff
@@ -0,0 +1,707 @@
+Index: rtorrent/doc/rtorrent.rc
+===================================================================
+--- rtorrent/doc/rtorrent.rc (revision 975)
++++ rtorrent/doc/rtorrent.rc (working copy)
+@@ -74,6 +74,17 @@
+ #
+ # encryption = allow_incoming,enable_retry,prefer_plaintext
+
++# Enable DHT support for trackerless torrents or when all trackers are down.
++# May be set to "disable" (completely disable DHT), "off" (do not start
DHT),
++# "auto" (start and stop DHT as needed), or "on" (start DHT immediately).
++# The default is "off". For DHT to work, a session directory must be
defined.
++#
++# dht = auto
++
++# UDP port to use for DHT.
++#
++# dht_port = 6881
++
+ # Enable peer exchange (for torrents not marked private)
+ #
+ # peer_exchange = yes
+Index: rtorrent/doc/rtorrent.1.xml
+===================================================================
+--- rtorrent/doc/rtorrent.1.xml (revision 975)
++++ rtorrent/doc/rtorrent.1.xml (working copy)
+@@ -1,4 +1,5 @@
+-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN">
++<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN"
++ "http://oasis-open.org/docbook/xml/4.1/docbookx.dtd";>
+
+ <refentry id="rtorrent">
+
+@@ -705,7 +706,39 @@
+ </para></listitem>
+ </varlistentry>
+
++ <varlistentry>
++ <term>dht = <replaceable>disabled|off|auto|on</replaceable></term>
++ <listitem><para>
++Support for querying the distributed hash table (DHT) to find peers for
trackerless
++torrents or when all trackers are down. Set to <emphasis>disable</emphasis>
to completely
++disable DHT, <emphasis>off</emphasis> (default) to enable DHT but to not
start the
++DHT server, <emphasis>auto</emphasis> to automatically start and stop the
DHT server
++as needed or <emphasis>on</emphasis> for permanently keeping the DHT server
running.
++When set to automatic, the DHT server will start up when the first
non-private torrent
++is started, and will stop 15-30 minutes after the last non-private torrent
is
++stopped (or when rTorrent quits). For DHT to work, a session directory must
be set (for
++saving the DHT cache).
++ </para></listitem>
++ </varlistentry>
++
+ <varlistentry>
++ <term>dht_port = <replaceable>number</replaceable></term>
++ <listitem><para>
++Set the UDP listen port for DHT. Defaults to 6881.
++ </para></listitem>
++ </varlistentry>
++
++ <varlistentry>
++ <term>dht_add_node = <replaceable>host[:port]</replaceable></term>
++ <listitem><para>
++Not intended for use in the configuration file but as one-time option in the
++client or on the command line to bootstrap an empty DHT node table.
Contacts
++the given node and attempts to bootstrap from it if it replies.
++The port is optional, with port 6881 being used by default.
++ </para></listitem>
++ </varlistentry>
++
++ <varlistentry>
+ <term>http_capath = <replaceable>path</replaceable></term>
+ <term>http_cacert = <replaceable>filename</replaceable></term>
+ <listitem><para>
+Index: rtorrent/src/core/download_list.cc
+===================================================================
+--- rtorrent/src/core/download_list.cc (revision 975)
++++ rtorrent/src/core/download_list.cc (working copy)
+@@ -55,6 +55,7 @@
+ #include "globals.h"
+ #include "manager.h"
+
++#include "dht_manager.h"
+ #include "download.h"
+ #include "download_list.h"
+ #include "download_store.h"
+@@ -94,6 +95,8 @@
+ void
+ DownloadList::session_save() {
+ std::for_each(begin(), end(),
std::bind1st(std::mem_fun(&DownloadStore::save),
control->core()->download_store()));
++
++ control->dht_manager()->save_dht_cache();
+ }
+
+ DownloadList::iterator
+@@ -388,6 +391,9 @@
+ torrent::resume_save_progress(*download->download(),
download->download()->bencode()->get_key("libtorrent_resume"), true);
+ }
+
++ // If the DHT server is set to auto, start it now.
++ control->dht_manager()->auto_start();
++
+ // Update the priority to ensure it has the correct
+ // seeding/unfinished modifiers.
+ download->set_priority(download->priority());
+Index: rtorrent/src/core/dht_manager.cc
+===================================================================
+--- rtorrent/src/core/dht_manager.cc (revision 0)
++++ rtorrent/src/core/dht_manager.cc (revision 0)
+@@ -0,0 +1,302 @@
++// rTorrent - BitTorrent client
++// Copyright (C) 2005-2007, Jari Sundell
++//
++// This program is free software; you can redistribute it and/or modify
++// it under the terms of the GNU General Public License as published by
++// the Free Software Foundation; either version 2 of the License, or
++// (at your option) any later version.
++//
++// This program is distributed in the hope that it will be useful,
++// but WITHOUT ANY WARRANTY; without even the implied warranty of
++// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++// GNU General Public License for more details.
++//
++// You should have received a copy of the GNU General Public License
++// along with this program; if not, write to the Free Software
++// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++//
++// In addition, as a special exception, the copyright holders give
++// permission to link the code of portions of this program with the
++// OpenSSL library under certain conditions as described in each
++// individual source file, and distribute linked combinations
++// including the two.
++//
++// You must obey the GNU General Public License in all respects for
++// all of the code used other than OpenSSL. If you modify file(s)
++// with this exception, you may extend this exception to your version
++// of the file(s), but you are not obligated to do so. If you do not
++// wish to do so, delete this exception statement from your version.
++// If you delete this exception statement from all source files in the
++// program, then also delete it here.
++//
++// Contact: Jari Sundell <jaris AT ifi.uio.no>
++//
++// Skomakerveien 33
++// 3185 Skoppum, NORWAY
++
++#include "config.h"
++
++#include <fstream>
++#include <sstream>
++#include <torrent/object.h>
++#include <torrent/dht_manager.h>
++#include <torrent/object_stream.h>
++#include <torrent/rate.h>
++
++#include "rpc/parse_commands.h"
++
++#include "globals.h"
++
++#include "control.h"
++#include "dht_manager.h"
++#include "download.h"
++#include "download_store.h"
++#include "manager.h"
++
++namespace core {
++
++const char* DhtManager::dht_settings[dht_settings_num] = { "disable",
"off", "auto", "on" };
++
++DhtManager::~DhtManager() {
++ priority_queue_erase(&taskScheduler, &m_updateTimeout);
++ priority_queue_erase(&taskScheduler, &m_stopTimeout);
++}
++
++void
++DhtManager::load_dht_cache() {
++ if (m_start == dht_disable ||
!control->core()->download_store()->is_enabled())
++ return;
++
++ torrent::Object cache(torrent::Object::TYPE_MAP);
++ std::fstream cache_file((control->core()->download_store()->path() +
"rtorrent.dht_cache").c_str(), std::ios::in | std::ios::binary);
++
++ if (cache_file.is_open()) {
++ cache_file >> cache;
++
++ if (cache_file.fail())
++ throw torrent::input_error("Invalid DHT cache.");
++ }
++
++ try {
++ torrent::dht_manager()->initialize(cache);
++
++ if (m_start == dht_on)
++ start_dht();
++
++ } catch (torrent::local_error& e) {
++ control->core()->push_log((std::string("DHT error: ") +
e.what()).c_str());
++ }
++}
++
++void
++DhtManager::start_dht() {
++ priority_queue_erase(&taskScheduler, &m_stopTimeout);
++
++ if (torrent::dht_manager()->is_active() ||
!torrent::dht_manager()->is_valid())
++ return;
++
++ int port = rpc::call_command_value("get_dht_port");
++ if (port <= 0)
++ return;
++
++ char msg[128];
++ snprintf(msg, sizeof(msg), "Starting DHT server on port %d.", port);
++ control->core()->push_log(msg);
++
++ try {
++ torrent::dht_manager()->start(port);
++
++ m_updateTimeout.set_slot(rak::mem_fn(this, &DhtManager::update));
++ priority_queue_insert(&taskScheduler, &m_updateTimeout, (cachedTime +
rak::timer::from_seconds(60)).round_seconds());
++
++ m_dhtPrevCycle = 0;
++ m_dhtPrevQueriesSent = 0;
++ m_dhtPrevRepliesReceived = 0;
++ m_dhtPrevQueriesReceived = 0;
++ m_dhtPrevBytesUp = 0;
++ m_dhtPrevBytesDown = 0;
++
++ } catch (torrent::local_error& e) {
++ control->core()->push_log((std::string("DHT error: ") +
e.what()).c_str());
++ m_start = dht_off;
++ }
++}
++
++void
++DhtManager::stop_dht() {
++ priority_queue_erase(&taskScheduler, &m_updateTimeout);
++ priority_queue_erase(&taskScheduler, &m_stopTimeout);
++ if (m_stopTimeout.is_queued())
++ priority_queue_erase(&taskScheduler, &m_stopTimeout);
++
++ if (torrent::dht_manager()->is_active()) {
++ log_statistics(true);
++ control->core()->push_log("Stopping DHT server.");
++ torrent::dht_manager()->stop();
++ }
++}
++
++void
++DhtManager::save_dht_cache() {
++ if (!control->core()->download_store()->is_enabled() ||
!torrent::dht_manager()->is_active())
++ return;
++
++ std::string filename = control->core()->download_store()->path() +
"rtorrent.dht_cache";
++ std::string filename_tmp = filename + ".new";
++ std::fstream cache_file(filename_tmp.c_str(), std::ios::out |
std::ios::trunc);
++
++ if (!cache_file.is_open())
++ return;
++
++ torrent::Object cache(torrent::Object::TYPE_MAP);
++ cache_file << *torrent::dht_manager()->store_cache(&cache);
++
++ if (!cache_file.good())
++ return;
++
++ cache_file.close();
++
++ ::rename(filename_tmp.c_str(), filename.c_str());
++}
++
++void
++DhtManager::set_start(const std::string& arg) {
++ int i;
++ for (i = 0; i < dht_settings_num; i++) {
++ if (arg == dht_settings[i]) {
++ m_start = i;
++ break;
++ }
++ }
++
++ if (i == dht_settings_num)
++ throw torrent::input_error("Invalid argument.");
++
++ if (m_start == dht_off)
++ stop_dht();
++ else if (m_start == dht_on)
++ start_dht();
++}
++
++void
++DhtManager::update() {
++ if (!torrent::dht_manager()->is_active())
++ throw torrent::internal_error("DhtManager::update called with DHT
inactive.");
++
++ if (m_start == dht_auto && !m_stopTimeout.is_queued()) {
++ DownloadList::const_iterator itr =
std::find_if(control->core()->download_list()->begin(),
control->core()->download_list()->end(), std::mem_fun(&Download::is_active));
++ if (itr == control->core()->download_list()->end()) {
++ m_stopTimeout.set_slot(rak::mem_fn(this, &DhtManager::stop_dht));
++ priority_queue_insert(&taskScheduler, &m_stopTimeout, (cachedTime +
rak::timer::from_seconds(15 * 60)).round_seconds());
++ }
++ }
++
++ // While bootstrapping (log_statistics returns true), check every minute
if it completed, otherwise update every 15 minutes.
++ if (log_statistics(false))
++ priority_queue_insert(&taskScheduler, &m_updateTimeout, (cachedTime +
rak::timer::from_seconds(60)).round_seconds());
++ else
++ priority_queue_insert(&taskScheduler, &m_updateTimeout, (cachedTime +
rak::timer::from_seconds(15 * 60)).round_seconds());
++}
++
++bool
++DhtManager::log_statistics(bool force) {
++ torrent::DhtManager::statistics_type stats =
torrent::dht_manager()->get_statistics();
++
++ // Check for firewall problems.
++
++ if (stats.cycle > 2 && stats.queries_sent - m_dhtPrevQueriesSent > 100 &&
stats.queries_received == m_dhtPrevQueriesReceived) {
++ // We should have had clients ping us at least but have received
++ // nothing, that means the UDP port is probably unreachable.
++ if (torrent::dht_manager()->can_receive_queries())
++ control->core()->push_log("Warning: DHT port appears to be
unreachable, no queries received.");
++
++ torrent::dht_manager()->set_can_receive(false);
++ }
++
++ if (stats.queries_sent - m_dhtPrevQueriesSent > stats.num_nodes * 2 + 20
&& stats.replies_received == m_dhtPrevRepliesReceived) {
++ // No replies to over 20 queries plus two per node we have. Probably
firewalled.
++ if (!m_warned)
++ control->core()->push_log("Warning: DHT port appears to be
firewalled, no replies received.");
++
++ m_warned = true;
++ return false;
++ }
++
++ m_warned = false;
++
++ if (stats.queries_received > m_dhtPrevQueriesReceived)
++ torrent::dht_manager()->set_can_receive(true);
++
++ // Nothing to log while bootstrapping, but check again every minute.
++ if (stats.cycle <= 1) {
++ m_dhtPrevCycle = stats.cycle;
++ return true;
++ }
++
++ // If bootstrap completed between now and the previous check, notify user.
++ if (m_dhtPrevCycle == 1) {
++ char buffer[128];
++ snprintf(buffer, sizeof(buffer), "DHT bootstrap complete, have %d nodes
in %d buckets.", stats.num_nodes, stats.num_buckets);
++ control->core()->get_log_complete().push_front(buffer);
++ m_dhtPrevCycle = stats.cycle;
++ return false;
++ };
++
++ // Standard DHT statistics on first real cycle, and every 8th cycle
++ // afterwards (i.e. every 2 hours), or when forced.
++ if ((force && stats.cycle != m_dhtPrevCycle) || stats.cycle == 3 ||
stats.cycle > m_dhtPrevCycle + 7) {
++ char buffer[256];
++ snprintf(buffer, sizeof(buffer),
++ "DHT statistics: %d queries in, %d queries out, %d replies
received, %lld bytes read, %lld bytes sent, "
++ "%d known nodes in %d buckets, %d peers (highest: %d) tracked
in %d torrents.",
++ stats.queries_received - m_dhtPrevQueriesReceived,
++ stats.queries_sent - m_dhtPrevQueriesSent,
++ stats.replies_received - m_dhtPrevRepliesReceived,
++ stats.down_rate.total() - m_dhtPrevBytesDown,
++ stats.up_rate.total() - m_dhtPrevBytesUp,
++ stats.num_nodes,
++ stats.num_buckets,
++ stats.num_peers,
++ stats.max_peers,
++ stats.num_trackers);
++
++ control->core()->get_log_complete().push_front(buffer);
++
++ m_dhtPrevCycle = stats.cycle;
++ m_dhtPrevQueriesSent = stats.queries_sent;
++ m_dhtPrevRepliesReceived = stats.replies_received;
++ m_dhtPrevQueriesReceived = stats.queries_received;
++ m_dhtPrevBytesUp = stats.up_rate.total();
++ m_dhtPrevBytesDown = stats.down_rate.total();
++ }
++
++ return false;
++}
++
++torrent::Object
++DhtManager::dht_statistics() {
++ torrent::Object dhtStats(torrent::Object::TYPE_MAP);
++
++ dhtStats.insert_key("dht", dht_settings[m_start]);
++ dhtStats.insert_key("active",
torrent::dht_manager()->is_active());
++
++ if (torrent::dht_manager()->is_active()) {
++ torrent::DhtManager::statistics_type stats =
torrent::dht_manager()->get_statistics();
++
++ dhtStats.insert_key("cycle", stats.cycle);
++ dhtStats.insert_key("queries_received", stats.queries_received);
++ dhtStats.insert_key("queries_sent", stats.queries_sent);
++ dhtStats.insert_key("replies_received", stats.replies_received);
++ dhtStats.insert_key("bytes_read", stats.down_rate.total());
++ dhtStats.insert_key("bytes_written", stats.up_rate.total());
++ dhtStats.insert_key("nodes", stats.num_nodes);
++ dhtStats.insert_key("buckets", stats.num_buckets);
++ dhtStats.insert_key("peers", stats.num_peers);
++ dhtStats.insert_key("peers_max", stats.max_peers);
++ dhtStats.insert_key("torrents", stats.num_trackers);
++ }
++
++ return dhtStats;
++}
++
++}
+Index: rtorrent/src/core/dht_manager.h
+===================================================================
+--- rtorrent/src/core/dht_manager.h (revision 0)
++++ rtorrent/src/core/dht_manager.h (revision 0)
+@@ -0,0 +1,89 @@
++// rTorrent - BitTorrent client
++// Copyright (C) 2005-2007, Jari Sundell
++//
++// This program is free software; you can redistribute it and/or modify
++// it under the terms of the GNU General Public License as published by
++// the Free Software Foundation; either version 2 of the License, or
++// (at your option) any later version.
++//
++// This program is distributed in the hope that it will be useful,
++// but WITHOUT ANY WARRANTY; without even the implied warranty of
++// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++// GNU General Public License for more details.
++//
++// You should have received a copy of the GNU General Public License
++// along with this program; if not, write to the Free Software
++// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++//
++// In addition, as a special exception, the copyright holders give
++// permission to link the code of portions of this program with the
++// OpenSSL library under certain conditions as described in each
++// individual source file, and distribute linked combinations
++// including the two.
++//
++// You must obey the GNU General Public License in all respects for
++// all of the code used other than OpenSSL. If you modify file(s)
++// with this exception, you may extend this exception to your version
++// of the file(s), but you are not obligated to do so. If you do not
++// wish to do so, delete this exception statement from your version.
++// If you delete this exception statement from all source files in the
++// program, then also delete it here.
++//
++// Contact: Jari Sundell <jaris AT ifi.uio.no>
++//
++// Skomakerveien 33
++// 3185 Skoppum, NORWAY
++
++#ifndef RTORRENT_CORE_DHT_MANAGER_H
++#define RTORRENT_CORE_DHT_MANAGER_H
++
++#include <rak/priority_queue_default.h>
++
++#include <torrent/object.h>
++
++namespace core {
++
++class DhtManager {
++public:
++ DhtManager() : m_warned(false), m_start(dht_off) { }
++ ~DhtManager();
++
++ void load_dht_cache();
++ void save_dht_cache();
++ torrent::Object dht_statistics();
++
++ void start_dht();
++ void stop_dht();
++ void auto_start() { if (m_start ==
dht_auto) start_dht(); }
++
++ void set_start(const std::string& arg);
++
++private:
++ static const int dht_disable = 0;
++ static const int dht_off = 1;
++ static const int dht_auto = 2;
++ static const int dht_on = 3;
++
++ static const int dht_settings_num = 4;
++ static const char* dht_settings[dht_settings_num];
++
++ void update();
++ bool log_statistics(bool force);
++
++ unsigned int m_dhtPrevCycle;
++ unsigned int m_dhtPrevQueriesSent;
++ unsigned int m_dhtPrevRepliesReceived;
++ unsigned int m_dhtPrevQueriesReceived;
++ uint64_t m_dhtPrevBytesUp;
++ uint64_t m_dhtPrevBytesDown;
++
++ rak::priority_item m_updateTimeout;
++ rak::priority_item m_stopTimeout;
++ bool m_warned;
++
++ int m_start;
++};
++
++}
++
++#endif
+Index: rtorrent/src/core/manager.cc
+===================================================================
+--- rtorrent/src/core/manager.cc (revision 975)
++++ rtorrent/src/core/manager.cc (working copy)
+@@ -242,6 +242,9 @@
+
+ m_downloadList->clear();
+
++ // When we implement asynchronous DNS lookups, we need to cancel them
++ // here before the torrent::* objects are deleted.
++
+ torrent::cleanup();
+ CurlStack::global_cleanup();
+
+Index: rtorrent/src/core/Makefile.am
+===================================================================
+--- rtorrent/src/core/Makefile.am (revision 975)
++++ rtorrent/src/core/Makefile.am (working copy)
+@@ -5,6 +5,8 @@
+ curl_get.h \
+ curl_stack.cc \
+ curl_stack.h \
++ dht_manager.cc \
++ dht_manager.h \
+ download.cc \
+ download.h \
+ download_factory.cc \
+Index: rtorrent/src/control.cc
+===================================================================
+--- rtorrent/src/control.cc (revision 975)
++++ rtorrent/src/control.cc (working copy)
+@@ -44,6 +44,7 @@
+ #include "core/download_store.h"
+ #include "core/view_manager.h"
+ #include "core/scheduler.h"
++#include "core/dht_manager.h"
+
+ #include "display/canvas.h"
+ #include "display/window.h"
+@@ -75,6 +76,7 @@
+ m_core = new core::Manager();
+ m_viewManager = new core::ViewManager(m_core->download_list());
+ m_scheduler = new core::Scheduler(m_core->download_list());
++ m_dhtManager = new core::DhtManager();
+
+ m_inputStdin->slot_pressed(sigc::mem_fun(m_input,
&input::Manager::pressed));
+
+@@ -95,6 +97,7 @@
+ delete m_display;
+ delete m_core;
+ delete m_scheduler;
++ delete m_dhtManager;
+ }
+
+ void
+Index: rtorrent/src/display/utils.cc
+===================================================================
+--- rtorrent/src/display/utils.cc (revision 975)
++++ rtorrent/src/display/utils.cc (working copy)
+@@ -191,8 +191,8 @@
+ } else if (d->tracker_list()->is_busy() && d->tracker_list()->focus() <
d->tracker_list()->size()) {
+ torrent::TrackerList* tl = d->tracker_list();
+
+- first = print_buffer(first, last, "Tracker[%i:%i]: Connecting to %s",
+- tl->get(tl->focus()).group(), tl->focus(),
tl->get(tl->focus()).url().c_str());
++ first = print_buffer(first, last, "Tracker[%i:%i]: Connecting to %s %s",
++ tl->get(tl->focus()).group(), tl->focus(),
tl->get(tl->focus()).url().c_str(), tl->get(tl->focus()).status().c_str());
+
+ } else if (!d->message().empty()) {
+ first = print_buffer(first, last, "%s", d->message().c_str());
+Index: rtorrent/src/display/window_tracker_list.cc
+===================================================================
+--- rtorrent/src/display/window_tracker_list.cc (revision 975)
++++ rtorrent/src/display/window_tracker_list.cc (working copy)
+@@ -91,7 +91,7 @@
+ m_canvas->print(4, pos++, "Id: %s Focus: %s Enabled: %s Open: %s S/L:
%u/%u",
+ rak::copy_escape_html(tracker.tracker_id()).c_str(),
+ range.first == tl->focus() ? "yes" : " no",
+- tracker.is_enabled() ? "yes" : " no",
++ tracker.is_usable() ? "yes" : tracker.is_enabled() ?
"off" : " no",
+ tracker.is_open() ? "yes" : " no",
+ tracker.scrape_complete(),
+ tracker.scrape_incomplete());
+Index: rtorrent/src/control.h
+===================================================================
+--- rtorrent/src/control.h (revision 975)
++++ rtorrent/src/control.h (working copy)
+@@ -51,6 +51,7 @@
+ class Manager;
+ class ViewManager;
+ class Scheduler;
++ class DhtManager;
+ }
+
+ namespace display {
+@@ -89,6 +90,7 @@
+ core::Manager* core() { return m_core; }
+ core::ViewManager* view_manager() { return m_viewManager;
}
+ core::Scheduler* scheduler() { return m_scheduler; }
++ core::DhtManager* dht_manager() { return m_dhtManager; }
+
+ torrent::Poll* poll();
+
+@@ -118,6 +120,7 @@
+ core::Manager* m_core;
+ core::ViewManager* m_viewManager;
+ core::Scheduler* m_scheduler;
++ core::DhtManager* m_dhtManager;
+
+ ui::Root* m_ui;
+ display::Manager* m_display;
+Index: rtorrent/src/main.cc
+===================================================================
+--- rtorrent/src/main.cc (revision 975)
++++ rtorrent/src/main.cc (working copy)
+@@ -49,6 +49,7 @@
+ #include <execinfo.h>
+ #endif
+
++#include "core/dht_manager.h"
+ #include "core/download.h"
+ #include "core/download_factory.h"
+ #include "core/download_store.h"
+@@ -244,6 +245,7 @@
+
+ // Load session torrents and perform scheduled tasks to ensure
+ // session torrents are loaded before arg torrents.
++ control->dht_manager()->load_dht_cache();
+ load_session_torrents(control);
+ rak::priority_queue_perform(&taskScheduler, cachedTime);
+
+Index: rtorrent/src/command_network.cc
+===================================================================
+--- rtorrent/src/command_network.cc (revision 975)
++++ rtorrent/src/command_network.cc (working copy)
+@@ -41,10 +41,12 @@
+ #include <rak/file_stat.h>
+ #include <rak/path.h>
+ #include <torrent/connection_manager.h>
++#include <torrent/dht_manager.h>
+ #include <torrent/tracker.h>
+ #include <torrent/tracker_list.h>
+ #include <torrent/torrent.h>
+
++#include "core/dht_manager.h"
+ #include "core/download.h"
+ #include "core/manager.h"
+ #include "rpc/scgi.h"
+@@ -119,7 +121,42 @@
+ void apply_hash_interval(int arg) {
torrent::set_hash_interval(arg * 1000); }
+ void apply_encoding_list(const std::string& arg) {
torrent::encoding_list()->push_back(arg); }
+
++struct call_add_node_t {
++ call_add_node_t(int port) : m_port(port) { }
++
++ void operator() (const sockaddr* sa, int err) {
++ if (sa == NULL)
++ control->core()->push_log("Could not resolve host.");
++ else
++ torrent::dht_manager()->add_node(sa, m_port, false);
++ }
++
++ int m_port;
++};
++
+ void
++apply_dht_add_node(const std::string& arg) {
++ if (!torrent::dht_manager()->is_valid())
++ throw torrent::input_error("DHT not enabled.");
++
++ int port, ret;
++ char dummy;
++ char host[1024];
++
++ ret = std::sscanf(arg.c_str(), "%1023[^:]:%i%c", host, &port, &dummy);
++
++ if (ret == 1)
++ port = 6881;
++ else if (ret != 2)
++ throw torrent::input_error("Could not parse host.");
++
++ if (port < 1 || port > 65535)
++ throw torrent::input_error("Invalid port number.");
++
++ torrent::connection_manager()->resolver()(host,
(int)rak::socket_address::pf_inet, SOCK_DGRAM, call_add_node_t(port));
++}
++
++void
+ apply_enable_trackers(int64_t arg) {
+ for (core::Manager::DListItr itr =
control->core()->download_list()->begin(), last =
control->core()->download_list()->end(); itr != last; ++itr) {
+ torrent::TrackerList tl = (*itr)->download()->tracker_list();
+@@ -324,6 +361,11 @@
+ ADD_COMMAND_VALUE_UN("enable_trackers",
std::ptr_fun(&apply_enable_trackers));
+ ADD_COMMAND_STRING_UN("encoding_list",
std::ptr_fun(&apply_encoding_list));
+
++ ADD_VARIABLE_VALUE("dht_port", 6881);
++ ADD_COMMAND_STRING_UN("dht",
rak::make_mem_fun(control->dht_manager(), &core::DhtManager::set_start));
++ ADD_COMMAND_STRING_UN("dht_add_node",
std::ptr_fun(&apply_dht_add_node));
++ ADD_COMMAND_VOID("dht_statistics",
rak::make_mem_fun(control->dht_manager(), &core::DhtManager::dht_statistics));
++
+ ADD_VARIABLE_BOOL("peer_exchange", false);
+
diff --git a/ftp/transmission/DEPENDS b/ftp/transmission/DEPENDS
new file mode 100755
index 0000000..50170dc
--- /dev/null
+++ b/ftp/transmission/DEPENDS
@@ -0,0 +1,6 @@
+depends openssl &&
+
+optional_depends gtk+2 \
+ "--with-gtk" \
+ "" \
+ "for the GUI"
diff --git a/ftp/transmission/DETAILS b/ftp/transmission/DETAILS
new file mode 100755
index 0000000..bfa0d55
--- /dev/null
+++ b/ftp/transmission/DETAILS
@@ -0,0 +1,14 @@
+ SPELL=transmission
+ VERSION=0.91
+ SOURCE="${SPELL}-${VERSION}.tar.bz2"
+ SOURCE_URL[0]=http://download.m0k.org/${SPELL}/files/${SOURCE}
+
SOURCE_HASH=sha512:964cce7189f1352963d272c3ba3abc9ccc9f545c07269acfd374e7b3c0b678dbb42b33b3a1a4e8831019cb9c693a0212fd90209cdf31a48ce1c277d59836e890
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
+ WEB_SITE="http://transmission.m0k.org/";
+ LICENSE[0]=MIT
+ ENTERED=20071105
+ SHORT="fast and powerful BitTorrent client"
+cat << EOF
+Transmission is a free, lightweight BitTorrent client. It features a simple,
+intuitive interface on top on an efficient, cross-platform back-end.
+EOF
diff --git a/ftp/transmission/HISTORY b/ftp/transmission/HISTORY
new file mode 100644
index 0000000..aff753c
--- /dev/null
+++ b/ftp/transmission/HISTORY
@@ -0,0 +1,2 @@
+2007-11-05 Vlad Glagolev <codex AT sourcemage.org>
+ * DEPENDS, DETAILS, HISTORY: spell created
diff --git a/gnome2-apps/abiword/DEPENDS b/gnome2-apps/abiword/DEPENDS
index 55bc8b5..3f1c1b0 100755
--- a/gnome2-apps/abiword/DEPENDS
+++ b/gnome2-apps/abiword/DEPENDS
@@ -8,8 +8,14 @@ depends popt "--with-popt" &&
depends fontconfig &&
depends libglade2 &&
depends wv "--with-sys-wv" &&
-depends gucharmap &&
-
+if [ "$DEVEL" == "n" ]; then
+ depends libgnomeprintui
+else
+ optional_depends libgnomeprintui \
+ "--enable-gnomeui" \
+ "--disable-gnomeui --disable-printing" \
+ "for gnome and printing support"
+fi &&
optional_depends imagemagick \
"--with-ImageMagick" \
"" \
@@ -26,10 +32,10 @@ optional_depends jpeg
\
"" \
"" \
"for jpeg image support" &&
-optional_depends libgnomeprintui \
- "--enable-gnome" \
- "" \
- "for gnome support" &&
+optional_depends gucharmap \
+ "--enable-gucharmap" \
+ "--disable-gucharmap" \
+ "for gucharmap support" &&
optional_depends nautilus2 \
"" \
"" \
diff --git a/gnome2-apps/abiword/HISTORY b/gnome2-apps/abiword/HISTORY
index c7be95e..c5453a7 100644
--- a/gnome2-apps/abiword/HISTORY
+++ b/gnome2-apps/abiword/HISTORY
@@ -1,3 +1,7 @@
+2007-10-29 George Sherwood <george AT beernabeer.com>
+ * DEPENDS: Updated so devel version builds without gnome libs.
+ Stable still depends on libgnomeprintui.
+
2007-09-05 George Sherwood <george AT beernabeer.com>
* DETAILS: Updated devel version to 2.5.2

diff --git a/gnome2-apps/accerciser/DETAILS b/gnome2-apps/accerciser/DETAILS
index 6e07c54..5860e3b 100755
--- a/gnome2-apps/accerciser/DETAILS
+++ b/gnome2-apps/accerciser/DETAILS
@@ -1,5 +1,5 @@
SPELL=accerciser
- VERSION=1.0.0
+ VERSION=1.0.1
BRANCH=`echo ${VERSION}|cut -d . -f 1,2`
SOURCE=${SPELL}-${VERSION}.tar.bz2
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
diff --git a/gnome2-apps/accerciser/HISTORY b/gnome2-apps/accerciser/HISTORY
index 6d1030e..1174c8e 100644
--- a/gnome2-apps/accerciser/HISTORY
+++ b/gnome2-apps/accerciser/HISTORY
@@ -1,2 +1,5 @@
+2007-10-17 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 1.0.1
+
2007-02-28 Robin Cook <rcook AT wyrms.net>
* New Spell: DETAILS, DEPENDS, BUILD, HISTORY
diff --git a/gnome2-apps/accerciser/accerciser-1.0.0.tar.bz2.sig
b/gnome2-apps/accerciser/accerciser-1.0.0.tar.bz2.sig
deleted file mode 100644
index 7177383..0000000
Binary files a/gnome2-apps/accerciser/accerciser-1.0.0.tar.bz2.sig and
/dev/null differ
diff --git a/gnome2-apps/accerciser/accerciser-1.0.1.tar.bz2.sig
b/gnome2-apps/accerciser/accerciser-1.0.1.tar.bz2.sig
new file mode 100644
index 0000000..234d8b6
Binary files /dev/null and
b/gnome2-apps/accerciser/accerciser-1.0.1.tar.bz2.sig differ
diff --git a/gnome2-apps/alexandria/BUILD b/gnome2-apps/alexandria/BUILD
new file mode 100755
index 0000000..f52095c
--- /dev/null
+++ b/gnome2-apps/alexandria/BUILD
@@ -0,0 +1,2 @@
+rake
+
diff --git a/gnome2-apps/alexandria/DEPENDS b/gnome2-apps/alexandria/DEPENDS
new file mode 100755
index 0000000..0fbcee3
--- /dev/null
+++ b/gnome2-apps/alexandria/DEPENDS
@@ -0,0 +1,7 @@
+depends rake &&
+depends ruby-gnome2 &&
+depends ruby-gettext &&
+suggest_depends ruby-amazon "" "" "for Amazon support" &&
+suggest_depends ruby-zoom "" "" "for Library of Congress and British Library
support" &&
+suggest_depends mechanize "" "" "for Deastore support" &&
+suggest_depends image-size "" "" "for optimizing cover images in exported
libraries"
diff --git a/gnome2-apps/alexandria/DETAILS b/gnome2-apps/alexandria/DETAILS
new file mode 100755
index 0000000..d3fa365
--- /dev/null
+++ b/gnome2-apps/alexandria/DETAILS
@@ -0,0 +1,35 @@
+ SPELL=alexandria
+ VERSION=0.6.2b2
+ SOURCE=$SPELL-$VERSION.tar.gz
+ SOURCE_URL[0]=http://rubyforge.org/frs/download.php/27401/$SOURCE
+
SOURCE_HASH=sha512:2dade89e984463b7e1ea227d5c1b48936a54d7ee3721c9800f3ec52547ccf50ed1475741197ebd4bda8ebdadeef0f21cf4ea29a2fb2ce66164bf5faffc15d771
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+ WEB_SITE=http://alexandria.rubyforge.org/
+ ENTERED=20071103
+ LICENSE[0]=GPL
+ SHORT="A GNOME application for managing book collections."
+cat << EOF
+Alexandria is a GNOME application to help you manage your book collection.
+
+Alexandria:
+ * retrieves and displays book information (sometimes with cover pictures)
+ from several online libraries, such as Amazon, Proxis, Barnes and
+ Noble, the Spanish Ministry of Culture, Amadeus Buch, Internet Bookshop
+ Italia, the US Library of Congress and the British Library ;
+ * allows books to be added and updated by hand ;
+ * enables searches either by EAN/ISBN/UPC, title, authors or keyword ;
+ * supports the Z39.50 standard and allow you to manage your own
sources ;
+ * saves data using the YAML format ;
+ * can import and export data into ONIX, Tellico and EAN/ISBN/UPC-list
+ formats ;
+ * generates from your libraries XHTML web pages themable with CSS ;
+ * allows marking your books as loaned, each with the loan-date and the
+ name of the person who has borrowed them ;
+ * features a HIG-compliant user interface ;
+ * shows books in different views (standard list or icons list), that
+ can be either filtered or sorted ;
+ * handles book rating and notes ;
+ * supports CueCat (R) barcode readers ;
+ * includes translations for several languages ;
+ * is documented in a complete manual (at the moment in English only).
+EOF
diff --git a/gnome2-apps/alexandria/HISTORY b/gnome2-apps/alexandria/HISTORY
new file mode 100644
index 0000000..fbedc76
--- /dev/null
+++ b/gnome2-apps/alexandria/HISTORY
@@ -0,0 +1,2 @@
+2007-11-03 Cathal Mc Ginley <cathal.magus AT gnostai.org>
+ * DEPENDS, BUILD, INSTALL, DETAILS: created this spell
diff --git a/gnome2-apps/alexandria/INSTALL b/gnome2-apps/alexandria/INSTALL
new file mode 100755
index 0000000..eb28b89
--- /dev/null
+++ b/gnome2-apps/alexandria/INSTALL
@@ -0,0 +1 @@
+rake install
diff --git a/gnome2-apps/bluez-gnome/DETAILS b/gnome2-apps/bluez-gnome/DETAILS
index a6396ee..a1bd1f0 100755
--- a/gnome2-apps/bluez-gnome/DETAILS
+++ b/gnome2-apps/bluez-gnome/DETAILS
@@ -1,8 +1,8 @@
SPELL=bluez-gnome
- VERSION=0.3
+ VERSION=0.14
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_URL[0]=http://bluez.sourceforge.net/download/$SOURCE
-
SOURCE_HASH=sha512:f2e4531dbe013b2c1778f1f8e845eee8c3c81982ed8b26e82a8b918d6266448f2c9cbc79c96551800564e168d569f1c861cdd0880edf80545793ad9c3bc85e9e
+
SOURCE_HASH=sha512:a24bb99ce1f5c02bf1be76d220458ef27e4fab2b89ef8f2e2de80d8dd3e61d6a2d6efdfe061a6b018270ec7d607c1fe8d8533a72b6e36276fe4ff9f7b3b99373
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
WEB_SITE=http://www.bluez.org/
ENTERED=20060727
diff --git a/gnome2-apps/bluez-gnome/HISTORY b/gnome2-apps/bluez-gnome/HISTORY
index d67b6c8..bc90ba2 100644
--- a/gnome2-apps/bluez-gnome/HISTORY
+++ b/gnome2-apps/bluez-gnome/HISTORY
@@ -1,3 +1,6 @@
+2007-09-28 Martin Klein <martin AT makl.de>
+ * DETAILS: updated spell to 0.14
+
2006-09-21 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: [automated] Removed BUILD_API=2.

diff --git a/gnome2-apps/deskbar-applet/DETAILS
b/gnome2-apps/deskbar-applet/DETAILS
index 6e37f83..9e6beb1 100755
--- a/gnome2-apps/deskbar-applet/DETAILS
+++ b/gnome2-apps/deskbar-applet/DETAILS
@@ -1,5 +1,5 @@
SPELL=deskbar-applet
- VERSION=2.20.0
+ VERSION=2.20.1
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 c9eb558..c9a533e 100644
--- a/gnome2-apps/deskbar-applet/HISTORY
+++ b/gnome2-apps/deskbar-applet/HISTORY
@@ -1,3 +1,6 @@
+2007-10-17 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 2.20.1
+
2007-09-27 Eric Sandall <sandalle AT sourcemage.org>
* REPAIR^f28a3645c12b689590aaf423d217e22e^FUNCTIONS: Fix Bug #14014

diff --git a/gnome2-apps/deskbar-applet/deskbar-applet-2.20.0.tar.bz2.sig
b/gnome2-apps/deskbar-applet/deskbar-applet-2.20.0.tar.bz2.sig
deleted file mode 100644
index 72541d2..0000000
Binary files a/gnome2-apps/deskbar-applet/deskbar-applet-2.20.0.tar.bz2.sig
and /dev/null differ
diff --git a/gnome2-apps/deskbar-applet/deskbar-applet-2.20.1.tar.bz2.sig
b/gnome2-apps/deskbar-applet/deskbar-applet-2.20.1.tar.bz2.sig
new file mode 100644
index 0000000..3fa882a
Binary files /dev/null and
b/gnome2-apps/deskbar-applet/deskbar-applet-2.20.1.tar.bz2.sig differ
diff --git a/gnome2-apps/eog2/DETAILS b/gnome2-apps/eog2/DETAILS
index 8520939..12091b6 100755
--- a/gnome2-apps/eog2/DETAILS
+++ b/gnome2-apps/eog2/DETAILS
@@ -1,5 +1,5 @@
SPELL=eog2
- VERSION=2.20.0
+ VERSION=2.20.1
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 3c28f4e..00062c0 100644
--- a/gnome2-apps/eog2/HISTORY
+++ b/gnome2-apps/eog2/HISTORY
@@ -1,3 +1,6 @@
+2007-10-17 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 2.20.1
+
2007-09-27 Eric Sandall <sandalle AT sourcemage.org>
* REPAIR^f28a3645c12b689590aaf423d217e22e^FUNCTIONS: Fix Bug #14014

diff --git a/gnome2-apps/eog2/eog-2.20.0.tar.bz2.sig
b/gnome2-apps/eog2/eog-2.20.0.tar.bz2.sig
deleted file mode 100644
index 398243f..0000000
Binary files a/gnome2-apps/eog2/eog-2.20.0.tar.bz2.sig and /dev/null differ
diff --git a/gnome2-apps/eog2/eog-2.20.1.tar.bz2.sig
b/gnome2-apps/eog2/eog-2.20.1.tar.bz2.sig
new file mode 100644
index 0000000..bf522de
Binary files /dev/null and b/gnome2-apps/eog2/eog-2.20.1.tar.bz2.sig differ
diff --git a/gnome2-apps/epiphany-extensions/DETAILS
b/gnome2-apps/epiphany-extensions/DETAILS
index c1a636d..0a3160a 100755
--- a/gnome2-apps/epiphany-extensions/DETAILS
+++ b/gnome2-apps/epiphany-extensions/DETAILS
@@ -1,5 +1,5 @@
SPELL=epiphany-extensions
- VERSION=2.20.0
+ VERSION=2.20.1
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 e342957..c439abb 100644
--- a/gnome2-apps/epiphany-extensions/HISTORY
+++ b/gnome2-apps/epiphany-extensions/HISTORY
@@ -1,3 +1,6 @@
+2007-10-18 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 2.20.1
+
2007-09-21 Robin Cook <rcook AT wyrms.net>
* DETAILS: updated VERSION to 2.20.0

diff --git
a/gnome2-apps/epiphany-extensions/epiphany-extensions-2.20.0.tar.bz2.sig
b/gnome2-apps/epiphany-extensions/epiphany-extensions-2.20.0.tar.bz2.sig
deleted file mode 100644
index 19d285b..0000000
Binary files
a/gnome2-apps/epiphany-extensions/epiphany-extensions-2.20.0.tar.bz2.sig and
/dev/null differ
diff --git
a/gnome2-apps/epiphany-extensions/epiphany-extensions-2.20.1.tar.bz2.sig
b/gnome2-apps/epiphany-extensions/epiphany-extensions-2.20.1.tar.bz2.sig
new file mode 100644
index 0000000..7d70174
Binary files /dev/null and
b/gnome2-apps/epiphany-extensions/epiphany-extensions-2.20.1.tar.bz2.sig
differ
diff --git a/gnome2-apps/epiphany/DETAILS b/gnome2-apps/epiphany/DETAILS
index 0d64e70..f8b77e8 100755
--- a/gnome2-apps/epiphany/DETAILS
+++ b/gnome2-apps/epiphany/DETAILS
@@ -1,5 +1,5 @@
SPELL=epiphany
- VERSION=2.20.0
+ VERSION=2.20.1
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 6c99a1b..29bb488 100644
--- a/gnome2-apps/epiphany/HISTORY
+++ b/gnome2-apps/epiphany/HISTORY
@@ -1,3 +1,6 @@
+2007-10-18 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 2.20.1
+
2007-09-27 Eric Sandall <sandalle AT sourcemage.org>
* REPAIR^f28a3645c12b689590aaf423d217e22e^FUNCTIONS: Fix Bug #14014

diff --git a/gnome2-apps/epiphany/epiphany-2.20.0.tar.bz2.sig
b/gnome2-apps/epiphany/epiphany-2.20.0.tar.bz2.sig
deleted file mode 100644
index 73e82fc..0000000
Binary files a/gnome2-apps/epiphany/epiphany-2.20.0.tar.bz2.sig and /dev/null
differ
diff --git a/gnome2-apps/epiphany/epiphany-2.20.1.tar.bz2.sig
b/gnome2-apps/epiphany/epiphany-2.20.1.tar.bz2.sig
new file mode 100644
index 0000000..377eea2
Binary files /dev/null and b/gnome2-apps/epiphany/epiphany-2.20.1.tar.bz2.sig
differ
diff --git a/gnome2-apps/evolution/DETAILS b/gnome2-apps/evolution/DETAILS
index eb520f6..fc8247b 100755
--- a/gnome2-apps/evolution/DETAILS
+++ b/gnome2-apps/evolution/DETAILS
@@ -1,5 +1,5 @@
SPELL=evolution
- VERSION=2.12.0
+ VERSION=2.12.1
BRANCH=${VERSION:0:4}
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/gnome2-apps/evolution/G_SCHEMAS b/gnome2-apps/evolution/G_SCHEMAS
index d9da012..f6e960f 100644
--- a/gnome2-apps/evolution/G_SCHEMAS
+++ b/gnome2-apps/evolution/G_SCHEMAS
@@ -1,6 +1,6 @@
-apps_evolution_addressbook-2.8.schemas
-apps_evolution_calendar-2.8.schemas
-apps-evolution-mail-prompts-checkdefault-2.8.schemas
-apps_evolution_shell-2.8.schemas
-evolution-mail-2.8.schemas
+apps_evolution_addressbook.schemas
+apps_evolution_calendar.schemas
+apps-evolution-mail-prompts-checkdefault.schemas
+apps_evolution_shell.schemas
+apps-evolution-mail.schemas

diff --git a/gnome2-apps/evolution/HISTORY b/gnome2-apps/evolution/HISTORY
index 27bc2f9..af94dac 100644
--- a/gnome2-apps/evolution/HISTORY
+++ b/gnome2-apps/evolution/HISTORY
@@ -1,3 +1,9 @@
+2007-11-04 Arjan Bouter <abouter AT sourcemage.org>
+ * G_SCHEMAS: removed versions
+
+2007-10-16 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 2.12.1
+
2007-09-27 Eric Sandall <sandalle AT sourcemage.org>
* serves: Removed deprecated file
* REPAIR^f28a3645c12b689590aaf423d217e22e^FUNCTIONS: Fix Bug #14014
diff --git a/gnome2-apps/evolution/evolution-2.12.0.tar.bz2.sig
b/gnome2-apps/evolution/evolution-2.12.0.tar.bz2.sig
deleted file mode 100644
index dca7216..0000000
Binary files a/gnome2-apps/evolution/evolution-2.12.0.tar.bz2.sig and
/dev/null differ
diff --git a/gnome2-apps/evolution/evolution-2.12.1.tar.bz2.sig
b/gnome2-apps/evolution/evolution-2.12.1.tar.bz2.sig
new file mode 100644
index 0000000..f6eef78
Binary files /dev/null and
b/gnome2-apps/evolution/evolution-2.12.1.tar.bz2.sig differ
diff --git a/gnome2-apps/file-roller/DETAILS b/gnome2-apps/file-roller/DETAILS
index de02e5e..de85463 100755
--- a/gnome2-apps/file-roller/DETAILS
+++ b/gnome2-apps/file-roller/DETAILS
@@ -1,5 +1,5 @@
SPELL=file-roller
- VERSION=2.20.0
+ VERSION=2.20.1
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 7865933..06e79e6 100644
--- a/gnome2-apps/file-roller/HISTORY
+++ b/gnome2-apps/file-roller/HISTORY
@@ -1,3 +1,6 @@
+2007-10-17 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 2.20.1
+
2007-09-27 Eric Sandall <sandalle AT sourcemage.org>
* REPAIR^f28a3645c12b689590aaf423d217e22e^FUNCTIONS: Fix Bug #14014

diff --git a/gnome2-apps/file-roller/file-roller-2.20.0.tar.gz.sig
b/gnome2-apps/file-roller/file-roller-2.20.0.tar.gz.sig
deleted file mode 100644
index 3e5b17a..0000000
Binary files a/gnome2-apps/file-roller/file-roller-2.20.0.tar.gz.sig and
/dev/null differ
diff --git a/gnome2-apps/file-roller/file-roller-2.20.1.tar.gz.sig
b/gnome2-apps/file-roller/file-roller-2.20.1.tar.gz.sig
new file mode 100644
index 0000000..c209bb0
Binary files /dev/null and
b/gnome2-apps/file-roller/file-roller-2.20.1.tar.gz.sig differ
diff --git a/gnome2-apps/galculator/DETAILS b/gnome2-apps/galculator/DETAILS
index c9f7cac..c5e1487 100755
--- a/gnome2-apps/galculator/DETAILS
+++ b/gnome2-apps/galculator/DETAILS
@@ -1,13 +1,12 @@
SPELL=galculator
- VERSION=1.2.5.2
+ VERSION=1.3.1
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$SOURCEFORGE_URL/galculator/$SOURCE
-
SOURCE_HASH=sha512:afd0fe93ecec295821808d2b1b60e6046cee707e55f29af2a8bcdc2a2f1f4612218230da0ebfba122179747ab502d48204abbce1213cf8add2672c91952569ce
+ SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
LICENSE[0]=GPL
WEB_SITE=http://galculator.sourceforge.net
ENTERED=20030120
- UPDATED=20050531
KEYWORDS="calculator gnome2"
SHORT="GTK+2 based calculator"
cat << EOF
diff --git a/gnome2-apps/galculator/HISTORY b/gnome2-apps/galculator/HISTORY
index 096786a..cf35861 100644
--- a/gnome2-apps/galculator/HISTORY
+++ b/gnome2-apps/galculator/HISTORY
@@ -1,3 +1,6 @@
+2007-10-08 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 1.3.1
+
2006-05-21 Robin Cook <rcook AT wyrms.net>
* DETAILS: removed BUILD_API

diff --git a/gnome2-apps/galculator/galculator-1.3.1.tar.bz2.sig
b/gnome2-apps/galculator/galculator-1.3.1.tar.bz2.sig
new file mode 100644
index 0000000..6b51965
Binary files /dev/null and
b/gnome2-apps/galculator/galculator-1.3.1.tar.bz2.sig differ
diff --git a/gnome2-apps/gcalctool/DETAILS b/gnome2-apps/gcalctool/DETAILS
index 8be843f..2134dc3 100755
--- a/gnome2-apps/gcalctool/DETAILS
+++ b/gnome2-apps/gcalctool/DETAILS
@@ -1,5 +1,5 @@
SPELL=gcalctool
- VERSION=5.20.0
+ VERSION=5.20.2
BRANCH=`echo $VERSION | cut -d . -f 1,2`
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/gnome2-apps/gcalctool/HISTORY b/gnome2-apps/gcalctool/HISTORY
index 2d4984f..8b4f401 100644
--- a/gnome2-apps/gcalctool/HISTORY
+++ b/gnome2-apps/gcalctool/HISTORY
@@ -1,3 +1,9 @@
+2007-10-17 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 5.20.2
+
+2007-10-02 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 5.20.1
+
2007-09-27 Eric Sandall <sandalle AT sourcemage.org>
* REPAIR^f28a3645c12b689590aaf423d217e22e^FUNCTIONS: Fix Bug #14014

diff --git a/gnome2-apps/gcalctool/gcalctool-5.20.0.tar.gz.sig
b/gnome2-apps/gcalctool/gcalctool-5.20.0.tar.gz.sig
deleted file mode 100644
index 02ef148..0000000
Binary files a/gnome2-apps/gcalctool/gcalctool-5.20.0.tar.gz.sig and
/dev/null differ
diff --git a/gnome2-apps/gcalctool/gcalctool-5.20.2.tar.gz.sig
b/gnome2-apps/gcalctool/gcalctool-5.20.2.tar.gz.sig
new file mode 100644
index 0000000..80a4862
Binary files /dev/null and
b/gnome2-apps/gcalctool/gcalctool-5.20.2.tar.gz.sig differ
diff --git a/gnome2-apps/gedit/DETAILS b/gnome2-apps/gedit/DETAILS
index fa5459f..5ba179d 100755
--- a/gnome2-apps/gedit/DETAILS
+++ b/gnome2-apps/gedit/DETAILS
@@ -1,5 +1,5 @@
SPELL=gedit
- VERSION=2.20.1
+ VERSION=2.20.3
BRANCH=`echo $VERSION|cut -d . -f 1,2`
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/gnome2-apps/gedit/HISTORY b/gnome2-apps/gedit/HISTORY
index 9066cfe..c942d35 100644
--- a/gnome2-apps/gedit/HISTORY
+++ b/gnome2-apps/gedit/HISTORY
@@ -1,3 +1,9 @@
+2007-10-18 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 2.20.3
+
+2007-10-17 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 2.20.2
+
2007-09-27 Eric Sandall <sandalle AT sourcemage.org>
* REPAIR^f28a3645c12b689590aaf423d217e22e^FUNCTIONS: Fix Bug #14014

diff --git a/gnome2-apps/gedit/gedit-2.20.1.tar.bz2.sig
b/gnome2-apps/gedit/gedit-2.20.1.tar.bz2.sig
deleted file mode 100644
index 37ec3e7..0000000
Binary files a/gnome2-apps/gedit/gedit-2.20.1.tar.bz2.sig and /dev/null differ
diff --git a/gnome2-apps/gedit/gedit-2.20.3.tar.bz2.sig
b/gnome2-apps/gedit/gedit-2.20.3.tar.bz2.sig
new file mode 100644
index 0000000..290690d
Binary files /dev/null and b/gnome2-apps/gedit/gedit-2.20.3.tar.bz2.sig differ
diff --git a/gnome2-apps/gnumeric/DEPENDS b/gnome2-apps/gnumeric/DEPENDS
index e50cf11..9a9ff72 100755
--- a/gnome2-apps/gnumeric/DEPENDS
+++ b/gnome2-apps/gnumeric/DEPENDS
@@ -1,14 +1,14 @@
depends libole2-2 &&
-depends gal2 &&
depends rarian &&
depends libgsf &&


if [[ "${GNUMERIC_DEVEL}" == "y" ]]; then
- depends goffice-0.5
+ depends goffice-0.5 &&
depends libxml2
else
- depends goffice
+ depends goffice &&
+ depends libgnomeprintui
fi &&

optional_depends gtk+2 \
diff --git a/gnome2-apps/gnumeric/DETAILS b/gnome2-apps/gnumeric/DETAILS
index ec646ef..dfdecbc 100755
--- a/gnome2-apps/gnumeric/DETAILS
+++ b/gnome2-apps/gnumeric/DETAILS
@@ -1,6 +1,6 @@
SPELL=gnumeric
if [[ "${GNUMERIC_DEVEL}" == "y" ]]; then
- VERSION=1.7.12
+ VERSION=1.7.14
else
VERSION=1.6.3
PATCHLEVEL=2
diff --git a/gnome2-apps/gnumeric/HISTORY b/gnome2-apps/gnumeric/HISTORY
index abc3235..8020ae9 100644
--- a/gnome2-apps/gnumeric/HISTORY
+++ b/gnome2-apps/gnumeric/HISTORY
@@ -1,3 +1,12 @@
+2007-11-04 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 1.7.14
+
+2007-10-29 George Sherwood <george AT beernabeer.com>
+ * DEPENDS: Updated to allow building of devel without gnome libs
+
+2007-10-21 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 1.7.13
+
2007-09-22 Robin Cook <rcook AT wyrms.net>
* DETAILS: updated VERSION to 1.7.12
* DEPENDS: change scrollkeeper to rarian
diff --git a/gnome2-apps/gnumeric/gnumeric-1.7.12.tar.bz2.sig
b/gnome2-apps/gnumeric/gnumeric-1.7.12.tar.bz2.sig
deleted file mode 100644
index a1a35f9..0000000
Binary files a/gnome2-apps/gnumeric/gnumeric-1.7.12.tar.bz2.sig and /dev/null
differ
diff --git a/gnome2-apps/gnumeric/gnumeric-1.7.14.tar.bz2.sig
b/gnome2-apps/gnumeric/gnumeric-1.7.14.tar.bz2.sig
new file mode 100644
index 0000000..3b01c68
Binary files /dev/null and b/gnome2-apps/gnumeric/gnumeric-1.7.14.tar.bz2.sig
differ
diff --git a/gnome2-apps/gok/DETAILS b/gnome2-apps/gok/DETAILS
index 2846b4a..963f698 100755
--- a/gnome2-apps/gok/DETAILS
+++ b/gnome2-apps/gok/DETAILS
@@ -1,5 +1,5 @@
SPELL=gok
- VERSION=1.3.4
+ VERSION=1.3.7
BRANCH=`echo $VERSION|cut -d . -f 1,2`
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/gnome2-apps/gok/HISTORY b/gnome2-apps/gok/HISTORY
index 793701a..9829bc8 100644
--- a/gnome2-apps/gok/HISTORY
+++ b/gnome2-apps/gok/HISTORY
@@ -1,3 +1,6 @@
+2007-10-17 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 1.3.7
+
2007-09-21 Robin Cook <rcook AT wyrms.net>
* DETAILS: updated VERSION to 1.3.4
* DEPENDS: changed scrollkeeper to rarian
diff --git a/gnome2-apps/gok/gok-1.3.4.tar.bz2.sig
b/gnome2-apps/gok/gok-1.3.4.tar.bz2.sig
deleted file mode 100644
index 0b9cdf2..0000000
Binary files a/gnome2-apps/gok/gok-1.3.4.tar.bz2.sig and /dev/null differ
diff --git a/gnome2-apps/gok/gok-1.3.7.tar.bz2.sig
b/gnome2-apps/gok/gok-1.3.7.tar.bz2.sig
new file mode 100644
index 0000000..ad0c9f0
Binary files /dev/null and b/gnome2-apps/gok/gok-1.3.7.tar.bz2.sig differ
diff --git a/gnome2-apps/gramps/DETAILS b/gnome2-apps/gramps/DETAILS
index 171c210..25c81bd 100755
--- a/gnome2-apps/gramps/DETAILS
+++ b/gnome2-apps/gramps/DETAILS
@@ -1,6 +1,6 @@
SPELL=gramps
- VERSION=2.2.8
-
SOURCE_HASH=sha512:8afe2a54d8f0a16bb8ef8357c5723d3ec9cae1edbc3bb12267b50285b501e3dec6f45a77b52337bfc7b060bbc12bc4eabc643fbb1026645bf5c2966093cc5273
+ VERSION=2.2.9
+
SOURCE_HASH=sha512:f383cdb1a04d55d81c48e9373d79d4cce66a3085f9ea4daff4c3a3fe254f90e3742512ce9e6381a7df56090bb5237d804a47a25be55320e85c23f52b50b900aa
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 418e3d8..c81189f 100644
--- a/gnome2-apps/gramps/HISTORY
+++ b/gnome2-apps/gramps/HISTORY
@@ -1,3 +1,6 @@
+2007-10-19 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 2.2.9
+
2007-09-22 Robin Cook <rcook AT wyrms.net>
* DEPENDS: changed scrollkeeper to rarian

diff --git a/gnome2-apps/gthumb2/DETAILS b/gnome2-apps/gthumb2/DETAILS
index 12331d2..1dbabf3 100755
--- a/gnome2-apps/gthumb2/DETAILS
+++ b/gnome2-apps/gthumb2/DETAILS
@@ -1,5 +1,5 @@
SPELL=gthumb2
- VERSION=2.10.5
+ VERSION=2.10.7
BRANCH=`echo $VERSION|cut -d . -f 1,2`
SOURCE=gthumb-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/gthumb-$VERSION
diff --git a/gnome2-apps/gthumb2/HISTORY b/gnome2-apps/gthumb2/HISTORY
index 62459e0..2e8b131 100644
--- a/gnome2-apps/gthumb2/HISTORY
+++ b/gnome2-apps/gthumb2/HISTORY
@@ -1,3 +1,6 @@
+2007-10-17 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 2.10.7
+
2007-09-22 Robin Cook <rcook AT wyrms.net>
* DEPENDS: changed scrollkeeper to rarian

diff --git a/gnome2-apps/gthumb2/gthumb-2.10.5.tar.bz2.sig
b/gnome2-apps/gthumb2/gthumb-2.10.5.tar.bz2.sig
deleted file mode 100644
index 21e1144..0000000
Binary files a/gnome2-apps/gthumb2/gthumb-2.10.5.tar.bz2.sig and /dev/null
differ
diff --git a/gnome2-apps/gthumb2/gthumb-2.10.7.tar.bz2.sig
b/gnome2-apps/gthumb2/gthumb-2.10.7.tar.bz2.sig
new file mode 100644
index 0000000..56c7397
Binary files /dev/null and b/gnome2-apps/gthumb2/gthumb-2.10.7.tar.bz2.sig
differ
diff --git a/gnome2-apps/gxneur/DETAILS b/gnome2-apps/gxneur/DETAILS
index 94d0649..ca499f8 100755
--- a/gnome2-apps/gxneur/DETAILS
+++ b/gnome2-apps/gxneur/DETAILS
@@ -1,8 +1,8 @@
SPELL=gxneur
- VERSION=0.6.2
+ VERSION=0.8.0
SOURCE=${SPELL}-${VERSION}.tar.bz2
SOURCE_URL[0]=http://dists.xneur.ru/release-${VERSION}/tgz/${SOURCE}
-
SOURCE_HASH=sha512:6f8154a3fcff2677897620c610ddd898a396f7b70f80ba1a89afea5fe06047a7346a1b75758abdfc2fe2e807a537a32cb3c4c13123e266020565f97f81cac255
+
SOURCE_HASH=sha512:d17482dc5eb8db4b66639d777563cf8b89774e2d1e954968a59c3f6ff5a7dbcd0d33b7abffbfbd8bb178e221de9049cf47838eaafb749a666c14a04c5b6bb37b
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
WEB_SITE=http://xneur.ru/
LICENSE[0]=GPL
diff --git a/gnome2-apps/gxneur/HISTORY b/gnome2-apps/gxneur/HISTORY
index 31630f6..4f5d17b 100644
--- a/gnome2-apps/gxneur/HISTORY
+++ b/gnome2-apps/gxneur/HISTORY
@@ -1,3 +1,6 @@
+2007-10-13 Pol Vinogradov <vin.public AT gmail.com>
+ * DETAILS: updated to 0.8.0
+
2007-07-26 Pol Vinogradov <vin.public AT gmail.com>
* DETAILS: updated to 0.6.2

diff --git a/gnome2-apps/mergeant/DEPENDS b/gnome2-apps/mergeant/DEPENDS
index 25d29f7..242e027 100755
--- a/gnome2-apps/mergeant/DEPENDS
+++ b/gnome2-apps/mergeant/DEPENDS
@@ -1,2 +1,2 @@
-depends libgda2-dev &&
-depends libgnomedb-dev
+depends libgda3 &&
+depends libgnomedb3
diff --git a/gnome2-apps/mergeant/DETAILS b/gnome2-apps/mergeant/DETAILS
index 6e249df..c53ad14 100755
--- a/gnome2-apps/mergeant/DETAILS
+++ b/gnome2-apps/mergeant/DETAILS
@@ -1,5 +1,5 @@
SPELL=mergeant
- VERSION=0.66
+ VERSION=0.67
BRANCH=`echo $VERSION | cut -d . -f 1,2`
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/gnome2-apps/mergeant/HISTORY b/gnome2-apps/mergeant/HISTORY
index e619092..498e920 100644
--- a/gnome2-apps/mergeant/HISTORY
+++ b/gnome2-apps/mergeant/HISTORY
@@ -1,3 +1,7 @@
+2007-10-24 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 0.67
+ * DEPENDS: changed to use libgda3 and libgnomedb3
+
2007-03-23 Robin Cook <rcook AT wyrms.net>
* DETAILS: updated VERSION to 0.66

diff --git a/gnome2-apps/mergeant/mergeant-0.65.tar.gz.sig
b/gnome2-apps/mergeant/mergeant-0.65.tar.gz.sig
deleted file mode 100644
index 4202660..0000000
Binary files a/gnome2-apps/mergeant/mergeant-0.65.tar.gz.sig and /dev/null
differ
diff --git a/gnome2-apps/mergeant/mergeant-0.66.tar.gz.sig
b/gnome2-apps/mergeant/mergeant-0.66.tar.gz.sig
deleted file mode 100644
index b274b73..0000000
Binary files a/gnome2-apps/mergeant/mergeant-0.66.tar.gz.sig and /dev/null
differ
diff --git a/gnome2-apps/mergeant/mergeant-0.67.tar.gz.sig
b/gnome2-apps/mergeant/mergeant-0.67.tar.gz.sig
new file mode 100644
index 0000000..97756c6
Binary files /dev/null and b/gnome2-apps/mergeant/mergeant-0.67.tar.gz.sig
differ
diff --git a/gnome2-apps/orca/DETAILS b/gnome2-apps/orca/DETAILS
index 7aecb54..f42a7a0 100755
--- a/gnome2-apps/orca/DETAILS
+++ b/gnome2-apps/orca/DETAILS
@@ -1,5 +1,5 @@
SPELL=orca
- VERSION=2.20.0
+ VERSION=2.20.1
BRANCH=`echo $VERSION|cut -d . -f 1,2`
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/gnome2-apps/orca/HISTORY b/gnome2-apps/orca/HISTORY
index d4351a8..5d201c3 100644
--- a/gnome2-apps/orca/HISTORY
+++ b/gnome2-apps/orca/HISTORY
@@ -1,3 +1,9 @@
+2007-10-29 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 2.20.1
+
+2007-10-08 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 2.20.0.1
+
2007-09-21 Robin Cook <rcook AT wyrms.net>
* DETAILS: updated VERSION to 2.20.0

diff --git a/gnome2-apps/orca/orca-2.20.0.tar.bz2.sig
b/gnome2-apps/orca/orca-2.20.0.tar.bz2.sig
deleted file mode 100644
index a471919..0000000
Binary files a/gnome2-apps/orca/orca-2.20.0.tar.bz2.sig and /dev/null differ
diff --git a/gnome2-apps/orca/orca-2.20.1.tar.bz2.sig
b/gnome2-apps/orca/orca-2.20.1.tar.bz2.sig
new file mode 100644
index 0000000..38d4b9a
Binary files /dev/null and b/gnome2-apps/orca/orca-2.20.1.tar.bz2.sig differ
diff --git a/gnome2-apps/osmo/DETAILS b/gnome2-apps/osmo/DETAILS
index 509e70e..755a85f 100755
--- a/gnome2-apps/osmo/DETAILS
+++ b/gnome2-apps/osmo/DETAILS
@@ -1,10 +1,10 @@
SPELL=osmo
- VERSION=0.1.0
+ VERSION=0.1.1
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://clay.ll.pl/osmo/$SOURCE
WEB_SITE=http://clay.ll.pl/osmo/
- SOURCE_GPG=gurus.gpg:$SOURCE.sig:WORKS_FOR_ME
+
SOURCE_HASH=sha512:5b0f6aaadf0a82e98df5f86525703451d33207037b9963b07a1a8560d89b4a4217c85e65322c2ae5829814e1057736196ceedfb15385a5d3a6b153ca93676a5f
LICENSE[0]=GPL
ENTERED=20070928
SHORT="a personal organizer"
diff --git a/gnome2-apps/osmo/HISTORY b/gnome2-apps/osmo/HISTORY
index 90714e9..4ad5037 100644
--- a/gnome2-apps/osmo/HISTORY
+++ b/gnome2-apps/osmo/HISTORY
@@ -1,3 +1,6 @@
+2007-10-22 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
+ * DETAILS: updated spell to 0.1.1
+
2007-09-28 Arwed v. Merkatz <v.merkatz AT gmx.net>
* DEPENDS, DETAILS, HISTORY: created this spell

diff --git a/gnome2-apps/osmo/osmo-0.1.0.tar.gz.sig
b/gnome2-apps/osmo/osmo-0.1.0.tar.gz.sig
deleted file mode 100644
index f6101b6..0000000
Binary files a/gnome2-apps/osmo/osmo-0.1.0.tar.gz.sig and /dev/null differ
diff --git a/gnome2-apps/passepartout/DEPENDS
b/gnome2-apps/passepartout/DEPENDS
new file mode 100755
index 0000000..08fb561
--- /dev/null
+++ b/gnome2-apps/passepartout/DEPENDS
@@ -0,0 +1,14 @@
+depends libxslt &&
+depends libxml++ &&
+depends freetype2 &&
+depends gtkmm2 &&
+depends ghostscript &&
+depends libgnomecanvasmm &&
+
+optional_depends libgnome \
+ "--with-gnome" \
+ "--without-gnome" \
+ "Enable gnome support?" &&
+
+optional_depends gnome-vfs2 "" "" "Also needed for gnome support?"
+
diff --git a/gnome2-apps/passepartout/DETAILS
b/gnome2-apps/passepartout/DETAILS
new file mode 100755
index 0000000..ca56026
--- /dev/null
+++ b/gnome2-apps/passepartout/DETAILS
@@ -0,0 +1,20 @@
+ SPELL=passepartout
+ VERSION=0.7.0
+ BRANCH=`echo $VERSION|cut -d . -f 1,2`
+ SOURCE=$SPELL-$VERSION.tar.bz2
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+ SOURCE_URL[0]=$GNOME_URL/sources/$SPELL/$BRANCH/$SOURCE
+ SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
+ LICENSE[0]=GPL
+ WEB_SITE=http://www.stacken.kth.se/project/pptout/
+ ENTERED=20071005
+ KEYWORDS="gnome2 graphics"
+ SHORT=""
+cat << EOF
+Passepartout is an Open Source* Desktop Publishing* application for the X
+Window System*. The goal of this project is to create a system capable of
+producing pre-press material of professional quality, but also to be a
useful
+tool for any enthusiast with access to a printer. The main focus is on
making it
+easy for the user to create publications with a flexible layout, typical
+examples being magazines, brochures and leaflets.
+EOF
diff --git a/gnome2-apps/passepartout/HISTORY
b/gnome2-apps/passepartout/HISTORY
new file mode 100644
index 0000000..de42a40
--- /dev/null
+++ b/gnome2-apps/passepartout/HISTORY
@@ -0,0 +1,2 @@
+2007-10-05 Robin Cook <rcook AT wyrms.net>
+ * Initial spell: PRE_BUILD, DETAILS, DEPENDS, HISTORY
diff --git a/gnome2-apps/passepartout/PRE_BUILD
b/gnome2-apps/passepartout/PRE_BUILD
new file mode 100755
index 0000000..109c2ad
--- /dev/null
+++ b/gnome2-apps/passepartout/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd ${SOURCE_DIRECTORY} &&
+
+patch -p0 < ${SCRIPT_DIRECTORY}/configure.diff
diff --git a/gnome2-apps/passepartout/configure.diff
b/gnome2-apps/passepartout/configure.diff
new file mode 100644
index 0000000..37103f7
--- /dev/null
+++ b/gnome2-apps/passepartout/configure.diff
@@ -0,0 +1,61 @@
+--- configure.orig 2007-10-05 20:26:46.000000000 -0500
++++ configure 2007-10-05 20:31:04.000000000 -0500
+@@ -3295,12 +3295,12 @@
+ pkg_cv_XMLPP_CFLAGS="$XMLPP_CFLAGS"
+ else
+ if test -n "$PKG_CONFIG" && \
+- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors
\"libxml++-1.0 >= 1.0\"") >&5
+- ($PKG_CONFIG --exists --print-errors "libxml++-1.0 >= 1.0") 2>&5
++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors
\"libxml++-2.6 >= 2.6\"") >&5
++ ($PKG_CONFIG --exists --print-errors "libxml++-2.6 >= 2.6") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+- pkg_cv_XMLPP_CFLAGS=`$PKG_CONFIG --cflags "libxml++-1.0 >= 1.0"
2>/dev/null`
++ pkg_cv_XMLPP_CFLAGS=`$PKG_CONFIG --cflags "libxml++-2.6 >= 2.6"
2>/dev/null`
+ else
+ pkg_failed=yes
+ fi
+@@ -3313,12 +3313,12 @@
+ pkg_cv_XMLPP_LIBS="$XMLPP_LIBS"
+ else
+ if test -n "$PKG_CONFIG" && \
+- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors
\"libxml++-1.0 >= 1.0\"") >&5
+- ($PKG_CONFIG --exists --print-errors "libxml++-1.0 >= 1.0") 2>&5
++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors
\"libxml++-2.6 >= 2.6\"") >&5
++ ($PKG_CONFIG --exists --print-errors "libxml++-2.6 >= 2.6") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+- pkg_cv_XMLPP_LIBS=`$PKG_CONFIG --libs "libxml++-1.0 >= 1.0" 2>/dev/null`
++ pkg_cv_XMLPP_LIBS=`$PKG_CONFIG --libs "libxml++-2.6 >= 2.6" 2>/dev/null`
+ else
+ pkg_failed=yes
+ fi
+@@ -3337,14 +3337,14 @@
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- XMLPP_PKG_ERRORS=`$PKG_CONFIG --short-errors
--errors-to-stdout --print-errors "libxml++-1.0 >= 1.0"`
++ XMLPP_PKG_ERRORS=`$PKG_CONFIG --short-errors
--errors-to-stdout --print-errors "libxml++-2.6 >= 2.6"`
+ else
+- XMLPP_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout
--print-errors "libxml++-1.0 >= 1.0"`
++ XMLPP_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout
--print-errors "libxml++-2.6 >= 2.6"`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$XMLPP_PKG_ERRORS" >&5
+
+- { { echo "$as_me:$LINENO: error: Package requirements (libxml++-1.0
>= 1.0) were not met:
++ { { echo "$as_me:$LINENO: error: Package requirements (libxml++-2.6
>= 2.6) were not met:
+
+ $XMLPP_PKG_ERRORS
+
+@@ -3355,7 +3355,7 @@
+ and XMLPP_LIBS to avoid the need to call pkg-config.
+ See the pkg-config man page for more details.
+ " >&5
+-echo "$as_me: error: Package requirements (libxml++-1.0 >= 1.0) were not
met:
++echo "$as_me: error: Package requirements (libxml++-2.6 >= 2.6) were not
met:
+
+ $XMLPP_PKG_ERRORS
+
diff --git a/gnome2-apps/passepartout/passepartout-0.7.0.tar.bz2.sig
b/gnome2-apps/passepartout/passepartout-0.7.0.tar.bz2.sig
new file mode 100644
index 0000000..c240212
Binary files /dev/null and
b/gnome2-apps/passepartout/passepartout-0.7.0.tar.bz2.sig differ
diff --git a/gnome2-apps/tagtool/DETAILS b/gnome2-apps/tagtool/DETAILS
index e0c102a..b6c1c27 100755
--- a/gnome2-apps/tagtool/DETAILS
+++ b/gnome2-apps/tagtool/DETAILS
@@ -1,13 +1,12 @@
SPELL=tagtool
- VERSION=0.11.1
- SOURCE=$SPELL-$VERSION.tar.gz
+ VERSION=0.12.3
+ SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
-
SOURCE_HASH=sha512:899e74bae8c6ef174d649ab7a85b4f546ead86883088778f602239b8b4336ced1e7ded5cdf50952de25b6b1739470c45293cb52d69e6920a45ef57c681ad578d
+
SOURCE_HASH=sha512:f32cf8ab072b9e8f52c5afd27e93f348a6d573085f71efedf81764a2d20941e580583c6536d420f25956eae84dcb6d1930229e60bc068ec7948247cfa64ff385
LICENSE[0]=GPL
WEB_SITE=http://pwp.netcabo.pt/paol/tagtool/
ENTERED=20041024
- UPDATED=20041031
KEYWORDS="editors gnome2"
SHORT="Audio file tag editor"
cat << EOF
diff --git a/gnome2-apps/tagtool/HISTORY b/gnome2-apps/tagtool/HISTORY
index 1f4bcd4..45b097f 100644
--- a/gnome2-apps/tagtool/HISTORY
+++ b/gnome2-apps/tagtool/HISTORY
@@ -1,3 +1,6 @@
+2007-10-03 Vlad Glagolev <codex AT sourcemage.org>
+ * DETAILS: updated to 0.12.3
+
2006-09-21 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: [automated] Removed BUILD_API=2.

diff --git a/gnome2-apps/tomboy/DETAILS b/gnome2-apps/tomboy/DETAILS
index d34510d..05637d8 100755
--- a/gnome2-apps/tomboy/DETAILS
+++ b/gnome2-apps/tomboy/DETAILS
@@ -1,5 +1,5 @@
SPELL=tomboy
- VERSION=0.8.0
+ VERSION=0.8.1
BRANCH=`echo $VERSION|cut -d . -f 1,2`
SOURCE=${SPELL}-${VERSION}.tar.gz
SOURCE_URL[0]=${GNOME_URL}/sources/${SPELL}/${BRANCH}/${SOURCE}
diff --git a/gnome2-apps/tomboy/HISTORY b/gnome2-apps/tomboy/HISTORY
index d1c7497..931e8dc 100644
--- a/gnome2-apps/tomboy/HISTORY
+++ b/gnome2-apps/tomboy/HISTORY
@@ -1,3 +1,6 @@
+2007-10-17 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 0.8.1
+
2007-09-21 Robin Cook <rcook AT wyrms.net>
* DETAILS: updated VERSION to 0.8.0

diff --git a/gnome2-apps/tomboy/tomboy-0.8.0.tar.gz.sig
b/gnome2-apps/tomboy/tomboy-0.8.0.tar.gz.sig
deleted file mode 100644
index f811e44..0000000
Binary files a/gnome2-apps/tomboy/tomboy-0.8.0.tar.gz.sig and /dev/null differ
diff --git a/gnome2-apps/tomboy/tomboy-0.8.1.tar.gz.sig
b/gnome2-apps/tomboy/tomboy-0.8.1.tar.gz.sig
new file mode 100644
index 0000000..ec8eec6
Binary files /dev/null and b/gnome2-apps/tomboy/tomboy-0.8.1.tar.gz.sig differ
diff --git a/gnome2-libs/at-spi/DETAILS b/gnome2-libs/at-spi/DETAILS
index ea02f79..464252d 100755
--- a/gnome2-libs/at-spi/DETAILS
+++ b/gnome2-libs/at-spi/DETAILS
@@ -1,5 +1,5 @@
SPELL=at-spi
- VERSION=1.20.0
+ VERSION=1.20.1
BRANCH=`echo $VERSION|cut -d . -f 1,2`
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/gnome2-libs/at-spi/HISTORY b/gnome2-libs/at-spi/HISTORY
index 2717d39..de86346 100644
--- a/gnome2-libs/at-spi/HISTORY
+++ b/gnome2-libs/at-spi/HISTORY
@@ -1,3 +1,6 @@
+2007-10-16 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 1.20.1
+
2007-09-19 Robin Cook <rcook AT wyrms.net>
* DETAILS: updated VERSION to 1.20.0

diff --git a/gnome2-libs/at-spi/at-spi-1.20.0.tar.bz2.sig
b/gnome2-libs/at-spi/at-spi-1.20.0.tar.bz2.sig
deleted file mode 100644
index 4cf5703..0000000
Binary files a/gnome2-libs/at-spi/at-spi-1.20.0.tar.bz2.sig and /dev/null
differ
diff --git a/gnome2-libs/at-spi/at-spi-1.20.1.tar.bz2.sig
b/gnome2-libs/at-spi/at-spi-1.20.1.tar.bz2.sig
new file mode 100644
index 0000000..007e9d5
Binary files /dev/null and b/gnome2-libs/at-spi/at-spi-1.20.1.tar.bz2.sig
differ
diff --git a/gnome2-libs/bug-buddy2/DETAILS b/gnome2-libs/bug-buddy2/DETAILS
index 8a38b9f..23617fd 100755
--- a/gnome2-libs/bug-buddy2/DETAILS
+++ b/gnome2-libs/bug-buddy2/DETAILS
@@ -1,5 +1,5 @@
SPELL=bug-buddy2
- VERSION=2.20.0
+ VERSION=2.20.1
BRANCH=`echo $VERSION|cut -d . -f 1,2`
SOURCE=bug-buddy-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/bug-buddy-$VERSION
diff --git a/gnome2-libs/bug-buddy2/HISTORY b/gnome2-libs/bug-buddy2/HISTORY
index ee8e5d1..38f7e05 100644
--- a/gnome2-libs/bug-buddy2/HISTORY
+++ b/gnome2-libs/bug-buddy2/HISTORY
@@ -1,3 +1,6 @@
+2007-10-08 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 2.20.1
+
2007-09-27 Eric Sandall <sandalle AT sourcemage.org>
* REPAIR^f28a3645c12b689590aaf423d217e22e^FUNCTIONS: Fix Bug #14014

diff --git a/gnome2-libs/bug-buddy2/bug-buddy-2.20.0.tar.bz2.sig
b/gnome2-libs/bug-buddy2/bug-buddy-2.20.0.tar.bz2.sig
deleted file mode 100644
index 182c9d4..0000000
Binary files a/gnome2-libs/bug-buddy2/bug-buddy-2.20.0.tar.bz2.sig and
/dev/null differ
diff --git a/gnome2-libs/bug-buddy2/bug-buddy-2.20.1.tar.bz2.sig
b/gnome2-libs/bug-buddy2/bug-buddy-2.20.1.tar.bz2.sig
new file mode 100644
index 0000000..b1b0ffc
Binary files /dev/null and
b/gnome2-libs/bug-buddy2/bug-buddy-2.20.1.tar.bz2.sig differ
diff --git a/gnome2-libs/dasher/DETAILS b/gnome2-libs/dasher/DETAILS
index adbd0f8..b04cdee 100755
--- a/gnome2-libs/dasher/DETAILS
+++ b/gnome2-libs/dasher/DETAILS
@@ -1,5 +1,5 @@
SPELL=dasher
- VERSION=4.6.0
+ VERSION=4.6.1
BRANCH=`echo $VERSION|cut -d . -f 1,2`
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/gnome2-libs/dasher/HISTORY b/gnome2-libs/dasher/HISTORY
index 1380bdd..4bebc8a 100644
--- a/gnome2-libs/dasher/HISTORY
+++ b/gnome2-libs/dasher/HISTORY
@@ -1,3 +1,6 @@
+2007-10-16 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 4.6.1
+
2007-09-20 Robin Cook <rcook AT wyrms.net>
* DETAILS: updated VERSION to 4.6.0

diff --git a/gnome2-libs/dasher/dasher-4.6.0.tar.bz2.sig
b/gnome2-libs/dasher/dasher-4.6.0.tar.bz2.sig
deleted file mode 100644
index 4ca2ad2..0000000
Binary files a/gnome2-libs/dasher/dasher-4.6.0.tar.bz2.sig and /dev/null
differ
diff --git a/gnome2-libs/dasher/dasher-4.6.1.tar.bz2.sig
b/gnome2-libs/dasher/dasher-4.6.1.tar.bz2.sig
new file mode 100644
index 0000000..1ec041e
Binary files /dev/null and b/gnome2-libs/dasher/dasher-4.6.1.tar.bz2.sig
differ
diff --git a/gnome2-libs/enchant/DETAILS b/gnome2-libs/enchant/DETAILS
index 506302a..e2b1677 100755
--- a/gnome2-libs/enchant/DETAILS
+++ b/gnome2-libs/enchant/DETAILS
@@ -1,5 +1,5 @@
SPELL=enchant
- VERSION=1.2.6
+ VERSION=1.3.0
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION

SOURCE_URL[0]=http://www.abisource.com/downloads/${SPELL}/${VERSION}/${SOURCE}
@@ -7,7 +7,6 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
LICENSE[0]=GPL
WEB_SITE=http://www.abisource.com/enchant
ENTERED=20040712
- UPDATED=20041119
KEYWORDS="gnome2 libs"
SHORT="Spell checking library that works with Abiword"
cat << EOF
diff --git a/gnome2-libs/enchant/HISTORY b/gnome2-libs/enchant/HISTORY
index a270ff0..2fb7f1a 100644
--- a/gnome2-libs/enchant/HISTORY
+++ b/gnome2-libs/enchant/HISTORY
@@ -1,3 +1,6 @@
+2007-10-24 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * DETAILS: updated spell to 1.3.0
+
2006-05-07 Robin Cook <rcook AT wyrms.net>
* DEPENDS: added glib2 (bug 11339)

diff --git a/gnome2-libs/enchant/enchant-1.2.6.tar.gz.sig
b/gnome2-libs/enchant/enchant-1.2.6.tar.gz.sig
deleted file mode 100644
index faf9194..0000000
Binary files a/gnome2-libs/enchant/enchant-1.2.6.tar.gz.sig and /dev/null
differ
diff --git a/gnome2-libs/enchant/enchant-1.3.0.tar.gz.sig
b/gnome2-libs/enchant/enchant-1.3.0.tar.gz.sig
new file mode 100644
index 0000000..b859ca3
Binary files /dev/null and b/gnome2-libs/enchant/enchant-1.3.0.tar.gz.sig
differ
diff --git a/gnome2-libs/evolution-data-server/DETAILS
b/gnome2-libs/evolution-data-server/DETAILS
index 796070b..e21533d 100755
--- a/gnome2-libs/evolution-data-server/DETAILS
+++ b/gnome2-libs/evolution-data-server/DETAILS
@@ -1,5 +1,5 @@
SPELL=evolution-data-server
- VERSION=1.12.0
+ VERSION=1.12.1
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-data-server/HISTORY
b/gnome2-libs/evolution-data-server/HISTORY
index 3fed51a..824b265 100644
--- a/gnome2-libs/evolution-data-server/HISTORY
+++ b/gnome2-libs/evolution-data-server/HISTORY
@@ -1,3 +1,6 @@
+2007-10-16 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 1.12.1
+
2007-09-20 Robin Cook <rcook AT wyrms.net>
* DETAILS: updated VERSION to 1.12.0

diff --git
a/gnome2-libs/evolution-data-server/evolution-data-server-1.12.0.tar.bz2.sig
b/gnome2-libs/evolution-data-server/evolution-data-server-1.12.0.tar.bz2.sig
deleted file mode 100644
index b7253c7..0000000
Binary files
a/gnome2-libs/evolution-data-server/evolution-data-server-1.12.0.tar.bz2.sig
and /dev/null differ
diff --git
a/gnome2-libs/evolution-data-server/evolution-data-server-1.12.1.tar.bz2.sig
b/gnome2-libs/evolution-data-server/evolution-data-server-1.12.1.tar.bz2.sig
new file mode 100644
index 0000000..70ac632
Binary files /dev/null and
b/gnome2-libs/evolution-data-server/evolution-data-server-1.12.1.tar.bz2.sig
differ
diff --git a/gnome2-libs/evolution-exchange/DETAILS
b/gnome2-libs/evolution-exchange/DETAILS
index 7e0f4fb..21c4fdf 100755
--- a/gnome2-libs/evolution-exchange/DETAILS
+++ b/gnome2-libs/evolution-exchange/DETAILS
@@ -1,5 +1,5 @@
SPELL=evolution-exchange
- VERSION=2.12.0
+ VERSION=2.12.1
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 5f57081..014f540 100644
--- a/gnome2-libs/evolution-exchange/HISTORY
+++ b/gnome2-libs/evolution-exchange/HISTORY
@@ -1,3 +1,6 @@
+2007-10-18 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 2.12.1
+
2007-09-21 Robin Cook <rcook AT wyrms.net>
* DETAILS: updated VERSION to 2.12.0

diff --git
a/gnome2-libs/evolution-exchange/evolution-exchange-2.12.0.tar.bz2.sig
b/gnome2-libs/evolution-exchange/evolution-exchange-2.12.0.tar.bz2.sig
deleted file mode 100644
index 71fed67..0000000
Binary files
a/gnome2-libs/evolution-exchange/evolution-exchange-2.12.0.tar.bz2.sig and
/dev/null differ
diff --git
a/gnome2-libs/evolution-exchange/evolution-exchange-2.12.1.tar.bz2.sig
b/gnome2-libs/evolution-exchange/evolution-exchange-2.12.1.tar.bz2.sig
new file mode 100644
index 0000000..d27571e
Binary files /dev/null and
b/gnome2-libs/evolution-exchange/evolution-exchange-2.12.1.tar.bz2.sig differ
diff --git a/gnome2-libs/gail/DETAILS b/gnome2-libs/gail/DETAILS
index 84f17ff..9172ce0 100755
--- a/gnome2-libs/gail/DETAILS
+++ b/gnome2-libs/gail/DETAILS
@@ -1,5 +1,5 @@
SPELL=gail
- VERSION=1.20.0
+ VERSION=1.20.1
BRANCH=`echo $VERSION|cut -d . -f 1,2`
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/gnome2-libs/gail/HISTORY b/gnome2-libs/gail/HISTORY
index 744f9e4..9a63bc8 100644
--- a/gnome2-libs/gail/HISTORY
+++ b/gnome2-libs/gail/HISTORY
@@ -1,3 +1,6 @@
+2007-10-16 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 1.20.1
+
2007-09-19 Robin Cook <rcook AT wyrms.net>
* DETAILS: updated VERSION to 1.20.0

diff --git a/gnome2-libs/gail/gail-1.20.0.tar.bz2.sig
b/gnome2-libs/gail/gail-1.20.0.tar.bz2.sig
deleted file mode 100644
index 2618e5c..0000000
Binary files a/gnome2-libs/gail/gail-1.20.0.tar.bz2.sig and /dev/null differ
diff --git a/gnome2-libs/gail/gail-1.20.1.tar.bz2.sig
b/gnome2-libs/gail/gail-1.20.1.tar.bz2.sig
new file mode 100644
index 0000000..a72da65
Binary files /dev/null and b/gnome2-libs/gail/gail-1.20.1.tar.bz2.sig differ
diff --git a/gnome2-libs/gconf2/DETAILS b/gnome2-libs/gconf2/DETAILS
index 03d2c3c..2d91f54 100755
--- a/gnome2-libs/gconf2/DETAILS
+++ b/gnome2-libs/gconf2/DETAILS
@@ -1,5 +1,5 @@
SPELL=gconf2
- VERSION=2.20.0
+ VERSION=2.20.1
BRANCH=`echo $VERSION|cut -d . -f 1,2`
SOURCE=GConf-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/GConf-$VERSION
diff --git a/gnome2-libs/gconf2/GConf-2.20.0.tar.bz2.sig
b/gnome2-libs/gconf2/GConf-2.20.0.tar.bz2.sig
deleted file mode 100644
index 27095c8..0000000
Binary files a/gnome2-libs/gconf2/GConf-2.20.0.tar.bz2.sig and /dev/null
differ
diff --git a/gnome2-libs/gconf2/GConf-2.20.1.tar.bz2.sig
b/gnome2-libs/gconf2/GConf-2.20.1.tar.bz2.sig
new file mode 100644
index 0000000..a084406
Binary files /dev/null and b/gnome2-libs/gconf2/GConf-2.20.1.tar.bz2.sig
differ
diff --git a/gnome2-libs/gconf2/HISTORY b/gnome2-libs/gconf2/HISTORY
index bd1d477..e39a33e 100644
--- a/gnome2-libs/gconf2/HISTORY
+++ b/gnome2-libs/gconf2/HISTORY
@@ -1,3 +1,6 @@
+2007-10-16 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 2.20.1
+
2007-09-19 Robin Cook <rcook AT wyrms.net>
* DETAILS: updated VERSION to 2.20.0

diff --git a/gnome2-libs/gdm2/DETAILS b/gnome2-libs/gdm2/DETAILS
index bd6f1f2..b6ddc24 100755
--- a/gnome2-libs/gdm2/DETAILS
+++ b/gnome2-libs/gdm2/DETAILS
@@ -1,5 +1,5 @@
SPELL=gdm2
- VERSION=2.20.0
+ VERSION=2.20.1
BRANCH=`echo $VERSION|cut -d . -f 1,2`
SOURCE=gdm-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/gdm-$VERSION
diff --git a/gnome2-libs/gdm2/HISTORY b/gnome2-libs/gdm2/HISTORY
index 82aef7f..026d632 100644
--- a/gnome2-libs/gdm2/HISTORY
+++ b/gnome2-libs/gdm2/HISTORY
@@ -1,3 +1,6 @@
+2007-10-16 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 2.20.1
+
2007-09-30 Arwed v. Merkatz <v.merkatz AT gmx.net>
* DEPENDS: fixed check for xorg-modular

diff --git a/gnome2-libs/gdm2/gdm-2.20.0.tar.bz2.sig
b/gnome2-libs/gdm2/gdm-2.20.0.tar.bz2.sig
deleted file mode 100644
index dc3202c..0000000
Binary files a/gnome2-libs/gdm2/gdm-2.20.0.tar.bz2.sig and /dev/null differ
diff --git a/gnome2-libs/gdm2/gdm-2.20.1.tar.bz2.sig
b/gnome2-libs/gdm2/gdm-2.20.1.tar.bz2.sig
new file mode 100644
index 0000000..aba4640
Binary files /dev/null and b/gnome2-libs/gdm2/gdm-2.20.1.tar.bz2.sig differ
diff --git a/gnome2-libs/glib2/DETAILS b/gnome2-libs/glib2/DETAILS
index bf4af80..025ec2a 100755
--- a/gnome2-libs/glib2/DETAILS
+++ b/gnome2-libs/glib2/DETAILS
@@ -1,5 +1,5 @@
SPELL=glib2
- VERSION=2.14.1
+ VERSION=2.14.2
BRANCH=`echo $VERSION | cut -d . -f 1,2`
SOURCE=glib-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/glib-$VERSION
diff --git a/gnome2-libs/glib2/HISTORY b/gnome2-libs/glib2/HISTORY
index 8986d05..422c536 100644
--- a/gnome2-libs/glib2/HISTORY
+++ b/gnome2-libs/glib2/HISTORY
@@ -1,3 +1,6 @@
+2007-10-16 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 2.14.2
+
2007-09-19 Robin Cook <rcook AT wyrms.net>
* DETAILS: updated VERSION to 2.14.1

diff --git a/gnome2-libs/glib2/glib-2.14.1.tar.bz2.sig
b/gnome2-libs/glib2/glib-2.14.1.tar.bz2.sig
deleted file mode 100644
index dc3c185..0000000
Binary files a/gnome2-libs/glib2/glib-2.14.1.tar.bz2.sig and /dev/null differ
diff --git a/gnome2-libs/glib2/glib-2.14.2.tar.bz2.sig
b/gnome2-libs/glib2/glib-2.14.2.tar.bz2.sig
new file mode 100644
index 0000000..b1b67b4
Binary files /dev/null and b/gnome2-libs/glib2/glib-2.14.2.tar.bz2.sig differ
diff --git a/gnome2-libs/glibmm/DETAILS b/gnome2-libs/glibmm/DETAILS
index a9aa2a7..3dfb86a 100755
--- a/gnome2-libs/glibmm/DETAILS
+++ b/gnome2-libs/glibmm/DETAILS
@@ -1,5 +1,5 @@
SPELL=glibmm
- VERSION=2.14.0
+ VERSION=2.14.2
BRANCH=`echo $VERSION|cut -d . -f 1,2`
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/gnome2-libs/glibmm/HISTORY b/gnome2-libs/glibmm/HISTORY
index a249346..619dedd 100644
--- a/gnome2-libs/glibmm/HISTORY
+++ b/gnome2-libs/glibmm/HISTORY
@@ -1,3 +1,9 @@
+2007-10-24 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 2.14.2
+
+2007-10-07 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 2.14.1
+
2007-09-22 Robin Cook <rcook AT wyrms.net>
* DETAILS: updated VERSION to 2.14.0

diff --git a/gnome2-libs/glibmm/glibmm-2.14.0.tar.bz2.sig
b/gnome2-libs/glibmm/glibmm-2.14.0.tar.bz2.sig
deleted file mode 100644
index 37981d8..0000000
Binary files a/gnome2-libs/glibmm/glibmm-2.14.0.tar.bz2.sig and /dev/null
differ
diff --git a/gnome2-libs/glibmm/glibmm-2.14.2.tar.bz2.sig
b/gnome2-libs/glibmm/glibmm-2.14.2.tar.bz2.sig
new file mode 100644
index 0000000..9093c1e
Binary files /dev/null and b/gnome2-libs/glibmm/glibmm-2.14.2.tar.bz2.sig
differ
diff --git a/gnome2-libs/gnome-control-center/DETAILS
b/gnome2-libs/gnome-control-center/DETAILS
index e4e487c..355eca6 100755
--- a/gnome2-libs/gnome-control-center/DETAILS
+++ b/gnome2-libs/gnome-control-center/DETAILS
@@ -1,5 +1,5 @@
SPELL=gnome-control-center
- VERSION=2.20.0.1
+ VERSION=2.20.1
BRANCH=`echo $VERSION|cut -d . -f 1,2`
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/gnome2-libs/gnome-control-center/HISTORY
b/gnome2-libs/gnome-control-center/HISTORY
index 6efc679..0385fd8 100644
--- a/gnome2-libs/gnome-control-center/HISTORY
+++ b/gnome2-libs/gnome-control-center/HISTORY
@@ -1,3 +1,6 @@
+2007-10-16 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 2.20.1
+
2007-09-27 Eric Sandall <sandalle AT sourcemage.org>
* REPAIR^f28a3645c12b689590aaf423d217e22e^FUNCTIONS: Fix Bug #14014

diff --git
a/gnome2-libs/gnome-control-center/gnome-control-center-2.20.0.1.tar.bz2.sig
b/gnome2-libs/gnome-control-center/gnome-control-center-2.20.0.1.tar.bz2.sig
deleted file mode 100644
index 18f90c0..0000000
Binary files
a/gnome2-libs/gnome-control-center/gnome-control-center-2.20.0.1.tar.bz2.sig
and /dev/null differ
diff --git
a/gnome2-libs/gnome-control-center/gnome-control-center-2.20.1.tar.bz2.sig
b/gnome2-libs/gnome-control-center/gnome-control-center-2.20.1.tar.bz2.sig
new file mode 100644
index 0000000..fad2df9
Binary files /dev/null and
b/gnome2-libs/gnome-control-center/gnome-control-center-2.20.1.tar.bz2.sig
differ
diff --git a/gnome2-libs/gnome-desktop/DETAILS
b/gnome2-libs/gnome-desktop/DETAILS
index cf00d91..a6fb334 100755
--- a/gnome2-libs/gnome-desktop/DETAILS
+++ b/gnome2-libs/gnome-desktop/DETAILS
@@ -1,5 +1,5 @@
SPELL=gnome-desktop
- VERSION=2.20.0
+ VERSION=2.20.1
BRANCH=`echo $VERSION|cut -d . -f 1,2`
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/gnome2-libs/gnome-desktop/HISTORY
b/gnome2-libs/gnome-desktop/HISTORY
index ac592a5..29f7cf8 100644
--- a/gnome2-libs/gnome-desktop/HISTORY
+++ b/gnome2-libs/gnome-desktop/HISTORY
@@ -1,3 +1,6 @@
+2007-10-16 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 2.20.1
+
2007-09-20 Robin Cook <rcook AT wyrms.net>
* DETAILS: updated VERSION to 2.20.0
* DEPENDS: change scrollkeeper to rarian
diff --git a/gnome2-libs/gnome-desktop/gnome-desktop-2.20.0.tar.bz2.sig
b/gnome2-libs/gnome-desktop/gnome-desktop-2.20.0.tar.bz2.sig
deleted file mode 100644
index 3327d7a..0000000
Binary files a/gnome2-libs/gnome-desktop/gnome-desktop-2.20.0.tar.bz2.sig and
/dev/null differ
diff --git a/gnome2-libs/gnome-desktop/gnome-desktop-2.20.1.tar.bz2.sig
b/gnome2-libs/gnome-desktop/gnome-desktop-2.20.1.tar.bz2.sig
new file mode 100644
index 0000000..f06f567
Binary files /dev/null and
b/gnome2-libs/gnome-desktop/gnome-desktop-2.20.1.tar.bz2.sig differ
diff --git a/gnome2-libs/gnome-games2/DETAILS
b/gnome2-libs/gnome-games2/DETAILS
index 551c1eb..c1fc1cb 100755
--- a/gnome2-libs/gnome-games2/DETAILS
+++ b/gnome2-libs/gnome-games2/DETAILS
@@ -1,5 +1,5 @@
SPELL=gnome-games2
- VERSION=2.20.0.1
+ VERSION=2.20.1
BRANCH=`echo $VERSION|cut -d . -f 1,2`
SOURCE=gnome-games-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/gnome-games-$VERSION
diff --git a/gnome2-libs/gnome-games2/HISTORY
b/gnome2-libs/gnome-games2/HISTORY
index 7fbf0ad..57f060f 100644
--- a/gnome2-libs/gnome-games2/HISTORY
+++ b/gnome2-libs/gnome-games2/HISTORY
@@ -1,3 +1,6 @@
+2007-10-16 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 2.20.1
+
2007-09-27 Eric Sandall <sandalle AT sourcemage.org>
* REPAIR^f28a3645c12b689590aaf423d217e22e^FUNCTIONS: Fix Bug #14014

diff --git a/gnome2-libs/gnome-games2/gnome-games-2.20.0.1.tar.bz2.sig
b/gnome2-libs/gnome-games2/gnome-games-2.20.0.1.tar.bz2.sig
deleted file mode 100644
index b66d251..0000000
Binary files a/gnome2-libs/gnome-games2/gnome-games-2.20.0.1.tar.bz2.sig and
/dev/null differ
diff --git a/gnome2-libs/gnome-games2/gnome-games-2.20.1.tar.bz2.sig
b/gnome2-libs/gnome-games2/gnome-games-2.20.1.tar.bz2.sig
new file mode 100644
index 0000000..a131707
Binary files /dev/null and
b/gnome2-libs/gnome-games2/gnome-games-2.20.1.tar.bz2.sig differ
diff --git a/gnome2-libs/gnome-keyring/DETAILS
b/gnome2-libs/gnome-keyring/DETAILS
index 39854bc..6f02c9e 100755
--- a/gnome2-libs/gnome-keyring/DETAILS
+++ b/gnome2-libs/gnome-keyring/DETAILS
@@ -1,5 +1,5 @@
SPELL=gnome-keyring
- VERSION=2.20.0
+ VERSION=2.20.1
BRANCH=`echo $VERSION|cut -d . -f 1,2`
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/gnome2-libs/gnome-keyring/HISTORY
b/gnome2-libs/gnome-keyring/HISTORY
index bf80696..1777923 100644
--- a/gnome2-libs/gnome-keyring/HISTORY
+++ b/gnome2-libs/gnome-keyring/HISTORY
@@ -1,3 +1,6 @@
+2007-10-16 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 2.20.1
+
2007-09-20 Robin Cook <rcook AT wyrms.net>
* DETAILS: updated VERSION to 2.20.0

diff --git a/gnome2-libs/gnome-keyring/gnome-keyring-2.20.0.tar.bz2.sig
b/gnome2-libs/gnome-keyring/gnome-keyring-2.20.0.tar.bz2.sig
deleted file mode 100644
index 75c98b1..0000000
Binary files a/gnome2-libs/gnome-keyring/gnome-keyring-2.20.0.tar.bz2.sig and
/dev/null differ
diff --git a/gnome2-libs/gnome-keyring/gnome-keyring-2.20.1.tar.bz2.sig
b/gnome2-libs/gnome-keyring/gnome-keyring-2.20.1.tar.bz2.sig
new file mode 100644
index 0000000..3ca6313
Binary files /dev/null and
b/gnome2-libs/gnome-keyring/gnome-keyring-2.20.1.tar.bz2.sig differ
diff --git a/gnome2-libs/gnome-menus/DETAILS b/gnome2-libs/gnome-menus/DETAILS
index 46bf5f4..ae655d6 100755
--- a/gnome2-libs/gnome-menus/DETAILS
+++ b/gnome2-libs/gnome-menus/DETAILS
@@ -1,6 +1,6 @@

SPELL=gnome-menus
- VERSION=2.20.0
+ VERSION=2.20.1
BRANCH=`echo $VERSION|cut -d . -f 1,2`
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/gnome2-libs/gnome-menus/HISTORY b/gnome2-libs/gnome-menus/HISTORY
index 62c7070..0ba30ec 100644
--- a/gnome2-libs/gnome-menus/HISTORY
+++ b/gnome2-libs/gnome-menus/HISTORY
@@ -1,3 +1,6 @@
+2007-10-16 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 2.20.1
+
2007-09-20 Robin Cook <rcook AT wyrms.net>
* DETAILS: updated VERSION to 2.20.0

diff --git a/gnome2-libs/gnome-menus/gnome-menus-2.20.0.tar.bz2.sig
b/gnome2-libs/gnome-menus/gnome-menus-2.20.0.tar.bz2.sig
deleted file mode 100644
index 6a7e127..0000000
Binary files a/gnome2-libs/gnome-menus/gnome-menus-2.20.0.tar.bz2.sig and
/dev/null differ
diff --git a/gnome2-libs/gnome-menus/gnome-menus-2.20.1.tar.bz2.sig
b/gnome2-libs/gnome-menus/gnome-menus-2.20.1.tar.bz2.sig
new file mode 100644
index 0000000..25ea690
Binary files /dev/null and
b/gnome2-libs/gnome-menus/gnome-menus-2.20.1.tar.bz2.sig differ
diff --git a/gnome2-libs/gnome-panel/DETAILS b/gnome2-libs/gnome-panel/DETAILS
index 054e834..3b60767 100755
--- a/gnome2-libs/gnome-panel/DETAILS
+++ b/gnome2-libs/gnome-panel/DETAILS
@@ -1,5 +1,5 @@
SPELL=gnome-panel
- VERSION=2.20.0.1
+ VERSION=2.20.1
BRANCH=`echo $VERSION|cut -d . -f 1,2`
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/gnome2-libs/gnome-panel/HISTORY b/gnome2-libs/gnome-panel/HISTORY
index ae3381e..7287344 100644
--- a/gnome2-libs/gnome-panel/HISTORY
+++ b/gnome2-libs/gnome-panel/HISTORY
@@ -1,3 +1,6 @@
+2007-10-16 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 2.20.1
+
2007-09-27 Eric Sandall <sandalle AT sourcemage.org>
* REPAIR^f28a3645c12b689590aaf423d217e22e^FUNCTIONS: Fix Bug #14014

diff --git a/gnome2-libs/gnome-panel/gnome-panel-2.20.0.1.tar.bz2.sig
b/gnome2-libs/gnome-panel/gnome-panel-2.20.0.1.tar.bz2.sig
deleted file mode 100644
index ee4aa71..0000000
Binary files a/gnome2-libs/gnome-panel/gnome-panel-2.20.0.1.tar.bz2.sig and
/dev/null differ
diff --git a/gnome2-libs/gnome-panel/gnome-panel-2.20.1.tar.bz2.sig
b/gnome2-libs/gnome-panel/gnome-panel-2.20.1.tar.bz2.sig
new file mode 100644
index 0000000..8cdfe79
Binary files /dev/null and
b/gnome2-libs/gnome-panel/gnome-panel-2.20.1.tar.bz2.sig differ
diff --git a/gnome2-libs/gnome-pilot/DEPENDS b/gnome2-libs/gnome-pilot/DEPENDS
index 8b088a3..386db5d 100755
--- a/gnome2-libs/gnome-pilot/DEPENDS
+++ b/gnome2-libs/gnome-pilot/DEPENDS
@@ -1,4 +1,4 @@
-depends control-center2 &&
-depends libglade2 &&
-depends gnome-panel &&
+depends gnome-control-center &&
+depends libglade2 &&
+depends gnome-panel &&
depends pilot-link
diff --git a/gnome2-libs/gnome-pilot/HISTORY b/gnome2-libs/gnome-pilot/HISTORY
index a605fe1..3d43574 100644
--- a/gnome2-libs/gnome-pilot/HISTORY
+++ b/gnome2-libs/gnome-pilot/HISTORY
@@ -1,3 +1,6 @@
+2007-10-20 Robin Cook <rcook AT wyrms.net>
+ * DEPENDS: change control-center2 gnome-control-center
+
2007-09-27 Eric Sandall <sandalle AT sourcemage.org>
* REPAIR^f28a3645c12b689590aaf423d217e22e^FUNCTIONS: Fix Bug #14014

diff --git a/gnome2-libs/gnome-session/DETAILS
b/gnome2-libs/gnome-session/DETAILS
index d26e528..e1c0d31 100755
--- a/gnome2-libs/gnome-session/DETAILS
+++ b/gnome2-libs/gnome-session/DETAILS
@@ -1,5 +1,5 @@
SPELL=gnome-session
- VERSION=2.20.0
+ VERSION=2.20.1
BRANCH=`echo $VERSION|cut -d . -f 1,2`
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/gnome2-libs/gnome-session/HISTORY
b/gnome2-libs/gnome-session/HISTORY
index 834e1ee..3103dc0 100644
--- a/gnome2-libs/gnome-session/HISTORY
+++ b/gnome2-libs/gnome-session/HISTORY
@@ -1,3 +1,6 @@
+2007-10-16 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 2.20.1
+
2007-09-27 Eric Sandall <sandalle AT sourcemage.org>
* REPAIR^f28a3645c12b689590aaf423d217e22e^FUNCTIONS: Fix Bug #14014

diff --git a/gnome2-libs/gnome-session/gnome-session-2.20.0.tar.bz2.sig
b/gnome2-libs/gnome-session/gnome-session-2.20.0.tar.bz2.sig
deleted file mode 100644
index 055aa0f..0000000
Binary files a/gnome2-libs/gnome-session/gnome-session-2.20.0.tar.bz2.sig and
/dev/null differ
diff --git a/gnome2-libs/gnome-session/gnome-session-2.20.1.tar.bz2.sig
b/gnome2-libs/gnome-session/gnome-session-2.20.1.tar.bz2.sig
new file mode 100644
index 0000000..54b3e22
Binary files /dev/null and
b/gnome2-libs/gnome-session/gnome-session-2.20.1.tar.bz2.sig differ
diff --git a/gnome2-libs/gnome-speech/HISTORY
b/gnome2-libs/gnome-speech/HISTORY
index f27d4d8..c1de7ce 100644
--- a/gnome2-libs/gnome-speech/HISTORY
+++ b/gnome2-libs/gnome-speech/HISTORY
@@ -1,3 +1,8 @@
+2007-11-29 Eric Sandall <sandalle AT sourcemage.org>
+ * According to the diff's ChangeLog, all that changed is:
+ configure.in, NEWS, README: prep for 0.4.16.
+ Fixes Bug #14009
+
2007-07-29 Robin Cook <rcook AT wyrms.net>
* DETAILS: updated VERSION to 0.4.16

diff --git a/gnome2-libs/gnome-speech/gnome-speech-0.4.16.tar.bz2.sig
b/gnome2-libs/gnome-speech/gnome-speech-0.4.16.tar.bz2.sig
index a2e2661..ed404cd 100644
Binary files a/gnome2-libs/gnome-speech/gnome-speech-0.4.16.tar.bz2.sig and
b/gnome2-libs/gnome-speech/gnome-speech-0.4.16.tar.bz2.sig differ
diff --git a/gnome2-libs/gnome-spell/DETAILS b/gnome2-libs/gnome-spell/DETAILS
index 3d4a04c..fea881a 100755
--- a/gnome2-libs/gnome-spell/DETAILS
+++ b/gnome2-libs/gnome-spell/DETAILS
@@ -1,5 +1,5 @@
SPELL=gnome-spell
- VERSION=1.0.7
+ VERSION=1.0.8
BRANCH=`echo $VERSION|cut -d . -f 1,2`
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
@@ -9,7 +9,6 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
LICENSE[0]=GPL
WEB_SITE=http://www.gnome.org
ENTERED=20020224
- UPDATED=20050211
KEYWORDS="gnome2 libs"
SHORT="Spellcheck for Gnome apps."
cat << EOF
diff --git a/gnome2-libs/gnome-spell/HISTORY b/gnome2-libs/gnome-spell/HISTORY
index a464285..d434971 100644
--- a/gnome2-libs/gnome-spell/HISTORY
+++ b/gnome2-libs/gnome-spell/HISTORY
@@ -1,3 +1,6 @@
+2007-10-16 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 1.0.8
+
2006-03-12 Karsten Behrmann <BearPerson AT sourcemage.org>
* DETAILS: (automated) Add KEYWORDS

diff --git a/gnome2-libs/gnome-spell/gnome-spell-1.0.7.tar.bz2.sig
b/gnome2-libs/gnome-spell/gnome-spell-1.0.7.tar.bz2.sig
deleted file mode 100644
index cfdf13d..0000000
Binary files a/gnome2-libs/gnome-spell/gnome-spell-1.0.7.tar.bz2.sig and
/dev/null differ
diff --git a/gnome2-libs/gnome-spell/gnome-spell-1.0.8.tar.bz2.sig
b/gnome2-libs/gnome-spell/gnome-spell-1.0.8.tar.bz2.sig
new file mode 100644
index 0000000..f2ad254
Binary files /dev/null and
b/gnome2-libs/gnome-spell/gnome-spell-1.0.8.tar.bz2.sig differ
diff --git a/gnome2-libs/gnome-system-monitor/DETAILS
b/gnome2-libs/gnome-system-monitor/DETAILS
index 8a68933..f97449d 100755
--- a/gnome2-libs/gnome-system-monitor/DETAILS
+++ b/gnome2-libs/gnome-system-monitor/DETAILS
@@ -1,5 +1,5 @@
SPELL=gnome-system-monitor
- VERSION=2.20.0
+ VERSION=2.20.1
BRANCH=`echo $VERSION|cut -d . -f 1,2`
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/gnome2-libs/gnome-system-monitor/HISTORY
b/gnome2-libs/gnome-system-monitor/HISTORY
index 9c7b472..481d8a1 100644
--- a/gnome2-libs/gnome-system-monitor/HISTORY
+++ b/gnome2-libs/gnome-system-monitor/HISTORY
@@ -1,3 +1,6 @@
+2007-10-16 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 2.20.1
+
2007-09-27 Eric Sandall <sandalle AT sourcemage.org>
* REPAIR^f28a3645c12b689590aaf423d217e22e^FUNCTIONS: Fix Bug #14014

diff --git
a/gnome2-libs/gnome-system-monitor/gnome-system-monitor-2.20.0.tar.bz2.sig
b/gnome2-libs/gnome-system-monitor/gnome-system-monitor-2.20.0.tar.bz2.sig
deleted file mode 100644
index 2363141..0000000
Binary files
a/gnome2-libs/gnome-system-monitor/gnome-system-monitor-2.20.0.tar.bz2.sig
and /dev/null differ
diff --git
a/gnome2-libs/gnome-system-monitor/gnome-system-monitor-2.20.1.tar.bz2.sig
b/gnome2-libs/gnome-system-monitor/gnome-system-monitor-2.20.1.tar.bz2.sig
new file mode 100644
index 0000000..55e1d24
Binary files /dev/null and
b/gnome2-libs/gnome-system-monitor/gnome-system-monitor-2.20.1.tar.bz2.sig
differ
diff --git a/gnome2-libs/gnome-themes/DETAILS
b/gnome2-libs/gnome-themes/DETAILS
index 41120b3..609213f 100755
--- a/gnome2-libs/gnome-themes/DETAILS
+++ b/gnome2-libs/gnome-themes/DETAILS
@@ -1,5 +1,5 @@
SPELL=gnome-themes
- VERSION=2.20.0
+ VERSION=2.20.1
BRANCH=`echo $VERSION|cut -d . -f 1,2`
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/gnome2-libs/gnome-themes/HISTORY
b/gnome2-libs/gnome-themes/HISTORY
index 40f9c1f..5722ec5 100644
--- a/gnome2-libs/gnome-themes/HISTORY
+++ b/gnome2-libs/gnome-themes/HISTORY
@@ -1,3 +1,6 @@
+2007-10-16 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 2.20.1
+
2007-09-20 Robin Cook <rcook AT wyrms.net>
* DETAILS: updated VERSION to 2.20.0

diff --git a/gnome2-libs/gnome-themes/gnome-themes-2.20.0.tar.bz2.sig
b/gnome2-libs/gnome-themes/gnome-themes-2.20.0.tar.bz2.sig
deleted file mode 100644
index 3728227..0000000
Binary files a/gnome2-libs/gnome-themes/gnome-themes-2.20.0.tar.bz2.sig and
/dev/null differ
diff --git a/gnome2-libs/gnome-themes/gnome-themes-2.20.1.tar.bz2.sig
b/gnome2-libs/gnome-themes/gnome-themes-2.20.1.tar.bz2.sig
new file mode 100644
index 0000000..3583254
Binary files /dev/null and
b/gnome2-libs/gnome-themes/gnome-themes-2.20.1.tar.bz2.sig differ
diff --git a/gnome2-libs/gnome2-user-docs/DETAILS
b/gnome2-libs/gnome2-user-docs/DETAILS
index 2983ee5..f94ccc2 100755
--- a/gnome2-libs/gnome2-user-docs/DETAILS
+++ b/gnome2-libs/gnome2-user-docs/DETAILS
@@ -1,5 +1,5 @@
SPELL=gnome2-user-docs
- VERSION=2.20.0
+ VERSION=2.20.1
BRANCH=`echo $VERSION | cut -d . -f 1,2`
SOURCE=gnome-user-docs-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/gnome-user-docs-$VERSION
diff --git a/gnome2-libs/gnome2-user-docs/HISTORY
b/gnome2-libs/gnome2-user-docs/HISTORY
index 06cf0da..832ebe5 100644
--- a/gnome2-libs/gnome2-user-docs/HISTORY
+++ b/gnome2-libs/gnome2-user-docs/HISTORY
@@ -1,3 +1,6 @@
+2007-10-16 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 2.20.1
+
2007-09-21 Robin Cook <rcook AT wyrms.net>
* DETAILS: updated VERSION to 2.20.0

diff --git a/gnome2-libs/gnome2-user-docs/gnome-user-docs-2.20.0.tar.bz2.sig
b/gnome2-libs/gnome2-user-docs/gnome-user-docs-2.20.0.tar.bz2.sig
deleted file mode 100644
index aa31a42..0000000
Binary files
a/gnome2-libs/gnome2-user-docs/gnome-user-docs-2.20.0.tar.bz2.sig and
/dev/null differ
diff --git a/gnome2-libs/gnome2-user-docs/gnome-user-docs-2.20.1.tar.bz2.sig
b/gnome2-libs/gnome2-user-docs/gnome-user-docs-2.20.1.tar.bz2.sig
new file mode 100644
index 0000000..ee5895c
Binary files /dev/null and
b/gnome2-libs/gnome2-user-docs/gnome-user-docs-2.20.1.tar.bz2.sig differ
diff --git a/gnome2-libs/goffice-0.5/DEPENDS b/gnome2-libs/goffice-0.5/DEPENDS
index cc5f95f..a84d6d4 100755
--- a/gnome2-libs/goffice-0.5/DEPENDS
+++ b/gnome2-libs/goffice-0.5/DEPENDS
@@ -1,6 +1,7 @@
depends glib2 &&
depends libgsf &&
depends xml-parser-expat &&
+depends libart_lgpl &&

optional_depends cairo \
'--with-cairo' \
diff --git a/gnome2-libs/goffice-0.5/DETAILS b/gnome2-libs/goffice-0.5/DETAILS
index f4a997c..5a6ed9e 100755
--- a/gnome2-libs/goffice-0.5/DETAILS
+++ b/gnome2-libs/goffice-0.5/DETAILS
@@ -1,5 +1,5 @@
SPELL=goffice-0.5
- VERSION=0.5.0
+ VERSION=0.5.2
BRANCH=${VERSION%\.*}
SOURCE=goffice-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/goffice-$VERSION
diff --git a/gnome2-libs/goffice-0.5/HISTORY b/gnome2-libs/goffice-0.5/HISTORY
index c1ae2b1..c743e26 100644
--- a/gnome2-libs/goffice-0.5/HISTORY
+++ b/gnome2-libs/goffice-0.5/HISTORY
@@ -1,2 +1,11 @@
+2007-11-04 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 0.5.2
+
+2007-10-19 George Sherwood <george AT beernbeer.com>
+ * DEPENDS: Added depends libart_lgpl
+
+2007-10-21 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 0.5.1
+
2007-09-22 Robin Cook <rcook AT wyrms.net>
* New spell made from goffice-dev
diff --git a/gnome2-libs/goffice-0.5/goffice-0.5.0.tar.bz2.sig
b/gnome2-libs/goffice-0.5/goffice-0.5.0.tar.bz2.sig
deleted file mode 100644
index 7488a46..0000000
Binary files a/gnome2-libs/goffice-0.5/goffice-0.5.0.tar.bz2.sig and
/dev/null differ
diff --git a/gnome2-libs/goffice-0.5/goffice-0.5.2.tar.bz2.sig
b/gnome2-libs/goffice-0.5/goffice-0.5.2.tar.bz2.sig
new file mode 100644
index 0000000..adf0326
Binary files /dev/null and
b/gnome2-libs/goffice-0.5/goffice-0.5.2.tar.bz2.sig differ
diff --git a/gnome2-libs/gtk-doc/DETAILS b/gnome2-libs/gtk-doc/DETAILS
index 67210fc..6f222c2 100755
--- a/gnome2-libs/gtk-doc/DETAILS
+++ b/gnome2-libs/gtk-doc/DETAILS
@@ -1,5 +1,5 @@
SPELL=gtk-doc
- VERSION=1.8
+ VERSION=1.9
BRANCH=`echo $VERSION | cut -d . -f 1,2`
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/gnome2-libs/gtk-doc/HISTORY b/gnome2-libs/gtk-doc/HISTORY
index 83eda26..b0ab023 100644
--- a/gnome2-libs/gtk-doc/HISTORY
+++ b/gnome2-libs/gtk-doc/HISTORY
@@ -1,3 +1,6 @@
+2007-10-02 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 1.9
+
2007-03-03 Robin Cook <rcook AT wyrms.net>
* DETAILS: updated VERSION to 1.8

diff --git a/gnome2-libs/gtk-doc/gtk-doc-1.8.tar.bz2.sig
b/gnome2-libs/gtk-doc/gtk-doc-1.8.tar.bz2.sig
deleted file mode 100644
index c96112b..0000000
Binary files a/gnome2-libs/gtk-doc/gtk-doc-1.8.tar.bz2.sig and /dev/null
differ
diff --git a/gnome2-libs/gtk-doc/gtk-doc-1.9.tar.bz2.sig
b/gnome2-libs/gtk-doc/gtk-doc-1.9.tar.bz2.sig
new file mode 100644
index 0000000..827ac07
Binary files /dev/null and b/gnome2-libs/gtk-doc/gtk-doc-1.9.tar.bz2.sig
differ
diff --git a/gnome2-libs/gtk-engines2/DETAILS
b/gnome2-libs/gtk-engines2/DETAILS
index 884d0c1..1807dc6 100755
--- a/gnome2-libs/gtk-engines2/DETAILS
+++ b/gnome2-libs/gtk-engines2/DETAILS
@@ -1,5 +1,5 @@
SPELL=gtk-engines2
- VERSION=2.12.1
+ VERSION=2.12.2
BRANCH=`echo $VERSION|cut -d . -f 1,2`
SOURCE=gtk-engines-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/gtk-engines-$VERSION
diff --git a/gnome2-libs/gtk-engines2/HISTORY
b/gnome2-libs/gtk-engines2/HISTORY
index c329115..2985c14 100644
--- a/gnome2-libs/gtk-engines2/HISTORY
+++ b/gnome2-libs/gtk-engines2/HISTORY
@@ -1,3 +1,6 @@
+2007-10-16 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 2.12.2
+
2007-09-22 Robin Cook <rcook AT wyrms.net>
* DETAILS: updated VERSION to 2.12.1

diff --git a/gnome2-libs/gtk-engines2/gtk-engines-2.12.1.tar.bz2.sig
b/gnome2-libs/gtk-engines2/gtk-engines-2.12.1.tar.bz2.sig
deleted file mode 100644
index 09e952b..0000000
Binary files a/gnome2-libs/gtk-engines2/gtk-engines-2.12.1.tar.bz2.sig and
/dev/null differ
diff --git a/gnome2-libs/gtk-engines2/gtk-engines-2.12.2.tar.bz2.sig
b/gnome2-libs/gtk-engines2/gtk-engines-2.12.2.tar.bz2.sig
new file mode 100644
index 0000000..de51b9a
Binary files /dev/null and
b/gnome2-libs/gtk-engines2/gtk-engines-2.12.2.tar.bz2.sig differ
diff --git a/gnome2-libs/gtkhtml2/DETAILS b/gnome2-libs/gtkhtml2/DETAILS
index e64e7be..0ba3c4d 100755
--- a/gnome2-libs/gtkhtml2/DETAILS
+++ b/gnome2-libs/gtkhtml2/DETAILS
@@ -1,5 +1,5 @@
SPELL=gtkhtml2
- VERSION=3.16.0
+ VERSION=3.16.1
BRANCH=`echo $VERSION|cut -d . -f 1,2`
SOURCE=gtkhtml-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/gtkhtml-$VERSION
diff --git a/gnome2-libs/gtkhtml2/HISTORY b/gnome2-libs/gtkhtml2/HISTORY
index b75cd12..193059c 100644
--- a/gnome2-libs/gtkhtml2/HISTORY
+++ b/gnome2-libs/gtkhtml2/HISTORY
@@ -1,3 +1,6 @@
+2007-10-16 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 3.16.1
+
2007-09-21 Robin Cook <rcook AT wyrms.net>
* DETAILS: updated VERSION to 3.16.0

diff --git a/gnome2-libs/gtkhtml2/gtkhtml-3.16.0.tar.bz2.sig
b/gnome2-libs/gtkhtml2/gtkhtml-3.16.0.tar.bz2.sig
deleted file mode 100644
index 6587236..0000000
Binary files a/gnome2-libs/gtkhtml2/gtkhtml-3.16.0.tar.bz2.sig and /dev/null
differ
diff --git a/gnome2-libs/gtkhtml2/gtkhtml-3.16.1.tar.bz2.sig
b/gnome2-libs/gtkhtml2/gtkhtml-3.16.1.tar.bz2.sig
new file mode 100644
index 0000000..c2eb912
Binary files /dev/null and b/gnome2-libs/gtkhtml2/gtkhtml-3.16.1.tar.bz2.sig
differ
diff --git a/gnome2-libs/gtksourceview/DETAILS
b/gnome2-libs/gtksourceview/DETAILS
index 896d338..8ddd722 100755
--- a/gnome2-libs/gtksourceview/DETAILS
+++ b/gnome2-libs/gtksourceview/DETAILS
@@ -1,5 +1,5 @@
SPELL=gtksourceview
- VERSION=2.0.0
+ VERSION=2.0.1
BRANCH=`echo $VERSION|cut -d . -f 1,2`
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/gnome2-libs/gtksourceview/HISTORY
b/gnome2-libs/gtksourceview/HISTORY
index e8f52ec..a3f8add 100644
--- a/gnome2-libs/gtksourceview/HISTORY
+++ b/gnome2-libs/gtksourceview/HISTORY
@@ -1,3 +1,6 @@
+2007-10-17 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 2.0.1
+
2007-09-20 Robin Cook <rcook AT wyrms.net>
* DETAILS: updated VERSION to 2.0.0

diff --git a/gnome2-libs/gtksourceview/gtksourceview-2.0.0.tar.bz2.sig
b/gnome2-libs/gtksourceview/gtksourceview-2.0.0.tar.bz2.sig
deleted file mode 100644
index de550bf..0000000
Binary files a/gnome2-libs/gtksourceview/gtksourceview-2.0.0.tar.bz2.sig and
/dev/null differ
diff --git a/gnome2-libs/gtksourceview/gtksourceview-2.0.1.tar.bz2.sig
b/gnome2-libs/gtksourceview/gtksourceview-2.0.1.tar.bz2.sig
new file mode 100644
index 0000000..110be6c
Binary files /dev/null and
b/gnome2-libs/gtksourceview/gtksourceview-2.0.1.tar.bz2.sig differ
diff --git a/gnome2-libs/java-access-bridge/DEPENDS
b/gnome2-libs/java-access-bridge/DEPENDS
index b14f241..acb7b86 100755
--- a/gnome2-libs/java-access-bridge/DEPENDS
+++ b/gnome2-libs/java-access-bridge/DEPENDS
@@ -1,7 +1,9 @@
source $GRIMOIRE/FUNCTIONS &&

-depends JAVA &&
-depends X11-LIBS &&
+depends JAVA &&
+depends X11-LIBS &&
+depends at-spi &&
+depends libbonobo &&

if check_if_xorg_modular_libs; then
depends xprop
diff --git a/gnome2-libs/java-access-bridge/HISTORY
b/gnome2-libs/java-access-bridge/HISTORY
index 65c7458..4459ebd 100644
--- a/gnome2-libs/java-access-bridge/HISTORY
+++ b/gnome2-libs/java-access-bridge/HISTORY
@@ -1,3 +1,6 @@
+2007-10-20 Robin Cook <rcook AT wyrms.net>
+ * DEPENDS: added at-spi and libbonobo
+
2007-09-26 Robin Cook <rcook AT wyrms.net>
* DETAILS: updated VERSION to 1.20.0

diff --git a/gnome2-libs/libbonobo/DETAILS b/gnome2-libs/libbonobo/DETAILS
index 21ea7a3..c433309 100755
--- a/gnome2-libs/libbonobo/DETAILS
+++ b/gnome2-libs/libbonobo/DETAILS
@@ -1,5 +1,5 @@
SPELL=libbonobo
- VERSION=2.20.0
+ VERSION=2.20.1
BRANCH=`echo $VERSION|cut -d . -f 1,2`
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/gnome2-libs/libbonobo/HISTORY b/gnome2-libs/libbonobo/HISTORY
index 9e98df9..d81d420 100644
--- a/gnome2-libs/libbonobo/HISTORY
+++ b/gnome2-libs/libbonobo/HISTORY
@@ -1,3 +1,6 @@
+2007-10-16 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 2.20.1
+
2007-09-19 Robin Cook <rcook AT wyrms.net>
* DETAILS: updated VERSION to 2.20.0

diff --git a/gnome2-libs/libbonobo/libbonobo-2.20.0.tar.bz2.sig
b/gnome2-libs/libbonobo/libbonobo-2.20.0.tar.bz2.sig
deleted file mode 100644
index 66b48e4..0000000
Binary files a/gnome2-libs/libbonobo/libbonobo-2.20.0.tar.bz2.sig and
/dev/null differ
diff --git a/gnome2-libs/libbonobo/libbonobo-2.20.1.tar.bz2.sig
b/gnome2-libs/libbonobo/libbonobo-2.20.1.tar.bz2.sig
new file mode 100644
index 0000000..177fe9c
Binary files /dev/null and
b/gnome2-libs/libbonobo/libbonobo-2.20.1.tar.bz2.sig differ
diff --git a/gnome2-libs/libgda3/DETAILS b/gnome2-libs/libgda3/DETAILS
index f9d4ed4..59d1ad5 100755
--- a/gnome2-libs/libgda3/DETAILS
+++ b/gnome2-libs/libgda3/DETAILS
@@ -1,11 +1,10 @@
SPELL=libgda3
- VERSION=3.1.1
-
SOURCE_HASH=sha512:a3efe57b86e924eb0f5b370ab3b90368611ba3351cb83cb8bb32213897e70a3ca6be36bd0983f78bfb042dbf048fca448cbe6566c0c80f9a217a4ce8c0458ed6
+ VERSION=3.1.2
BRANCH=`echo $VERSION|cut -d . -f 1,2`
SOURCE=libgda-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/libgda-$VERSION
SOURCE_URL[0]=$GNOME_URL/sources/libgda/$BRANCH/$SOURCE
-# SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
+ SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
LICENSE[0]="LGPL"
LICENSE[1]="GPL"
WEB_SITE=http://www.gnome-db.org
diff --git a/gnome2-libs/libgda3/HISTORY b/gnome2-libs/libgda3/HISTORY
index b296ad1..d495b51 100644
--- a/gnome2-libs/libgda3/HISTORY
+++ b/gnome2-libs/libgda3/HISTORY
@@ -1,3 +1,6 @@
+2007-10-24 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 3.1.2
+
2007-09-16 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 3.1.1

diff --git a/gnome2-libs/libgda3/libgda-3.1.2.tar.bz2.sig
b/gnome2-libs/libgda3/libgda-3.1.2.tar.bz2.sig
new file mode 100644
index 0000000..d0cdea5
Binary files /dev/null and b/gnome2-libs/libgda3/libgda-3.1.2.tar.bz2.sig
differ
diff --git a/gnome2-libs/libgnome/DETAILS b/gnome2-libs/libgnome/DETAILS
index c8c9d87..31935b5 100755
--- a/gnome2-libs/libgnome/DETAILS
+++ b/gnome2-libs/libgnome/DETAILS
@@ -1,5 +1,5 @@
SPELL=libgnome
- VERSION=2.20.0
+ VERSION=2.20.1.1
BRANCH=`echo $VERSION|cut -d . -f 1,2`
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/gnome2-libs/libgnome/HISTORY b/gnome2-libs/libgnome/HISTORY
index 093e6ac..cbe0682 100644
--- a/gnome2-libs/libgnome/HISTORY
+++ b/gnome2-libs/libgnome/HISTORY
@@ -1,3 +1,9 @@
+2007-10-17 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 2.20.1.1
+
+2007-10-16 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 2.20.1
+
2007-09-27 Eric Sandall <sandalle AT sourcemage.org>
* REPAIR^f28a3645c12b689590aaf423d217e22e^FUNCTIONS: Fix Bug #14014

diff --git a/gnome2-libs/libgnome/libgnome-2.20.0.tar.bz2.sig
b/gnome2-libs/libgnome/libgnome-2.20.0.tar.bz2.sig
deleted file mode 100644
index 146dfb8..0000000
Binary files a/gnome2-libs/libgnome/libgnome-2.20.0.tar.bz2.sig and /dev/null
differ
diff --git a/gnome2-libs/libgnome/libgnome-2.20.1.1.tar.bz2.sig
b/gnome2-libs/libgnome/libgnome-2.20.1.1.tar.bz2.sig
new file mode 100644
index 0000000..b21c78a
Binary files /dev/null and
b/gnome2-libs/libgnome/libgnome-2.20.1.1.tar.bz2.sig differ
diff --git a/gnome2-libs/libgnomecanvas/DETAILS
b/gnome2-libs/libgnomecanvas/DETAILS
index abe78e5..257b9f1 100755
--- a/gnome2-libs/libgnomecanvas/DETAILS
+++ b/gnome2-libs/libgnomecanvas/DETAILS
@@ -1,5 +1,5 @@
SPELL=libgnomecanvas
- VERSION=2.20.0
+ VERSION=2.20.1.1
BRANCH=`echo $VERSION|cut -d . -f 1,2`
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/gnome2-libs/libgnomecanvas/HISTORY
b/gnome2-libs/libgnomecanvas/HISTORY
index ec34689..22c3912 100644
--- a/gnome2-libs/libgnomecanvas/HISTORY
+++ b/gnome2-libs/libgnomecanvas/HISTORY
@@ -1,3 +1,9 @@
+2007-10-20 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 2.20.1.1
+
+2007-10-16 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 2.20.1
+
2007-09-19 Robin Cook <rcook AT wyrms.net>
* DETAILS: updated VERSION to 2.20.0

diff --git a/gnome2-libs/libgnomecanvas/libgnomecanvas-2.20.0.tar.bz2.sig
b/gnome2-libs/libgnomecanvas/libgnomecanvas-2.20.0.tar.bz2.sig
deleted file mode 100644
index b842f71..0000000
Binary files a/gnome2-libs/libgnomecanvas/libgnomecanvas-2.20.0.tar.bz2.sig
and /dev/null differ
diff --git a/gnome2-libs/libgnomecanvas/libgnomecanvas-2.20.1.1.tar.bz2.sig
b/gnome2-libs/libgnomecanvas/libgnomecanvas-2.20.1.1.tar.bz2.sig
new file mode 100644
index 0000000..2ae31f4
Binary files /dev/null and
b/gnome2-libs/libgnomecanvas/libgnomecanvas-2.20.1.1.tar.bz2.sig differ
diff --git a/gnome2-libs/libgnomedb3/DETAILS b/gnome2-libs/libgnomedb3/DETAILS
index f255526..bc75d80 100755
--- a/gnome2-libs/libgnomedb3/DETAILS
+++ b/gnome2-libs/libgnomedb3/DETAILS
@@ -1,11 +1,10 @@
SPELL=libgnomedb3
- VERSION=3.1.1
-
SOURCE_HASH=sha512:3839f5a8750d87df1e3e6bb980aabfceab70c81564801416c0490809e6e37c0d829d0f9627bbb95101affdbe6dae907635e537a1b9f4d7d3faf34e531a335c57
+ VERSION=3.1.2
BRANCH=`echo $VERSION | cut -d . -f 1,2`
SOURCE=libgnomedb-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/libgnomedb-$VERSION
SOURCE_URL[0]=$GNOME_URL/sources/libgnomedb/$BRANCH/$SOURCE
-# SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
+ SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
LICENSE[0]="LGPL"
LICENSE[1]="GPL"
WEB_SITE=http://www.gnome-db.org
diff --git a/gnome2-libs/libgnomedb3/HISTORY b/gnome2-libs/libgnomedb3/HISTORY
index e1e674f..7b815d4 100644
--- a/gnome2-libs/libgnomedb3/HISTORY
+++ b/gnome2-libs/libgnomedb3/HISTORY
@@ -1,3 +1,6 @@
+2007-10-24 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 3.1.2
+
2007-09-27 Eric Sandall <sandalle AT sourcemage.org>
* REPAIR^f28a3645c12b689590aaf423d217e22e^FUNCTIONS: Fix Bug #14014

diff --git a/gnome2-libs/libgnomedb3/libgnomedb-3.1.2.tar.bz2.sig
b/gnome2-libs/libgnomedb3/libgnomedb-3.1.2.tar.bz2.sig
new file mode 100644
index 0000000..e26f49e
Binary files /dev/null and
b/gnome2-libs/libgnomedb3/libgnomedb-3.1.2.tar.bz2.sig differ
diff --git a/gnome2-libs/libgnomeui/DETAILS b/gnome2-libs/libgnomeui/DETAILS
index eca7414..a7f4248 100755
--- a/gnome2-libs/libgnomeui/DETAILS
+++ b/gnome2-libs/libgnomeui/DETAILS
@@ -1,5 +1,5 @@
SPELL=libgnomeui
- VERSION=2.20.0
+ VERSION=2.20.1.1
BRANCH=`echo $VERSION|cut -d . -f 1,2`
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/gnome2-libs/libgnomeui/HISTORY b/gnome2-libs/libgnomeui/HISTORY
index 9379d13..43b04fe 100644
--- a/gnome2-libs/libgnomeui/HISTORY
+++ b/gnome2-libs/libgnomeui/HISTORY
@@ -1,3 +1,9 @@
+2007-10-17 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 2.20.1.1
+
+2007-10-16 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 2.20.1
+
2007-09-19 Robin Cook <rcook AT wyrms.net>
* DETAILS: updated VERSION to 2.20.0

diff --git a/gnome2-libs/libgnomeui/libgnomeui-2.20.0.tar.bz2.sig
b/gnome2-libs/libgnomeui/libgnomeui-2.20.0.tar.bz2.sig
deleted file mode 100644
index 2502e3c..0000000
Binary files a/gnome2-libs/libgnomeui/libgnomeui-2.20.0.tar.bz2.sig and
/dev/null differ
diff --git a/gnome2-libs/libgnomeui/libgnomeui-2.20.1.1.tar.bz2.sig
b/gnome2-libs/libgnomeui/libgnomeui-2.20.1.1.tar.bz2.sig
new file mode 100644
index 0000000..fd188c7
Binary files /dev/null and
b/gnome2-libs/libgnomeui/libgnomeui-2.20.1.1.tar.bz2.sig differ
diff --git a/gnome2-libs/librsvg2/BUILD b/gnome2-libs/librsvg2/BUILD
index d577bf0..08ae87d 100755
--- a/gnome2-libs/librsvg2/BUILD
+++ b/gnome2-libs/librsvg2/BUILD
@@ -4,12 +4,15 @@ else
OPTS="$OPTS --disable-gtk-theme"
fi &&

-CFLAGS="${CFLAGS} -I/usr/include/nspr" &&
+CFLAGS="${CFLAGS} -I${INSTALL_ROOT}/usr/include/nspr" &&

if test "$(get_spell_provider $SPELL GECKO)" = firefox; then
sedit 's:mozilla/plugins:firefox/plugins:' moz-plugin/Makefile.in &&
# note: needs to be exported or configure won't see it
export MOZILLA_CONFIG=firefox-config
+elif test "$(get_spell_provider $SPELL GECKO)" = iceweasel; then
+ sedit 's:mozilla/plugins:iceweasel/plugins:' moz-plugin/Makefile.in &&
+ export MOZILLA_CONFIG=iceweasel-config
elif test "$(get_spell_provider $SPELL GECKO)" = seamonkey; then
sedit 's:mozilla/plugins:seamonkey/plugins:' moz-plugin/Makefile.in &&
export MOZILLA_CONFIG=seamonkey-config
diff --git a/gnome2-libs/librsvg2/HISTORY b/gnome2-libs/librsvg2/HISTORY
index 3012c75..73951b3 100644
--- a/gnome2-libs/librsvg2/HISTORY
+++ b/gnome2-libs/librsvg2/HISTORY
@@ -1,3 +1,7 @@
+2007-10-22 Pol Vinogradov <vin.public AT gmail.com>
+ * BUILD: install_rootifying nspr include path, added
+ iceweasel support
+
2007-09-06 Robin Cook <rcook AT wyrms.net>
* DETAILS: updated VERSION to 2.18.2

diff --git a/gnome2-libs/libsoup/DETAILS b/gnome2-libs/libsoup/DETAILS
index c2fd2a0..27ef6c9 100755
--- a/gnome2-libs/libsoup/DETAILS
+++ b/gnome2-libs/libsoup/DETAILS
@@ -1,5 +1,5 @@
SPELL=libsoup
- VERSION=2.2.100
+ VERSION=2.2.103
BRANCH=`echo $VERSION|cut -d . -f 1,2`
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/gnome2-libs/libsoup/HISTORY b/gnome2-libs/libsoup/HISTORY
index 8876ca8..c0a8cb7 100644
--- a/gnome2-libs/libsoup/HISTORY
+++ b/gnome2-libs/libsoup/HISTORY
@@ -1,3 +1,12 @@
+2007-10-29 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 2.2.103
+
+2007-10-16 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 2.2.102
+
+2007-10-07 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 2.2.101
+
2007-02-27 Robin Cook <rcook AT wyrms.net>
* DETAILS: updated VERSION to 2.2.100

diff --git a/gnome2-libs/libsoup/libsoup-2.2.100.tar.bz2.sig
b/gnome2-libs/libsoup/libsoup-2.2.100.tar.bz2.sig
deleted file mode 100644
index 0e61595..0000000
Binary files a/gnome2-libs/libsoup/libsoup-2.2.100.tar.bz2.sig and /dev/null
differ
diff --git a/gnome2-libs/libsoup/libsoup-2.2.103.tar.bz2.sig
b/gnome2-libs/libsoup/libsoup-2.2.103.tar.bz2.sig
new file mode 100644
index 0000000..9b6509d
Binary files /dev/null and b/gnome2-libs/libsoup/libsoup-2.2.103.tar.bz2.sig
differ
diff --git a/gnome2-libs/libwnck/DETAILS b/gnome2-libs/libwnck/DETAILS
index 99eb3ba..d8f23fb 100755
--- a/gnome2-libs/libwnck/DETAILS
+++ b/gnome2-libs/libwnck/DETAILS
@@ -1,5 +1,5 @@
SPELL=libwnck
- VERSION=2.20.0
+ VERSION=2.20.1
BRANCH=`echo $VERSION|cut -d . -f 1,2`
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/gnome2-libs/libwnck/HISTORY b/gnome2-libs/libwnck/HISTORY
index 6d708f5..6dea5c7 100644
--- a/gnome2-libs/libwnck/HISTORY
+++ b/gnome2-libs/libwnck/HISTORY
@@ -1,3 +1,6 @@
+2007-10-16 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 2.20.1
+
2007-09-20 Robin Cook <rcook AT wyrms.net>
* DETAILS: updated VERSION to 2.20.0

diff --git a/gnome2-libs/libwnck/libwnck-2.20.0.tar.bz2.sig
b/gnome2-libs/libwnck/libwnck-2.20.0.tar.bz2.sig
deleted file mode 100644
index 4b4936e..0000000
Binary files a/gnome2-libs/libwnck/libwnck-2.20.0.tar.bz2.sig and /dev/null
differ
diff --git a/gnome2-libs/libwnck/libwnck-2.20.1.tar.bz2.sig
b/gnome2-libs/libwnck/libwnck-2.20.1.tar.bz2.sig
new file mode 100644
index 0000000..f3dc28f
Binary files /dev/null and b/gnome2-libs/libwnck/libwnck-2.20.1.tar.bz2.sig
differ
diff --git a/gnome2-libs/orbit2/DETAILS b/gnome2-libs/orbit2/DETAILS
index 6e5fc89..9649930 100755
--- a/gnome2-libs/orbit2/DETAILS
+++ b/gnome2-libs/orbit2/DETAILS
@@ -1,5 +1,5 @@
SPELL=orbit2
- VERSION=2.14.9
+ VERSION=2.14.10
BRANCH=`echo $VERSION|cut -d . -f 1,2`
SOURCE=ORBit2-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/ORBit2-$VERSION
diff --git a/gnome2-libs/orbit2/HISTORY b/gnome2-libs/orbit2/HISTORY
index e7d20ce..22b62e7 100644
--- a/gnome2-libs/orbit2/HISTORY
+++ b/gnome2-libs/orbit2/HISTORY
@@ -1,3 +1,6 @@
+2007-10-16 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 2.14.10
+
2007-09-19 Robin Cook <rcook AT wyrms.net>
* DETAILS: updated VERSION to 2.14.9

diff --git a/gnome2-libs/orbit2/ORBit2-2.14.10.tar.bz2.sig
b/gnome2-libs/orbit2/ORBit2-2.14.10.tar.bz2.sig
new file mode 100644
index 0000000..957e946
Binary files /dev/null and b/gnome2-libs/orbit2/ORBit2-2.14.10.tar.bz2.sig
differ
diff --git a/gnome2-libs/orbit2/ORBit2-2.14.9.tar.bz2.sig
b/gnome2-libs/orbit2/ORBit2-2.14.9.tar.bz2.sig
deleted file mode 100644
index 051595e..0000000
Binary files a/gnome2-libs/orbit2/ORBit2-2.14.9.tar.bz2.sig and /dev/null
differ
diff --git a/gnome2-libs/pango/DETAILS b/gnome2-libs/pango/DETAILS
index 56e763f..b5d3a7d 100755
--- a/gnome2-libs/pango/DETAILS
+++ b/gnome2-libs/pango/DETAILS
@@ -1,5 +1,5 @@
SPELL=pango
- VERSION=1.18.2
+ VERSION=1.18.3
BRANCH=`echo $VERSION|cut -d . -f 1,2`
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/gnome2-libs/pango/HISTORY b/gnome2-libs/pango/HISTORY
index 838bd29..753a730 100644
--- a/gnome2-libs/pango/HISTORY
+++ b/gnome2-libs/pango/HISTORY
@@ -1,3 +1,6 @@
+2007-10-16 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 1.18.3
+
2007-09-30 Arwed v. Merkatz <v.merkatz AT gmx.net>
* DEPENDS: use check_if_xorg_modular_libs so it works with xorg-libs
as X11 provider
diff --git a/gnome2-libs/pango/pango-1.18.2.tar.bz2.sig
b/gnome2-libs/pango/pango-1.18.2.tar.bz2.sig
deleted file mode 100644
index 530e2f2..0000000
Binary files a/gnome2-libs/pango/pango-1.18.2.tar.bz2.sig and /dev/null differ
diff --git a/gnome2-libs/pango/pango-1.18.3.tar.bz2.sig
b/gnome2-libs/pango/pango-1.18.3.tar.bz2.sig
new file mode 100644
index 0000000..2137e16
Binary files /dev/null and b/gnome2-libs/pango/pango-1.18.3.tar.bz2.sig differ
diff --git a/gnome2-libs/ruby-glib2/01-timeout_add_seconds.patch
b/gnome2-libs/ruby-glib2/01-timeout_add_seconds.patch
new file mode 100644
index 0000000..e885089
--- /dev/null
+++ b/gnome2-libs/ruby-glib2/01-timeout_add_seconds.patch
@@ -0,0 +1,108 @@
+--- rbglib_maincontext.c 2006/12/10 17:24:22 1.10
++++ rbglib_maincontext.c 2007/08/30 10:13:44 1.13
+@@ -3,8 +3,8 @@
+
+ rbglib_maincontext.c -
+
+- $Author: mutoh $
+- $Date: 2006/12/10 17:24:22 $
++ $Author: ktou $
++ $Date: 2007/08/30 10:13:44 $
+
+ Copyright (C) 2005 Masao Mutoh
+ ************************************************/
+@@ -54,7 +54,7 @@
+ callback_info_t *info = (callback_info_t *)data;
+ gboolean ret;
+
+- ret = RTEST(rb_funcall(info->callback, id_call, 0));
++ ret = RVAL2CBOOL(rb_funcall(info->callback, id_call, 0));
+ if (!ret)
+ G_REMOVE_RELATIVE(mGLibSource, id__callbacks__, UINT2NUM(info->id));
+ return ret;
+@@ -95,7 +95,7 @@
+ mc_iteration(self, may_block)
+ VALUE self, may_block;
+ {
+- return CBOOL2RVAL(g_main_context_iteration(_SELF(self),
RTEST(may_block)));
++ return CBOOL2RVAL(g_main_context_iteration(_SELF(self),
RVAL2CBOOL(may_block)));
+ }
+
+ static VALUE
+@@ -253,7 +253,7 @@
+ mc_set_poll_func(self)
+ VALUE self;
+ {
+- rb_ivar_set(self, id_poll_func, G_BLOCK_PROC());
++ rb_ivar_set(self, id_poll_func, rb_block_proc());
+ g_main_context_set_poll_func(_SELF(self), (GPollFunc)poll_func);
+
+ return self;
+@@ -331,19 +331,23 @@
+
+ #if GLIB_CHECK_VERSION(2,14,0)
+ static VALUE
+-timeout_add_seconds(VALUE self, VALUE interval)
++timeout_add_seconds(int argc, VALUE *argv, VALUE self)
+ {
+- VALUE func, rb_id;
++ VALUE interval, rb_priority, func, rb_id;
++ gint priority;
+ callback_info_t *info;
+ guint id;
+
+- func = G_BLOCK_PROC();
++ rb_scan_args(argc, argv, "11&", &interval, &rb_priority, &func);
+
++ priority = NIL_P(rb_priority) ? G_PRIORITY_DEFAULT :
INT2NUM(rb_priority);
+ info = ALLOC(callback_info_t);
+ info->callback = func;
+- id = g_timeout_add_seconds(NUM2UINT(interval),
+- (GSourceFunc)invoke_source_func,
+- (gpointer)info, g_free);
++ id = g_timeout_add_seconds_full(priority,
++ NUM2UINT(interval),
++ (GSourceFunc)invoke_source_func,
++ (gpointer)info,
++ g_free);
+ info->id = id;
+ rb_id = UINT2NUM(id);
+ G_RELATIVE2(mGLibSource, func, id__callbacks__, rb_id);
+@@ -372,15 +376,15 @@
+
+ rb_scan_args(argc, argv, "02", &arg1, &arg2);
+
+- if (RTEST(rb_obj_is_kind_of(arg1, rb_cProc))) {
++ if (RVAL2CBOOL(rb_obj_is_kind_of(arg1, rb_cProc))) {
+ priority = G_PRIORITY_DEFAULT;
+ func = arg1;
+- } else if (RTEST(rb_obj_is_kind_of(arg1, rb_cInteger))) {
++ } else if (RVAL2CBOOL(rb_obj_is_kind_of(arg1, rb_cInteger))) {
+ priority = NUM2INT(arg1);
+- func = G_BLOCK_PROC();
++ func = rb_block_proc();
+ } else {
+ priority = G_PRIORITY_DEFAULT;
+- func = G_BLOCK_PROC();
++ func = rb_block_proc();
+ }
+
+ info = ALLOC(callback_info_t);
+@@ -427,7 +431,7 @@
+ child_watch_add(self, pid)
+ VALUE self, pid;
+ {
+- VALUE func = G_BLOCK_PROC();
++ VALUE func = rb_block_proc();
+ G_RELATIVE(self, func);
+ return UINT2NUM(g_child_watch_add((GPid)NUM2INT(pid),
+ (GChildWatchFunc)child_watch_func,
(gpointer)func));
+@@ -488,7 +492,7 @@
+ #endif
+ rb_define_module_function(timeout, "add", timeout_add, -1);
+ #if GLIB_CHECK_VERSION(2,14,0)
+- rb_define_module_function(timeout, "add_seconds", timeout_add_seconds,
1);
++ rb_define_module_function(timeout, "add_seconds", timeout_add_seconds,
-1);
+ #endif
+ rb_define_module_function(idle, "source_new", idle_source_new, 0);
+ rb_define_module_function(idle, "add", idle_add, -1);
diff --git a/gnome2-libs/ruby-glib2/02-unicode.patch
b/gnome2-libs/ruby-glib2/02-unicode.patch
new file mode 100644
index 0000000..2c0d17a
--- /dev/null
+++ b/gnome2-libs/ruby-glib2/02-unicode.patch
@@ -0,0 +1,167 @@
+--- rbglib_unicode.c 2006/12/16 05:01:30 1.7
++++ rbglib_unicode.c 2007/08/30 10:16:35 1.9
+@@ -3,8 +3,8 @@
+
+ rbglib_unicode.c -
+
+- $Author: mutoh $
+- $Date: 2006/12/16 05:01:30 $
++ $Author: ktou $
++ $Date: 2007/08/30 10:16:35 $
+
+ Copyright (C) 2006 Kouhei Sutou
+
+@@ -100,7 +100,7 @@
+ gint len;
+
+ original_str = StringValuePtr(rb_ucs4);
+- len = RSTRING(rb_ucs4)->len;
++ len = RSTRING_LEN(rb_ucs4);
+ ucs4 = g_memdup(original_str, len);
+ g_unicode_canonical_ordering(ucs4, len);
+ normalized_ucs4 = rb_str_new((const char *)ucs4, len);
+@@ -140,7 +140,7 @@
+ rbglib_m_unichar_get_script(VALUE self, VALUE unichar)
+ {
+ return GENUM2RVAL(g_unichar_get_script(NUM2UINT(unichar)),
+- G_TYPE_UNICODE_SCRIPT_TYPE);
++ G_TYPE_UNICODE_SCRIPT);
+ }
+ #endif
+
+@@ -154,8 +154,8 @@
+
+ if (RVAL2CBOOL(validate)) {
+ StringValue(utf8);
+- result = g_utf8_get_char_validated(RSTRING(utf8)->ptr,
+- RSTRING(utf8)->len);
++ result = g_utf8_get_char_validated(RSTRING_PTR(utf8),
++ RSTRING_LEN(utf8));
+ if (result == (gunichar)-1) {
+ return INT2NUM(-1);
+ } else if (result == (gunichar)-2) {
+@@ -174,7 +174,7 @@
+ gchar *utf8;
+
+ utf8 = StringValueCStr(rb_utf8);
+- return INT2NUM(g_utf8_strlen(utf8, RSTRING(rb_utf8)->len));
++ return INT2NUM(g_utf8_strlen(utf8, RSTRING_LEN(rb_utf8)));
+ }
+
+ static VALUE
+@@ -184,7 +184,7 @@
+ gchar *utf8, *reversed_utf8;
+
+ utf8 = StringValueCStr(rb_utf8);
+- reversed_utf8 = g_utf8_strreverse(utf8, RSTRING(rb_utf8)->len);
++ reversed_utf8 = g_utf8_strreverse(utf8, RSTRING_LEN(rb_utf8));
+ result = rb_str_new2(reversed_utf8);
+ g_free(reversed_utf8);
+ return result;
+@@ -194,7 +194,7 @@
+ rbglib_m_utf8_validate(VALUE self, VALUE str)
+ {
+ StringValue(str);
+- return CBOOL2RVAL(g_utf8_validate(RSTRING(str)->ptr, RSTRING(str)->len,
++ return CBOOL2RVAL(g_utf8_validate(RSTRING_PTR(str), RSTRING_LEN(str),
+ NULL));
+ }
+
+@@ -205,7 +205,7 @@
+ gchar *utf8, *upcased_utf8;
+
+ utf8 = StringValueCStr(rb_utf8);
+- upcased_utf8 = g_utf8_strup(utf8, RSTRING(rb_utf8)->len);
++ upcased_utf8 = g_utf8_strup(utf8, RSTRING_LEN(rb_utf8));
+ result = rb_str_new2(upcased_utf8);
+ g_free(upcased_utf8);
+ return result;
+@@ -218,7 +218,7 @@
+ gchar *utf8, *downcased_utf8;
+
+ utf8 = StringValueCStr(rb_utf8);
+- downcased_utf8 = g_utf8_strdown(utf8, RSTRING(rb_utf8)->len);
++ downcased_utf8 = g_utf8_strdown(utf8, RSTRING_LEN(rb_utf8));
+ result = rb_str_new2(downcased_utf8);
+ g_free(downcased_utf8);
+ return result;
+@@ -231,7 +231,7 @@
+ gchar *utf8, *casefolded_utf8;
+
+ utf8 = StringValueCStr(rb_utf8);
+- casefolded_utf8 = g_utf8_casefold(utf8, RSTRING(rb_utf8)->len);
++ casefolded_utf8 = g_utf8_casefold(utf8, RSTRING_LEN(rb_utf8));
+ result = rb_str_new2(casefolded_utf8);
+ g_free(casefolded_utf8);
+ return result;
+@@ -250,7 +250,7 @@
+ mode = RVAL2GENUM(rb_mode, G_TYPE_NORMALIZE_MODE);
+
+ utf8 = StringValueCStr(rb_utf8);
+- normalized_utf8 = g_utf8_normalize(utf8, RSTRING(rb_utf8)->len, mode);
++ normalized_utf8 = g_utf8_normalize(utf8, RSTRING_LEN(rb_utf8), mode);
+ result = rb_str_new2(normalized_utf8);
+ g_free(normalized_utf8);
+ return result;
+@@ -273,7 +273,7 @@
+ rb_scan_args(argc, argv, "11", &rb_utf8, &for_filename);
+
+ utf8 = StringValueCStr(rb_utf8);
+- len = RSTRING(rb_utf8)->len;
++ len = RSTRING_LEN(rb_utf8);
+ #if GLIB_CHECK_VERSION(2,8,0)
+ if (RVAL2CBOOL(for_filename))
+ key = g_utf8_collate_key_for_filename(utf8, len);
+@@ -296,7 +296,7 @@
+ GError *error = NULL;
+
+ utf8 = StringValueCStr(rb_utf8);
+- len = RSTRING(rb_utf8)->len;
++ len = RSTRING_LEN(rb_utf8);
+
+ utf16 = g_utf8_to_utf16(utf8, len, NULL, &items_written, &error);
+
+@@ -319,7 +319,7 @@
+ rb_scan_args(argc, argv, "11", &rb_utf8, &is_fast);
+
+ utf8 = StringValueCStr(rb_utf8);
+- len = RSTRING(rb_utf8)->len;
++ len = RSTRING_LEN(rb_utf8);
+
+ if (RVAL2CBOOL(is_fast)) {
+ ucs4 = g_utf8_to_ucs4_fast(utf8, len, &items_written);
+@@ -346,7 +346,7 @@
+ GError *error = NULL;
+
+ utf16 = (gunichar2 *)StringValueCStr(rb_utf16);
+- len = RSTRING(rb_utf16)->len / sizeof(*utf16);
++ len = RSTRING_LEN(rb_utf16) / sizeof(*utf16);
+
+ ucs4 = g_utf16_to_ucs4(utf16, len, NULL, &items_written, &error);
+
+@@ -368,7 +368,7 @@
+ GError *error = NULL;
+
+ utf16 = (gunichar2 *)StringValueCStr(rb_utf16);
+- len = RSTRING(rb_utf16)->len / sizeof(*utf16);
++ len = RSTRING_LEN(rb_utf16) / sizeof(*utf16);
+
+ utf8 = g_utf16_to_utf8(utf16, len, NULL, &items_written, &error);
+
+@@ -390,7 +390,7 @@
+ GError *error = NULL;
+
+ ucs4 = (gunichar *)StringValuePtr(rb_ucs4);
+- len = RSTRING(rb_ucs4)->len / sizeof(*ucs4);
++ len = RSTRING_LEN(rb_ucs4) / sizeof(*ucs4);
+
+ utf16 = g_ucs4_to_utf16(ucs4, len, NULL, &items_written, &error);
+
+@@ -412,7 +412,7 @@
+ GError *error = NULL;
+
+ ucs4 = (gunichar *)StringValuePtr(rb_ucs4);
+- len = RSTRING(rb_ucs4)->len / sizeof(*ucs4);
++ len = RSTRING_LEN(rb_ucs4) / sizeof(*ucs4);
+
+ utf8 = g_ucs4_to_utf8(ucs4, len, NULL, &items_written, &error);
diff --git a/gnome2-libs/ruby-glib2/HISTORY b/gnome2-libs/ruby-glib2/HISTORY
index efef09c..8473181 100644
--- a/gnome2-libs/ruby-glib2/HISTORY
+++ b/gnome2-libs/ruby-glib2/HISTORY
@@ -1,3 +1,12 @@
+2007-12-01 Eric Sandall <sandalle AT sourcemage.org>
+ * 01-timeout_add_seconds.patch: Patch between 1.10 and 1.13 from
+ Revision 1.12 from
http://ruby-gnome2.cvs.sourceforge.net/ruby-gnome2/ruby-gnome2/glib/src/rbglib_maincontext.c?view=log
+ Fixes Bug #14114
+ * 02-unicode.patch: Patch from 1.7 to 1.9 from
+ Revision 1.12 from
http://ruby-gnome2.cvs.sourceforge.net/ruby-gnome2/ruby-gnome2/glib/src/rbglib_maincontext.c?view=log
+ Fixes another compile issue with glib2 > 2.14.1
+ * PRE_BUILD: Apply patches in-order
+
2007-03-18 Robin Cook <rcook AT wyrms.net>
* DETAILS: updated VERSION to 0.16.0

diff --git a/gnome2-libs/ruby-glib2/PRE_BUILD
b/gnome2-libs/ruby-glib2/PRE_BUILD
new file mode 100755
index 0000000..7ed2d8c
--- /dev/null
+++ b/gnome2-libs/ruby-glib2/PRE_BUILD
@@ -0,0 +1,5 @@
+default_pre_build &&
+patch $SOURCE_DIRECTORY/glib/src/rbglib_maincontext.c \
+ $SCRIPT_DIRECTORY/01-timeout_add_seconds.patch &&
+patch $SOURCE_DIRECTORY/glib/src/rbglib_unicode.c \
+ $SCRIPT_DIRECTORY/02-unicode.patch
diff --git a/gnome2-libs/vino/DETAILS b/gnome2-libs/vino/DETAILS
index 5073b7c..e3d7b78 100755
--- a/gnome2-libs/vino/DETAILS
+++ b/gnome2-libs/vino/DETAILS
@@ -1,5 +1,5 @@
SPELL=vino
- VERSION=2.20.0
+ VERSION=2.20.1
BRANCH=`echo $VERSION|cut -d . -f 1,2`
SOURCE=${SPELL}-${VERSION}.tar.bz2
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
diff --git a/gnome2-libs/vino/HISTORY b/gnome2-libs/vino/HISTORY
index 7fd212f..d5a1cf3 100644
--- a/gnome2-libs/vino/HISTORY
+++ b/gnome2-libs/vino/HISTORY
@@ -1,3 +1,6 @@
+2007-10-16 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 2.20.1
+
2007-09-27 Eric Sandall <sandalle AT sourcemage.org>
* REPAIR^f28a3645c12b689590aaf423d217e22e^FUNCTIONS: Fix Bug #14014

diff --git a/gnome2-libs/vino/vino-2.20.0.tar.bz2.sig
b/gnome2-libs/vino/vino-2.20.0.tar.bz2.sig
deleted file mode 100644
index a9608b3..0000000
Binary files a/gnome2-libs/vino/vino-2.20.0.tar.bz2.sig and /dev/null differ
diff --git a/gnome2-libs/vino/vino-2.20.1.tar.bz2.sig
b/gnome2-libs/vino/vino-2.20.1.tar.bz2.sig
new file mode 100644
index 0000000..ad4e4a7
Binary files /dev/null and b/gnome2-libs/vino/vino-2.20.1.tar.bz2.sig differ
diff --git a/gnu.gpg b/gnu.gpg
index 10af771..017d1e7 100644
Binary files a/gnu.gpg and b/gnu.gpg differ
diff --git a/gnu/ada/DETAILS b/gnu/ada/DETAILS
index 021eb03..1de328e 100755
--- a/gnu/ada/DETAILS
+++ b/gnu/ada/DETAILS
@@ -1,5 +1,5 @@
SPELL=ada
- VERSION=4.1.2
+ VERSION=4.2.2
SOURCE=gcc-core-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/gcc-$VERSION
SOURCE_URL[0]=$GNU_URL/gcc/gcc-$VERSION/$SOURCE
@@ -8,7 +8,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/gcc-$VERSION
SOURCE2_URL[0]=$GNU_URL/gcc/gcc-$VERSION/$SOURCE2
SOURCE2_URL[1]=ftp://gcc.gnu.org/pub/gcc/releases/gcc-$VERSION/$SOURCE2
SOURCE3=gnat-4.1.1-i386-pc-linux-gnu.tar.bz2
- SOURCE3_GPG=gurus.gpg:$SOURCE3.sig:UPSTREAM_HASH
+ SOURCE3_GPG=gurus.gpg:$SOURCE3.sig:UPSTREAM_KEY
SOURCE3_URL[0]=http://download.sourcemage.org/distro/$SOURCE3

#upstream signatures
diff --git a/gnu/ada/HISTORY b/gnu/ada/HISTORY
index c013270..dc0e83e 100644
--- a/gnu/ada/HISTORY
+++ b/gnu/ada/HISTORY
@@ -1,3 +1,13 @@
+2007-10-09 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
+ * DETAILS: Fixed SOURCE_URL[0]
+ updated spell to 4.2.2
+
+2007-08-15 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * DETAILS: updated to 4.2.1
+
+2007-05-19 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * DETAILS: updated spell to 4.2.0; fixed the gnat verification
+
2007-02-14 Treeve Jelbert <treeve AT oi.be>
* DETAILS: version 4.1.2
convert to upstream signatures
diff --git a/gnu/fortran/DETAILS b/gnu/fortran/DETAILS
index d05b128..21755d9 100755
--- a/gnu/fortran/DETAILS
+++ b/gnu/fortran/DETAILS
@@ -1,5 +1,5 @@
SPELL=fortran
- VERSION=4.1.2
+ VERSION=4.2.2
SOURCE=gcc-core-$VERSION.tar.bz2
# SOURCE_GPG=gurus.gpg:$SOURCE.sig:WORKS_FOR_ME
SOURCE_DIRECTORY=$BUILD_DIRECTORY/gcc-$VERSION
diff --git a/gnu/fortran/HISTORY b/gnu/fortran/HISTORY
index 286c6a1..0fbc3df 100644
--- a/gnu/fortran/HISTORY
+++ b/gnu/fortran/HISTORY
@@ -1,3 +1,13 @@
+2007-10-09 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
+ * DETAILS: updated spell to 4.2.2
+ fixed WEB_SITE
+
+2007-08-15 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * DETAILS: updated to 4.2.1
+
+2007-05-18 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * DETAILS: updated spell to 4.2.0
+
2007-02-16 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* CONFLICTS: removed, deprecation complete

diff --git a/gnu/g++/DETAILS b/gnu/g++/DETAILS
index 02c0acc..e156fcb 100755
--- a/gnu/g++/DETAILS
+++ b/gnu/g++/DETAILS
@@ -1,5 +1,5 @@
SPELL=g++
- VERSION=4.1.2
+ VERSION=4.2.2
SOURCE=gcc-core-$VERSION.tar.bz2
# SOURCE_GPG=gurus.gpg:$SOURCE.sig:WORKS_FOR_ME
SOURCE_DIRECTORY=$BUILD_DIRECTORY/gcc-$VERSION
diff --git a/gnu/g++/HISTORY b/gnu/g++/HISTORY
index 09e8b5c..3e637ff 100644
--- a/gnu/g++/HISTORY
+++ b/gnu/g++/HISTORY
@@ -1,3 +1,13 @@
+2007-10-09 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
+ * DETAILS: updated spell to 4.2.2
+ fixed WEB_SITE
+
+2007-08-15 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * DETAILS: updated to 4.2.1
+
+2007-05-18 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * DETAILS: updated spell to 4.2.0
+
2007-03-01 Eric Sandall <sandalle AT sourcemage.org>
* BUILD: -ffast-math also breaks with pentium-m

diff --git a/gnu/gcc/DETAILS b/gnu/gcc/DETAILS
index b7bf8f1..fc9c322 100755
--- a/gnu/gcc/DETAILS
+++ b/gnu/gcc/DETAILS
@@ -1,5 +1,5 @@
SPELL=gcc
- VERSION=4.1.2
+ VERSION=4.2.2
SOURCE=gcc-core-$VERSION.tar.bz2
SOURCE2=$SOURCE.sig
SOURCE_DIRECTORY=$BUILD_DIRECTORY/gcc-$VERSION
@@ -8,11 +8,11 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/gcc-$VERSION
SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
SOURCE_GPG=gnu.gpg:$SOURCE.sig:UPSTREAM_KEY
SOURCE2_IGNORE=signature
-
LICENSE[0]=GPL
WEB_SITE=http://gcc.gnu.org/
ENTERED=20040420
DOCS="$DOCS INSTALL"
+ PATCHLEVEL=1
KEYWORDS="compiler"
SHORT="the GNU C compiler"
cat << EOF
diff --git a/gnu/gcc/HISTORY b/gnu/gcc/HISTORY
index f8c6505..42d227d 100644
--- a/gnu/gcc/HISTORY
+++ b/gnu/gcc/HISTORY
@@ -1,3 +1,18 @@
+2007-10-20 David Brown <dmlb2000 AT gmail.com>
+ * INSTALL: make sure if they are using lib64 to compile in the linker
+ as if it was in /lib64
+ * DETAILS: patchlevel++
+
+2007-10-09 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
+ * DETAILS: updated spell to 4.2.2
+ fixed WEB_SITE
+
+2007-08-15 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * DETAILS: updated to 4.2.1
+
+2007-05-18 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * DETAILS: updated spell to 4.2.0
+
2007-03-01 Eric Sandall <sandalle AT sourcemage.org>
* BUILD: -ffast-math also breaks with pentium-m

diff --git a/gnu/gcc/INSTALL b/gnu/gcc/INSTALL
index db5e393..7ed5d01 100755
--- a/gnu/gcc/INSTALL
+++ b/gnu/gcc/INSTALL
@@ -22,6 +22,11 @@ ln -sf ${TRACK_ROOT}/usr/bin/cpp ${INSTALL_ROOT}/lib
&&
local SPECSDIR=${INSTALL_ROOT}/usr/lib/gcc/$HOST/$VERSION &&
mkdir -p $SPECSDIR/specs-local &&
cp gcc/specs $SPECSDIR/specs-local/specs-gcc &&
+if [[ $HOST == x86_64-* && $GCC_NOLIB64 == n ]]
+then
+ # make sure the linker gets compiled in as a /lib64 one
+ sed -i 's#/lib/ld-linux-x86-64.so.2#/lib64/ld-linux-x86-64.so.2#'
$SPECSDIR/specs-local/specs-gcc
+fi &&
# make sure installwatch tracks it, the cat alone doesn't do that
touch $SPECSDIR/specs &&
cat $SPECSDIR/specs-local/* > $SPECSDIR/specs
diff --git a/gnu/gcj/DEPENDS b/gnu/gcj/DEPENDS
index f025ea2..f4f2486 100755
--- a/gnu/gcj/DEPENDS
+++ b/gnu/gcj/DEPENDS
@@ -7,4 +7,6 @@ fi
&&
if [[ $VERSION != $(installed_version gcc) ]]; then
force_depends gcc
fi &&
-depends smgl-archspecs
+depends smgl-archspecs &&
+depends unzip &&
+depends zip
diff --git a/gnu/gcj/DETAILS b/gnu/gcj/DETAILS
index 7a5ac27..c29df1d 100755
--- a/gnu/gcj/DETAILS
+++ b/gnu/gcj/DETAILS
@@ -1,5 +1,5 @@
SPELL=gcj
- VERSION=4.1.2
+ VERSION=4.2.2
SOURCE=gcc-core-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/gcc-$VERSION
SOURCE_URL[0]=$GNU_URL/gcc/gcc-$VERSION/$SOURCE
diff --git a/gnu/gcj/HISTORY b/gnu/gcj/HISTORY
index 24664f7..bca31d4 100644
--- a/gnu/gcj/HISTORY
+++ b/gnu/gcj/HISTORY
@@ -1,3 +1,15 @@
+2007-10-09 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
+ * DETAILS: updated spell to 4.2.2
+
+2007-08-15 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * DETAILS: updated to 4.2.1
+
+2007-05-22 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * DEPENDS: added zip and unzip for fastjar
+
+2007-05-19 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * DETAILS: updated spell to 4.2.0
+
2007-02-14 Treeve Jelbert <treeve AT oi.be>
* DETAILS: version 4.1.2
convert to upstream signatures
diff --git a/gnu/objc/DETAILS b/gnu/objc/DETAILS
index f7a822e..c255016 100755
--- a/gnu/objc/DETAILS
+++ b/gnu/objc/DETAILS
@@ -1,5 +1,5 @@
SPELL=objc
- VERSION=4.1.2
+ VERSION=4.2.2
SOURCE=gcc-core-$VERSION.tar.bz2
# SOURCE_GPG=gurus.gpg:$SOURCE.sig:WORKS_FOR_ME
SOURCE2=gcc-$SPELL-$VERSION.tar.bz2
diff --git a/gnu/objc/HISTORY b/gnu/objc/HISTORY
index bd9aff3..8809564 100644
--- a/gnu/objc/HISTORY
+++ b/gnu/objc/HISTORY
@@ -1,3 +1,13 @@
+2007-10-09 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
+ * DETAILS: updated spell to 4.2.2
+ fixed WEB_SITE
+
+2007-08-15 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * DETAILS: updated to 4.2.1
+
+2007-05-18 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * DETAILS: updated spell to 4.2.0
+
2007-02-14 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 4.1.2
convert to upstream signatures
diff --git a/graphics-libs/freetype2/DETAILS b/graphics-libs/freetype2/DETAILS
index 41c6288..4b1b7fe 100755
--- a/graphics-libs/freetype2/DETAILS
+++ b/graphics-libs/freetype2/DETAILS
@@ -1,5 +1,5 @@
SPELL=freetype2
- VERSION=2.3.5
+ VERSION=2.3.4
SECURITY_PATCH=1
SOURCE=freetype-$VERSION.tar.bz2
SOURCE2=$SOURCE.sig
diff --git a/graphics-libs/freetype2/HISTORY b/graphics-libs/freetype2/HISTORY
index 006bfb0..967f1fb 100644
--- a/graphics-libs/freetype2/HISTORY
+++ b/graphics-libs/freetype2/HISTORY
@@ -1,6 +1,3 @@
-2007-07-03 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 2.3.5
-
2007-04-10 Elisamuel Resto <ryuji AT mages.ath.cx>
* DETAILS: version 2.3.4

diff --git a/graphics-libs/libpng/DETAILS b/graphics-libs/libpng/DETAILS
index 298d874..5014cc3 100755
--- a/graphics-libs/libpng/DETAILS
+++ b/graphics-libs/libpng/DETAILS
@@ -1,6 +1,6 @@
SPELL=libpng
- VERSION=1.2.20
-
SOURCE_HASH=sha512:114a2fc6a60d4f5a4cc2f8e71bbdc52708424cdacdf3e192f5511a134af9eca1f9f702b20b86f953b0b3fa5fde52424dd10616523693ccca7a8772950974e108
+ VERSION=1.2.22
+
SOURCE_HASH=sha512:6138eff3791d2f1e45d79ee8d8e40c93dcbdea86337b2c78513b2065a816e00ef7c2ccd4abee5084872095d6803df14bf8b9580ab3ee0eb9caf1351b09bbe9ce
SECURITY_PATCH=2
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/graphics-libs/libpng/HISTORY b/graphics-libs/libpng/HISTORY
index f491fce..0f920d9 100644
--- a/graphics-libs/libpng/HISTORY
+++ b/graphics-libs/libpng/HISTORY
@@ -1,3 +1,9 @@
+2007-10-14 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.2.21
+
+2007-10-04 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 1.2.21
+
2007-09-08 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.2.20

diff --git a/graphics-libs/poppler-data/DETAILS
b/graphics-libs/poppler-data/DETAILS
index 6cd371d..c60714e 100755
--- a/graphics-libs/poppler-data/DETAILS
+++ b/graphics-libs/poppler-data/DETAILS
@@ -1,5 +1,5 @@
SPELL=poppler-data
- VERSION=0.1
+ VERSION=0.1.1
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://poppler.freedesktop.org/$SOURCE
diff --git a/graphics-libs/poppler-data/HISTORY
b/graphics-libs/poppler-data/HISTORY
index 7457460..7dbd5a9 100644
--- a/graphics-libs/poppler-data/HISTORY
+++ b/graphics-libs/poppler-data/HISTORY
@@ -1,2 +1,5 @@
+2007-10-29 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 0.1.1
+
2007-09-12 Robin Cook <rcook AT wyrms.net>
* Initial Spell: DETAILS, PRE_BUILD, BUILD, HISTORY
diff --git a/graphics-libs/poppler-data/poppler-data-0.1.1.tar.gz.sig
b/graphics-libs/poppler-data/poppler-data-0.1.1.tar.gz.sig
new file mode 100644
index 0000000..bd18e1d
Binary files /dev/null and
b/graphics-libs/poppler-data/poppler-data-0.1.1.tar.gz.sig differ
diff --git a/graphics-libs/poppler-data/poppler-data-0.1.tar.gz.sig
b/graphics-libs/poppler-data/poppler-data-0.1.tar.gz.sig
deleted file mode 100644
index c36d1c3..0000000
Binary files a/graphics-libs/poppler-data/poppler-data-0.1.tar.gz.sig and
/dev/null differ
diff --git a/graphics-libs/poppler/DETAILS b/graphics-libs/poppler/DETAILS
index 00e3a54..4cb8be8 100755
--- a/graphics-libs/poppler/DETAILS
+++ b/graphics-libs/poppler/DETAILS
@@ -11,15 +11,17 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-cvs

SOURCE_URL[0]=cvs://:pserver:anoncvs AT cvs.freedesktop.org:/cvs/poppler:poppler
SOURCE_IGNORE=volatile
else
- VERSION=0.6
+ VERSION=0.6.2
+
SOURCE_HASH=sha512:c7861579aefd063e996d3da29dfc3e38aa9deba242b640ea8c8c6acac78802e686571d052743d44dc60328314d3d85641673080907c7c23f28705c4a36ea7203
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://poppler.freedesktop.org/$SOURCE
- SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
+# SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
fi
WEB_SITE=http://poppler.freedesktop.org/
LICENSE[0]=GPL
ENTERED=20050502
+ SECURITY_PATCH=1
SHORT="a PDF rendering library"
cat << EOF
Poppler is a PDF rendering library based on the xpdf-3.0 code base.
diff --git a/graphics-libs/poppler/HISTORY b/graphics-libs/poppler/HISTORY
index 03168ca..cf1769f 100644
--- a/graphics-libs/poppler/HISTORY
+++ b/graphics-libs/poppler/HISTORY
@@ -1,3 +1,13 @@
+2007-11-10 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.6.2
+ SECURITY_PATCH++
+ fixes CVE-2007-4352, CVE-2007-5392 and CVE-2007-5393
+ bug #14095
+
+2007-10-13 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.6.1
+ * PRE_BUILD: remove sedit
+
2007-09-15 Pol Vinogradov <vin.public AT gmail.com>
* DEPENDS: fixed annoying typo

diff --git a/graphics-libs/poppler/PRE_BUILD b/graphics-libs/poppler/PRE_BUILD
index c4e1347..df74cbd 100755
--- a/graphics-libs/poppler/PRE_BUILD
+++ b/graphics-libs/poppler/PRE_BUILD
@@ -3,8 +3,4 @@ cd $SOURCE_DIRECTORY &&

if [ "$POPPLER_CVS" == "y" ]; then
NOCONFIGURE=ON ./autogen.sh
-else
- sedit "s/glib >= 2.6/glib-2.0 >= 2.6/" configure.ac &&
- sedit "9i#include <cstdlib>" qt/test-poppler-qt.cpp &&
- autoreconf
fi
diff --git a/graphics-libs/rmagick/DETAILS b/graphics-libs/rmagick/DETAILS
index 0846574..538e374 100755
--- a/graphics-libs/rmagick/DETAILS
+++ b/graphics-libs/rmagick/DETAILS
@@ -1,8 +1,8 @@
SPELL=rmagick
- VERSION=2.0.0-beta3
+ VERSION=2.0.0-beta5
SOURCE=RMagick-${VERSION}.tar.bz2
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/RMagick-${VERSION:0:5}
- SOURCE_URL[0]=http://rubyforge.org/frs/download.php/25311/$SOURCE
+ SOURCE_URL[0]=http://rubyforge.org/frs/download.php/27092/$SOURCE
SOURCE_GPG="gurus.gpg:${SOURCE}.sig:WORKS_FOR_ME"
WEB_SITE=http://rmagick.rubyforge.org/
ENTERED=20051105
diff --git a/graphics-libs/rmagick/HISTORY b/graphics-libs/rmagick/HISTORY
index e61393f..8ce5ff5 100644
--- a/graphics-libs/rmagick/HISTORY
+++ b/graphics-libs/rmagick/HISTORY
@@ -1,3 +1,6 @@
+2007-11-01 Pol Vinogradov <vin.public AT gmail.com>
+ * DETAILS: updated to 2.0.0-beta5
+
2007-09-16 Pol Vinogradov <vin.public AT gmail.com>
* DETAILS: updated to 2.0.0-beta3

diff --git a/graphics-libs/rmagick/RMagick-2.0.0-beta3.tar.bz2.sig
b/graphics-libs/rmagick/RMagick-2.0.0-beta3.tar.bz2.sig
deleted file mode 100644
index c75f2cd..0000000
Binary files a/graphics-libs/rmagick/RMagick-2.0.0-beta3.tar.bz2.sig and
/dev/null differ
diff --git a/graphics-libs/rmagick/RMagick-2.0.0-beta5.tar.bz2.sig
b/graphics-libs/rmagick/RMagick-2.0.0-beta5.tar.bz2.sig
new file mode 100644
index 0000000..5aa847a
Binary files /dev/null and
b/graphics-libs/rmagick/RMagick-2.0.0-beta5.tar.bz2.sig differ
diff --git a/graphics/gimp-help-2/DETAILS b/graphics/gimp-help-2/DETAILS
index 60c2483..8b79424 100755
--- a/graphics/gimp-help-2/DETAILS
+++ b/graphics/gimp-help-2/DETAILS
@@ -1,8 +1,8 @@
SPELL=gimp-help-2
- VERSION=0.12
+ VERSION=0.13
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-
SOURCE_HASH=sha512:3a47c93d229c13dcad4095ee9c621ee95e25672a37298edc99f6ac5b6a4571c1c7b53ed680ae6321111cb67bf71a8dae323b54ab6024a278dd3f9201c24bca73
+ SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
SOURCE_URL[0]=ftp://ftp.gimp.org/pub/gimp/help/$SOURCE
WEB_SITE=http://www.gimp.org/
ENTERED=20041221
diff --git a/graphics/gimp-help-2/HISTORY b/graphics/gimp-help-2/HISTORY
index c79a64f..06e877a 100644
--- a/graphics/gimp-help-2/HISTORY
+++ b/graphics/gimp-help-2/HISTORY
@@ -1,3 +1,6 @@
+2007-10-29 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 0.13
+
2007-03-25 Eric Sandall <sandalle AT sourcemage.org>
* DEPENDS: Fix misquote (Bug #13655)

diff --git a/graphics/gimp-help-2/gimp-help-2-0.13.tar.gz.sig
b/graphics/gimp-help-2/gimp-help-2-0.13.tar.gz.sig
new file mode 100644
index 0000000..9bb9cb2
Binary files /dev/null and b/graphics/gimp-help-2/gimp-help-2-0.13.tar.gz.sig
differ
diff --git a/graphics/gimp/DEPENDS b/graphics/gimp/DEPENDS
index 56c9104..07816bc 100755
--- a/graphics/gimp/DEPENDS
+++ b/graphics/gimp/DEPENDS
@@ -1,24 +1,13 @@
-if [ "$GIMP_DEVEL" == "y" ];then
- depends pygtk2 &&
- optional_depends poppler '' '' 'pdf support' &&
- optional_depends dbus-glib \
- "--with-dbus" \
- "--without-dbus" \
- "for D-Bus support"
-else
- optional_depends gimp-print \
- "" \
- "--disable-print" \
- "to support printing from gimp" &&
-
- optional_depends pygtk2 "--enable-python" "--disable-python" \
- "for python scripting support"
-fi &&
-
+depends pygtk2 &&
depends gtk+2 &&
depends libart_lgpl &&
depends xml-parser-expat &&

+optional_depends poppler '' '' 'pdf support' &&
+optional_depends dbus-glib \
+ "--with-dbus" \
+ "--without-dbus" \
+ "for D-Bus support" &&
optional_depends lcms \
"" \
"" \
diff --git a/graphics/gimp/DETAILS b/graphics/gimp/DETAILS
index 37d1a36..dd42eda 100755
--- a/graphics/gimp/DETAILS
+++ b/graphics/gimp/DETAILS
@@ -1,12 +1,12 @@
SPELL=gimp

if [ "$GIMP_DEVEL" == "y" ];then
- VERSION=2.4.0-rc3
+ VERSION=2.4.1
SOURCE=$SPELL-$VERSION.tar.bz2
-
SOURCE_HASH=sha512:3f880c3b3f15f1cc6d501c285bff4b18ae0a90c46dbfbbd02598c955a03813ff37baa3fe0c2d5b256fb3918e80db6ff79190a0a5fbae6b020f5ed43a0a72dc5c
+ SOURCE_GPG="gurus.gpg:${SOURCE}.sig:WORKS_FOR_ME"
SOURCE_URL[0]=ftp://ftp.gimp.org/pub/gimp/v${VERSION%.*}/testing/$SOURCE
else
- VERSION=2.2.17
+ VERSION=2.4.1
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_URL[0]=ftp://ftp.gimp.org/pub/gimp/v${VERSION%.*}/$SOURCE
SOURCE_GPG="gurus.gpg:${SOURCE}.sig:WORKS_FOR_ME"
diff --git a/graphics/gimp/HISTORY b/graphics/gimp/HISTORY
index d5c19c2..fd053ab 100644
--- a/graphics/gimp/HISTORY
+++ b/graphics/gimp/HISTORY
@@ -1,3 +1,10 @@
+2007-11-01 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * DETAILS: updated to 2.4.1
+
+2007-10-24 George Sherwood <george AT beernabeer.com>
+ * DETAILS: Updated stable and devel to 2.4.0
+ * DEPENDS: Cleaned up for version 2.4.0
+
2007-09-26 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 2.4.0-rc3 (devel)\
* DEPENDS: gimp-print is only for stable
diff --git a/graphics/gimp/gimp-2.2.17.tar.bz2.sig
b/graphics/gimp/gimp-2.2.17.tar.bz2.sig
deleted file mode 100644
index 5372da4..0000000
Binary files a/graphics/gimp/gimp-2.2.17.tar.bz2.sig and /dev/null differ
diff --git a/graphics/gimp/gimp-2.4.1.tar.bz2.sig
b/graphics/gimp/gimp-2.4.1.tar.bz2.sig
new file mode 100644
index 0000000..cbf6f90
Binary files /dev/null and b/graphics/gimp/gimp-2.4.1.tar.bz2.sig differ
diff --git a/graphics/gscan2pdf/DETAILS b/graphics/gscan2pdf/DETAILS
index 8967c1a..26ee01a 100755
--- a/graphics/gscan2pdf/DETAILS
+++ b/graphics/gscan2pdf/DETAILS
@@ -1,8 +1,8 @@
SPELL=gscan2pdf
- VERSION=0.9.16
+ VERSION=0.9.17
SOURCE="${SPELL}-${VERSION}.tar.gz"
SOURCE_URL[0]=$SOURCEFORGE_URL/${SPELL}/${SOURCE}
-
SOURCE_HASH=sha512:acce4717473e6533d3bb7b08357f59a77be4597974af416956496bb9fa445f2de6c44fa77f26a24f0c3ddf3b39ec723467ab03d8e2b617afbd2000ec23eca2f2
+
SOURCE_HASH=sha512:65f6c4f2022661ed9d2d29e439c332b963bdd8b8478c9c3f6a05e769b6e957522bdaa65c4e2400ff5403166472128aa0d55f8285e0e517664628937de29e4cd0
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
WEB_SITE="http://gscan2pdf.sourceforge.net/";
LICENSE[0]=GPL
diff --git a/graphics/gscan2pdf/HISTORY b/graphics/gscan2pdf/HISTORY
index 662e9a8..a88ae3e 100644
--- a/graphics/gscan2pdf/HISTORY
+++ b/graphics/gscan2pdf/HISTORY
@@ -1,2 +1,5 @@
+2007-10-03 George Sherwood <george AT beernabeer.com>
+ * DETAILS: Updated to version 0.9.17
+
2007-08-25 George Sherwood <george AT beernabeer.com>
* DETAILS, DEPENDS, HISTORY: created spell
diff --git a/graphics/imagemagick/DETAILS b/graphics/imagemagick/DETAILS
index c49a8e4..ca9cea3 100755
--- a/graphics/imagemagick/DETAILS
+++ b/graphics/imagemagick/DETAILS
@@ -1,9 +1,12 @@
SPELL=imagemagick
- VERSION=6.3.5-10
+ VERSION=6.3.6-8
SECURITY_PATCH=1
SOURCE=ImageMagick-${VERSION}.tar.bz2
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/ImageMagick-${VERSION/-*/}
SOURCE_URL[0]=ftp://ftp.imagemagick.org/pub/ImageMagick/$SOURCE
+ SOURCE_URL[1]=ftp://ftp.surfnet.nl/pub/ImageMagick/$SOURCE
+ SOURCE_URL[2]=ftp://ftp.nluug.nl/pub/ImageMagick/$SOURCE
+ SOURCE_URL[3]=http://image_magick.veidrodis.com/image_magick/$SOURCE
SOURCE_GPG="gurus.gpg:${SOURCE}.sig:WORKS_FOR_ME"
WEB_SITE=http://www.imagemagick.org/
ENTERED=20010922
diff --git a/graphics/imagemagick/HISTORY b/graphics/imagemagick/HISTORY
index b34c3ba..bcfc537 100644
--- a/graphics/imagemagick/HISTORY
+++ b/graphics/imagemagick/HISTORY
@@ -1,3 +1,27 @@
+2007-12-01 Remko van der Vossen <wich AT sourcemage.org>
+ * DETAILS: Added 3 mirrors (which also have older releases available)
+
+2007-11-06 George Sherwood <george AT beernabeer.com>
+ * DETAILS: Updated to version 6.3.6-8
+
+2007-11-04 George Sherwood <george AT beernabeer.com>
+ * DETAILS: Updated to version 6.3.6-6
+
+2007-11-02 George Sherwood <george AT beernabeer.com>
+ * DETAILS: Updated to version 6.3.6-5
+
+2007-10-23 George Sherwood <george AT beernabeer.com>
+ * DETAILS: Updated to version 6.3.6-3
+
+2007-10-15 George Sherwood <george AT beernabeer.com>
+ * DETAILS: Updated to version 6.3.6-2
+
+2007-10-10 George Sherwood <george AT beernabeer.com>
+ * DETAILS: Updated to version 6.3.6-1
+
+2007-10-03 George Sherwood <george AT beernabeer.com>
+ * DETAILS: Updated to version 6.3.6-0
+
2007-09-30 Arwed v. Merkatz <v.merkatz AT gmx.net>
* DEPENDS: fixed check for xorg-modular

diff --git a/graphics/imagemagick/ImageMagick-6.3.5-10.tar.bz2.sig
b/graphics/imagemagick/ImageMagick-6.3.5-10.tar.bz2.sig
deleted file mode 100644
index 3dc62fb..0000000
Binary files a/graphics/imagemagick/ImageMagick-6.3.5-10.tar.bz2.sig and
/dev/null differ
diff --git a/graphics/imagemagick/ImageMagick-6.3.6-8.tar.bz2.sig
b/graphics/imagemagick/ImageMagick-6.3.6-8.tar.bz2.sig
new file mode 100644
index 0000000..d228f37
Binary files /dev/null and
b/graphics/imagemagick/ImageMagick-6.3.6-8.tar.bz2.sig differ
diff --git a/graphics/xaralx/DETAILS b/graphics/xaralx/DETAILS
index 41aff93..368f3ba 100755
--- a/graphics/xaralx/DETAILS
+++ b/graphics/xaralx/DETAILS
@@ -1,7 +1,7 @@
SPELL=xaralx
SPELLX=XaraLX
- VERSION=0.7r1780
-
SOURCE_HASH=sha512:8d5f24bfd6757a8f33837c9d1b5df8b7fb0e322bac970c7ca064e72813f0447a4f9c088f236bc6abd24d0afec7e69a185559cfcf0ee12813c862a196e3f2cc11
+ VERSION=0.7r1783
+
SOURCE_HASH=sha512:68ccb87a703dc5d4a380aa50260c2c47f5a44334126333492cc0fafabce74e1bc9cc46d9ba4a45222ff5f2ccc3282f3252f54a48c237e3d8d174200ac3eadf67
SOURCE=${SPELLX}-${VERSION}.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELLX}-${VERSION}
SOURCE_URL[0]=http://downloads2.xara.com/opensource/$SOURCE
diff --git a/graphics/xaralx/HISTORY b/graphics/xaralx/HISTORY
index d7f13fc..ff8f9ca 100644
--- a/graphics/xaralx/HISTORY
+++ b/graphics/xaralx/HISTORY
@@ -1,3 +1,6 @@
+2007-11-05 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.7r1783
+
2007-09-04 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.7r1780

diff --git a/groups b/groups
index e41730c..e5c9e41 100755
--- a/groups
+++ b/groups
@@ -18,6 +18,7 @@ floppy:25:
audio:29:
www-data:33:
backup:34:
+shadow:42:
utmp:43:
games:60:
firebird:84:
@@ -79,5 +80,7 @@ iplog:156:
stb-admin:157:
davfs2:158:
dovecot:159:
+netdev:160:
+kde4:161
users:1000:
nogroup:65534:
diff --git a/gurus.gpg b/gurus.gpg
index d639f58..e34c396 100644
Binary files a/gurus.gpg and b/gurus.gpg differ
diff --git a/haskell/haskell-x11-extras/DETAILS
b/haskell/haskell-x11-extras/DETAILS
index 60297c1..a1d1220 100755
--- a/haskell/haskell-x11-extras/DETAILS
+++ b/haskell/haskell-x11-extras/DETAILS
@@ -1,8 +1,8 @@
SPELL=haskell-x11-extras
- VERSION=0.3
+ VERSION=0.4
SOURCE="X11-extras-${VERSION}.tar.gz"

SOURCE_URL[0]=http://hackage.haskell.org/packages/archive/X11-extras/${VERSION}/${SOURCE}
-
SOURCE_HASH=sha512:07192db7bc245489e20bc90a49b9d0428ddf22757c4584073cdbc89832f8c912807584c73ffd0968014de933c8c6779b4fbccb779689010ec6137f33bb694581
+
SOURCE_HASH=sha512:3c0e004bee3e42abdb3a81a331d34e5e356fa0fbaf1433f3c1585a242161af2ed145407ad392c8f9de85436eba03b21f82eba84a974c187feffc0c4ac9643461
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/X11-extras-${VERSION}"

WEB_SITE="http://hackage.haskell.org/cgi-bin/hackage-scripts/package/X11-extras";
LICENSE[0]=BSD3
diff --git a/haskell/haskell-x11-extras/HISTORY
b/haskell/haskell-x11-extras/HISTORY
index 9cfdf36..0947b64 100644
--- a/haskell/haskell-x11-extras/HISTORY
+++ b/haskell/haskell-x11-extras/HISTORY
@@ -1,3 +1,6 @@
+2007-10-21 Alexander Tsamutali <astsmtl AT gmail.com>
+ * DETAILS: updated spell to 0.4
+
2007-09-05 Alexander Tsamutali <astsmtl AT gmail.com>
* DETAILS: updated spell to 0.3

diff --git a/haskell/haskell-x11/DETAILS b/haskell/haskell-x11/DETAILS
index b2e1295..0259e9f 100755
--- a/haskell/haskell-x11/DETAILS
+++ b/haskell/haskell-x11/DETAILS
@@ -1,8 +1,8 @@
SPELL=haskell-x11
- VERSION=1.2.2
+ VERSION=1.2.3
SOURCE="X11-${VERSION}.tar.gz"

SOURCE_URL[0]=http://hackage.haskell.org/packages/archive/X11/${VERSION}/${SOURCE}
-
SOURCE_HASH=sha512:19390535a08672326133196380b51c704c4534f18de5a2befdbb7d0aae2ab33f75ca1d49c466dc0beb23e833d86757800de7c86aa64c505ad6243c5d66e23d13
+
SOURCE_HASH=sha512:c8288ff45bdc3e7f94c27be03f328ce2d896db6989e9d4ee1bbd37b81c66564ee0054df6c27a3b1b185379c27b643a90472cf3f19ec96c279360dacf7c1e3547
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/X11-${VERSION}"

WEB_SITE="http://hackage.haskell.org/cgi-bin/hackage-scripts/package/X11";
LICENSE[0]=BSD3
diff --git a/haskell/haskell-x11/HISTORY b/haskell/haskell-x11/HISTORY
index 1e4f3a0..ddf884e 100644
--- a/haskell/haskell-x11/HISTORY
+++ b/haskell/haskell-x11/HISTORY
@@ -1,3 +1,6 @@
+2007-10-21 Alexander Tsamutali <astsmtl AT gmail.com>
+ * DETAILS: updated spell to 1.2.3
+
2007-08-25 Alexander Tsamutali <astsmtl AT gmail.com>
* POST_REMOVE: Added to unregister package with ghc-pkg
* PRE_RESURRECT, POST_RESURRECT: Added to protect package.conf and
diff --git a/http/apache2/HISTORY b/http/apache2/HISTORY
index 6abdb03..4ff4933 100644
--- a/http/apache2/HISTORY
+++ b/http/apache2/HISTORY
@@ -1,3 +1,9 @@
+2007-11-29 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: Use upstream apache.gpg
+ Cleaned up extra spaces in long description
+ * buildconf.patch: Re-apply patch (finish Bug #13989)
+ * PRE_BUILD: Apply buildconf.patch again (Bug #13989)
+
2007-09-10 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 2.0.61, SECURITY_PATCH=2
CVE-2007-3847, CVE-2007-1863, CVE-2006-5752, CVE-2007-3304
diff --git a/http/apache2/PRE_BUILD b/http/apache2/PRE_BUILD
new file mode 100755
index 0000000..b69b7fe
--- /dev/null
+++ b/http/apache2/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+patch -p1 < $SCRIPT_DIRECTORY/buildconf.patch
diff --git a/http/apache2/buildconf.patch b/http/apache2/buildconf.patch
new file mode 100644
index 0000000..427a438
--- /dev/null
+++ b/http/apache2/buildconf.patch
@@ -0,0 +1,12 @@
+diff -urN httpd-2.0.58/buildconf httpd/buildconf
+--- httpd-2.0.58/buildconf 2006-04-24 13:12:21.000000000 -0400
++++ httpd/buildconf 2006-05-15 22:28:32.000000000 -0400
+@@ -67,7 +67,7 @@
+ should_exit=1
+ fi
+
+-if [ ! -f "$apu_src_dir/Makefile.in" ]; then
++if [ ! -f "$apu_src_dir/build/apu-conf.m4" ]; then
+ echo ""
+ echo "You don't have a copy of the apr-util source in $apu_src_dir. "
+ echo "Please get one the source using the following instructions, "
diff --git a/http/firefox/DETAILS b/http/firefox/DETAILS
index d767530..8688555 100755
--- a/http/firefox/DETAILS
+++ b/http/firefox/DETAILS
@@ -5,7 +5,7 @@ if [ "$FIREFOX_CVS" == "y" ]; then

SOURCE_URL[0]=cvs://:pserver:anonymous AT cvs-mirror.mozilla.org:/cvsroot:mozilla/client.mk
SOURCE_IGNORE=volatile
else
- VERSION=2.0.0.7
+ VERSION=2.0.0.11
SOURCE=$SPELL-$VERSION-source.tar.bz2
SOURCE2=${SOURCE}.asc
SOURCE_GPG="firefox.gpg:${SOURCE2}:UPSTREAM_KEY"
@@ -15,7 +15,7 @@ else

SOURCE_URL[2]=ftp://ftp.in2p3.fr/pub/mozilla/$SPELL/releases/$VERSION/source/$SOURCE
SOURCE_URL[3]=ftp://ftp.sai.msu.su/pub/unix/WWW/browsers/$SOURCE
SOURCE2_URL[0]=${SOURCE_URL}.asc
- SECURITY_PATCH=11
+ SECURITY_PATCH=14
fi
SOURCE_DIRECTORY=$BUILD_DIRECTORY/mozilla
WEB_SITE=http://www.mozilla.org/projects/firefox/
diff --git a/http/firefox/HISTORY b/http/firefox/HISTORY
index 6c07798..53bf12c 100644
--- a/http/firefox/HISTORY
+++ b/http/firefox/HISTORY
@@ -1,3 +1,26 @@
+2007-12-01 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: SECURITY_PATCH++
+ updated spell to 2.0.0.11
+
+2007-11-27 George Sherwood <george AT beernabeer.com>
+ * DETAILS: Updated to versoin 2.0.0.10. SECURITY_PATCH++
+
http://www.mozilla.org/projects/security/known-vulnerabilities.html#firefox2.0.0.10
+ * firefox-config.patch: Updated to 2.0.0.10
+ * PRE_BUILD: Removed patch
+ * gdkpango.patch: Removed. Incorporated upstream.
+
+2007-11-02 George Sherwood <george AT beernabeer.com>
+ * DETAILS: Updated to version 2.0.0.9.
+ * firefox-config.patch: Updated to 2.0.0.9
+
+2007-10-21 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * INSTALL: fix up permissions after install so it runs as non-root
+
+2007-10-19 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 2.0.0.8, SECURITY_PATCH=12
+
http://www.mozilla.org/projects/security/known-vulnerabilities.html#firefox2.0.0.8
+ * firefox-config.patch: updated to 2.0.0.8
+
2007-09-24 George Sherwood <george AT beernabeer.com>
* DETAILS: Updated to used UPSTREAM_KEY again
* firefox.gpg: Added new upstream key
diff --git a/http/firefox/INSTALL b/http/firefox/INSTALL
index 895d4b3..ec36913 100755
--- a/http/firefox/INSTALL
+++ b/http/firefox/INSTALL
@@ -71,4 +71,9 @@ install -m 755 -o root -g root
$SCRIPT_DIRECTORY/firefox \
sedit "s/nspr/mozilla-nspr/"
${INSTALL_ROOT}/usr/lib/pkgconfig/firefox-nss.pc &&
sedit "s/nspr/mozilla-nspr/" ${INSTALL_ROOT}/usr/lib/pkgconfig/firefox-js.pc
&&
sedit "s/nspr/mozilla-nspr/"
${INSTALL_ROOT}/usr/lib/pkgconfig/firefox-xpcom.pc &&
-sedit "s/nspr/mozilla-nspr/"
${INSTALL_ROOT}/usr/lib/pkgconfig/firefox-plugin.pc
+sedit "s/nspr/mozilla-nspr/"
${INSTALL_ROOT}/usr/lib/pkgconfig/firefox-plugin.pc &&
+
+# fix up permissions, firefox 2.0.0.8 installs stuff non-readable for
+# anyone but root
+chmod -R go+r /usr/lib/firefox &&
+chmod go+x /usr/lib/firefox/run-mozilla.sh
diff --git a/http/firefox/firefox-config.patch
b/http/firefox/firefox-config.patch
index 6a3f0dd..0c6929c 100644
--- a/http/firefox/firefox-config.patch
+++ b/http/firefox/firefox-config.patch
@@ -14,8 +14,8 @@
exit 0
;;
--cflags)
-- if test "/usr/local/include/firefox-2.0.0.7" != /usr/include ; then
-- includes="-I/usr/local/include/firefox-2.0.0.7"
+- if test "/usr/local/include/firefox-2.0.0.11" != /usr/include ; then
+- includes="-I/usr/local/include/firefox-2.0.0.11"
+ if test "/usr/include/firefox" != /usr/include ; then
+ includes="-I/usr/include/firefox"
fi
@@ -25,14 +25,14 @@
if test "$echo_cflags" = "yes"; then
nspr_cflags="-I/usr/include/nspr"
for n in $echo_components; do
-- component_includes="$component_includes
-I/usr/local/include/firefox-2.0.0.7/$n"
+- component_includes="$component_includes
-I/usr/local/include/firefox-2.0.0.11/$n"
+ component_includes="$component_includes -I/usr/include/firefox/$n"
done
echo $component_includes $includes $nspr_cflags
fi

if test "$echo_idlflags" = "yes"; then
-- echo "-I/usr/local/share/idl/firefox-2.0.0.7"
+- echo "-I/usr/local/share/idl/firefox-2.0.0.11"
+ echo "-I/usr/share/idl/firefox"
fi

@@ -41,6 +41,6 @@
;;
esac
done
-- echo -L/usr/local/lib/firefox-2.0.0.7 $libs
+- echo -L/usr/local/lib/firefox-2.0.0.11 $libs
+ echo -L/usr/lib $libs
fi
diff --git a/http/gnash/CONFIGURE b/http/gnash/CONFIGURE
index 5d61e1e..55d2ac4 100755
--- a/http/gnash/CONFIGURE
+++ b/http/gnash/CONFIGURE
@@ -19,6 +19,9 @@ config_query_list GNASH_GUI
\
config_query_list GNASH_MEDIA \
"Which media backend do you want to use?" \
ffmpeg gstreamer libmad &&
+config_query_list GNASH_RENDERER \
+ "Which renderer to use?" \
+ opengl agg &&
GNASH_SOUND=${GNASH_SOUND/SDL/sdl} &&
GNASH_SOUND=${GNASH_SOUND/GST/gstreamer} &&
GNASH_SOUND=${GNASH_SOUND/gst/gstreamer} &&
diff --git a/http/gnash/DEPENDS b/http/gnash/DEPENDS
index 95c2273..4fc7fc4 100755
--- a/http/gnash/DEPENDS
+++ b/http/gnash/DEPENDS
@@ -6,14 +6,15 @@ depends libpng
&&
depends jpeg &&
depends libxml2 &&
depends curl &&
-# only recommnedde renderer is ogl... the other
-# one is agg which we don't have a spell yet for and doesn't
-# have the same performance under certain conditions
-depends OPENGL '--enable-renderer=ogl' &&
+if [[ $GNASH_RENDERER == "opengl" ]]; then
+ depends OPENGL '--enable-renderer=ogl'
+else
+ depends agg '--enable-renderer=agg'
+fi &&
if [[ $GNASH_MEDIA == "gstreamer" ]]; then
depends $GNASH_MEDIA '--enable-media=GST'
elif [[ $GNASH_MEDIA == "libmad" ]]; then
- depends $GNASH_MEDIA '--enable-media=mad}'
+ depends $GNASH_MEDIA '--enable-media=mad --enable-mad'
elif [[ $GNASH_MEDIA == "ffmpeg" ]]; then
depends LIBAVCODEC '--enable-media=ffmpeg'
fi &&
@@ -33,6 +34,6 @@ if [[ "${GNASH_GUI}" == "GTK" ]]; then
elif [[ "${GNASH_GUI}" == "KDE" ]]; then
depends kdebase '--enable-gui=kde' &&
depends kdelibs '--enable-kparts' &&
- depends qt-x11 '--with-qt-incl=/usr/include/qt --with-qt-lib=/usr/lib'
+ depends qt-x11 "--with-qt-incl=${INSTALL_ROOT}/usr/include/qt
--with-qt-lib=${INSTALL_ROOT}/usr/lib"
fi

diff --git a/http/gnash/HISTORY b/http/gnash/HISTORY
index b4f30be..74962c1 100644
--- a/http/gnash/HISTORY
+++ b/http/gnash/HISTORY
@@ -1,3 +1,15 @@
+2007-10-22 Pol Vinogradov <vin.public AT gmail.com>
+ * INSTALL: added iceweasel{,-bin} support
+
+2007-10-08 Pol Vinogradov <vin.public AT gmail.com>
+ * CONFIGURE: swapped list items for GNASH_RENDERER
+ so that opengl goes first and default
+
+2007-10-07 Pol Vinogradov <vin.public AT gmail.com>
+ * CONFIGURE: added GNASH_RENDERER query list
+ * DEPENDS: added one more renderer (agg), fixed libmad
+ flags, install_rootifying qt paths
+
2007-09-26 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
* DEPENDS: kde/qt needs a bit more paths specified
* INSTALL: don't install plugin if none is built
diff --git a/http/gnash/INSTALL b/http/gnash/INSTALL
index 02ae7a4..9a83419 100755
--- a/http/gnash/INSTALL
+++ b/http/gnash/INSTALL
@@ -2,7 +2,7 @@ default_install &&
if ! list_find "$GNASH_OPTS" "--disable-nsapi" ;
then
local ns_compat
-for ns_compat in mozilla firefox seamonkey xulrunner opera netscape4; do
+for ns_compat in mozilla firefox iceweasel seamonkey xulrunner opera
netscape4; do
if spell_installed $ns_compat; then
message "${MESSAGE_COLOR}Installing for $ns_compat${DEFAULT_COLOR}\n" &&

@@ -14,8 +14,8 @@ if spell_installed $ns_compat; then
$INSTALL_ROOT/usr/lib/$ns_compat/plugins/
fi
done &&
-for ns_compat in mozilla firefox seamonkey xulrunner opera netscape4; do
-if spell_installed firefox-bin seamonkey-bin; then
+for ns_compat in mozilla firefox iceweasel seamonkey xulrunner opera
netscape4; do
+if spell_installed firefox-bin iceweasel-bin seamonkey-bin; then
message "${MESSAGE_COLOR}Installing for $ns_compat${DEFAULT_COLOR}\n" &&
if [[ -e $INSTALL_ROOT/opt/${ns_compat/-bin}/plugins/libgnashplugin.so ]];
then
rm -f $INSTALL_ROOT/opt/${ns_compat/-bin}/plugins/libgnashplugin.so
diff --git a/http/iceweasel/BUILD b/http/iceweasel/BUILD
new file mode 100755
index 0000000..2ffbd33
--- /dev/null
+++ b/http/iceweasel/BUILD
@@ -0,0 +1,34 @@
+ local ICEWEASEL_HOME=${INSTALL_ROOT}/usr/lib/${SPELL} &&
+export MOZ_PHOENIX=1 &&
+
+export CFLAGS="${CFLAGS//-O3/-O2}" &&
+export CXXFLAGS="${CXXFLAGS//-O3/-O2}" &&
+
+OPTS="$ICEWEASEL_MAILNEWS $ICEWEASEL_CALENDAR $ICEWEASEL_CHAT
$ICEWEASEL_COMPOSER \
+$ICEWEASEL_MATHML $ICEWEASEL_JS $OPTS" &&
+
+if [[ "$ICEWEASEL_RENDER" != "none" ]]
+then
+ OPTS="--enable-svg-renderer=$ICEWEASEL_RENDER $OPTS"
+fi &&
+
+./configure \
+ --prefix=${INSTALL_ROOT}/usr \
+ --with-user-appdir=.${SPELL} \
+ --with-pthreads \
+ --enable-application=browser \
+ --enable-reorder \
+ --enable-cpp-rtti \
+ --enable-strip \
+ --enable-optimize="$CFLAGS" \
+ --with-default-mozilla-five-home=$ICEWEASEL_HOME \
+ --disable-debug \
+ --disable-tests \
+ --disable-installer \
+ --disable-pedantic \
+ --enable-single-profile \
+ --enable-extensions=default,typeaheadfind \
+ --enable-canvas \
+ $OPTS &&
+
+make
diff --git a/http/iceweasel/CONFIGURE b/http/iceweasel/CONFIGURE
new file mode 100755
index 0000000..1fb805b
--- /dev/null
+++ b/http/iceweasel/CONFIGURE
@@ -0,0 +1,38 @@
+config_query_option ICEWEASEL_MAILNEWS \
+ 'Build Mail/News client?' \
+ y \
+ '--enable-mailnews' \
+ '--disable-mailnews' &&
+config_query_option ICEWEASEL_CALENDAR \
+ 'Build Calendar component?' \
+ y \
+ '--enable-calendar' \
+ '--disable-calendar' &&
+config_query_option ICEWEASEL_CHAT \
+ 'Build ChatZilla component?' \
+ y \
+ '--enable-chatzilla' \
+ '--disable-chatzilla' &&
+config_query_option ICEWEASEL_COMPOSER \
+ 'Build Composer component?' \
+ y \
+ '--enable-composer' \
+ '--disable-composer' &&
+config_query_option ICEWEASEL_MATHML \
+ 'Enable MathML?' \
+ y \
+ '--enable-mathml' \
+ '--disable-mathml' &&
+config_query_option ICEWEASEL_JS \
+ 'Build JavaScript profile tool?' \
+ n \
+ '--enable-xpctools' \
+ '--disable-xpctools' &&
+config_query_list ICEWEASEL_RENDER \
+ 'Possible SVG renderers:' \
+ 'cairo' 'libart' 'none' &&
+
+config_query ICEWEASEL_NULLPLUGIN \
+"Do you want nullplugin installed (to enable auto search and install of
other plugins)" \
+ y
+
diff --git a/http/iceweasel/DEPENDS b/http/iceweasel/DEPENDS
new file mode 100755
index 0000000..1c0aef3
--- /dev/null
+++ b/http/iceweasel/DEPENDS
@@ -0,0 +1,79 @@
+depends g++ &&
+depends glib2 &&
+depends X11-LIBS "--with-x" &&
+
+case $ICEWEASEL_RENDER in
+ cairo) depends cairo ;;
+ libart) depends libart_lgpl ;;
+ *) true ;;
+esac &&
+
+source $GRIMOIRE/FUNCTIONS &&
+
+if check_if_xorg_modular_libs ; then
+ optional_depends libxp \
+ "" \
+ "--disable-xprint" \
+ "for Xprint printing support" &&
+
+ optional_depends libxft \
+ "" \
+ "--disable-xft" \
+ "for Xft support" &&
+
+ optional_depends libxinerama \
+ "--enable-xinerama" \
+ "" \
+ "for Xinerama support"
+
+fi &&
+
+optional_depends freetype2 \
+ "" \
+ "--disable-freetype2" \
+ "for FreeType2 support" &&
+
+optional_depends gnome-vfs2 \
+ "" \
+ "--disable-gnomevfs" \
+ "for GnomeVFS support" &&
+
+optional_depends jpeg \
+ "--with-system-jpeg" \
+ "" \
+ "for system jpeg" &&
+
+optional_depends libgnomeui \
+ "" \
+ "--disable-gnomeui" \
+ "for libgnomeui support" &&
+
+optional_depends libpng \
+ "--with-system-png" \
+ "" \
+ "for system png" &&
+
+optional_depends nspr \
+ "--with-system-nspr" \
+ "" \
+ "for system NSPR" &&
+
+optional_depends openldap \
+ "" \
+ "--disable-ldap" \
+ "for LDAP support" &&
+
+optional_depends pango \
+ "--enable-pango" \
+ "" \
+ "for Pango font rendering support" &&
+
+optional_depends POSTSCRIPT-INTERPRETER \
+ "" \
+ "--disable-postscript" \
+ "for PostScript printing support" &&
+
+optional_depends zlib \
+ "--with-system-zlib" \
+ "" \
+ "for system libz"
diff --git a/http/iceweasel/DETAILS b/http/iceweasel/DETAILS
new file mode 100755
index 0000000..20ed3f0
--- /dev/null
+++ b/http/iceweasel/DETAILS
@@ -0,0 +1,34 @@
+ SPELL=iceweasel
+ VERSION=2.0.0.6-g2
+ SOURCE=${SPELL}-${VERSION}.tar.bz2
+ SOURCE2=${SOURCE}.sig
+ SOURCE_GPG="iceweasel.gpg:${SOURCE2}:UPSTREAM_KEY"
+ SOURCE2_IGNORE=signature
+ SOURCE_URL[0]=http://gnuzilla.gnu.org/download/${SOURCE}
+ SOURCE2_URL[0]=${SOURCE_URL}.sig
+SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
+ WEB_SITE=http://gnuzilla.gnu.org/
+ ENTERED=20071022
+ LICENSE[0]=MPL
+ KEYWORDS="http"
+ SHORT="the GNU version of the Firefox browser"
+cat << EOF
+Gnuzilla is the GNU version of the Mozilla suite, and IceWeasel is the GNU
+version of the Firefox browser. Its main advantage is an ethical one: it is
+entirely free software. While the source code from the Mozilla project is
free
+software, the binaries that they release include additional non-free
software.
+Also, they distribute non-free software as plug-ins. (IceWeasel does keep the
+triple licensing used by Firefox to facilitate the reuse of code.)
+
+In addition, IceWeasel includes some privacy protection features:
+
+ 1. Some sites refer to zero-size images on other hosts to keep track of
+ cookies. When IceWeasel detects this mechanism it blocks cookies from
the
+ site hosting the zero-length image file. (It is possible to re-enable
+ such a site by removing it from the blocked hosts list.)
+ 2. Other sites rewrite the host name in links redirecting the user to
another
+ site, mainly to "spy" on clicks. When this behavior is detected,
IceWeasel
+ shows a message alerting the user.
+
+To see these new features in action, some test pages are available.
+EOF
diff --git a/http/iceweasel/HISTORY b/http/iceweasel/HISTORY
new file mode 100644
index 0000000..77c2515
--- /dev/null
+++ b/http/iceweasel/HISTORY
@@ -0,0 +1,7 @@
+2007-10-30 Pol Vinogradov <vin.public AT gmail.com>
+ * DETAILS, iceweasel.gpg: added GPG upstream signature
+
+2007-10-22 Pol Vinogradov <vin.public AT gmail.com>
+ * BUILD, cairo-fixes.patch, CONFIGURE, DEPENDS,
+ desktop/iceweasel.desktop, DETAILS, iceweasel, iceweasel.sh,
+ INSTALL, PRE_BUILD, PROVIDES: created this spell
diff --git a/http/iceweasel/INSTALL b/http/iceweasel/INSTALL
new file mode 100755
index 0000000..3fd1788
--- /dev/null
+++ b/http/iceweasel/INSTALL
@@ -0,0 +1,51 @@
+make_normal &&
+
+MOZILLA_HOME=$INSTALL_ROOT/usr/lib/iceweasel &&
+
+#
+# everything coming into /usr/lib/iceweasel-${VERSION/rc*}/
+# must actually go to /usr/lib/iceweasel/
+#
+mkdir -p $MOZILLA_HOME &&
+ln -fns $MOZILLA_HOME $MOZILLA_HOME-${VERSION/rc*} &&
+mkdir -p $INSTALL_ROOT/usr/share/idl/iceweasel &&
+ln -fns $TRACK_ROOT/usr/share/idl/iceweasel \
+ $INSTALL_ROOT/usr/share/idl/iceweasel-${VERSION/rc*} &&
+
+make install &&
+
+#
+# Script to set MOZILLA_FIVE_HOME
+#
+cp ${SCRIPT_DIRECTORY}/${SPELL}.sh $INSTALL_ROOT/etc/profile.d &&
+
+#
+# Create symlink from NSS Root CA store, if it exists. NSS requires this
+# to be in the same directory as the current application binary. See:
+# http://www.mozilla.org/projects/security/pki/nss/loadable_certs.html
+# https://bugzilla.mozilla.org/show_bug.cgi?id=128290
+# Only create if $MOZILLA_HOME/libnssckbi.so does not exist or is already a
+# symlink.
+#
+if test -f $INSTALL_ROOT/usr/lib/libnssckbi.so; then
+ if ! test -f $MOZILLA_HOME/libnssckbi.so ||
+ test -h $MOZILLA_HOME/libnssckbi.so; then
+ ln -sf $TRACK_ROOT/usr/lib/libnssckbi.so $MOZILLA_HOME/libnssckbi.so
+ fi
+fi &&
+if [[ "$ICEWEASEL_NULLPLUGIN" == "n" ]]
+then
+ rm $MOZILLA_HOME/plugins/libnullplugin.so
+fi &&
+
+# make the pkgconfig files reference the nspr from the standalone nspr spell
+sedit 's/nspr/mozilla-nspr/'
${INSTALL_ROOT}/usr/lib/pkgconfig/iceweasel-js.pc &&
+sedit 's/nspr/mozilla-nspr/'
${INSTALL_ROOT}/usr/lib/pkgconfig/iceweasel-nss.pc &&
+sedit 's/nspr/mozilla-nspr/'
${INSTALL_ROOT}/usr/lib/pkgconfig/iceweasel-xpcom.pc &&
+
+#
+# install iceweasel script so it loads properly even if MOZILLA_FIVE_HOME is
+# not set or set to a different mozilla/firefox directory
+#
+install -m 755 -o root -g root $SCRIPT_DIRECTORY/iceweasel \
+ $INSTALL_ROOT/usr/bin
diff --git a/http/iceweasel/PRE_BUILD b/http/iceweasel/PRE_BUILD
new file mode 100755
index 0000000..adc6b49
--- /dev/null
+++ b/http/iceweasel/PRE_BUILD
@@ -0,0 +1,12 @@
+default_pre_build &&
+
+# remove /root/.mozconfig, it causes too much trouble
+if [ -f /root/.mozconfig ]; then
+ rm -f /root/.mozconfig
+fi &&
+
+# remove broken .mozconfig shipped with 1.0b
+rm -f $SOURCE_DIRECTORY/.mozconfig &&
+
+cd $SOURCE_DIRECTORY &&
+patch -p1 < $SCRIPT_DIRECTORY/cairo-fixes.patch
diff --git a/http/iceweasel/PROVIDES b/http/iceweasel/PROVIDES
new file mode 100755
index 0000000..e0c99a2
--- /dev/null
+++ b/http/iceweasel/PROVIDES
@@ -0,0 +1,4 @@
+WEB-BROWSER
+GRAPHICAL-WEB-BROWSER
+GECKO
+NS-PLUGIN-COMPATIBLE
diff --git a/http/iceweasel/cairo-fixes.patch
b/http/iceweasel/cairo-fixes.patch
new file mode 100644
index 0000000..f11250e
--- /dev/null
+++ b/http/iceweasel/cairo-fixes.patch
@@ -0,0 +1,15 @@
+--- a/content/canvas/src/nsCanvasRenderingContext2D.cpp 2007-09-16
02:28:55.602763128 +0000
++++ b/content/canvas/src/nsCanvasRenderingContext2D.cpp 2007-09-16
02:28:27.527046255 +0000
+@@ -98,6 +98,12 @@
+ #include "nsTArray.h"
+
+ #include "cairo.h"
++typedef enum _cairo_font_type {
++ CAIRO_FONT_TYPE_TOY,
++ CAIRO_FONT_TYPE_FT,
++ CAIRO_FONT_TYPE_WIN32,
++ CAIRO_FONT_TYPE_ATSUI
++} cairo_font_type_t;
+ #include "imgIEncoder.h"
+ #ifdef MOZILLA_1_8_BRANCH
+ #define imgIEncoder imgIEncoder_MOZILLA_1_8_BRANCH
diff --git a/http/iceweasel/desktop/iceweasel.desktop
b/http/iceweasel/desktop/iceweasel.desktop
new file mode 100644
index 0000000..1d3b9af
--- /dev/null
+++ b/http/iceweasel/desktop/iceweasel.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=IceWeasel
+Exec=iceweasel
+Icon=
+Terminal=false
+Type=Application
+Categories=Application;Network;Browsers;
diff --git a/http/iceweasel/iceweasel b/http/iceweasel/iceweasel
new file mode 100644
index 0000000..4bff5c7
--- /dev/null
+++ b/http/iceweasel/iceweasel
@@ -0,0 +1,18 @@
+#!/bin/sh
+#
+# Created by Eric Sandall 2004-12-09
+# Modified for IceWeasel by Pol Vinogradov 2007-10-22
+#
+# This script is here to set the correct LD_LIBRARY_PATH for iceweasel 2.0+
+# based on the information from this thread:
+# http://lists.freebsd.org/pipermail/freebsd-gnome/2004-October/008443.html
+#
+export MOZILLA_FIVE_HOME=/usr/lib/iceweasel
+export LD_LIBRARY_PATH=/usr/lib/iceweasel
+remote=""
+if /usr/lib/iceweasel/iceweasel-bin -remote "ping()" > /dev/null 2>&1 ; then
+ if [ -z "$@" ] ; then
+ remote='-remote xfeDoCommand(openBrowser)'
+ fi
+fi
+/usr/lib/iceweasel/iceweasel-bin $remote "$@"
diff --git a/http/iceweasel/iceweasel.gpg b/http/iceweasel/iceweasel.gpg
new file mode 100644
index 0000000..e474166
Binary files /dev/null and b/http/iceweasel/iceweasel.gpg differ
diff --git a/http/iceweasel/iceweasel.sh b/http/iceweasel/iceweasel.sh
new file mode 100644
index 0000000..959f7c1
--- /dev/null
+++ b/http/iceweasel/iceweasel.sh
@@ -0,0 +1,12 @@
+#!/bin/bash
+# First check if this variable is already set
+# then if not set, check it (maybe), then set it
+#
+# Set MOZILLA_FIVE_HOME for packages which need
+# the mozilla libs (e.g. monodevelop)
+#
+
+if [ -z "$MOZILLA_FIVE_HOME" ] ; then
+ MOZILLA_FIVE_HOME=/usr/lib/iceweasel
+fi
+export MOZILLA_FIVE_HOME
diff --git a/http/kazehakase/DETAILS b/http/kazehakase/DETAILS
index 0c5ba4e..1a9dc25 100755
--- a/http/kazehakase/DETAILS
+++ b/http/kazehakase/DETAILS
@@ -13,10 +13,10 @@ then
SOURCE_IGNORE=volatile
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-svn
else
- VERSION=0.4.9
+ VERSION=0.5.0
SOURCE=${SPELL}-${VERSION}.tar.gz
- SOURCE_URL[0]=http://osdn.dl.sourceforge.jp/kazehakase/27353/${SOURCE}
-
SOURCE_HASH=sha512:e7e6b8e2ade86243b238648ad1c03b9a79b659e2425d17ce676b7bfe0c79edc4bb3a5cd267710a224b612537bdc0c74145f024c872cb5a835f6f9c21e6895201
+ SOURCE_URL[0]=http://osdn.dl.sourceforge.jp/kazehakase/27774/${SOURCE}
+
SOURCE_HASH=sha512:56e8a0989c47fd312d9e02ed4811dfa03520da4f356838378d331e3abe360304ddca08bcf5799fa0fa98e300caf52b8e04beee322a11f922bd218a58fca16859
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
fi
WEB_SITE=http://kazehakase.sourceforge.jp
diff --git a/http/kazehakase/HISTORY b/http/kazehakase/HISTORY
index 084013b..a4413bf 100644
--- a/http/kazehakase/HISTORY
+++ b/http/kazehakase/HISTORY
@@ -1,3 +1,7 @@
+2007-10-30 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
+ * DETAILS: Fixed SOURCE_URL[0]
+ updated spell to 0.5.0
+
2007-09-29 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
* DETAILS: Fixed SOURCE_URL[0]
fixed long description wrap
diff --git a/http/links-twibright/DETAILS b/http/links-twibright/DETAILS
index 2ad31da..988706e 100755
--- a/http/links-twibright/DETAILS
+++ b/http/links-twibright/DETAILS
@@ -1,10 +1,10 @@
SPELL=links-twibright
- VERSION=2.1pre30
+ VERSION=2.1pre31
SOURCE_NAME=links
SOURCE=$SOURCE_NAME-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SOURCE_NAME-$VERSION
SOURCE_URL[0]=http://links.twibright.com/download/$SOURCE
-
SOURCE_HASH=sha512:9d909cace759c04ef7b812316946c78a6a9ccc9b5198b4179ec35466d4825579f6716673043cbf430eb54dfc769ba159ae4cc16e0d39e1e8e95992defde76dc5
+
SOURCE_HASH=sha512:92544de3a45d9ebf37e8a10bd67b2333fe449ae45ba3f6ca036a31c9568c3a7f1f5d6888acbb43b8c57b5565b46041a0ff5825abf2b8784422f41b126801cba0
LICENSE[0]=GPL
WEB_SITE=http://links.twibright.com/
ENTERED=20011027
diff --git a/http/links-twibright/HISTORY b/http/links-twibright/HISTORY
index fe04d2a..870c151 100644
--- a/http/links-twibright/HISTORY
+++ b/http/links-twibright/HISTORY
@@ -1,3 +1,6 @@
+2007-10-30 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 2.1pre31
+
2007-08-16 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 2.1pre30, SECURITY_PATCH=1

diff --git a/http/links/DETAILS b/http/links/DETAILS
index 16dcd1e..10568dc 100755
--- a/http/links/DETAILS
+++ b/http/links/DETAILS
@@ -1,10 +1,9 @@
SPELL=links
- VERSION=0.98
+ VERSION=1.00pre21
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION

SOURCE_URL[0]=http://artax.karlin.mff.cuni.cz/~mikulas/links/download/$SOURCE
- SOURCE_URL[1]=http://links.sourceforge.net/download/$SOURCE
-
SOURCE_HASH=sha512:ca705e34761ff46429326afc670d4a0bf8fc6745665d75b05cc5d45e2c47259997af16dbe92b3d548fa3f7f72b7d29e64abf3684566f6d8d305aad53fb301a94
+
SOURCE_HASH=sha512:52477dd6c256786b927ddf87529c9b0a9b04ce93e54d670824039bc887323c6758b9365da24569e05fc78c575a587010bc84b38acc879d6f3683bcd80ea5c8cb
LICENSE[0]=GPL
WEB_SITE=http://links.sourceforge.net
ENTERED=20011027
diff --git a/http/links/HISTORY b/http/links/HISTORY
index fbd30b1..6fb6599 100644
--- a/http/links/HISTORY
+++ b/http/links/HISTORY
@@ -1,3 +1,13 @@
+2007-11-04 Julien "_kaze_" ROZO <julien AT rozo.org>
+ * TRIGGERS: links is casted on openssl update only if HTTPS support
is enabled
+
+2007-11-03 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * DETAILS: updated spell to 1.00pre21
+
+2007-09-26 Martin Klein <martin AT makl.de>
+ * DETAILS: Fixed SOURCE_URL[0] (old) #14022
+ updated spell to 1.0pre20
+
2006-10-03 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: [automated] Removed UPDATED.

diff --git a/http/links/TRIGGERS b/http/links/TRIGGERS
index 58d6d6f..1ee281d 100755
--- a/http/links/TRIGGERS
+++ b/http/links/TRIGGERS
@@ -1 +1,3 @@
-on_cast openssl cast_self
+if is_depends_enabled $SPELL openssl; then
+ on_cast openssl cast_self
+fi
diff --git a/http/lynx/DETAILS b/http/lynx/DETAILS
index 1ef5d07..98e2f43 100755
--- a/http/lynx/DETAILS
+++ b/http/lynx/DETAILS
@@ -1,9 +1,9 @@
SPELL=lynx
- VERSION=2.8.6
- SOURCE=$SPELL$VERSION.tar.bz2
+ VERSION=2.8.6rel.5
+ SOURCE=${SPELL}${VERSION}.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELL}2-8-6
SOURCE_URL[0]=http://lynx.isc.org/release/$SOURCE
-
SOURCE_HASH=sha512:94a39616d97d3de37b1d601d892748fd41fc20f82144256a7ebc091d83989df49632c7861e4cb691b9230b7698c9c41e9db47d185255e4b41fe4b053e809944f
+
SOURCE_HASH=sha512:b4e9796940940158b9fa9760623e766c9b5d82de6c0e7cf8f08388935ca36eeb0ffc6c3244c904475f7136a3418888f60f372642a63ad521bd5a9875abbbec66
WEB_SITE=http://lynx.browser.org/
ENTERED=20010922
PATCH_LEVEL=1
diff --git a/http/lynx/HISTORY b/http/lynx/HISTORY
index 1dde372..13cb1d7 100644
--- a/http/lynx/HISTORY
+++ b/http/lynx/HISTORY
@@ -1,3 +1,7 @@
+2007-10-23 George Sherwood <george AT beernabeer.com>
+ * DETAILS: Updated to version 2.8.6rel.5
+ Upstream uses releases so often our sha512 is incorrect
+
2007-05-27 Elisamuel Resto <ryuji AT mages.ath.cx>
* DETAILS: SOURCE_HASH updated, seems upstream package was touched

diff --git a/http/seamonkey/DETAILS b/http/seamonkey/DETAILS
index 7b48806..6b040d4 100755
--- a/http/seamonkey/DETAILS
+++ b/http/seamonkey/DETAILS
@@ -1,29 +1,17 @@
SPELL=seamonkey
- VERSION=1.1.4
+ VERSION=1.1.7
SOURCE=$SPELL-$VERSION.source.tar.bz2
- SOURCE_GPG=gurus.gpg:$SOURCE.sig:WORKS_FOR_ME
+
SOURCE_HASH=sha512:5abbcfb0ee20d17221f4951884cc4b6cf2049b5218daf8e99b888d05748ab7102b90e9683d1c79756caffc145eeab037f1a3540e3678c644515d15837957137f:UPSTREAM_HASH
SOURCE_DIRECTORY=$BUILD_DIRECTORY/mozilla
SOURCE_URI=seamonkey/releases/$VERSION/$SOURCE
SOURCE_URL[0]=http://releases.mozilla.org/pub/mozilla.org/$SOURCE_URI
- SOURCE_URL[1]=ftp://archive.progeny.com/$SOURCE_URI
- SOURCE_URL[2]=http://ftp.oleane.net/pub/$SOURCE_URI
- SOURCE_URL[3]=ftp://ftp.chg.ru/pub/WWW/mozilla/$SOURCE_URI
- SOURCE_URL[4]=ftp://ftp.sunsite.kth.se/mirrors/ftp.mozilla.org/$SOURCE_URI
- SOURCE_URL[5]=http://ftp.cvut.cz/$SOURCE_URI
- SOURCE_URL[6]=ftp://ftp.mirror.ac.uk/sites/ftp.mozilla.org/pub/$SOURCE_URI
- SOURCE_URL[7]=http://mirrors.xmission.com/$SOURCE_URI
- SOURCE_URL[8]=ftp://gd.tuwien.ac.at/infosys/browsers/$SOURCE_URI
- SOURCE_URL[9]=ftp://ftp.planetmirror.com.au/pub/$SOURCE_URI
- SOURCE_URL[10]=http://ftp.uni-erlangen.de/pub/mirrors/$SOURCE_URI
- SOURCE_URL[11]=ftp://ftp.free.fr/pub/Networking/www/Mozilla/$SOURCE_URI
- SOURCE_URL[12]=ftp://ftp.eunet.ie/mirrors/ftp.mozilla.org/pub/$SOURCE_URI
WEB_SITE=http://www.mozilla.org/
- SECURITY_PATCH=7
+ SECURITY_PATCH=9
ENTERED=20010922
LICENSE[0]=MPL
DOCS="LICENSE README.txt"
KEYWORDS="web http"
- PATCHLEVEL=1
+ PATCHLEVEL=0
SHORT="Web browser and a rich cient application platform"
cat << EOF
The SeaMonkey project is a community effort to deliver production-quality
diff --git a/http/seamonkey/HISTORY b/http/seamonkey/HISTORY
index 74741aa..9892a45 100644
--- a/http/seamonkey/HISTORY
+++ b/http/seamonkey/HISTORY
@@ -1,3 +1,13 @@
+2007-12-01 George Sherwood <george AT beernabeer.com>
+ * DETAILS: Updated to version 1.1.7. SECURITY_PATCH++
+
http://www.mozilla.org/projects/security/known-vulnerabilities.html#SeaMonkey
+
+2007-11-06 George Sherwood <george AT beernabeer.com>
+ * DETAILS: Updated to version 1.1.6. Removed broken SOURCE_URLS.
+
+2007-10-20 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 1.1.5, SECURITY_PATCH=8
+
2007-09-17 Pol Vinogradov <vin.public AT gmail.com>
* DETAILS: PATCHLEVEL++
* PRE_BUILD, cairo-fixes.patch: added patch from firefox spell
diff --git a/http/seamonkey/seamonkey-1.1.4.source.tar.bz2.sig
b/http/seamonkey/seamonkey-1.1.4.source.tar.bz2.sig
deleted file mode 100644
index 89193ad..0000000
Binary files a/http/seamonkey/seamonkey-1.1.4.source.tar.bz2.sig and
/dev/null differ
diff --git a/http/squid/BUILD b/http/squid/BUILD
index 07ba6fa..56f5adf 100755
--- a/http/squid/BUILD
+++ b/http/squid/BUILD
@@ -8,9 +8,11 @@ SQUID_AUTH_DIGEST='' &&
SQUID_AUTH_NTLM='' &&

./configure \
- --prefix=/usr \
- --sysconfdir=/etc/squid \
- --localstatedir=/var/cache/squid \
+ --prefix=${INSTALL_ROOT}/usr \
+ --sysconfdir=${INSTALL_ROOT}/etc/squid \
+ --localstatedir=${INSTALL_ROOT}/var/cache/squid \
+ --mandir=${INSTALL_ROOT}/usr/share/man \
+ --infodir=${INSTALL_ROOT}/usr/share/info \
--enable-async-io \
--enable-snmp \
--enable-removal-policies \
diff --git a/http/squid/HISTORY b/http/squid/HISTORY
index 29d5a92..c4dfc0d 100644
--- a/http/squid/HISTORY
+++ b/http/squid/HISTORY
@@ -1,3 +1,7 @@
+2007-10-10 Martin Spitzbarth <m.spitzbarth AT gmx.de>
+ * BUILD: fixed the install path of the manpages
+ * BUILD, INSTALL: INSTALL_ROOT ified the spell
+
2007-09-06 George Sherwood <george AT beernabeer.com>
* DETAILS: Updated to version 2.6.STABLE16

diff --git a/http/squid/INSTALL b/http/squid/INSTALL
index e525f14..9c9b0d4 100755
--- a/http/squid/INSTALL
+++ b/http/squid/INSTALL
@@ -1,10 +1,10 @@
make install &&

-chown -R nobody.nogroup /var/cache/squid &&
+chown -R nobody.nogroup ${INSTALL_ROOT}/var/cache/squid &&

-if ! [ -x /var/log/squid ]; then
- mkdir -p /var/log/squid &&
- touch /var/log/squid/access.log &&
- touch /var/log/squid/cache.log &&
- touch /var/log/squid/store.log
+if ! [ -x ${INSTALL_ROOT}/var/log/squid ]; then
+ mkdir -p ${INSTALL_ROOT}/var/log/squid &&
+ touch ${INSTALL_ROOT}/var/log/squid/access.log &&
+ touch ${INSTALL_ROOT}/var/log/squid/cache.log &&
+ touch ${INSTALL_ROOT}/var/log/squid/store.log
fi
diff --git a/http/xulrunner/BUILD b/http/xulrunner/BUILD
index 2175575..3fd5c23 100755
--- a/http/xulrunner/BUILD
+++ b/http/xulrunner/BUILD
@@ -17,6 +17,11 @@ fi &&
CFLAGS="${CFLAGS//-O3/-O2}" &&
CXXFLAGS="${CXXFLAGS//-O3/-O2}" &&

+if [[ ${SMGL_COMPAT_ARCHS[1]} == ia32 ]]
+then
+ OPTS="--enable-elf-dynstr-gc $OPTS"
+fi &&
+
./configure --prefix=$INSTALL_ROOT/usr \
--mandir=$INSTALL_ROOT/usr/share/man \
--with-default-mozilla-five-home=$MOZILLA_HOME \
@@ -28,7 +33,6 @@ CXXFLAGS="${CXXFLAGS//-O3/-O2}" &&
--enable-xft \
--disable-pango \
--enable-reorder \
- --enable-elf-dynstr-gc \
--enable-storage \
--enable-cpp-rtti \
--enable-application=xulrunner \
@@ -44,6 +48,7 @@ CXXFLAGS="${CXXFLAGS//-O3/-O2}" &&
--disable-pedantic \
$XULRUNNER_OPTS \
$OPTS &&
+
make_single &&

make
diff --git a/http/xulrunner/HISTORY b/http/xulrunner/HISTORY
index 1b0e995..277aa78 100644
--- a/http/xulrunner/HISTORY
+++ b/http/xulrunner/HISTORY
@@ -1,3 +1,9 @@
+2007-10-27 Lalo Martins <lalo AT sourcemage.org>
+ * BUILD: fix build on non-ia32
+ (no PATCHLEVEL, as it only makes it buildable for users when it
wasn't
+ buildable before)
+ Fixes bug #13101
+
2007-09-30 Arwed v. Merkatz <v.merkatz AT gmx.net>
* DEPENDS: fixed check for xorg-modular

diff --git a/kde-apps/digikam/DETAILS b/kde-apps/digikam/DETAILS
index 488c490..dd026e6 100755
--- a/kde-apps/digikam/DETAILS
+++ b/kde-apps/digikam/DETAILS
@@ -1,7 +1,7 @@
SPELL=digikam
if [[ "$DG_VER" == "y" ]];then
- VERSION=0.9.2-final
-
SOURCE_HASH=sha512:030768d08d564c4a7322ff67e151ba0067499c54629cf6ba133736b7ee4e5e7c4a893ae21eec30a06d18d1736d983a752af66c877f032ef77cca4c6c8e7872f1
+ VERSION=0.9.3-beta2
+
SOURCE_HASH=sha512:768caf0e63c9b5c1b0f6487cf74fe350986d78261d775c06e2050cd2075dc288aebc11804c021ae25e3ca51aebc84d52a06d44fcb75db667b17f9ee3019c0bad
else
VERSION=0.9.2-final

SOURCE_HASH=sha512:030768d08d564c4a7322ff67e151ba0067499c54629cf6ba133736b7ee4e5e7c4a893ae21eec30a06d18d1736d983a752af66c877f032ef77cca4c6c8e7872f1
diff --git a/kde-apps/digikam/HISTORY b/kde-apps/digikam/HISTORY
index f098a5e..a597b84 100644
--- a/kde-apps/digikam/HISTORY
+++ b/kde-apps/digikam/HISTORY
@@ -1,3 +1,10 @@
+2007-11-01 Treeve Jelbert <treevesourcemage.org>
+ * DETAILS: version 0.9.3-beta2 (devel)
+
+2007-10-11 Treeve Jelbert <treevesourcemage.org>
+ * DETAILS: version 0.9.3-beta1 (devel)
+ * DEPENDS: patch not relevant to devel version
+
2007-09-18 Treeve Jelbert <treevesourcemage.org>
* lcmsprf.h, PRE_BUILD: added, fix compiel with lcms-1.17

diff --git a/kde-apps/digikam/PRE_BUILD b/kde-apps/digikam/PRE_BUILD
index bf1fca7..ad689b2 100755
--- a/kde-apps/digikam/PRE_BUILD
+++ b/kde-apps/digikam/PRE_BUILD
@@ -1,3 +1,5 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&
+if [[ "$DG_VER" != "y" ]];then
patch -p3 < $SPELL_DIRECTORY/lcmsprf.h
+fi
diff --git a/kde-apps/gwenview/DEPENDS b/kde-apps/gwenview/DEPENDS
index 8542911..13f5c9a 100755
--- a/kde-apps/gwenview/DEPENDS
+++ b/kde-apps/gwenview/DEPENDS
@@ -1,4 +1,4 @@
-depends kdelibs &&
+source $SECTION_DIRECTORY/KDE_DEPENDS &&
depends exiv2 &&
optional_depends kipi-plugins \
"--enable-kipi" \
diff --git a/kde-apps/gwenview/HISTORY b/kde-apps/gwenview/HISTORY
index 71245be..35e45b6 100644
--- a/kde-apps/gwenview/HISTORY
+++ b/kde-apps/gwenview/HISTORY
@@ -1,3 +1,6 @@
+2007-10-24 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * DEPENDS: added arts for disabling #14039
+
2007-09-15 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.4.2

diff --git a/kde-apps/k9copy/DETAILS b/kde-apps/k9copy/DETAILS
index c0810a4..34d87f7 100755
--- a/kde-apps/k9copy/DETAILS
+++ b/kde-apps/k9copy/DETAILS
@@ -1,10 +1,10 @@
source $SECTION_DIRECTORY/KDE_DETAILS
SPELL=k9copy
- VERSION=1.1.3
+ VERSION=1.2.0
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
- SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
+
SOURCE_HASH=sha512:ea70f99dfd00c5943112a14157dd3c251c9b30f491811d7ea904381b8ce1087bdf0ee7ac644ce343efe066b9a38c90bbd53afe9f0d2496faa75ed05277d0ae9c
WEB_SITE=http://k9copy.sourceforge.net/
ENTERED=20060102
LICENSE[0]=GPL
diff --git a/kde-apps/k9copy/HISTORY b/kde-apps/k9copy/HISTORY
index e1ad7c8..a1affff 100644
--- a/kde-apps/k9copy/HISTORY
+++ b/kde-apps/k9copy/HISTORY
@@ -1,3 +1,6 @@
+2007-11-01 Julien "_kaze_" ROZO <julien AT rozo.org>
+ * DETAILS: updated spell to 1.2.0
+
2007-09-01 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* DETAILS: updated spell to 1.1.3, patch from Julien "KaZe" ROZO
#13971

diff --git a/kde-apps/kdebluetooth/DEPENDS b/kde-apps/kdebluetooth/DEPENDS
index 87151a7..9e5a7e5 100755
--- a/kde-apps/kdebluetooth/DEPENDS
+++ b/kde-apps/kdebluetooth/DEPENDS
@@ -1,5 +1,6 @@
depends kdebase --without-arts &&
depends openobex &&
+depends obexftp &&
depends bluez-utils &&

optional_depends "xmms" \
diff --git a/kde-apps/kdebluetooth/DETAILS b/kde-apps/kdebluetooth/DETAILS
index 159369b..1c1e0f9 100755
--- a/kde-apps/kdebluetooth/DETAILS
+++ b/kde-apps/kdebluetooth/DETAILS
@@ -1,9 +1,9 @@
SPELL=kdebluetooth
- VERSION=1.0-beta3
+ VERSION=1.0_beta8
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$SOURCEFORGE_URL/kde-bluetooth/$SOURCE
-
SOURCE_HASH=sha512:445bab9edffaa626333a77b269b9cb835754417a8e020cf43b8e70a22fe8df2fd1c9491b8c37bd82cd35d89b048a17e5256b95267c620a61be2c07c6b21984e0
+
SOURCE_HASH=sha512:84b4fad1ba7d15f6e3d7e4a16a1097cb7814cca13ec274937d68b90b1c65665fc1969d10b4ce38d01896772c6ed5022f31a22b10df25e78bdbaf7ebf13513f20
WEB_SITE=http://bluetooth.kmobiletools.org/
ENTERED=20050321
LICENSE[0]=GPL
diff --git a/kde-apps/kdebluetooth/HISTORY b/kde-apps/kdebluetooth/HISTORY
index 7b6e5ea..1bce17e 100644
--- a/kde-apps/kdebluetooth/HISTORY
+++ b/kde-apps/kdebluetooth/HISTORY
@@ -1,3 +1,7 @@
+2007-10-04 Julien "_kaze_" ROZO <julien AT rozo.org>
+ * DETAILS: updated spell to 1.0_beta8
+ * DEPENDS: added depends obexftp
+
2007-10-01 Julien "_kaze_" ROZO <julien AT rozo.org>
* DETAILS: updated spell to 1.0-beta3, corrected WEB_SITE

diff --git a/kde-apps/kdesvn/BUILD b/kde-apps/kdesvn/BUILD
index d4b482b..4996a48 100755
--- a/kde-apps/kdesvn/BUILD
+++ b/kde-apps/kdesvn/BUILD
@@ -1 +1,6 @@
-source $SECTION_DIRECTORY/KDE_BUILD
+if [[ -f /etc/profile.d/qt.sh ]]; then
+ . /etc/profile.d/qt.sh
+fi &&
+
+OPTS="-DCMAKE_CXX_FLAGS=-DQT_THREAD_SUPPORT $OPTS" &&
+cmake_build
diff --git a/kde-apps/kdesvn/CONFIGURE b/kde-apps/kdesvn/CONFIGURE
deleted file mode 100755
index 3e2e1ef..0000000
--- a/kde-apps/kdesvn/CONFIGURE
+++ /dev/null
@@ -1 +0,0 @@
-source $SECTION_DIRECTORY/KDE_CONFIGURE
diff --git a/kde-apps/kdesvn/DEPENDS b/kde-apps/kdesvn/DEPENDS
index ed992fb..24fd9f0 100755
--- a/kde-apps/kdesvn/DEPENDS
+++ b/kde-apps/kdesvn/DEPENDS
@@ -1,5 +1,6 @@
-source "$SECTION_DIRECTORY/KDE_DEPENDS" &&
-
+depends qt-x11 &&
+depends kdelibs &&
depends subversion &&
depends apr-util &&
-depends neon
+depends neon &&
+depends cmake
diff --git a/kde-apps/kdesvn/DETAILS b/kde-apps/kdesvn/DETAILS
index e415628..8bca192 100755
--- a/kde-apps/kdesvn/DETAILS
+++ b/kde-apps/kdesvn/DETAILS
@@ -1,12 +1,13 @@
source $SECTION_DIRECTORY/KDE_DETAILS

SPELL=kdesvn
- VERSION=0.9.1
- SOURCE=$SPELL-$VERSION.tar.gz
- SOURCE_URL[0]=http://www.alwins-world.de/programs/download/kdesvn/$SOURCE
-
SOURCE_HASH=sha512:d21b29b23b5b76379ff807327c5941b0aba2fda4f9a76005c5499a63a048119fbc2d1fe1f489a0b3efc4626a97bf7701e0e4b8bce803956c09b39e545042174d
+ VERSION=0.14.0
+ VERSIONX=${VERSION//.0/.x}
+ SOURCE=$SPELL-$VERSION.tar.bz2
+
SOURCE_URL[0]=http://www.alwins-world.de/programs/download/kdesvn/$VERSIONX/$SOURCE
+
SOURCE_HASH=sha512:46e3bdb67a4555b0e19917866cbf77b42625be4b0afb55c27195c1fe17d7974d4c6281ebcdef44783b6fabc866c82b259b6eabd482988bb46a54f6474168e225
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/$SPELL-$VERSION
- WEB_SITE=http://www.alwins-world.de/programs/kdesvn/
+ WEB_SITE=http://kdesvn.alwins-world.de/
LICENSE[0]=LGPL
KEYWORDS="kde svn"
SHORT="Graphical frontend for SVN"
diff --git a/kde-apps/kdesvn/HISTORY b/kde-apps/kdesvn/HISTORY
index 2eefb4d..f1457ec 100644
--- a/kde-apps/kdesvn/HISTORY
+++ b/kde-apps/kdesvn/HISTORY
@@ -1,3 +1,9 @@
+2007-10-20 Julien "_kaze_" ROZO <julien AT rozo.org>
+ * DETAILS: updated version to 0.14.0, added VERSIONX for SOURCE_URL,
corrected WEB_SITE
+ * BUILD: spell now uses cmake
+ * DEPENDS: removed KDE_DEPENDS, as kdesvn doesn't need arts; spell
now depends on cmake
+ * CONFIGURE: useless, deleted
+
2006-12-14 Juuso Alasuutari <iuso AT sourcemage.org>
* DEPENDS: Removed depends kdelibs (now in KDE_DEPENDS).

diff --git a/kde-apps/kdevelop/DEPENDS b/kde-apps/kdevelop/DEPENDS
index 1561012..850d24b 100755
--- a/kde-apps/kdevelop/DEPENDS
+++ b/kde-apps/kdevelop/DEPENDS
@@ -42,7 +42,7 @@ optional_depends fortran \
'--disable-fortran' \
'for Fortran support' &&

-optional_depends GHC \
+optional_depends ghc \
'--enable-haskell' \
'--disable-haskell' \
'for Haskell support' &&
diff --git a/kde-apps/kdevelop/DETAILS b/kde-apps/kdevelop/DETAILS
index 7a17797..7dfcde9 100755
--- a/kde-apps/kdevelop/DETAILS
+++ b/kde-apps/kdevelop/DETAILS
@@ -1,10 +1,10 @@
source $SECTION_DIRECTORY/KDE_DETAILS

SPELL=kdevelop
- VERSION=3.4.1
+ VERSION=3.5.0
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- SOURCE_URL[0]=$KDE_URL/stable/3.5.7/src/$SOURCE
+ SOURCE_URL[0]=$KDE_URL/stable/3.5.8/src/$SOURCE
SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
WEB_SITE=http://www.kdevelop.org/
ENTERED=20010922
diff --git a/kde-apps/kdevelop/HISTORY b/kde-apps/kdevelop/HISTORY
index 5d91559..72b0aee 100644
--- a/kde-apps/kdevelop/HISTORY
+++ b/kde-apps/kdevelop/HISTORY
@@ -1,3 +1,9 @@
+2007-11-04 Alexander Tsamutali <astsmtl AT gmail.com>
+ * DEPENDS: Now depends on ghc instead of GHC
+
+2007-10-24 George Sherwood <george AT beernabeer.com>
+ * DETAILS: Updated to version 3.5.0. Updated SOURCE_URL.
+
2007-05-25 George Sherwood <george AT beernabeer.com>
* DETAILS: Updated to version 3.4.1. Updated SOURCE_URL.

diff --git a/kde-apps/kdevelop/kdevelop-3.4.1.tar.bz2.sig
b/kde-apps/kdevelop/kdevelop-3.4.1.tar.bz2.sig
deleted file mode 100644
index f47778d..0000000
Binary files a/kde-apps/kdevelop/kdevelop-3.4.1.tar.bz2.sig and /dev/null
differ
diff --git a/kde-apps/kdevelop/kdevelop-3.5.0.tar.bz2.sig
b/kde-apps/kdevelop/kdevelop-3.5.0.tar.bz2.sig
new file mode 100644
index 0000000..7aa8fd4
Binary files /dev/null and b/kde-apps/kdevelop/kdevelop-3.5.0.tar.bz2.sig
differ
diff --git a/kde-apps/kipi-plugins/DEPENDS b/kde-apps/kipi-plugins/DEPENDS
index 42f5c1f..f46a1cd 100755
--- a/kde-apps/kipi-plugins/DEPENDS
+++ b/kde-apps/kipi-plugins/DEPENDS
@@ -1,7 +1,8 @@
+source $SECTION_DIRECTORY/KDE_DEPENDS &&
depends libkexiv2 &&
depends libkipi &&
+depends libkdcraw &&
optional_depends libxslt "" "" "for HtmlExport plugin" &&
-optional_depends imlib2 "" "" "for SlideShow plugin" &&
optional_depends libgphoto2 "" "" "for kameraklient plugin" &&
optional_depends tiff "" "" "for
AcquireImages/JpegLossless/RawConverter plugins"

diff --git a/kde-apps/kipi-plugins/DETAILS b/kde-apps/kipi-plugins/DETAILS
index 7056a2c..55fb2be 100755
--- a/kde-apps/kipi-plugins/DETAILS
+++ b/kde-apps/kipi-plugins/DETAILS
@@ -1,6 +1,6 @@
SPELL=kipi-plugins
- VERSION=0.1.4
-
SOURCE_HASH=sha512:b141aafb149871105272d38278079a3c46c2b767b5373d80363bfd79d674ea1c5b6399e7be92c9beeca1ed51fbe0ba5adf56a57da6d8641e064660eb180a6c65
+ VERSION=0.1.5-beta1
+
SOURCE_HASH=sha512:56775a3703f50064c7737c0eaba3c5e6ac5edf3d3cd8f22a40f44d7971c21f758c3ab540e6798a6112b10113280b466317298efeaf54e0a10d70aeb8cc35cc31
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$SOURCEFORGE_URL/kipi/$SOURCE
diff --git a/kde-apps/kipi-plugins/HISTORY b/kde-apps/kipi-plugins/HISTORY
index f915346..9fd8478 100644
--- a/kde-apps/kipi-plugins/HISTORY
+++ b/kde-apps/kipi-plugins/HISTORY
@@ -1,3 +1,13 @@
+2007-10-24 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * DEPENDS: added arts for disabling #14038
+
+2007-10-15 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: remove imlib2
+
+2007-10-12 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.1.5-beta1
+ * DEPENDS: add libkdcraw
+
2007-09-18 Treeve Jelbert <treeve AT sourcemage.org>
* TRIGGERS: added, to check libkexiv2 chamges

diff --git a/kde-apps/kmobiletools/DETAILS b/kde-apps/kmobiletools/DETAILS
index 33a9e58..63c21ad 100755
--- a/kde-apps/kmobiletools/DETAILS
+++ b/kde-apps/kmobiletools/DETAILS
@@ -1,10 +1,10 @@
SPELL=kmobiletools
- VERSION=0.5.0-beta2
+ VERSION=0.5.0-beta3
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://download.berlios.de/$SPELL/$SOURCE
-
SOURCE_HASH=sha512:c1bdd030cac18f80c8fd67d81905b1f3e35c75937b86bc674cebcf3c6e2a6426af14616e7c1905f21a87e2e382e9d6ec9990032e49b8b2f62d5fc93a1dda7cef
- WEB_SITE=http://kmobiletools.berlios.de/
+
SOURCE_HASH=sha512:a460763fd500dcacf51d5e34d27e61321215eba01b202b13e14e87383904b0e96383e0a346548caa5dec4803be86c380069132d60103ae35dafe8cabbb9e9bdb
+ WEB_SITE=http://www.kmobiletools.org/
ENTERED=20040919
LICENSE[0]=GPL
KEYWORDS="mobile kde"
diff --git a/kde-apps/kmobiletools/HISTORY b/kde-apps/kmobiletools/HISTORY
index 86a84ed..e44f0bd 100644
--- a/kde-apps/kmobiletools/HISTORY
+++ b/kde-apps/kmobiletools/HISTORY
@@ -1,3 +1,9 @@
+2007-10-04 Julien "_kaze_" ROZO <julien AT rozo.org>
+ * DETAILS: corrected sha512 sum
+
+2007-10-01 Julien "_kaze_" ROZO <julien AT rozo.org>
+ * DETAILS: updated spell to 0.5.0-beta3, corrected WEB_SITE
+
2007-04-09 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* DEPENDS: disable arts, added optional kdebluetooth
* DETAILS: updated spell to 0.5.0-beta2
diff --git a/kde-apps/koffice/DEPENDS b/kde-apps/koffice/DEPENDS
index 4ed9276..b601c47 100755
--- a/kde-apps/koffice/DEPENDS
+++ b/kde-apps/koffice/DEPENDS
@@ -1,5 +1,6 @@
depends kdebase &&
depends libxslt &&
+depends which &&

source "$SECTION_DIRECTORY/KDE_DEPENDS" &&

diff --git a/kde-apps/koffice/DETAILS b/kde-apps/koffice/DETAILS
index 4aca197..e59396d 100755
--- a/kde-apps/koffice/DETAILS
+++ b/kde-apps/koffice/DETAILS
@@ -7,7 +7,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$KDE_URL/stable/$SPELL-$VERSION/src/$SOURCE
WEB_SITE=http://www.koffice.org
ENTERED=20020405
- SECURITY_PATCH=2
+ SECURITY_PATCH=3
LICENSE[0]=GPL
KEYWORDS="kde office"
SHORT="Full office suite"
diff --git a/kde-apps/koffice/HISTORY b/kde-apps/koffice/HISTORY
index d9537aa..e47d8b3 100644
--- a/kde-apps/koffice/HISTORY
+++ b/kde-apps/koffice/HISTORY
@@ -1,3 +1,12 @@
+2007-11-08 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: SECURITY_PATCH++
+ * PRE_BUILD: apply patch
+ * koffice-1.6.3-xpdf2-CVE-2007-4352-5392-5393.diff.bz2: added
+ fix bug #14089
+
+2007-10-25 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * DEPENDS: added which, needed for kexi docs script #14063
+
2007-08-01 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: SECURITY_PATCH++
* PRE_BUILD, koffice-xpdf-CVE-2007-3387.diff: added
diff --git a/kde-apps/koffice/PRE_BUILD b/kde-apps/koffice/PRE_BUILD
index 4faa2a0..281e688 100755
--- a/kde-apps/koffice/PRE_BUILD
+++ b/kde-apps/koffice/PRE_BUILD
@@ -1,3 +1,5 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&
-patch -p0 < $SPELL_DIRECTORY/koffice-xpdf-CVE-2007-3387.diff
+patch -p0 < $SPELL_DIRECTORY/koffice-xpdf-CVE-2007-3387.diff &&
+bzcat $SPELL_DIRECTORY/koffice-1.6.3-xpdf2-CVE-2007-4352-5392-5393.diff.bz2|
\
+ patch -p0
diff --git
a/kde-apps/koffice/koffice-1.6.3-xpdf2-CVE-2007-4352-5392-5393.diff.bz2
b/kde-apps/koffice/koffice-1.6.3-xpdf2-CVE-2007-4352-5392-5393.diff.bz2
new file mode 100644
index 0000000..97dfaf5
Binary files /dev/null and
b/kde-apps/koffice/koffice-1.6.3-xpdf2-CVE-2007-4352-5392-5393.diff.bz2 differ
diff --git a/kde-apps/kphotoalbum/CONFLICTS b/kde-apps/kphotoalbum/CONFLICTS
deleted file mode 100755
index f397c53..0000000
--- a/kde-apps/kphotoalbum/CONFLICTS
+++ /dev/null
@@ -1 +0,0 @@
-conflicts kimdaba y
diff --git a/kde-apps/kphotoalbum/DEPENDS b/kde-apps/kphotoalbum/DEPENDS
index 48d068a..a81d405 100755
--- a/kde-apps/kphotoalbum/DEPENDS
+++ b/kde-apps/kphotoalbum/DEPENDS
@@ -1,4 +1,4 @@
-depends kdelibs &&
+source $SECTION_DIRECTORY/KDE_DEPENDS &&
optional_depends exiv2 \
"" \
"" \
diff --git a/kde-apps/kphotoalbum/DETAILS b/kde-apps/kphotoalbum/DETAILS
index 91335a2..29ba564 100755
--- a/kde-apps/kphotoalbum/DETAILS
+++ b/kde-apps/kphotoalbum/DETAILS
@@ -1,6 +1,6 @@
SPELL=kphotoalbum
- VERSION=3.0.1
-
SOURCE_HASH=sha512:e62b0ff7e79a3b1be146080e229d2c221a035ecb95b69ed816b90e9ee29aa00972aab6dce09b0049b104510d3af1afe34234c646fedf3cfb33de45b956128418
+ VERSION=3.0.2
+
SOURCE_HASH=sha512:03588a9ca03a13909bfdaa061a14de63b87b10da23889fd282ef70096a134d2956b9a9e5db364b6abd8b6b0feb399060a600e09e1caf3a79e6e39deb580418dc
SOURCE=$SPELL-$VERSION-noi18n.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION-noi18n
WEB_SITE=http://www.kphotoalbum.org/
diff --git a/kde-apps/kphotoalbum/HISTORY b/kde-apps/kphotoalbum/HISTORY
index c383a0d..1fcb296 100644
--- a/kde-apps/kphotoalbum/HISTORY
+++ b/kde-apps/kphotoalbum/HISTORY
@@ -1,3 +1,8 @@
+2007-11-04 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 3.0.2
+ * DEPENDS: use KDE_DEPENDS
+ * CONFLICTS: remove obsolete file
+
2007-04-11 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 3.0.1

diff --git a/kde-apps/kpowersave/DETAILS b/kde-apps/kpowersave/DETAILS
index 18fc680..5fef4ad 100755
--- a/kde-apps/kpowersave/DETAILS
+++ b/kde-apps/kpowersave/DETAILS
@@ -1,11 +1,11 @@
SPELL=kpowersave
- VERSION=0.7.2
+ VERSION=0.7.3
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_URL[0]=$SOURCEFORGE_URL/powersave/$SOURCE
-
SOURCE_HASH=sha512:016ce31752ac0e9c98936ef8ac770d63002702a225d39d7326811e5d1873c8432677f5fdc8b679cef0ecdd89205cda071258f598f4e456f9c2461a97d0071473
+
SOURCE_HASH=sha512:39c3ae8314009b91594ac0f05a7af625a9b164f5e010bf617bccc663205f049a74e5647bdc8b4cfa106c54e094bc5f351e504b051ea539f93bc283a569f9b8a4
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
LICENSE[0]=GPL
- WEB_SITE=http://freshmeat.net/projects/powersave
+ WEB_SITE=http://www.kde-apps.org/content/show.php?content=29295
ENTERED=20060709
SHORT="KDE frontend for the powersave daemon."
cat << EOF
diff --git a/kde-apps/kpowersave/HISTORY b/kde-apps/kpowersave/HISTORY
index f6e5f72..811daf0 100644
--- a/kde-apps/kpowersave/HISTORY
+++ b/kde-apps/kpowersave/HISTORY
@@ -1,3 +1,7 @@
+2007-11-04 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.7.3
+ new WEB_SITE
+
2007-09-24 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: kpowersave website is now defunct, use powersave's
* BUILD: Fails to compile with multiple make jobs
diff --git a/kde-apps/ksquirrel-libs/BUILD b/kde-apps/ksquirrel-libs/BUILD
index d4b482b..836d80e 100755
--- a/kde-apps/ksquirrel-libs/BUILD
+++ b/kde-apps/ksquirrel-libs/BUILD
@@ -1 +1,2 @@
+touch *
source $SECTION_DIRECTORY/KDE_BUILD
diff --git a/kde-apps/ksquirrel-libs/DETAILS b/kde-apps/ksquirrel-libs/DETAILS
index b94180e..e55d213 100755
--- a/kde-apps/ksquirrel-libs/DETAILS
+++ b/kde-apps/ksquirrel-libs/DETAILS
@@ -1,7 +1,7 @@
source $SECTION_DIRECTORY/KDE_DETAILS
SPELL=ksquirrel-libs
- VERSION=0.7.1try3
-
SOURCE_HASH=sha512:95545f641d2f369c3e4f2b82192da60d2bdcf68e1d76ecd4a7ac76a65155e16c9a85549620e4f19923981da52d10501d8b2b6309efe81593e88690e598535c35
+ VERSION=0.7.4
+
SOURCE_HASH=sha512:114c8978ddcd0fd6555d09babfb14287995be3ff9dc8f4a442da4ca635cdbec1aaa4c4af14b4e3a151e1d6fd939d200f4b6aa553dfa197a1116a549d2ea849c3
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-${VERSION//try?}
SOURCE_URL[0]=$SOURCEFORGE_URL/ksquirrel/$SOURCE
diff --git a/kde-apps/ksquirrel-libs/HISTORY b/kde-apps/ksquirrel-libs/HISTORY
index e6a932d..0aaab14 100644
--- a/kde-apps/ksquirrel-libs/HISTORY
+++ b/kde-apps/ksquirrel-libs/HISTORY
@@ -1,3 +1,13 @@
+2007-11-05 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.7.4
+ * BUILD: touch all files to fix dates being in future!!
+
+2007-11-04 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.7.3
+
+2007-10-13 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.7.2
+
2007-09-24 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.7.1try3

diff --git a/kde-apps/ksquirrel/DETAILS b/kde-apps/ksquirrel/DETAILS
index 3583065..8ba5b7d 100755
--- a/kde-apps/ksquirrel/DETAILS
+++ b/kde-apps/ksquirrel/DETAILS
@@ -1,7 +1,7 @@
source $SECTION_DIRECTORY/KDE_DETAILS
SPELL=ksquirrel
- VERSION=0.7.1try5
-
SOURCE_HASH=sha512:928de119d544c8f5ea7ed3d186b5e6f37e150e791b1c81acc900b5a78fc0eddb9472819894c1e87e4a7ec755b2ebefbdc18bda831207abab880d989b2f59cfd0
+ VERSION=0.7.4
+
SOURCE_HASH=sha512:a78a1b2146e39fd16074329f615b904b4bec55b200bcd1e90aba9cbee86e4120ab7342d4c8a81c9444c90f40263e1c1009f511b1ed476b51c62ea119f1efe365
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-${VERSION//try?}
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
diff --git a/kde-apps/ksquirrel/HISTORY b/kde-apps/ksquirrel/HISTORY
index f461ad4..cf412a4 100644
--- a/kde-apps/ksquirrel/HISTORY
+++ b/kde-apps/ksquirrel/HISTORY
@@ -1,3 +1,12 @@
+2007-11-05 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.7.4
+
+2007-11-04 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.7.3
+
+2007-10-13 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.7.2
+
2007-09-24 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.7.1try5

diff --git a/kde-apps/kxneur/BUILD b/kde-apps/kxneur/BUILD
new file mode 100755
index 0000000..d4b482b
--- /dev/null
+++ b/kde-apps/kxneur/BUILD
@@ -0,0 +1 @@
+source $SECTION_DIRECTORY/KDE_BUILD
diff --git a/kde-apps/kxneur/CONFIGURE b/kde-apps/kxneur/CONFIGURE
new file mode 100755
index 0000000..3e2e1ef
--- /dev/null
+++ b/kde-apps/kxneur/CONFIGURE
@@ -0,0 +1 @@
+source $SECTION_DIRECTORY/KDE_CONFIGURE
diff --git a/kde-apps/kxneur/DEPENDS b/kde-apps/kxneur/DEPENDS
index 44c187d..7dfb23b 100755
--- a/kde-apps/kxneur/DEPENDS
+++ b/kde-apps/kxneur/DEPENDS
@@ -1,2 +1,2 @@
-depends xneur &&
-depends kdelibs
+source $SECTION_DIRECTORY/KDE_DEPENDS &&
+depends xneur
diff --git a/kde-apps/kxneur/DETAILS b/kde-apps/kxneur/DETAILS
index ee4042f..9016c81 100755
--- a/kde-apps/kxneur/DETAILS
+++ b/kde-apps/kxneur/DETAILS
@@ -1,8 +1,9 @@
+source $SECTION_DIRECTORY/KDE_DETAILS
SPELL=kxneur
- VERSION=0.6.2
+ VERSION=0.8.0
SOURCE=${SPELL}-${VERSION}.tar.bz2
SOURCE_URL[0]=http://dists.xneur.ru/release-${VERSION}/tgz/${SOURCE}
-
SOURCE_HASH=sha512:9b65dd2e2002c8ac6969055527bb49ae5afaa261dbde2ffca28bdc75ca969dee3cd0c3670c0048b329432529185af9c7966393c568aab3fbb63da9bfa37a1fd2
+
SOURCE_HASH=sha512:0ef39f37c3582ea3604e5bff7217e465c1b34d305159fbbc48c470d508cc539e3c0a1147118b470f2c0ed74965f7e4c07fbaf5272779967b11be193776d2792a
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
WEB_SITE=http://xneur.ru/
LICENSE[0]=GPL
diff --git a/kde-apps/kxneur/HISTORY b/kde-apps/kxneur/HISTORY
index d5b0d37..5826e84 100644
--- a/kde-apps/kxneur/HISTORY
+++ b/kde-apps/kxneur/HISTORY
@@ -1,2 +1,8 @@
+2007-10-13 Pol Vinogradov <vin.public AT gmail.com>
+ * DETAILS: updated to 0.8.0, added sourcing of
+ section-wide KDE_DETAILS
+ * BUILD, CONFIGURE: added for section way of building
+ * DEPENDS: added sourcing of section-wide KDE_DEPENDS
+
2007-07-26 Pol Vinogradov <vin.public AT gmail.com>
* DETAILS, DEPENDS: created spell
diff --git a/kde-apps/libkdcraw/DETAILS b/kde-apps/libkdcraw/DETAILS
index 0d4def4..155d2ca 100755
--- a/kde-apps/libkdcraw/DETAILS
+++ b/kde-apps/libkdcraw/DETAILS
@@ -1,6 +1,6 @@
SPELL=libkdcraw
- VERSION=0.1.1
-
SOURCE_HASH=sha512:17404ab05813fa93749c3cf78c2ae8b8fa046115f94bc361771685197825a22043dd17114f01020873f4733029294de68547b76a85c04ea1fa88ad5c433f09a1
+ VERSION=0.1.2
+
SOURCE_HASH=sha512:74166d1e784ff1c84be45a89f07fdf4d19f90ba374163ccceb69fceccd1973c391318ce22e57e3571bf5740d2ed4f06fbe48eea5190d56710e70b6efb468c98d
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-${VERSION}
SOURCE_URL[0]=$SOURCEFORGE_URL/kipi/$SOURCE
diff --git a/kde-apps/libkdcraw/HISTORY b/kde-apps/libkdcraw/HISTORY
index 0dc9c29..ed2ce4f 100644
--- a/kde-apps/libkdcraw/HISTORY
+++ b/kde-apps/libkdcraw/HISTORY
@@ -1,3 +1,6 @@
+2007-10-12 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.1.2
+
2007-06-14 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.1.1

diff --git a/kde-core/arts/DETAILS b/kde-core/arts/DETAILS
index 792a6bb..8aa9c55 100755
--- a/kde-core/arts/DETAILS
+++ b/kde-core/arts/DETAILS
@@ -1,11 +1,11 @@
source $SECTION_DIRECTORY/KDE_DETAILS

SPELL=arts
- VERSION=1.5.7
-
SOURCE_HASH=sha512:e2bcd5bfcf60a7b34a9ccf3bbfc9e8fee67336643b78044db649f2009dec4ae8b4cc864fcee626a9edfb737e17d179fea2111999264c5b8ceee5fa20977d95ef
+ VERSION=1.5.8
+
SOURCE_HASH=sha512:0dc73511e44ca9c6408f4aa0eb0f3d3d6de97cfc235036f518fcb0ecebab54ce407fe5035672e1a2ddc33a3217b0df8bd04da9d641e1a98fb4bba2c53f115a55
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- SOURCE_URL[0]=$KDE_URL/stable/3.5.7/src/$SOURCE
+ SOURCE_URL[0]=$KDE_URL/stable/3.5.8/src/$SOURCE
WEB_SITE=http://www.kde.org/
ENTERED=20020322
SECURITY_PATCH=1
diff --git a/kde-core/arts/HISTORY b/kde-core/arts/HISTORY
index 84877a3..6ac7c33 100644
--- a/kde-core/arts/HISTORY
+++ b/kde-core/arts/HISTORY
@@ -1,3 +1,6 @@
+2007-10-16 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.5.8
+
2007-05-26 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* DETAILS: Fixed SOURCE_URL[0]
updated spell to 1.5.7
diff --git a/kde-core/kde-i18n/DETAILS b/kde-core/kde-i18n/DETAILS
index 2addb21..cff6d1d 100755
--- a/kde-core/kde-i18n/DETAILS
+++ b/kde-core/kde-i18n/DETAILS
@@ -1,7 +1,7 @@
# the remaining details of this spell are provided by CONFIGURE
source $SECTION_DIRECTORY/KDE_DETAILS
SPELL=kde-i18n
- VERSION=3.5.7
+ VERSION=3.5.8
SITE=$KDE_URL/stable/${VERSION//.0/}/src/$SPELL

SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/kde-core/kde-i18n/HISTORY b/kde-core/kde-i18n/HISTORY
index b89b146..a2a3e8e 100644
--- a/kde-core/kde-i18n/HISTORY
+++ b/kde-core/kde-i18n/HISTORY
@@ -1,3 +1,6 @@
+2007-10-16 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 3.5.8
+
2007-05-23 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* DETAILS: updated spell to 3.5.7

diff --git a/kde-core/kde-profile/DETAILS b/kde-core/kde-profile/DETAILS
index a4fbc8a..f73b505 100755
--- a/kde-core/kde-profile/DETAILS
+++ b/kde-core/kde-profile/DETAILS
@@ -1,5 +1,5 @@
SPELL=kde-profile
- VERSION=3.5.7
+ VERSION=3.5.8
WEB_SITE=http://www.kde.org/
ENTERED=20010922
KEYWORDS="kde"
diff --git a/kde-core/kde-profile/HISTORY b/kde-core/kde-profile/HISTORY
index 2ed7854..a7539a6 100644
--- a/kde-core/kde-profile/HISTORY
+++ b/kde-core/kde-profile/HISTORY
@@ -1,3 +1,6 @@
+2007-10-16 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 3.5.8
+
2007-05-26 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* DETAILS: updated spell to 3.5.7

diff --git a/kde-core/kdeaccessibility/DETAILS
b/kde-core/kdeaccessibility/DETAILS
index d216a0b..fff08e3 100755
--- a/kde-core/kdeaccessibility/DETAILS
+++ b/kde-core/kdeaccessibility/DETAILS
@@ -1,8 +1,8 @@
source $SECTION_DIRECTORY/KDE_DETAILS

SPELL=kdeaccessibility
- VERSION=3.5.7
-
SOURCE_HASH=sha512:6df7c9bf806afcb9f3f31f12b1350e5d3823d0a88b6692a8d264aff031256840c91de75b864a8898adf47a70d7a12d9d55342ed6bf07969d334bab4390f7d7df
+ VERSION=3.5.8
+
SOURCE_HASH=sha512:64eefa965bc918adad2a83f2a147199c56b76176948a10e443fe26308aa6a420deb207691382cce4e533b57c6f288a334bdd3a9f392a2e1d6fa46f2369d990af
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$KDE_URL/stable/${VERSION//.0/}/src/$SOURCE
diff --git a/kde-core/kdeaccessibility/HISTORY
b/kde-core/kdeaccessibility/HISTORY
index d39bbbc..bc33176 100644
--- a/kde-core/kdeaccessibility/HISTORY
+++ b/kde-core/kdeaccessibility/HISTORY
@@ -1,3 +1,6 @@
+2007-10-16 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 3.5.8
+
2007-08-16 Ethan "eekee" Grammatikidis <eekee57 AT fastmail.fm>
* DETAILS: deilnting (79 columns is a little too wide with some
pagers)
diff --git a/kde-core/kdeaddons/DETAILS b/kde-core/kdeaddons/DETAILS
index bfe7041..15be0ad 100755
--- a/kde-core/kdeaddons/DETAILS
+++ b/kde-core/kdeaddons/DETAILS
@@ -1,8 +1,8 @@
source $SECTION_DIRECTORY/KDE_DETAILS

SPELL=kdeaddons
- VERSION=3.5.7
-
SOURCE_HASH=sha512:4634da5550b1efd665bce7d4c9cbfe0aaeaae8449d0376090280a64da5a0dc1d2c8e3aae1bb3442443443d532741183e34c2a01ef1fec5c4db0951dce4436ec3
+ VERSION=3.5.8
+
SOURCE_HASH=sha512:6e23443280cf5c46bb2f38b8e6bd8c4aa795991aaa8c9e7ca3a50484acba822753251c844c519d48a454003cf5178a5610d7f43246799bef57c841468e6e0f0e
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$KDE_URL/stable/${VERSION//.0/}/src/$SOURCE
diff --git a/kde-core/kdeaddons/HISTORY b/kde-core/kdeaddons/HISTORY
index 010e22b..fc8c403 100644
--- a/kde-core/kdeaddons/HISTORY
+++ b/kde-core/kdeaddons/HISTORY
@@ -1,3 +1,6 @@
+2007-10-16 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 3.5.8
+
2007-05-23 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* DETAILS: updated spell to 3.5.7

diff --git a/kde-core/kdeadmin/DETAILS b/kde-core/kdeadmin/DETAILS
index cad8387..1fc80b8 100755
--- a/kde-core/kdeadmin/DETAILS
+++ b/kde-core/kdeadmin/DETAILS
@@ -1,8 +1,8 @@
source $SECTION_DIRECTORY/KDE_DETAILS

SPELL=kdeadmin
- VERSION=3.5.7
-
SOURCE_HASH=sha512:8b82dfee291b1a8daa192af0b29839a8e6a1b12762d261094192b87fd94453398d275c06130fab9773de4503b4d03c3e6aabe07a9e9d2bdfaac39f357a84daa8
+ VERSION=3.5.8
+
SOURCE_HASH=sha512:5be75cbc76c8556d071a5347d75f9bdc207216f3797b7dd50f3948c79598f4c6d0ed44694a803c4d36a2689b7f5bded40c2f8a04cecc84bfdc290827ab57e096
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$KDE_URL/stable/${VERSION//.0/}/src/$SOURCE
diff --git a/kde-core/kdeadmin/HISTORY b/kde-core/kdeadmin/HISTORY
index 7b9a9df..b5f099e 100644
--- a/kde-core/kdeadmin/HISTORY
+++ b/kde-core/kdeadmin/HISTORY
@@ -1,3 +1,6 @@
+2007-10-16 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 3.5.8
+
2007-05-23 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* DETAILS: updated spell to 3.5.7

diff --git a/kde-core/kdeartwork/DETAILS b/kde-core/kdeartwork/DETAILS
index 6b4c258..b0fd36f 100755
--- a/kde-core/kdeartwork/DETAILS
+++ b/kde-core/kdeartwork/DETAILS
@@ -1,8 +1,8 @@
source $SECTION_DIRECTORY/KDE_DETAILS

SPELL=kdeartwork
- VERSION=3.5.7
-
SOURCE_HASH=sha512:5d8846d150f4cb07d5295ed8bff4c1640e1c73d80bd069b02363efba39ed38281576047ce98d0b207a22444570ac4e4470b0f16c063f693e73d462e1ef66bbe7
+ VERSION=3.5.8
+
SOURCE_HASH=sha512:2fdd56ff9bd26cd6ac4729e48f352ae003509200ca3a4cd484f8b55a6a9080d6d8a60210477217d1d24c9dcfc3a0f09b4a8febe362c7d0fcb001b20143f8afac
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$KDE_URL/stable/${VERSION//.0/}/src/$SOURCE
diff --git a/kde-core/kdeartwork/HISTORY b/kde-core/kdeartwork/HISTORY
index ba65228..6f40e4d 100644
--- a/kde-core/kdeartwork/HISTORY
+++ b/kde-core/kdeartwork/HISTORY
@@ -1,3 +1,6 @@
+2007-10-16 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 3.5.8
+
2007-05-23 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* DETAILS: updated spell to 3.5.7

diff --git a/kde-core/kdebase/DETAILS b/kde-core/kdebase/DETAILS
index ac7e9d1..843eb05 100755
--- a/kde-core/kdebase/DETAILS
+++ b/kde-core/kdebase/DETAILS
@@ -1,8 +1,8 @@
source $SECTION_DIRECTORY/KDE_DETAILS

SPELL=kdebase
- VERSION=3.5.7
-
SOURCE_HASH=sha512:b7a01346b36b0bf6c4fcfe6104f738c60f188864d942286e9bf785f8e53ddd0e4643766d285cb499b6bf3cd61d3c0fd3c88f0e5e7c4498faeadadd6e1d1d957b
+ VERSION=3.5.8
+
SOURCE_HASH=sha512:5385d94939300fe1f79e15fbe5f26387c19d7b9da1744915ac47cd17a8f223a56c8a6aae9e92b3c22037303bf978f2bd3a7d2d97a40a2d7585458afe6cb46024
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$KDE_URL/stable/${VERSION//.0/}/src/$SOURCE
@@ -13,6 +13,7 @@ if [[ $SMGL_THEME == "y" ]]; then
fi
WEB_SITE=http://www.kde.org
ENTERED=20010912
+ PATCHLEVEL=1
SECURITY_PATCH=3
LICENSE[0]=GPL
KEYWORDS="kde"
diff --git a/kde-core/kdebase/FINAL b/kde-core/kdebase/FINAL
index 94cabe4..b37e679 100755
--- a/kde-core/kdebase/FINAL
+++ b/kde-core/kdebase/FINAL
@@ -1,12 +1,3 @@
-if check_if_xorg_modular_libs qt-x11; then
- message "$PROBLEM_COLOR"
- message "kdm does not work out-of-the-box with xorg-modular since the "
- message "paths changed. Edit /usr/share/config/kdm/kdmrc and modify "
- message "ServerCmd to point to /usr/bin/X . If needed, set Xrdb, "
- message "FailsafeClient and Session to point to correct paths (no X11R6/)."
- message "$DEFAULT_COLOR"
-fi &&
-
message '
To get pmount working with hal on kde >= 3.5.4 a policy for the plugdev group
has to be created in /etc/dbus-1/system.d/hal.conf:
diff --git a/kde-core/kdebase/HISTORY b/kde-core/kdebase/HISTORY
index ef7edf9..ba7ae79 100644
--- a/kde-core/kdebase/HISTORY
+++ b/kde-core/kdebase/HISTORY
@@ -1,3 +1,17 @@
+2007-10-20 Juuso Alasuutari <iuso AT sourcemage.org>
+ * FINAL: Removed warning about paths in kdmrc, they have been made
+ xorg-modular-compliant.
+
+2007-10-16 Treeve Jelbert <treeve AT sourcemage.org>
+ * INSTALL: /usr/share/xsessions is a directory,
+ create it before copying
+ * DETAILS: PATCHLEVEL++
+
+2007-10-16 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 3.5.8
+ * PRE_BUILD: don't apply security patches
+ * *.diff: deleted, already applied upstream
+
2007-09-21 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: SECURTIY_PATCH++
CVE-2007-4224 CVE-2007-4225 CVE-2007-3820 CVE-2007-4569
diff --git a/kde-core/kdebase/INSTALL b/kde-core/kdebase/INSTALL
index 20d3e00..2858c92 100755
--- a/kde-core/kdebase/INSTALL
+++ b/kde-core/kdebase/INSTALL
@@ -18,5 +18,6 @@ if [[ $SMGL_THEME == "y" ]]; then
done
fi &&

+mkdir -p $INSTALL_ROOT/usr/share/xsessions &&
install -m 0644 -o root -g root $SCRIPT_DIRECTORY/kde.desktop \
$INSTALL_ROOT/usr/share/xsessions
diff --git a/kde-core/kdebase/PRE_BUILD b/kde-core/kdebase/PRE_BUILD
index 3557726..49d7088 100755
--- a/kde-core/kdebase/PRE_BUILD
+++ b/kde-core/kdebase/PRE_BUILD
@@ -1,7 +1,5 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&
-patch -p0 < $SPELL_DIRECTORY/post-3.5.7-kdebase-konqueror-2.diff &&
-patch -p0 < $SPELL_DIRECTORY/post-3.5.7-kdebase-kdm.diff &&
# splashscreen patch
if [[ $SMGL_THEME == "y" ]]; then
unpack_file 2
diff --git a/kde-core/kdebase/post-3.5.7-kdebase-kdm.diff
b/kde-core/kdebase/post-3.5.7-kdebase-kdm.diff
deleted file mode 100644
index 40b6abb..0000000
--- a/kde-core/kdebase/post-3.5.7-kdebase-kdm.diff
+++ /dev/null
@@ -1,63 +0,0 @@
---- kdm/backend/session.c
-+++ kdm/bakcend/session.c
-@@ -121,8 +121,9 @@
- static void
- DoAutoLogon( void )
- {
-- StrDup( &curuser, td->autoUser );
-- StrDup( &curpass, td->autoPass );
-+ ReStr( &curuser, td->autoUser );
-+ ReStr( &curpass, td->autoPass );
-+ ReStr( &curtype, "classic" );
- cursource = PWSRC_AUTOLOGIN;
- }
-
-@@ -141,7 +142,9 @@
- td->hstent->npass = 0;
- newdmrc = td->hstent->nargs;
- td->hstent->nargs = 0;
-+ ReStr( &curtype, "classic" );
- cursource = (td->hstent->rLogin == 1) ? PWSRC_RELOGIN :
PWSRC_MANUAL;
-+ return 1;
- } else if (*td->autoUser && !td->autoDelay && (tdiff > 0 ||
td->autoAgain))
- {
- unsigned int lmask;
-@@ -153,11 +156,9 @@
- if (lmask & ShiftMask)
- return 0;
- DoAutoLogon();
-- } else {
-- cursource = PWSRC_MANUAL;
-- return 0;
-+ return 1;
- }
-- return 1;
-+ return 0;
- }
-
-
-@@ -369,6 +370,7 @@
- if (curtype) free( curtype );
- curtype = GRecvStr();
- Debug( " type %\"s\n", curtype );
-+ cursource = PWSRC_MANUAL;
- if (Verify( conv_interact, rootok )) {
- Debug( " -> return success\n" );
- GSendInt( V_OK );
-@@ -378,7 +380,6 @@
- case G_AutoLogin:
- Debug( "G_AutoLogin\n" );
- DoAutoLogon();
-- StrDup( &curtype, "classic" );
- if (Verify( conv_auto, FALSE )) {
- Debug( " -> return success\n" );
- GSendInt( V_OK );
-@@ -565,7 +566,7 @@
- tdiff = td->autoAgain ?
- 1 : time( 0 ) - td->hstent->lastExit - td->openDelay;
- if (AutoLogon( tdiff )) {
-- if (!StrDup( &curtype, "classic" ) || !Verify( conv_auto,
FALSE ))
-+ if (!Verify( conv_auto, FALSE ))
- goto gcont;
- if (greeter)
- GSendInt( V_OK );
diff --git a/kde-core/kdebase/post-3.5.7-kdebase-konqueror-2.diff
b/kde-core/kdebase/post-3.5.7-kdebase-konqueror-2.diff
deleted file mode 100644
index 0d6e44e..0000000
--- a/kde-core/kdebase/post-3.5.7-kdebase-konqueror-2.diff
+++ /dev/null
@@ -1,49 +0,0 @@
---- konqueror/konq_combo.cc
-+++ konqueror/konq_combo.cc
-@@ -158,6 +158,9 @@ void KonqCombo::setURL( const QString& u
- kapp->dcopClient()->send( "konqueror*", "KonquerorIface",
- "addToCombo(QString,QCString)", data);
- }
-+ // important security consideration: always display the beginning
-+ // of the url rather than its end to prevent spoofing attempts.
-+ lineEdit()->setCursorPosition( 0 );
- }
-
- void KonqCombo::setTemporary( const QString& text )
---- konqueror/konq_mainwindow.cc
-+++ konqueror/konq_mainwindow.cc
-@@ -611,12 +611,11 @@ void KonqMainWindow::openURL( KonqView *
- }
- else // no known serviceType, use KonqRun
- {
-- if ( ( view && view == m_currentView ) ||
-- ( !view && !req.newTab ) ) // startup with argument
-+ if ( ( !view || view->url().isEmpty() ) && !req.newTab ) // startup
with argument
- {
- // Show it for now in the location bar, but we'll need to store
it in the view
- // later on (can't do it yet since either view == 0 or
updateHistoryEntry will be called).
-- kdDebug(1202) << "setLocationBarURL : url = " << url << endl;
-+ kdDebug(1202) << "setLocationBarURL (startup) : url = " << url <<
endl;
- setLocationBarURL( url );
- }
-
-@@ -819,8 +818,6 @@ bool KonqMainWindow::openView( QString s
- if ( childView )
- {
- enableAllActions( true );
--
-- m_pViewManager->setActivePart( childView->part() );
- m_currentView = childView;
- }
- }
---- konqueror/konq_viewmgr.cc
-+++ konqueror/konq_viewmgr.cc
-@@ -1395,6 +1395,8 @@ void KonqViewManager::slotActivePartChan
-
- void KonqViewManager::emitActivePartChanged()
- {
-+ // prevent unnecessary multiple calls to slotPartActivated:
-+ m_activePartChangedTimer->stop();
- m_pMainWindow->slotPartActivated( activePart() );
- }
-
diff --git a/kde-core/kdebindings/DETAILS b/kde-core/kdebindings/DETAILS
index 0d963f0..ab68dba 100755
--- a/kde-core/kdebindings/DETAILS
+++ b/kde-core/kdebindings/DETAILS
@@ -1,8 +1,8 @@
source $SECTION_DIRECTORY/KDE_DETAILS

SPELL=kdebindings
- VERSION=3.5.5
-
SOURCE_HASH=sha512:ea6b6e00fc8f3fdb174e3dae84e0a36080a285f669687183bceb4a3b7875a0a65d5fa1d708dbf0393838dbdfe052d40e9884e414564c3fb34067d529fda7ed3b
+ VERSION=3.5.8
+
SOURCE_HASH=sha512:11b82273689ca0742e5e812d535d48b658fe3fae0acb23730aac8cfda864e8aba3e8ccabc97906e05c036615319222dd79985d7039e52a83c855d0847b8b217d
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$KDE_URL/stable/$VERSION/src/$SOURCE
diff --git a/kde-core/kdebindings/HISTORY b/kde-core/kdebindings/HISTORY
index 81f9cba..2e569fc 100644
--- a/kde-core/kdebindings/HISTORY
+++ b/kde-core/kdebindings/HISTORY
@@ -1,3 +1,6 @@
+2007-10-16 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 3.5.8
+
2007-06-16 Treeve Jelbert <treeve AT sourcemage.org>
* BUILD: source qt.sh
fixes bug #13802
diff --git a/kde-core/kdeedu/DETAILS b/kde-core/kdeedu/DETAILS
index 2216216..60c7c83 100755
--- a/kde-core/kdeedu/DETAILS
+++ b/kde-core/kdeedu/DETAILS
@@ -1,8 +1,8 @@
source $SECTION_DIRECTORY/KDE_DETAILS

SPELL=kdeedu
- VERSION=3.5.7
-
SOURCE_HASH=sha512:818f82b964e311690ab4a8e30d0fd4238e5cab7a995d4477ffbc57a69eb88cf5fa10dc231165aff13a58df4348269988b45e2b43f021f57847cde1c206581026
+ VERSION=3.5.8
+
SOURCE_HASH=sha512:8297ef698a1c14a12d147fddf9cb41f06f0722b815115c0546fa22b085f9ce740aa59d80c9b519d63e29b6b2c170ab6629515b1e0d39c09e34a19428f1a4d013
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$KDE_URL/stable/$VERSION/src/$SOURCE
diff --git a/kde-core/kdeedu/HISTORY b/kde-core/kdeedu/HISTORY
index 49e31f4..117d37e 100644
--- a/kde-core/kdeedu/HISTORY
+++ b/kde-core/kdeedu/HISTORY
@@ -1,3 +1,6 @@
+2007-10-16 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 3.5.8
+
2007-05-23 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* DETAILS: updated spell to 3.5.7

diff --git a/kde-core/kdegames/DETAILS b/kde-core/kdegames/DETAILS
index 86833eb..7022e38 100755
--- a/kde-core/kdegames/DETAILS
+++ b/kde-core/kdegames/DETAILS
@@ -1,8 +1,8 @@
source "$SECTION_DIRECTORY/KDE_DETAILS" &&

SPELL=kdegames
- VERSION=3.5.7
-
SOURCE_HASH=sha512:f7e9dfa775eed8cd050e77b46b9ec2575a84e8da31763621361aeceb26300fadd6959a5abae92050343c9c7809d86e293d479b1f36055e0925227919d93b9078
+ VERSION=3.5.8
+
SOURCE_HASH=sha512:fd6023c9db53644d82bb70bfdd3897a9710792767943b5cfb8edf2c4bdc9b9ab66ae13d9ef01476700e9fff982c6fa813027eb0187528682970a1f09c448720c
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=$KDE_URL/stable/${VERSION//.0/}/src/$SOURCE
diff --git a/kde-core/kdegames/HISTORY b/kde-core/kdegames/HISTORY
index 5e1cbfb..8cf9491 100644
--- a/kde-core/kdegames/HISTORY
+++ b/kde-core/kdegames/HISTORY
@@ -1,3 +1,12 @@
+2007-10-18 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: fix hash
+
+2007-10-16 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: add missing hash
+
+2007-10-16 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 3.5.8
+
2007-05-23 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* DETAILS: updated spell to 3.5.7

diff --git a/kde-core/kdegraphics/DETAILS b/kde-core/kdegraphics/DETAILS
index a558d2f..c53b1f9 100755
--- a/kde-core/kdegraphics/DETAILS
+++ b/kde-core/kdegraphics/DETAILS
@@ -1,14 +1,14 @@
source $SECTION_DIRECTORY/KDE_DETAILS

SPELL=kdegraphics
- VERSION=3.5.7
-
SOURCE_HASH=sha512:5193f0fd5e00117f5b89342602b4b269dc8ce9f789615042bfeb851a4a3bab773e3bc56b785ceb2d4236c1a53cd406354a343f522ed4c9048739d5931907ab11
+ VERSION=3.5.8
+
SOURCE_HASH=sha512:d565ecd7fb76714b7868b8daeb5ebfdc56094a547fc75fe3d81fbff021a5e571441469cebeca04fc923901b5c4f4194ca6997fd4a35f726e9e13b40de1c7ecef
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$KDE_URL/stable/${VERSION//.0/}/src/$SOURCE
WEB_SITE=http://www.kde.org
ENTERED=20010922
- SECURITY_PATCH=3
+ SECURITY_PATCH=4
LICENSE[0]=GPL
KEYWORDS="kde"
SHORT="Graphics related programs for KDE."
diff --git a/kde-core/kdegraphics/HISTORY b/kde-core/kdegraphics/HISTORY
index c8971d1..e364f1d 100644
--- a/kde-core/kdegraphics/HISTORY
+++ b/kde-core/kdegraphics/HISTORY
@@ -1,3 +1,12 @@
+2007-11-08 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: SECURITY_PATCH++
+ * PRE_BUILD, post-3.5.8-kdegraphics-kpdf.diff.bz2: added
+ securit fix, bug #14089
+
+2007-10-16 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 3.5.8
+ * PRE_BUILD, post-3.5.7-kdegraphics-CVE-2007-3387.diff: deleted
+
2007-08-01 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: SECURITY_PATCH++
* PRE_BUILD, post-3.5.7-kdegraphics-CVE-2007-3387.diff
diff --git a/kde-core/kdegraphics/PRE_BUILD b/kde-core/kdegraphics/PRE_BUILD
index 336c5ff..8dffb5c 100755
--- a/kde-core/kdegraphics/PRE_BUILD
+++ b/kde-core/kdegraphics/PRE_BUILD
@@ -1,3 +1,3 @@
-default_pre_build &&
-cd $SOURCE_DIRECTORY &&
-patch -p0 < $SPELL_DIRECTORY/post-3.5.7-kdegraphics-CVE-2007-3387.diff
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+bzcat $SPELL_DIRECTORY/post-3.5.8-kdegraphics-kpdf.diff.bz2| patch -p0
diff --git a/kde-core/kdegraphics/post-3.5.7-kdegraphics-CVE-2007-3387.diff
b/kde-core/kdegraphics/post-3.5.7-kdegraphics-CVE-2007-3387.diff
deleted file mode 100644
index e28add8..0000000
--- a/kde-core/kdegraphics/post-3.5.7-kdegraphics-CVE-2007-3387.diff
+++ /dev/null
@@ -1,17 +0,0 @@
-Index: kpdf/xpdf/xpdf/Stream.cc
-===================================================================
---- kpdf/xpdf/xpdf/Stream.cc (revision 689574)
-+++ kpdf/xpdf/xpdf/Stream.cc (working copy)
-@@ -411,9 +411,9 @@ StreamPredictor::StreamPredictor(Stream
-
- nVals = width * nComps;
- if (width <= 0 || nComps <= 0 || nBits <= 0 ||
-- nComps >= INT_MAX / nBits ||
-- width >= INT_MAX / nComps / nBits ||
-- nVals * nBits + 7 < 0) {
-+ nComps > gfxColorMaxComps || nBits > 16 ||
-+ width >= INT_MAX / nComps ||
-+ nVals >= (INT_MAX - 7) / nBits) {
- return;
- }
- pixBytes = (nComps * nBits + 7) >> 3;
diff --git a/kde-core/kdegraphics/post-3.5.8-kdegraphics-kpdf.diff.bz2
b/kde-core/kdegraphics/post-3.5.8-kdegraphics-kpdf.diff.bz2
new file mode 100644
index 0000000..1248e44
Binary files /dev/null and
b/kde-core/kdegraphics/post-3.5.8-kdegraphics-kpdf.diff.bz2 differ
diff --git a/kde-core/kdelibs/DETAILS b/kde-core/kdelibs/DETAILS
index d77e631..48db127 100755
--- a/kde-core/kdelibs/DETAILS
+++ b/kde-core/kdelibs/DETAILS
@@ -1,8 +1,8 @@
source $SECTION_DIRECTORY/KDE_DETAILS

SPELL=kdelibs
- VERSION=3.5.7
-
SOURCE_HASH=sha512:860e3d9c041a9086077893590a556980c402ca6a08938b5ac48aeb29c8366576f6c3078e624263b4e097338f6a57255da4e1df1cb7b4e54a6cb330dd28a081af
+ VERSION=3.5.8
+
SOURCE_HASH=sha512:70bd419337b1e1efc46f4ddcb678754371f49993c8dbdda3a67aeea0954154eede13e433f07b94b4a1be8b8427f38e3affcbd01f32fe3197f7f9dcb5f1f551c0
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$KDE_URL/stable/${VERSION//.0/}/src/$SOURCE
diff --git a/kde-core/kdelibs/HISTORY b/kde-core/kdelibs/HISTORY
index 1bb1490..dee9263 100644
--- a/kde-core/kdelibs/HISTORY
+++ b/kde-core/kdelibs/HISTORY
@@ -1,3 +1,7 @@
+2007-10-16 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 3.5.8
+ * PRE_BUILD, *.diff: deleted, already applied
+
2007-09-21 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: SECURITY_PATCH++
* post-3.5.7-kdelibs-kdecore-2.diff: added
diff --git a/kde-core/kdelibs/PRE_BUILD b/kde-core/kdelibs/PRE_BUILD
deleted file mode 100755
index 969f941..0000000
--- a/kde-core/kdelibs/PRE_BUILD
+++ /dev/null
@@ -1,5 +0,0 @@
-default_pre_build &&
-cd $SOURCE_DIRECTORY &&
-#patch -p0 < $SPELL_DIRECTORY/post-3.5.7-kdelibs-kdecore.diff &&
-patch -p0 < $SPELL_DIRECTORY/post-3.5.7-kdelibs-kdecore-2.diff &&
-patch -p1 < $SPELL_DIRECTORY/cups.diff
diff --git a/kde-core/kdelibs/cups.diff b/kde-core/kdelibs/cups.diff
deleted file mode 100644
index 124d799..0000000
--- a/kde-core/kdelibs/cups.diff
+++ /dev/null
@@ -1,82 +0,0 @@
---- kdelibs-3.5.7/kdeprint/cups/cupsdconf2/cups-util.c.cups13 2006-10-01
12:33:43.000000000 -0500
-+++ kdelibs-3.5.7/kdeprint/cups/cupsdconf2/cups-util.c 2007-07-19
15:12:48.000000000 -0500
-@@ -108,7 +108,8 @@ cupsGetConf(void)
- * See if we should retry the current digest password...
- */
-
-- if (strncmp(cups_server->fields[HTTP_FIELD_WWW_AUTHENTICATE],
"Basic", 5) == 0 ||
-+ if (strncmp(httpGetField (cups_server, HTTP_FIELD_WWW_AUTHENTICATE),
-+ "Basic", 5) == 0 ||
- digest_tries > 1 || !pwdstring[0])
- {
- /*
-@@ -116,7 +117,7 @@ cupsGetConf(void)
- */
-
- snprintf(prompt, sizeof(prompt), "Password for %s on %s? ",
cupsUser(),
-- cups_server->hostname);
-+ cupsServer());
-
- if ((password = cupsGetPassword(prompt)) == NULL)
- break;
-@@ -135,7 +136,8 @@ cupsGetConf(void)
- * Got a password; encode it for the server...
- */
-
-- if (strncmp(cups_server->fields[HTTP_FIELD_WWW_AUTHENTICATE],
"Basic", 5) == 0)
-+ if (strncmp(httpGetField (cups_server, HTTP_FIELD_WWW_AUTHENTICATE),
-+ "Basic", 5) == 0)
- {
- /*
- * Basic authentication...
-@@ -334,7 +336,8 @@ cupsPutConf(const char *name) /* I - Na
- * See if we should retry the current digest password...
- */
-
-- if (strncmp(cups_server->fields[HTTP_FIELD_WWW_AUTHENTICATE],
"Basic", 5) == 0 ||
-+ if (strncmp(httpGetField (cups_server, HTTP_FIELD_WWW_AUTHENTICATE),
-+ "Basic", 5) == 0 ||
- digest_tries > 1 || !pwdstring[0])
- {
- /*
-@@ -342,7 +345,7 @@ cupsPutConf(const char *name) /* I - Na
- */
-
- snprintf(prompt, sizeof(prompt), "Password for %s on %s? ",
cupsUser(),
-- cups_server->hostname);
-+ cupsServer());
-
- if ((password = cupsGetPassword(prompt)) == NULL)
- break;
-@@ -361,7 +364,8 @@ cupsPutConf(const char *name) /* I - Na
- * Got a password; encode it for the server...
- */
-
-- if (strncmp(cups_server->fields[HTTP_FIELD_WWW_AUTHENTICATE],
"Basic", 5) == 0)
-+ if (strncmp(httpGetField (cups_server, HTTP_FIELD_WWW_AUTHENTICATE),
-+ "Basic", 5) == 0)
- {
- /*
- * Basic authentication...
---- kdelibs-3.5.7/kdeprint/cups/ipprequest.cpp.cups13 2007-01-15
05:34:19.000000000 -0600
-+++ kdelibs-3.5.7/kdeprint/cups/ipprequest.cpp 2007-07-19 15:15:09.000000000
-0500
-@@ -309,7 +309,8 @@ bool IppRequest::doFileRequest(const QSt
- return false;
- }
-
--#ifdef HAVE_CUPS_NO_PWD_CACHE
-+#if defined(HAVE_CUPS_NO_PWD_CACHE) && \
-+ CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR < 3
- strncpy( HTTP->authstring, cups_authstring.data(), HTTP_MAX_VALUE );
- #endif
-
-@@ -319,7 +320,8 @@ bool IppRequest::doFileRequest(const QSt
- }
-
- request_ = cupsDoFileRequest(HTTP, request_, (res.isEmpty() ? "/" :
res.latin1()), (filename.isEmpty() ? NULL : filename.latin1()));
--#ifdef HAVE_CUPS_NO_PWD_CACHE
-+#if defined(HAVE_CUPS_NO_PWD_CACHE) && \
-+ CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR < 3
- cups_authstring = HTTP->authstring;
- #endif
- httpClose(HTTP);
diff --git a/kde-core/kdelibs/post-3.5.7-kdelibs-kdecore-2.diff
b/kde-core/kdelibs/post-3.5.7-kdelibs-kdecore-2.diff
deleted file mode 100644
index 50a9ed1..0000000
--- a/kde-core/kdelibs/post-3.5.7-kdelibs-kdecore-2.diff
+++ /dev/null
@@ -1,34 +0,0 @@
---- kdecore/kurl.cpp
-+++ kdecore/kurl.cpp
-@@ -30,6 +30,7 @@
- #include <kglobal.h>
- #include <kidna.h>
- #include <kprotocolinfo.h>
-+#include <kstringhandler.h>
- #endif
-
- #include <stdio.h>
-@@ -183,7 +184,7 @@ static QString lazy_encode( const QStrin
- (character == '?') || // Start of query delimiter
- ((character == '@') && encodeAt) || // Username delimiter
- (character == '#') || // Start of reference delimiter
-- ((character == 32) && (i+1 == old_length))) // A trailing space
-+ ((character == 32) && (i+1 == old_length || segment[i+1] == ' ')))
// A trailing space
- {
- new_segment[ new_length++ ] = '%';
-
-@@ -1540,7 +1541,13 @@ QString KURL::prettyURL( int _trailing )
- u += "//";
- if ( hasUser() )
- {
-- u += lazy_encode(m_strUser);
-+ QString s = m_strUser;
-+#ifndef KDE_QT_ONLY
-+ // shorten the username, its unlikely to be valid without password
anyway
-+ if (!hasPass())
-+ s = KStringHandler::csqueeze(s, 16);
-+#endif
-+ u += encode(s, 0, 0);
- // Don't show password!
- u += "@";
- }
diff --git a/kde-core/kdemultimedia/DETAILS b/kde-core/kdemultimedia/DETAILS
index d84cb41..7abc78b 100755
--- a/kde-core/kdemultimedia/DETAILS
+++ b/kde-core/kdemultimedia/DETAILS
@@ -1,8 +1,8 @@
source $SECTION_DIRECTORY/KDE_DETAILS

SPELL=kdemultimedia
- VERSION=3.5.7
-
SOURCE_HASH=sha512:0b405b08370dd6f1b98f243d95996bb428b92d9e88f87eb184f5c8d330fc9f6f5633946e806269909430896659b9b935ea3c40da2f3d952f5bbc47fb7e900bed
+ VERSION=3.5.8
+
SOURCE_HASH=sha512:92ae14bd30834eb6c6f5d1e7ad27c6c468c2d843a763c0caf296ea0a2fb4ff75eb0fcde449a9e879eb141b04b543ccfc69d3521c39f4d5e1d948b2c6dc21efb2
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$KDE_URL/stable/${VERSION//.0/}/src/$SOURCE
diff --git a/kde-core/kdemultimedia/HISTORY b/kde-core/kdemultimedia/HISTORY
index 368cd6c..e650f59 100644
--- a/kde-core/kdemultimedia/HISTORY
+++ b/kde-core/kdemultimedia/HISTORY
@@ -1,3 +1,6 @@
+2007-10-16 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 3.5.8
+
2007-05-23 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* DETAILS: updated spell to 3.5.7

diff --git a/kde-core/kdenetwork/DETAILS b/kde-core/kdenetwork/DETAILS
index 55d7b68..ba9119a 100755
--- a/kde-core/kdenetwork/DETAILS
+++ b/kde-core/kdenetwork/DETAILS
@@ -1,8 +1,8 @@
source $SECTION_DIRECTORY/KDE_DETAILS

SPELL=kdenetwork
- VERSION=3.5.7
-
SOURCE_HASH=sha512:9ce28cf12a2cb8e09d88f327c18503094d9d3affa4b0a79547eaea9880c1e16df51be9e3357e9edb5317de9ae9c57d992204c3c436ede223f9d85cc9d604f7f8
+ VERSION=3.5.8
+
SOURCE_HASH=sha512:e6f9475c80516b973cc7fa612b10c545d68a0356827a5c9dccb00c44cf2fdc1bf0e4e5094972d29bdf8cdf3cfd52708073d248f9d2c93b31fb2f144e4d20f830
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$KDE_URL/stable/${VERSION//.0/}/src/$SOURCE
diff --git a/kde-core/kdenetwork/HISTORY b/kde-core/kdenetwork/HISTORY
index baa6ab6..43e1897 100644
--- a/kde-core/kdenetwork/HISTORY
+++ b/kde-core/kdenetwork/HISTORY
@@ -1,3 +1,6 @@
+2007-10-16 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 3.5.8
+
2007-05-23 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* DETAILS: updated spell to 3.5.7

diff --git a/kde-core/kdepim/DETAILS b/kde-core/kdepim/DETAILS
index 1b189e2..23e1e14 100755
--- a/kde-core/kdepim/DETAILS
+++ b/kde-core/kdepim/DETAILS
@@ -1,8 +1,8 @@
source $SECTION_DIRECTORY/KDE_DETAILS

SPELL=kdepim
- VERSION=3.5.7
-
SOURCE_HASH=sha512:ce6920258ade12919806de72898c283f5019e8a67cbeab781d2a290e57f6542668c36b7228a669073e3615137dcfa38eedf1460993a56c5fa48d1a7edd8a785c
+ VERSION=3.5.8
+
SOURCE_HASH=sha512:c5c77da3768e753384aabd37254add7acb69e22c39ad3f52bd57a8ee7a2d843849c6f63ae9e9d462c19a1638a754608552c0769c9bd53a95135fa1c77ec99c74
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$KDE_URL/stable/${VERSION//.0/}/src/$SOURCE
diff --git a/kde-core/kdepim/HISTORY b/kde-core/kdepim/HISTORY
index 48c110b..4babe83 100644
--- a/kde-core/kdepim/HISTORY
+++ b/kde-core/kdepim/HISTORY
@@ -1,3 +1,6 @@
+2007-10-16 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 3.5.8
+
2007-06-20 Treeve Jelbert <treeve AT sourcemage.org>
* DEPENDS: add optional libopensync

diff --git a/kde-core/kdesdk/DETAILS b/kde-core/kdesdk/DETAILS
index b33cf6f..215d2b7 100755
--- a/kde-core/kdesdk/DETAILS
+++ b/kde-core/kdesdk/DETAILS
@@ -1,8 +1,8 @@
source $SECTION_DIRECTORY/KDE_DETAILS

SPELL=kdesdk
- VERSION=3.5.7
-
SOURCE_HASH=sha512:05ca30536b1c7c6a370fe243ddc55d5286ce98749de83e5d1b81d31eb27b18630c7fcaf6578795c0905b1d177121db063e5fee574c13d09863ea61ee27958a55
+ VERSION=3.5.8
+
SOURCE_HASH=sha512:4a697fe76d77b0bf5558ee6d4f2577deb953009117f57bc04847edafe648ef49f81ede7900a9edd938042c7208ccf556c2850a1a3cef56e9ad5005d30333cc6b
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$KDE_URL/stable/${VERSION//.0/}/src/$SOURCE
diff --git a/kde-core/kdesdk/HISTORY b/kde-core/kdesdk/HISTORY
index b9a0148..94e99a0 100644
--- a/kde-core/kdesdk/HISTORY
+++ b/kde-core/kdesdk/HISTORY
@@ -1,3 +1,6 @@
+2007-10-16 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 3.5.8
+
2007-05-23 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* DETAILS: updated spell to 3.5.7

diff --git a/kde-core/kdetoys/DETAILS b/kde-core/kdetoys/DETAILS
index 0307298..a1fc091 100755
--- a/kde-core/kdetoys/DETAILS
+++ b/kde-core/kdetoys/DETAILS
@@ -1,8 +1,8 @@
source $SECTION_DIRECTORY/KDE_DETAILS

SPELL=kdetoys
- VERSION=3.5.7
-
SOURCE_HASH=sha512:d6a303244a5589935b2695202a1e142931e7004a32673d9ba31868f7c01fb749b3cbaf322e78e3cc7f4f94eaef6d6b8c862fd83d1593568978ccc24df12615af
+ VERSION=3.5.8
+
SOURCE_HASH=sha512:9bc4e06ee8b0c3df14d365ab775910ca881e8be2da5ea28b6a428d1100e3be8f32e64da436801bd58bdc5c261cc2ea5381b9e9f36506c5ed72808a38c5c711ae
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$KDE_URL/stable/$VERSION/src/$SOURCE
diff --git a/kde-core/kdetoys/HISTORY b/kde-core/kdetoys/HISTORY
index a07e83f..541f3e0 100644
--- a/kde-core/kdetoys/HISTORY
+++ b/kde-core/kdetoys/HISTORY
@@ -1,3 +1,6 @@
+2007-10-16 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 3.5.8
+
2007-05-23 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* DETAILS: updated spell to 3.5.7

diff --git a/kde-core/kdeutils/DETAILS b/kde-core/kdeutils/DETAILS
index e30799f..81217b5 100755
--- a/kde-core/kdeutils/DETAILS
+++ b/kde-core/kdeutils/DETAILS
@@ -1,8 +1,8 @@
source $SECTION_DIRECTORY/KDE_DETAILS

SPELL=kdeutils
- VERSION=3.5.7
-
SOURCE_HASH=sha512:e5903b857cd7e39dff68fb098d2f6b6de5075def1c23f859d4e808aac4f886c3aafd8a4dc45b8f1bcf2104f0d6f5fea2271ae2614a710938e9989e1289fa39d3
+ VERSION=3.5.8
+
SOURCE_HASH=sha512:ed3e285adeaddcc088bd2fcb906db7a19d46395aa337eec35d2f9c2d05ce702b22b9a5ef32a63236152c312e43c7998f9d39caba3f30671a576e475198c2de4d
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$KDE_URL/stable/${VERSION//.0/}/src/$SOURCE
diff --git a/kde-core/kdeutils/HISTORY b/kde-core/kdeutils/HISTORY
index 5b7afc4..dedb3a3 100644
--- a/kde-core/kdeutils/HISTORY
+++ b/kde-core/kdeutils/HISTORY
@@ -1,3 +1,6 @@
+2007-10-16 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 3.5.8
+
2007-05-23 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* DETAILS: updated spell to 3.5.7

diff --git a/kde-core/kdewebdev/DETAILS b/kde-core/kdewebdev/DETAILS
index 43f8ca4..09fdabc 100755
--- a/kde-core/kdewebdev/DETAILS
+++ b/kde-core/kdewebdev/DETAILS
@@ -1,8 +1,8 @@
source $SECTION_DIRECTORY/KDE_DETAILS

SPELL=kdewebdev
- VERSION=3.5.7
-
SOURCE_HASH=sha512:531606f0ff0183cd0781c1791359c7067531d870d881eeaf9329ebd16db3b8095a2b1f7005b349f6bda598bb7fac1216a4c6782c9d24a6e8728aaa1a94ac304c
+ VERSION=3.5.8
+
SOURCE_HASH=sha512:59421f7abb02d24ddbefaf01537a4fbc7354d09b1a939de725c766855838fa1268c729fc2f6df5997458c5fb856d8fcabda8d9de6575892696de6487848891a6
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$KDE_URL/stable/${VERSION}/src/$SOURCE
diff --git a/kde-core/kdewebdev/HISTORY b/kde-core/kdewebdev/HISTORY
index 54c2af6..376392e 100644
--- a/kde-core/kdewebdev/HISTORY
+++ b/kde-core/kdewebdev/HISTORY
@@ -1,3 +1,6 @@
+2007-10-16 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 3.5.8
+
2007-05-23 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* DETAILS: updated spell to 3.5.7

diff --git a/kde4/FUNCTIONS b/kde4/FUNCTIONS
index 900f37a..80904c2 100755
--- a/kde4/FUNCTIONS
+++ b/kde4/FUNCTIONS
@@ -1,39 +1,53 @@
-default_build() {
-QTDIR=$INSTALL_ROOT/usr &&
-PATH=$QTDIR/bin/qt4:$PATH &&
-
-persistent_add KDE4DIR &&
-KDE4DIR=$INSTALL_ROOT/opt &&
+prepare_environment() {
+ QTDIR="${QTDIR:-$INSTALL_ROOT/usr}" &&
+ PATH="$QTDIR/bin/qt4:$PATH" &&

-PATH=$KDE4DIR/bin:$PATH &&
-LD_LIBRARY_PATH=$KDE4DIR/lib:$LD_LIBRARY_PATH &&
-QT_PLUGIN_PATH=$KDE4DIR/lib/kde4/plugins &&
+ persistent_add KDE4DIR &&
+ KDE4DIR="$INSTALL_ROOT/opt" &&

-XDG_DATA_DIRS=$KDE4DIR/share &&
+ PATH="$KDE4DIR/bin:$PATH" &&
+ LD_LIBRARY_PATH="$KDE4DIR/lib:$LD_LIBRARY_PATH" &&
+ QT_PLUGIN_PATH="$KDE4DIR/lib/kde4/plugins"
+}

-cd $SOURCE_DIRECTORY &&
-mkdir -p build &&
-cd build &&
-cmake -DCMAKE_INSTALL_PREFIX=$KDE4DIR \
- -DCMAKE_BUILD_TYPE=$KDE_DEBUG_OPTION \
- ../ &&
-make
+default_build() {
+ prepare_environment &&
+
+ cd $SOURCE_DIRECTORY &&
+ mkdir -p build &&
+ cd build &&
+ cmake -DCMAKE_INSTALL_PREFIX="$KDE4DIR" \
+ -DCMAKE_BUILD_TYPE=$KDE_DEBUG_OPTION \
+ ../ &&
+ make
}

# kde4 also needs a special default_install,
# to maintain some environment variables
default_install() {
-QTDIR=$INSTALL_ROOT/usr &&
-PATH=$QTDIR/bin/qt4:$PATH &&
+ prepare_environment &&
+
+ cd $SOURCE_DIRECTORY/build &&
+ make install
+}
+

-KDE4DIR=$INSTALL_ROOT/opt &&
+# we need a default_final, default_post_remove
+# so that the mime and desktop databases get updated
+update_databases() {

-PATH=$KDE4DIR/bin:$PATH &&
-LD_LIBRARY_PATH=$KDE4DIR/lib:$LD_LIBRARY_PATH &&
-QT_PLUGIN_PATH=$KDE4DIR/lib/kde4/plugins &&
+ source /etc/profile.d/strigi.sh
+ update-mime-database /opt/share/mime/
+ if [[ -e /opt/share/desktop-directories ]]; then
+ update-desktop-database /opt/share/desktop-directories
+ fi
+}
+
+default_final() {
+ update_databases
+}

-XDG_DATA_DIRS=$KDE4DIR/share &&

-cd $SOURCE_DIRECTORY/build &&
-make install
+default_post_remove() {
+ update_databases
}
diff --git a/kde4/HISTORY b/kde4/HISTORY
index 025e4ef..347def1 100644
--- a/kde4/HISTORY
+++ b/kde4/HISTORY
@@ -1,3 +1,19 @@
+2007-10-31 Treeve Jelbert <treeve AT sourcemage.org>
+ * KDE_DEPENDS: include kdebase4-runtime
+ include plasma
+
+2007-10-29 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * kde4/FUNCTIONS: factorised common code, indented, fixed
update_databases
+
+2007-10-26 Treeve Jelbert <treeve AT sourcemage.org>
+ * FUNCTIONS: source /etc/profile.d/strigi.sh
+ so that XDG_DATA_DIRS is always set correctly
+
+2007-10-19 Treeve Jelbert <treeve AT sourcemage.org>
+ * default_final, default_post_remove: added
+ don't set XDG_DATA_DIRS, this is now done by strigi
+ * KDE_DEPENDS: add depends desktop-file-utils
+
2007-09-25 Treeve Jelbert <treeve AT sourcemage.org>
* KDE_DEPENDS: remove soprano, pcre, FAM from kdelibs4
everything depends on kdelibs4 and optional kdebase-workspace4
diff --git a/kde4/KDE_DEPENDS b/kde4/KDE_DEPENDS
index 3568c7f..cff0aa3 100755
--- a/kde4/KDE_DEPENDS
+++ b/kde4/KDE_DEPENDS
@@ -9,6 +9,7 @@ case $SPELL in
depends libsm &&
depends libxext
fi &&
+ depends desktop-file-utils &&
depends dbus &&
depends hal &&
depends pkgconfig &&
@@ -30,13 +31,20 @@ case $SPELL in
depends libgpg-error &&
depends boost
;;
+
+ kdebase4-runtime)
+ depends kdelibs4
+ ;;

kdebase-workspace4)
depends kdelibs4 &&
depends X11-SERVER
;;

- *) depends kdelibs4 &&
+ plasma) depends kdebase-workspace4
+ ;;
+
+ *) depends kdebase4-runtime &&
optional_depends kdebase-workspace4 '' '' 'kde desktop'
;;
esac
diff --git a/kde4/kde4-l10n/DETAILS b/kde4/kde4-l10n/DETAILS
index 200c131..4c0f90d 100755
--- a/kde4/kde4-l10n/DETAILS
+++ b/kde4/kde4-l10n/DETAILS
@@ -1,7 +1,7 @@
# the remaining details of this spell are provided by CONFIGURE
SPELL=kde4-l10n
SPELLX=kde-l10n
- VERSION=3.93.0
+ VERSION=3.95.0
SITE=$KDE_URL/unstable/${VERSION//.0/}/src/$SPELLX
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX
source $SPELL_CONFIG
diff --git a/kde4/kde4-l10n/HISTORY b/kde4/kde4-l10n/HISTORY
index b6190f8..837458c 100644
--- a/kde4/kde4-l10n/HISTORY
+++ b/kde4/kde4-l10n/HISTORY
@@ -1,3 +1,9 @@
+2007-10-30 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 3.95.0
+
+2007-10-18 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 3.94.0
+
2007-09-09 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 3.93.0
spell created, cloned from kde3 spell
diff --git a/kde4/kde4-profile/DETAILS b/kde4/kde4-profile/DETAILS
index 1b039ff..28db386 100755
--- a/kde4/kde4-profile/DETAILS
+++ b/kde4/kde4-profile/DETAILS
@@ -1,5 +1,5 @@
SPELL=kde4-profile
- VERSION=3.93.0
+ VERSION=3.95.0
WEB_SITE=http://www.kde.org/
ENTERED=20070307
KEYWORDS="kde"
diff --git a/kde4/kde4-profile/HISTORY b/kde4/kde4-profile/HISTORY
index 774a7b8..27b0139 100644
--- a/kde4/kde4-profile/HISTORY
+++ b/kde4/kde4-profile/HISTORY
@@ -1,3 +1,9 @@
+2007-10-30 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 3.95.0
+
+2007-10-18 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 3.94.0
+
2007-09-07 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 3.93.0
* DEPENDS: remove explicit kdebase4
diff --git a/kde4/kdeaccessibility4/DETAILS b/kde4/kdeaccessibility4/DETAILS
index adf4b98..670b4c2 100755
--- a/kde4/kdeaccessibility4/DETAILS
+++ b/kde4/kdeaccessibility4/DETAILS
@@ -1,6 +1,6 @@
SPELL=kdeaccessibility4
- VERSION=3.93.0
-
SOURCE_HASH=sha512:c8a82a4aca4ac3e47492afae407e462c8f3ca7e4b3a4fb5cb7454842df6d465b18af5404661996cceeede3cb11d1f621c5f7691bb9d00832a7891261c01456e9
+ VERSION=3.95.0
+
SOURCE_HASH=sha512:3adc1f325d102d8b71c48fc4a32ee2c1b3811f099d567bce6f2a5c38894f6562f6aa9c00036ddc5b74d0fba69613b87891b2245c67cd8733d8b387ecdcbfa340
SOURCE=${SPELL//4}-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELL//4}-$VERSION
SOURCE_URL[0]=$KDE_URL/unstable/${VERSION//.0/}/src/$SOURCE
diff --git a/kde4/kdeaccessibility4/HISTORY b/kde4/kdeaccessibility4/HISTORY
index ab45e6b..673d7c3 100644
--- a/kde4/kdeaccessibility4/HISTORY
+++ b/kde4/kdeaccessibility4/HISTORY
@@ -1,3 +1,9 @@
+2007-10-30 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 3.95.0
+
+2007-10-18 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 3.94.0
+
2007-09-18 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 3.93.0
spell created
diff --git a/kde4/kdeadmin4/DETAILS b/kde4/kdeadmin4/DETAILS
index 1b1fde3..d8fd5ce 100755
--- a/kde4/kdeadmin4/DETAILS
+++ b/kde4/kdeadmin4/DETAILS
@@ -1,7 +1,7 @@
SPELL=kdeadmin4
SPELLX=${SPELL//4}
- VERSION=3.93.0
-
SOURCE_HASH=sha512:d9abc5d023e8877e2c7411c6cee299ae186a8c4da58317c07eb5d90faab3d83ba68860cdca358764bbe7ac9f834705005b8880949b908efb12659a2022eb92fe
+ VERSION=3.95.0
+
SOURCE_HASH=sha512:e2b63ef6cb0a49b20dd50cabd3d11e018640c796539ac8ad7b7fd90c6ed5045190fa234d179929bd0bc0528cbe1c321f3697f4e5153bc574358eaa0d14adb1d1
SOURCE=$SPELLX-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION
SOURCE_URL[0]=$KDE_URL/unstable/${VERSION//.0}/src/$SOURCE
diff --git a/kde4/kdeadmin4/HISTORY b/kde4/kdeadmin4/HISTORY
index 4bcd00a..b9779d0 100644
--- a/kde4/kdeadmin4/HISTORY
+++ b/kde4/kdeadmin4/HISTORY
@@ -1,3 +1,9 @@
+2007-10-30 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 3.95.0
+
+2007-10-18 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 3.94.0
+
2007-09-06 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 3.93.0
* DEPENDS: remove old code
diff --git a/kde4/kdebase-workspace4/DEPENDS b/kde4/kdebase-workspace4/DEPENDS
index cfd7dc5..0139568 100755
--- a/kde4/kdebase-workspace4/DEPENDS
+++ b/kde4/kdebase-workspace4/DEPENDS
@@ -2,9 +2,13 @@ source $SECTION_DIRECTORY/KDE_DEPENDS &&
source $GRIMOIRE/FUNCTIONS &&

if check_if_xorg_modular_libs qt4 ; then
+ depends xproto &&
+ depends xmessage &&
depends libxdmcp &&
depends libxrandr &&
- depends libxxf86misc
+ depends libxxf86misc &&
+ suggest_depends xrdb '' '' "update the X resource database"
&&
+ suggest_depends xkeyboard-config '' '' "allow multiple consoles ctl-alt-Fn"
fi &&

optional_depends freetype2 '' '' 'anti-aliasing of fonts' &&
@@ -16,5 +20,6 @@ optional_depends libusb '' '' 'usb support'
&&
optional_depends bluez-libs '' '' 'Bluetooth support ' &&
optional_depends openldap '' '' 'LDAP authentication' &&
optional_depends cyrus-sasl '' '' 'Cyrus SASL authentication' &&
-optional_depends OPENGL '' '' 'OpenGL support in plasma'
+optional_depends OPENGL '' '' 'OpenGL support in plasma' &&
+optional_depends plasma '' '' 'additional plasma features'
#optional_depends networkmanager '' '' '' &&
diff --git a/kde4/kdebase-workspace4/DETAILS b/kde4/kdebase-workspace4/DETAILS
index 1609c3b..0bed32e 100755
--- a/kde4/kdebase-workspace4/DETAILS
+++ b/kde4/kdebase-workspace4/DETAILS
@@ -1,7 +1,7 @@
SPELL=kdebase-workspace4
SPELLX=${SPELL//4}
- VERSION=3.93.0
-
SOURCE_HASH=sha512:950147a0d4e7b2de6b2b6477cf2c37165d69f91ca3fa310e1c8d166abb0af1a3b420b4c3a62ad9fca186cd212f0a3f42243146165785d8eb344f10e134d7e7d7
+ VERSION=3.95.0
+
SOURCE_HASH=sha512:e2496fdafa058d639b9f58e8252e2791fe31219ba2239f0bdde4b653668ddaf76f0f28c8fccd89d354cb611192f2a98aa82e6d0ef7372f7fad0d4b2ef3fdb7b7
SOURCE=$SPELLX-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION
SOURCE_URL[0]=$KDE_URL/unstable/${VERSION//.0}/src/$SOURCE
diff --git a/kde4/kdebase-workspace4/HISTORY b/kde4/kdebase-workspace4/HISTORY
index 3249ad7..96aa33e 100644
--- a/kde4/kdebase-workspace4/HISTORY
+++ b/kde4/kdebase-workspace4/HISTORY
@@ -1,3 +1,38 @@
+2007-10-31 Treeve Jelbert <treeve AT sourcemage.org>
+ * kde4.sh: remove QTDIR
+ exclude root from using this script
+
+2007-10-31 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: fix suggest_depends syntax
+
+2007-10-30 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 3.95.0
+
+2007-10-30 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: add xrdb
+
+2007-10-30 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: fix typo in suggest_depends
+
+2007-10-29 Treeve Jelbert <treeve AT sourcemage.org>
+ * kde4.desktop: refer to correct file
+ * kde4.sh: added
+ * PRE_BUILD: added, to create kde4 group
+ * INSTALL: install kde4.sh
+ it is now possible to start a kde4 session and have a working
desktop
+ beware that if kde3 is also installed, kde4 will take precedence!!!
+ by default, only users who belong to group kde4 can use this
+ they will also have a separate desktop configuration for kde3/4
+ this is controlled by the variable KDEHOME
+ reset KDEHOME to share the same desktop in kde3/4
+ you will then get a mixture of kde3/4 applications
+
+2007-10-18 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: add xproto, xmessage, xkeyboard-config, plasma
+
+2007-10-18 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 3.94.0
+
2007-09-21 Eric Sandall <sandalle AT sourcemage.org>
* DEPENDS: Dependency on X11-SERVER is already covered in KDE_DEPENDS
* INSTALL: /usr/share/xsessions is a directory, create it before
copying
diff --git a/kde4/kdebase-workspace4/INSTALL b/kde4/kdebase-workspace4/INSTALL
index 92b4dbb..2f4602e 100755
--- a/kde4/kdebase-workspace4/INSTALL
+++ b/kde4/kdebase-workspace4/INSTALL
@@ -1,4 +1,6 @@
default_install &&
mkdir -p $INSTALL_ROOT/usr/share/xsessions &&
install -m 0644 -o root -g root $SCRIPT_DIRECTORY/kde4.desktop \
- $INSTALL_ROOT/usr/share/xsessions
+ $INSTALL_ROOT/usr/share/xsessions &&
+install -m 0640 -o root -g kde4 $SCRIPT_DIRECTORY/kde4.sh \
+ $INSTALL_ROOT/etc/profile.d
diff --git a/kde4/kdebase-workspace4/PRE_BUILD
b/kde4/kdebase-workspace4/PRE_BUILD
new file mode 100755
index 0000000..ed31e3f
--- /dev/null
+++ b/kde4/kdebase-workspace4/PRE_BUILD
@@ -0,0 +1,3 @@
+create_group kde4 &&
+default_pre_build
+
diff --git a/kde4/kdebase-workspace4/kde4.desktop
b/kde4/kdebase-workspace4/kde4.desktop
index 31b20b3..9337d54 100644
--- a/kde4/kdebase-workspace4/kde4.desktop
+++ b/kde4/kdebase-workspace4/kde4.desktop
@@ -2,8 +2,8 @@
Encoding=UTF-8
Name=KDE4
Comment=This session logs you into KDE4
-Exec=/opt/bin/kstart
-TryExec=/opt/bin/kstart
+Exec=/opt/bin/startkde
+TryExec=/opt/bin/startkde
# no icon yet, only the top three are currently used
Icon=
Type=Application
diff --git a/kde4/kdebase-workspace4/kde4.sh b/kde4/kdebase-workspace4/kde4.sh
new file mode 100644
index 0000000..31eb67b
--- /dev/null
+++ b/kde4/kdebase-workspace4/kde4.sh
@@ -0,0 +1,28 @@
+#!/bin/sh
+if [ $USER != root ];then
+# setup KDE4 environment for SMGL
+
+export PATH=/usr/bin/qt4:$PATH
+export KDEDIR=/opt
+export KDEDIRS=$KDEDIR
+export KDE_DATA_DIRS=$KDEDIR/share
+export PATH=$KDEDIR/bin:$PATH
+export XDG_CONFIG_DIRS=$KDEDIR/etc/xdg
+export QT_PLUGIN_PATH=$KDEDIR/lib/plugins
+export LD_LIBRARY_PATH=$KDEDIR/lib:$LD_LIBRARY_PATH
+export PKG_CONFIG_PATH=$KDEDIR/lib/pkgconfig:$PKG_CONFIG_PATH
+#export KDE_COLOR_DEBUG=1
+
+# this will keep the kde3/4 desktops separate
+export KDEHOME=$HOME/.kde4
+
+# temporary runtime directories
+export KDETMP=${TMPDIR-/tmp}/kde4-$USER
+export KDEVARTMP=/var/tmp/kde4cache-$USER
+
+# Ensure that they exist
+mkdir -p $KDEDIR $KDETMP $KDEVARTMP
+fi
+
+
+
diff --git a/kde4/kdebase4-runtime/CONFIGURE b/kde4/kdebase4-runtime/CONFIGURE
new file mode 100755
index 0000000..3e2e1ef
--- /dev/null
+++ b/kde4/kdebase4-runtime/CONFIGURE
@@ -0,0 +1 @@
+source $SECTION_DIRECTORY/KDE_CONFIGURE
diff --git a/kde4/kdebase4-runtime/DEPENDS b/kde4/kdebase4-runtime/DEPENDS
new file mode 100755
index 0000000..2b4bc1e
--- /dev/null
+++ b/kde4/kdebase4-runtime/DEPENDS
@@ -0,0 +1,25 @@
+source $SECTION_DIRECTORY/KDE_DEPENDS &&
+source $GRIMOIRE/FUNCTIONS &&
+depends qimageblitz &&
+depends kdepimlibs4 &&
+if check_if_xorg_modular_libs qt4 ; then
+# depends imake &&
+# depends libxau &&
+# depends libxcomposite &&
+# depends libxcursor &&
+# depends libxdmcp &&
+# depends libxfixes &&
+# depends libxft &&
+# depends libxrandr &&
+# depends libxtst &&
+# depends libxxf86misc &&
+# depends xsetroot &&
+# depends xset &&
+ optional_depends xine-lib '' '' 'video player' &&
+ if is_depends_enabled $SPELL xine-lib;then
+# sub_depends xine-lib libxcb
+ depends libxcb
+ fi
+# optional_depends libxdamage '' '' 'Compositing support'
+fi
+
diff --git a/kde4/kdebase4-runtime/DETAILS b/kde4/kdebase4-runtime/DETAILS
new file mode 100755
index 0000000..189a109
--- /dev/null
+++ b/kde4/kdebase4-runtime/DETAILS
@@ -0,0 +1,15 @@
+ SPELL=kdebase4-runtime
+ SPELLX=${SPELL//4}
+ VERSION=3.95.0
+
SOURCE_HASH=sha512:d61b56d869e0bbd77a84f8ff81b6def53e68d02bd8a9915b5e7214484f9288e4cf61de70c7820b7a16d18cf80b85ae2cb856d4591d008e66aaea76cf88d9ed7c
+ SOURCE=$SPELLX-$VERSION.tar.bz2
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION
+ SOURCE_URL[0]=$KDE_URL/unstable/${VERSION//.0}/src/platform/$SOURCE
+ WEB_SITE=http://www.kde.org
+ ENTERED=20071030
+# SECURITY_PATCH=1
+ LICENSE[0]=GPL
+ KEYWORDS="kde"
+ SHORT=""
+cat << EOF
+EOF
diff --git a/kde4/kdebase4-runtime/HISTORY b/kde4/kdebase4-runtime/HISTORY
new file mode 100644
index 0000000..23cbf4b
--- /dev/null
+++ b/kde4/kdebase4-runtime/HISTORY
@@ -0,0 +1,3 @@
+2007-10-30 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 3.95.0
+
diff --git a/kde4/kdebase4-runtime/TRIGGERS b/kde4/kdebase4-runtime/TRIGGERS
new file mode 100755
index 0000000..8508632
--- /dev/null
+++ b/kde4/kdebase4-runtime/TRIGGERS
@@ -0,0 +1 @@
+on_cast qt4 check_self
diff --git a/kde4/kdebase4/DEPENDS b/kde4/kdebase4/DEPENDS
index 506a913..3ddaef2 100755
--- a/kde4/kdebase4/DEPENDS
+++ b/kde4/kdebase4/DEPENDS
@@ -15,7 +15,11 @@ if check_if_xorg_modular_libs qt4 ; then
depends libxxf86misc &&
depends xsetroot &&
depends xset &&
- optional_depends libxcb '' '' 'VideoWidget' &&
+ optional_depends xine-lib '' '' 'video player' &&
+ if is_depends_enabled $SPELL xine-lib;then
+# sub_depends xine-lib libxcb
+ depends libxcb
+ fi &&
optional_depends libxdamage '' '' 'Compositing support'
fi &&

@@ -31,5 +35,4 @@ optional_depends libxklavier '' '' 'keyboard
configuration' &&
optional_depends libusb '' '' 'usb support' &&
optional_depends bluez-libs '' '' 'Bluetooth support ' &&
optional_depends openldap '' '' 'LDAP authentication' &&
-optional_depends cyrus-sasl '' '' 'Cyrus SASL authentication' &&
-optional_depends xine-lib '' '' 'video player'
+optional_depends cyrus-sasl '' '' 'Cyrus SASL authentication'
diff --git a/kde4/kdebase4/DETAILS b/kde4/kdebase4/DETAILS
index a734fa7..ca6e06d 100755
--- a/kde4/kdebase4/DETAILS
+++ b/kde4/kdebase4/DETAILS
@@ -1,7 +1,7 @@
SPELL=kdebase4
SPELLX=${SPELL//4}
- VERSION=3.93.0
-
SOURCE_HASH=sha512:8643a6ec5c9d6f2e109924bf265ce088db8ad2ce4d04ff9c33b08e65812e628100a5014d6b20eb021902727cddc22ee443308e99b8b46b608c779bab2b8b014c
+ VERSION=3.95.0
+
SOURCE_HASH=sha512:70f2802648f5562db6444fcbf99336738b1215bfd0f0f062e16ae78dca39a44650b0d083ea4fdb00589c6eeb73488d43dba7ae4478651a86bab55fdc39a9b843
SOURCE=$SPELLX-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION
SOURCE_URL[0]=$KDE_URL/unstable/${VERSION//.0}/src/$SOURCE
diff --git a/kde4/kdebase4/HISTORY b/kde4/kdebase4/HISTORY
index 623a74f..39b6a52 100644
--- a/kde4/kdebase4/HISTORY
+++ b/kde4/kdebase4/HISTORY
@@ -1,3 +1,12 @@
+2007-10-30 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 3.95.0
+
+2007-10-19 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: adjust xine-lib, libxcb dependency
+
+2007-10-18 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 3.94.0
+
2007-09-07 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: update description
* DEPENDS: add qimageblitz, kdepimlibs
diff --git a/kde4/kdebindings4/DEPENDS b/kde4/kdebindings4/DEPENDS
index fb3af8b..590ebfe 100755
--- a/kde4/kdebindings4/DEPENDS
+++ b/kde4/kdebindings4/DEPENDS
@@ -1,8 +1,10 @@
source $SECTION_DIRECTORY/KDE_DEPENDS &&

-optional_depends mono '' '' 'Mono C#/QT# bindings' &&
-optional_depends python '' '' 'Python bindings' &&
-optional_depends ruby '' '' 'Ruby bindings'
+optional_depends mono '' '' 'Mono C#/QT# bindings' &&
+optional_depends python '' '' 'Python bindings' &&
+optional_depends qscintilla '' '' 'editing component' &&
+optional_depends qwt5 '' '' 'gui for technical apps' &&
+optional_depends ruby '' '' 'Ruby bindings'
#optional_depends ocaml '' '' 'OCaml bindings'
#optional_depends OPENGL '' '' '3D OpenGL modes' &&
#optional_depends JAVA '' '' 'Java support' 'z-rejected' &&
diff --git a/kde4/kdebindings4/DETAILS b/kde4/kdebindings4/DETAILS
index 03973c0..99db077 100755
--- a/kde4/kdebindings4/DETAILS
+++ b/kde4/kdebindings4/DETAILS
@@ -1,6 +1,6 @@
SPELL=kdebindings4
- VERSION=3.93.0
-
SOURCE_HASH=sha512:075a51e2625d80c907c67b6709881fbc4e8d1e2c69d95c08f90105bcd4addcb741e8ed124c78bc9802efde18eab4b637671cd1e0eb41c4143c4e2ebd41fc80fb
+ VERSION=3.95.0
+
SOURCE_HASH=sha512:50e9cb045ac035cfbb94772f168585c6282dd1e4ddb68def8ea54418a290ef597aef94879511bf7be739391428c677d25010355d1a3bbed080443a9bb62ee37c
SOURCE=${SPELL//4}-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELL//4}-$VERSION
SOURCE_URL[0]=$KDE_URL/unstable/${VERSION//.0}/src/$SOURCE
diff --git a/kde4/kdebindings4/HISTORY b/kde4/kdebindings4/HISTORY
index a0519a5..9987383 100644
--- a/kde4/kdebindings4/HISTORY
+++ b/kde4/kdebindings4/HISTORY
@@ -1,2 +1,9 @@
+2007-10-30 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 3.95.0
+ * DEPENDS: add qscintilla. qwt5
+
+2007-10-18 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 3.94.0
+
2007-09-09 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 3.93.0
diff --git a/kde4/kdeedu4/DETAILS b/kde4/kdeedu4/DETAILS
index 9dfce9e..17864b6 100755
--- a/kde4/kdeedu4/DETAILS
+++ b/kde4/kdeedu4/DETAILS
@@ -1,7 +1,7 @@
SPELL=kdeedu4
SPELLX=${SPELL//4}
- VERSION=3.93.0
-
SOURCE_HASH=sha512:b7d17deb0d69bce0477d327f0e3112933671964232e1d96200e658cf1a86456f6e1ef2739835dcd00c83db09ab985d18154d4a0918a1d9c0370e2a9909510337
+ VERSION=3.95.0
+
SOURCE_HASH=sha512:ceb74ae56dcc71ebb9e68bded8fe117e022c2b6b0ef8025ae1343027cbcec54c2fbf7c99958610dc84d456318b86b7049aa3febd588d04f01e078139e84d242d
SOURCE=$SPELLX-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION
SOURCE_URL[0]=$KDE_URL/unstable/${VERSION//.0}/src/$SOURCE
diff --git a/kde4/kdeedu4/HISTORY b/kde4/kdeedu4/HISTORY
index c4f7983..9fc83bd 100644
--- a/kde4/kdeedu4/HISTORY
+++ b/kde4/kdeedu4/HISTORY
@@ -1,3 +1,9 @@
+2007-10-30 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 3.95.0
+
+2007-10-18 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 3.94.0
+
2007-09-06 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 3.93.0
* DEPENDS: add facile, for Kalzium (linear algebra support)
diff --git a/kde4/kdegames4/DETAILS b/kde4/kdegames4/DETAILS
index 9eae062..3c77fcc 100755
--- a/kde4/kdegames4/DETAILS
+++ b/kde4/kdegames4/DETAILS
@@ -1,7 +1,7 @@
SPELL=kdegames4
SPELLX=${SPELL//4}
- VERSION=3.93.0
-
SOURCE_HASH=sha512:f6754c2ff74a7bd738fe3fdb39afeee79c7d043ac7ca033a23ebbdf217642788296b4ca93a212ad456cc83c20c5124c3daf7bdfcbc5e77971d179584120bab12
+ VERSION=3.95.0
+
SOURCE_HASH=sha512:ff12a3b419a901c273be24136f0266972f4a600e0021a4a32636ab53565cf7de14b85d7179a70bc52786ce7694c3bcb6422de42e42092e9fc9862f7121f55e95
SOURCE=$SPELLX-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION
SOURCE_URL[0]=$KDE_URL/unstable/${VERSION//.0}/src/$SOURCE
diff --git a/kde4/kdegames4/HISTORY b/kde4/kdegames4/HISTORY
index 6cfc3e7..b0dd84b 100644
--- a/kde4/kdegames4/HISTORY
+++ b/kde4/kdegames4/HISTORY
@@ -1,3 +1,9 @@
+2007-10-30 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 3.95.0
+
+2007-10-18 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 3.94.0
+
2007-09-09 Treeve Jelbert <treeve AT sourcemage.org>
* DEPENDS: add optional ggz-client-libs (games grimoire)

diff --git a/kde4/kdegraphics4/DETAILS b/kde4/kdegraphics4/DETAILS
index cea471b..0569a7f 100755
--- a/kde4/kdegraphics4/DETAILS
+++ b/kde4/kdegraphics4/DETAILS
@@ -1,7 +1,7 @@
SPELL=kdegraphics4
SPELLX=${SPELL//4}
- VERSION=3.93.0
-
SOURCE_HASH=sha512:fd0c6c4e72e47e744b5b2d32ab60d2fcc6528be4f6d51fe2c1724d64624c3ff8d7637661a2eeb935c0278e0ee51ae3ef17f9735eec8769a4f96851d4445ae26a
+ VERSION=3.95.0
+
SOURCE_HASH=sha512:1643ef534008da5f81a9c4398a4714372adc5ade1a693a63c328a23b02771fea721e5890a91177330232b3a3589cd6322084e1d4633e13cfcea9a0c0f5c35546
SOURCE=$SPELLX-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION
SOURCE_URL[0]=$KDE_URL/unstable/${VERSION//.0}/src/$SOURCE
diff --git a/kde4/kdegraphics4/HISTORY b/kde4/kdegraphics4/HISTORY
index 40fc774..4999dfd 100644
--- a/kde4/kdegraphics4/HISTORY
+++ b/kde4/kdegraphics4/HISTORY
@@ -1,3 +1,9 @@
+2007-10-30 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 3.95.0
+
+2007-10-18 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 3.94.0
+
2007-09-06 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 3.93.0
* DEPENDS: add qimageblitz
diff --git a/kde4/kdelibs4/DEPENDS b/kde4/kdelibs4/DEPENDS
index 25501a3..528c9f8 100755
--- a/kde4/kdelibs4/DEPENDS
+++ b/kde4/kdelibs4/DEPENDS
@@ -6,6 +6,7 @@ optional_depends tiff '' '' 'to view tiff graphics'
&&
optional_depends alsa-lib '' '' 'for libKMid alsa support' &&
optional_depends CUPS '' '' 'to use cups printing' &&
optional_depends aspell '' '' 'for spell checking support'&&
+optional_depends hspell '' '' 'for Hebrew spell checking' &&
optional_depends enchant '' '' 'generic spelling library' &&
optional_depends avahi '' '' 'for domain browsing' &&
optional_depends python '' '' 'kross scripting support' &&
diff --git a/kde4/kdelibs4/DETAILS b/kde4/kdelibs4/DETAILS
index b68a36e..cdd391b 100755
--- a/kde4/kdelibs4/DETAILS
+++ b/kde4/kdelibs4/DETAILS
@@ -1,10 +1,10 @@
SPELL=kdelibs4
SPELLX=${SPELL//4}
- VERSION=3.93.0
-
SOURCE_HASH=sha512:4f16765cd1b493468aca9c9963fb17b4d57b6f6564526613b567349579810d5595569960da1c7f2bc497f6ff6af3590b5d504fa6ea78b537a3fdc5d0d03d8b58
+ VERSION=3.95.0
+
SOURCE_HASH=sha512:f56391dffd330d684b892c9de9f9ef3cae258b11ab0c44621f964e4a49506b38ad65015c6ee17320b6294ecc563b723b33cc37a3eb63b2c130c327d761d7a304
SOURCE=$SPELLX-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION
- SOURCE_URL[0]=$KDE_URL/unstable/${VERSION//.0}/src/$SOURCE
+ SOURCE_URL[0]=$KDE_URL/unstable/${VERSION//.0}/src/platform/$SOURCE
WEB_SITE=http://www.kde.org
ENTERED=20020912
PATCHLEVEL=1
diff --git a/kde4/kdelibs4/HISTORY b/kde4/kdelibs4/HISTORY
index 5a68e36..448305a 100644
--- a/kde4/kdelibs4/HISTORY
+++ b/kde4/kdelibs4/HISTORY
@@ -1,3 +1,13 @@
+2007-10-30 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 3.95.0
+
+2007-10-22 Juuso Alasuutari <iuso AT sourcemage.org>
+ * INSTALL: Change `ln -s` to `ln -sf`, fixes bug #14053.
+
+2007-10-18 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 3.94.0
+ * DEPENDS: add optional hspell
+
2007-09-25 Treeve Jelbert <treeve AT sourcemage.org>
* DEPENDS: add optional soprano, FAM, pcre
* TRIGGERS: add check on soprano
diff --git a/kde4/kdelibs4/INSTALL b/kde4/kdelibs4/INSTALL
index 458cfe9..657aa5a 100755
--- a/kde4/kdelibs4/INSTALL
+++ b/kde4/kdelibs4/INSTALL
@@ -8,7 +8,7 @@ DBUSDIR=`pkg-config --variable=session_bus_services_dir
dbus-1 \
if [[ $KDE4DIR != $INSTALL_ROOT/usr ]] ;then
if [[ ! -s $KDE4DIR/$DBUSDIR ]];then
mkdir -p $KDE4DIR/share &&
- ln -s $INSTALL_ROOT/$DBUSDIR $KDE4DIR/share
+ ln -sf $INSTALL_ROOT/$DBUSDIR $KDE4DIR/share
fi
fi &&

diff --git a/kde4/kdemultimedia4/DETAILS b/kde4/kdemultimedia4/DETAILS
index adc64e6..150ed7a 100755
--- a/kde4/kdemultimedia4/DETAILS
+++ b/kde4/kdemultimedia4/DETAILS
@@ -1,7 +1,7 @@
SPELL=kdemultimedia4
SPELLX=${SPELL//4}
- VERSION=3.93.0
-
SOURCE_HASH=sha512:c9ffe775f97ce3eb5b7a5348409ffec6f9d752735591d9a406801c3be058c2ef92b9fbf094b2a325255e3188597fef049ec74c7f69ac0dde8c731b9d94de2384
+ VERSION=3.95.0
+
SOURCE_HASH=sha512:e7f23694fa928215a69637f1b4e3a6b68d2be18e355e8137c4ecdcf79cf22c9ba41d450ccd42d61b7385bf00dbe5c4373641b1674a8ce2469327096958898a47
SOURCE=$SPELLX-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION
SOURCE_URL[0]=$KDE_URL/unstable/${VERSION//.0}/src/$SOURCE
diff --git a/kde4/kdemultimedia4/HISTORY b/kde4/kdemultimedia4/HISTORY
index fafead7..18ac35c 100644
--- a/kde4/kdemultimedia4/HISTORY
+++ b/kde4/kdemultimedia4/HISTORY
@@ -1,3 +1,9 @@
+2007-10-30 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 3.95.0
+
+2007-10-18 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 3.94.0
+
2007-09-06 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 3.93.0
* DEPENDS: remove explicit kdebase4
diff --git a/kde4/kdenetwork4/DETAILS b/kde4/kdenetwork4/DETAILS
index b5e85ca..e7e3d32 100755
--- a/kde4/kdenetwork4/DETAILS
+++ b/kde4/kdenetwork4/DETAILS
@@ -1,7 +1,7 @@
SPELL=kdenetwork4
SPELLX=${SPELL//4}
- VERSION=3.93.0
-
SOURCE_HASH=sha512:9f2a0e6486e5f85ffc1435ecc29bcbeefb6ac6bbd31052de165ed32a7e7bc55c5bff0ecdd9fbb90bdd3ab4eb50ec6593decbf43b0783258529fb9755e4b969f3
+ VERSION=3.95.0
+
SOURCE_HASH=sha512:c9c82016f1a51d5c4f0ab02dd04cd87e78c40e06edf958fb81cbdefece981ccdd3646a91b7cc176937af252aecfc5e928bc4dfc6975a3c646d2abdc3bbd5abcf
SOURCE=$SPELLX-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION
SOURCE_URL[0]=$KDE_URL/unstable/${VERSION//.0}/src/$SOURCE
diff --git a/kde4/kdenetwork4/HISTORY b/kde4/kdenetwork4/HISTORY
index edffffb..bcfcd58 100644
--- a/kde4/kdenetwork4/HISTORY
+++ b/kde4/kdenetwork4/HISTORY
@@ -1,3 +1,9 @@
+2007-10-30 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 3.95.0
+
+2007-10-18 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 3.94.0
+
2007-09-26 Treeve Jelbert <treeve AT sourcemage.org>
* DEPENDS: tidy up

diff --git a/kde4/kdepim4/DETAILS b/kde4/kdepim4/DETAILS
index 2f09074..a2bbb56 100755
--- a/kde4/kdepim4/DETAILS
+++ b/kde4/kdepim4/DETAILS
@@ -1,7 +1,7 @@
SPELL=kdepim4
SPELLX=${SPELL//4}
- VERSION=3.93.0
-
SOURCE_HASH=sha512:02bbb5f4460d896f7889b824a967435689e40636b9417f612afdaa0c42908ee40badce838a1804df4f7988d1be2da4e49adca1bf5d56265f855974f66efa404b
+ VERSION=3.95.0
+
SOURCE_HASH=sha512:c7034dde9db214697c9d32d23aca810f2fd50ac39c47a1de9ff9d0b63645ed67eaf4f77c8c009cc8f108009fa2e4500dd9eaaf25535ff9e01cdd8ca51241b222
SOURCE=$SPELLX-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION
SOURCE_URL[0]=$KDE_URL/unstable/${VERSION//.0}/src/$SOURCE
diff --git a/kde4/kdepim4/HISTORY b/kde4/kdepim4/HISTORY
index bd9dbb4..6e1027f 100644
--- a/kde4/kdepim4/HISTORY
+++ b/kde4/kdepim4/HISTORY
@@ -1,3 +1,9 @@
+2007-10-30 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 3.95.0
+
+2007-10-18 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 3.94.0
+
2007-09-07 Treeve Jelbert <treeve AT sourcemage.org>
* DEPENDS: add kdepimlibs4
tidy up
diff --git a/kde4/kdepimlibs4/DETAILS b/kde4/kdepimlibs4/DETAILS
index 49f4f34..616c4dd 100755
--- a/kde4/kdepimlibs4/DETAILS
+++ b/kde4/kdepimlibs4/DETAILS
@@ -1,10 +1,10 @@
SPELL=kdepimlibs4
SPELLX=${SPELL//4}
- VERSION=3.93.0
-
SOURCE_HASH=sha512:0d147831f2b7e9fa78489b3fe82f99ae477f42741c8b4f5a73b5aa39a907fb0fdca5e459bdac533e939b0c6318f21c696ddba109282ec1d63b794fe9ed105622
+ VERSION=3.95.0
+
SOURCE_HASH=sha512:38b3d2b89e86a5aa7e83e3385161cd0a51fe77f1cadc9e2ca5ca847479a140d553f3ef21a4754df684d073f8bb6e1613723a410c435ca74ec3190aae6499b7c7
SOURCE=$SPELLX-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION
- SOURCE_URL[0]=$KDE_URL/unstable/${VERSION//.0}/src/$SOURCE
+ SOURCE_URL[0]=$KDE_URL/unstable/${VERSION//.0}/src/platform/$SOURCE
WEB_SITE=http://www.kde.org
ENTERED=20020912
# SECURITY_PATCH=1
diff --git a/kde4/kdepimlibs4/HISTORY b/kde4/kdepimlibs4/HISTORY
index c5a12c1..43019e4 100644
--- a/kde4/kdepimlibs4/HISTORY
+++ b/kde4/kdepimlibs4/HISTORY
@@ -1,3 +1,9 @@
+2007-10-30 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 3.95.0
+
+2007-10-18 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 3.94.0
+
2007-09-06 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 3.93.0

diff --git a/kde4/kdesdk4/DETAILS b/kde4/kdesdk4/DETAILS
index 5f977e5..c659c5d 100755
--- a/kde4/kdesdk4/DETAILS
+++ b/kde4/kdesdk4/DETAILS
@@ -1,7 +1,7 @@
SPELL=kdesdk4
SPELLX=${SPELL//4}
- VERSION=3.93.0
-
SOURCE_HASH=sha512:6676f2ebfb151defeab33c6f758d1656d686ca4452c3109f47e03b2fef51213c8502c630ed784b4e820aeab2aea4816ff1624f3204c5e9aa6f708350c929ef7e
+ VERSION=3.95.0
+
SOURCE_HASH=sha512:3857f7e3904168f4397ebe020f45b00cbc03c427d6c72f23f2333f39952fdb758e83e956438b15a2a7398b546a5066edb629df6d393d034d61a1915b42bbbb17
SOURCE=$SPELLX-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION
SOURCE_URL[0]=$KDE_URL/unstable/${VERSION//.0}/src/$SOURCE
diff --git a/kde4/kdesdk4/HISTORY b/kde4/kdesdk4/HISTORY
index ac75181..7652caa 100644
--- a/kde4/kdesdk4/HISTORY
+++ b/kde4/kdesdk4/HISTORY
@@ -1,3 +1,9 @@
+2007-10-30 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 3.95.0
+
+2007-10-18 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 3.94.0
+
2007-09-06 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 3.93.0

diff --git a/kde4/kdetoys4/DETAILS b/kde4/kdetoys4/DETAILS
index 0e52439..c0ad378 100755
--- a/kde4/kdetoys4/DETAILS
+++ b/kde4/kdetoys4/DETAILS
@@ -1,7 +1,7 @@
SPELL=kdetoys4
SPELLX=${SPELL//4}
- VERSION=3.93.0
-
SOURCE_HASH=sha512:aa903b7d79f3f7da317267bdfb54eede8aece85d87a65abcb179d700f2aba75e0b5ee05bb5b763ea0974714dfca0a25992d2553fb740fa14c87db8a738a8dbe1
+ VERSION=3.95.0
+
SOURCE_HASH=sha512:83836db65ad54cbf2286f7a2a05805296af0eae832b7be93ce602d88dcacfbf9e25fb13d54126fda59fe26f586fb22ff3cb9d2f7e009b33d09d55d032f9cf63a
SOURCE=$SPELLX-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION
SOURCE_URL[0]=$KDE_URL/unstable/${VERSION//.0}/src/$SOURCE
diff --git a/kde4/kdetoys4/HISTORY b/kde4/kdetoys4/HISTORY
index 64d1030..ff5a3ad 100644
--- a/kde4/kdetoys4/HISTORY
+++ b/kde4/kdetoys4/HISTORY
@@ -1,3 +1,9 @@
+2007-10-30 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 3.95.0
+
+2007-10-18 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 3.94.0
+
2007-09-06 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 3.93.0
* DEPENDS: remove explict kdebase4
diff --git a/kde4/kdeutils4/DEPENDS b/kde4/kdeutils4/DEPENDS
index 9595d20..c167539 100755
--- a/kde4/kdeutils4/DEPENDS
+++ b/kde4/kdeutils4/DEPENDS
@@ -1,4 +1,5 @@
source $SECTION_DIRECTORY/KDE_DEPENDS &&
optional_depends gmp '' '' 'to build kalc' &&
optional_depends python '' '' 'to build SuperKaramba' &&
-optional_depends tpctl '' '' 'ThinkPad support'
+optional_depends tpctl '' '' 'ThinkPad support' &&
+optional_depends libzip '' '' 'manipulate ZIP files'
diff --git a/kde4/kdeutils4/DETAILS b/kde4/kdeutils4/DETAILS
index c7cf277..a5ececb 100755
--- a/kde4/kdeutils4/DETAILS
+++ b/kde4/kdeutils4/DETAILS
@@ -1,7 +1,7 @@
SPELL=kdeutils4
SPELLX=${SPELL//4}
- VERSION=3.93.0
-
SOURCE_HASH=sha512:eea1cb95042be8adcef5db354965a37f6d4e8c63a2f3b0f4f83ba43e88ddc9313afeb41c5550dd9a1339b7f03c2d43d6a954d2ace9b998dd5d1051c4317cb23d
+ VERSION=3.95.0
+
SOURCE_HASH=sha512:acbbb68a6d682b4f1002025046b888c554d4753492ab88843342e03f24fd0f3e793f950536165b564afdb6be64a5527d2594330f96a03cde7536f2e8c129d95e
SOURCE=$SPELLX-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION
SOURCE_URL[0]=$KDE_URL/unstable/${VERSION//.0}/src/$SOURCE
diff --git a/kde4/kdeutils4/HISTORY b/kde4/kdeutils4/HISTORY
index 1ca6aeb..297272d 100644
--- a/kde4/kdeutils4/HISTORY
+++ b/kde4/kdeutils4/HISTORY
@@ -1,3 +1,12 @@
+2007-10-30 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 3.95.0
+
+2007-10-27 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: add optional libzip
+
+2007-10-18 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 3.94.0
+
2007-09-06 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 3.93.0

diff --git a/kde4/koffice2/DETAILS b/kde4/koffice2/DETAILS
index 27f54b1..3f4be81 100755
--- a/kde4/koffice2/DETAILS
+++ b/kde4/koffice2/DETAILS
@@ -1,10 +1,10 @@
#source $SECTION_DIRECTORY/KDE_DETAILS
SPELL=koffice2
- VERSION=1.9.93
-
SOURCE_HASH=sha512:4e36124bcbf0cfc963ffa5b8ae267f6518747b995b32903c23524487048a459db07173e2207a5a322ace551a52b034c9c106c8226632734cbd042e82194ddef5
+ VERSION=1.9.94
+
SOURCE_HASH=sha512:75e1f23c90ac21207df1d3484bbc2469087a2406c08e2715d0f21392d5c5820dbc838dc13c3ef0235ca7add0d60dce3c025fe7efdfd6819beea63f93f813d434
SOURCE=${SPELL//2}-${VERSION}.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELL//2}-${VERSION}
- SOURCE_URL[0]=$KDE_URL/unstable/${SPELL//2}-${VERSION}/src/$SOURCE
+ SOURCE_URL[0]=$KDE_URL/unstable/3.94/src/$SOURCE
WEB_SITE=http://www.koffice.org
ENTERED=20070707
LICENSE[0]=GPL
diff --git a/kde4/koffice2/HISTORY b/kde4/koffice2/HISTORY
index 490100e..69c4846 100644
--- a/kde4/koffice2/HISTORY
+++ b/kde4/koffice2/HISTORY
@@ -1,3 +1,6 @@
+2007-10-18 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.9.94
+
2007-09-06 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.9.93
* DEPENDS: add libart_lgpl, qimageblitz, kdepimlibs4, glpk
diff --git a/kde4/plasma/CONFIGURE b/kde4/plasma/CONFIGURE
new file mode 100755
index 0000000..3e2e1ef
--- /dev/null
+++ b/kde4/plasma/CONFIGURE
@@ -0,0 +1 @@
+source $SECTION_DIRECTORY/KDE_CONFIGURE
diff --git a/kde4/plasma/DEPENDS b/kde4/plasma/DEPENDS
new file mode 100755
index 0000000..ffedbe9
--- /dev/null
+++ b/kde4/plasma/DEPENDS
@@ -0,0 +1,10 @@
+source $SECTION_DIRECTORY/KDE_DEPENDS
+
+#optional_depends ppp '' '' 'for dialup support' &&
+#optional_depends openslp '' '' 'to find available remote desktops' &&
+#optional_depends wireless_tools '' '' 'Wireless support' &&
+#optional_depends libidn '' '' 'International Domain Name Support' &&
+#optional_depends decibel '' '' 'Decibel support' &&
+#optional_depends qca2 '' '' 'needed to build kopete'
+# libdnssd: libvncserver jpeg?
+#
diff --git a/kde4/plasma/DETAILS b/kde4/plasma/DETAILS
new file mode 100755
index 0000000..13d3c70
--- /dev/null
+++ b/kde4/plasma/DETAILS
@@ -0,0 +1,14 @@
+ SPELL=plasma
+ SPELLX=extragear-plasma
+ VERSION=3.95.0
+
SOURCE_HASH=sha512:c7f9236dcc333b27ddf792f0338c58dfb7c52632d3af469efe0ef96ff21f7f258d1a7791cd3177f00d99458e6f2923b77088002c90e221991954c64ae787d080
+ SOURCE=$SPELLX-$VERSION.tar.bz2
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION
+ SOURCE_URL[0]=$KDE_URL/unstable/${VERSION//.0}/src/$SOURCE
+ WEB_SITE=http://www.kde.org
+ ENTERED=20071019
+# SECURITY_PATCH=1
+ LICENSE[0]=GPL
+ KEYWORDS="kde"
+ SHORT="" cat << EOF
+EOF
diff --git a/kde4/plasma/HISTORY b/kde4/plasma/HISTORY
new file mode 100644
index 0000000..f944570
--- /dev/null
+++ b/kde4/plasma/HISTORY
@@ -0,0 +1,6 @@
+2007-10-30 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 3.95.0
+
+2007-10-18 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 3.94.0
+ spell created
diff --git a/kde4/tagua/DEPENDS b/kde4/tagua/DEPENDS
index a482f45..d7de1f6 100755
--- a/kde4/tagua/DEPENDS
+++ b/kde4/tagua/DEPENDS
@@ -1,2 +1,2 @@
-source $SECTION/KDE_DEPENDS
+source $SECTION_DIRECTORY/KDE_DEPENDS

diff --git a/kernels/cdfs/DETAILS b/kernels/cdfs/DETAILS
index 7c562be..1ab36c5 100755
--- a/kernels/cdfs/DETAILS
+++ b/kernels/cdfs/DETAILS
@@ -1,7 +1,7 @@
SPELL=cdfs
if [ "$(uname -r|cut -f1,2 -d. )" == "2.6" ]; then
- VERSION=2.6.19
-
SOURCE_HASH=sha512:e2ad92f3fc8f8a5b2e2330676b9ada368727e94047036941298fec021732281a7eda8a969593f3e7d6ca230b768f77bad724aacc71efa0fb75361355a76cd02f
+ VERSION=2.6.23
+
SOURCE_HASH=sha512:5a027c0be57fa1f091df64c17fb255e47218393df76850304ab4ea34bb5953d93587f4141a261e130214fd82eed128dd86c86372f1851164f307348be3f4a3d2
else
VERSION=2.4.20-a
MD5[0]=006a1fe46226c6b7d797d75d90ea7d21
diff --git a/kernels/cdfs/HISTORY b/kernels/cdfs/HISTORY
index 64bb40c..de43ee9 100644
--- a/kernels/cdfs/HISTORY
+++ b/kernels/cdfs/HISTORY
@@ -1,3 +1,6 @@
+2006-10-24 Arjan Bouter <abouter AT sourcemage.org>
+ * DETAILS: 2.6.23
+
2006-12-12 Arjan Bouter <abouter AT sourcemage.org>
* DETAILS: 2.6.19

diff --git a/kernels/dazuko/DETAILS b/kernels/dazuko/DETAILS
index bb92ca4..39bb8b4 100755
--- a/kernels/dazuko/DETAILS
+++ b/kernels/dazuko/DETAILS
@@ -1,5 +1,5 @@
SPELL=dazuko
- VERSION=2.3.4-pre2
+ VERSION=2.3.4
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://www.dazuko.org/files/$SOURCE
diff --git a/kernels/dazuko/HISTORY b/kernels/dazuko/HISTORY
index b14977d..deb6ece 100644
--- a/kernels/dazuko/HISTORY
+++ b/kernels/dazuko/HISTORY
@@ -1,3 +1,6 @@
+2007-10-14 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 2.3.4
+
2007-09-01 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 2.3.4-pre2

diff --git a/kernels/drm/FINAL b/kernels/drm/FINAL
index ce41770..416b795 100755
--- a/kernels/drm/FINAL
+++ b/kernels/drm/FINAL
@@ -1 +1 @@
-depmod -a
+depmod -a $(get_kernel_version)
diff --git a/kernels/drm/HISTORY b/kernels/drm/HISTORY
index 4ac720f..fb7d9ae 100644
--- a/kernels/drm/HISTORY
+++ b/kernels/drm/HISTORY
@@ -1,3 +1,6 @@
+2007-10-28 David Brown <dmlb2000 AT gmail.com>
+ * FINAL: do the depmod against the kernel version in question
+
2007-07-14 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
* INSTALL: temporary fixup to install the novuea_drm.h
until a new libdrm is out that has it
diff --git a/kernels/ieee80211/BUILD b/kernels/ieee80211/BUILD
new file mode 100755
index 0000000..4529520
--- /dev/null
+++ b/kernels/ieee80211/BUILD
@@ -0,0 +1,8 @@
+local KERNEL_VER=$(get_kernel_version) &&
+
+echo y | make KVER=$KERNEL_VER &&
+echo y | make KVER=$KERNEL_VER patch_kernel &&
+cd $INSTALL_ROOT/lib/modules/$KERNEL_VER/build &&
+sed -i 's:.*CONFIG_IEEE80211.*:CONFIG_IEEE80211=m:' .config &&
+echo n | make oldconfig &&
+make modules
diff --git a/kernels/ieee80211/DETAILS b/kernels/ieee80211/DETAILS
new file mode 100755
index 0000000..dbdf1c6
--- /dev/null
+++ b/kernels/ieee80211/DETAILS
@@ -0,0 +1,15 @@
+ SPELL=ieee80211
+ VERSION=1.2.18
+ SOURCE=$SPELL-$VERSION.tgz
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+ SOURCE_URL=$SOURCEFORGE_URL/$SPELL/$SOURCE
+#
SOURCE_HASH=sha512:4e9eeace68a2adfef698831024dc58ccc1930de9be08f859ad838166709ae6aa584fd0b8b56c8ee011039e4fc67b640e6a6473ceb376cba6902907274456f238
+ SOURCE_GPG="gurus.gpg:$SOURCE.sig:WORKS_FOR_ME"
+ LICENCE[0]=GPL
+ WEB_SITE=http://$SPELL.sourceforge.net/
+ ENTERED=20040815
+ ARCHIVE="off"
+ SHORT='Generic ieee80211 networking stack'
+cat << EOF
+A generic ieee80211 networking stack for the Linux kernel.
+EOF
diff --git a/kernels/ieee80211/HISTORY b/kernels/ieee80211/HISTORY
new file mode 100644
index 0000000..7a714b9
--- /dev/null
+++ b/kernels/ieee80211/HISTORY
@@ -0,0 +1,67 @@
+2007-10-08 Eric Sandall <sandalle AT sourcemage.org>
+ * BUILD: Added *correct* .config code for IEEE80211
+
+2007-10-07 Eric Sandall <sandalle AT sourcemage.org>
+ * BUILD,INSTALL: Properly install ieee80211 kernel modules in the
+ kernel tree
+ Removed incorrect .config code copied from mac80211
+
+2007-09-22 Eric Sandall <sandalle AT sourcemage.org>
+ * BUILD: Pass 'y' to make to continue if it will overwrite kernel
modules
+
+2007-09-21 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: Updated to 1.2.18 (works with 2.6.22)
+
+2007-02-05 Juuso Alasuutari <iuso AT sourcemage.org>
+ * DETAILS: Version 1.2.16.
+
+2006-12-17 Juuso Alasuutari <iuso AT sourcemage.org>
+ * PRE_BUILD: Changed all get_sorcery_kernel_config to
+ get_kernel_config (bug #13071).
+
+2006-10-27 Juuso Alasuutari <iuso AT sourcemage.org>
+ * DETAILS: Updated to 1.2.15.
+
+2006-07-24 Juuso Alasuutari <iuso AT sourcemage.org>
+ * BUILD: Reverted previous edit, bypassing 'make all' needs
+ additional spell features to work flawlessly. Implement these
+ later.
+
+2006-07-12 Juuso Alasuutari <iuso AT sourcemage.org>
+ * DETAILS: Updated to 1.1.14, removed BUILD_API & UPDATED.
+ * PRE_BUILD: Added sedit to remove duplicate 'make modules' from
+ Makefile, added confirmation queries to kernel crypto config
+ checks.
+ * BUILD: Do 'make modules' instead of just make to bypass
+ useless and annoying remove-old script that interrupts BUILD
+ with queries and removes modules from all kernel trees (bug
+ #10821).
+
+2006-04-13 Juuso Alasuutari <iuso AT sourcemage.org>
+ * DETAILS: Updated to 1.1.13
+
+2006-02-21 Juuso Alasuutari <juuso.alasuutari AT tamperelainen.org>
+ * DETAILS: updated to 1.1.12, changed WEB_SITE $SPELL.sf.net to
+ $SPELL.sourceforge.net
+
+2006-01-28 Juuso Alasuutari <juuso.alasuutari AT tamperelainen.org>
+ * DETAILS: updated to 1.1.9, removed SOURCE_URL variable
+ number [0], GPG -> SHA512
+ * PRE_BUILD: added file, migrated kernel check for in-built
+ ieee80211 from INSTALL & BUILD, migrated kernel crypto checks
+ and warnings from ipw2200's PRE_BUILD
+ * BUILD: removed kernel check for in-built ieee80211
+ * INSTALL: removed kernel check for in-built ieee80211
+ * ieee80211-1.0.3.tgz.sig: deleted
+
+2006-01-11 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: Updated short and long descriptions according to the
website
+
+2005-07-30 David Brown <dmlb2000 AT gmail.com>
+ * DETAILS: removed dmlb2000.gpg for the global gurus.gpg keyring
+
+2005-07-28 David Brown <dmlb2000 AT gmail.com>
+ * ALL: created spell
+ * BUILD: did check for subsystem if it's already in the kernel
+ * INSTALL: same check for subsystem if it's already in the kernel
+
diff --git a/kernels/ieee80211/INSTALL b/kernels/ieee80211/INSTALL
new file mode 100755
index 0000000..0117f3d
--- /dev/null
+++ b/kernels/ieee80211/INSTALL
@@ -0,0 +1,2 @@
+cd $INSTALL_ROOT/lib/modules/$(get_kernel_version)/build &&
+make modules_install
diff --git a/kernels/ieee80211/PRE_BUILD b/kernels/ieee80211/PRE_BUILD
new file mode 100755
index 0000000..290c410
--- /dev/null
+++ b/kernels/ieee80211/PRE_BUILD
@@ -0,0 +1,41 @@
+if [[ $(get_kernel_config CONFIG_IEEE80211) == "y" ||
+ $(get_kernel_config CONFIG_IEEE80211) == "m" ]]
+ then
+ message "${MESSAGE_COLOR}Kernel $(get_kernel_version) already has" \
+ "the subsystem built in, cannot build external ieee80211" \
+ "stack.${DEFAULT_COLOR}" &&
+ return 1
+fi &&
+
+if [[ $(get_kernel_config CONFIG_CRYPTO_ARC4) != "y" &&
+ $(get_kernel_config CONFIG_CRYPTO_ARC4) != "m" &&
+ $(get_kernel_config CONFIG_CRC32) != "y" &&
+ $(get_kernel_config CONFIG_CRC32) != "m" ]]
+ then
+ message "${PROBLEM_COLOR}You don't have the right crypto support" \
+ "built in the kernel, CONFIG_CRYPTO_ARC4 and CONFIG_CRC32." \
+ "These are needed for WEP key support.${DEFAULT_COLOR}" &&
+ if ! query "Continue anyway?"; then
+ return 1
+ fi
+fi &&
+
+if [[ $(get_kernel_config CONFIG_CRYPTO_MICHAEL_MIC) != "y" &&
+ $(get_kernel_config CONFIG_CRYPTO_MICHAEL_MIC) != "m" &&
+ $(get_kernel_config CONFIG_CRYPTO_AES_586) != "y" &&
+ $(get_kernel_config CONFIG_CRYPTO_AES_586) != "m" ]]
+ then
+ message "${PROBLEM_COLOR}You don't have the right crypto support" \
+ "built in the kernel, CONFIG_CRYPTO_AES_586 and" \
+ "CONFIG_MICHAEL_MIC. These are needed for WPA" \
+ "support.${DEFAULT_COLOR}" &&
+ if ! query "Continue anyway?"; then
+ return 1
+ fi
+fi &&
+
+default_pre_build &&
+
+# Modules already built in BUILD
+sedit 's/install: check_path modules/install: check_path/' \
+ $SOURCE_DIRECTORY/Makefile
diff --git a/kernels/ieee80211/TRIGGERS b/kernels/ieee80211/TRIGGERS
new file mode 100755
index 0000000..bb1c400
--- /dev/null
+++ b/kernels/ieee80211/TRIGGERS
@@ -0,0 +1 @@
+on_cast linux cast_self
diff --git a/kernels/ieee80211/ieee80211-1.2.18.tgz.sig
b/kernels/ieee80211/ieee80211-1.2.18.tgz.sig
new file mode 100644
index 0000000..2ab52d9
Binary files /dev/null and b/kernels/ieee80211/ieee80211-1.2.18.tgz.sig differ
diff --git a/kernels/ieee80211/volatiles b/kernels/ieee80211/volatiles
new file mode 100755
index 0000000..170a6c5
--- /dev/null
+++ b/kernels/ieee80211/volatiles
@@ -0,0 +1 @@
+^/lib/modules/*/modules.*
diff --git a/kernels/iwlwifi/BUILD b/kernels/iwlwifi/BUILD
new file mode 100755
index 0000000..25cc194
--- /dev/null
+++ b/kernels/iwlwifi/BUILD
@@ -0,0 +1 @@
+make KVER=$(get_kernel_version)
diff --git a/kernels/iwlwifi/CONFLICTS b/kernels/iwlwifi/CONFLICTS
new file mode 100755
index 0000000..900a552
--- /dev/null
+++ b/kernels/iwlwifi/CONFLICTS
@@ -0,0 +1,6 @@
+source $GRIMOIRE/FUNCTIONS &&
+
+if [[ "$(get_kernel_version|cut -d. -f3)" < "23" ]]
+then
+ conflicts mac80211
+fi
diff --git a/kernels/iwlwifi/DEPENDS b/kernels/iwlwifi/DEPENDS
new file mode 100755
index 0000000..4c492ea
--- /dev/null
+++ b/kernels/iwlwifi/DEPENDS
@@ -0,0 +1,8 @@
+depends IWLWIFI-UCODE '' '' 'z-rejected' &&
+
+source $GRIMOIRE/FUNCTIONS &&
+
+if [[ "$(get_kernel_version|cut -d. -f3)" < "23" ]]
+then
+ depends mac80211
+fi
diff --git a/kernels/iwlwifi/DETAILS b/kernels/iwlwifi/DETAILS
new file mode 100755
index 0000000..9d05c9b
--- /dev/null
+++ b/kernels/iwlwifi/DETAILS
@@ -0,0 +1,25 @@
+ SPELL=iwlwifi
+ VERSION=1.1.17
+ SOURCE=$SPELL-$VERSION.tgz
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+ SOURCE_URL[0]=http://intellinuxwireless.org/$SPELL/downloads/$SOURCE
+ SOURCE_GPG="gurus.gpg:$SOURCE.sig:WORKS_FOR_ME"
+ LICENSE[0]=GPL
+ WEB_SITE=http://intellinuxwireless.org/iwlwifi/
+ ENTERED=20071007
+ SHORT='Intel 4965AGN/3945ABG kernel driver'
+ DOCS="$DOCS README.iwlwifi CHANGES ISSUES LICENSE*"
+cat << EOF
+The iwlwifi project provides a driver which utilizes the new mac80211
subsystem
+for the Intel Wireless WiFi Link 4965AGN and Intel PRO/Wireless 3945ABG
+Network Connection adapters.
+
+In addition to using the new mac80211 subsystem, this project uses a new
+microcode image which removes the need for the user space regulatory daemon
+(such as ipw3945 uses). This change should help to simplify installation,
+development, and redistribution of this driver package.
+
+NOTE: The iwlwifi driver is a development driver. If you are looking for a
+fully validated and stable driver, please visit the Intel Customer Support
+download page
+EOF
diff --git a/kernels/iwlwifi/FINAL b/kernels/iwlwifi/FINAL
new file mode 100755
index 0000000..ce41770
--- /dev/null
+++ b/kernels/iwlwifi/FINAL
@@ -0,0 +1 @@
+depmod -a
diff --git a/kernels/iwlwifi/HISTORY b/kernels/iwlwifi/HISTORY
new file mode 100644
index 0000000..c69c077
--- /dev/null
+++ b/kernels/iwlwifi/HISTORY
@@ -0,0 +1,17 @@
+2007-10-20 Eric Sandall <sandalle AT sourcemage.org>
+ * DEPENDS: Only needs mac80211 for 2.6.22 and older
+ * CONFLICTS: Conflicts with mac80211 for 2.6.23 and newer, since it's
+ now in the kernel
+ * PRE_BUILD: Check for CONFIG_FW_LOADER and CONFIG_MAC80211
+
+2007-10-09 Eric Sandall <sandalle AT sourcemage.org>
+ * DEPENDS: Nope, it just doesn't work often and it happened to be a
+ fluke that iwlwifi worked again after installing ieee80211. Only
+ needs mac80211
+
+2007-10-08 Eric Sandall <sandalle AT sourcemage.org>
+ * DEPENDS: Also seems to depend on ieee80211 to work properly
+
+2007-10-07 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS, DEPENDS, BUILD, INSTALL, FINAL, TRIGGERS: Created
+
diff --git a/kernels/iwlwifi/INSTALL b/kernels/iwlwifi/INSTALL
new file mode 100755
index 0000000..a40c4a1
--- /dev/null
+++ b/kernels/iwlwifi/INSTALL
@@ -0,0 +1 @@
+make KVER=$(get_kernel_version) install
diff --git a/kernels/iwlwifi/PRE_BUILD b/kernels/iwlwifi/PRE_BUILD
new file mode 100755
index 0000000..4866f58
--- /dev/null
+++ b/kernels/iwlwifi/PRE_BUILD
@@ -0,0 +1,22 @@
+local _FW_LOADER=$(get_kernel_config CONFIG_FW_LOADER) &&
+local _MAC80211=$(get_kernel_config CONFIG_MAC80211) &&
+
+if [[ $_FW_LOADER != y &&
+ $_FW_LOADER != m ]]
+then
+ message "${PROBLEM_COLOR}You don't have CONFIG_FW_LOADER" \
+ "enabled in your kernel configuration, cannot build" \
+ "${SPELL_COLOR}$SPELL${MESSAGE_COLOR}.${DEFAULT_COLOR}" &&
+ return 1
+fi &&
+
+if [[ $_MAC80211 != y &&
+ $_MAC80211 != m ]]
+then
+ message "${PROBLEM_COLOR}You don't have CONFIG_MAC80211" \
+ "enabled in your kernel configuration, cannot build" \
+ "${SPELL_COLOR}$SPELL${MESSAGE_COLOR}.${DEFAULT_COLOR}" &&
+ return 1
+fi
+
+default_pre_build
diff --git a/kernels/iwlwifi/TRIGGERS b/kernels/iwlwifi/TRIGGERS
new file mode 100755
index 0000000..bb1c400
--- /dev/null
+++ b/kernels/iwlwifi/TRIGGERS
@@ -0,0 +1 @@
+on_cast linux cast_self
diff --git a/kernels/iwlwifi/iwlwifi-1.1.17.tgz.sig
b/kernels/iwlwifi/iwlwifi-1.1.17.tgz.sig
new file mode 100644
index 0000000..f76cc4d
Binary files /dev/null and b/kernels/iwlwifi/iwlwifi-1.1.17.tgz.sig differ
diff --git a/kernels/kvm/BUILD b/kernels/kvm/BUILD
index 57d1cd1..d16aa18 100755
--- a/kernels/kvm/BUILD
+++ b/kernels/kvm/BUILD
@@ -1,3 +1,3 @@
-local KVM_OPTS="--prefix=${INSTALL_ROOT}/usr
--qemu-cc=${INSTALL_ROOT}/opt/gcc34/bin/gcc
--kerneldir=/lib/modules/$(get_kernel_version)/build"
+local KVM_OPTS="--prefix=${INSTALL_ROOT}/usr --disable-gcc-check
--qemu-cc=gcc --kerneldir=/lib/modules/$(get_kernel_version)/build"
./configure $KVM_OPTS &&
make
diff --git a/kernels/kvm/DEPENDS b/kernels/kvm/DEPENDS
index 2bf10fa..656ce9c 100755
--- a/kernels/kvm/DEPENDS
+++ b/kernels/kvm/DEPENDS
@@ -1,4 +1,3 @@
-depends gcc34 &&
depends sdl &&

optional_depends alsa-lib \
diff --git a/kernels/kvm/DETAILS b/kernels/kvm/DETAILS
index 253b399..f02d101 100755
--- a/kernels/kvm/DETAILS
+++ b/kernels/kvm/DETAILS
@@ -1,6 +1,6 @@
SPELL=kvm
- VERSION=44
-
SOURCE_HASH=sha512:392a5043bef245263959068cfc5bc5c42a002bb2c0e5b392adfc4d1ca3743a76de9b4a1c305659f5fe7671fb867a0b48806665061dc9e9a22a1b771b0fc2a909
+ VERSION=50
+
SOURCE_HASH=sha512:e112862f6c45ccd0e17fee5d3564a798a99156cd6f54c61854373a75f1028eac16cb4f4cc7881bee07e3f330ece15ccdc6dd85ea0afb2692a441d100ee2d2577

SOURCE=${SPELL}-${VERSION}.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELL}-${VERSION}
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
diff --git a/kernels/kvm/HISTORY b/kernels/kvm/HISTORY
index e486b3d..9a6f3fd 100644
--- a/kernels/kvm/HISTORY
+++ b/kernels/kvm/HISTORY
@@ -1,3 +1,27 @@
+2007-11-04 David Brown <dmlb2000 AT gmail.com>
+ * DETAILS: updated to 50
+ * INSTALL: fixed install to install newer stuff
+
+2007-10-29 David Brown <dmlb2000 AT gmail.com>
+ * DETAILS: updated to 49
+
+2007-10-27 David Brown <dmlb2000 AT gmail.com>
+ * DETAILS: updated to 48
+
+2007-10-19 Eric Sandall <sandalle AT sourcemage.org>
+ * DEPENDS: Hasn't required gcc34 for a long time (since 11 at least)
+ Thanks to arachnist
+ * BUILD: Disable the gcc check and tell it to use gcc
+
+2007-10-18 David Brown <dmlb2000 AT gmail.com>
+ * DETAILS: udpated to 47
+
+2007-10-07 David Brown <dmlb2000 AT gmail.com>
+ * DETAILS: updated to 46
+
+2007-10-03 David Brown <dmlb2000 AT gmail.com>
+ * DETAILS: updated to 45
+
2007-09-23 David Brown <dmlb2000 AT gmail.com>
* DETAILS: updated to 44

@@ -45,3 +69,4 @@

2007-04-07 David Brown <dmlb2000 AT gmail.com>
* ALL: created spell
+
diff --git a/kernels/kvm/INSTALL b/kernels/kvm/INSTALL
index 3273e27..3c32d0c 100755
--- a/kernels/kvm/INSTALL
+++ b/kernels/kvm/INSTALL
@@ -6,6 +6,4 @@ do
install -v -o root -g root -m 644 $kmod $kinstalldir
done &&
depmod -a $(get_kernel_version) &&
-make -C qemu DESTDIR=${INSTALL_ROOT} install &&
-make -C user DESTDIR=${INSTALL_ROOT} install &&
-install -v -o root -g root -m 755 user/kvmctl ${INSTALL_ROOT}/sbin
+make install-rpm DESTDIR=${INSTALL_ROOT}
diff --git a/kernels/linux/BUILD b/kernels/linux/BUILD
index c2ec244..7d0d7d2 100755
--- a/kernels/linux/BUILD
+++ b/kernels/linux/BUILD
@@ -5,34 +5,30 @@ echo "This is the version: $VERSION" &&
# 2.6 kernels.

case "${KERNEL_ARCH}" in
+ sparc*)
+ IMAGE_TARGET=vmlinux
+ ;;
ppc)
LDFLAGS="${LDFLAGS/-s/}"
+ IMAGE_TARGET=vmlinux
+ ;;
+ sh)
+ IMAGE_TARGET=zImage
+ ;;
+ *)
+ IMAGE_TARGET=bzImage
;;
esac &&

if [[ -z "$INTERNAL_ISO_VAR" ]] ; then
case "$VERSION" in
- 2.6*)
- echo "making for a 2.6 kernel" &&
- make $EXTRA_MAKE_OPTIONS modules &&
- make $EXTRA_MAKE_OPTIONS || return 1
- ;;
2.[024]*)
- echo "making for a 2.4 kernel" &&
- make dep &&
- case $KERNEL_ARCH in
- sparc*) make $EXTRA_MAKE_OPTIONS vmlinux || return 1 ;;
- ppc) make $EXTRA_MAKE_OPTIONS vmlinux || return 1 ;;
- sh) make $EXTRA_MAKE_OPTIONS zImage || return 1 ;;
- *) make $EXTRA_MAKE_OPTIONS bzImage || return 1 ;;
- esac &&
- make $EXTRA_MAKE_OPTIONS modules || return 1
- ;;
- *)
- echo "There is no kernel version: $VERSION" &&
- return 1
+ echo "making deps for a 2.4 kernel" &&
+ make dep
;;
esac &&
+ make $EXTRA_MAKE_OPTIONS $IMAGE_TARGET &&
+ make $EXTRA_MAKE_OPTIONS modules &&
if grep -q CONFIG_BONDING=m ./.config || grep -q CONFIG_BONDING=y ./.config
then
gcc -Wall -O -I/usr/src/linux/include
./Documentation/networking/ifenslave.c -o ifenslave
diff --git a/kernels/linux/HISTORY b/kernels/linux/HISTORY
index 1283dc7..ffea6eb 100644
--- a/kernels/linux/HISTORY
+++ b/kernels/linux/HISTORY
@@ -1,3 +1,65 @@
+2007-11-05 David Brown <dmlb2000 AT gmail.com>
+ * info/patches/maintenance_patches/patch-2.6.16.56: added
+ * info/patches/maintenance_patches/patch-2.6.16.57: added
+ * info/patches/maintenance_patches/patch-2.6.20.21: added
+ * info/patches/maintenance_patches/patch-2.6.22.11: added
+ * info/patches/maintenance_patches/patch-2.6.22.12: added
+
+2007-11-05 David Brown <dmlb2000 AT gmail.com>
+ * latest.defaults: updated latest to patch-2.6.23.1-rt5
+ * info/patches/realtime_patches/patch-2.6.23.1-rt5: added
+
+2007-10-27 David Brown <dmlb2000 AT gmail.com>
+ * latest.defaults: updated latest to patch-2.6.23.1-rt4
+ * info/patches/realtime_patches/patch-2.6.23.1-rt4: added
+
+2007-10-23 David Brown <dmlb2000 AT gmail.com>
+ * latest.defaults: updated latest to patch-2.6.24-rc1
+ * info/patches/PRE_2_6/patch-2.6.24-rc1: added
+
+2007-10-17 David Brown <dmlb2000 AT gmail.com>
+ * BUILD: cleaned up BUILD process to reduce the number of times
+ we call make to the kernel in the code and some syntax errors
+
+2007-10-14 David Brown <dmlb2000 AT gmail.com>
+ * info/patches/smgl_patches/smgl-logo-0.2-for-2.6.22.patch: added
+
+2007-10-14 David Brown <dmlb2000 AT gmail.com>
+ * info/patches/maintenance_patches/patch-2.6.16.54: added
+ * info/patches/maintenance_patches/patch-2.6.16.55: added
+ * info/patches/maintenance_patches/patch-2.6.20.16: added
+ * info/patches/maintenance_patches/patch-2.6.20.17: added
+ * info/patches/maintenance_patches/patch-2.6.20.18: added
+ * info/patches/maintenance_patches/patch-2.6.20.19: added
+ * info/patches/maintenance_patches/patch-2.6.20.20: added
+ * info/patches/maintenance_patches/patch-2.6.21.7: added
+ * info/patches/maintenance_patches/patch-2.6.22.10: added
+
+2007-10-14 David Brown <dmlb2000 AT gmail.com>
+ * info/patches/reiser4_patches/reiser4-for-2.6.19-4.patch: added
+ * info/patches/reiser4_patches/reiser4-for-2.6.20.patch: added
+ * info/patches/reiser4_patches/reiser4-for-2.6.21.patch: added
+ * info/patches/reiser4_patches/reiser4-for-2.6.22-2.patch: added
+
+2007-10-13 David Brown <dmlb2000 AT gmail.com>
+ * latest.defaults: updated latest to patch-2.6.23-rt1
+ * info/patches/realtime_patches/patch-2.6.23-rt1: added and url and
sig
+
+2007-10-12 David Brown <dmlb2000 AT gmail.com>
+ * latest.defaults: updated latest to 2.6.23-mm1
+ * info/patches/mm_patches/2.6.23-mm1: added
+ * info/patches/maintenance_patches/patch-2.6.23.1: added
+
+2007-10-09 David Brown <dmlb2000 AT gmail.com>
+ * latest.defaults: updated to 2.6.23 everything
+ * info/patches/PRE_2_6/patch-2.6.23: added
+ * info/patches/maintenance_patches/patch-2.6.23: added
+ * info/kernels/2.6.23: added
+
+2007-10-03 David Brown <dmlb2000 AT gmail.com>
+ * latest.defaults: updated latest to patch-2.6.23-rc9
+ * info/patches/PRE_2_6/patch-2.6.23-rc9: added
+
2007-09-27 David Brown <dmlb2000 AT gmail.com>
* latest.defaults: updated latest to 2.6.23-rc8-mm2
* info/patches/mm_patches/2.6.23-rc8-mm2: added
diff --git a/kernels/linux/info/kernels/2.6.23
b/kernels/linux/info/kernels/2.6.23
new file mode 100755
index 0000000..357e397
--- /dev/null
+++ b/kernels/linux/info/kernels/2.6.23
@@ -0,0 +1,3 @@
+version="2.6.23"
+source="linux-${version}.tar.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/v2.6/${source}"
diff --git a/kernels/linux/info/patches/PRE_2_6/patch-2.6.23
b/kernels/linux/info/patches/PRE_2_6/patch-2.6.23
new file mode 100755
index 0000000..ff561ea
--- /dev/null
+++ b/kernels/linux/info/patches/PRE_2_6/patch-2.6.23
@@ -0,0 +1,5 @@
+patchversion="2.6.23"
+source=""
+source_url=""
+appliedkernels="2.6.23"
+md5sum=""
diff --git a/kernels/linux/info/patches/PRE_2_6/patch-2.6.23-rc9
b/kernels/linux/info/patches/PRE_2_6/patch-2.6.23-rc9
new file mode 100755
index 0000000..4eff8e3
--- /dev/null
+++ b/kernels/linux/info/patches/PRE_2_6/patch-2.6.23-rc9
@@ -0,0 +1,7 @@
+patchversion="2.6.23-rc9"
+source="patch-${patchversion}.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/v2.6/testing/${source}"
+appliedkernels="2.6.22"
+gpg_source_url="${source_url}.sign"
+source_gpg="kernel.gpg:${source}.sign:ESTABLISHED_UPSTREAM_KEY"
+md5sum=""
diff --git a/kernels/linux/info/patches/PRE_2_6/patch-2.6.24-rc1
b/kernels/linux/info/patches/PRE_2_6/patch-2.6.24-rc1
new file mode 100755
index 0000000..de36dd1
--- /dev/null
+++ b/kernels/linux/info/patches/PRE_2_6/patch-2.6.24-rc1
@@ -0,0 +1,7 @@
+patchversion="2.6.24-rc1"
+source="patch-${patchversion}.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/v2.6/testing/${source}"
+appliedkernels="2.6.23"
+gpg_source_url="${source_url}.sign"
+source_gpg="kernel.gpg:${source}.sign:ESTABLISHED_UPSTREAM_KEY"
+md5sum=""
diff --git a/kernels/linux/info/patches/maintenance_patches/patch-2.6.16.54
b/kernels/linux/info/patches/maintenance_patches/patch-2.6.16.54
new file mode 100755
index 0000000..4bd14c4
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches/patch-2.6.16.54
@@ -0,0 +1,6 @@
+appliedkernels="2.6.16"
+patchversion="${appliedkernels}.54"
+source="patch-${patchversion}.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/v2.6/${source}"
+source_gpg="kernel.gpg:${source}.sign:ESTABLISHED_UPSTREAM_KEY"
+gpg_source_url="${source_url}.sign"
diff --git a/kernels/linux/info/patches/maintenance_patches/patch-2.6.16.55
b/kernels/linux/info/patches/maintenance_patches/patch-2.6.16.55
new file mode 100755
index 0000000..fdebf8d
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches/patch-2.6.16.55
@@ -0,0 +1,6 @@
+appliedkernels="2.6.16"
+patchversion="${appliedkernels}.55"
+source="patch-${patchversion}.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/v2.6/${source}"
+source_gpg="kernel.gpg:${source}.sign:ESTABLISHED_UPSTREAM_KEY"
+gpg_source_url="${source_url}.sign"
diff --git a/kernels/linux/info/patches/maintenance_patches/patch-2.6.16.56
b/kernels/linux/info/patches/maintenance_patches/patch-2.6.16.56
new file mode 100755
index 0000000..6feb203
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches/patch-2.6.16.56
@@ -0,0 +1,6 @@
+appliedkernels="2.6.16"
+patchversion="${appliedkernels}.56"
+source="patch-${patchversion}.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/v2.6/${source}"
+source_gpg="kernel.gpg:${source}.sign:ESTABLISHED_UPSTREAM_KEY"
+gpg_source_url="${source_url}.sign"
diff --git a/kernels/linux/info/patches/maintenance_patches/patch-2.6.16.57
b/kernels/linux/info/patches/maintenance_patches/patch-2.6.16.57
new file mode 100755
index 0000000..7e3caef
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches/patch-2.6.16.57
@@ -0,0 +1,6 @@
+appliedkernels="2.6.16"
+patchversion="${appliedkernels}.57"
+source="patch-${patchversion}.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/v2.6/${source}"
+source_gpg="kernel.gpg:${source}.sign:ESTABLISHED_UPSTREAM_KEY"
+gpg_source_url="${source_url}.sign"
diff --git a/kernels/linux/info/patches/maintenance_patches/patch-2.6.20.16
b/kernels/linux/info/patches/maintenance_patches/patch-2.6.20.16
new file mode 100755
index 0000000..37e2c72
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches/patch-2.6.20.16
@@ -0,0 +1,6 @@
+appliedkernels="2.6.20"
+patchversion="${appliedkernels}.16"
+source="patch-${patchversion}.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/v2.6/${source}"
+source_gpg="kernel.gpg:${source}.sign:ESTABLISHED_UPSTREAM_KEY"
+gpg_source_url="${source_url}.sign"
diff --git a/kernels/linux/info/patches/maintenance_patches/patch-2.6.20.17
b/kernels/linux/info/patches/maintenance_patches/patch-2.6.20.17
new file mode 100755
index 0000000..09b6ebe
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches/patch-2.6.20.17
@@ -0,0 +1,6 @@
+appliedkernels="2.6.20"
+patchversion="${appliedkernels}.17"
+source="patch-${patchversion}.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/v2.6/${source}"
+source_gpg="kernel.gpg:${source}.sign:ESTABLISHED_UPSTREAM_KEY"
+gpg_source_url="${source_url}.sign"
diff --git a/kernels/linux/info/patches/maintenance_patches/patch-2.6.20.18
b/kernels/linux/info/patches/maintenance_patches/patch-2.6.20.18
new file mode 100755
index 0000000..5e70281
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches/patch-2.6.20.18
@@ -0,0 +1,6 @@
+appliedkernels="2.6.20"
+patchversion="${appliedkernels}.18"
+source="patch-${patchversion}.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/v2.6/${source}"
+source_gpg="kernel.gpg:${source}.sign:ESTABLISHED_UPSTREAM_KEY"
+gpg_source_url="${source_url}.sign"
diff --git a/kernels/linux/info/patches/maintenance_patches/patch-2.6.20.19
b/kernels/linux/info/patches/maintenance_patches/patch-2.6.20.19
new file mode 100755
index 0000000..43e953c
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches/patch-2.6.20.19
@@ -0,0 +1,6 @@
+appliedkernels="2.6.20"
+patchversion="${appliedkernels}.19"
+source="patch-${patchversion}.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/v2.6/${source}"
+source_gpg="kernel.gpg:${source}.sign:ESTABLISHED_UPSTREAM_KEY"
+gpg_source_url="${source_url}.sign"
diff --git a/kernels/linux/info/patches/maintenance_patches/patch-2.6.20.20
b/kernels/linux/info/patches/maintenance_patches/patch-2.6.20.20
new file mode 100755
index 0000000..dbda077
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches/patch-2.6.20.20
@@ -0,0 +1,6 @@
+appliedkernels="2.6.20"
+patchversion="${appliedkernels}.20"
+source="patch-${patchversion}.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/v2.6/${source}"
+source_gpg="kernel.gpg:${source}.sign:ESTABLISHED_UPSTREAM_KEY"
+gpg_source_url="${source_url}.sign"
diff --git a/kernels/linux/info/patches/maintenance_patches/patch-2.6.20.21
b/kernels/linux/info/patches/maintenance_patches/patch-2.6.20.21
new file mode 100755
index 0000000..9de15ca
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches/patch-2.6.20.21
@@ -0,0 +1,6 @@
+appliedkernels="2.6.20"
+patchversion="${appliedkernels}.21"
+source="patch-${patchversion}.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/v2.6/${source}"
+source_gpg="kernel.gpg:${source}.sign:ESTABLISHED_UPSTREAM_KEY"
+gpg_source_url="${source_url}.sign"
diff --git a/kernels/linux/info/patches/maintenance_patches/patch-2.6.21.7
b/kernels/linux/info/patches/maintenance_patches/patch-2.6.21.7
new file mode 100755
index 0000000..5112c4d
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches/patch-2.6.21.7
@@ -0,0 +1,6 @@
+appliedkernels="2.6.21"
+patchversion="${appliedkernels}.7"
+source="patch-${patchversion}.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/v2.6/${source}"
+source_gpg="kernel.gpg:${source}.sign:ESTABLISHED_UPSTREAM_KEY"
+gpg_source_url="${source_url}.sign"
diff --git a/kernels/linux/info/patches/maintenance_patches/patch-2.6.22.10
b/kernels/linux/info/patches/maintenance_patches/patch-2.6.22.10
new file mode 100755
index 0000000..5882dd3
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches/patch-2.6.22.10
@@ -0,0 +1,6 @@
+appliedkernels="2.6.22"
+patchversion="${appliedkernels}.10"
+source="patch-${patchversion}.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/v2.6/${source}"
+source_gpg="kernel.gpg:${source}.sign:ESTABLISHED_UPSTREAM_KEY"
+gpg_source_url="${source_url}.sign"
diff --git a/kernels/linux/info/patches/maintenance_patches/patch-2.6.22.11
b/kernels/linux/info/patches/maintenance_patches/patch-2.6.22.11
new file mode 100755
index 0000000..39b06ee
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches/patch-2.6.22.11
@@ -0,0 +1,6 @@
+appliedkernels="2.6.22"
+patchversion="${appliedkernels}.11"
+source="patch-${patchversion}.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/v2.6/${source}"
+source_gpg="kernel.gpg:${source}.sign:ESTABLISHED_UPSTREAM_KEY"
+gpg_source_url="${source_url}.sign"
diff --git a/kernels/linux/info/patches/maintenance_patches/patch-2.6.22.12
b/kernels/linux/info/patches/maintenance_patches/patch-2.6.22.12
new file mode 100755
index 0000000..020da26
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches/patch-2.6.22.12
@@ -0,0 +1,6 @@
+appliedkernels="2.6.22"
+patchversion="${appliedkernels}.12"
+source="patch-${patchversion}.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/v2.6/${source}"
+source_gpg="kernel.gpg:${source}.sign:ESTABLISHED_UPSTREAM_KEY"
+gpg_source_url="${source_url}.sign"
diff --git a/kernels/linux/info/patches/maintenance_patches/patch-2.6.23
b/kernels/linux/info/patches/maintenance_patches/patch-2.6.23
new file mode 100755
index 0000000..ff561ea
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches/patch-2.6.23
@@ -0,0 +1,5 @@
+patchversion="2.6.23"
+source=""
+source_url=""
+appliedkernels="2.6.23"
+md5sum=""
diff --git a/kernels/linux/info/patches/maintenance_patches/patch-2.6.23.1
b/kernels/linux/info/patches/maintenance_patches/patch-2.6.23.1
new file mode 100755
index 0000000..237e7ec
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches/patch-2.6.23.1
@@ -0,0 +1,6 @@
+appliedkernels="2.6.23"
+patchversion="${appliedkernels}.1"
+source="patch-${patchversion}.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/v2.6/${source}"
+source_gpg="kernel.gpg:${source}.sign:ESTABLISHED_UPSTREAM_KEY"
+gpg_source_url="${source_url}.sign"
diff --git a/kernels/linux/info/patches/mm_patches/2.6.23-mm1
b/kernels/linux/info/patches/mm_patches/2.6.23-mm1
new file mode 100755
index 0000000..229f4b6
--- /dev/null
+++ b/kernels/linux/info/patches/mm_patches/2.6.23-mm1
@@ -0,0 +1,6 @@
+appliedkernels="2.6.23"
+patchversion="${appliedkernels}-mm1"
+source="${patchversion}.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/people/akpm/patches/2.6/${appliedkernels}/${patchversion}/${source}"
+source_gpg="kernel.gpg:${source}.sign"
+gpg_source_url="${source_url}.sign"
diff --git a/kernels/linux/info/patches/realtime_patches/patch-2.6.23-rt1
b/kernels/linux/info/patches/realtime_patches/patch-2.6.23-rt1
new file mode 100755
index 0000000..971fede
--- /dev/null
+++ b/kernels/linux/info/patches/realtime_patches/patch-2.6.23-rt1
@@ -0,0 +1,6 @@
+appliedkernels="2.6.23"
+patchversion="${appliedkernels}-rt1"
+source="patch-${patchversion}.bz2"
+source_url="http://www.kernel.org/pub/linux/kernel/projects/rt/${source}";
+source_gpg="kernel.gpg:${source}.sign"
+gpg_source_url="${source_url}.sign"
diff --git a/kernels/linux/info/patches/realtime_patches/patch-2.6.23.1-rt4
b/kernels/linux/info/patches/realtime_patches/patch-2.6.23.1-rt4
new file mode 100755
index 0000000..1792d6f
--- /dev/null
+++ b/kernels/linux/info/patches/realtime_patches/patch-2.6.23.1-rt4
@@ -0,0 +1,7 @@
+appliedkernels="2.6.23"
+depends="patch-2.6.23.1"
+patchversion="${depends/patch-/}-rt4"
+source="patch-${patchversion}.bz2"
+source_url="http://www.kernel.org/pub/linux/kernel/projects/rt/${source}";
+source_gpg="kernel.gpg:${source}.sign"
+gpg_source_url="${source_url}.sign"
diff --git a/kernels/linux/info/patches/realtime_patches/patch-2.6.23.1-rt5
b/kernels/linux/info/patches/realtime_patches/patch-2.6.23.1-rt5
new file mode 100755
index 0000000..4654dcb
--- /dev/null
+++ b/kernels/linux/info/patches/realtime_patches/patch-2.6.23.1-rt5
@@ -0,0 +1,7 @@
+appliedkernels="2.6.23"
+depends="patch-2.6.23.1"
+patchversion="${depends/patch-/}-rt5"
+source="patch-${patchversion}.bz2"
+source_url="http://www.kernel.org/pub/linux/kernel/projects/rt/${source}";
+source_gpg="kernel.gpg:${source}.sign"
+gpg_source_url="${source_url}.sign"
diff --git
a/kernels/linux/info/patches/reiser4_patches/reiser4-for-2.6.19-4.patch
b/kernels/linux/info/patches/reiser4_patches/reiser4-for-2.6.19-4.patch
new file mode 100755
index 0000000..cacbd19
--- /dev/null
+++ b/kernels/linux/info/patches/reiser4_patches/reiser4-for-2.6.19-4.patch
@@ -0,0 +1,5 @@
+appliedkernels="2.6.19"
+source="reiser4-for-${appliedkernels}-4.patch.gz"
+source_url="http://ftp.namesys.com/pub/reiser4-for-2.6/${appliedkernels}/${source}";
+source_gpg="gurus.gpg:${source}.sig"
+gpg_source_url="http://dmlb2000.homelinux.org/pub/kernel/${source}.sig";
diff --git
a/kernels/linux/info/patches/reiser4_patches/reiser4-for-2.6.20.patch
b/kernels/linux/info/patches/reiser4_patches/reiser4-for-2.6.20.patch
new file mode 100755
index 0000000..18f2e45
--- /dev/null
+++ b/kernels/linux/info/patches/reiser4_patches/reiser4-for-2.6.20.patch
@@ -0,0 +1,5 @@
+appliedkernels="2.6.20"
+source="reiser4-for-${appliedkernels}.patch.gz"
+source_url="http://ftp.namesys.com/pub/reiser4-for-2.6/${appliedkernels}/${source}";
+source_gpg="gurus.gpg:${source}.sig"
+gpg_source_url="http://dmlb2000.homelinux.org/pub/kernel/${source}.sig";
diff --git
a/kernels/linux/info/patches/reiser4_patches/reiser4-for-2.6.21.patch
b/kernels/linux/info/patches/reiser4_patches/reiser4-for-2.6.21.patch
new file mode 100755
index 0000000..9924cb8
--- /dev/null
+++ b/kernels/linux/info/patches/reiser4_patches/reiser4-for-2.6.21.patch
@@ -0,0 +1,5 @@
+appliedkernels="2.6.21"
+source="reiser4-for-${appliedkernels}.patch.gz"
+source_url="http://ftp.namesys.com/pub/reiser4-for-2.6/${appliedkernels}/${source}";
+source_gpg="gurus.gpg:${source}.sig"
+gpg_source_url="http://dmlb2000.homelinux.org/pub/kernel/${source}.sig";
diff --git
a/kernels/linux/info/patches/reiser4_patches/reiser4-for-2.6.22-2.patch
b/kernels/linux/info/patches/reiser4_patches/reiser4-for-2.6.22-2.patch
new file mode 100755
index 0000000..c649d7e
--- /dev/null
+++ b/kernels/linux/info/patches/reiser4_patches/reiser4-for-2.6.22-2.patch
@@ -0,0 +1,5 @@
+appliedkernels="2.6.22"
+source="reiser4-for-${appliedkernels}-2.patch.gz"
+source_url="http://ftp.namesys.com/pub/reiser4-for-2.6/${appliedkernels}/${source}";
+source_gpg="gurus.gpg:${source}.sig"
+gpg_source_url="http://dmlb2000.homelinux.org/pub/kernel/${source}.sig";
diff --git
a/kernels/linux/info/patches/smgl_patches/smgl-logo-0.2-for-2.6.22.patch
b/kernels/linux/info/patches/smgl_patches/smgl-logo-0.2-for-2.6.22.patch
new file mode 100755
index 0000000..668b7a1
--- /dev/null
+++ b/kernels/linux/info/patches/smgl_patches/smgl-logo-0.2-for-2.6.22.patch
@@ -0,0 +1,5 @@
+appliedkernels="2.6.23 2.6.22"
+source="smgl-logo-0.2-for-2.6.22.patch.bz2"
+source_url="http://dmlb2000.homelinux.org/pub/kernel/${source}";
+source_gpg="gurus.gpg:${source}.sig"
+gpg_source_url=${source_url}.sig
diff --git a/kernels/linux/latest.defaults b/kernels/linux/latest.defaults
index 3c19537..487c3bd 100644
--- a/kernels/linux/latest.defaults
+++ b/kernels/linux/latest.defaults
@@ -1,10 +1,10 @@
-LATEST_2_6=2.6.22
-LATEST_PRE_2_6=patch-2.6.23-rc8
-LATEST_maintenance_patches=patch-2.6.22.9
+LATEST_2_6=2.6.23
+LATEST_PRE_2_6=patch-2.6.24-rc1
+LATEST_maintenance_patches=patch-2.6.23.1
LATEST_git_patches=patch-2.6.12-rc5-git8
LATEST_2_4=2.4.32
LATEST_PRE_2_4=patch-2.4.33-pre1
-LATEST_mm_patches=2.6.23-rc8-mm2
+LATEST_mm_patches=2.6.23-mm1
LATEST_ac_patches=patch-2.6.11-ac7
LATEST_grsecurity_2_4=grsecurity-2.1.8-2.4.32-200601211647.patch
LATEST_grsec_secfix_2_4=linux-2.4.28-secfix-200501071141.patch
@@ -16,4 +16,4 @@ LATEST_ck_server_patches=patch-2.6.22-cks1
LATEST_cko_patches=patch-2.6.12-cko3
LATEST_as_patches=patch-2.6.10-as7
LATEST_love_patches=2.6.12-love1
-LATEST_realtime_patches=patch-2.6.22.1-rt2
+LATEST_realtime_patches=patch-2.6.23.1-rt5
diff --git a/kernels/lm_sensors/DETAILS b/kernels/lm_sensors/DETAILS
index d098b02..4af9b2e 100755
--- a/kernels/lm_sensors/DETAILS
+++ b/kernels/lm_sensors/DETAILS
@@ -1,5 +1,5 @@
SPELL=lm_sensors
- VERSION=2.10.4
+ VERSION=2.10.5
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SPELL-$VERSION.tar.gz.asc
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/kernels/lm_sensors/HISTORY b/kernels/lm_sensors/HISTORY
index 26ce323..a41040a 100644
--- a/kernels/lm_sensors/HISTORY
+++ b/kernels/lm_sensors/HISTORY
@@ -1,3 +1,6 @@
+2007-10-26 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 2.10.5
+
2007-07-20 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 2.10.4

diff --git a/kernels/mac80211/BUILD b/kernels/mac80211/BUILD
new file mode 100755
index 0000000..0a6844a
--- /dev/null
+++ b/kernels/mac80211/BUILD
@@ -0,0 +1,8 @@
+local KERNEL_VER=$(get_kernel_version) &&
+
+echo y | make KVER=$KERNEL_VER &&
+make KVER=$KERNEL_VER patch_kernel &&
+cd $INSTALL_ROOT/lib/modules/$KERNEL_VER/build &&
+sed -i 's:.*CONFIG_MAC80211.*:CONFIG_MAC80211=m:' .config &&
+echo n | make oldconfig &&
+make modules
diff --git a/kernels/mac80211/DETAILS b/kernels/mac80211/DETAILS
new file mode 100755
index 0000000..a759542
--- /dev/null
+++ b/kernels/mac80211/DETAILS
@@ -0,0 +1,13 @@
+ SPELL=mac80211
+ VERSION=10.0.0
+ SOURCE=$SPELL-$VERSION.tgz
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+ SOURCE_URL=http://intellinuxwireless.org/$SPELL/downloads/$SOURCE
+ SOURCE_GPG="gurus.gpg:$SOURCE.sig:WORKS_FOR_ME"
+ LICENCE[0]=GPL
+ WEB_SITE=http://intellinuxwireless.org/mac80211/
+ ENTERED=20071007
+ SHORT='Generic mac80211 networking stack'
+cat << EOF
+A generic mac80211 networking stack for the Linux kernel.
+EOF
diff --git a/kernels/mac80211/HISTORY b/kernels/mac80211/HISTORY
new file mode 100644
index 0000000..cda08a0
--- /dev/null
+++ b/kernels/mac80211/HISTORY
@@ -0,0 +1,59 @@
+2007-09-22 Eric Sandall <sandalle AT sourcemage.org>
+ * BUILD: Pass 'y' to make to continue if it will overwrite kernel
modules
+
+2007-09-21 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: Updated to 1.2.18 (works with 2.6.22)
+
+2007-02-05 Juuso Alasuutari <iuso AT sourcemage.org>
+ * DETAILS: Version 1.2.16.
+
+2006-12-17 Juuso Alasuutari <iuso AT sourcemage.org>
+ * PRE_BUILD: Changed all get_sorcery_kernel_config to
+ get_kernel_config (bug #13071).
+
+2006-10-27 Juuso Alasuutari <iuso AT sourcemage.org>
+ * DETAILS: Updated to 1.2.15.
+
+2006-07-24 Juuso Alasuutari <iuso AT sourcemage.org>
+ * BUILD: Reverted previous edit, bypassing 'make all' needs
+ additional spell features to work flawlessly. Implement these
+ later.
+
+2006-07-12 Juuso Alasuutari <iuso AT sourcemage.org>
+ * DETAILS: Updated to 1.1.14, removed BUILD_API & UPDATED.
+ * PRE_BUILD: Added sedit to remove duplicate 'make modules' from
+ Makefile, added confirmation queries to kernel crypto config
+ checks.
+ * BUILD: Do 'make modules' instead of just make to bypass
+ useless and annoying remove-old script that interrupts BUILD
+ with queries and removes modules from all kernel trees (bug
+ #10821).
+
+2006-04-13 Juuso Alasuutari <iuso AT sourcemage.org>
+ * DETAILS: Updated to 1.1.13
+
+2006-02-21 Juuso Alasuutari <juuso.alasuutari AT tamperelainen.org>
+ * DETAILS: updated to 1.1.12, changed WEB_SITE $SPELL.sf.net to
+ $SPELL.sourceforge.net
+
+2006-01-28 Juuso Alasuutari <juuso.alasuutari AT tamperelainen.org>
+ * DETAILS: updated to 1.1.9, removed SOURCE_URL variable
+ number [0], GPG -> SHA512
+ * PRE_BUILD: added file, migrated kernel check for in-built
+ ieee80211 from INSTALL & BUILD, migrated kernel crypto checks
+ and warnings from ipw2200's PRE_BUILD
+ * BUILD: removed kernel check for in-built ieee80211
+ * INSTALL: removed kernel check for in-built ieee80211
+ * ieee80211-1.0.3.tgz.sig: deleted
+
+2006-01-11 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: Updated short and long descriptions according to the
website
+
+2005-07-30 David Brown <dmlb2000 AT gmail.com>
+ * DETAILS: removed dmlb2000.gpg for the global gurus.gpg keyring
+
+2005-07-28 David Brown <dmlb2000 AT gmail.com>
+ * ALL: created spell
+ * BUILD: did check for subsystem if it's already in the kernel
+ * INSTALL: same check for subsystem if it's already in the kernel
+
diff --git a/kernels/mac80211/INSTALL b/kernels/mac80211/INSTALL
new file mode 100755
index 0000000..0117f3d
--- /dev/null
+++ b/kernels/mac80211/INSTALL
@@ -0,0 +1,2 @@
+cd $INSTALL_ROOT/lib/modules/$(get_kernel_version)/build &&
+make modules_install
diff --git a/kernels/mac80211/PRE_BUILD b/kernels/mac80211/PRE_BUILD
new file mode 100755
index 0000000..b943822
--- /dev/null
+++ b/kernels/mac80211/PRE_BUILD
@@ -0,0 +1,12 @@
+if [[ $(get_kernel_config CONFIG_CFG80211) != "y" &&
+ $(get_kernel_config CONFIG_CFG80211) != "m" ]]
+then
+ message "${PROBLEM_COLOR}CONFIG_CFG80211 is not enabled!${DEFAULT_COLOR}"
&&
+ return 1
+fi &&
+
+default_pre_build &&
+
+# Modules already built in BUILD
+sedit 's/install: check_path modules/install: check_path/' \
+ $SOURCE_DIRECTORY/Makefile
diff --git a/kernels/mac80211/TRIGGERS b/kernels/mac80211/TRIGGERS
new file mode 100755
index 0000000..bb1c400
--- /dev/null
+++ b/kernels/mac80211/TRIGGERS
@@ -0,0 +1 @@
+on_cast linux cast_self
diff --git a/kernels/mac80211/mac80211-10.0.0.tgz.sig
b/kernels/mac80211/mac80211-10.0.0.tgz.sig
new file mode 100644
index 0000000..e446d4a
Binary files /dev/null and b/kernels/mac80211/mac80211-10.0.0.tgz.sig differ
diff --git a/kernels/mac80211/volatiles b/kernels/mac80211/volatiles
new file mode 100755
index 0000000..170a6c5
--- /dev/null
+++ b/kernels/mac80211/volatiles
@@ -0,0 +1 @@
+^/lib/modules/*/modules.*
diff --git a/kernels/madwifi/DETAILS b/kernels/madwifi/DETAILS
index ba8e9e4..b134f26 100755
--- a/kernels/madwifi/DETAILS
+++ b/kernels/madwifi/DETAILS
@@ -7,17 +7,17 @@ if [[ "$MADWIFI_SVN" == "y" ]]; then
fi
SOURCE=$SPELL-svn.tar.bz2
SOURCE_HINTS=old_svn_compat
- SOURCE_URL[0]=svn://svn.madwifi.org/trunk:madwifi
+ SOURCE_URL[0]=svn://svn.madwifi.org/madwifi/trunk:madwifi
SOURCE_IGNORE=volatile
FORCE_DOWNLOAD="on"
else
- VERSION=0.9.3.2
+ VERSION=0.9.3.3
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
- SOURCE_HASH=sha1:ccd8f4ba267df75ca002d8dbf66b09347e1bc0b6
+
SOURCE_HASH=sha512:e3ca8a59fa58d10bd36924a30d1db5570af363887c6d322f2a67bf2a9804d8370b9dc13a4dc340849274d9d43bb801d12151e9c683cf86df2b31e9e48513ff19
fi
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- SECURITY_PATCH=2
+ SECURITY_PATCH=3
LICENSE[0]=GPL
KEYWORDS="kernels"
WEB_SITE=http://madwifi.sourceforge.net/
diff --git a/kernels/madwifi/HISTORY b/kernels/madwifi/HISTORY
index aa2ec5b..911d6cb 100644
--- a/kernels/madwifi/HISTORY
+++ b/kernels/madwifi/HISTORY
@@ -1,3 +1,9 @@
+2007-12-04 Arjan Bouter <abouter AT sourcemage.org>
+ * DETAILS: version bumped to 0.9.3.3, security update
+
+2007-10-13 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: SVN URL changed from /trunk to /madwifi/trunk
+
2007-09-03 Thomas Orgis <sobukus AT sourcemage.org>
* DETAILS: version bumped to 0.9.3.2, compiles with linux-2.6.22
* *.sig: Removed, using sha1 hash for now ...
diff --git a/kernels/module-init-tools/BUILD b/kernels/module-init-tools/BUILD
index bfd981d..99c6f49 100755
--- a/kernels/module-init-tools/BUILD
+++ b/kernels/module-init-tools/BUILD
@@ -1,8 +1,4 @@
[[ $CROSS_INSTALL == on ]] && OPTS="$OPTS --host=${HOST}"
-# touch the man pages so make doesn't try to rebuild them
- touch *.5 *.8 &&
-
-patch -p1 < $SPELL_DIRECTORY/mk.diff &&
make_single &&

if [ $OLD_TOO == y ] ; then
@@ -20,4 +16,4 @@ fi &&
--prefix=${TRACK_ROOT}/ \
--mandir=${TRACK_ROOT}/usr/share/man \
$OPTS &&
-make DESTDIR=$INSTALL_ROOT
+make DESTDIR=$INSTALL_ROOT MANS=
diff --git a/kernels/module-init-tools/DETAILS
b/kernels/module-init-tools/DETAILS
index e433459..29eb5eb 100755
--- a/kernels/module-init-tools/DETAILS
+++ b/kernels/module-init-tools/DETAILS
@@ -15,14 +15,14 @@ fi
# new module-init-tools data

SPELL=module-init-tools
- VERSION=3.3-pre10
+ VERSION=3.4
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
WEB_SITE=http://www.kerneltools.org
- SOURCE_URL[0]=${WEB_SITE}/pub/downloads/${SPELL}/${SOURCE}
+ SOURCE_URL[0]=${KERNEL_URL}/pub/linux/kernel/people/jcm/${SPELL}/${SOURCE}
SOURCE3=$SOURCE.sign
SOURCE3_URL[0]=${SOURCE_URL[0]}.sign
- SOURCE_GPG=m-i-t.gpg:$SOURCE.sign:UPSTREAM_KEY
+ SOURCE_GPG=jcm.gpg:$SOURCE.sign:UPSTREAM_KEY
SOURCE3_IGNORE=signature
PATCHLEVEL=1
ENTERED=20030410
diff --git a/kernels/module-init-tools/HISTORY
b/kernels/module-init-tools/HISTORY
index 6bf4d1f..59aa5df 100644
--- a/kernels/module-init-tools/HISTORY
+++ b/kernels/module-init-tools/HISTORY
@@ -1,3 +1,17 @@
+2007-10-31 Treeve Jelbert <treeve AT pi.be>
+ * DETAILS: version 3.4
+ new url, new sig
+ * jcm.gpg: added
+ * insmod.patch: deleted, does not apply
+ * PRE_BUILD: don't apply insmod.patch, apply mk.diff
+ * BUILD: move patching to PRE_BUILD
+ don't touch non-existent files
+ * BUILD, INSTALL:
+ add MANS=, to suppress manpages
+ * mk.diff: updateded, to ignore man pages
+ even when docbook2man is installed, building man pages fails,
+ so suppres them
+
2007-05-29 David Brown <dmlb2000 AT gmail.com>
* insmod.patch: added and fixed and again

diff --git a/kernels/module-init-tools/INSTALL
b/kernels/module-init-tools/INSTALL
index 8897ff6..15c90fd 100755
--- a/kernels/module-init-tools/INSTALL
+++ b/kernels/module-init-tools/INSTALL
@@ -16,7 +16,7 @@ then
fi
fi &&

-make install DESTDIR="$INSTALL_ROOT" &&
+make install DESTDIR="$INSTALL_ROOT" MANS= &&

if [[ $OLD_TOO == y ]] && [[ -z $INSTALL_ROOT ]]
then
diff --git a/kernels/module-init-tools/PRE_BUILD
b/kernels/module-init-tools/PRE_BUILD
index 13f0110..7d4b56c 100755
--- a/kernels/module-init-tools/PRE_BUILD
+++ b/kernels/module-init-tools/PRE_BUILD
@@ -7,4 +7,5 @@
fi &&

cd ${SOURCE_DIRECTORY} &&
- patch -p1 < ${SCRIPT_DIRECTORY}/insmod.patch
+# patch -p1 < ${SCRIPT_DIRECTORY}/insmod.patch
+ patch -p0 < $SPELL_DIRECTORY/mk.diff
diff --git a/kernels/module-init-tools/jcm.gpg
b/kernels/module-init-tools/jcm.gpg
new file mode 100644
index 0000000..addadd0
Binary files /dev/null and b/kernels/module-init-tools/jcm.gpg differ
diff --git a/kernels/module-init-tools/mk.diff
b/kernels/module-init-tools/mk.diff
index bc7cd37..bfa6a9d 100644
--- a/kernels/module-init-tools/mk.diff
+++ b/kernels/module-init-tools/mk.diff
@@ -1,7 +1,15 @@
-diff -ur module-init-tools-3.1-pre2/Makefile.in
module-init-tools-3.1-pre2-copy/Makefile.in
---- module-init-tools-3.1-pre2/Makefile.in 2004-06-14 07:54:21.000000000
+0200
-+++ module-init-tools-3.1-pre2-copy/Makefile.in 2004-06-19
19:16:37.614111176 +0200
-@@ -783,15 +783,6 @@
+--- Makefile.in~ 2007-10-08 00:03:25.000000000 +0200
++++ Makefile.in 2007-11-02 16:45:49.000000000 +0100
+@@ -751,7 +751,7 @@
+ uninstall: uninstall-am
+
+ install-am: all-am
+- @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
++ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am
+
+ installcheck: installcheck-am
+ install-strip:
+@@ -917,15 +917,6 @@
ln -sf `ls -l /sbin/$$f | sed 's/.* -> //'`.old /sbin/$$f; \
fi; \
mv /sbin/$$f /sbin/$$f.old; \
diff --git a/kernels/rt2500_driver/HISTORY b/kernels/rt2500_driver/HISTORY
index d6c4de7..e187e6e 100644
--- a/kernels/rt2500_driver/HISTORY
+++ b/kernels/rt2500_driver/HISTORY
@@ -1,3 +1,6 @@
+2007-10-19 Arjan Bouter <abouter AT sourcemage.org>
+ * INSTALL: fixed source dir when installing cvs version
+
2006-08-31 Anton Brondz <dinolinux AT sourcemage.org>
* DETAILS: updated sourceforge CVS location, updated to 1.1.0-b4,
removed UPDATED
* BUILD: fixed broken CVS install
diff --git a/kernels/rt2500_driver/INSTALL b/kernels/rt2500_driver/INSTALL
index c8f9722..f43744b 100755
--- a/kernels/rt2500_driver/INSTALL
+++ b/kernels/rt2500_driver/INSTALL
@@ -1,2 +1,6 @@
-cd ${SOURCE_DIRECTORY}/Module &&
+if [ "$RT_CVS" == "n" ]; then
+ cd ${SOURCE_DIRECTORY}/Module
+else
+ cd ${SOURCE_DIRECTORY}/rt2500/Module
+fi &&
make KERNDIR=/lib/modules/$(get_kernel_version)/build install
diff --git a/kernels/virtualbox-module/BUILD b/kernels/virtualbox-module/BUILD
new file mode 100755
index 0000000..8f58e6d
--- /dev/null
+++ b/kernels/virtualbox-module/BUILD
@@ -0,0 +1 @@
+make
diff --git a/kernels/virtualbox-module/DETAILS
b/kernels/virtualbox-module/DETAILS
new file mode 100755
index 0000000..e8f024f
--- /dev/null
+++ b/kernels/virtualbox-module/DETAILS
@@ -0,0 +1,14 @@
+ SPELL=virtualbox-module
+ VERSION=1.5.2
+ SOURCE=vbox-kernel-module-src-$VERSION.tar.gz
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/vboxdrv
+ SOURCE_URL[0]=http://www.virtualbox.org/download/$VERSION/$SOURCE
+
SOURCE_HASH=sha512:e98553aed0c7f24ffa761b43a2d63cdac1386c258d0ad32c1ad226207b141e48267898bbb3ac186ce08f2016705b58065a8b2c2ec006481769665d4e37d5263d
+ LICENSE[0]=GPL
+ WEB_SITE=http://www.virtualbox.org/
+ ENTERED=20070613
+ KEYWORDS="utils"
+ SHORT="VirtualBox kernel module"
+cat << EOF
+VirtualBox kernel module.
+EOF
diff --git a/kernels/virtualbox-module/HISTORY
b/kernels/virtualbox-module/HISTORY
new file mode 100644
index 0000000..068fdc3
--- /dev/null
+++ b/kernels/virtualbox-module/HISTORY
@@ -0,0 +1,12 @@
+2007-11-04 Julien "_kaze_" ROZO <julien AT rozo.org>
+ * INSTALL: added an udev rule to put the right permissions on
/dev/vboxdrv
+
+2007-10-19 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 1.5.2
+
+2007-09-03 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 1.5.0
+
+2007-06-13 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS, BUILD: created this spell, version 1.4.0
+
diff --git a/kernels/virtualbox-module/INSTALL
b/kernels/virtualbox-module/INSTALL
new file mode 100755
index 0000000..bc27ec1
--- /dev/null
+++ b/kernels/virtualbox-module/INSTALL
@@ -0,0 +1,5 @@
+default_install &&
+#not everyone uses udev
+if spell_installed udev ; then
+echo 'KERNEL=="vboxdrv", NAME="%k", MODE="0666"' >
${INSTALL_ROOT}/etc/udev/rules.d/60-virtualbox-module.rules
+fi
diff --git a/libs/bluez-libs/DETAILS b/libs/bluez-libs/DETAILS
index 160593e..f10a0aa 100755
--- a/libs/bluez-libs/DETAILS
+++ b/libs/bluez-libs/DETAILS
@@ -1,12 +1,11 @@
SPELL=bluez-libs
- VERSION=3.2
+ VERSION=3.22
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://bluez.sourceforge.net/download/$SOURCE
- SOURCE_GPG="gurus.gpg:$SOURCE.sig"
- WEB_SITE=http://bluez.sourceforge.net
+
SOURCE_HASH=sha512:3a9dc4c354458d786053b8dd43694b16ad8b50232adbebc6cb52331af2705db64947d34fe91bd410e631bfa14cc8668d580746485980538e9b89b19bf6f75560
+ WEB_SITE=http://www.bluez.org/
ENTERED=20021215
- UPDATED=20050327
KEYWORDS="bluetooth libs"
SHORT="Libraries for the bluez Bluetooth stack"
LICENSE[0]=GPL
diff --git a/libs/bluez-libs/HISTORY b/libs/bluez-libs/HISTORY
index 1fa1858..cc4befc 100644
--- a/libs/bluez-libs/HISTORY
+++ b/libs/bluez-libs/HISTORY
@@ -1,3 +1,15 @@
+2007-10-31 Julien "_kaze_" ROZO <julien AT rozo.org>
+ * DETAILS: updated version to 3.22
+
+2007-10-24 Julien "_kaze_" ROZO <julien AT rozo.org>
+ * DETAILS: updated version to 3.20
+
+2007-10-01 Julien "_kaze_" ROZO <julien AT rozo.org>
+ * DETAILS: corrected WEB_SITE
+
+2007-09-28 Martin Klein <martin AT makl.de>
+ * DETAILS: updated spell to 3.19
+
2006-09-21 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: [automated] Removed BUILD_API=2.

diff --git a/libs/clucene/DETAILS b/libs/clucene/DETAILS
index 485d770..e398a0f 100755
--- a/libs/clucene/DETAILS
+++ b/libs/clucene/DETAILS
@@ -11,6 +11,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-core-$VERSION
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
WEB_SITE=http://sourceforge.net/projects/clucene/
ENTERED=20050531
+ PATCHLEVEL=1
LICENSE[0]=LGPL
KEYWORDS="libs"
SHORT="C++ port of Lucene"
diff --git a/libs/clucene/HISTORY b/libs/clucene/HISTORY
index b67fc9c..06162f5 100644
--- a/libs/clucene/HISTORY
+++ b/libs/clucene/HISTORY
@@ -1,3 +1,7 @@
+2007-10-24 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: PATCHLEVEL++
+ * PRE_BUILD: deleted, causes problems with strigi and soprano
+
2007-08-20 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.9.20

diff --git a/libs/clucene/PRE_BUILD b/libs/clucene/PRE_BUILD
deleted file mode 100755
index ff4e824..0000000
--- a/libs/clucene/PRE_BUILD
+++ /dev/null
@@ -1,4 +0,0 @@
-default_pre_build &&
-cd $SOURCE_DIRECTORY &&
-sed -i '/clucene_configdir = \$(libdir)/ s,libdir,includedir,' \
- src/CLucene/Makefile.am src/Makefile.in
diff --git a/libs/glibc/DETAILS b/libs/glibc/DETAILS
index 17dced0..aa045d6 100755
--- a/libs/glibc/DETAILS
+++ b/libs/glibc/DETAILS
@@ -1,34 +1,34 @@
SPELL=glibc
if [ "$GLIBC_NPTL" = "y" ]; then
VERSION=2.6.1
- HEADERS_VERSION=2.6.22.6
+ HEADERS_VERSION=2.6.23.1
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE2=$SOURCE.sig
case "${SMGL_COMPAT_ARCHS[1]}" in
ia32)
SOURCE3=linux-headers-${HEADERS_VERSION}-i386.tar.bz2
-
SOURCE3_HASH=sha512:e328abe55c7d3c239ec3dbede78ce405a662d3159382a2cb3db8dbf5b7783d230a237d44c23280171893c9213b55c4f9bf8963f193fc50158803078e3875ecef
+
SOURCE3_HASH=sha512:8860505c6d1b32b0f3f1180f648da65c3fc0a91b696e13ae9198a87dbfc2ea6e29eca471628237540857a993d43977cb3e5d794abb77bf07e6fa7bc0d4a76d12
;;
x86_64)
SOURCE3=linux-headers-${HEADERS_VERSION}-x86_64.tar.bz2
-
SOURCE3_HASH=sha512:1d032b35eee2593896cdffd779ed3f695f5abb552c83f96fcabec46d5977b649db0741690be5dd40d712779b0f3816c6e04e7840991dad4e0a6881adee097852

+
SOURCE3_HASH=sha512:122eba0147cbd1e6eb6dedc3701d7118851e192a8d6189bbb95ed1822b637239b99abe80322368c1039e747d1129f0571014557b2d4775bc94f024a58991353f
;;
ppc)
SOURCE3=linux-headers-${HEADERS_VERSION}-powerpc.tar.bz2
-
SOURCE3_HASH=sha512:06c5ff0fdbe39367df6538000358058fb6a804bc3711ad621fd825fa2887b2cb13b6992c32fe64da3381402b681b9ac526ac2b7eb2320966fcb9a6f6b1830737

+
SOURCE3_HASH=sha512:1e64989ce33eba084f6a612c2d798bae070b8dd42ef5cf4cf127a9c28645082b3d170026aa03de48ed0bbfd99942c38e6e28e3c58756b254ae960c9b6b13a9b5
;;
alpha)
SOURCE3=linux-headers-${HEADERS_VERSION}-alpha.tar.bz2
-
SOURCE3_HASH=sha512:a462e6ee9c446a71181e189d36b430fbdbf7070f2499d06e234b50f91ec3f0172a3428ecd37e7dad85bb153bfc985cea39e33785b7cffa9ac371a579412e6361
+
SOURCE3_HASH=sha512:002a7d1003eedc257c5be00970f61667cc6e328f6ee9d20572f755f74e0498193042e0a0a3d4ba0751f8481a682be090e358edb3167b211c8fc5c1c7ff69d81b
;;
sparc)
if [[ ${SMGL_COMPAT_ARCHS[0]} == 64 ]]
then
SOURCE3=linux-headers-${HEADERS_VERSION}-sparc64.tar.bz2
-
SOURCE3_HASH=sha512:45665ceb4c8622615c3e9bbcbe57e8f9bd96d1cfd7d50aa7269ca8be9f6400c35feddc4b93251e56a7e0d5fbb48cf1b1e0f81bd9ca2853dc154cd38c1bd5ebe8
+
SOURCE3_HASH=sha512:d7e04e212ad1dc0605bf5d77cde8d150d0961c8a72c012bf9679115af993d857a9760a3ad54f207c4126dd4228882b60d553095cb59a00c390339b36dba9c4a3
else
SOURCE3=linux-headers-${HEADERS_VERSION}-sparc.tar.bz2
-
SOURCE3_HASH=sha512:264bf8f30dcfd72b8fcdb8e9486c8ffe59ec20bbb5f7379b9e300510d761128f636f2d6945ba97f7672fae878a0976e0dabf500a0c53702d67bf7790562a9484

+
SOURCE3_HASH=sha512:5e398a9ccf5b19ce2ea910002e9ac4d054c90b5b7cb54edab97634da0f34002056e1d1b0dd02cc623557b32422fae286905bb60be327d5e4912e75b00e10660d
fi
;;
*)
@@ -50,6 +50,7 @@ esac
fi
SOURCE_GPG=gnu.gpg:$SOURCE.sig:UPSTREAM_KEY
SOURCE2_IGNORE=signature
+ PATCHLEVEL=1
else
VERSION=2.3.6
HEADERS_VERSION=2.4.24
diff --git a/libs/glibc/HISTORY b/libs/glibc/HISTORY
index f624646..c1061ce 100644
--- a/libs/glibc/HISTORY
+++ b/libs/glibc/HISTORY
@@ -1,3 +1,11 @@
+2007-10-21 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * PRE_INSTALL: remove each of /usr/include/{asm,asm-generic,linux} if
+ it is a symlink, seems like some installations still have those,
+ which breaks stuff
+
+2007-10-18 David Brown <dmlb2000 AT gmail.com>
+ * DETAILS: updated header version to 2.6.23.1
+
2007-09-23 David Brown <dmlb2000 AT gmail.com>
* PRE_BUILD: nisplus_fix.diff and iconv_open.patch removed not needed
* nisplus_fix.diff: removed
diff --git a/libs/glibc/PRE_INSTALL b/libs/glibc/PRE_INSTALL
index 4cda515..cadcee1 100755
--- a/libs/glibc/PRE_INSTALL
+++ b/libs/glibc/PRE_INSTALL
@@ -26,4 +26,15 @@ fi &&

if spell_ok glibc; then
dispel --notriggers --nosustain glibc
+fi &&
+
+# clean up symlinks that break stuff, we used to install those
+if [[ -h $INSTALL_ROOT/usr/include/asm ]]; then
+ rm -f $INSTALL_ROOT/usr/include/asm
+fi &&
+if [[ -h $INSTALL_ROOT/usr/include/asm-generic ]]; then
+ rm -f $INSTALL_ROOT/usr/include/asm-generic
+fi &&
+if [[ -h $INSTALL_ROOT/usr/include/linux ]]; then
+ rm -f $INSTALL_ROOT/usr/include/linux
fi
diff --git a/libs/klibc/HISTORY b/libs/klibc/HISTORY
index 1ee1a50..e7ad7db 100644
--- a/libs/klibc/HISTORY
+++ b/libs/klibc/HISTORY
@@ -1,3 +1,6 @@
+2007-10-10 Martin Spitzbarth <m.spitzbarth AT gmx.de>
+ * PRE_BUILD: fixed the install path of the manpages
+
2007-04-17 David Brown <dmlb2000 AT gmail.com>
* DETAILS: updated 1.5

diff --git a/libs/klibc/PRE_BUILD b/libs/klibc/PRE_BUILD
index 2f7cda8..6b8d00c 100755
--- a/libs/klibc/PRE_BUILD
+++ b/libs/klibc/PRE_BUILD
@@ -7,6 +7,11 @@ cd $SOURCE_DIRECTORY &&
sedit "s:/usr:$INSTALL_ROOT/usr:" Makefile &&

#
+# Manpages go to usr/share/man
+#
+sedit 's:$(prefix)/man:$(prefix)/share/man:' Makefile &&
+
+#
# Needs the linux source to build against.
# Uses get_kernel_version from $GRIMOIRE/FUNCTIONS
#
diff --git a/libs/libatomic_ops/DETAILS b/libs/libatomic_ops/DETAILS
new file mode 100755
index 0000000..b2d7851
--- /dev/null
+++ b/libs/libatomic_ops/DETAILS
@@ -0,0 +1,17 @@
+ SPELL=libatomic_ops
+ VERSION=1.2
+ SOURCE=$SPELL-$VERSION.tar.gz
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+
SOURCE_URL[0]=http://www.hpl.hp.com/research/linux/atomic_ops/download/$SOURCE
+ WEB_SITE=http://www.hpl.hp.com/research/linux/atomic_ops/
+ SOURCE_GPG=gurus.gpg:$SOURCE.sig:WORKS_FOR_ME
+ LICENSE[0]=MIT
+ ENTERED=20071016
+ SHORT="atomic memory update operations"
+cat << EOF
+Provides implementations for atomic memory update operations on a number of
+architectures. This allows direct use of these in reasonably portable code.
+Unlike earlier similar packages, this one explicitly considers memory barrier
+semantics, and allows the construction of code that involves minimum overhead
+across a variety of architectures.
+EOF
diff --git a/libs/libatomic_ops/HISTORY b/libs/libatomic_ops/HISTORY
new file mode 100644
index 0000000..9f3e93b
--- /dev/null
+++ b/libs/libatomic_ops/HISTORY
@@ -0,0 +1,3 @@
+2007-10-16 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * DETAILS, HISTORY: created this spell
+
diff --git a/libs/libatomic_ops/libatomic_ops-1.2.tar.gz.sig
b/libs/libatomic_ops/libatomic_ops-1.2.tar.gz.sig
new file mode 100644
index 0000000..cb25095
Binary files /dev/null and b/libs/libatomic_ops/libatomic_ops-1.2.tar.gz.sig
differ
diff --git a/libs/libcdio/DETAILS b/libs/libcdio/DETAILS
index bd2e710..e9aee7e 100755
--- a/libs/libcdio/DETAILS
+++ b/libs/libcdio/DETAILS
@@ -1,14 +1,17 @@
SPELL=libcdio
- VERSION=0.77
+ VERSION=0.78.2
SOURCE=$SPELL-$VERSION.tar.gz
+ SOURCE2=$SOURCE.sig
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=${GNU_URL}/libcdio/$SOURCE
-
SOURCE_HASH=sha512:7511d97ed61871d3a69ff6810de3c125151446f9d70e3887d949509c82e916bc19cf8f2d5dd415bbe3549acc81654a59474d9791b4bda9dc8a4a128ea3ec12b7
+ SOURCE2_URL[0]=${GNU_URL}/libcdio/$SOURCE2
+ SOURCE2_IGNORE=signature
+ SOURCE_GPG="gnu.gpg:$SOURCE2:UPSTREAM_KEY"
LICENSE[0]=GPL
WEB_SITE=http://www.gnu.org/software/libcdio/
+ KEYWORDS="libs"
ENTERED=20030222
DOCS="COPYING NEWS README"
- KEYWORDS="libs"
SHORT="library for accessing cdrom drives"
cat << EOF
library for accessing cdrom drives
diff --git a/libs/libcdio/HISTORY b/libs/libcdio/HISTORY
index e6a1b09..d9fceea 100644
--- a/libs/libcdio/HISTORY
+++ b/libs/libcdio/HISTORY
@@ -1,3 +1,7 @@
+2007-10-24 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: Updated to 0.78.2 (fixes compile issue with glibc 2.6)
+ Use upstream gnu.gpg key
+
2006-06-23 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 0.77, removed UPDATED and BUILD_API

diff --git a/libs/libconfig/DETAILS b/libs/libconfig/DETAILS
new file mode 100755
index 0000000..96d8bdb
--- /dev/null
+++ b/libs/libconfig/DETAILS
@@ -0,0 +1,16 @@
+ SPELL=libconfig
+ VERSION=1.2
+ SOURCE=$SPELL-$VERSION.tar.gz
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+ SOURCE_URL[0]=http://www.hyperrealm.com/libconfig/$SOURCE
+
SOURCE_HASH=sha512:48888ad98379dd1d7bebecdaceea0b19da897447761f1bc3eabeac8c3c4aa06346670685110f23719b1e2d4933b287bd6fb328b5356e41018523ba7ff2fb96b8
+ LICENSE[0]=LGPL
+ WEB_SITE=http://www.hyperrealm.com/libconfig/
+ ENTERED=20071024
+ KEYWORDS="libs"
+ SHORT="simple library to manipulate structured configuration
files"
+cat << EOF
+libconfig is a library for reading, manipulating, and writing structured
+configuration files. The library features a fully reentrant parser and
includes
+bindings for both the C and C++ programming languages.
+EOF
diff --git a/libs/libconfig/HISTORY b/libs/libconfig/HISTORY
new file mode 100644
index 0000000..047e22e
--- /dev/null
+++ b/libs/libconfig/HISTORY
@@ -0,0 +1,2 @@
+2007-10-24 Julien "_kaze_" ROZO <julien AT rozo.org>
+ * DETAILS, HISTORY: created spell
diff --git a/libs/libidn/DETAILS b/libs/libidn/DETAILS
index 25e62ec..60e0451 100755
--- a/libs/libidn/DETAILS
+++ b/libs/libidn/DETAILS
@@ -1,12 +1,12 @@
SPELL=libidn
- VERSION=1.1
-
SOURCE_HASH=sha512:3dbb8644e6710a62e2fd2bc643bb8e79101a557dafc50d46d1571da82d91cd39b9c17e1c2bebd2e9c45d212a7a2f7b3d71e44ce32e887a0742cca517f71b4158
+ VERSION=1.2
+
SOURCE_HASH=sha512:36afd9fe05074a8bf90f403e32fd86c638dd52e12603ff721f53d5c92486382f677a87dd55f0ab2f05c3a404ac28533767a899ae292a1da04cc9502813bd9b37
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://josefsson.org/libidn/releases/$SOURCE
WEB_SITE=http://www.gnu.org/software/libidn/
ENTERED=20040824
- PATCHLEVEL=1
+ PATCHLEVEL=0
LICENSE[0]=LGPL
KEYWORDS="libs"
SHORT="Internationalized Domain Names (IDN) implementation."
diff --git a/libs/libidn/HISTORY b/libs/libidn/HISTORY
index efaf8a9..a3b110a 100644
--- a/libs/libidn/HISTORY
+++ b/libs/libidn/HISTORY
@@ -1,3 +1,6 @@
+2007-10-11 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 1.2
+
2007-09-10 Remko van der Vossen <wich AT stack.nl>
* DETAILS: 1.1
* BUILD: Removed. idn-int.h issue was fixed upstream
diff --git a/libs/libixp/CONFIGURE b/libs/libixp/CONFIGURE
new file mode 100755
index 0000000..a971dc4
--- /dev/null
+++ b/libs/libixp/CONFIGURE
@@ -0,0 +1,2 @@
+config_query LIBIXP_HG "Build devel version from mercurial? (necessary for
wmii to build)" y
+
diff --git a/libs/libixp/DEPENDS b/libs/libixp/DEPENDS
new file mode 100755
index 0000000..7822390
--- /dev/null
+++ b/libs/libixp/DEPENDS
@@ -0,0 +1,4 @@
+if [ "x$LIBIXP_HG" == "xy" ]; then
+ depends mercurial
+fi
+
diff --git a/libs/libixp/DETAILS b/libs/libixp/DETAILS
index 7d015a8..3096901 100755
--- a/libs/libixp/DETAILS
+++ b/libs/libixp/DETAILS
@@ -1,9 +1,17 @@
SPELL=libixp
- VERSION=0.2
- SOURCE=$SPELL-$VERSION.tar.gz
- SOURCE_URL[0]=http://libs.suckless.org/download/${SOURCE}
-
SOURCE_HASH=sha512:3db37b22b0807446b644902cab52213475d2d4ca07ff5fdbe2ab54269c7d8eadd5b140be25f959f5869a9b61ebfe7156e78e26db2eb5fd07d9bd137b164cee80
+if [ x"$LIBIXP_HG" == x"y" ]; then
+ VERSION=hg
+SOURCE_URL[0]=http://www.suckless.org/hg.rc/libixp
+ SOURCE_IGNORE=volatile
+ FORCE_DOWNLOAD=on
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL
+else
+ VERSION=0.3
+ SOURCE_URL[0]=http://libs.suckless.org/snaps/${SOURCE}
+
SOURCE_HASH=sha512:114e5b82649e8e24d94873e8098c15e775230cf933c352001036b2313a0ac4cafc8dba09f3df89d90b514e36725c3358619592a300f05c0a444f7203b70ec7a2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+fi
+ SOURCE=$SPELL-$VERSION.tar.gz
WEB_SITE=http://libs.suckless.org
ENTERED=20061230
LICENSE[0]=GPL
diff --git a/libs/libixp/DOWNLOAD b/libs/libixp/DOWNLOAD
new file mode 100755
index 0000000..ecd5162
--- /dev/null
+++ b/libs/libixp/DOWNLOAD
@@ -0,0 +1,10 @@
+if [ "x$LIBIXP_HG" != "xy" ]; then
+ default_download
+ return $?
+fi &&
+message "${MESSAGE_COLOR}Generating tarball...${DEFAULT_COLOR}" &&
+hg clone http://suckless.org/hg.rc/libixp &&
+tar -zcf ${SOURCE} ${SPELL} &&
+cp ${SOURCE} ${SOURCE_CACHE}/${SOURCE} &&
+rm ${SOURCE} &&
+message "${MESSAGE_COLOR}HG Checkout complete...${DEFAULT_COLOR}"
diff --git a/libs/libixp/HISTORY b/libs/libixp/HISTORY
index 0b5cfcd..195a62c 100644
--- a/libs/libixp/HISTORY
+++ b/libs/libixp/HISTORY
@@ -1,3 +1,13 @@
+2007-10-29 Mathieu Lonjaret <lejatorn AT sourcemage.org>
+ * DEPENDS: created this file to add mercurial depend (for pulling
+ devel version).
+
+2007-10-28 Mathieu Lonjaret <lejatorn AT sourcemage.org>
+ * DETAILS, CONFIGURE, DOWNLOAD: added devel version pulled with hg
+
+2007-10-07 Mathieu Lonjaret <lejatorn AT sourcemage.org>
+ * DETAILS: update to 0.3
+
2007-08-04 Ethan "eekee" Grammatikidis <eekee57 AT fastmail.fm>
* DETAILS: Rewrote long desc for spelling grammar and clarity.

diff --git a/libs/libmal/DETAILS b/libs/libmal/DETAILS
index ed1a9cc..29c8a17 100755
--- a/libs/libmal/DETAILS
+++ b/libs/libmal/DETAILS
@@ -1,11 +1,11 @@
SPELL=libmal
- VERSION=0.31
+ VERSION=0.44
SOURCE=${SPELL}-${VERSION}.tar.gz
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
SOURCE_URL[0]=http://jasonday.home.att.net/code/libmal/${SOURCE}
WEB_SITE=http://jasonday.home.att.net/code/libmal/libmal.html
- LICENSE[0]=GPL
-
SOURCE_HASH=sha512:90548a3b3e54124948d6f15dead62d9feb3625f3c6bde8e81802662064fe60015502fdcfa36701452ab54a28a5f89dcf2bf73ef2df7f9be09754d1539540c71b
+ LICENSE[0]=MPL
+
SOURCE_HASH=sha512:2823d43deaf11ccfbc38603d4de10a4c153439b79709d42eb02a6f71f8ef66fdc33c3ceeaedf5c67a0723e3fe6d0861aa559f5c4e78051f674bb124777e1d562
ENTERED=20030601
KEYWORDS="libs"
SHORT="libmal is a library of the object files contained in
malsync."
diff --git a/libs/libmal/HISTORY b/libs/libmal/HISTORY
index f0b05fc..e28c163 100644
--- a/libs/libmal/HISTORY
+++ b/libs/libmal/HISTORY
@@ -1,3 +1,6 @@
+2007-10-16 Julien "_kaze_" ROZO <julien AT rozo.org>
+ * DETAILS: updated to version 0.44, corrected licence to MPL
+
2006-10-03 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: [automated] Removed UPDATED.

diff --git a/libs/libpaper/DETAILS b/libs/libpaper/DETAILS
new file mode 100755
index 0000000..83db2fe
--- /dev/null
+++ b/libs/libpaper/DETAILS
@@ -0,0 +1,16 @@
+ SPELL=libpaper
+ VERSION=1.1.23
+ SOURCE=${SPELL}_$VERSION.tar.gz
+ SOURCE_URL[0]=http://ftp.debian.org/debian/pool/main/libp/$SPELL/$SOURCE
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+ SOURCE_GPG="gurus.gpg:$SOURCE.sig"
+ LICENSE[0]=GPL
+ WEB_SITE=http://packages.qa.debian.org/libp/libpaper.html
+ KEYWORDS="libs"
+ ENTERED=20021126
+ SHORT='simple paper size library'
+cat << EOF
+The paper library and accompanying files are intended to provide a simple way
+for applications to take actions based on a system- or user-specified paper
+size.
+EOF
diff --git a/libs/libpaper/HISTORY b/libs/libpaper/HISTORY
new file mode 100644
index 0000000..01a8a05
--- /dev/null
+++ b/libs/libpaper/HISTORY
@@ -0,0 +1,3 @@
+2007-11-26 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: Created
+
diff --git a/libs/libpaper/libpaper_1.1.23.tar.gz.sig
b/libs/libpaper/libpaper_1.1.23.tar.gz.sig
new file mode 100644
index 0000000..5b5ddb8
Binary files /dev/null and b/libs/libpaper/libpaper_1.1.23.tar.gz.sig differ
diff --git a/libs/libsigsegv/DETAILS b/libs/libsigsegv/DETAILS
index 6024cd6..3f63fb9 100755
--- a/libs/libsigsegv/DETAILS
+++ b/libs/libsigsegv/DETAILS
@@ -1,16 +1,16 @@
SPELL=libsigsegv
- VERSION=2.3
+ VERSION=2.4
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SOURCE.sig
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$GNU_URL/$SPELL/$SOURCE
SOURCE2_URL[0]=$GNU_URL/$SPELL/$SOURCE2
- SOURCE_GPG=gnu.gpg:$SOURCE2
SOURCE2_IGNORE=signature
- WEB_SITE=http://sourceforge.net/projects/libsigsegv/
- ENTERED=20060103
+ SOURCE_GPG=gnu.gpg:$SOURCE2
LICENSE[0]=GPL
+ WEB_SITE=http://sourceforge.net/projects/libsigsegv/
KEYWORDS="libs"
+ ENTERED=20060103
SHORT='page fault handling library'
cat << EOF
GNU libsigsegv is a library for handling page faults. A page fault occurs
when
diff --git a/libs/libsigsegv/HISTORY b/libs/libsigsegv/HISTORY
index 3f78d63..fc99ca2 100644
--- a/libs/libsigsegv/HISTORY
+++ b/libs/libsigsegv/HISTORY
@@ -1,3 +1,7 @@
+2007-10-24 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: Updated to 2.4 (fixes ./configure sigaltstack check lockup
+ with gcc 4.2 and glibc 2.6 updates)
+
2006-09-21 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: [automated] Removed BUILD_API=2.

diff --git a/libs/libsmbios/DETAILS b/libs/libsmbios/DETAILS
new file mode 100755
index 0000000..8278500
--- /dev/null
+++ b/libs/libsmbios/DETAILS
@@ -0,0 +1,25 @@
+ SPELL=libsmbios
+ VERSION=0.13.9
+ SOURCE="${SPELL}-${VERSION}.tar.gz"
+
SOURCE_URL[0]=http://linux.dell.com/${SPELL}/download/${SPELL}/${SPELL}-${VERSION}/${SOURCE}
+
SOURCE_HASH=sha512:a4d08a3b16fda768a6e197e6537e6928a4699f86373bf6aab2796a9447f8fd7419af9558263f1232d347125972bd39120f11027f1f5ad31a536264afc5164d80
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
+ WEB_SITE="http://linux.dell.com/libsmbios/main/index.html";
+ LICENSE[0]=LGPL
+ ENTERED=20070827
+ SHORT="libsmbios provides access to Dell bios functions"
+cat << EOF
+SMBIOS is a standards-based approach for hardware vendors to
+present and structure management data for consumption by OS and
+Management Applications. You can find more information here:
+http://www.dmtf.org/standards/smbios .
+
+Basically, the system BIOS leaves a small table in memory that can be found
+by the OS after system boot. This table has a standardized format that can
+easily be parsed by application software.
+
+Several Dell-specific hardware features, such as BIOS update, CMOS Tokens,
+SMI, hardware probes (temperature, fan, etc) are represented in the SMBIOS
+tables. Because of this, libsmbios has code to enable these features on
+Dell systems.
+EOF
diff --git a/libs/libsmbios/HISTORY b/libs/libsmbios/HISTORY
new file mode 100644
index 0000000..b817ccb
--- /dev/null
+++ b/libs/libsmbios/HISTORY
@@ -0,0 +1,2 @@
+2007-10-24 Arjan Bouter <abouter AT sourcemage.org>
+ * DETAILS,HISTORY: created spell
diff --git a/libs/libwpd/DEPENDS b/libs/libwpd/DEPENDS
new file mode 100755
index 0000000..fd0b0eb
--- /dev/null
+++ b/libs/libwpd/DEPENDS
@@ -0,0 +1 @@
+depends g++
diff --git a/libs/libwpd/DETAILS b/libs/libwpd/DETAILS
new file mode 100755
index 0000000..96bcf95
--- /dev/null
+++ b/libs/libwpd/DETAILS
@@ -0,0 +1,22 @@
+ SPELL=libwpd
+ VERSION=0.8.11
+ SOURCE=$SPELL-$VERSION.tar.gz
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+ SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
+ SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
+ LICENSE[0]=GPL
+ WEB_SITE=http://libwpd.sourceforge.net/index.html
+ ENTERED=20071006
+ KEYWORDS="libs wordperfect"
+ SHORT="Library for processing WordPerfect documents"
+cat << EOF
+libwpd is a C++ library designed to help process WordPerfect documents. It
is
+most commonly used to import WordPerfect documents into other word
processors
+(see below), but may be useful in other cases as well.
+
+libwpd exposes a simple callback-based API (similar to SAX), allowing it to
be
+easily plugged into any C or C++ application. It strictly depends only on an
+implementation of the STL, although by interfacing with a library which
+abstracts the Microsoft OLE format (such as libgsf), you gain the ability to
+import OLE-embedded WordPerfect documents.
+EOF
diff --git a/libs/libwpd/HISTORY b/libs/libwpd/HISTORY
new file mode 100644
index 0000000..f1f3cf6
--- /dev/null
+++ b/libs/libwpd/HISTORY
@@ -0,0 +1,2 @@
+2007-10-06 Robin Cook <rcook AT wyrms.net>
+ * New Spell: DETAILS, DEPENDS, HISTORY
diff --git a/libs/libwpd/libwpd-0.8.11.tar.gz.sig
b/libs/libwpd/libwpd-0.8.11.tar.gz.sig
new file mode 100644
index 0000000..5caf4fd
Binary files /dev/null and b/libs/libwpd/libwpd-0.8.11.tar.gz.sig differ
diff --git a/libs/libwpg/DEPENDS b/libs/libwpg/DEPENDS
new file mode 100755
index 0000000..8080a84
--- /dev/null
+++ b/libs/libwpg/DEPENDS
@@ -0,0 +1,2 @@
+depends g++ &&
+depends libwpd
diff --git a/libs/libwpg/DETAILS b/libs/libwpg/DETAILS
new file mode 100755
index 0000000..e8815a5
--- /dev/null
+++ b/libs/libwpg/DETAILS
@@ -0,0 +1,16 @@
+ SPELL=libwpg
+ VERSION=0.1.0
+ SOURCE=$SPELL-$VERSION.tar.gz
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+ SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
+ SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
+ LICENSE[0]=GPL
+ WEB_SITE=http://libwpg.sourceforge.net/
+ ENTERED=20071006
+ KEYWORDS="libs wordperfect"
+ SHORT="libraries and tools to work with graphics in WPG format"
+cat << EOF
+A collection of libraries and tools to work with graphics in WPG
(WordPerfect
+Graphics) format. WPG is the format used among others in Corel sofware, such
as
+WordPerfect(tm) and Presentations(tm).
+EOF
diff --git a/libs/libwpg/HISTORY b/libs/libwpg/HISTORY
new file mode 100644
index 0000000..f1f3cf6
--- /dev/null
+++ b/libs/libwpg/HISTORY
@@ -0,0 +1,2 @@
+2007-10-06 Robin Cook <rcook AT wyrms.net>
+ * New Spell: DETAILS, DEPENDS, HISTORY
diff --git a/libs/libwpg/libwpg-0.1.0.tar.gz.sig
b/libs/libwpg/libwpg-0.1.0.tar.gz.sig
new file mode 100644
index 0000000..2ef17ff
Binary files /dev/null and b/libs/libwpg/libwpg-0.1.0.tar.gz.sig differ
diff --git a/libs/libwps/DEPENDS b/libs/libwps/DEPENDS
new file mode 100755
index 0000000..8080a84
--- /dev/null
+++ b/libs/libwps/DEPENDS
@@ -0,0 +1,2 @@
+depends g++ &&
+depends libwpd
diff --git a/libs/libwps/DETAILS b/libs/libwps/DETAILS
new file mode 100755
index 0000000..d448e99
--- /dev/null
+++ b/libs/libwps/DETAILS
@@ -0,0 +1,18 @@
+ SPELL=libwps
+ VERSION=0.1.0
+ SOURCE=$SPELL-$VERSION.tar.bz2
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+ SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
+ SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
+ LICENSE[0]=GPL
+ WEB_SITE=http://libwps.sourceforge.net/
+ ENTERED=20071006
+ KEYWORDS="libs ms-works"
+ SHORT="Library for importing MS Work word processor files"
+cat << EOF
+libwps is a library for importing the Microsoft Works word processor file
+format. As of December 2006, the project is new, but it imports Works format
+versions 2, 3, 4, 5 (aka 2000), and 8 with some formatting. The scope of
this
+project is just a Works word processor import filter, so there are no plans
for
+supporting an export filter, spreadsheets, or databases.
+EOF
diff --git a/libs/libwps/HISTORY b/libs/libwps/HISTORY
new file mode 100644
index 0000000..ab78768
--- /dev/null
+++ b/libs/libwps/HISTORY
@@ -0,0 +1,2 @@
+2007-10-06 Robin Cook <rcook AT wyrms.net>
+ * New Spell: DETAILS, HISTORY
diff --git a/libs/libwps/libwps-0.1.0.tar.bz2.sig
b/libs/libwps/libwps-0.1.0.tar.bz2.sig
new file mode 100644
index 0000000..15aefd1
Binary files /dev/null and b/libs/libwps/libwps-0.1.0.tar.bz2.sig differ
diff --git a/libs/locale/DETAILS b/libs/locale/DETAILS
index 3c335c8..a1a913c 100755
--- a/libs/locale/DETAILS
+++ b/libs/locale/DETAILS
@@ -1,5 +1,6 @@
SPELL=locale
VERSION=0.0.2
+ PATCHLEVEL=1
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
WEB_SITE=http://www.gnu.org/software/libc
LICENSE[0]=LGPL
diff --git a/libs/locale/HISTORY b/libs/locale/HISTORY
index a2a7208..9ef6c29 100644
--- a/libs/locale/HISTORY
+++ b/libs/locale/HISTORY
@@ -1,3 +1,7 @@
+2007-10-20 Ladislav Hagara <hgr AT vabo.cz>
+ * locales: fixed character maps [Bug 14044]
+ * DETAILS: PATCHLEVEL=1
+
2007-04-16 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* CONFIGURE: clarified the explanation a bit more

diff --git a/libs/locale/locales b/libs/locale/locales
index aaa4c8a..4e2f757 100755
--- a/libs/locale/locales
+++ b/libs/locale/locales
@@ -31,7 +31,7 @@ bs_BA/ISO-8859-2
Bosnian_locale_for_Bosnia_and_Herzegowina off
byn_ER/UTF-8 Blin_locale_for_Eritrea
off
ca_ES/ISO-8859-1 Catalan_locale_for_Catalonia
off
ca_ES@euro/ISO-8859-15 Catalan_locale_for_Catalonia_with_Euro
off
-cs_CZ/ISO_8859-2 Czech_locale_for_the_Czech_Republic
off
+cs_CZ/ISO-8859-2 Czech_locale_for_the_Czech_Republic
off
cy_GB/ISO-8859-14 Welsh_locale_for_Great_Britain
off
da_DK/ISO-8859-1 Danish_locale_for_Denmark
off
de_AT/ISO-8859-1 German_locale_for_Austria
off
@@ -48,7 +48,7 @@ el_GR@euro/UTF-8
Greek_locale_for_Greece_with_Euro off
en_AU/ISO-8859-1 English_locale_for_Australia
off
en_BW/ISO-8859-1 English_locale_for_Botswana
off
en_CA/ISO-8859-1 English_locale_for_Canada
off
-en_DK/ISO_8859-1 English_locale_for_Denmark
off
+en_DK/ISO-8859-1 English_locale_for_Denmark
off
en_GB/ISO-8859-1 English_locale_for_Britain
off
en_HK/ISO-8859-1 English_locale_for_Hong_Kong
off
en_IE/ISO-8859-1 English_locale_for_Ireland
off
@@ -98,7 +98,7 @@ fr_LU/ISO-8859-1 French_locale_for_Luxemburg
off
fr_LU@euro/ISO-8859-15 French_locale_for_Luxemburg_with_Euro
off
ga_IE/ISO-8859-1 Irish_locale_for_Ireland
off
ga_IE@euro/ISO-8859-15 Irish_locale_for_Ireland_with_Euro
off
-gd_GB/ISO_8859-15 Scots_Gaelic_locale_for_Great_Britain
off
+gd_GB/ISO-8859-15 Scots_Gaelic_locale_for_Great_Britain
off
gez_ER/UTF-8 Ge'ez_locale_for_Eritrea
off
gez_ER@abegede/UTF-8 Ge'ez_locale_for_Eritrea_With_Abegede_Collation
off
gez_ET/UTF-8 Ge'ez_locale_for_Ethiopia
off
@@ -141,7 +141,7 @@ nl_BE@euro/ISO-8859-15
Dutch_locale_for_Belgium_with_Euro off
nl_NL/ISO-8859-1 Dutch_locale_for_the_Netherlands
off
nl_NL@euro/ISO-8859-15 Dutch_locale_for_the_Netherlands_with_Euro
off
nn_NO/ISO-8859-1 Nynorsk_locale_for_Norway
off
-oc_FR/ISO_8859-1 Occitan_Locale_for_France
off
+oc_FR/ISO-8859-1 Occitan_Locale_for_France
off
om_ET/UTF-8 Oromo_locale_for_Ethiopia
off
om_KE/ISO-8859-1 Oromo_locale_for_Kenya
off
pa_IN/UTF-8 Punjabi_locale_for_India
off
@@ -182,7 +182,7 @@ ur_PK/CP1256 Urdu_Locale_for_Pakistan
off
uz_UZ/UTF-8 Uzbek_(latin)_locale_for_Uzbekistan
off
uz_UZ@cyrillic/UTF-8 Uzbek_(cyrillic)_locale_for_Uzbekistan
off
vi_VN/UTF-8 Vietnamese_locale_for_Vietnam
off
-wa_BE/ISO_8859-1 Walloon_Locale_for_Belgium
off
+wa_BE/ISO-8859-1 Walloon_Locale_for_Belgium
off
wa_BE@euro/ISO-8859-15 Walloon_locale_for_Belgium_with_Euro
off
xh_ZA/UTF-8 Xhosa_locale_for_South_Africa
off
yi_US/CP1255 Yiddish_locale
off
diff --git a/libs/newt/DETAILS b/libs/newt/DETAILS
index 6bd4449..089e782 100755
--- a/libs/newt/DETAILS
+++ b/libs/newt/DETAILS
@@ -1,6 +1,6 @@
SPELL=newt
- VERSION=0.52.7-3.fc8
-
SOURCE_HASH=sha512:b516838c1400715af377fda565ceee886a1cdf40c5146fb18465e2787a6ab55aad6afde1f2b07f31a8409cd2b7e842b40651547007e449d65e6f7f5c3c43b212
+ VERSION=0.52.7-4.fc8
+
SOURCE_HASH=sha512:0162412f6b7c3f839290af7f178c496776ad35a31aeab8a33f646e75671e8aacaea485e0d19eba756dbd5b56a276a9866073fa07b44df29c43cf6b54a535148e
SOURCE=$SPELL-$VERSION.src.rpm
local RHL_DIR
RHL_DIR=pub/fedora/linux/development/source/SRPMS
diff --git a/libs/newt/HISTORY b/libs/newt/HISTORY
index 3ecb4f4..e371b92 100644
--- a/libs/newt/HISTORY
+++ b/libs/newt/HISTORY
@@ -1,3 +1,6 @@
+2007-10-21 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.52.7-4.fc8
+
2007-08-26 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.52.7-3.fc8

diff --git a/libs/ode/DETAILS b/libs/ode/DETAILS
index 54e45b6..70e272d 100755
--- a/libs/ode/DETAILS
+++ b/libs/ode/DETAILS
@@ -5,10 +5,10 @@ if [ "${ODE_SNAP}" == "y" ]; then
SOURCE_URL[0]=http://opende.sourceforge.net/snapshots/${SOURCE}
SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
else
- VERSION=0.8.1-rc1
+ VERSION=0.9
SOURCE=${SPELL}-src-${VERSION}.zip
SOURCE_URL[0]=${SOURCEFORGE_URL}/opende/${SOURCE}
-
SOURCE_HASH=sha512:502b4d66a731940ddbd3acace7b93aa6f528844ac86518afa169eee7826a74ba3f8c0878f55ec98f1275de547d7cbb4bff1bfc0eaaff964a78c07c7ec1e7e049
+
SOURCE_HASH=sha512:ff72911649ab5e0ebaea5af8bc26518c9b184588a43074345c4284bf999cdcc22def23227c9108f7cb5b67d8353f2a06107b7ab35cfb80f77612d0e50f772302
fi
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
WEB_SITE=http://ode.org/
diff --git a/libs/ode/HISTORY b/libs/ode/HISTORY
index 5024153..e6f073e 100644
--- a/libs/ode/HISTORY
+++ b/libs/ode/HISTORY
@@ -1,4 +1,7 @@
-2008-09-10 Pol Vinogradov <vin.public AT gmail.com>
+2007-10-17 Pol Vinogradov <vin.public AT gmail.com>
+ * DETAILS: updated to 0.9
+
+2007-09-10 Pol Vinogradov <vin.public AT gmail.com>
* DETAILS: updated to 0.8.1-rc1

2007-02-13 Pol Vinogradov <vin.public AT gmail.com>
diff --git a/libs/openobex/DETAILS b/libs/openobex/DETAILS
index 44bb7a2..9cd2ffd 100755
--- a/libs/openobex/DETAILS
+++ b/libs/openobex/DETAILS
@@ -5,7 +5,7 @@
# SOURCE_GPG="gurus.gpg:$SOURCE.sig"
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$SOURCEFORGE_URL/openobex/$SOURCE
- WEB_SITE=http://openobex.sourceforge.net
+ WEB_SITE=http://dev.zuckschwerdt.org/openobex/
ENTERED=20021219
KEYWORDS="wireless libs"
SHORT="openobex wireless Exchange protocol"
diff --git a/libs/openobex/HISTORY b/libs/openobex/HISTORY
index b0ac447..0cd9adc 100644
--- a/libs/openobex/HISTORY
+++ b/libs/openobex/HISTORY
@@ -1,3 +1,6 @@
+2007-10-04 Julien "_kaze_" ROZO <julien AT rozo.org>
+ * DETAILS: corrected WEB_SITE
+
2007-04-19 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* PRE_SUB_DEPENDS: wrongly used bluez-utils instead of bluez-libs

diff --git a/libs/redland/DEPENDS b/libs/redland/DEPENDS
index 736a355..455326f 100755
--- a/libs/redland/DEPENDS
+++ b/libs/redland/DEPENDS
@@ -1,9 +1,13 @@
depends raptor "--with-raptor=system" &&
depends rasqal "--with-rasqal=system" &&
-depends db "--with-bdb=/usr" &&
depends libxml2 "--with-xml-parser=libxml" &&
depends openssl "--with-openssl-digests" &&

+optional_depends db \
+ "--with-bdb=/usr" \
+ "--with-bdb=no" \
+ "Sleepycat db support" &&
+
optional_depends sqlite \
"--with-sqlite=yes" \
"--with-sqlite=no" \
diff --git a/libs/redland/HISTORY b/libs/redland/HISTORY
index 529ed25..0d9aca2 100644
--- a/libs/redland/HISTORY
+++ b/libs/redland/HISTORY
@@ -1,3 +1,6 @@
+2007-10-30 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: db is optional
+
2007-05-06 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.0.6
convert to upstream key
diff --git a/libs/ruby-amazon/BUILD b/libs/ruby-amazon/BUILD
new file mode 100755
index 0000000..9d9e10a
--- /dev/null
+++ b/libs/ruby-amazon/BUILD
@@ -0,0 +1,2 @@
+ruby setup.rb config --prefix="$INSTALL_ROOT"/usr &&
+ruby setup.rb setup
diff --git a/libs/ruby-amazon/DEPENDS b/libs/ruby-amazon/DEPENDS
new file mode 100755
index 0000000..866eee3
--- /dev/null
+++ b/libs/ruby-amazon/DEPENDS
@@ -0,0 +1 @@
+depends ruby
diff --git a/libs/ruby-amazon/DETAILS b/libs/ruby-amazon/DETAILS
new file mode 100755
index 0000000..d576f50
--- /dev/null
+++ b/libs/ruby-amazon/DETAILS
@@ -0,0 +1,20 @@
+ SPELL=ruby-amazon
+ VERSION=0.9.2
+ SOURCE="$SPELL-$VERSION.tar.gz"
+ SOURCE_URL[0]=http://www.caliban.org/files/ruby/$SOURCE
+
SOURCE_HASH=sha512:0c67e2c5d534dd39f4c7de68dee988e5df0f92964a1ce00657f6d03f3b00acc4f0478258c0a1b5d9de4eab5c697eedf34f39d7eb9d22dbdced1fa4dfff3afce5
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
+ WEB_SITE=http://www.caliban.org/ruby/ruby-amazon.shtml
+ LICENSE[0]=GPL
+ ENTERED=20071103
+ SHORT="Ruby library for fetching data from Amazon Web Services."
+cat << EOF
+Ruby/Amazon is a Ruby language library that allows the programmer to retrieve
+information from the popular Amazon Web site via Amazon Web Services. In
+addition to the original amazon.com site, amazon.co.uk, amazon.de, amazon.fr,
+amazon.ca and amazon.co.jp are also supported.
+
+This library is still in development, but already supports the vast majority
+of the AWS v3 API. All forms of product search are implemented, along with
the
+transaction API and the remote shopping-cart API.
+EOF
diff --git a/libs/ruby-amazon/HISTORY b/libs/ruby-amazon/HISTORY
new file mode 100644
index 0000000..7333d09
--- /dev/null
+++ b/libs/ruby-amazon/HISTORY
@@ -0,0 +1,2 @@
+2007-11-03 Cathal Mc Ginley <cathal.magus AT gnostai.org>
+ * DEPENDS, BUILD, INSTALL, DETAILS, HISTORY: created this spell
diff --git a/libs/ruby-amazon/INSTALL b/libs/ruby-amazon/INSTALL
new file mode 100755
index 0000000..caf81b7
--- /dev/null
+++ b/libs/ruby-amazon/INSTALL
@@ -0,0 +1 @@
+ruby setup.rb install
diff --git a/libs/ruby-gettext/BUILD b/libs/ruby-gettext/BUILD
new file mode 100755
index 0000000..64b8abb
--- /dev/null
+++ b/libs/ruby-gettext/BUILD
@@ -0,0 +1,2 @@
+ruby setup.rb config --prefix=/usr &&
+ruby setup.rb setup
diff --git a/libs/ruby-gettext/DEPENDS b/libs/ruby-gettext/DEPENDS
new file mode 100755
index 0000000..866eee3
--- /dev/null
+++ b/libs/ruby-gettext/DEPENDS
@@ -0,0 +1 @@
+depends ruby
diff --git a/libs/ruby-gettext/DETAILS b/libs/ruby-gettext/DETAILS
new file mode 100755
index 0000000..05faced
--- /dev/null
+++ b/libs/ruby-gettext/DETAILS
@@ -0,0 +1,38 @@
+ SPELL=ruby-gettext
+ VERSION=1.10.0
+ SOURCE="$SPELL-package-$VERSION.tar.gz"
+ SOURCE_URL[0]=http://rubyforge.org/frs/download.php/22478/$SOURCE
+
SOURCE_HASH=sha512:4ec8fce188823ecd39d0b2a6fda58033363b2af420e62aa7ca7cca58a0c85d898a9d7ea574013f327e00c3e345e76cc0d217ab8e4a91a7d3693dd045f48cf1f2
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-package-$VERSION"
+ WEB_SITE=http://ponx.s5.xrea.com/hiki/ruby-gettext.html
+ LICENSE[0]=GPL
+ ENTERED=20071103
+ SHORT="Native Language Support library and tools for Ruby."
+cat << EOF
+Ruby-GetText-Package is Native Language Support library and tools
+which modeled after GNU gettext package.
+
+Features:
+
+* Simple APIs(similar GNU gettext)
+
+* rgettext creates po-files from
+ * ruby scripts
+ * glade-2 XML file(.glade)
+ * ERB file(.rhtml)
+ The po-file is compatible to GNU gettext.
+
+* rmsgfmt creates a mo-file from a po-file.
+ The mo-file is compatible to GNU gettext(msgfmt).
+
+* 2 kind of textdomain's scope
+ * A file base (default: recommanded)
+ * A Class/Module base
+ (GetText::Container, GetText::ErbContainer, GetText::Rails)
+
+* CGI support (gettext/cgi)
+
+* ERB support (gettext/erb)
+
+* Ruby on Rails support (gettext/rails)
+EOF
diff --git a/libs/ruby-gettext/HISTORY b/libs/ruby-gettext/HISTORY
new file mode 100644
index 0000000..43ea54f
--- /dev/null
+++ b/libs/ruby-gettext/HISTORY
@@ -0,0 +1,2 @@
+2007-11-03 Cathal Mc Ginley <cathal.magus AT gnostai.org>
+ * DEPENDS, BUILD, INSTALL, DETAILS, HISTORY: created this spell
diff --git a/libs/ruby-gettext/INSTALL b/libs/ruby-gettext/INSTALL
new file mode 100755
index 0000000..caf81b7
--- /dev/null
+++ b/libs/ruby-gettext/INSTALL
@@ -0,0 +1 @@
+ruby setup.rb install
diff --git a/libs/ruby-zoom/BUILD b/libs/ruby-zoom/BUILD
new file mode 100755
index 0000000..99712e0
--- /dev/null
+++ b/libs/ruby-zoom/BUILD
@@ -0,0 +1,2 @@
+ruby extconf.rb &&
+make
diff --git a/libs/ruby-zoom/DEPENDS b/libs/ruby-zoom/DEPENDS
new file mode 100755
index 0000000..f9bb2b3
--- /dev/null
+++ b/libs/ruby-zoom/DEPENDS
@@ -0,0 +1,2 @@
+depends ruby &&
+depends yaz
diff --git a/libs/ruby-zoom/DETAILS b/libs/ruby-zoom/DETAILS
new file mode 100755
index 0000000..973a458
--- /dev/null
+++ b/libs/ruby-zoom/DETAILS
@@ -0,0 +1,16 @@
+ SPELL=ruby-zoom
+ VERSION=0.2.2
+ SOURCE="$SPELL-$VERSION.tar.gz"
+ SOURCE_URL[0]=http://rubyforge.org/frs/download.php/6940/$SOURCE
+
SOURCE_HASH=sha512:6949bbc4400587d7db0e2d9de0e51d1259a89d939db7caf41c8b52404eb96b3a8ce063866a5a217cff3ec320bf8a596f26ecdeb04e5711ea6f478a02ce42f88f
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
+ WEB_SITE=http://ruby-zoom.rubyforge.org/
+ LICENSE[0]=LGPL
+ ENTERED=20071103
+ SHORT="a Ruby binding to the ZOOM toolkit"
+cat << EOF
+Ruby/ZOOM provides a Ruby binding to the Z39.50 Object-Orientation Model
+(ZOOM), an abstract object-oriented programming interface to a subset of the
+services specified by the Z39.50 standard, also known as the international
+standard ISO 23950.
+EOF
diff --git a/libs/ruby-zoom/HISTORY b/libs/ruby-zoom/HISTORY
new file mode 100644
index 0000000..aec8581
--- /dev/null
+++ b/libs/ruby-zoom/HISTORY
@@ -0,0 +1,2 @@
+2007-11-03 Cathal Mc Ginley <cathal.magus AT gnostai.org>
+ * DEPENDS, BUILD, DETAILS: created this spell
diff --git a/libs/sdl_gfx/DETAILS b/libs/sdl_gfx/DETAILS
index 466364e..2e0fe7a 100755
--- a/libs/sdl_gfx/DETAILS
+++ b/libs/sdl_gfx/DETAILS
@@ -1,5 +1,5 @@
SPELL=sdl_gfx
- VERSION=2.0.13
+ VERSION=2.0.16
SOURCE=SDL_gfx-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/SDL_gfx-$VERSION

SOURCE_URL[0]=http://www.ferzkopp.net/~aschiffler/Software/SDL_gfx-2.0/$SOURCE
diff --git a/libs/sdl_gfx/HISTORY b/libs/sdl_gfx/HISTORY
index 3a37ddb..32945a2 100644
--- a/libs/sdl_gfx/HISTORY
+++ b/libs/sdl_gfx/HISTORY
@@ -1,3 +1,6 @@
+2007-10-08 Pol Vinogradov <vin.public AT gmail.com>
+ * DETAILS: updated to 2.0.16
+
2006-09-21 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: [automated] Removed BUILD_API=2.

diff --git a/libs/sdl_gfx/SDL_gfx-2.0.13.tar.gz.sig
b/libs/sdl_gfx/SDL_gfx-2.0.13.tar.gz.sig
deleted file mode 100644
index ed96faa..0000000
Binary files a/libs/sdl_gfx/SDL_gfx-2.0.13.tar.gz.sig and /dev/null differ
diff --git a/libs/sdl_gfx/SDL_gfx-2.0.16.tar.gz.sig
b/libs/sdl_gfx/SDL_gfx-2.0.16.tar.gz.sig
new file mode 100644
index 0000000..ef66fee
Binary files /dev/null and b/libs/sdl_gfx/SDL_gfx-2.0.16.tar.gz.sig differ
diff --git a/libs/sdl_mixer/CONFIGURE b/libs/sdl_mixer/CONFIGURE
index d3a7bb2..7ab5ac3 100755
--- a/libs/sdl_mixer/CONFIGURE
+++ b/libs/sdl_mixer/CONFIGURE
@@ -1,16 +1,3 @@
-config_query_option SDLMIXER_MOD \
- "Enable MOD support" \
- y \
- "--enable-music-libmikmod" \
- "--disable-music-libmikmod" &&
-if [[ "$SDLMIXER_MOD" == "--enable-music-libmikmod" ]]
-then
- config_query_option SDLMIXER_MOD_MIKMOD \
- "Enable MOD music via mikmod(depends mikmod)" \
- y \
- "--enable-music-mikmod" \
- "--disable-music-mikmod"
-fi &&
config_query_option SDLMIXER_NATIVE_MIDI \
"Enable MIDI support" \
y \
diff --git a/libs/sdl_mixer/DEPENDS b/libs/sdl_mixer/DEPENDS
index 6d5d597..d1d9893 100755
--- a/libs/sdl_mixer/DEPENDS
+++ b/libs/sdl_mixer/DEPENDS
@@ -1,15 +1,15 @@
depends sdl &&
depends audiofile &&

-if [[ "$SDLMIXER_MOD" == "--enable-music-libmikmod" ]]
-then
-depends libmikmod
-fi &&
+optional_depends libmikmod \
+ "--enable-music-libmikmod" \
+ "--disable-music-libmikmod" \
+ "to play mods via libmikmod"

-if [[ "$SDLMIXER_MOD_MIKMOD" == "--enable-music-mod" ]]
-then
-depends mikmod
-fi &&
+optional_depends mikmod \
+ "--enable-music-mod" \
+ "--disable-music-mod" \
+ "to play mods via mikmod"

if [[ "$SDLMIXER_TIMIDITY_MIDI" == "--enable-music-midi" ]]
then
diff --git a/libs/sdl_mixer/DETAILS b/libs/sdl_mixer/DETAILS
index 230f7ef..bd1e7a7 100755
--- a/libs/sdl_mixer/DETAILS
+++ b/libs/sdl_mixer/DETAILS
@@ -12,9 +12,9 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/SDL_mixer-$VERSION
SOURCE2_GPG="gurus.gpg:${SOURCE2}.sig"
WEB_SITE=http://www.libsdl.org/projects/SDL_mixer/
ENTERED=20010922
- UPDATED=20040918
LICENSE[0]=LGPL
KEYWORDS="mixer sdl libs"
+ PATCHLEVEL=1
SHORT="SDL multi-channel audio mixer"
cat << EOF
SDL_mixer is a simple multi-channel audio mixer. It supports 8 channels
diff --git a/libs/sdl_mixer/HISTORY b/libs/sdl_mixer/HISTORY
index 11f82ef..67b485a 100644
--- a/libs/sdl_mixer/HISTORY
+++ b/libs/sdl_mixer/HISTORY
@@ -1,3 +1,8 @@
+2007-11-04 Arjan Bouter <abouter AT sourcemage.org>
+ * DETAILS: patchlevel++, removed UPDATED
+ * DEPENDS: fixed mikmod options
+ * CONFIGURE: removed mikmod queries
+
2006-12-16 Eric Sandall <sandalle AT sourcemage.org>
* DEPENDS: Fix spelling of trough -> through

diff --git a/libs/soprano/DETAILS b/libs/soprano/DETAILS
index 7b0f7fd..3fec1d6 100755
--- a/libs/soprano/DETAILS
+++ b/libs/soprano/DETAILS
@@ -1,7 +1,7 @@
SPELL=soprano
if [[ $SOP_DEV == y ]]; then
- VERSION=1.90.0-beta1
-
SOURCE_HASH=sha512:3d62772c72c31b2aa93f1f86e2297c5888b3fedf73878d64626d7a87d151a0cd10a8994b8663a8c3509409e05a497a5da411f0a6337b5395fd6f845bb5e3daec
+ VERSION=1.95.0-beta2
+
SOURCE_HASH=sha512:255c7d5157b81010ada96e9fcee9b846836f1a080fb0f21e7ade1272fc5f4057749aca61c99e21449ac998677217115a0910e2637634a64d59205e78f39ddedf
else
VERSION=0.9.0

SOURCE_HASH=sha512:2c1780eebad6d5c36ca43a08ab4dbd556429b198998cb03de441e1f3f4f923aeaa0a6083ce28212cb64a9492d3a9c9131d7cfe3f149ef121ee0feb6c4f13b690
diff --git a/libs/soprano/HISTORY b/libs/soprano/HISTORY
index 6ee0cde..5f5669a 100644
--- a/libs/soprano/HISTORY
+++ b/libs/soprano/HISTORY
@@ -1,3 +1,6 @@
+2007-10-12 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.95.0-beta2
+
2007-09-26 Treeve Jelbert <treeve AT sourcemage.org>
* PREPARE: added, support devel and stable version
* DETAILS: add back version 0.9.0 (stable)
diff --git a/libs/sword/DETAILS b/libs/sword/DETAILS
index 24f9f0e..98d290a 100755
--- a/libs/sword/DETAILS
+++ b/libs/sword/DETAILS
@@ -1,9 +1,9 @@
SPELL=sword
- VERSION=1.5.9
+ VERSION=1.5.10
+
SOURCE_HASH=sha512:b3858b5a4c8221b2a0296190b8d7fa9433ebac7c0fd948aa6d185cdbaaa8248adbef421cd83c42c5df70595056d2a1c58bd2fd1699655ca2c5bef89897716f2f
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION

SOURCE_URL[0]=http://www.crosswire.org/ftpmirror/pub/sword/source/v1.5/$SOURCE
-
SOURCE_HASH=sha512:990532a6e1e9ff35d974442dd24dd0af9203110a78e552370bf52c80830f98deeae88d986ecbd88418a464124a0070150387d51edc9dad4ff2610b5f85745c6c
WEB_SITE=http://www.crosswire.org/sword/index.jsp
ENTERED=20040909
LICENSE[0]=GPL
diff --git a/libs/sword/HISTORY b/libs/sword/HISTORY
index 127c67e..aaf4813 100644
--- a/libs/sword/HISTORY
+++ b/libs/sword/HISTORY
@@ -1,3 +1,6 @@
+2007-10-24 Treeve Jelbert <treeve@@sourcemage.org>
+ * DETAILS: version 1.5.10
+
2007-01-14 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* DEPENDS: made curl optional, added clucene; fix #13404

diff --git a/libs/xmlrpc-c/BUILD b/libs/xmlrpc-c/BUILD
index 567421c..1cee254 100755
--- a/libs/xmlrpc-c/BUILD
+++ b/libs/xmlrpc-c/BUILD
@@ -1,49 +1,4 @@
-if [ "$CURLCLIENT" == "n" ];
-then
- MYCONF="--disable-curl-client " &&
- message "${MESSAGE_COLOR}Disabled curl client build${DEFAULT_COLOR}"
-fi &&
-if [ "$ABYSSERV" == "n" ];
-then
- MYCONF="$MYCONF --disable-abyss-server " &&
- message "${MESSAGE_COLOR}Disabled abyss server build${DEFAULT_COLOR}"
-fi &&
-if [ "$CGISERV" == "n" ];
-then
- MYCONF="$MYCONF --disable-cgi-server " &&
- message "${MESSAGE_COLOR}Disabled cgi server build${DEFAULT_COLOR}"
-fi &&
-if [ "$CPLUSPLUS" == "n" ];
-then
- MYCONF="$MYCONF --disable-cplusplus " &&
- message "${MESSAGE_COLOR}Disabled c++ wrapper build${DEFAULT_COLOR}"
-fi &&
-if [ "$BUNICODE" == "n" ];
-then
- MYCONF="$MYCONF --disable-cplusplus " &&
- message "${MESSAGE_COLOR}Disabled unicode support build${DEFAULT_COLOR}"
-fi &&
-if [ "$ABFORK" == "y" ];
-then
- MYCONF="$MYCONF --disable-abyss-threads " &&
- message "${MESSAGE_COLOR}Disabled abys thread support
build${DEFAULT_COLOR}"
-fi &&
-
-./configure \
- --prefix=${INSTALL_ROOT}/usr \
- --bindir=${INSTALL_ROOT}/usr/bin \
- --sbindir=${INSTALL_ROOT}/usr/sbin \
- --datadir=${INSTALL_ROOT}/usr/share \
- --sysconfdir=${INSTALL_ROOT}/etc \
- --libdir=${INSTALL_ROOT}/usr/lib \
- --includedir=${INSTALL_ROOT}/usr/include \
- --infodir=${INSTALL_ROOT}/usr/info \
- --mandir=${INSTALL_ROOT}/usr/share/man \
- --libexecdir=${INSTALL_ROOT}/usr/libexec \
- --datadir=${INSTALL_ROOT}/usr/share \
- --localstatedir=${INSTALL_ROOT}/var/lib/xmlrpc-c \
- --sharedstatedir=${INSTALL_ROOT}/usr/share/xmlrpc-c \
- $OPTS \
- $MYCONF &&
-
-make
+OPTS="$XMLRPCC_OPTS $OPTS" &&
+make_single &&
+default_build &&
+make_normal
diff --git a/libs/xmlrpc-c/CONFIGURE b/libs/xmlrpc-c/CONFIGURE
index 6d9e163..93f7a2e 100755
--- a/libs/xmlrpc-c/CONFIGURE
+++ b/libs/xmlrpc-c/CONFIGURE
@@ -1,6 +1,16 @@
-config_query CURLCLIENT "Build curl client?" y
-config_query ABYSSERV "Build abyss server?" y
-config_query CGISERV "Build cgi server?" y
-config_query CPLUSPLUS "Build c++ wrapper?" y
-config_query BUNICODE "Build unicode support?" y
-config_query ABFORK "Use fork in abyss instead of pthreads?" n
+config_query_option XMLRPCC_OPTS \
+ "Build abyss server?" \
+ y \
+ "--enable-abyss-server" \
+ "--disable-abyss-server" &&
+config_query_option XMLRPCC_OPTS \
+ "Use fork in abyss instead of pthreads?" \
+ y \
+ "--enable-abyss-threads" \
+ "--disable-abyss-threads" &&
+config_query_option XMLRPCC_OPTS \
+ "Build cgi server?" \
+ y \
+ "--enable-cgi-server" \
+ "--disable-cgi-server"
+
diff --git a/libs/xmlrpc-c/DEPENDS b/libs/xmlrpc-c/DEPENDS
index 88dbfe6..4cf9e19 100755
--- a/libs/xmlrpc-c/DEPENDS
+++ b/libs/xmlrpc-c/DEPENDS
@@ -1,2 +1,14 @@
-depends curl &&
-depends w3c-libwww
+# we prefer system libs to package provided ones
+depends libxml2 "--enable-libxml2-backend" &&
+optional_depends curl \
+ "--enable-curl-client" \
+ "--disable-curl-client" \
+ "Enable cURL support" &&
+optional_depends w3c-libwww \
+ "--enable-libwww-client" \
+ "--disable-libwww-client" \
+ "Enable libwww support" &&
+optional_depends g++ \
+ "--enable-cplusplus" \
+ "--disable-cplusplus" \
+ "Enable C++ support"
diff --git a/libs/xmlrpc-c/DETAILS b/libs/xmlrpc-c/DETAILS
index 04ce3f6..7fefc8d 100755
--- a/libs/xmlrpc-c/DETAILS
+++ b/libs/xmlrpc-c/DETAILS
@@ -1,10 +1,10 @@
SPELL=xmlrpc-c
- VERSION=1.03.01
+ VERSION=1.06.18
SOURCE=$SPELL-$VERSION.tgz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$SOURCEFORGE_URL/xmlrpc-c/$SOURCE
WEB_SITE=http://xmlrpc-c.sourceforge.net
-
SOURCE_HASH=sha512:41f969cc9e6d1fe803517b3b310f78d6b8fcce15468bc16b5b5afa66e745f0e7bfdda973f45fdfe6153e75df8874509635dcb8341fdbe0112c2deedacbd719da
+
SOURCE_HASH=sha512:13283e733492c654e9c1b6197c7f087dd19e12633dd9c96a4d32ab2ab223f0f74c74afc088cde33cf7a19c4a7c11a0f7adde4d00829be892cb727e53a1844a54
LICENSE[0]=GPL
ENTERED=20040907
KEYWORDS="xml http libs"
diff --git a/libs/xmlrpc-c/HISTORY b/libs/xmlrpc-c/HISTORY
index 643e1e1..1294eb7 100644
--- a/libs/xmlrpc-c/HISTORY
+++ b/libs/xmlrpc-c/HISTORY
@@ -1,3 +1,13 @@
+2007-10-19 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
+ * DETAILS: version update
+ * DEPENDS: revamped
+ * CONFIGURE: revamped
+ * BUILD: revamped
+ * PRE_BUILD: added, use our CFLAGS
+
+2007-10-18 Mathieu Lonjaret <lejatorn AT sourcemage.org>
+ * BUILD: bogus configure for unicode
+
2007-01-23 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* DETAILS: use $SOURCEFORGE_URL instead of hardcoded broken value

diff --git a/libs/xmlrpc-c/PRE_BUILD b/libs/xmlrpc-c/PRE_BUILD
new file mode 100755
index 0000000..c25ae92
--- /dev/null
+++ b/libs/xmlrpc-c/PRE_BUILD
@@ -0,0 +1,5 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+sedit "s:\(CFLAGS_COMMON.*\)-g -O3:\1$CFLAGS:" Makefile.common &&
+sedit "s:\(CXXFLAGS_COMMON.*\)-g:\1$CXXFLAGS:" Makefile.common
+
diff --git a/libs/xmltv/DETAILS b/libs/xmltv/DETAILS
index bb90ce0..9a232ca 100755
--- a/libs/xmltv/DETAILS
+++ b/libs/xmltv/DETAILS
@@ -1,6 +1,6 @@
SPELL=xmltv
- VERSION=0.5.49
-
SOURCE_HASH=sha512:8f184ddacfd1cd36e551c7e5206bfa40aee9cb8a3f5601b610b45191a63bc8ecf5e4f1daeeae52632287b35e60193e5d43a66b1efd482055a3ded81bf14cf683
+ VERSION=0.5.50
+
SOURCE_HASH=sha512:0588bf65eded70008b681ebf468c0a797bbfb0480c43a2ccc5078d28cfd961aff4f9ca449076140e4d896134a13cd15b1c3fd8798bd46b23c8a6f0ecdd244f13
SOURCE=${SPELL}-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=${SOURCEFORGE_URL}/${SPELL}/$SOURCE
diff --git a/libs/xmltv/HISTORY b/libs/xmltv/HISTORY
index 5c7804a..2d318d6 100644
--- a/libs/xmltv/HISTORY
+++ b/libs/xmltv/HISTORY
@@ -1,3 +1,7 @@
+2007-11-05 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.5.50
+ * grabbers: two new grabbers
+
2007-10-01 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.5.49

diff --git a/libs/xmltv/grabbers b/libs/xmltv/grabbers
index 3b0c816..06844ff 100644
--- a/libs/xmltv/grabbers
+++ b/libs/xmltv/grabbers
@@ -8,6 +8,7 @@ tv_grab_dk Denmark off
tv_grab_dtv_la Latin American off
tv_grab_ee Estonia off
tv_grab_es Spain off
+tv_grab_eu_epgdata commercial_epgdata.com_service off
tv_grab_hr Croatia off
tv_grab_huro Hungary_and_Romania off
tv_grab_is Iceland off
@@ -17,6 +18,7 @@ tv_grab_fr France off
tv_grab_hr Croatia off
tv_grab_jp Japan off
tv_grab_na_dd North_America_using_DataDirect off
+tv_grab_na_dtv North_America_for_DirectTV off
tv_grab_na_icons North_American_Channel_Icons off
tv_grab_nc Nouvelle Caledonie off
tv_grab_nl Netherlands off
diff --git a/mail/alpine/BUILD b/mail/alpine/BUILD
new file mode 100755
index 0000000..6ddf11b
--- /dev/null
+++ b/mail/alpine/BUILD
@@ -0,0 +1,2 @@
+OPTS="--with-system-pinerc=/etc/pinerc --with-c-client-target=slx
${ALPINE_OPTS} $OPTS" &&
+default_build
diff --git a/mail/alpine/CONFIGURE b/mail/alpine/CONFIGURE
new file mode 100755
index 0000000..373c227
--- /dev/null
+++ b/mail/alpine/CONFIGURE
@@ -0,0 +1,8 @@
+config_query_option ALPINE_OPTS "Do you want NLS support?" y \
+ "--enable-nls" "--disable-nls" &&
+
+config_query_option ALPINE_OPTS "Do you want IPv6 support?" n \
+ "--with-ipv6" "--without-ipv6" &&
+
+config_query_option ALPINE_OPTS "Do you want iconv support?" n \
+ "--with-libiconv-prefix"
"--without-libiconv-prefix"
diff --git a/mail/alpine/DEPENDS b/mail/alpine/DEPENDS
new file mode 100755
index 0000000..9840edd
--- /dev/null
+++ b/mail/alpine/DEPENDS
@@ -0,0 +1,23 @@
+depends MAIL-TRANSPORT-AGENT &&
+
+optional_depends openssl \
+ "--with-ssl-dir=$INSTALL_ROOT/usr \
+ --with-ssl-certs-dir=$INSTALL_ROOT/etc/ssl/certs \
+ --with-ssl-include-dir=$INSTALL_ROOT/usr/include/openssl \
+ --with-ssl-lib-dir=$INSTALL_ROOT/usr/lib" \
+ "--without-ssl" \
+ "for SSL/TLS support" &&
+
+# it doesn't detect TCL as much as i have tried
+#optional_depends tcl '--with-tcl-lib' '--without-tcl'
\
+# 'for Web Alpine support'
&&
+
+optional_depends openldap \
+ '--with-ldap-dir' \
+ '--without-ldap' \
+ 'for LDAP support' &&
+
+optional_depends krb5 \
+ '--with-krb5-dir' \
+ '--without-krb5' \
+ 'for Kerberos support'
diff --git a/mail/alpine/DETAILS b/mail/alpine/DETAILS
new file mode 100755
index 0000000..bf71e46
--- /dev/null
+++ b/mail/alpine/DETAILS
@@ -0,0 +1,29 @@
+ SPELL=alpine
+ VERSION=0.9999
+
SOURCE_HASH=sha512:a04e4557d2b3481ab19aa24da0e2210a599ada8f54a1725695e6e4aaee50b98132705d96a94177514957f2c1353fc512bc0ad555d60434bb44de96590ca6b108
+ SOURCE=${SPELL}-${VERSION}.tar.bz2
+SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
+ SOURCE_URL[0]=ftp://ftp.cac.washington.edu/alpine/${SOURCE}
+ SOURCE_URL[1]=ftp://ftp.cac.washington.edu/alpine/old/${SOURCE}
+ WEB_SITE=http://www.washington.edu/alpine/
+ ENTERED=20071028
+ LICENSE[0]=APACHE
+ SHORT="Alpine consists of a UNIX command-line program, a PC
version, and a Web version."
+cat << EOF
+In late 2005, Computing & Communications at the University of Washington
+began a project to create a new family of email tools built upon the Pine
+Message System. This family of tools is called Alpine. Alpine consists of
+a UNIX command-line program, a PC version, and a Web version.
+
+Why Alpine? The Pine Team wanted to reorganize the very mature Pine source
+code, distribute the Web version that has been very popular here at the
+Univerity of Washington, and relax our trademark obligation for source
+code quality control to a world-wide customer base.
+
+The trademark obligation represents an ongoing administrative effort.
+Coincidentally, the UW is standardizing its license for the several other
+products we offer to the Apache License, Version 2.0.
+
+The cleanest way to do all this was to stop developing Pine (a registered
+trademark) and start a new product - thus Alpine was born.
+EOF
diff --git a/mail/alpine/HISTORY b/mail/alpine/HISTORY
new file mode 100644
index 0000000..fcb1820
--- /dev/null
+++ b/mail/alpine/HISTORY
@@ -0,0 +1,6 @@
+2007-10-31 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
+ * BUILD: removed the unnecessary ssl stuff
+ * DEPENDS: added more opts to the ssl stuff
+
+2007-10-30 Elisamuel Resto <ryuji AT mages.ath.cx>
+ * BUILD, CONFIGURE, DEPENDS, DETAILS: spell created from current
c-client spell.
diff --git a/mail/anubis/DETAILS b/mail/anubis/DETAILS
index 483fa55..6a0add2 100755
--- a/mail/anubis/DETAILS
+++ b/mail/anubis/DETAILS
@@ -8,14 +8,17 @@ if [[ "${ANUBIS_USE_CVS}" == "y" ]]; then
fi
SOURCE=${SPELL}-cvs.tar.bz2

SOURCE_URL[0]=cvs://:pserver:anonymous AT cvs.savannah.gnu.org:/sources/anubis:anubis
+ SOURCE2_URL[0]=git://git.savannah.gnu.org/gnulib.git:gnulib-scm
+ SOURCE2=gnulib-scm.tar.bz2
SOURCE_IGNORE=volatile
+ SOURCE2_IGNORE=volatile
FORCE_DOWNLOAD=on
else
- VERSION=4.0
+ VERSION=4.1
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SPELL-$VERSION.tar.gz.sig
- SOURCE_URL[0]=ftp://ftp.gnu.org/gnu/anubis/$SOURCE-$VERSION
- SOURCE2_URL[0]=ftp://ftp.gnu.org/gnu/anubis/$SOURCE2
+ SOURCE_URL[0]=$GNU_URL/anubis/$SOURCE
+ SOURCE2_URL[0]=$GNU_URL/anubis/$SOURCE2
SOURCE2_IGNORE=signature
SOURCE_GPG="gnu.gpg:$SOURCE2:UPSTREAM_KEY"
fi
diff --git a/mail/anubis/HISTORY b/mail/anubis/HISTORY
index 9169f9b..891e774 100644
--- a/mail/anubis/HISTORY
+++ b/mail/anubis/HISTORY
@@ -1,3 +1,8 @@
+2007-11-06 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
+ * DETAILS: Fixed SOURCE_URL[0]
+ updated spell to 4.1
+ * PREPARE: commented out the CVS stuff it needs more work atm
+
2007-04-23 Arwed v. Merkatz <v.merkatz AT gmx.net>
* CONFIGURE: removed guile version warning
* DEPENDS: actually depend on gdbm if it's chosen, not on postgresql
diff --git a/mail/anubis/PREPARE b/mail/anubis/PREPARE
index f8af9a4..b67772f 100755
--- a/mail/anubis/PREPARE
+++ b/mail/anubis/PREPARE
@@ -1,5 +1,6 @@
-config_query ANUBIS_USE_CVS "Use the CVS version?" "n"
-if [[ "$ANUBIS_USE_CVS" == "y" ]]; then
- config_query ANUBIS_CVS_AUTOUPDATE \
- "Automaticaly update the spell on sorcery queue/system-update?" "n"
-fi
+# CVS VERSION BROKEN FOR NOW
+#config_query ANUBIS_USE_CVS "Use the CVS version?" "n"
+#if [[ "$ANUBIS_USE_CVS" == "y" ]]; then
+# config_query ANUBIS_CVS_AUTOUPDATE \
+# "Automaticaly update the spell on sorcery queue/system-update?" "n"
+#fi
diff --git a/mail/anubis/PRE_BUILD b/mail/anubis/PRE_BUILD
index e76e21d..2b1d97e 100755
--- a/mail/anubis/PRE_BUILD
+++ b/mail/anubis/PRE_BUILD
@@ -1,6 +1,9 @@
default_pre_build &&
if [[ "${ANUBIS_USE_CVS}" == "y" ]]; then
cd ${SOURCE_DIRECTORY} &&
+ unpack_file 2 &&
sedit "s:testsuite::g" Makefile.am &&
- NOCONFIGURE=1 ./autogen.sh
+ build/bootstrap --gnulib-srcdir=./gnulib-scm --skip-po &&
+ sedit "s:#include <getline.h>::g" src/anubisusr.c &&
+ sedit "s:#include <getline.h>::g" src/anubisadm.c
fi
diff --git a/mail/claws-mail-extra-plugins/DETAILS
b/mail/claws-mail-extra-plugins/DETAILS
index aaa25c6..aa8a736 100755
--- a/mail/claws-mail-extra-plugins/DETAILS
+++ b/mail/claws-mail-extra-plugins/DETAILS
@@ -7,7 +7,7 @@
SOURCE_GPG=sylpheed.gpg:${SOURCE}.asc
SOURCE2_IGNORE=signature
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- WEB_SITE=http://www.sylpheed-claws.net/plugins.php
+ WEB_SITE=http://www.claws-mail.org/plugins.php
ENTERED=20060926
LICENSE[0]=GPL
KEYWORDS="reader email mail"
diff --git a/mail/claws-mail-extra-plugins/HISTORY
b/mail/claws-mail-extra-plugins/HISTORY
index 1406a9d..ed3792b 100644
--- a/mail/claws-mail-extra-plugins/HISTORY
+++ b/mail/claws-mail-extra-plugins/HISTORY
@@ -1,3 +1,6 @@
+2007-10-03 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: fixed WEB_SITE
+
2007-09-17 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 3.0.1

diff --git a/mail/claws-mail/DETAILS b/mail/claws-mail/DETAILS
index 7f882ca..8fed84e 100755
--- a/mail/claws-mail/DETAILS
+++ b/mail/claws-mail/DETAILS
@@ -1,5 +1,5 @@
SPELL=claws-mail
- VERSION=3.0.1
+ VERSION=3.0.2
SECURITY_PATCH=1
SOURCE=$SPELL-${VERSION}.tar.bz2
SOURCE_URL=$SOURCEFORGE_URL/sylpheed-claws/$SOURCE
diff --git a/mail/claws-mail/HISTORY b/mail/claws-mail/HISTORY
index 8cf6a07..15208b4 100644
--- a/mail/claws-mail/HISTORY
+++ b/mail/claws-mail/HISTORY
@@ -1,3 +1,6 @@
+2007-10-02 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 3.0.2
+
2007-09-17 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 3.0.1

diff --git a/mail/dovecot/DETAILS b/mail/dovecot/DETAILS
index a18bec4..f0b7b1d 100755
--- a/mail/dovecot/DETAILS
+++ b/mail/dovecot/DETAILS
@@ -1,22 +1,26 @@
SPELL=dovecot
- VERSION=1.0.3
+ VERSION=1.0.7
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SOURCE.sig
SOURCE2_IGNORE=signature
- SOURCE_GPG="dovecot.gpg:${SOURCE2}"
+ SOURCE_GPG="dovecot.gpg:${SOURCE2}:UPSTREAM_KEY"
SOURCE_URL[0]=http://www.dovecot.org/releases/${VERSION%.*}/$SOURCE
SOURCE2_URL[0]=http://www.dovecot.org/releases/${VERSION%.*}/$SOURCE2
if [[ "$DOVECOT_EXT_LDA" == "y" ]]; then
- VERSION2=20070223
-
SOURCE3_HASH=sha512:2ccde6a1b8ec806431f91225e35667a1900332fea73db46d5bb1ee114e62c7dd740c356484e0358a21b1f422a0d8a0aa7e408f3b73098f4d6c128057ec17a113
+ VERSION2=1.0.2
SOURCE3=$SPELL-sieve-$VERSION2.tar.gz
- SOURCE3_URL[0]=http://dovecot.org/nightly/sieve/$SOURCE3
+ SOURCE4=$SPELL-sieve-$VERSION2.tar.gz.sig
+ SOURCE3_URL[0]=http://www.dovecot.org/releases/sieve/$SOURCE3
+ SOURCE4_URL[0]=http://www.dovecot.org/releases/sieve/$SOURCE4
+ SOURCE4_IGNORE=signature
+ SOURCE3_GPG="dovecot.gpg:${SOURCE4}:UPSTREAM_KEY"
if [[ "$DOVECOT_MANAGESIEVE" == "y" ]]; then
- VERSION3=1.0.3
- VERSION4=v6
-
SOURCE4_HASH=sha512:0fb4fd6385c57f59dbf9b9e49b20e57585b86b984af2473c11358e0f3a09dd76999797d48c2417a17107e4509b6a213deaaa5b162ab6c170999648bd67b9e666
- SOURCE4=$SPELL-$VERSION3-MANAGESIEVE-$VERSION4.diff.gz
- SOURCE4_URL[0]=http://sinas.rename-it.nl/~sirius/$SOURCE4
+ VERSION3=1.0.7
+ VERSION4=v8.3
+
SOURCE5_HASH=sha512:2910dab906ae841340c2059fea3356e80052722cb6e7deb888c24f29442b1842038e354ec913a9e587be5b503cb878773b551ed3fcfd04880c8fb8ffa7751016
+ PATCHLEVEL=2
+ SOURCE5=$SPELL-$VERSION3-MANAGESIEVE-$VERSION4.diff.gz
+ SOURCE5_URL[0]=http://sinas.rename-it.nl/~sirius/$SOURCE5
fi
fi
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/mail/dovecot/FINAL b/mail/dovecot/FINAL
index 1c9f9cc..9c377aa 100755
--- a/mail/dovecot/FINAL
+++ b/mail/dovecot/FINAL
@@ -1,5 +1,6 @@
message "${MESSAGE_COLOR}Use the following script to generate certificates
for IMAP and POP3:${DEFAULT_COLOR}"
message "${MESSAGE_COLOR}sudo $GRIMOIRE_DIR/http/httpd-dev/mksscert.sh
<imap|pop3>${DEFAULT_COLOR}"
+message "Or get a fully free certificate from http://www.cacert.org for
various purposes"

if [[ "$DOVECOT_MANAGESIEVE" == "y" ]]; then
message "${MESSAGE_COLOR}"
diff --git a/mail/dovecot/HISTORY b/mail/dovecot/HISTORY
index 36c1e60..47d47d5 100644
--- a/mail/dovecot/HISTORY
+++ b/mail/dovecot/HISTORY
@@ -1,3 +1,22 @@
+2007-11-04 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
+ * DETAILS: updatade managesive patch to 8.3, PATCHLEVEL++
+ users highly advised to upgrade
+
+2007-10-31 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
+ * DETAILS: updated patch to 1.0.7 v8
+
+2007-10-29 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
+ * DETAILS: updated spell to 1.0.7
+
+2007-10-28 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
+ * DETAILS: version update 1.0.6
+ * FINAL: adde a message to recommend using cacert certificates
+
+2007-10-10 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
+ * DETAILS: updated spell to 1.0.5
+ * INSTALL: minor update
+ * PRE_BUILD: fixup what source goes where
+
2007-09-07 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
* BUILD: always install dev headers

diff --git a/mail/dovecot/INSTALL b/mail/dovecot/INSTALL
index e8e0531..1dc560b 100755
--- a/mail/dovecot/INSTALL
+++ b/mail/dovecot/INSTALL
@@ -1,7 +1,7 @@
default_install &&
create_account dovecot &&
if [[ $DOVECOT_EXT_LDA == y ]]; then
-pushd dovecot-sieve-1.0.1 &&
+pushd dovecot-sieve-* &&
default_install &&
popd
fi
diff --git a/mail/dovecot/PRE_BUILD b/mail/dovecot/PRE_BUILD
index dc576b9..e02af6a 100755
--- a/mail/dovecot/PRE_BUILD
+++ b/mail/dovecot/PRE_BUILD
@@ -3,8 +3,8 @@ cd $SOURCE_DIRECTORY &&
if [[ "$DOVECOT_EXT_LDA" == "y" ]]; then
unpack_file 3 &&
if [[ "$DOVECOT_MANAGESIEVE" == "y" ]]; then
-verify_file 4 &&
-zcat $SOURCE_CACHE/$SOURCE4 | patch -p1 &&
+verify_file 5 &&
+zcat $SOURCE_CACHE/$SOURCE5 | patch -p1 &&
aclocal &&
automake --add-missing &&
autoreconf
diff --git a/mail/exim/BUILD b/mail/exim/BUILD
index 5de45fe..75dbecd 100755
--- a/mail/exim/BUILD
+++ b/mail/exim/BUILD
@@ -158,6 +158,11 @@ then
echo "SUPPORT_MOVE_FROZEN_MESSAGES=yes" >> Local/Makefile
fi &&

+if [[ "$EXIM_DEMIME" == "y" ]]
+then
+ echo "WITH_OLD_DEMIME=yes" >> Local/Makefile
+fi &&
+
echo "BIN_DIRECTORY=/usr/sbin" >> Local/Makefile &&
echo "CONFIGURE_FILE=/etc/exim.conf" >> Local/Makefile &&
echo "SPOOL_DIRECTORY=/var/spool/mail" >> Local/Makefile &&
diff --git a/mail/exim/CONFIGURE b/mail/exim/CONFIGURE
index 6ac9dca..a2d1eb5 100755
--- a/mail/exim/CONFIGURE
+++ b/mail/exim/CONFIGURE
@@ -9,6 +9,7 @@ config_query EXIM_MD5 "Enable cram/md5 authentication?"
n &&
config_query EXIM_PLAINTEXT "Enable plaintext authentication?" n
&&
config_query EXIM_SPA "Enable SPA authentication?" n
&&
config_query EXIM_FROZEN "Enable moving frozen messages?" n
&&
+config_query EXIM_DEMIME "Enable old demime support?" n
&&

if spell_ok hc-cron; then
config_query_list EXIM_CRON "Use which cron to resend undelivered mail?"
\
diff --git a/mail/exim/DETAILS b/mail/exim/DETAILS
index fadc0a1..75faa9c 100755
--- a/mail/exim/DETAILS
+++ b/mail/exim/DETAILS
@@ -1,5 +1,5 @@
SPELL=exim
- VERSION=4.67
+ VERSION=4.68
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE2=$SOURCE.sig
SOURCE_GPG="exim.gpg:$SOURCE2:VERIFIED_UPSTREAM_KEY"
@@ -9,34 +9,96 @@ if [[ "$EXIM_MIRRORS" == "austria" ]]; then
SOURCE_URL[0]=http://gd.tuwien.ac.at/infosys/mail/exim/exim/exim4/$SOURCE
SOURCE_URL[1]=ftp://gd.tuwien.ac.at/infosys/mail/exim/exim/exim4/$SOURCE
SOURCE_URL[2]=ftp://exim.inode.at/exim/exim4/$SOURCE
+ SOURCE_URL[3]=http://exim-ftp.itsoft.at/exim/exim4/$SOURCE
SOURCE2_URL[0]=http://gd.tuwien.ac.at/infosys/mail/exim/exim/exim4/$SOURCE2
SOURCE2_URL[1]=ftp://gd.tuwien.ac.at/infosys/mail/exim/exim/exim4/$SOURCE2
SOURCE2_URL[2]=ftp://exim.inode.at/exim/exim4/$SOURCE2
+ SOURCE2_URL[3]=http://exim-ftp.itsoft.at/exim/exim4/$SOURCE2
+elif [[ "$EXIM_MIRRORS" == "belgium" ]]; then
+ SOURCE_URL[0]=ftp://ftp.easynet.be/exim/exim4/$SOURCE
+ SOURCE2_URL[0]=ftp://ftp.easynet.be/exim/exim4/$SOURCE2
+elif [[ "$EXIM_MIRRORS" == "bolgaria" ]]; then
+ SOURCE_URL[0]=ftp://ftp.fixity.net/pub/exim/exim4/$SOURCE
+ SOURCE2_URL[0]=ftp://ftp.fixity.net/pub/exim/exim4/$SOURCE2
+elif [[ "$EXIM_MIRRORS" == "czech-republic" ]]; then
+ SOURCE_URL[0]=ftp://mirror.kn.vutbr.cz/pub/ftp.exim.org/exim4/$SOURCE
+ SOURCE2_URL[0]=ftp://mirror.kn.vutbr.cz/pub/ftp.exim.org/exim4/$SOURCE2
+elif [[ "$EXIM_MIRRORS" == "france" ]]; then
+ SOURCE_URL[0]=http://mirror.fr.claryss.net/ftp.exim.org/exim/exim4/$SOURCE
+ SOURCE_URL[1]=http://exim.feraudet.com/ftp/exim/exim4/$SOURCE
+ SOURCE_URL[2]=http://exim.mirror.fr/exim4/$SOURCE
+
SOURCE2_URL[0]=http://mirror.fr.claryss.net/ftp.exim.org/exim/exim4/$SOURCE2
+ SOURCE2_URL[1]=http://exim.feraudet.com/ftp/exim/exim4/$SOURCE2
+ SOURCE2_URL[2]=http://exim.mirror.fr/exim4/$SOURCE2
elif [[ "$EXIM_MIRRORS" == "germany" ]]; then

SOURCE_URL[0]=ftp://ftp.freenet.de/pub/ftp.csx.cam.ac.uk/pub/software/email/exim/exim4/$SOURCE
SOURCE_URL[1]=ftp://exim.noris.de/exim/exim4/$SOURCE
SOURCE_URL[2]=ftp://ftp.bytemine.net/exim/exim/exim4/$SOURCE
- SOURCE_URL[3]=ftp://ftp.tin.org/pub/mail/exim//exim4/$SOURCE
+ SOURCE_URL[3]=ftp://ftp.tin.org/pub/mail/exim/exim4/$SOURCE
+ SOURCE_URL[4]=http://dl.ambiweb.de/mirrors/ftp.exim.org/exim4/$SOURCE
+ SOURCE_URL[5]=ftp://ftp.cityline.net/pub/mirrors/exim/exim4/$SOURCE
+ SOURCE_URL[6]=ftp://exim.mirror.iphh.net/ftp/exim4/$SOURCE
+ SOURCE_URL[7]=http://exim.mirror.iphh.net/ftp/exim4/$SOURCE

SOURCE2_URL[0]=ftp://ftp.freenet.de/pub/ftp.csx.cam.ac.uk/pub/software/email/exim/exim4/$SOURCE2
SOURCE2_URL[1]=ftp://exim.noris.de/exim/exim4/$SOURCE2
SOURCE2_URL[2]=ftp://ftp.bytemine.net/exim/exim/exim4/$SOURCE2
- SOURCE2_URL[3]=ftp://ftp.tin.org/pub/mail/exim//exim4/$SOURCE2
+ SOURCE2_URL[3]=ftp://ftp.tin.org/pub/mail/exim/exim4/$SOURCE2
+ SOURCE2_URL[4]=http://dl.ambiweb.de/mirrors/ftp.exim.org/exim4/$SOURCE2
+ SOURCE2_URL[5]=ftp://ftp.cityline.net/pub/mirrors/exim/exim4/$SOURCE2
+ SOURCE2_URL[6]=ftp://exim.mirror.iphh.net/ftp/exim4/$SOURCE2
+ SOURCE2_URL[7]=http://exim.mirror.iphh.net/ftp/exim4/$SOURCE2
+elif [[ "$EXIM_MIRRORS" == "indonesia" ]]; then
+ SOURCE_URL[0]=ftp://mirror.cbn.net.id/pub/exim//exim4/$SOURCE
+ SOURCE2_URL[0]=ftp://mirror.cbn.net.id/pub/exim//exim4/$SOURCE2
+elif [[ "$EXIM_MIRRORS" == "ireland" ]]; then
+
SOURCE_URL[0]=ftp://ftp.esat.net/pub/networking/mail/mta/exim/exim4/$SOURCE
+
SOURCE_URL[1]=http://ftp.esat.net/pub/networking/mail/mta/exim/exim4/$SOURCE
+ SOURCE_URL[2]=ftp://ftp.heanet.ie/pub/exim/exim4/$SOURCE
+ SOURCE_URL[3]=http://ftp.heanet.ie/pub/exim/exim4/$SOURCE
+SOURCE2_URL[0]=ftp://ftp.esat.net/pub/networking/mail/mta/exim/exim4/$SOURCE2
+
SOURCE2_URL[1]=http://ftp.esat.net/pub/networking/mail/mta/exim/exim4/$SOURCE2
+ SOURCE2_URL[2]=ftp://ftp.heanet.ie/pub/exim/exim4/$SOURCE2
+ SOURCE2_URL[3]=http://ftp.heanet.ie/pub/exim/exim4/$SOURCE2
+elif [[ "$EXIM_MIRRORS" == "japan" ]]; then
+ SOURCE_URL[0]=http://washitake.com/mail/exim/mirror/exim/exim4/$SOURCE
+ SOURCE2_URL[0]=http://washitake.com/mail/exim/mirror/exim/exim4/$SOURCE2
elif [[ "$EXIM_MIRRORS" == "netherlands" ]]; then
SOURCE_URL[0]=http://ftp.easynet.nl/mirror/exim/exim/exim4/$SOURCE
SOURCE_URL[1]=ftp://ftp.eu.uu.net/pub/unix/mail/exim/exim/exim4/$SOURCE
SOURCE_URL[2]=ftp://ftp.demon.nl/pub/mirrors/exim//exim4/$SOURCE
SOURCE_URL[3]=ftp://ftp.easynet.nl/mirror/exim/exim/exim4/$SOURCE
+ SOURCE_URL[4]=ftp://mirror.hostfuss.com/exim/ftp/exim/exim4/$SOURCE
+ SOURCE_URL[5]=http://mirror.hostfuss.com/exim/ftp/exim/exim4/$SOURCE
+ SOURCE_URL[6]=ftp://ftp.osmirror.nl/pub/ftp/exim/exim4/$SOURCE
+ SOURCE_URL[7]=http://exim.sipo.nl/ftp/exim/exim4/$SOURCE
SOURCE2_URL[0]=http://ftp.easynet.nl/mirror/exim/exim/exim4/$SOURCE2
SOURCE2_URL[1]=ftp://ftp.eu.uu.net/pub/unix/mail/exim/exim/exim4/$SOURCE2
SOURCE2_URL[2]=ftp://ftp.demon.nl/pub/mirrors/exim//exim4/$SOURCE2
SOURCE2_URL[3]=ftp://ftp.easynet.nl/mirror/exim/exim/exim4/$SOURCE2
+ SOURCE2_URL[4]=ftp://mirror.hostfuss.com/exim/ftp/exim/exim4/$SOURCE2
+ SOURCE2_URL[5]=http://mirror.hostfuss.com/exim/ftp/exim/exim4/$SOURCE2
+ SOURCE2_URL[6]=ftp://ftp.osmirror.nl/pub/ftp/exim/exim4/$SOURCE2
+ SOURCE2_URL[7]=http://exim.sipo.nl/ftp/exim/exim4/$SOURCE2
+elif [[ "$EXIM_MIRRORS" == "norway" ]]; then
+ SOURCE_URL[0]=ftp://sunsite.uio.no/pub/mail/exim/exim/exim4/$SOURCE
+ SOURCE2_URL[0]=ftp://sunsite.uio.no/pub/mail/exim/exim/exim4/$SOURCE2
+elif [[ "$EXIM_MIRRORS" == "poland" ]]; then
+
SOURCE_URL[0]=ftp://sunsite.icm.edu.pl/pub/unix/mail/exim/exim/exim4/$SOURCE
+
SOURCE_URL[1]=http://sunsite.icm.edu.pl/pub/unix/mail/exim/exim/exim4/$SOURCE
+
SOURCE_URL[2]=http://piotrkosoft.net/pub/mirrors/ftp.exim.org/exim/exim4/$SOURCE
+
SOURCE_URL[3]=ftp://ftp.piotrkosoft.net/pub/mirrors/ftp.exim.org/exim/exim4/$SOURCE
+
SOURCE2_URL[0]=ftp://sunsite.icm.edu.pl/pub/unix/mail/exim/exim/exim4/$SOURCE2
+
SOURCE2_URL[1]=http://sunsite.icm.edu.pl/pub/unix/mail/exim/exim/exim4/$SOURCE2
+
SOURCE2_URL[2]=http://piotrkosoft.net/pub/mirrors/ftp.exim.org/exim/exim4/$SOURCE2
+
SOURCE2_URL[3]=ftp://ftp.piotrkosoft.net/pub/mirrors/ftp.exim.org/exim/exim4/$SOURCE2
+elif [[ "$EXIM_MIRRORS" == "south-africa" ]]; then
+ SOURCE_URL[0]=ftp://ftp.is.co.za/pub/mta/exim/ftp/exim/exim4/$SOURCE
+ SOURCE2_URL[0]=ftp://ftp.is.co.za/pub/mta/exim/ftp/exim/exim4/$SOURCE2
elif [[ "$EXIM_MIRRORS" == "switzerland" ]]; then
SOURCE_URL[0]=ftp://mirror.switch.ch/mirror/exim/exim/exim4/$SOURCE
SOURCE_URL[1]=http://mirror.switch.ch/ftp/mirror/exim/exim/exim4/$SOURCE
- SOURCE_URL[2]=ftp://exim.zic-network.ch/exim/exim/exim4/$SOURCE
SOURCE2_URL[0]=ftp://mirror.switch.ch/mirror/exim/exim/exim4/$SOURCE2
SOURCE2_URL[1]=http://mirror.switch.ch/ftp/mirror/exim/exim/exim4/$SOURCE2
- SOURCE2_URL[2]=ftp://exim.zic-network.ch/exim/exim/exim4/$SOURCE2
elif [[ "$EXIM_MIRRORS" == "united-kingdom" ]]; then
SOURCE_URL[0]=ftp://ftp.exim.org/pub/exim/exim4/$SOURCE

SOURCE_URL[1]=ftp://ftp.mirrorservice.org/sites/ftp.csx.cam.ac.uk/pub/software/email/exim/exim4/$SOURCE
@@ -47,62 +109,21 @@ elif [[ "$EXIM_MIRRORS" == "united-kingdom" ]]; then

SOURCE2_URL[2]=http://www.mirrorservice.org/sites/ftp.csx.cam.ac.uk/pub/software/email/exim/exim4/$SOURCE2
SOURCE2_URL[3]=ftp://ftp.demon.co.uk/pub/mirrors/exim/exim4/$SOURCE2
elif [[ "$EXIM_MIRRORS" == "united-states" ]]; then
- SOURCE_URL[0]=ftp://ftp.gr-linux.com/pub/exim/exim/exim4/$SOURCE
- SOURCE_URL[1]=http://www.mirrormonster.com/exim/exim4/$SOURCE
- SOURCE_URL[2]=ftp://ftp.fsckit.net/pub/exim/exim4/$SOURCE
- SOURCE2_URL[0]=ftp://ftp.gr-linux.com/pub/exim/exim/exim4/$SOURCE2
- SOURCE2_URL[1]=http://www.mirrormonster.com/exim/exim4/$SOURCE2
- SOURCE2_URL[2]=ftp://ftp.fsckit.net/pub/exim/exim4/$SOURCE2
-elif [[ "$EXIM_MIRRORS" == "ireland" ]]; then
-
SOURCE_URL[0]=ftp://ftp.esat.net/pub/networking/mail/mta/exim/exim4/$SOURCE
-
SOURCE_URL[1]=http://ftp.esat.net/pub/networking/mail/mta/exim/exim4/$SOURCE
-
SOURCE2_URL[0]=ftp://ftp.esat.net/pub/networking/mail/mta/exim/exim4/$SOURCE2
-
SOURCE2_URL[1]=http://ftp.esat.net/pub/networking/mail/mta/exim/exim4/$SOURCE2
-elif [[ "$EXIM_MIRRORS" == "japan" ]]; then
- SOURCE_URL[0]=http://washitake.com/mail/exim/mirror/exim/exim4/$SOURCE
- SOURCE2_URL[0]=http://washitake.com/mail/exim/mirror/exim/exim4/$SOURCE2
-elif [[ "$EXIM_MIRRORS" == "norway" ]]; then
- SOURCE_URL[0]=ftp://sunsite.uio.no/pub/mail/exim/exim/exim4/$SOURCE
- SOURCE2_URL[0]=ftp://sunsite.uio.no/pub/mail/exim/exim/exim4/$SOURCE2
-elif [[ "$EXIM_MIRRORS" == "poland" ]]; then
-
SOURCE_URL[0]=ftp://sunsite.icm.edu.pl/pub/unix/mail/exim/exim/exim4/$SOURCE
-
SOURCE_URL[1]=http://sunsite.icm.edu.pl/pub/unix/mail/exim/exim/exim4/$SOURCE
-
SOURCE2_URL[0]=ftp://sunsite.icm.edu.pl/pub/unix/mail/exim/exim/exim4/$SOURCE2
-
SOURCE2_URL[1]=http://sunsite.icm.edu.pl/pub/unix/mail/exim/exim/exim4/$SOURCE2
-elif [[ "$EXIM_MIRRORS" == "south-africa" ]]; then
-
SOURCE_URL[0]=ftp://ftp.is.co.za/networking/mail/transport/exim/exim4/$SOURCE
-
SOURCE2_URL[0]=ftp://ftp.is.co.za/networking/mail/transport/exim/exim4/$SOURCE2
-elif [[ "$EXIM_MIRRORS" == "belgium" ]]; then
- SOURCE_URL[0]=ftp://ftp.easynet.be/exim/exim/exim4/$SOURCE
- SOURCE2_URL[0]=ftp://ftp.easynet.be/exim/exim/exim4/$SOURCE2
-elif [[ "$EXIM_MIRRORS" == "canada" ]]; then
- SOURCE_URL[0]=ftp://mirror.direct.ca/pub/exim/exim/exim4/$SOURCE
- SOURCE_URL[1]=http://exim-ftp.meulie.net/exim//exim4/$SOURCE
- SOURCE2_URL[0]=ftp://mirror.direct.ca/pub/exim/exim/exim4/$SOURCE2
- SOURCE2_URL[1]=http://exim-ftp.meulie.net/exim//exim4/$SOURCE2
-elif [[ "$EXIM_MIRRORS" == "czech-republic" ]]; then
- SOURCE_URL[0]=ftp://mirror.kn.vutbr.cz/pub/ftp.exim.org/exim/exim4/$SOURCE
-
SOURCE2_URL[0]=ftp://mirror.kn.vutbr.cz/pub/ftp.exim.org/exim/exim4/$SOURCE2
-elif [[ "$EXIM_MIRRORS" == "denmark" ]]; then
- SOURCE_URL[0]=ftp://sunsite.auc.dk/pub/mail/exim/exim/exim4/$SOURCE
- SOURCE_URL[1]=http://ftp.sunsite.dk/pub/mail/exim/exim//exim4/$SOURCE
- SOURCE2_URL[0]=ftp://sunsite.auc.dk/pub/mail/exim/exim/exim4/$SOURCE2
- SOURCE2_URL[1]=http://ftp.sunsite.dk/pub/mail/exim/exim//exim4/$SOURCE2
-elif [[ "$EXIM_MIRRORS" == "france" ]]; then
- SOURCE_URL[0]=http://exim.mirror.fr//exim4/$SOURCE
- SOURCE_URL[1]=http://mirror.fr.claryss.net/ftp.exim.org/exim/exim4/$SOURCE
- SOURCE2_URL[0]=http://exim.mirror.fr//exim4/$SOURCE2
-
SOURCE2_URL[1]=http://mirror.fr.claryss.net/ftp.exim.org/exim/exim4/$SOURCE2
-elif [[ "$EXIM_MIRRORS" == "indonesia" ]]; then
- SOURCE_URL[0]=ftp://mirror.cbn.net.id/pub/exim//exim4/$SOURCE
- SOURCE2_URL[0]=ftp://mirror.cbn.net.id/pub/exim//exim4/$SOURCE2
-else # "united-states" list
- SOURCE_URL[0]=ftp://ftp.gr-linux.com/pub/exim/exim/exim4/$SOURCE
- SOURCE_URL[1]=http://www.mirrormonster.com/exim/exim4/$SOURCE
- SOURCE_URL[2]=ftp://ftp.fsckit.net/pub/exim/exim4/$SOURCE
- SOURCE2_URL[0]=ftp://ftp.gr-linux.com/pub/exim/exim/exim4/$SOURCE2
- SOURCE2_URL[1]=http://www.mirrormonster.com/exim/exim4/$SOURCE2
- SOURCE2_URL[2]=ftp://ftp.fsckit.net/pub/exim/exim4/$SOURCE2
+ SOURCE_URL[0]=http://mirrors.fourbatons.com/exim/ftp/exim/exim4/$SOURCE
+ SOURCE_URL[1]=http://mirrors.wikifusion.info/exim/exim/exim4/$SOURCE
+
SOURCE_URL[2]=ftp://mirrors.24-7-solutions.net/pub/exim/ftp/exim/exim4/$SOURCE
+
SOURCE_URL[3]=http://mirrors.24-7-solutions.net/pub/exim/ftp/exim/exim4/$SOURCE
+ SOURCE_URL[4]=http://exim.site2nd.org/exim/exim/exim4/$SOURCE
+ SOURCE2_URL[0]=http://mirrors.fourbatons.com/exim/ftp/exim/exim4/$SOURCE2
+ SOURCE2_URL[1]=http://mirrors.wikifusion.info/exim/exim/exim4/$SOURCE2
+
SOURCE2_URL[2]=ftp://mirrors.24-7-solutions.net/pub/exim/ftp/exim/exim4/$SOURCE2
+
SOURCE2_URL[3]=http://mirrors.24-7-solutions.net/pub/exim/ftp/exim/exim4/$SOURCE2
+ SOURCE2_URL[4]=http://exim.site2nd.org/exim/exim/exim4/$SOURCE2
+else # use primary site as primary fallback
+ SOURCE_URL[0]=ftp://ftp.exim.org/pub/exim/exim4/$SOURCE
+ SOURCE_URL[1]=http://gd.tuwien.ac.at/infosys/mail/exim/exim/exim4/$SOURCE
+ SOURCE2_URL[0]=ftp://ftp.exim.org/pub/exim/exim4/$SOURCE2
+ SOURCE2_URL[1]=http://gd.tuwien.ac.at/infosys/mail/exim/exim/exim4/$SOURCE2
fi
LICENSE[0]=GPL
WEB_SITE=http://www.exim.org/
diff --git a/mail/exim/HISTORY b/mail/exim/HISTORY
index 1666aba..5495b45 100644
--- a/mail/exim/HISTORY
+++ b/mail/exim/HISTORY
@@ -1,3 +1,13 @@
+2007-10-28 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
+ * BUILD: added support for demime
+ * CONFIGURE: added support for demime
+
+2007-10-09 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
+ * DETAILS: updated spell to 4.68
+ reworked the mirrors keep them alphabetical please in
+ DETAILS as well
+ * PREPARE: pruned the mirror list and added som efresh ones
+
2007-08-01 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
* PREPARE: use list as that's what the mirror system is setup
for logicaly. Multi option makes no sense here.
diff --git a/mail/exim/PREPARE b/mail/exim/PREPARE
index 271e4d7..53236de 100755
--- a/mail/exim/PREPARE
+++ b/mail/exim/PREPARE
@@ -2,9 +2,8 @@ config_query_list EXIM_MIRRORS
\
"Which group of exim mirrors would you like to use?" \
"austria" \
"belgium" \
- "canada" \
+ "bolgaria" \
"czech-republic" \
- "denmark" \
"france" \
"germany" \
"indonesia" \
diff --git a/mail/postfix/DETAILS b/mail/postfix/DETAILS
index 86e7106..9d33749 100755
--- a/mail/postfix/DETAILS
+++ b/mail/postfix/DETAILS
@@ -1,5 +1,5 @@
SPELL=postfix
- VERSION=2.4.3
+ VERSION=2.4.5
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SPELL-$VERSION.tar.gz.sig
SOURCE2_IGNORE=signature
@@ -48,19 +48,18 @@
#
# VDA patch
#
- VERSION3=2.4.3-vda
+ VERSION3=2.4.5-vda
NAME3=$SPELL-$VERSION3-ng.patch
SOURCE3=$NAME3.gz
SOURCE3_DIRECTORY=$SOURCE_DIRECTORY
SOURCE3_URL[0]=http://vda.sourceforge.net/VDA/$SOURCE3
-
SOURCE3_HASH=sha512:349ac813ee815d1fba926057c098c142ea7964a773847024c9eb689113c09bedb2b628bafefe293bbc2d78f3a02b6bc0d1ef0a3bb9e3530d5629eed2b446f5f0
+
SOURCE3_HASH=sha512:e48c949bd8e66b01091122ffee5d00fc0eb629d34248e328b890e5157dd7719737c646d3c67068433dced8d4c5c7d43a2663c6f0618f50c974847185667c8e47

#
# Postfix main site
#
WEB_SITE=http://www.postfix.org/
ENTERED=20020125
- UPDATED=20051230
DOCS="$DOCS README_FILES RELEASE_NOTES* html examples auxiliary"
LICENSE[0]=IBMPL
SHORT="Postfix is a MTA"
diff --git a/mail/postfix/HISTORY b/mail/postfix/HISTORY
index cbf3675..b4b747a 100644
--- a/mail/postfix/HISTORY
+++ b/mail/postfix/HISTORY
@@ -1,3 +1,6 @@
+2007-10-10 Elisamuel Resto <ryuji AT mages.ath.cx>
+ * DETAILS: updated to 2.4.5 (VDA-ng 2.4.5)
+
2007-06-23 David Kowis <dkowis AT shlrm.org>
* DETAILS: version bumped to 2.4.3 VDA to 2.4.3 next generation
https://overlays.gentoo.org/dev/chtekk/wiki/VDA-NG/
diff --git a/mail/sylpheed/DETAILS b/mail/sylpheed/DETAILS
index 9ddc364..ca6d955 100755
--- a/mail/sylpheed/DETAILS
+++ b/mail/sylpheed/DETAILS
@@ -3,8 +3,8 @@ if [ "$SYLPHEED_GTK2" == "n" ]; then
VERSION=1.0.5

SOURCE_HASH=sha512:060b9ad6f829edaef8dd67c05237fd73bb24216daedc668e5e442b280730b205b64d8efe56e0f215bd7716a30734cfc6e8fd53252de1220b74c3f3d0d8eb5622
else
- VERSION=2.4.6
-
SOURCE_HASH=sha512:0d6703fa1f81d0f18f9dbf8f9b5ccd55e8fcb6379754558e242055bdc42ecb0b5fcc3dd8a3608b29611ecb4900337edd246209ba733810fd21c902a022e33140
+ VERSION=2.4.7
+
SOURCE_HASH=sha512:b1a574d08b97a7735b4569d221eaf46b511b6c05eb9ceb8c55a67a0c7ae1821f87f958ef6eff5e834c6ed46054d4149558abdb46e497d3485d1d0c5bde9d042c
SECURITY_PATCH=1
fi
SOURCE=$SPELL-$VERSION.tar.bz2
diff --git a/mail/sylpheed/HISTORY b/mail/sylpheed/HISTORY
index 7dd64aa..0f8bb35 100644
--- a/mail/sylpheed/HISTORY
+++ b/mail/sylpheed/HISTORY
@@ -1,3 +1,6 @@
+2007-10-04 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 2.4.7
+
2007-09-19 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 2.4.6

diff --git a/mail/thunderbird/DEPENDS b/mail/thunderbird/DEPENDS
index edb300e..e9559ec 100755
--- a/mail/thunderbird/DEPENDS
+++ b/mail/thunderbird/DEPENDS
@@ -10,7 +10,6 @@ depends perl
&&
depends zip
&&
depends gtk+2
\
'--enable-xft --disable-freetype2 --enable-default-toolkit=gtk2'
&&
-depends gnome-panel
&&
#
# LDAP support doesn't work (fails to build)
#
diff --git a/mail/thunderbird/DETAILS b/mail/thunderbird/DETAILS
index 6224983..670089d 100755
--- a/mail/thunderbird/DETAILS
+++ b/mail/thunderbird/DETAILS
@@ -1,5 +1,5 @@
SPELL=thunderbird
- VERSION=2.0.0.6
+ VERSION=2.0.0.9
SOURCE=$SPELL-$VERSION-source.tar.bz2
SOURCE2=$SOURCE.asc
SOURCE_GPG="mozilla.gpg:$SOURCE2:UPSTREAM_KEY"
@@ -7,19 +7,19 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/mozilla

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

SOURCE2_URL[0]=http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/$VERSION/source/$SOURCE2
if [ "$BUILD_ENIGMAIL" = "y" ]; then
-ENIGMAIL_VERSION=0.95.3
- PATCHLEVEL=1
+ENIGMAIL_VERSION=0.95.5
+ PATCHLEVEL=0
SOURCE3=enigmail-$ENIGMAIL_VERSION.tar.gz
- SOURCE4=${SOURCE3}.gpg
+ SOURCE4=${SOURCE3}.sig
SOURCE4_IGNORE=signature
SOURCE3_GPG="enigmail.gpg:$SOURCE4:UPSTREAM_KEY"
SOURCE3_URL[0]=http://www.mozilla-enigmail.org/downloads/src/$SOURCE3
- SOURCE4_URL[0]=${SOURCE3_URL}.gpg
+ SOURCE4_URL[0]=${SOURCE3_URL}.sig
LICENSE[1]=MPL
LICENSE[2]=MPL
fi
- SECURITY_PATCH=9
- PATCHLEVEL=1
+ SECURITY_PATCH=10
+ PATCHLEVEL=0
WEB_SITE=http://www.mozilla.org/products/thunderbird/
ENTERED=20041028
LICENSE[0]=MOZILLA
diff --git a/mail/thunderbird/HISTORY b/mail/thunderbird/HISTORY
index 39a9209..fa43cce 100644
--- a/mail/thunderbird/HISTORY
+++ b/mail/thunderbird/HISTORY
@@ -1,3 +1,18 @@
+2007-11-14 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 2.0.0.9, SECURITY_PATCH=10
+ * mozilla.gpg: updated "Mozilla Software Releases" key
+ thunderbird-2.0.0.9-source is signed by 17785FE8 [expires:
2009-07-16]
+
+2007-11-13 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: ENIGMAIL 0.95.5
+
+2007-10-31 David Kowis <dkowis AT shlrm.org>
+ * DEPENDS: DOES NOT DEPEND ON gnome-panel
+ I just built it. I promise.
+
+2007-10-23 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: ENIGMAIL 0.95.4, signature gpg -> sig
+
2007-08-24 Arjan Bouter <abouter AT sourcemage.org>
* DETAILS: patchlevel++
* DEPENDS: added gnome-panel
diff --git a/mail/thunderbird/mozilla.gpg b/mail/thunderbird/mozilla.gpg
index 948df06..adb886e 100644
Binary files a/mail/thunderbird/mozilla.gpg and
b/mail/thunderbird/mozilla.gpg differ
diff --git a/mobile/acpi-support/BUILD b/mobile/acpi-support/BUILD
new file mode 100755
index 0000000..8f58e6d
--- /dev/null
+++ b/mobile/acpi-support/BUILD
@@ -0,0 +1 @@
+make
diff --git a/mobile/acpi-support/DEPENDS b/mobile/acpi-support/DEPENDS
new file mode 100755
index 0000000..be62b19
--- /dev/null
+++ b/mobile/acpi-support/DEPENDS
@@ -0,0 +1,11 @@
+depends acpid &&
+depends dmidecode &&
+depends bsd-finger &&
+depends hdparm &&
+depends laptop-detect &&
+depends vbetool &&
+depends powermgmt-base &&
+optional_depends radeontool \
+ "" "" "For radeon support" &&
+optional_depends laptop-mode-tools \
+ "" "" "For laptop mode tools support"
diff --git a/mobile/acpi-support/DETAILS b/mobile/acpi-support/DETAILS
new file mode 100755
index 0000000..9993854
--- /dev/null
+++ b/mobile/acpi-support/DETAILS
@@ -0,0 +1,25 @@
+ SPELL=acpi-support
+ VERSION=0.103
+ SOURCE=${SPELL}_$VERSION.orig.tar.gz
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELL}-0.102
+
SOURCE_URL[0]=http://ftp.debian.org/debian/pool/main/a/acpi-support/$SOURCE
+
SOURCE_HASH=sha512:01c8f16da1c663510c21db862d5a9fbd7275966f03122f61a2a440514b83598cb960809a64c0f5c7a42877c89a98e480250314e98e471ab3e866fade08305674
+ PATCHLEVEL=1
+ LICENSE[0]=GPL
+ WEB_SITE=http://packages.qa.debian.org/a/acpi-support.html
+ ENTERED=20071015
+ SHORT="acpi-support include scripts for handling many ACPI events"
+cat << EOF
+acpi-support contains scripts to react to various ACPI events.
+It only includes scripts for events that can be supported with
+some level of safety cross platform.
+
+It is able to:
+
+ * Detect loss and gain of AC power, lid closure, and the press of a
+ number of specific buttons (on Asus, IBM, Lenovo, Panasonic, Sony
+ and Toshiba laptops).
+ * Suspend, hibernate and resume the computer, with workarounds for
+ hardware that needs it.
+ * On some laptops, set screen brightness.
+ EOF
diff --git a/mobile/acpi-support/HISTORY b/mobile/acpi-support/HISTORY
new file mode 100644
index 0000000..b196468
--- /dev/null
+++ b/mobile/acpi-support/HISTORY
@@ -0,0 +1,25 @@
+2007-10-17 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: Set PATCHLEVEL=1
+ Change LICENSE -> LICENSE[0]
+ * init.d/{acpi-support,vbesave}: Remove force-reload, for some reason
+ it's broken here and gives "not a valid identifier" when the script
+ is run on startup
+
+2007-10-17 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
+ * DEPENDS: fixup optional_depends and added radeontool
+
+2007-10-15 Javier Vasquez <jevv.cr AT gmail.com>
+ * DETAILS: Updating to ver 0.103-1
+ * acpi-support_0.103-1.diff: added patch
+ * acpi-support_0.103-1__add.diff: added patch
+ * DEPENDS: And also removing LSB dependency...
+
+2007-09-16 Javier Vasquez <jevv.cr AT gmail.com>
+ * DEPENDS, PRE_BUILD, BUILD, INSTALL, DETAILS,
+ init.d/acpi-support, init.d/vbesave,
+ acpi-support_0.95-2.diff,
+ acpi-support_0.95-2__lid_sh.patch,
+ HISTORY:
+ created this spell, ver. 0.95, +patch => 0.95-2,
+ + lid.sh path => radeontool called even on console
+
diff --git a/mobile/acpi-support/INSTALL b/mobile/acpi-support/INSTALL
new file mode 100755
index 0000000..d447a5e
--- /dev/null
+++ b/mobile/acpi-support/INSTALL
@@ -0,0 +1,42 @@
+cd $SOURCE_DIRECTORY &&
+#install -d -m 755 ${INSTALL_ROOT}/usr/share/acpi-support &&
+if [[ -e ${INSTALL_ROOT}/usr/share/acpi-support ]]; then
+ rm -rf ${INSTALL_ROOT}/usr/share/acpi-support
+fi &&
+cp -v -r lib ${INSTALL_ROOT}/usr/share/acpi-support &&
+chmod -v 755 ${INSTALL_ROOT}/usr/share/acpi-support &&
+chmod -v 644 ${INSTALL_ROOT}/usr/share/acpi-support/* &&
+install -v -d -m 755 ${INSTALL_ROOT}/etc/acpi/suspend.d &&
+install -v -d -m 755 ${INSTALL_ROOT}/etc/acpi/resume.d &&
+install -v -d -m 755 ${INSTALL_ROOT}/etc/acpi/start.d &&
+install -v -d -m 755 ${INSTALL_ROOT}/etc/acpi/ac.d &&
+install -v -d -m 755 ${INSTALL_ROOT}/etc/acpi/battery.d &&
+install -v -d -m 755 ${INSTALL_ROOT}/var/lib/acpi-support &&
+#for file in `ls lib/* | sed 's/\([^ ]\)[ ]/\1\\ /g'` ;
+#do
+# install -m 644 $file ${INSTALL_ROOT}/usr/share/acpi-support
+#done &&
+for file in events/* ;
+do
+install -v -m 644 $file ${INSTALL_ROOT}/etc/acpi/events
+done &&
+for file in suspend.d/* ;
+do
+install -v -m 755 $file ${INSTALL_ROOT}/etc/acpi/suspend.d
+done &&
+for file in resume.d/* ;
+do
+install -v -m 755 $file ${INSTALL_ROOT}/etc/acpi/resume.d
+done &&
+for file in start.d/* ;
+do
+install -v -m 755 $file ${INSTALL_ROOT}/etc/acpi/start.d
+done &&
+for file in *.sh ;
+do
+install -v -m 755 $file ${INSTALL_ROOT}/etc/acpi
+done &&
+install -v -m 644 acpi-support ${INSTALL_ROOT}/etc/default &&
+install -v -m 644 thinkpad_acpi.modprobe ${INSTALL_ROOT}/etc/modprobe.d &&
+install -v -m 755 acpi_fakekey ${INSTALL_ROOT}/usr/bin &&
+install -v -m 644 key-constants ${INSTALL_ROOT}/usr/share/acpi-support
diff --git a/mobile/acpi-support/PRE_BUILD b/mobile/acpi-support/PRE_BUILD
new file mode 100755
index 0000000..b758189
--- /dev/null
+++ b/mobile/acpi-support/PRE_BUILD
@@ -0,0 +1,13 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+patch -p1 < "$SCRIPT_DIRECTORY/acpi-support_0.103-1.diff" &&
+patch -p1 < "$SCRIPT_DIRECTORY/acpi-support_0.103-1__add.diff" &&
+rm -f resume.d/13-915-resolution-set.sh &&
+rm -f suspend.d/80-video-pci-state.sh &&
+rm -f resume.d/13-855-resolution-set.sh &&
+rm -f resume.d/49-855-resolution-set.sh &&
+rm -f toshiba_acpi.modprobe README.toshiba &&
+rm -f acpi-support_0.90-2.diff.gz &&
+cd resume.d &&
+ln -sf 49-915-resolution-set.sh 13-915-resolution-set.sh &&
+cd ..
diff --git a/mobile/acpi-support/acpi-support_0.103-1.diff
b/mobile/acpi-support/acpi-support_0.103-1.diff
new file mode 100644
index 0000000..060ee33
--- /dev/null
+++ b/mobile/acpi-support/acpi-support_0.103-1.diff
@@ -0,0 +1,3085 @@
+--- acpi-support-0.103.orig/toshbright.sh
++++ acpi-support-0.103/toshbright.sh
+@@ -1,5 +1,7 @@
+ #!/bin/sh
+
++test -f /usr/share/acpi-support/power-funcs || exit 0
++
+ BRIGHTNESS=$(( `grep brightness: /proc/acpi/toshiba/lcd | cut -d: -f2` + 0
))
+ MAXBRIGHT=$(( `grep brightness_levels: /proc/acpi/toshiba/lcd | cut -d:
-f2` - 1 ))
+
+--- acpi-support-0.103.orig/acpi-support
++++ acpi-support-0.103/acpi-support
+@@ -64,9 +64,15 @@
+ # machines
+ RESTART_IRDA=false
+
+-# Switch to laptop-mode on battery power - off by default as it causes odd
+-# hangs on some machines
+-ENABLE_LAPTOP_MODE=false
++# Add to this list network interfaces that you don't want to be stopped
++# during suspend (in fact any network interface whose name starts with
++# a prefix given in this list is skipped)
++SKIP_INTERFACES="dummy qemu"
+
+-# Spindown time on battery
+-SPINDOWN_TIME=12
+\ No newline at end of file
++# Note: to enable "laptop mode" (to spin down your hard drive for longer
++# periods of time), install the laptop-mode-tools package and configure
++# it in /etc/laptop-mode/laptop-mode.conf.
++#
++# (Note to upgraders: earlier versions of the acpi-support package
contained
++# an option to enable/disable laptop mode. This option has never actually
++# worked, and for that reason it has been removed.)
+--- acpi-support-0.103.orig/acpi_fakekey.c
++++ acpi-support-0.103/acpi_fakekey.c
+@@ -19,15 +19,14 @@
+ fd = open(filename, O_RDWR);
+ ioctl(fd, EVIOCGBIT(EV_KEY, sizeof(key_bitmask)),
key_bitmask);
+
+- for (j = 0; j < BTN_MISC; j++) {
++ /* We assume that anything that has an alphabetic key in the
++ QWERTYUIOP range in it is the main keyboard. */
++ for (j = KEY_Q; j <= KEY_P; j++) {
+ if (TestBit(j, key_bitmask))
+- break;
++ return fd;
+ }
+
+- if (j < BTN_MISC) {
+- return fd;
+- }
+- close (fd);
++ close (fd);
+ }
+ return 0;
+ }
+--- acpi-support-0.103.orig/asus-touchpad.sh
++++ acpi-support-0.103/asus-touchpad.sh
+@@ -1,7 +1,9 @@
+ #!/bin/sh
+
++test -f /usr/share/acpi-support/power-funcs || exit 0
++
+ # get the current state of the touchpad
+-TPSTATUS=`synclient -l | grep TouchpadOff | awk '{print $3}'`
++TPSTATUS=`synclient -l | awk '/TouchpadOff/ {print $3}'`
+
+ # if getting the status failed, exit
+ test -z $TPSTATUS && exit 1
+--- acpi-support-0.103.orig/suspend.d/50-time.sh
++++ acpi-support-0.103/suspend.d/50-time.sh
+@@ -0,0 +1,4 @@
++#!/bin/sh
++
++# Save the time to the hardware clock
++invoke-rc.d hwclock.sh stop
+--- acpi-support-0.103.orig/suspend.d/81-video-pci-state.sh
++++ acpi-support-0.103/suspend.d/81-video-pci-state.sh
+@@ -0,0 +1,11 @@
++#!/bin/sh
++
++# Save video PCI state?
++if [ x$SAVE_VIDEO_PCI_STATE = xtrue ]; then
++ for x in /sys/bus/pci/devices/*; do
++ if [ `cat $x/class` = "0x030000" ]; then
++ cat $x/config >/var/run/vga-pci-`basename $x`;
++ fi
++ done
++fi
++
+--- acpi-support-0.103.orig/suspend.d/80-video-vesa-state.sh
++++ acpi-support-0.103/suspend.d/80-video-vesa-state.sh
+@@ -3,10 +3,14 @@
+ if [ x$SAVE_VBE_STATE = "xtrue" ]; then
+ # Check if we're in a VESA mode - if so, we need to do things more
+ # awkwardly. Otherwise, just use the state from boot.
+- VBEMODE=`vbetool vbemode get`;
+- if [ $VBEMODE != "3" ]; then
+- vbetool vbemode set 3;
+- vbetool vbestate save >$VBESTATE;
++ VBEMODE=$(vbetool vbemode get || echo FAILED);
++ if ( echo "$VBEMODE" | grep -q FAILED ); then
++ echo "vbetool returned an error while requesting the vbe mode."
++ else
++ if [ "$VBEMODE" != "3" ]; then
++ vbetool vbemode set 3;
++ vbetool vbestate save >$VBESTATE;
++ fi
+ fi
+ fi
+
+--- acpi-support-0.103.orig/suspend.d/55-down-interfaces.sh
++++ acpi-support-0.103/suspend.d/55-down-interfaces.sh
+@@ -5,12 +5,38 @@
+ # Get rid of any currently running dhclients
+ killall dhclient dhclient3 2>/dev/null
+
+-# Find the currently running network interfaces...
++# First do all network interfaces that were brought up by ifupdown. These
are
++# the only interfaces that we bring up on resume (the other ones are
probably
++# managed by other tools, such as NetworkManager, and will be brought up
++# automatically).
++IFUP_INTERFACES="`cat /etc/network/run/ifstate | sed 's/=.*//'`"
++
++must_control_interface()
++{
++ # Always skip lo
++ test "$1" = "lo" && return 1
++ for i in $SKIP_INTERFACES; do
++ # Skip if listed in $SKIP_INTERFACES
++ echo "$1" | grep -q "^$i" && return 1
++ done
++ return 0
++}
++
++
++# Shut down the interfaces (except lo, which can and should be kept up)
++for x in $IFUP_INTERFACES; do
++ if must_control_interface $x ; then
++ ifdown $x
++ fi
++done
++
++# Find the remaining running network interfaces...
+ INTERFACES=`/sbin/ifconfig | awk '/^[^ ]+/ {print $1}'`
+
+-# And shut them down
++# And shut them down (except lo, which can and should be kept up)
+ for x in $INTERFACES; do
+- ifdown $x;
+- ifconfig $x down;
++ if must_control_interface $x ; then
++ ifconfig $x down
++ fi
+ done
+
+--- acpi-support-0.103.orig/suspend.d/10-thinkpad-standby-led.sh
++++ acpi-support-0.103/suspend.d/10-thinkpad-standby-led.sh
+@@ -1,3 +1,4 @@
+ #!/bin/sh
++
+ . /usr/share/acpi-support/state-funcs
+ setLEDThinkpadSuspending 1
+--- acpi-support-0.103.orig/suspend.d/90-framebuffer-stop.sh
++++ acpi-support-0.103/suspend.d/90-framebuffer-stop.sh
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/bin/sh
+
+ # Make sure the backlight goes off
+ if [ x$USE_DPMS = "xtrue" ]; then
+--- acpi-support-0.103.orig/ibm-wireless.sh
++++ acpi-support-0.103/ibm-wireless.sh
+@@ -1,4 +1,7 @@
+ #!/bin/sh
++
++test -f /usr/share/acpi-support/power-funcs || exit 0
++
+ # Find and toggle wireless of bluetooth devices on ThinkPads
+
+ . /usr/share/acpi-support/state-funcs
+--- acpi-support-0.103.orig/volupbtn.sh
++++ acpi-support-0.103/volupbtn.sh
+@@ -1,3 +1,6 @@
+-#!/bin/bash
++#!/bin/sh
++
++test -f /usr/share/acpi-support/power-funcs || exit 0
++
+ . /usr/share/acpi-support/key-constants
+ acpi_fakekey $KEY_VOLUMEUP
+--- acpi-support-0.103.orig/resume.sh
++++ acpi-support-0.103/resume.sh
+@@ -1,8 +1,10 @@
+-#!/bin/bash
++#!/bin/sh
++
++test -f /usr/share/acpi-support/state-funcs || exit 0
+
+ # Source from /etc/acpi/resume.d/
+ for SCRIPT in /etc/acpi/resume.d/*.sh; do
+ if [ -x $SCRIPT ]; then
+ . $SCRIPT
+ fi
+-done
+\ No newline at end of file
++done
+--- acpi-support-0.103.orig/hibernatebtn.sh
++++ acpi-support-0.103/hibernatebtn.sh
+@@ -1,3 +1,6 @@
+-#!/bin/bash
++#!/bin/sh
++
++test -f /usr/share/acpi-support/power-funcs || exit 0
++
+ . /usr/share/acpi-support/key-constants
+ acpi_fakekey $KEY_SUSPEND
+--- acpi-support-0.103.orig/wireless.sh
++++ acpi-support-0.103/wireless.sh
+@@ -3,4 +3,4 @@
+
+ . /usr/share/acpi-support/state-funcs
+
+-toggleWirelessStates;
++toggleAllWirelessStates;
+--- acpi-support-0.103.orig/hibernate.sh
++++ acpi-support-0.103/hibernate.sh
+@@ -1,4 +1,6 @@
+-#!/bin/bash
++#!/bin/sh
++
++test -f /usr/share/acpi-support/power-funcs || exit 0
+
+ . /etc/default/acpi-support
+ . /usr/share/acpi-support/power-funcs
+@@ -27,18 +29,14 @@
+
+ echo -n $HIBERNATE_MODE >/sys/power/disk
+
+-if [ -x /sbin/s2disk ]; then
+- DEVICE="/dev/disk/by-uuid/`awk -F= '{print $3}'
</etc/initramfs-tools/conf.d/resume`"
+- if [ -f /etc/usplash.conf ]; then
+- . /etc/usplash.conf
+- /sbin/s2disk -x "$xres" -y "$yres" $DEVICE
+- else
+- /sbin/s2disk $DEVICE
+- fi
++if [ -x /usr/sbin/s2disk ]; then
++ /usr/sbin/s2disk
+ else
+ echo -n "disk" >/sys/power/state
+ fi
+
+-$LAPTOP_MODE stop
++# Hard drives normally forget their power settings over suspend; restore
them
++# now.
++invoke-rc.d laptop-mode restart
+
+ . /etc/acpi/resume.sh
+--- acpi-support-0.103.orig/Makefile
++++ acpi-support-0.103/Makefile
+@@ -2,7 +2,6 @@
+
+ acpi_fakekey: acpi_fakekey.c
+ gcc -g -Wall -o acpi_fakekey acpi_fakekey.c
+- strip acpi_fakekey
+
+ # Keep this manually generated so that it doesn't build-dep on
+ # 'linux-headers' and stays predictable.
+--- acpi-support-0.103.orig/lib/state-funcs
++++ acpi-support-0.103/lib/state-funcs
+@@ -1,4 +1,3 @@
+-#!/bin/sh
+ # Paul Sladen, 2006-03-28, 2007-03-26
+ # Library functions to check/change status of wireless
+
+--- acpi-support-0.103.orig/lib/power-funcs
++++ acpi-support-0.103/lib/power-funcs
+@@ -20,7 +20,7 @@
+
+ getXconsole() {
+ console=`fgconsole`;
+- displaynum=`ps ax | grep -m1 -e '[X] .* vt'$console | sed -re 's!.*/X
.*:([0-9]+).*!\1!'`
++ displaynum=`COLUMNS="" ps ax | grep -e 'X .* vt'$console | grep -v
grep | sed -re 's!.*/X .*:([0-9]+).*!\1!'`
+ if [ x"$displaynum" != x"" ]; then
+ export DISPLAY=":$displaynum"
+ getXuser
+@@ -53,7 +53,6 @@
+ fi
+ }
+
+-LAPTOP_MODE='/usr/sbin/laptop_mode'
+ HDPARM='/sbin/hdparm -q'
+
+ LIDSTATE='/var/lib/acpi-support/lidstate'
+--- acpi-support-0.103.orig/lib/IBM.config
++++ acpi-support-0.103/lib/IBM.config
+@@ -67,6 +67,10 @@
+ 1866*|1867*|1869*)
+ ACPI_SLEEP=true;
+ ;;
++ # X60s
++ 1702*|1704*)
++ SAVE_VBE_STATE=false;
++ ;;
+ # Z60m (Intel graphics) 'ThinkPad Z60m'
+ 2529*)
+ ACPI_SLEEP=true;
+@@ -76,7 +80,7 @@
+ case "$bios_version" in
+ # BIOS version for "ThinkPad R40 model 2722, 2723, 2724, 2897"
+ 1PET53WW*)
+- APCI_SLEEP=true
++ ACPI_SLEEP=true
+ ;;
+ esac
+ ;;
+--- acpi-support-0.103.orig/power.sh
++++ acpi-support-0.103/power.sh
+@@ -1,60 +1,26 @@
+-#!/bin/bash
++#!/bin/sh
++
++test -f /usr/share/acpi-support/power-funcs || exit 0
+
+ . /etc/default/acpi-support
+ . /usr/share/acpi-support/power-funcs
+
+-function laptop_mode_enable {
+- $LAPTOP_MODE start
+-
+- for x in /sys/bus/ide/devices/*/block; do
+- drive=$(basename $(readlink $x));
+- $HDPARM -S $SPINDOWN_TIME /dev/$drive 2>/dev/null
+- $HDPARM -B 1 /dev/$drive 2>/dev/null
+- done
+-
+- for x in /sys/bus/scsi/devices/*/block; do
+- drive=$(basename $(readlink $x));
+- $HDPARM -S $SPINDOWN_TIME /dev/$drive 2>/dev/null
+- $HDPARM -B 1 /dev/$drive 2>/dev/null
+- done
+-}
+-
+-function laptop_mode_disable {
+- for x in /sys/bus/ide/devices/*/block; do
+- drive=$(basename $(readlink $x));
+- $HDPARM -S 0 /dev/$drive 2>/dev/null
+- $HDPARM -B 255 /dev/$drive 2>/dev/null
+- done
+- for x in /sys/bus/scsi/devices/*/block; do
+- drive=$(basename $(readlink $x));
+- $HDPARM -S 0 /dev/$drive 2>/dev/null
+- $HDPARM -B 255 /dev/$drive 2>/dev/null
+- done
+- $LAPTOP_MODE stop
+-}
+-
+ getState;
+
+ checkStateChanged;
+
+-shopt -s nullglob
+-
+ for x in /proc/acpi/ac_adapter/*; do
+- grep -q off-line $x/state
++ if [ -d "$x" ] ; then
++ grep -q off-line $x/state
+
+- if [ $? = 0 ] && [ x$1 != xstop ]; then
+- for SCRIPT in /etc/acpi/battery.d/*.sh; do
+- . $SCRIPT
+- done
+- if [ x$ENABLE_LAPTOP_MODE = xtrue ]; then
+- (sleep 5 && laptop_mode_enable)&
+- fi
+- else
+- for SCRIPT in /etc/acpi/ac.d/*.sh; do
+- . $SCRIPT
+- done
+- if [ x$ENABLE_LAPTOP_MODE = xtrue ]; then
+- (sleep 5 && laptop_mode_disable)&
+- fi
++ if [ $? = 0 ] && [ x$1 != xstop ]; then
++ for SCRIPT in /etc/acpi/battery.d/*.sh; do
++ . $SCRIPT
++ done
++ else
++ for SCRIPT in /etc/acpi/ac.d/*.sh; do
++ . $SCRIPT
++ done
++ fi
+ fi
+-done
+\ No newline at end of file
++done
+--- acpi-support-0.103.orig/mediabtn.sh
++++ acpi-support-0.103/mediabtn.sh
+@@ -1,3 +1,6 @@
+-#!/bin/bash
++#!/bin/sh
++
++test -f /usr/share/acpi-support/power-funcs || exit 0
++
+ . /usr/share/acpi-support/key-constants
+ acpi_fakekey $KEY_MEDIA
+--- acpi-support-0.103.orig/panabright.sh
++++ acpi-support-0.103/panabright.sh
+@@ -1,7 +1,8 @@
+ #!/bin/sh
+
+-# default span value
++test -f /usr/share/acpi-support/power-funcs || exit 0
+
++# default span value
+ SPAN=1
+
+ # check power state
+--- acpi-support-0.103.orig/thinkpad_acpi.modprobe
++++ acpi-support-0.103/thinkpad_acpi.modprobe
+@@ -1 +1,34 @@
++# The thinkpad_acpi module can be configured to generate ACPI events for
certain
++# hotkey (Fn+*) presses. This often happens in addition to the usual
function,
++# e.g. bluetooth hotkey (Fn+F5) off means: no acpi event, but bluetooth
still
++# switches on and off.
++
++# bits -- hotkey: usual function
++# 0x0001 -- Fn+F1 : -
++# 0x0002 -- Fn+F2 : lock screen
++# 0x0004 -- Fn+F3 : blank screen
++# 0x0008 -- Fn+F4 : suspend to ram
++# 0x0010 -- Fn+F5 : switch bluetooth
++# 0x0020 -- Fn+F6 : -
++# 0x0040 -- Fn+F7 : switch display
++# 0x0080 -- Fn+F8 : toggle display expansion
++# 0x0100 -- Fn+F9 : eject from dock
++# 0x0200 -- Fn+F10: -
++# 0x0400 -- Fn+F11: -
++# 0x0800 -- Fn+F12: hibernate
++# 0x1000 -- Fn+Backspace
++# 0x2000 -- Fn+Ins
++# 0x4000 -- Fn+Del
++# 0x8000 -- Fn+Pos1 / Fn+Home: brightness up
++
++# examples:
++# 0xffff -- enable all possible hot keys
++# 0xffef -- enable all except Fn+F5
++# 0xff9f -- enable all except Fn+F6 and Fn+F7 (default)
++# 0x080c -- enable only Fn+F3, Fn+F4 and Fn+F12
++# 0x0000 -- disable all possible hot keys
++
++# We pass a bit more in case there are more buttons. :-)
++
+ options thinkpad_acpi hotkey=enable,0xffff8f experimental=1
++
+--- acpi-support-0.103.orig/tosh-wireless.sh
++++ acpi-support-0.103/tosh-wireless.sh
+@@ -1,4 +1,6 @@
+-#!/bin/bash
++#!/bin/sh
++
++test -f /usr/share/acpi-support/power-funcs || exit 0
+
+ . /usr/share/acpi-support/state-funcs
+
+--- acpi-support-0.103.orig/webbtn.sh
++++ acpi-support-0.103/webbtn.sh
+@@ -1,3 +1,6 @@
+-#!/bin/bash
++#!/bin/sh
++
++test -f /usr/share/acpi-support/power-funcs || exit 0
++
+ . /usr/share/acpi-support/key-constants
+ acpi_fakekey $KEY_WWW
+--- acpi-support-0.103.orig/thinkpad-lockorbattery.sh
++++ acpi-support-0.103/thinkpad-lockorbattery.sh
+@@ -1,5 +1,7 @@
+ #!/bin/sh
+
++test -f /usr/share/acpi-support/power-funcs || exit 0
++
+ # Lenovo are great. They have changed the function of the Fn-F3
+ # combination on the LenovoPads from KEY_LOCK => KEY_BATTERY.
+ # Unfortunately they didn't bother to change the DMI strings
+--- acpi-support-0.103.orig/prepare.sh
++++ acpi-support-0.103/prepare.sh
+@@ -1,7 +1,7 @@
+-#!/bin/bash
++#!/bin/sh
+
+ for SCRIPT in /etc/acpi/suspend.d/*.sh; do
+ if [ -x $SCRIPT ]; then
+ . $SCRIPT
+ fi
+-done
+\ No newline at end of file
++done
+--- acpi-support-0.103.orig/vbesave
++++ acpi-support-0.103/vbesave
+@@ -1,5 +1,15 @@
+ #!/bin/sh
+
++### BEGIN INIT INFO
++# Provides: vbesave
++# Required-Start: $local_fs $remote_fs
++# Required-Stop: $local_fs $remote_fs
++# Default-Start: 2 3 4 5
++# Default-Stop: 0 1 6
++### END INIT INFO
++
++test -f /usr/share/acpi-support/power-funcs || exit 0
++
+ test -x /usr/sbin/vbetool || exit 0
+ set -e
+
+@@ -36,6 +46,9 @@
+ log_end_msg 0
+ fi
+ ;;
++ stop|restart|force-reload)
++ # Doesn't make sense (and shut up lintian)
++ ;;
+ *)
+ exit 0
+ ;;
+--- acpi-support-0.103.orig/ejectbtn.sh
++++ acpi-support-0.103/ejectbtn.sh
+@@ -1,3 +1,6 @@
+-#!/bin/bash
++#!/bin/sh
++
++test -f /usr/share/acpi-support/power-funcs || exit 0
++
+ . /usr/share/acpi-support/key-constants
+ acpi_fakekey $KEY_EJECTCD
+--- acpi-support-0.103.orig/stopbtn.sh
++++ acpi-support-0.103/stopbtn.sh
+@@ -1,3 +1,6 @@
+-#!/bin/bash
++#!/bin/sh
++
++test -f /usr/share/acpi-support/power-funcs || exit 0
++
+ . /usr/share/acpi-support/key-constants
+ acpi_fakekey $KEY_STOPCD
+--- acpi-support-0.103.orig/playbtn.sh
++++ acpi-support-0.103/playbtn.sh
+@@ -1,3 +1,6 @@
+-#!/bin/bash
++#!/bin/sh
++
++test -f /usr/share/acpi-support/power-funcs || exit 0
++
+ . /usr/share/acpi-support/key-constants
+ acpi_fakekey $KEY_PLAYPAUSE
+--- acpi-support-0.103.orig/sonybright.sh
++++ acpi-support-0.103/sonybright.sh
+@@ -1,4 +1,8 @@
+-#!/bin/bash
++#!/bin/sh
++
++test -f /usr/share/acpi-support/power-funcs || exit 0
++
++modprobe sony-laptop
+
+ BRIGHTNESS=$(cat /sys/class/backlight/sony/actual_brightness)
+
+@@ -14,13 +18,13 @@
+ [ -x /usr/bin/spicctrl ] && /usr/bin/spicctrl -b 0
+ fi
+ # Recent nvidia Sonys have ACPI methods that do nothing. Thanks, Sony.
+- [ -x /usr/bin/smartdimmer ] && smartdimmer -d 2>/dev/null
++ [ -x /usr/bin/nvclock ] && nvclock -S -10 2>/dev/null
+ elif [ "x$1" = "xup" ]; then
+ if [ "x$BRIGHTNESS" != "x8" ]; then
+ BRIGHTNESS=$(( $BRIGHTNESS + 1 ))
+ echo $BRIGHTNESS > /sys/class/backlight/sony/brightness
+ fi
+- [ -x /usr/bin/smartdimmer ] && smartdimmer -i 2>/dev/null
++ [ -x /usr/bin/nvclock ] && nvclock -S +10 2>/dev/null
+ else
+ echo >&2 Unknown argument $1
+ fi
+--- acpi-support-0.103.orig/batterybtn.sh
++++ acpi-support-0.103/batterybtn.sh
+@@ -1,5 +1,7 @@
+ #!/bin/sh
+
++test -f /usr/share/acpi-support/power-funcs || exit 0
++
+ . /usr/share/acpi-support/key-constants
+
+ acpi_fakekey $KEY_BATTERY
+--- acpi-support-0.103.orig/sleep.sh
++++ acpi-support-0.103/sleep.sh
+@@ -1,4 +1,6 @@
+-#!/bin/bash
++#!/bin/sh
++
++test -f /usr/share/acpi-support/power-funcs || exit 0
+
+ . /etc/default/acpi-support
+ . /usr/share/acpi-support/power-funcs
+--- acpi-support-0.103.orig/lid.sh
++++ acpi-support-0.103/lid.sh
+@@ -1,4 +1,6 @@
+-#!/bin/bash
++#!/bin/sh
++
++test -f /usr/share/acpi-support/power-funcs || exit 0
+
+ . /usr/share/acpi-support/power-funcs
+ . /usr/share/acpi-support/policy-funcs
+@@ -6,23 +8,26 @@
+
+ [ -x /etc/acpi/local/lid.sh.pre ] && /etc/acpi/local/lid.sh.pre
+
+-if [ `CheckPolicy` == 0 ]; then exit; fi
++if [ `CheckPolicy` = 0 ]; then exit; fi
+
+ grep -q closed /proc/acpi/button/lid/*/state
+ if [ $? = 0 ]
+ then
+ for x in /tmp/.X11-unix/*; do
+ displaynum=`echo $x | sed s#/tmp/.X11-unix/X##`
+- getXuser;
++ getXconsole;
+ if [ x"$XAUTHORITY" != x"" ]; then
+ export DISPLAY=":$displaynum"
+ . /usr/share/acpi-support/screenblank
+ fi
+ done
+ else
++ if [ x$RADEON_LIGHT = xtrue ]; then
++ [ -x /usr/sbin/radeontool ] && radeontool light on
++ fi
+ for x in /tmp/.X11-unix/*; do
+ displaynum=`echo $x | sed s#/tmp/.X11-unix/X##`
+- getXuser;
++ getXconsole;
+ if [ x"$XAUTHORITY" != x"" ]; then
+ export DISPLAY=":$displaynum"
+ grep -q off-line /proc/acpi/ac_adapter/*/state
+@@ -32,13 +37,16 @@
+ su $user -c "xscreensaver-command -unthrottle"
+ fi
+ fi
+- if [ x$RADEON_LIGHT = xtrue ]; then
+- [ -x /usr/sbin/radeontool ] && radeontool light on
+- fi
+ if [ `pidof xscreensaver` ]; then
+ su $user -c "xscreensaver-command -deactivate"
+ fi
+ su $user -c "xset dpms force on"
++
++ # Press LEFT SHIFT. On some laptops / in some configurations
forcing
++ # the DPMS on is not enough, X needs to be convinced to unblank
the
++ # screen. The left shift key is probably the most harmless key we
++ # could press. :-)
++ acpi_fakekey 42
+ fi
+ done
+ fi
+--- acpi-support-0.103.orig/mailbtn.sh
++++ acpi-support-0.103/mailbtn.sh
+@@ -1,4 +1,6 @@
+-#!/bin/bash
++#!/bin/sh
++
++test -f /usr/share/acpi-support/power-funcs || exit 0
+
+ . /etc/default/acpi-support
+ . /usr/share/acpi-support/power-funcs
+--- acpi-support-0.103.orig/lockbtn.sh
++++ acpi-support-0.103/lockbtn.sh
+@@ -1,5 +1,7 @@
+ #!/bin/sh
+
++test -f /usr/share/acpi-support/power-funcs || exit 0
++
+ . /usr/share/acpi-support/key-constants
+
+ acpi_fakekey $KEY_COFFEE
+--- acpi-support-0.103.orig/nextbtn.sh
++++ acpi-support-0.103/nextbtn.sh
+@@ -1,3 +1,6 @@
+-#!/bin/bash
++#!/bin/sh
++
++test -f /usr/share/acpi-support/power-funcs || exit 0
++
+ . /usr/share/acpi-support/key-constants
+ acpi_fakekey $KEY_NEXTSONG
+--- acpi-support-0.103.orig/voldownbtn.sh
++++ acpi-support-0.103/voldownbtn.sh
+@@ -1,3 +1,6 @@
+-#!/bin/bash
++#!/bin/sh
++
++test -f /usr/share/acpi-support/power-funcs || exit 0
++
+ . /usr/share/acpi-support/key-constants
+ acpi_fakekey $KEY_VOLUMEDOWN
+--- acpi-support-0.103.orig/resume.d/49-915-resolution-set.sh
++++ acpi-support-0.103/resume.d/49-915-resolution-set.sh
+@@ -0,0 +1,8 @@
++#!/bin/sh
++
++if [ -x /usr/sbin/915resolution ]; then
++ . /etc/default/915resolution
++ if [ "$MODE" != "" ] && [ "$XRESO" != "" ] && [ "$YRESO" != "" ]; then
++ /etc/init.d/915resolution start;
++ fi
++fi
+--- acpi-support-0.103.orig/resume.d/50-time.sh
++++ acpi-support-0.103/resume.d/50-time.sh
+@@ -1,5 +1,4 @@
+ #!/bin/sh
+
+ # Reset the time
+-hwclock --hctosys
+-
++invoke-rc.d hwclock.sh start
+--- acpi-support-0.103.orig/resume.d/11-video-pci-restore.sh
++++ acpi-support-0.103/resume.d/11-video-pci-restore.sh
+@@ -0,0 +1,11 @@
++#!/bin/sh
++
++# Restore video PCI state
++if [ x$SAVE_VIDEO_PCI_STATE = xtrue ]; then
++ for x in /sys/bus/pci/devices/*; do
++ if [ -f /var/run/vga-pci-`basename $x` ]; then
++ cat /var/run/vga-pci-`basename $x` >$x/config;
++ fi
++ done
++fi
++
+--- acpi-support-0.103.orig/resume.d/72-acpi-pain.sh
++++ acpi-support-0.103/resume.d/72-acpi-pain.sh
+@@ -33,3 +33,6 @@
+ modprobe acpi_sbs
+ /etc/acpi/power.sh
+
++# Force monitoring processes to reopen their /proc/acpi files after modules
++# have been replaced.
++killall -s HUP ksysguardd
+--- acpi-support-0.103.orig/resume.d/17-video-restore.sh
++++ acpi-support-0.103/resume.d/17-video-restore.sh
+@@ -10,12 +10,4 @@
+ fi
+ fi
+
+-# Restore video PCI state
+-if [ x$SAVE_VIDEO_PCI_STATE = xtrue ]; then
+- for x in /sys/bus/pci/devices/*; do
+- if [ -f /var/run/vga-pci-`basename $x` ]; then
+- cat /var/run/vga-pci-`basename $x` >$x/config;
+- fi
+- done
+-fi
+
+--- acpi-support-0.103.orig/resume.d/62-ifup.sh
++++ acpi-support-0.103/resume.d/62-ifup.sh
+@@ -1,8 +1,19 @@
+ #!/bin/sh
+
+-# Bring up the interfaces (this should probably be left up to some policy
+-# manager, but at the moment we just bring back whatever we ifdowned)
+-for x in $INTERFACES; do
+- ifup $x &
++# Bring up the interfaces. This should probably be left up to some policy
++# manager, but at the moment we just bring back all the ifupdown-managed
++# interfaces that were up at suspend time.
++for x in $IFUP_INTERFACES; do
++ if must_control_interface $x ; then
++ ifup $x &
++ fi
+ done
+
++# Kick network-manager to bring up its interfaces. (It won't do this
++# automatically.)
++invoke-rc.d --quiet network-manager restart
++
++# Kick ifplugd to check its interfaces. (Not sure if this is necessary, but
it
++# can't hurt either.)
++invoke-rc.d --quiet ifplugd restart
++
+--- acpi-support-0.103.orig/ChangeLog
++++ acpi-support-0.103/ChangeLog
+@@ -0,0 +1,839 @@
++acpi-support (0.103) gutsy; urgency=low
++
++ * Replace call to 'thinkpad-keys-update' with "thinkpad-keys --update"
++ * Remove wireless-related comment gruff from 'thinkpad-cmos' event.
++
++ -- Paul Sladen <sladen AT ubuntu.com> Tue, 18 Sep 2007 20:09:02 +0300
++
++acpi-support (0.102) gutsy; urgency=low
++
++ * Poke thinkpad-keys on CMOS notification
++
++ -- Matthew Garrett <mjg59 AT srcf.ucam.org> Sat, 15 Sep 2007 22:13:42 +0100
++
++acpi-support (0.101) gutsy; urgency=low
++
++ * Switch Thinkpad to using ACPI events for magic keys so that
++ 'thinkpad-keys' can go away and save us all from the new Lenovopad
++ slow NVRAM.
++ - See 'hotkey-setup' for remapping and initial module loading + setup.
++ * Extend mask used in 'thinkpad_acpi.modprobe'.
++ * Replace 'bin/bash' with 'bin/sh' in a couple of files.
++
++ -- Paul Sladen <sladen AT ubuntu.com> Thu, 13 Sep 2007 19:15:14 +0300
++
++acpi-support (0.100) gutsy; urgency=low
++
++ * send events on ACPI brightness presses
++
++ -- Matthew Garrett <mjg59 AT srcf.ucam.org> Sun, 09 Sep 2007 18:02:20 +0100
++
++acpi-support (0.99) gutsy; urgency=low
++
++ * prepare.sh: Fix missing space in executability test (thanks, Sitsofe
++ Wheeler and TJ; LP: #136453).
++
++ -- Colin Watson <cjwatson AT ubuntu.com> Sat, 01 Sep 2007 17:32:01 +0100
++
++acpi-support (0.98) gutsy; urgency=low
++
++ * Add support for the video toggle hotkey
++
++ -- Matthew Garrett <mjg59 AT srcf.ucam.org> Fri, 31 Aug 2007 05:02:08 +0100
++
++acpi-support (0.97) gutsy; urgency=low
++
++ * Improve X display finding
++ * Switch Thinkpad wireless hotkey control back to firmware for now
++ * Improve Toshiba wireless handling
++ * Check fragment scripts are executable
++ * Improve Panasonic support
++ * Improve state saving/restoring over suspend/resume
++ * Add Asus brightness key support
++ * Alter some dependencies to recommends
++ * Fix init script to check state on boot
++ * Depend on the appropriate shlibdeps
++ * Add a postrm to tidy up the init scripts
++ * We no longer need to stop mysql
++ * Tidy up scripts so a few errors aren't produced
++ * Update sony brightness script to handle sony-laptop
++
++ -- Matthew Garrett <mjg59 AT srcf.ucam.org> Fri, 31 Aug 2007 04:19:36 +0100
++
++acpi-support (0.96ubuntu1) gutsy; urgency=low
++
++ * Build packages for lpia as well.
++
++ -- Adam Conrad <adconrad AT ubuntu.com> Wed, 15 Aug 2007 23:48:51 +1000
++
++acpi-support (0.96) gutsy; urgency=low
++
++ * ibm-acpi has been renamed to thinkpad-acpi. Rename options file
accordingly.
++ LP: #119052. Thanks to Benjamin Pineau <ben.pineau AT gmail.com> for the
patch.
++
++ -- Reinhard Tartler <siretart AT tauware.de> Sun, 15 Jul 2007 18:55:10 +0200
++
++acpi-support (0.95) feisty; urgency=low
++
++ * Clean up issues with toggling multiple wireless cards.
++ - Move variable initiation into loop inside 'wireless.sh'
++ - Move contents of 'wireless.sh' into
lib/state-funcs:toggleAllWirelessState()
++ - Update '{ibm,tosh,asus}-wireless.sh' to use state-funcs
++ (Closes: LP #96107)
++ (Thanks to Nicolò Chieffo for assistance and testing)
++ * Remove spurious 'echo HERE' from lib/state-funcs. D'oh.
++
++ -- Paul Sladen <paul@katu> Mon, 26 Mar 2007 01:06:58 +0100
++
++acpi-support (0.94) feisty; urgency=low
++
++ * Save and restore values that the kernel does not preserve across
++ suspend/resume and hibernate/resume:
++ - /sys/class/net/eth*/device/rf_kill
++ (Closes: LP #37010)
++ - /proc/acpi/ibm/bluetooth
++ (Closes: LP #37175)
++ - /sys/devices/system/cpu/cpu*/cpufreq/scaling_governor
++ (Closes: LP #68191)
++ * White list Lenovo ThinkPad Z60m as working suspend.
++ (Closes: LP #57144)
++
++ -- Paul Sladen <sladen AT ubuntu.com> Thu, 22 Mar 2007 03:57:36 +0000
++
++acpi-support (0.93) feisty; urgency=low
++
++ * Change 'wireless.sh' to use 'device/rf_kill' for wireless devices (if
++ available) in preference to 'device/power/state' which was been
++ removed by the upstream kernel developers.
++ (Closes: LP #42820)
++ * Teach 'lib/state-funcs:isAnyWirelessPoweredOn()' to also check
++ 'device/rf_kill' if it's available.
++ (Closes: LP #42820)
++ * Change 'ibm-wireless.sh' to rotate wireless and bluetooth states
++ through the sequence: both, bluetooth only, wireless only, neither.
++ (Closes: LP #24680)
++ * Correct inverted logic in 'isAnyWirelessPoweredOn()'.
++ (Closes: LP #66083)
++ * Change script shebangs to use '/bin/sh' instead of '/bin/bash'.
++
++ -- Paul Sladen <sladen AT ubuntu.com> Wed, 21 Mar 2007 04:55:27 +0000
++
++acpi-support (0.92) feisty; urgency=low
++
++ * Add 'events/sony-eject' for Sony Vaio TX3.
++ (Closes: LP #55388)
++
++ -- Paul Sladen <sladen AT ubuntu.com> Sun, 18 Mar 2007 23:09:38 +0000
++
++acpi-support (0.91build1) feisty; urgency=low
++
++ * Rebuild for changes in the amd64 toolchain.
++
++ -- Matthias Klose <doko AT ubuntu.com> Mon, 5 Mar 2007 01:12:40 +0000
++
++acpi-support (0.91) feisty; urgency=low
++
++ * Identical to 0.90, revert the sync from Debian
++
++ -- Matthew Garrett <mjg59 AT srcf.ucam.org> Wed, 8 Nov 2006 17:33:04 +0000
++
++acpi-support (0.90) edgy; urgency=low
++
++ * Explicitly switch the screen back to text mode if it was that way
++ before resume
++
++ -- Matthew Garrett <mjg59 AT srcf.ucam.org> Sun, 15 Oct 2006 18:09:03 +0100
++
++acpi-support (0.89) edgy; urgency=low
++
++ * Add support for high-res uswsusp
++
++ -- Matthew Garrett <mjg59 AT srcf.ucam.org> Fri, 15 Sep 2006 21:43:54 +0100
++
++acpi-support (0.88) edgy; urgency=low
++
++ * Change defaults
++
++ -- Matthew Garrett <mjg59 AT srcf.ucam.org> Fri, 15 Sep 2006 17:48:05 +0100
++
++acpi-support (0.87) edgy; urgency=low
++
++ * Add support for using uswsusp
++
++ -- Matthew Garrett <mjg59 AT srcf.ucam.org> Thu, 24 Aug 2006 01:03:30 +0100
++
++acpi-support (0.86) edgy; urgency=low
++
++ * Remove stop links from rc0 and rc6
++
++ -- Scott James Remnant <scott AT ubuntu.com> Thu, 20 Jul 2006 23:03:51 +0100
++
++acpi-support (0.85) dapper-updates; urgency=low
++
++ * Don't unload nsc-ircc on suspend
++
++ -- Matthew Garrett <mjg59 AT srcf.ucam.org> Mon, 19 Jun 2006 10:38:09 +0100
++
++acpi-support (0.84) dapper; urgency=low
++
++ * Whitelist another laptop (Ubuntu #44781)
++ - Hewlett-Packard Pavilion ZV6000
++ * Add whitelist for bizarre old laptop (Closes: Ubuntu #38174)
++
++ -- Daniel Silverstone <daniel.silverstone AT ubuntu.com> Tue, 23 May 2006
14:02:34 +0100
++
++acpi-support (0.83) dapper; urgency=low
++
++ * Whitelist laptops (Ubuntu #44781) (Closes: Ubuntu #44909)
++ * Fix use of 'pidof' so that it won't bork if multiple processes exist
++ with the same name and to not spawn extra subshells. Also do a
++ more specific 'dcop' call and _only_ if 'dcopserver' is actually
running.
++ * Increase the 'acpilock' back up from 5 -> 10 seconds that got dropped,
++ may help with (Ubuntu #43519).
++ * Save the 'dmidecode' bios-version as we can identify ThinkPads with
blank
++ product-names.
++ * Add entry for ThinkPad R40 with BIOS version "1PET62WW" (Tony Whitmore)
++
++ -- Paul Sladen <ubuntu AT paul.sladen.org> Mon, 22 May 2006 19:06:40 +0100
++
++acpi-support (0.82) dapper; urgency=low
++
++ * Add more whitelisted laptops
++ * Add battery.d and ac.d (Closes: Ubuntu #44996)
++ * Use pccardctl rather than cardctl (Closes: Ubuntu #44164)
++ * Only call xscreensaver if it's running
++
++ -- Matthew Garrett <mjg59 AT srcf.ucam.org> Tue, 16 May 2006 13:06:24 +0100
++
++acpi-support (0.81) dapper; urgency=low
++
++ * Whitelist Dell Inspiron XPS Gen2
++ (Closes: Ubuntu #44732)
++
++ -- Paul Sladen <ubuntu AT paul.sladen.org> Mon, 15 May 2006 00:42:08 +0100
++
++acpi-support (0.80) dapper; urgency=low
++
++ * Add support for the toshiba battery button and add a generic
++ batterybtn.sh action script
++
++ -- Daniel Silverstone <daniel.silverstone AT ubuntu.com> Wed, 10 May 2006
12:09:25 +0100
++
++acpi-support (0.79) dapper; urgency=low
++
++ * Reorder some checks in order to avoid deadlocks in KDE
++
++ -- Matthew Garrett <mjg59 AT srcf.ucam.org> Sun, 7 May 2006 14:51:20 +0100
++
++acpi-support (0.78) dapper; urgency=low
++
++ * Fix Sony brightness handling so minimum brightness doesn't "stick"
++
++ -- Matthew Garrett <mjg59 AT srcf.ucam.org> Sat, 6 May 2006 00:57:38 +0100
++
++acpi-support (0.77) dapper; urgency=low
++
++ * Call smartdimmer even if the Sony acpi brightness value is mad
++
++ -- Matthew Garrett <mjg59 AT srcf.ucam.org> Fri, 5 May 2006 23:59:16 +0100
++
++acpi-support (0.76) dapper; urgency=low
++
++ * Only save VBE state on laptops - desktops should have a runnable
++ BIOS
++
++ -- Matthew Garrett <mjg59 AT srcf.ucam.org> Wed, 3 May 2006 21:32:13 +0100
++
++acpi-support (0.75) dapper; urgency=low
++
++ * Default to saving VBE state on boot
++
++ -- Matthew Garrett <mjg59 AT srcf.ucam.org> Sun, 30 Apr 2006 19:24:51 +0100
++
++acpi-support (0.74) dapper; urgency=low
++
++ * Whitelist Asus A5E [Malone: #37303]
++ Closes: launchpad #37303
++
++ -- Paul Sladen <ubuntu AT paul.sladen.org> Sun, 30 Apr 2006 02:22:39 +0200
++
++acpi-support (0.73) dapper; urgency=low
++
++ * Fix mis-named interface-down script
++
++ -- Matthew Garrett <mjg59 AT srcf.ucam.org> Mon, 24 Apr 2006 21:05:43 +0100
++
++acpi-support (0.72) dapper; urgency=low
++
++ * Re-disable laptop-mode by default, to work around LP#12483
++ - Has the pleasant side effect of making the comment match the code
++
++ -- Matt Zimmerman <mdz AT ubuntu.com> Sat, 22 Apr 2006 05:34:12 -0700
++
++acpi-support (0.71) dapper; urgency=low
++
++ * Split resume.sh and prepare.sh up to make it easier to add appropriate
hooks
++
++ -- Matthew Garrett <mjg59 AT srcf.ucam.org> Fri, 21 Apr 2006 16:13:19 +0100
++
++acpi-support (0.70) dapper; urgency=low
++
++ * Drop call to ifrename which is not only not installed by default, but
++ conflicts with udev so can't be installed.
++
++ -- Scott James Remnant <scott AT ubuntu.com> Tue, 18 Apr 2006 09:22:00 +0100
++
++acpi-support (0.69) dapper; urgency=low
++
++ * Add whitelist for Sony VGN-S260
++ Closes: launchpad #32186
++ * Apply patch to unload netconsole if it's present.
++ Closes: launchpad #33885
++
++ -- Daniel Silverstone <daniel.silverstone AT ubuntu.com> Thu, 13 Apr 2006
10:52:29 +0100
++
++acpi-support (0.68) dapper; urgency=low
++
++ * Bring up only those interfaces we downed, and do it all at once now
++ that ifup doesn't block on the state file each time.
++
++ -- Scott James Remnant <scott AT ubuntu.com> Thu, 6 Apr 2006 06:32:41 +0100
++
++acpi-support (0.67) dapper; urgency=low
++
++ * ...and fix lib/state-funcs:isAnyWirelessPoweredOn() so that it
++ doesn't have eth1 hard-coded as a wireless device. Oops.
++
++ -- Paul Sladen <ubuntu AT paul.sladen.org> Wed, 29 Mar 2006 13:56:09 +0100
++
++acpi-support (0.66) dapper; urgency=low
++
++ * Cache result of 'dmidecode -s *' so that they can be access without
++ privileges when checking 'pmi capabilities'. [Malone: #36573]
++
++ -- Paul Sladen <ubuntu AT paul.sladen.org> Tue, 28 Mar 2006 20:19:48 +0100
++
++acpi-support (0.65) dapper; urgency=low
++
++ * Whitelist Compaq Evo N600c has working SLEEP [Malone: #36838]
++ * Whitelist Sony VGN-FJ1S has working SLEEP [Malone: #29890]
++ * Add support for '/etc/acpi/start.d/*.sh' to be run on startup
++ * Synchronise the Asus Wireless LED on start and resume [Malone: #22795]
++ * Execute {suspend,resume}.d/*.sh at different times depending on
++ whether they match [01]*.sh, [2-7]*.sh, [89]*.sh
++ * Flash the ThinkPad Moon LED while hibernating/suspending.
++
++ -- Paul Sladen <ubuntu AT paul.sladen.org> Tue, 28 Mar 2006 17:20:48 +0100
++
++acpi-support (0.64) dapper; urgency=low
++
++ * Add support for Asus A6U Touchpad toggle [Malone #31063].
++
++ -- Paul Sladen <ubuntu AT paul.sladen.org> Sat, 25 Mar 2006 22:38:36 +0000
++
++acpi-support (0.63) dapper; urgency=low
++
++ * Set KEY_BATTERY=236 on the basis that this is going to be assigned
upstream.
++
++ -- Paul Sladen <ubuntu AT paul.sladen.org> Sat, 25 Mar 2006 19:37:16 +0000
++
++acpi-support (0.62) dapper; urgency=low
++
++ * And the rest
++
++ -- Matthew Garrett <mjg59 AT srcf.ucam.org> Thu, 23 Mar 2006 21:49:11 +0000
++
++acpi-support (0.61) dapper; urgency=low
++
++ * Use modprobe -r rather than rmmod [Malone #36172]
++
++ -- Matthew Garrett <mjg59 AT srcf.ucam.org> Thu, 23 Mar 2006 16:36:49 +0000
++
++acpi-support (0.60) dapper; urgency=low
++
++ * Trim trailing spaces from the end of dmidecode strings before looking
++ for the appropriate '.config' file. [Malone #34536]
++ * Add correct handling for new Lenovo ThinkPads that have changed the
++ action of Fn-F3 from KEY_LOCK => KEY_BATTERY. [Malone #35395]
++ * Add Lenovo ThinkPad handling of Fn-F8 to toggle the Touchpad
++ on newer models or do-nothing on normal ThinkPads [Malone #35395]
++ * Append 'aliased-keys' onto 'key-constants' for unassigned keycodes.
++ - Nota Bene: KEY_BATTERY will need updating when assigned upstream.
++ * Fix handling of hexadecimal numbers when generating 'key-constants'.
++
++ -- Paul Sladen <ubuntu AT paul.sladen.org> Tue, 21 Mar 2006 15:05:02 +0000
++
++acpi-support (0.59) dapper; urgency=low
++
++ * Disable USB module unloading - the kernel seems to manage it better
++ now
++
++ -- Matthew Garrett <mjg59 AT srcf.ucam.org> Sat, 18 Feb 2006 14:25:11 +0000
++
++acpi-support (0.58) dapper; urgency=low
++
++ * Pull in missing policy-funcs in sleep.sh
++
++ -- Matthew Garrett <mjg59 AT srcf.ucam.org> Thu, 16 Feb 2006 13:33:51 +0000
++
++acpi-support (0.57) dapper; urgency=low
++
++ * Re-enable laptop-mode
++
++ -- Matthew Garrett <mjg59 AT srcf.ucam.org> Thu, 16 Feb 2006 00:37:52 +0000
++
++acpi-support (0.56) dapper; urgency=low
++
++ * Re-enable hard drive power saving
++ * Disable laptop-mode before starting hibernate
++ * Fix PCI state saving for PCI devices
++ * Remove recommends on xscreensaver
++ * Fix policy checking - don't run certain scripts if a desktop policy
++ manager is running
++ * Unload ndiswrapper after taking down its interface
++
++ -- Matthew Garrett <mjg59 AT srcf.ucam.org> Thu, 16 Feb 2006 00:29:29 +0000
++
++acpi-support (0.55) dapper; urgency=low
++
++ * Change asus-lock and tosh-lock to invoke lockbtn.sh which in turn will
++ create a KEY_COFFEE event.
++ This needs a kernel fix before it will be of much use in the general
case.
++ * Add tosh-www to run webbtn.sh
++ * Add tosh-mail to run mailbtn.sh
++ * Add tosh-ibutton to run mediabtn.sh
++
++ -- Daniel Silverstone <daniel.silverstone AT ubuntu.com> Wed, 15 Feb 2006
17:35:19 +0000
++
++acpi-support (0.54) dapper; urgency=low
++
++ * Fix acpi_fakekey
++
++ -- Matthew Garrett <mjg59 AT srcf.ucam.org> Mon, 13 Feb 2006 18:40:46 +0000
++
++acpi-support (0.53) dapper; urgency=low
++
++ * Transition model-specific sleep and hibernate buttons to use
++ keycodes rather than executing scripts directly
++ * Don't directly execute the sleep script if g-p-m or klaptopdaemon
++ are running - they should define policy
++ * Change to using symbolic constants rather than numbers (patch from
++ Paul Sladen <ubuntu AT paul.sladen.org>
++
++ -- Matthew Garrett <mjg59 AT srcf.ucam.org> Mon, 6 Feb 2006 14:55:50 +0000
++
++acpi-support (0.52) dapper; urgency=low
++
++ * Stop using uinput - fake keyboard input directly
++
++ -- Matthew Garrett <mjg59 AT srcf.ucam.org> Fri, 27 Jan 2006 04:29:18 +0000
++
++acpi-support (0.51) dapper; urgency=low
++
++ * Switch on brightness support in ibm-acpi
++
++ -- Matthew Garrett <mjg59 AT srcf.ucam.org> Tue, 24 Jan 2006 03:25:23 +0000
++
++acpi-support (0.50) dapper; urgency=low
++
++ * Load uinput module on boot (Ubuntu #21566)
++ * Fix power.sh conditionals (Ubuntu #21567)
++
++ -- Matthew Garrett <mjg59 AT srcf.ucam.org> Tue, 27 Dec 2005 14:55:55 +0000
++
++acpi-support (0.49) dapper; urgency=low
++
++ * Use uinput rather than hacky X stuff to fake keypresses
++
++ -- Matthew Garrett <mjg59 AT srcf.ucam.org> Sat, 24 Dec 2005 20:33:38 +0000
++
++acpi-support (0.48) dapper; urgency=low
++
++ * Only depend on vbetool on i386 and amd64
++ * Fix reference to SCREEN_LOCK - should have been LOCK_SCREEN
++
++ -- Matthew Garrett <mjg59 AT srcf.ucam.org> Sat, 24 Dec 2005 18:56:01 +0000
++
++acpi-support (0.47) dapper; urgency=low
++
++ * Freeze the framebuffer around sleep/resume
++ * Check SCREEN_LOCK on lid close (Ubuntu #20007)
++ * Work with newer dmidecodes (Ubuntu #19879)
++ * Use laptop-mode-tools rather than laptop-mode (Ubuntu #19572)
++ * Remove extra radeontool call (Ubuntu #18208)
++ * Add radeontool and smartdimmer to depends
++ * Add support for saving/restoring video PCI state (Ubuntu #17972)
++ * Fix the permissions on /var/lib/acpi-support/powerstate (Ubuntu #17606)
++ * Reenable spindown timings on SATA drives (Ubuntu #17230)
++ * Poke alsa to improve sound recovery
++ * Kill dhclient while suspending - otherwise it blocks ifdown
++
++ -- Matthew Garrett <mjg59 AT srcf.ucam.org> Tue, 29 Nov 2005 18:25:31 +0000
++
++acpi-support (0.46) breezy; urgency=low
++
++ * Add some extra machines to the whitelists
++ * Depend on powermgmt-base
++ * Disable restarting irda services by default
++ * Disable laptop-mode by default
++
++ -- Matthew Garrett <mjg59 AT srcf.ucam.org> Wed, 12 Oct 2005 12:50:11 +0100
++
++acpi-support (0.45) breezy; urgency=low
++
++ * Remove sneaky new dependencies on radeontool and smartdimmer. We're too
++ close to release to start poking the hardware in interesting new ways by
++ default
++
++ -- Matt Zimmerman <mdz AT ubuntu.com> Tue, 4 Oct 2005 17:35:54 -0700
++
++acpi-support (0.44) breezy; urgency=low
++
++ * Fix whitelisting
++ * Fix resume when suspended for longer than the xscreensaver timeout
++ * Disable attempts to use hdparm on SATA drives - we don't have the
++ kernel support.
++
++ -- Matthew Garrett <mjg59 AT srcf.ucam.org> Tue, 4 Oct 2005 16:44:01 +0100
++
++acpi-support (0.43) breezy; urgency=low
++
++ * Fix Radeon backlight tweak support
++ * Fix lid closing screen locking
++ * Fix check for ac adapters
++
++ -- Matthew Garrett <mjg59 AT srcf.ucam.org> Tue, 4 Oct 2005 05:07:58 +0100
++
++acpi-support (0.42) breezy; urgency=low
++
++ * Fix missing fi statement in init script
++
++ -- Matthew Garrett <mjg59 AT srcf.ucam.org> Mon, 3 Oct 2005 02:03:21 +0100
++
++acpi-support (0.41) breezy; urgency=low
++
++ * Make sure that xscreensaver-command -lock is always called
++ * Use smartdimmer on Sonys if it's available. Nnngh.
++ * Add support for resetting IDE drives more enthusiastically
++ * Add support for using radeontool on some awkward machines
++ * Unload/reload fan and thermal modules on resume to increase the
++ chances of them working
++ * Unload/reload ibm-acpi if it's loaded (#14791)
++ * Fix lid.sh (#16802)
++ * Unify init script/power.sh, and make sure power.sh is called on
++ resume (#14833)
++
++ -- Matthew Garrett <mjg59 AT srcf.ucam.org> Mon, 3 Oct 2005 00:48:57 +0100
++
++acpi-support (0.40) breezy; urgency=low
++
++ * Add a large set of whitelisted laptops
++ * Export DISPLAY before trying to call apps (closes: #16555)
++
++ -- Matthew Garrett <mjg59 AT srcf.ucam.org> Sat, 1 Oct 2005 18:01:54 +0100
++
++acpi-support (0.39) breezy; urgency=low
++
++ * Fix up a couple of bugs in the display handling code
++
++ -- Matthew Garrett <mjg59 AT srcf.ucam.org> Fri, 30 Sep 2005 04:25:58 +0100
++
++acpi-support (0.38) breezy; urgency=low
++
++ * Add support for leaving some modules loaded
++ * Run X commands on all displays, not just :0
++ * Run hotkey commands on the foremost console
++
++ -- Matthew Garrett <mjg59 AT srcf.ucam.org> Fri, 30 Sep 2005 03:40:32 +0100
++
++acpi-support (0.37) breezy; urgency=low
++
++ * Add support for custom suspend and resume scripts
++ * Add Toshiba brightness restoration over suspend/resume
++ (Both provided by Daniel Silverstone)
++ * Run 855resolution on resume if it's configured (closes: #16271)
++ * Revert to using xscreensaver
++ * Stop services before unloading modules (closes: #16008)
++ * Fix syntax error in asus-wireless.sh
++
++ -- Matthew Garrett <mjg59 AT srcf.ucam.org> Tue, 27 Sep 2005 01:48:39 +0100
++
++acpi-support (0.36) breezy; urgency=low
++
++ * Change Panasonic brightness on button down, not button release
++ * Fix quoting in vbesave init script
++
++ -- Matthew Garrett <mjg59 AT srcf.ucam.org> Fri, 23 Sep 2005 11:58:37 +0100
++
++acpi-support (0.35) breezy; urgency=low
++
++ * Fix for occasionally picking the wrong user
++
++ -- Matthew Garrett <mjg59 AT srcf.ucam.org> Wed, 21 Sep 2005 00:07:08 +0100
++
++acpi-support (0.34) breezy; urgency=low
++
++ The "I do not wish to discuss it" release
++
++ * Add workaround for prodding fans back into life on resume
++ * Add sick evil code for doing sick evil things to sick evil
++ screensavers
++
++ -- Matthew Garrett <mjg59 AT srcf.ucam.org> Tue, 20 Sep 2005 03:15:46 +0100
++
++acpi-support (0.33) breezy; urgency=low
++
++ * Remove hdparm -B calls in the init scripts
++
++ -- Matthew Garrett <mjg59 AT srcf.ucam.org> Thu, 15 Sep 2005 21:16:54 +0100
++
++acpi-support (0.32) breezy; urgency=low
++
++ * Add correct quoting to check for running PowerManager
++ * Remove PowerManager checking from lid script
++
++ -- Matthew Garrett <mjg59 AT srcf.ucam.org> Thu, 15 Sep 2005 15:55:12 +0100
++
++acpi-support (0.31) breezy; urgency=low
++
++ * Don't mess with hdparm -B; it triggers a bug elsewhere which causes
++ the system to hang on some laptops
++
++ -- Matt Zimmerman <mdz AT ubuntu.com> Wed, 14 Sep 2005 15:28:21 -0700
++
++acpi-support (0.30) breezy; urgency=low
++
++ * Remove hardcoded /dev/hda from the init script
++ * Unload irda modules on suspend - they don't tend to survive
++ * Make sure that we power the screen back on on lid open
++ * Don't unload/reload input modules - it seems to break things
++ * Background xscreensaver locking
++
++ -- Matthew Garrett <mjg59 AT srcf.ucam.org> Fri, 2 Sep 2005 17:47:17 +0100
++
++acpi-support (0.29) breezy; urgency=low
++
++ * Deal more nicely with running IRDA, otherwise the kernel tends to
++ oops
++
++ -- Matthew Garrett <mjg59 AT srcf.ucam.org> Thu, 1 Sep 2005 18:09:14 +0100
++
++acpi-support (0.28) breezy; urgency=low
++
++ * If power-manager is running, let it determine policy rather than
++ running scripts blindly. Ignore this for machine-specific hotkeys.
++
++ -- Matthew Garrett <mjg59 AT srcf.ucam.org> Tue, 30 Aug 2005 18:13:40 +0100
++
++acpi-support (0.27) breezy; urgency=low
++
++ * Use "..." rather than ":" in init script messages, for consistency with
++ other scripts
++
++ -- Matt Zimmerman <mdz AT ubuntu.com> Mon, 29 Aug 2005 15:51:25 -0700
++
++acpi-support (0.26) breezy; urgency=low
++
++ * Fix power.sh so that it actually works (Ubuntu #14241)
++ * Add support for Sony brightness control (Ubuntu #14188)
++ * Include scripts for Asus volume control (Ubuntu #14164)
++
++ -- Matthew Garrett <mjg59 AT srcf.ucam.org> Sun, 28 Aug 2005 17:33:14 +0100
++
++acpi-support (0.25) breezy; urgency=low
++
++ * Depend on xset (Ubuntu #13997)
++
++ -- Matthew Garrett <mjg59 AT srcf.ucam.org> Thu, 25 Aug 2005 10:12:35 +0100
++
++acpi-support (0.24) breezy; urgency=low
++
++ * Add another missing build-depend DANIEL WHY DO YOU HATE ME SO
++
++ -- Matthew Garrett <mjg59 AT srcf.ucam.org> Thu, 25 Aug 2005 01:34:14 +0100
++
++acpi-support (0.23) breezy; urgency=low
++
++ * Add missing build-depends
++
++ -- Matthew Garrett <mjg59 AT srcf.ucam.org> Thu, 25 Aug 2005 01:20:28 +0100
++
++acpi-support (0.22) breezy; urgency=low
++
++ [ Thom May ]
++ * Import into bzr.
++ * Notify NetworkManager on suspend and resume, and Recommend:
++ network-manager
++
++ [ Matthew Garrett ]
++ * Add support for sending key events to userspace
++ * Add scripts for various media events
++ * Let the BIOS handle video hotkey events on Thinkpads
++ * Add ACPI events for Toshiba media buttons
++ * Don't change VTs on lid close
++ * Remove gratuitous sleep statements
++ * Improve the ability to guess the user and home directory
++ * Add more support for Panasonic and Asus machines
++ * Improve Asus and Thinkpad wireless control scripts
++ * Support SATA disks
++ * Eject PCMCIA cards at a more appropriate time, and handle
++ ndiswrapper
++ * Support Toshiba bluetooth switching
++
++ -- Matthew Garrett <mjg59 AT srcf.ucam.org> Mon, 22 Aug 2005 21:55:51 +0100
++
++acpi-support (0.21) hoary; urgency=low
++
++ * Ensure we only return one match from grep.
++ * Run /etc/acpi/local/lid.sh.post if it exists.
++ * sleep for one second, then nuke the acpi lock
++
++ -- Thom May <thom AT ubuntu.com> Fri, 1 Apr 2005 11:37:06 +0100
++
++acpi-support (0.20) hoary; urgency=low
++
++ * Ifrename on resume so our interfaces are called the same. (Ubuntu:
#7480)
++ * call xscreensaver-command -deactivate so we get a dialog rather than a
++ blank screen when we resume. (Ubuntu: #7717)
++ * Don't clobber LIDSTATE when we mean POWERSTATE (Ubuntu: #8258)
++ * Background the acpid lock removal
++
++ -- Thom May <thom AT ubuntu.com> Thu, 17 Mar 2005 17:39:22 +0000
++
++acpi-support (0.19.1) hoary; urgency=low
++
++ * Ensure that we only attempt to save vbe state if ACPI_SLEEP is enabled
++
++ -- Thom May <thom AT ubuntu.com> Mon, 7 Mar 2005 12:49:28 +0000
++
++acpi-support (0.19) hoary; urgency=low
++
++ * Add ia64 to the list of supported architectures
++
++ -- Thom May <thom AT ubuntu.com> Wed, 2 Mar 2005 23:19:57 +0000
++
++acpi-support (0.18) hoary; urgency=low
++
++ * Fix vbesave init script (Ubuntu: #6907)
++
++ -- Thom May <thom AT ubuntu.com> Fri, 25 Feb 2005 11:03:48 +0000
++
++acpi-support (0.17) hoary; urgency=low
++
++ * Use acpid locking functionality finally (Hi, Martijn!)
++ * vbestate:
++ - Test for existence of vbetool
++ - LSBifiy
++ - Convert to a true init script
++ - quieten
++ * Check whether package has been removed but not purged in init script
++
++ -- Thom May <thom AT ubuntu.com> Wed, 23 Feb 2005 15:07:51 +0000
++
++acpi-support (0.16) hoary; urgency=low
++
++ * Fix dumb typos
++
++ -- Thom May <thom AT debian.org> Mon, 24 Jan 2005 17:30:48 +0000
++
++acpi-support (0.15) hoary; urgency=low
++
++ * Install ibm_acpi.modprobe and tosh_acpi.modprobe by default
++
++ -- Thom May <thom AT planetarytramp.net> Sat, 22 Jan 2005 16:18:09 +0000
++
++acpi-support (0.14) hoary; urgency=low
++
++ * Run vbesave at the top of rc2, rather than in rcS, so we can still boot
to
++ single user
++
++ -- Thom May <thom AT planetarytramp.net> Mon, 17 Jan 2005 17:26:37 +0000
++
++acpi-support (0.13) hoary; urgency=low
++
++ * Update toshiba scripts to handle both possible BIOS values
++ * Fix == bashisms. (Ubuntu #5566)
++ * Fix up ASUS event scripts. (Ubuntu #5510)
++
++ -- Thom May <thom AT planetarytramp.net> Fri, 14 Jan 2005 12:31:29 +0000
++
++acpi-support (0.12) hoary; urgency=low
++
++ * Depend on vbetool on i386 only
++
++ -- Thom May <thom AT planetarytramp.net> Fri, 14 Jan 2005 10:48:37 +0000
++
++acpi-support (0.11) hoary; urgency=low
++
++ * Add Toshiba, Asus and Panasonic event scripts
++ * Add Toshiba modprobe config and README
++ * All Tosh stuff courtesy of Daniel Silverstone
++
++ -- Thom May <thom AT planetarytramp.net> Thu, 13 Jan 2005 16:08:48 +0000
++
++acpi-support (0.10) hoary; urgency=low
++
++ * Matthew Garrett:
++ - /etc/defaults/acpi-support: new
++ - hotplug events for IBM laptops
++ - lots more
++
++ -- Thom May <thom AT planetarytramp.net> Thu, 13 Jan 2005 12:27:47 +0000
++
++acpi-support (0.9) warty; urgency=low
++
++ * Add stop target to the init script, disable hdparm advanced power
++ management therein. (Warty #1914)
++
++ -- Thom May <thom AT canonical.com> Tue, 5 Oct 2004 21:18:52 +0100
++
++acpi-support (0.8) warty; urgency=low
++
++ * Explicitly add /usr/bin/X11 to path. (Warty #1549)
++
++ -- Thom May <thom AT canonical.com> Fri, 24 Sep 2004 12:08:20 +0100
++
++acpi-support (0.7) warty; urgency=low
++
++ * Added versioned depend on lsb-base
++
++ -- Nathaniel McCallum <npmccallum AT canonical.com> Fri, 3 Sep 2004
14:45:32 -0400
++
++acpi-support (0.6) warty; urgency=low
++
++ * Load after acpid. (Warty #992)
++
++ -- Thom May <thom AT planetarytramp.net> Fri, 3 Sep 2004 18:39:52 +0100
++
++acpi-support (0.5) warty; urgency=low
++
++ * debian/init.d: pretty initscript
++
++ -- Nathaniel McCallum <npmccallum AT canonical.com> Thu, 2 Sep 2004
13:16:21 -0400
++
++acpi-support (0.4) warty; urgency=low
++
++ * use a subdirectory of /var/lib (Closes Warty #842)
++ * don't hardcode names so that suckful HP boxes might work. (Closes Warty
++ #841)
++
++ -- Thom May <thom AT planetarytramp.net> Tue, 31 Aug 2004 15:27:13 +0100
++
++acpi-support (0.3) warty; urgency=low
++
++ * Apparently, acpid needs a good kick when we change the events.
++
++ -- Thom May <thom AT planetarytramp.net> Thu, 19 Aug 2004 18:38:55 +0100
++
++acpi-support (0.2) warty; urgency=low
++
++ * use a safer state file to maintain state across lid open/close
++
++ -- Thom May <thom AT planetarytramp.net> Thu, 19 Aug 2004 17:43:38 +0100
++
++acpi-support (0.1) warty; urgency=low
++
++ * First upload.
++ * delimit a basic collection of safe acpi events
++
++ -- Thom May <thom AT planetarytramp.net> Thu, 19 Aug 2004 15:33:01 +0100
+--- acpi-support-0.103.orig/debian/watch
++++ acpi-support-0.103/debian/watch
+@@ -0,0 +1,2 @@
++version=2
++http://archive.ubuntu.com/ubuntu/pool/main/a/acpi-support/acpi-support_(.*).tar.gz
+--- acpi-support-0.103.orig/debian/rules
++++ acpi-support-0.103/debian/rules
+@@ -1,26 +1,34 @@
+-#! /usr/bin/make -f
++#!/usr/bin/make -f
+
+ DEB_HOST_ARCH := $(shell dpkg-architecture -qDEB_HOST_ARCH)
+ ifeq ($(DEB_HOST_ARCH),i386)
+-arch-depends := -V'arch:Depends=vbetool, radeontool, toshset, smartdimmer'
++arch-depends := -V'arch:Depends=vbetool, toshset'
+ endif
+ ifeq ($(DEB_HOST_ARCH),amd64)
+ arch-depends := -V'arch:Depends=vbetool'
+ endif
+
+-clean:
++clean:
+ make clean
+ dh_testdir
+ dh_clean
++ rm -f resume.d/13-915-resolution-set.sh
++ # Remove unwanted files from orig.tar.gz
++ rm -f suspend.d/80-video-pci-state.sh # Renamed in 81-...
++ rm -f resume.d/13-855-resolution-set.sh
++ rm -f resume.d/49-855-resolution-set.sh
++ rm -f toshiba_acpi.modprobe README.toshiba
++ rm -f acpi-support_0.90-2.diff.gz
+
+-build:
++build:
+ make
+
+-install:
++install:
+ dh_testdir
+ dh_testroot
+ dh_clean -k
+ dh_installdirs
++ ln -sf 49-915-resolution-set.sh resume.d/13-915-resolution-set.sh
+ for file in lib/*; do\
+ install -m 644 "$$file"
debian/acpi-support/usr/share/acpi-support/;\
+ done
+@@ -40,7 +48,6 @@
+ install -m 755 $$file debian/acpi-support/etc/acpi/;\
+ done
+ install -m 644 acpi-support debian/acpi-support/etc/default/;
+- install -m 644 toshiba_acpi.modprobe
debian/acpi-support/etc/modprobe.d/;
+ install -m 644 thinkpad_acpi.modprobe
debian/acpi-support/etc/modprobe.d/;
+ install -m 755 vbesave debian/acpi-support/etc/init.d/vbesave
+ install -m 755 acpi_fakekey debian/acpi-support/usr/bin/acpi_fakekey
+@@ -52,11 +59,14 @@
+ dh_testdir
+ dh_testroot
+ dh_installdocs
+- dh_installchangelogs
++ dh_installchangelogs ChangeLog
++ dh_installman
+ dh_installinit -- start 99 2 3 4 5 . stop 20 1 .
++ dh_strip
+ dh_compress
+ dh_fixperms
+ dh_installdeb
++ dh_shlibdeps
+ dh_gencontrol -- $(arch-depends)
+ dh_md5sums
+ dh_builddeb
+--- acpi-support-0.103.orig/debian/compat
++++ acpi-support-0.103/debian/compat
+@@ -1 +1 @@
+-4
++5
+--- acpi-support-0.103.orig/debian/acpi_fakekey.1
++++ acpi-support-0.103/debian/acpi_fakekey.1
+@@ -0,0 +1,21 @@
++.Dd 2007-01-22
++.Dt acpi_fakekeya 1
++.Os "Debian GNU/Linux"
++.Sh NAME
++.Nm acpi_fakekey
++.Nd acpi event wrapper
++.Sh SYNOPSIS
++.Nm acpi_fakekey
++.Op KEYNUMBER
++.Sh DESCRIPTION
++.Nm
++gets the key numbers for specific events generated as output by
++scripts in /etc/acpi/ and writes them to the correct input FIFO in
/dev/input/eventx.
++.Sh OPTIONS
++No options used by this program.
++.Sh SEE ALSO
++.Xr acpid 8
++.Xr acpi_listen 8
++.Sh AUTHOR
++This manual page was written by Nico Golde <nico AT ngolde.de>
++for the Debian GNU/Linux system (but may be used by others).
+--- acpi-support-0.103.orig/debian/manpages
++++ acpi-support-0.103/debian/manpages
+@@ -0,0 +1 @@
++debian/acpi_fakekey.1
+--- acpi-support-0.103.orig/debian/README.devel
++++ acpi-support-0.103/debian/README.devel
+@@ -0,0 +1,14 @@
++How to maintain acpi-support
++----------------------------
++
++Since this package is a Ubuntu package it comes with a debian dir in the
++upstream tarball.
++
++We repackage the .tar.gz without that directory but we keep a copy of
debian/changelog
++in ChangeLog.
++
++The svn-upgrade is called on the .tar.gz with the debian directory so that
++we can detect any relevant changes in the postinst and such. It would be
++great if svn-upgrade proposed to ignore some files (like debian/changelog
++to avoid some expected conflicts).
++
+--- acpi-support-0.103.orig/debian/init.d
++++ acpi-support-0.103/debian/init.d
+@@ -1,7 +1,17 @@
+-#!/bin/bash
++#!/bin/sh
+ # INIT script to check whether we're on batteries, and so start with laptop
+ # mode etc enabled.
+
++### BEGIN INIT INFO
++# Provides: acpi-support
++# Required-Start: $local_fs $remote_fs
++# Required-Stop: $local_fs $remote_fs
++# Default-Start: 2 3 4 5
++# Default-Stop: 0 1 6
++### END INIT INFO
++
++test -f /usr/share/acpi-support/power-funcs || exit 0
++
+ # BUGS: unless we start *really* late, we have no way of throttling
+ # xscreensaver, since it won't be there to command.
+ . /usr/share/acpi-support/power-funcs
+@@ -11,23 +21,30 @@
+
+ test -d /var/lib/acpi-support || exit 0
+
+-shopt -s nullglob
+-
+ case "$1" in
+ start)
+ log_begin_msg "Checking battery state..."
+- /etc/acpi/power.sh
++ if [ x"`echo /proc/acpi/ac_adapter/*`" != x"/proc/acpi/ac_adapter/*" ];
then
++ /etc/acpi/power.sh
++ fi
+ # Source everything in /etc/acpi/start.d/
+ for SCRIPT in /etc/acpi/start.d/*.sh; do
+- . $SCRIPT
++ if [ -f "$SCRIPT" ] ; then
++ . $SCRIPT
++ fi
+ done
+ log_end_msg 0
+ ;;
+ stop)
+ log_begin_msg "Disabling power management..."
+- /etc/acpi/power.sh stop
++ if [ x"`echo /proc/acpi/ac_adapter/*`" != x"/proc/acpi/ac_adapter/*" ];
then
++ /etc/acpi/power.sh stop
++ fi
+ log_end_msg 0
+ ;;
++ restart|force-reload)
++ # Doesn't make sense for that package
++ ;;
+ *)
+ ;;
+ esac
+--- acpi-support-0.103.orig/debian/postrm
++++ acpi-support-0.103/debian/postrm
+@@ -4,4 +4,5 @@
+
+ if [ "$1" = "purge" ] ; then
+ update-rc.d vbesave remove >/dev/null || exit $?
+-fi
+\ No newline at end of file
++fi
++
+--- acpi-support-0.103.orig/debian/docs
++++ acpi-support-0.103/debian/docs
+@@ -1,2 +1 @@
+ README
+-README.toshiba
+--- acpi-support-0.103.orig/debian/copyright
++++ acpi-support-0.103/debian/copyright
+@@ -1,4 +1,7 @@
+-This package written and debianised by Thom May <thom AT canonical.com> based
on work by Matthew Garrett <mjg59 AT srcf.ucam.org>
++This package written and debianised for Ubuntu by Thom May
++<thom AT canonical.com> based on work by Matthew Garrett
++<mjg59 AT srcf.ucam.org>. It was downloaded from
++http://archive.ubuntu.com/ubuntu/pool/main/a/acpi-support/
+
+ Copyright (C) 2004 Canonical Ltd.
+ Authors: Matthew Garrett, Thom May
+@@ -15,7 +18,7 @@
+
+ You should have received a copy of the GNU General Public License along with
+ acpi-support; see the file COPYING. If not, write to the Free Software
+-Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+
+ On Debian systems, a copy of the GNU General Public License is available in
+ /usr/share/common-licenses/GPL as part of the base-files package.
+--- acpi-support-0.103.orig/debian/README.Debian
++++ acpi-support-0.103/debian/README.Debian
+@@ -0,0 +1,22 @@
++
++Handling of obsolete configuration files/scripts
++------------------------------------------------
++
++Since dpkg doesn't not remove conffiles that are no more provided by the
++current version of the package, we have sometimes to disable them manually
++so that they don't create troubles.
++
++The postinst of this package will thus rename some of those files by
++adding a ".obsolete" extension. If you find out such files in
++/etc/acpi/{events,suspend.d,resume.d}, you can safely remove them.
++
++This renaming is required because otherwise they would be actively used
++while they are no more supposed to be there.
++
++You can use the following command to find out the files that could have
++been renamed by the postinst script:
++$ dpkg -s acpi-support | grep obsolete$
++
++(If you have none, it's not a bug, it's just that you installed acpi-support
++after the last removal, or that you purged it to reinstall it properly from
++scratch).
+--- acpi-support-0.103.orig/debian/postinst
++++ acpi-support-0.103/debian/postinst
+@@ -1,43 +1,32 @@
+-#!/bin/bash
++#!/bin/sh
+
+ case "$1" in
+ configure)
++ # Clean up old config files
++ if dpkg --compare-versions "$2" lt "0.95-1"; then
++ # One conffile got renamed
++ if [ -e /etc/acpi/suspend.d/80-video-pci-state.sh ]; then
++ mv -f /etc/acpi/suspend.d/80-video-pci-state.sh
/etc/acpi/suspend.d/81-video-pci-state.sh
++ fi
++ # Other are obsolete and needs to be moved out of the way
++ # The admin can safely remove them himself
++ [ -e /etc/acpi/resume.d/49-855-resolution-set.sh ] && mv
-f /etc/acpi/resume.d/49-855-resolution-set.sh
/etc/acpi/resume.d/49-855-resolution-set.sh.obsolete
++ [ -e /etc/acpi/resume.d/13-855-resolution-set.sh ] && mv
-f /etc/acpi/resume.d/13-855-resolution-set.sh
/etc/acpi/resume.d/13-855-resolution-set.sh.obsolete
++ # This one should be deleted
++ rm -f /etc/modprobe.d/toshiba_acpi.modprobe
++ fi
++
+ invoke-rc.d acpid restart>/dev/null
+ ;;
+ *)
+ ;;
+ esac
+
+-#fix up old packages.
+-if [ -L /etc/rc2.d/S20acpi-support ]; then
+-# we're probably using defaults, so let's blow us away.
+- update-rc.d -f acpi-support remove
+-fi
+-
+-if [ ! -L /etc/rc1.d/K20acpi-support -a -L /etc/rc2.d/S99acpi-support ];
then
+- update-rc.d -f acpi-support remove
+-fi
+-
+ # Remove shutdown and reboot links; this init script does not need them.
+ if dpkg --compare-versions "$2" lt "0.86"; then
+ rm -f /etc/rc0.d/K20acpi-support /etc/rc6.d/K20acpi-support
+ fi
+
+-if dpkg --compare-versions "$2" lt 0.14; then
+- if [ -L /etc/rcS.d/S52vbesave ];then
+- update-rc.d -f vbesave remove >/dev/null
+- fi
+-fi
+-
+-if dpkg --compare-versions "$2" lt 0.47; then
+- if [ -f /var/lib/acpi-support/powerstate ]; then
+- chmod 644 /var/lib/acpi-support/powerstate;
+- fi
+- if [ -f /var/lib/acpi-support/lidstate ]; then
+- chmod 644 /var/lib/acpi-support/lidstate;
+- fi
+-fi
+-
+ if [ -x "/etc/init.d/vbesave" ]; then
+ update-rc.d vbesave start 05 2 3 4 5 . >/dev/null
+ fi
+--- acpi-support-0.103.orig/debian/control
++++ acpi-support-0.103/debian/control
+@@ -1,17 +1,27 @@
+ Source: acpi-support
+ Section: admin
+ Priority: optional
+-Maintainer: Ubuntu Core developers <ubuntu-devel-discuss AT lists.ubuntu.com>
+-XSBC-Original-Maintainer: Matthew Garrett <mjg59 AT srcf.ucam.org>
+-Build-Depends: debhelper (>=4.1.16)
+-Standards-Version: 3.6.1.0
++Maintainer: Bart Samwel <bart AT samwel.tk>
++Uploaders: Loic Minier <lool AT dooz.org>, Raphael Hertzog <hertzog AT debian.org>
++Build-Depends: debhelper (>= 5), libx11-dev, x11proto-xext-dev,
libxtst-dev, x11proto-core-dev
++Vcs-Svn: svn://svn.debian.org/collab-maint/deb-maint/acpi-support/trunk
++Vcs-Browser:
http://svn.debian.org/wsvn/collab-maint/deb-maint/acpi-support/trunk/
++Standards-Version: 3.7.2
+
+ Package: acpi-support
+ Architecture: i386 amd64 ia64 lpia
+-Depends: xset, laptop-mode-tools, acpid (>= 1.0.4-1ubuntu4), hdparm,
lsb-base (>= 1.3-9ubuntu3), ${arch:Depends}, finger, powermgmt-base,
laptop-detect, dmidecode (>= 2.7-1), ${shlibs:Depends}
+-Recommends: toshset, smartdimmer, radeontool
++Depends: ${shlibs:Depends}, x11-xserver-utils, acpid (>= 1.0.4), hdparm,
lsb-base (>= 1.3-9), ${arch:Depends}, finger, powermgmt-base, laptop-detect,
dmidecode (>= 2.7-1), radeontool, nvclock
+ Conflicts: uswsusp (<= 0.2)
+-Description: a collection of useful events for acpi
+- The scripts included in acpi-support include events for lid closure
+- and loss and gain of ac power. These are the only events that can be
+- supported with any level of safety cross platform.
++Suggests: laptop-mode-tools
++Description: scripts for handling many ACPI events
++ This package contains scripts to react to various ACPI events. It only
++ includes scripts for events that can be supported with some level of
++ safety cross platform.
++ .
++ It is able to:
++ * Detect loss and gain of AC power, lid closure, and the press of a
++ number of specific buttons (on Asus, IBM, Lenovo, Panasonic, Sony
++ and Toshiba laptops).
++ * Suspend, hibernate and resume the computer, with workarounds for
++ hardware that needs it.
++ * On some laptops, set screen brightness.
+--- acpi-support-0.103.orig/debian/changelog
++++ acpi-support-0.103/debian/changelog
+@@ -1,839 +1,218 @@
+-acpi-support (0.103) gutsy; urgency=low
++acpi-support (0.103-1) unstable; urgency=low
+
+- * Replace call to 'thinkpad-keys-update' with "thinkpad-keys --update"
+- * Remove wireless-related comment gruff from 'thinkpad-cmos' event.
+-
+- -- Paul Sladen <sladen AT ubuntu.com> Tue, 18 Sep 2007 20:09:02 +0300
+-
+-acpi-support (0.102) gutsy; urgency=low
+-
+- * Poke thinkpad-keys on CMOS notification
+-
+- -- Matthew Garrett <mjg59 AT srcf.ucam.org> Sat, 15 Sep 2007 22:13:42 +0100
+-
+-acpi-support (0.101) gutsy; urgency=low
+-
+- * Switch Thinkpad to using ACPI events for magic keys so that
+- 'thinkpad-keys' can go away and save us all from the new Lenovopad
+- slow NVRAM.
+- - See 'hotkey-setup' for remapping and initial module loading + setup.
+- * Extend mask used in 'thinkpad_acpi.modprobe'.
+- * Replace 'bin/bash' with 'bin/sh' in a couple of files.
+-
+- -- Paul Sladen <sladen AT ubuntu.com> Thu, 13 Sep 2007 19:15:14 +0300
+-
+-acpi-support (0.100) gutsy; urgency=low
+-
+- * send events on ACPI brightness presses
+-
+- -- Matthew Garrett <mjg59 AT srcf.ucam.org> Sun, 09 Sep 2007 18:02:20 +0100
+-
+-acpi-support (0.99) gutsy; urgency=low
+-
+- * prepare.sh: Fix missing space in executability test (thanks, Sitsofe
+- Wheeler and TJ; LP: #136453).
+-
+- -- Colin Watson <cjwatson AT ubuntu.com> Sat, 01 Sep 2007 17:32:01 +0100
+-
+-acpi-support (0.98) gutsy; urgency=low
+-
+- * Add support for the video toggle hotkey
+-
+- -- Matthew Garrett <mjg59 AT srcf.ucam.org> Fri, 31 Aug 2007 05:02:08 +0100
+-
+-acpi-support (0.97) gutsy; urgency=low
+-
+- * Improve X display finding
+- * Switch Thinkpad wireless hotkey control back to firmware for now
+- * Improve Toshiba wireless handling
+- * Check fragment scripts are executable
+- * Improve Panasonic support
+- * Improve state saving/restoring over suspend/resume
+- * Add Asus brightness key support
+- * Alter some dependencies to recommends
+- * Fix init script to check state on boot
+- * Depend on the appropriate shlibdeps
+- * Add a postrm to tidy up the init scripts
+- * We no longer need to stop mysql
+- * Tidy up scripts so a few errors aren't produced
+- * Update sony brightness script to handle sony-laptop
+-
+- -- Matthew Garrett <mjg59 AT srcf.ucam.org> Fri, 31 Aug 2007 04:19:36 +0100
+-
+-acpi-support (0.96ubuntu1) gutsy; urgency=low
+-
+- * Build packages for lpia as well.
+-
+- -- Adam Conrad <adconrad AT ubuntu.com> Wed, 15 Aug 2007 23:48:51 +1000
+-
+-acpi-support (0.96) gutsy; urgency=low
+-
+- * ibm-acpi has been renamed to thinkpad-acpi. Rename options file
accordingly.
+- LP: #119052. Thanks to Benjamin Pineau <ben.pineau AT gmail.com> for the
patch.
+-
+- -- Reinhard Tartler <siretart AT tauware.de> Sun, 15 Jul 2007 18:55:10 +0200
+-
+-acpi-support (0.95) feisty; urgency=low
+-
+- * Clean up issues with toggling multiple wireless cards.
+- - Move variable initiation into loop inside 'wireless.sh'
+- - Move contents of 'wireless.sh' into
lib/state-funcs:toggleAllWirelessState()
+- - Update '{ibm,tosh,asus}-wireless.sh' to use state-funcs
+- (Closes: LP #96107)
+- (Thanks to Nicolò Chieffo for assistance and testing)
+- * Remove spurious 'echo HERE' from lib/state-funcs. D'oh.
+-
+- -- Paul Sladen <paul@katu> Mon, 26 Mar 2007 01:06:58 +0100
+-
+-acpi-support (0.94) feisty; urgency=low
+-
+- * Save and restore values that the kernel does not preserve across
+- suspend/resume and hibernate/resume:
+- - /sys/class/net/eth*/device/rf_kill
+- (Closes: LP #37010)
+- - /proc/acpi/ibm/bluetooth
+- (Closes: LP #37175)
+- - /sys/devices/system/cpu/cpu*/cpufreq/scaling_governor
+- (Closes: LP #68191)
+- * White list Lenovo ThinkPad Z60m as working suspend.
+- (Closes: LP #57144)
++ * New upstream version 0.96 (from Ubuntu Gutsy):
++ * ibm-acpi has been renamed to thinkpad-acpi. Rename options file
++ accordingly. (Closes: #434845)
++ * New upstream version 0.96-ubuntu1 (from Ubuntu Gutsy):
++ * Build packages for lpia as well.
++ * New upstream version 0.97 (from Ubuntu Gutsy):
++ * Improve X display finding
++ * Switch Thinkpad wireless hotkey control back to firmware for now
++ * Improve Toshiba wireless handling
++ * Check fragment scripts are executable
++ * Improve Panasonic support
++ * Improve state saving/restoring over suspend/resume
++ * Add Asus brightness key support
++ * Alter some dependencies to recommends
++ * Fix init script to check state on boot
++ * Depend on the appropriate shlibdeps
++ * Add a postrm to tidy up the init scripts
++ * We no longer need to stop mysql
++ * Tidy up scripts so a few errors aren't produced
++ * Update sony brightness script to handle sony-laptop
++ * New upstream version 0.98 (from Ubuntu Gutsy):
++ * Add support for the video toggle hotkey
++ * New upstream version 0.99 (from Ubuntu Gutsy):
++ * prepare.sh: Fix missing space in executability test.
++ * New upstream version 0.100 (from Ubuntu Gutsy):
++ * send events on ACPI brightness presses
++ * New upstream version 0.101 (from Ubuntu Gutsy):
++ * Switch Thinkpad to using ACPI events for magic keys so that
++ 'thinkpad-keys' can go away and save us all from the new Lenovopad
++ slow NVRAM.
++ - See 'hotkey-setup' for remapping and initial module loading + setup.
++ * Extend mask used in 'thinkpad_acpi.modprobe'.
++ * New upstream version 0.102 (from Ubuntu Gutsy):
++ * Poke thinkpad-keys on CMOS notification
++ * New upstream version 0.103 (from Ubuntu Gutsy):
++ * Replace call to 'thinkpad-keys-update' with "thinkpad-keys --update"
++ * Remove wireless-related comment gruff from 'thinkpad-cmos' event.
++ * Use nvclock instead of smartdimmer for setting LCD brightness on Sony
++ laptops. (Closes: #430491)
++ * Call the correct function in wireless.sh to toglle wireless states.
++ (Closes: #430895)
++ * Correctly detect keyboard event device in acpi_fakekey. (Closes:
#433771)
++ * Add LSB dependency info to acpi-support and vbesave init scripts.
++ (Closes: #432020)
++ * Fix a problem in power-funcs (getXconsole function), which didn't work
when
++ COLUMNS was set. (Closes: #437141)
++ * Press LEFT SHIFT (using acpi_fakekey) after unblanking the screen when
the
++ lid is opened. (Closes: #374069)
++ * Fix path to backlight control file for sony laptops, from upstream
version
++ 0.97. (Closes: #424004)
++ * Honor DEB_BUILD_OPTIONS=nostrip. (Closes: #436370)
++ * Document thinkpad_acpi options in thinkpad_acpi.modprobe. (Closes:
#438430)
++ * Send SIGHUP to ksysguardd on resume so that it reopens its files in
++ /proc/acpi. (Closes: #421017)
++ * Correct directory existence check in power.sh. (Closes: #430494)
++ * Perform error checking for vbetool. (Closes: #445213)
++ * Reduced dependency on xbase-clients to x11-xserver-utils. (Closes:
#438665)
+
+- -- Paul Sladen <sladen AT ubuntu.com> Thu, 22 Mar 2007 03:57:36 +0000
+-
+-acpi-support (0.93) feisty; urgency=low
+-
+- * Change 'wireless.sh' to use 'device/rf_kill' for wireless devices (if
+- available) in preference to 'device/power/state' which was been
+- removed by the upstream kernel developers.
+- (Closes: LP #42820)
+- * Teach 'lib/state-funcs:isAnyWirelessPoweredOn()' to also check
+- 'device/rf_kill' if it's available.
+- (Closes: LP #42820)
+- * Change 'ibm-wireless.sh' to rotate wireless and bluetooth states
+- through the sequence: both, bluetooth only, wireless only, neither.
+- (Closes: LP #24680)
+- * Correct inverted logic in 'isAnyWirelessPoweredOn()'.
+- (Closes: LP #66083)
+- * Change script shebangs to use '/bin/sh' instead of '/bin/bash'.
+-
+- -- Paul Sladen <sladen AT ubuntu.com> Wed, 21 Mar 2007 04:55:27 +0000
+-
+-acpi-support (0.92) feisty; urgency=low
+-
+- * Add 'events/sony-eject' for Sony Vaio TX3.
+- (Closes: LP #55388)
+-
+- -- Paul Sladen <sladen AT ubuntu.com> Sun, 18 Mar 2007 23:09:38 +0000
+-
+-acpi-support (0.91build1) feisty; urgency=low
+-
+- * Rebuild for changes in the amd64 toolchain.
+-
+- -- Matthias Klose <doko AT ubuntu.com> Mon, 5 Mar 2007 01:12:40 +0000
+-
+-acpi-support (0.91) feisty; urgency=low
+-
+- * Identical to 0.90, revert the sync from Debian
+-
+- -- Matthew Garrett <mjg59 AT srcf.ucam.org> Wed, 8 Nov 2006 17:33:04 +0000
+-
+-acpi-support (0.90) edgy; urgency=low
+-
+- * Explicitly switch the screen back to text mode if it was that way
+- before resume
+-
+- -- Matthew Garrett <mjg59 AT srcf.ucam.org> Sun, 15 Oct 2006 18:09:03 +0100
+-
+-acpi-support (0.89) edgy; urgency=low
+-
+- * Add support for high-res uswsusp
+-
+- -- Matthew Garrett <mjg59 AT srcf.ucam.org> Fri, 15 Sep 2006 21:43:54 +0100
+-
+-acpi-support (0.88) edgy; urgency=low
+-
+- * Change defaults
+-
+- -- Matthew Garrett <mjg59 AT srcf.ucam.org> Fri, 15 Sep 2006 17:48:05 +0100
+-
+-acpi-support (0.87) edgy; urgency=low
+-
+- * Add support for using uswsusp
+-
+- -- Matthew Garrett <mjg59 AT srcf.ucam.org> Thu, 24 Aug 2006 01:03:30 +0100
+-
+-acpi-support (0.86) edgy; urgency=low
+-
+- * Remove stop links from rc0 and rc6
+-
+- -- Scott James Remnant <scott AT ubuntu.com> Thu, 20 Jul 2006 23:03:51 +0100
+-
+-acpi-support (0.85) dapper-updates; urgency=low
+-
+- * Don't unload nsc-ircc on suspend
+-
+- -- Matthew Garrett <mjg59 AT srcf.ucam.org> Mon, 19 Jun 2006 10:38:09 +0100
+-
+-acpi-support (0.84) dapper; urgency=low
+-
+- * Whitelist another laptop (Ubuntu #44781)
+- - Hewlett-Packard Pavilion ZV6000
+- * Add whitelist for bizarre old laptop (Closes: Ubuntu #38174)
+-
+- -- Daniel Silverstone <daniel.silverstone AT ubuntu.com> Tue, 23 May 2006
14:02:34 +0100
+-
+-acpi-support (0.83) dapper; urgency=low
+-
+- * Whitelist laptops (Ubuntu #44781) (Closes: Ubuntu #44909)
+- * Fix use of 'pidof' so that it won't bork if multiple processes exist
+- with the same name and to not spawn extra subshells. Also do a
+- more specific 'dcop' call and _only_ if 'dcopserver' is actually
running.
+- * Increase the 'acpilock' back up from 5 -> 10 seconds that got dropped,
+- may help with (Ubuntu #43519).
+- * Save the 'dmidecode' bios-version as we can identify ThinkPads with
blank
+- product-names.
+- * Add entry for ThinkPad R40 with BIOS version "1PET62WW" (Tony Whitmore)
+-
+- -- Paul Sladen <ubuntu AT paul.sladen.org> Mon, 22 May 2006 19:06:40 +0100
+-
+-acpi-support (0.82) dapper; urgency=low
+-
+- * Add more whitelisted laptops
+- * Add battery.d and ac.d (Closes: Ubuntu #44996)
+- * Use pccardctl rather than cardctl (Closes: Ubuntu #44164)
+- * Only call xscreensaver if it's running
+-
+- -- Matthew Garrett <mjg59 AT srcf.ucam.org> Tue, 16 May 2006 13:06:24 +0100
+-
+-acpi-support (0.81) dapper; urgency=low
+-
+- * Whitelist Dell Inspiron XPS Gen2
+- (Closes: Ubuntu #44732)
+-
+- -- Paul Sladen <ubuntu AT paul.sladen.org> Mon, 15 May 2006 00:42:08 +0100
+-
+-acpi-support (0.80) dapper; urgency=low
+-
+- * Add support for the toshiba battery button and add a generic
+- batterybtn.sh action script
+-
+- -- Daniel Silverstone <daniel.silverstone AT ubuntu.com> Wed, 10 May 2006
12:09:25 +0100
+-
+-acpi-support (0.79) dapper; urgency=low
+-
+- * Reorder some checks in order to avoid deadlocks in KDE
+-
+- -- Matthew Garrett <mjg59 AT srcf.ucam.org> Sun, 7 May 2006 14:51:20 +0100
+-
+-acpi-support (0.78) dapper; urgency=low
+-
+- * Fix Sony brightness handling so minimum brightness doesn't "stick"
+-
+- -- Matthew Garrett <mjg59 AT srcf.ucam.org> Sat, 6 May 2006 00:57:38 +0100
+-
+-acpi-support (0.77) dapper; urgency=low
+-
+- * Call smartdimmer even if the Sony acpi brightness value is mad
+-
+- -- Matthew Garrett <mjg59 AT srcf.ucam.org> Fri, 5 May 2006 23:59:16 +0100
+-
+-acpi-support (0.76) dapper; urgency=low
+-
+- * Only save VBE state on laptops - desktops should have a runnable
+- BIOS
+-
+- -- Matthew Garrett <mjg59 AT srcf.ucam.org> Wed, 3 May 2006 21:32:13 +0100
+-
+-acpi-support (0.75) dapper; urgency=low
+-
+- * Default to saving VBE state on boot
+-
+- -- Matthew Garrett <mjg59 AT srcf.ucam.org> Sun, 30 Apr 2006 19:24:51 +0100
+-
+-acpi-support (0.74) dapper; urgency=low
+-
+- * Whitelist Asus A5E [Malone: #37303]
+- Closes: launchpad #37303
+-
+- -- Paul Sladen <ubuntu AT paul.sladen.org> Sun, 30 Apr 2006 02:22:39 +0200
+-
+-acpi-support (0.73) dapper; urgency=low
+-
+- * Fix mis-named interface-down script
+-
+- -- Matthew Garrett <mjg59 AT srcf.ucam.org> Mon, 24 Apr 2006 21:05:43 +0100
+-
+-acpi-support (0.72) dapper; urgency=low
+-
+- * Re-disable laptop-mode by default, to work around LP#12483
+- - Has the pleasant side effect of making the comment match the code
+-
+- -- Matt Zimmerman <mdz AT ubuntu.com> Sat, 22 Apr 2006 05:34:12 -0700
+-
+-acpi-support (0.71) dapper; urgency=low
+-
+- * Split resume.sh and prepare.sh up to make it easier to add appropriate
hooks
+-
+- -- Matthew Garrett <mjg59 AT srcf.ucam.org> Fri, 21 Apr 2006 16:13:19 +0100
+-
+-acpi-support (0.70) dapper; urgency=low
+-
+- * Drop call to ifrename which is not only not installed by default, but
+- conflicts with udev so can't be installed.
+-
+- -- Scott James Remnant <scott AT ubuntu.com> Tue, 18 Apr 2006 09:22:00 +0100
+-
+-acpi-support (0.69) dapper; urgency=low
+-
+- * Add whitelist for Sony VGN-S260
+- Closes: launchpad #32186
+- * Apply patch to unload netconsole if it's present.
+- Closes: launchpad #33885
+-
+- -- Daniel Silverstone <daniel.silverstone AT ubuntu.com> Thu, 13 Apr 2006
10:52:29 +0100
+-
+-acpi-support (0.68) dapper; urgency=low
+-
+- * Bring up only those interfaces we downed, and do it all at once now
+- that ifup doesn't block on the state file each time.
+-
+- -- Scott James Remnant <scott AT ubuntu.com> Thu, 6 Apr 2006 06:32:41 +0100
+-
+-acpi-support (0.67) dapper; urgency=low
+-
+- * ...and fix lib/state-funcs:isAnyWirelessPoweredOn() so that it
+- doesn't have eth1 hard-coded as a wireless device. Oops.
+-
+- -- Paul Sladen <ubuntu AT paul.sladen.org> Wed, 29 Mar 2006 13:56:09 +0100
+-
+-acpi-support (0.66) dapper; urgency=low
+-
+- * Cache result of 'dmidecode -s *' so that they can be access without
+- privileges when checking 'pmi capabilities'. [Malone: #36573]
+-
+- -- Paul Sladen <ubuntu AT paul.sladen.org> Tue, 28 Mar 2006 20:19:48 +0100
+-
+-acpi-support (0.65) dapper; urgency=low
+-
+- * Whitelist Compaq Evo N600c has working SLEEP [Malone: #36838]
+- * Whitelist Sony VGN-FJ1S has working SLEEP [Malone: #29890]
+- * Add support for '/etc/acpi/start.d/*.sh' to be run on startup
+- * Synchronise the Asus Wireless LED on start and resume [Malone: #22795]
+- * Execute {suspend,resume}.d/*.sh at different times depending on
+- whether they match [01]*.sh, [2-7]*.sh, [89]*.sh
+- * Flash the ThinkPad Moon LED while hibernating/suspending.
+-
+- -- Paul Sladen <ubuntu AT paul.sladen.org> Tue, 28 Mar 2006 17:20:48 +0100
+-
+-acpi-support (0.64) dapper; urgency=low
+-
+- * Add support for Asus A6U Touchpad toggle [Malone #31063].
+-
+- -- Paul Sladen <ubuntu AT paul.sladen.org> Sat, 25 Mar 2006 22:38:36 +0000
+-
+-acpi-support (0.63) dapper; urgency=low
+-
+- * Set KEY_BATTERY=236 on the basis that this is going to be assigned
upstream.
+-
+- -- Paul Sladen <ubuntu AT paul.sladen.org> Sat, 25 Mar 2006 19:37:16 +0000
+-
+-acpi-support (0.62) dapper; urgency=low
+-
+- * And the rest
+-
+- -- Matthew Garrett <mjg59 AT srcf.ucam.org> Thu, 23 Mar 2006 21:49:11 +0000
+-
+-acpi-support (0.61) dapper; urgency=low
+-
+- * Use modprobe -r rather than rmmod [Malone #36172]
+-
+- -- Matthew Garrett <mjg59 AT srcf.ucam.org> Thu, 23 Mar 2006 16:36:49 +0000
+-
+-acpi-support (0.60) dapper; urgency=low
+-
+- * Trim trailing spaces from the end of dmidecode strings before looking
+- for the appropriate '.config' file. [Malone #34536]
+- * Add correct handling for new Lenovo ThinkPads that have changed the
+- action of Fn-F3 from KEY_LOCK => KEY_BATTERY. [Malone #35395]
+- * Add Lenovo ThinkPad handling of Fn-F8 to toggle the Touchpad
+- on newer models or do-nothing on normal ThinkPads [Malone #35395]
+- * Append 'aliased-keys' onto 'key-constants' for unassigned keycodes.
+- - Nota Bene: KEY_BATTERY will need updating when assigned upstream.
+- * Fix handling of hexadecimal numbers when generating 'key-constants'.
+-
+- -- Paul Sladen <ubuntu AT paul.sladen.org> Tue, 21 Mar 2006 15:05:02 +0000
+-
+-acpi-support (0.59) dapper; urgency=low
+-
+- * Disable USB module unloading - the kernel seems to manage it better
+- now
+-
+- -- Matthew Garrett <mjg59 AT srcf.ucam.org> Sat, 18 Feb 2006 14:25:11 +0000
+-
+-acpi-support (0.58) dapper; urgency=low
+-
+- * Pull in missing policy-funcs in sleep.sh
+-
+- -- Matthew Garrett <mjg59 AT srcf.ucam.org> Thu, 16 Feb 2006 13:33:51 +0000
+-
+-acpi-support (0.57) dapper; urgency=low
+-
+- * Re-enable laptop-mode
+-
+- -- Matthew Garrett <mjg59 AT srcf.ucam.org> Thu, 16 Feb 2006 00:37:52 +0000
+-
+-acpi-support (0.56) dapper; urgency=low
+-
+- * Re-enable hard drive power saving
+- * Disable laptop-mode before starting hibernate
+- * Fix PCI state saving for PCI devices
+- * Remove recommends on xscreensaver
+- * Fix policy checking - don't run certain scripts if a desktop policy
+- manager is running
+- * Unload ndiswrapper after taking down its interface
+-
+- -- Matthew Garrett <mjg59 AT srcf.ucam.org> Thu, 16 Feb 2006 00:29:29 +0000
+-
+-acpi-support (0.55) dapper; urgency=low
+-
+- * Change asus-lock and tosh-lock to invoke lockbtn.sh which in turn will
+- create a KEY_COFFEE event.
+- This needs a kernel fix before it will be of much use in the general
case.
+- * Add tosh-www to run webbtn.sh
+- * Add tosh-mail to run mailbtn.sh
+- * Add tosh-ibutton to run mediabtn.sh
+-
+- -- Daniel Silverstone <daniel.silverstone AT ubuntu.com> Wed, 15 Feb 2006
17:35:19 +0000
+-
+-acpi-support (0.54) dapper; urgency=low
+-
+- * Fix acpi_fakekey
+-
+- -- Matthew Garrett <mjg59 AT srcf.ucam.org> Mon, 13 Feb 2006 18:40:46 +0000
+-
+-acpi-support (0.53) dapper; urgency=low
+-
+- * Transition model-specific sleep and hibernate buttons to use
+- keycodes rather than executing scripts directly
+- * Don't directly execute the sleep script if g-p-m or klaptopdaemon
+- are running - they should define policy
+- * Change to using symbolic constants rather than numbers (patch from
+- Paul Sladen <ubuntu AT paul.sladen.org>
+-
+- -- Matthew Garrett <mjg59 AT srcf.ucam.org> Mon, 6 Feb 2006 14:55:50 +0000
+-
+-acpi-support (0.52) dapper; urgency=low
+-
+- * Stop using uinput - fake keyboard input directly
+-
+- -- Matthew Garrett <mjg59 AT srcf.ucam.org> Fri, 27 Jan 2006 04:29:18 +0000
+-
+-acpi-support (0.51) dapper; urgency=low
+-
+- * Switch on brightness support in ibm-acpi
+-
+- -- Matthew Garrett <mjg59 AT srcf.ucam.org> Tue, 24 Jan 2006 03:25:23 +0000
+-
+-acpi-support (0.50) dapper; urgency=low
+-
+- * Load uinput module on boot (Ubuntu #21566)
+- * Fix power.sh conditionals (Ubuntu #21567)
+-
+- -- Matthew Garrett <mjg59 AT srcf.ucam.org> Tue, 27 Dec 2005 14:55:55 +0000
+-
+-acpi-support (0.49) dapper; urgency=low
+-
+- * Use uinput rather than hacky X stuff to fake keypresses
+-
+- -- Matthew Garrett <mjg59 AT srcf.ucam.org> Sat, 24 Dec 2005 20:33:38 +0000
+-
+-acpi-support (0.48) dapper; urgency=low
+-
+- * Only depend on vbetool on i386 and amd64
+- * Fix reference to SCREEN_LOCK - should have been LOCK_SCREEN
+-
+- -- Matthew Garrett <mjg59 AT srcf.ucam.org> Sat, 24 Dec 2005 18:56:01 +0000
+-
+-acpi-support (0.47) dapper; urgency=low
+-
+- * Freeze the framebuffer around sleep/resume
+- * Check SCREEN_LOCK on lid close (Ubuntu #20007)
+- * Work with newer dmidecodes (Ubuntu #19879)
+- * Use laptop-mode-tools rather than laptop-mode (Ubuntu #19572)
+- * Remove extra radeontool call (Ubuntu #18208)
+- * Add radeontool and smartdimmer to depends
+- * Add support for saving/restoring video PCI state (Ubuntu #17972)
+- * Fix the permissions on /var/lib/acpi-support/powerstate (Ubuntu #17606)
+- * Reenable spindown timings on SATA drives (Ubuntu #17230)
+- * Poke alsa to improve sound recovery
+- * Kill dhclient while suspending - otherwise it blocks ifdown
+-
+- -- Matthew Garrett <mjg59 AT srcf.ucam.org> Tue, 29 Nov 2005 18:25:31 +0000
+-
+-acpi-support (0.46) breezy; urgency=low
+-
+- * Add some extra machines to the whitelists
+- * Depend on powermgmt-base
+- * Disable restarting irda services by default
+- * Disable laptop-mode by default
+-
+- -- Matthew Garrett <mjg59 AT srcf.ucam.org> Wed, 12 Oct 2005 12:50:11 +0100
+-
+-acpi-support (0.45) breezy; urgency=low
+-
+- * Remove sneaky new dependencies on radeontool and smartdimmer. We're too
+- close to release to start poking the hardware in interesting new ways by
+- default
+-
+- -- Matt Zimmerman <mdz AT ubuntu.com> Tue, 4 Oct 2005 17:35:54 -0700
+-
+-acpi-support (0.44) breezy; urgency=low
+-
+- * Fix whitelisting
+- * Fix resume when suspended for longer than the xscreensaver timeout
+- * Disable attempts to use hdparm on SATA drives - we don't have the
+- kernel support.
+-
+- -- Matthew Garrett <mjg59 AT srcf.ucam.org> Tue, 4 Oct 2005 16:44:01 +0100
+-
+-acpi-support (0.43) breezy; urgency=low
+-
+- * Fix Radeon backlight tweak support
+- * Fix lid closing screen locking
+- * Fix check for ac adapters
+-
+- -- Matthew Garrett <mjg59 AT srcf.ucam.org> Tue, 4 Oct 2005 05:07:58 +0100
+-
+-acpi-support (0.42) breezy; urgency=low
+-
+- * Fix missing fi statement in init script
+-
+- -- Matthew Garrett <mjg59 AT srcf.ucam.org> Mon, 3 Oct 2005 02:03:21 +0100
+-
+-acpi-support (0.41) breezy; urgency=low
+-
+- * Make sure that xscreensaver-command -lock is always called
+- * Use smartdimmer on Sonys if it's available. Nnngh.
+- * Add support for resetting IDE drives more enthusiastically
+- * Add support for using radeontool on some awkward machines
+- * Unload/reload fan and thermal modules on resume to increase the
+- chances of them working
+- * Unload/reload ibm-acpi if it's loaded (#14791)
+- * Fix lid.sh (#16802)
+- * Unify init script/power.sh, and make sure power.sh is called on
+- resume (#14833)
+-
+- -- Matthew Garrett <mjg59 AT srcf.ucam.org> Mon, 3 Oct 2005 00:48:57 +0100
+-
+-acpi-support (0.40) breezy; urgency=low
+-
+- * Add a large set of whitelisted laptops
+- * Export DISPLAY before trying to call apps (closes: #16555)
+-
+- -- Matthew Garrett <mjg59 AT srcf.ucam.org> Sat, 1 Oct 2005 18:01:54 +0100
+-
+-acpi-support (0.39) breezy; urgency=low
+-
+- * Fix up a couple of bugs in the display handling code
+-
+- -- Matthew Garrett <mjg59 AT srcf.ucam.org> Fri, 30 Sep 2005 04:25:58 +0100
+-
+-acpi-support (0.38) breezy; urgency=low
+-
+- * Add support for leaving some modules loaded
+- * Run X commands on all displays, not just :0
+- * Run hotkey commands on the foremost console
+-
+- -- Matthew Garrett <mjg59 AT srcf.ucam.org> Fri, 30 Sep 2005 03:40:32 +0100
+-
+-acpi-support (0.37) breezy; urgency=low
+-
+- * Add support for custom suspend and resume scripts
+- * Add Toshiba brightness restoration over suspend/resume
+- (Both provided by Daniel Silverstone)
+- * Run 855resolution on resume if it's configured (closes: #16271)
+- * Revert to using xscreensaver
+- * Stop services before unloading modules (closes: #16008)
+- * Fix syntax error in asus-wireless.sh
+-
+- -- Matthew Garrett <mjg59 AT srcf.ucam.org> Tue, 27 Sep 2005 01:48:39 +0100
+-
+-acpi-support (0.36) breezy; urgency=low
+-
+- * Change Panasonic brightness on button down, not button release
+- * Fix quoting in vbesave init script
+-
+- -- Matthew Garrett <mjg59 AT srcf.ucam.org> Fri, 23 Sep 2005 11:58:37 +0100
+-
+-acpi-support (0.35) breezy; urgency=low
+-
+- * Fix for occasionally picking the wrong user
+-
+- -- Matthew Garrett <mjg59 AT srcf.ucam.org> Wed, 21 Sep 2005 00:07:08 +0100
+-
+-acpi-support (0.34) breezy; urgency=low
+-
+- The "I do not wish to discuss it" release
+-
+- * Add workaround for prodding fans back into life on resume
+- * Add sick evil code for doing sick evil things to sick evil
+- screensavers
+-
+- -- Matthew Garrett <mjg59 AT srcf.ucam.org> Tue, 20 Sep 2005 03:15:46 +0100
+-
+-acpi-support (0.33) breezy; urgency=low
+-
+- * Remove hdparm -B calls in the init scripts
+-
+- -- Matthew Garrett <mjg59 AT srcf.ucam.org> Thu, 15 Sep 2005 21:16:54 +0100
+-
+-acpi-support (0.32) breezy; urgency=low
+-
+- * Add correct quoting to check for running PowerManager
+- * Remove PowerManager checking from lid script
+-
+- -- Matthew Garrett <mjg59 AT srcf.ucam.org> Thu, 15 Sep 2005 15:55:12 +0100
+-
+-acpi-support (0.31) breezy; urgency=low
+-
+- * Don't mess with hdparm -B; it triggers a bug elsewhere which causes
+- the system to hang on some laptops
+-
+- -- Matt Zimmerman <mdz AT ubuntu.com> Wed, 14 Sep 2005 15:28:21 -0700
+-
+-acpi-support (0.30) breezy; urgency=low
+-
+- * Remove hardcoded /dev/hda from the init script
+- * Unload irda modules on suspend - they don't tend to survive
+- * Make sure that we power the screen back on on lid open
+- * Don't unload/reload input modules - it seems to break things
+- * Background xscreensaver locking
+-
+- -- Matthew Garrett <mjg59 AT srcf.ucam.org> Fri, 2 Sep 2005 17:47:17 +0100
+-
+-acpi-support (0.29) breezy; urgency=low
+-
+- * Deal more nicely with running IRDA, otherwise the kernel tends to
+- oops
+-
+- -- Matthew Garrett <mjg59 AT srcf.ucam.org> Thu, 1 Sep 2005 18:09:14 +0100
+-
+-acpi-support (0.28) breezy; urgency=low
+-
+- * If power-manager is running, let it determine policy rather than
+- running scripts blindly. Ignore this for machine-specific hotkeys.
+-
+- -- Matthew Garrett <mjg59 AT srcf.ucam.org> Tue, 30 Aug 2005 18:13:40 +0100
+-
+-acpi-support (0.27) breezy; urgency=low
+-
+- * Use "..." rather than ":" in init script messages, for consistency with
+- other scripts
+-
+- -- Matt Zimmerman <mdz AT ubuntu.com> Mon, 29 Aug 2005 15:51:25 -0700
+-
+-acpi-support (0.26) breezy; urgency=low
+-
+- * Fix power.sh so that it actually works (Ubuntu #14241)
+- * Add support for Sony brightness control (Ubuntu #14188)
+- * Include scripts for Asus volume control (Ubuntu #14164)
+-
+- -- Matthew Garrett <mjg59 AT srcf.ucam.org> Sun, 28 Aug 2005 17:33:14 +0100
+-
+-acpi-support (0.25) breezy; urgency=low
+-
+- * Depend on xset (Ubuntu #13997)
+-
+- -- Matthew Garrett <mjg59 AT srcf.ucam.org> Thu, 25 Aug 2005 10:12:35 +0100
+-
+-acpi-support (0.24) breezy; urgency=low
+-
+- * Add another missing build-depend DANIEL WHY DO YOU HATE ME SO
+-
+- -- Matthew Garrett <mjg59 AT srcf.ucam.org> Thu, 25 Aug 2005 01:34:14 +0100
+-
+-acpi-support (0.23) breezy; urgency=low
+-
+- * Add missing build-depends
+-
+- -- Matthew Garrett <mjg59 AT srcf.ucam.org> Thu, 25 Aug 2005 01:20:28 +0100
+-
+-acpi-support (0.22) breezy; urgency=low
+-
+- [ Thom May ]
+- * Import into bzr.
+- * Notify NetworkManager on suspend and resume, and Recommend:
+- network-manager
+-
+- [ Matthew Garrett ]
+- * Add support for sending key events to userspace
+- * Add scripts for various media events
+- * Let the BIOS handle video hotkey events on Thinkpads
+- * Add ACPI events for Toshiba media buttons
+- * Don't change VTs on lid close
+- * Remove gratuitous sleep statements
+- * Improve the ability to guess the user and home directory
+- * Add more support for Panasonic and Asus machines
+- * Improve Asus and Thinkpad wireless control scripts
+- * Support SATA disks
+- * Eject PCMCIA cards at a more appropriate time, and handle
+- ndiswrapper
+- * Support Toshiba bluetooth switching
+-
+- -- Matthew Garrett <mjg59 AT srcf.ucam.org> Mon, 22 Aug 2005 21:55:51 +0100
+-
+-acpi-support (0.21) hoary; urgency=low
+-
+- * Ensure we only return one match from grep.
+- * Run /etc/acpi/local/lid.sh.post if it exists.
+- * sleep for one second, then nuke the acpi lock
+-
+- -- Thom May <thom AT ubuntu.com> Fri, 1 Apr 2005 11:37:06 +0100
+-
+-acpi-support (0.20) hoary; urgency=low
+-
+- * Ifrename on resume so our interfaces are called the same. (Ubuntu:
#7480)
+- * call xscreensaver-command -deactivate so we get a dialog rather than a
+- blank screen when we resume. (Ubuntu: #7717)
+- * Don't clobber LIDSTATE when we mean POWERSTATE (Ubuntu: #8258)
+- * Background the acpid lock removal
+-
+- -- Thom May <thom AT ubuntu.com> Thu, 17 Mar 2005 17:39:22 +0000
+-
+-acpi-support (0.19.1) hoary; urgency=low
+-
+- * Ensure that we only attempt to save vbe state if ACPI_SLEEP is enabled
+-
+- -- Thom May <thom AT ubuntu.com> Mon, 7 Mar 2005 12:49:28 +0000
+-
+-acpi-support (0.19) hoary; urgency=low
+-
+- * Add ia64 to the list of supported architectures
+-
+- -- Thom May <thom AT ubuntu.com> Wed, 2 Mar 2005 23:19:57 +0000
+-
+-acpi-support (0.18) hoary; urgency=low
+-
+- * Fix vbesave init script (Ubuntu: #6907)
+-
+- -- Thom May <thom AT ubuntu.com> Fri, 25 Feb 2005 11:03:48 +0000
+-
+-acpi-support (0.17) hoary; urgency=low
+-
+- * Use acpid locking functionality finally (Hi, Martijn!)
+- * vbestate:
+- - Test for existence of vbetool
+- - LSBifiy
+- - Convert to a true init script
+- - quieten
+- * Check whether package has been removed but not purged in init script
+-
+- -- Thom May <thom AT ubuntu.com> Wed, 23 Feb 2005 15:07:51 +0000
+-
+-acpi-support (0.16) hoary; urgency=low
+-
+- * Fix dumb typos
+-
+- -- Thom May <thom AT debian.org> Mon, 24 Jan 2005 17:30:48 +0000
+-
+-acpi-support (0.15) hoary; urgency=low
+-
+- * Install ibm_acpi.modprobe and tosh_acpi.modprobe by default
+-
+- -- Thom May <thom AT planetarytramp.net> Sat, 22 Jan 2005 16:18:09 +0000
+-
+-acpi-support (0.14) hoary; urgency=low
+-
+- * Run vbesave at the top of rc2, rather than in rcS, so we can still boot
to
+- single user
+-
+- -- Thom May <thom AT planetarytramp.net> Mon, 17 Jan 2005 17:26:37 +0000
+-
+-acpi-support (0.13) hoary; urgency=low
+-
+- * Update toshiba scripts to handle both possible BIOS values
+- * Fix == bashisms. (Ubuntu #5566)
+- * Fix up ASUS event scripts. (Ubuntu #5510)
+-
+- -- Thom May <thom AT planetarytramp.net> Fri, 14 Jan 2005 12:31:29 +0000
+-
+-acpi-support (0.12) hoary; urgency=low
+-
+- * Depend on vbetool on i386 only
+-
+- -- Thom May <thom AT planetarytramp.net> Fri, 14 Jan 2005 10:48:37 +0000
+-
+-acpi-support (0.11) hoary; urgency=low
+-
+- * Add Toshiba, Asus and Panasonic event scripts
+- * Add Toshiba modprobe config and README
+- * All Tosh stuff courtesy of Daniel Silverstone
+-
+- -- Thom May <thom AT planetarytramp.net> Thu, 13 Jan 2005 16:08:48 +0000
+-
+-acpi-support (0.10) hoary; urgency=low
+-
+- * Matthew Garrett:
+- - /etc/defaults/acpi-support: new
+- - hotplug events for IBM laptops
+- - lots more
+-
+- -- Thom May <thom AT planetarytramp.net> Thu, 13 Jan 2005 12:27:47 +0000
+-
+-acpi-support (0.9) warty; urgency=low
+-
+- * Add stop target to the init script, disable hdparm advanced power
+- management therein. (Warty #1914)
+-
+- -- Thom May <thom AT canonical.com> Tue, 5 Oct 2004 21:18:52 +0100
+-
+-acpi-support (0.8) warty; urgency=low
+-
+- * Explicitly add /usr/bin/X11 to path. (Warty #1549)
+-
+- -- Thom May <thom AT canonical.com> Fri, 24 Sep 2004 12:08:20 +0100
+-
+-acpi-support (0.7) warty; urgency=low
+-
+- * Added versioned depend on lsb-base
+-
+- -- Nathaniel McCallum <npmccallum AT canonical.com> Fri, 3 Sep 2004
14:45:32 -0400
+-
+-acpi-support (0.6) warty; urgency=low
+-
+- * Load after acpid. (Warty #992)
+-
+- -- Thom May <thom AT planetarytramp.net> Fri, 3 Sep 2004 18:39:52 +0100
+-
+-acpi-support (0.5) warty; urgency=low
+-
+- * debian/init.d: pretty initscript
+-
+- -- Nathaniel McCallum <npmccallum AT canonical.com> Thu, 2 Sep 2004
13:16:21 -0400
+-
+-acpi-support (0.4) warty; urgency=low
+-
+- * use a subdirectory of /var/lib (Closes Warty #842)
+- * don't hardcode names so that suckful HP boxes might work. (Closes Warty
+- #841)
+-
+- -- Thom May <thom AT planetarytramp.net> Tue, 31 Aug 2004 15:27:13 +0100
+-
+-acpi-support (0.3) warty; urgency=low
+-
+- * Apparently, acpid needs a good kick when we change the events.
+-
+- -- Thom May <thom AT planetarytramp.net> Thu, 19 Aug 2004 18:38:55 +0100
+-
+-acpi-support (0.2) warty; urgency=low
+-
+- * use a safer state file to maintain state across lid open/close
+-
+- -- Thom May <thom AT planetarytramp.net> Thu, 19 Aug 2004 17:43:38 +0100
++ -- Bart Samwel <bart AT samwel.tk> Sun, 07 Oct 2007 11:15:00 +0200
+
+-acpi-support (0.1) warty; urgency=low
++acpi-support (0.95-2) unstable; urgency=low
+
+- * First upload.
+- * delimit a basic collection of safe acpi events
++ * Remove spurious file acpi-support_0.90-2.diff.gz added in the repository
++ during last merge (it's still in the orig.tar.gz though).
++ * Add a new SKIP_INTERFACES variables in /etc/default/acpi-support and use
++ it to define network interfaces that are not tied to hardware to avoid
++ shutting them down during suspend.
++ * Properly remove files that have been removed in the SVN in the clean
++ target. This is required because the files are still present in the
++ .orig.tar.gz file (otherwise autobuilder builds will have the unwanted
++ files).
++ * Add XS-Vcs-* fields in debian/control.
++
++ -- Raphael Hertzog <hertzog AT debian.org> Fri, 15 Jun 2007 21:34:42 +0200
++
++acpi-support (0.95-1) unstable; urgency=low
++
++ [ Bart Samwel ]
++ * New upstream versions (from Ubuntu Feisty and Gutsy).
++ * 0.95: Clean up issues with toggling multiple wireless cards.
++ - Move variable initiation into loop inside 'wireless.sh'
++ - Move contents of 'wireless.sh' into
lib/state-funcs:toggleAllWirelessState()
++ - Update '{ibm,tosh,asus}-wireless.sh' to use state-funcs
++ * 0.95: Remove spurious 'echo HERE' from lib/state-funcs. D'oh.
++ * 0.94: Save and restore values that the kernel does not preserve across
++ suspend/resume and hibernate/resume:
++ - /sys/class/net/eth*/device/rf_kill
++ - /proc/acpi/ibm/bluetooth
++ - /sys/devices/system/cpu/cpu*/cpufreq/scaling_governor
++ * 0.94: White list Lenovo ThinkPad Z60m as working suspend.
++ * 0.93: Change 'wireless.sh' to use 'device/rf_kill' for wireless
++ devices (if available) in preference to 'device/power/state' which
++ has been removed by the upstream kernel developers.
++ * 0.93: Teach 'lib/state-funcs:isAnyWirelessPoweredOn( )' to also check
++ 'device/rf_kill' if it's available.
++ * 0.93: Change 'ibm-wireless.sh' to rotate wireless and bluetooth states
++ * 0.93: Correct inverted logic in 'isAnyWirelessPoweredOn()'.
++ * 0.93: Change script shebangs to use '/bin/sh' instead of '/bin/bash'.
++ * 0.92: Add 'events/sony-eject' for Sony Vaio TX3.
++ * Stop pretending to control laptop-mode-tools, which
++ only works (and badly too) in the upstream Ubuntu version. The lmt
++ package provides its own acpi bindings. Add reference in config file
++ to laptop-mode-tools as a replacement for the current non-working
++ configuration option. (Closes: #425800)
++ * Change Recommends of laptop-mode-tools to Suggests. This should prevent
++ automatic enabling of laptop mode for unsuspecting users, it should not
++ be installed by default.
++ * Check that acpi-support is still installed in script configuration
files.
++ (Closes: #424752)
++ * Change order of PCI video state restoration so that it is always the
last
++ to be saved and the first to be restored. (Closes: #396897)
++ * Only use ifup/ifdown for interfaces listed by /etc/network/run/ifstate.
++ For other interfaces that are up, use "ifconfig down" to force them
down,
++ and restart network-manager and ifplugd after resume to bring them back
up.
++ (Closes: #373659)
++ * Do not ifup/down "lo" and "dummy..." interfaces over suspend.
++ (Closes: #427128)
++ * Removed bash dependencies. (Note that this may break custom scripts in
++ /etc/acpi that contain bashisms, as the scripts are sourced, not just
++ executed.) (Closes: #407510)
++ * Instead of only restoring the hardware clock on resume, stop and start
the
++ hwclock.sh service over suspend. (Closes: #389537)
++ * Move radeontool call out of loop in lid.sh. (Mentioned in bug 391498,
but
++ does not solve the bug.)
++ * Potential fix for "sometimes lid.sh doesn't work" bug. (Part of bug
391498,
++ but not enough to close it.)
++ * Bump up Debhelper compatibility level to 5.
++ * Remove useless use of grep in asus-touchpad.sh.
++
++ [ Raphael Hertzog ]
++ * Mark Bart as Maintainer.
++ * Put myself in Uploaders instead.
++ * Sponsor upload for Bart. Change version to 0.95-1.
++ * Manually remove (or move out of the way) old scripts in postint.
Concerns:
++ - /etc/acpi/suspend.d/80-video-pci-state.sh
++ - /etc/acpi/resume.d/49-855-resolution-set.sh
++ - /etc/acpi/resume.d/13-855-resolution-set.sh
++ - /etc/modprobe.d/toshiba_acpi.modprobe
++ * Documents policy for handling obsolete configuration files in
++ README.Debian.
++
++ -- Raphael Hertzog <hertzog AT debian.org> Thu, 14 Jun 2007 21:52:16 +0200
++
++acpi-support (0.90-4) unstable; urgency=low
++
++ * Change logic of isAnyWirelessPoweredOn() to only succeed if one wireless
++ device with support for reporting a "state" in sysfs is turned on;
++ closes: #410402.
++ * Add myself as uploader.
++ * Install new manpage for acpi_fakekey, thanks Nico Golde; closes:
#383365.
++ * Call dh_strip to drop the ELF comment section of acpi_fakekey.
++ * Depend on radeontool on all arches.
++
++ -- Loic Minier <lool AT dooz.org> Sun, 11 Feb 2007 19:48:22 +0100
++
++acpi-support (0.90-3) unstable; urgency=low
++
++ * Disable VESA BIOS Extensions (VBE) state saving / restoring for X60s
++ Thinkpads (models 1702*, 1704*); closes: 407188.
++
++ -- Loic Minier <lool AT dooz.org> Fri, 19 Jan 2007 22:57:56 +0100
++
++acpi-support (0.90-2) unstable; urgency=low
++
++ * Invoke /usr/sbin/s2disk instead of /sbin/s2disk; thanks Jan Luebbe.
++ * Don't pass any arguments to s2disk as it doesn't support these in newer
++ uswsusp versions.
++ * Fix "APCI" instead of "ACPI" typo in IBM.config; thanks Joshua Kwan;
++ closes: #389511.
++
++ -- Loic Minier <lool AT dooz.org> Sun, 22 Oct 2006 19:15:00 +0200
++
++acpi-support (0.90-1) unstable; urgency=low
++
++ * New upstream versions (from Ubuntu Edgy).
++ * 0.90: Explicitly switch the screen back to text mode if it was that
way
++ before resume.
++ * 0.89: Add support for high-res uswsusp
++ * 0.88: Change defaults
++ * 0.87: Add support for using uswsusp
++ * Conflict with uswsusp <= 0.2 as well.
++
++ -- Loic Minier <lool AT dooz.org> Sat, 21 Oct 2006 12:59:06 +0200
++
++acpi-support (0.86-1) unstable; urgency=low
++
++ * New upstream version (from Ubuntu Edgy).
++ * 0.86: Remove stop links from rc0 and rc6
++ * 0.85: Don't unload nsc-ircc on suspend
++ * Add ${shlibs:Depends} and call to dh_shlibdeps. Closes: #383449
++ * 855resolution is no more in Debian, replaced by 915resolution.
++ Closes: #381210
++ * Improved description, thanks to Clément Stenac. Closes: #383691
++ * Removed README.toshiba which doesn't apply to Debian (or which doesn't
++ apply any more, the toshiba_acpi option indicated doesn't exist in
++ 2.6.17.7). Closes: #383326
++
++ -- Raphael Hertzog <hertzog AT debian.org> Sun, 20 Aug 2006 10:43:59 +0200
++
++acpi-support (0.84-1) unstable; urgency=low
++
++ * New upstream version.
++ * Put laptop-mode-tools in Recommends instead of Depends to not force the
++ user to use it: it can be painful to have to wait for the disk to spin
up
++ and the gain is not always worth it with recent (very small) hard-disks.
++ * Add upstream changelog.
++
++ -- Raphael Hertzog <hertzog AT debian.org> Fri, 16 Jun 2006 17:51:06 +0200
++
++acpi-support (0.80-1) unstable; urgency=low
++
++ * Initial release.
++ * Add a watch file.
++ * Little fixes for lintian compliancy.
+
+- -- Thom May <thom AT planetarytramp.net> Thu, 19 Aug 2004 15:33:01 +0100
++ -- Raphael Hertzog <hertzog AT debian.org> Mon, 15 May 2006 00:02:44 +0000
+--- acpi-support-0.103.orig/screenblank.sh
++++ acpi-support-0.103/screenblank.sh
+@@ -1,4 +1,6 @@
+-#!/bin/bash
++#!/bin/sh
++
++test -f /usr/share/acpi-support/power-funcs || exit 0
+
+ . /etc/default/acpi-support
+ . /usr/share/acpi-support/power-funcs
+--- acpi-support-0.103.orig/mutebtn.sh
++++ acpi-support-0.103/mutebtn.sh
+@@ -1,3 +1,6 @@
+ #!/bin/sh
++
++test -f /usr/share/acpi-support/power-funcs || exit 0
++
+ . /usr/share/acpi-support/key-constants
+ acpi_fakekey $KEY_MUTE
+--- acpi-support-0.103.orig/sleepbtn.sh
++++ acpi-support-0.103/sleepbtn.sh
+@@ -1,3 +1,6 @@
+-#!/bin/bash
++#!/bin/sh
++
++test -f /usr/share/acpi-support/power-funcs || exit 0
++
+ . /usr/share/acpi-support/key-constants
+ acpi_fakekey $KEY_SLEEP
+--- acpi-support-0.103.orig/prevbtn.sh
++++ acpi-support-0.103/prevbtn.sh
+@@ -1,3 +1,6 @@
+-#!/bin/bash
++#!/bin/sh
++
++test -f /usr/share/acpi-support/power-funcs || exit 0
++
+ . /usr/share/acpi-support/key-constants
+ acpi_fakekey $KEY_PREVIOUSSONG
+--- acpi-support-0.103.orig/asus-wireless.sh
++++ acpi-support-0.103/asus-wireless.sh
+@@ -1,6 +1,8 @@
+ #!/bin/sh
+ # Find and toggle wireless devices on Asus laptops
+
++test -f /usr/share/acpi-support/power-funcs || exit 0
++
+ . /usr/share/acpi-support/state-funcs
+
+ toggleAllWirelessStates;
+--- acpi-support-0.103.orig/thinkpad-stretchortouchpad.sh
++++ acpi-support-0.103/thinkpad-stretchortouchpad.sh
+@@ -1,5 +1,7 @@
+ #!/bin/sh
+
++test -f /usr/share/acpi-support/power-funcs || exit 0
++
+ # Lenovo rock. They have changed the function of the Fn-F8
+ # combination on the LenovoPads from stretching the display (in
+ # hardware/BIOS) to toggling the touchpad on and off.
diff --git a/mobile/acpi-support/acpi-support_0.103-1__add.diff
b/mobile/acpi-support/acpi-support_0.103-1__add.diff
new file mode 100644
index 0000000..3b2b199
--- /dev/null
+++ b/mobile/acpi-support/acpi-support_0.103-1__add.diff
@@ -0,0 +1,264 @@
+diff -Naur acpi-support-0.102.orig/debian/init.d
acpi-support-0.102/debian/init.d
+--- acpi-support-0.102.orig/debian/init.d 2007-10-15 16:35:33.000000000
-0600
++++ acpi-support-0.102/debian/init.d 2007-10-15 17:14:08.000000000 -0600
+@@ -10,43 +10,47 @@
+ # Default-Stop: 0 1 6
+ ### END INIT INFO
+
++# Adding smgl stuff..
++PROGRAM=/etc/acpi/power.sh
++RUNLEVEL=3
++. /etc/init.d/smgl_init
++
+ test -f /usr/share/acpi-support/power-funcs || exit 0
+
+ # BUGS: unless we start *really* late, we have no way of throttling
+ # xscreensaver, since it won't be there to command.
+ . /usr/share/acpi-support/power-funcs
+
+-test -f /lib/lsb/init-functions || exit 1
+-. /lib/lsb/init-functions
+-
+ test -d /var/lib/acpi-support || exit 0
+
+-case "$1" in
+- start)
+- log_begin_msg "Checking battery state..."
+- if [ x"`echo /proc/acpi/ac_adapter/*`" != x"/proc/acpi/ac_adapter/*" ];
then
+- /etc/acpi/power.sh
+- fi
+- # Source everything in /etc/acpi/start.d/
+- for SCRIPT in /etc/acpi/start.d/*.sh; do
+- if [ -f "$SCRIPT" ] ; then
+- . $SCRIPT
+- fi
+- done
+- log_end_msg 0
+- ;;
+- stop)
+- log_begin_msg "Disabling power management..."
+- if [ x"`echo /proc/acpi/ac_adapter/*`" != x"/proc/acpi/ac_adapter/*" ];
then
+- /etc/acpi/power.sh stop
+- fi
+- log_end_msg 0
+- ;;
+- restart|force-reload)
+- # Doesn't make sense for that package
+- ;;
+- *)
+- ;;
+-esac
+-
++# Changing to support smgl init way to do things...
+
++function start() {
++ echo "Checking battery state..."
++ if [ x"`echo /proc/acpi/ac_adapter/*`" != x"/proc/acpi/ac_adapter/*"
]; then
++ $PROGRAM
++ fi
++ # Source everything in /etc/acpi/start.d/
++ for SCRIPT in /etc/acpi/start.d/*.sh; do
++ if [ -f "$SCRIPT" ] ; then
++ . $SCRIPT
++ fi
++ done
++ echo "Done..."
++}
++
++function stop() {
++ echo "Disabling power management..."
++ if [ x"`echo /proc/acpi/ac_adapter/*`" != x"/proc/acpi/ac_adapter/*"
]; then
++ $PROGRAM stop
++ fi
++ echo "Done..."
++}
++
++function restart() {
++ echo "Unsupported..."
++}
++
++function force-reload() {
++ echo "Unsupported..."
++}
+diff -Naur acpi-support-0.102.orig/lid.sh acpi-support-0.102/lid.sh
+--- acpi-support-0.102.orig/lid.sh 2007-10-15 16:35:33.000000000 -0600
++++ acpi-support-0.102/lid.sh 2007-10-15 16:48:29.000000000 -0600
+@@ -13,41 +13,67 @@
+ grep -q closed /proc/acpi/button/lid/*/state
+ if [ $? = 0 ]
+ then
+- for x in /tmp/.X11-unix/*; do
+- displaynum=`echo $x | sed s#/tmp/.X11-unix/X##`
+- getXconsole;
+- if [ x"$XAUTHORITY" != x"" ]; then
+- export DISPLAY=":$displaynum"
+- . /usr/share/acpi-support/screenblank
++ ls /tmp/.X11-unix/*
++ if [ $? != 0 ]
++ then
++ if [ -x /usr/sbin/radeontool ]
++ then
++ /usr/sbin/radeontool light off
++ fi
++ else
++ for x in /tmp/.X11-unix/*; do
++ displaynum=`echo $x | sed s#/tmp/.X11-unix/X##`
++ getXconsole;
++ if [ x"$XAUTHORITY" != x"" ]; then
++ export DISPLAY=":$displaynum"
++ . /usr/share/acpi-support/screenblank
++ fi
++ done
++ if [ -x /usr/sbin/radeontool ]
++ then
++ /usr/sbin/radeontool light off
++ fi
+ fi
+- done
+ else
+- if [ x$RADEON_LIGHT = xtrue ]; then
+- [ -x /usr/sbin/radeontool ] && radeontool light on
+- fi
+- for x in /tmp/.X11-unix/*; do
+- displaynum=`echo $x | sed s#/tmp/.X11-unix/X##`
+- getXconsole;
+- if [ x"$XAUTHORITY" != x"" ]; then
+- export DISPLAY=":$displaynum"
+- grep -q off-line /proc/acpi/ac_adapter/*/state
+- if [ $? = 1 ]
++ ls /tmp/.X11-unix/*
++ if [ $? != 0 ]
++ then
++ if [ -x /usr/sbin/radeontool ]
+ then
+- if pidof xscreensaver > /dev/null; then
+- su $user -c "xscreensaver-command -unthrottle"
++ /usr/sbin/radeontool light on
+ fi
+- fi
+- if [ `pidof xscreensaver` ]; then
+- su $user -c "xscreensaver-command -deactivate"
+- fi
+- su $user -c "xset dpms force on"
++ else
++ if [ x$RADEON_LIGHT = xtrue ]; then
++ [ -x /usr/sbin/radeontool ] && radeontool light on
++ fi
++ for x in /tmp/.X11-unix/*; do
++ displaynum=`echo $x | sed s#/tmp/.X11-unix/X##`
++ getXconsole;
++ if [ x"$XAUTHORITY" != x"" ]; then
++ export DISPLAY=":$displaynum"
++ grep -q off-line /proc/acpi/ac_adapter/*/state
++ if [ $? = 1 ]
++ then
++ if pidof xscreensaver > /dev/null;
then
++ su $user -c
"xscreensaver-command -unthrottle"
++ fi
++ fi
++ if [ `pidof xscreensaver` ]; then
++ su $user -c "xscreensaver-command
-deactivate"
++ fi
++ su $user -c "xset dpms force on"
+
+- # Press LEFT SHIFT. On some laptops / in some configurations
forcing
+- # the DPMS on is not enough, X needs to be convinced to unblank
the
+- # screen. The left shift key is probably the most harmless key we
+- # could press. :-)
+- acpi_fakekey 42
++ # Press LEFT SHIFT. On some laptops / in some
configurations forcing
++ # the DPMS on is not enough, X needs to be
convinced to unblank the
++ # screen. The left shift key is probably the
most harmless key we
++ # could press. :-)
++ acpi_fakekey 42
++ fi
++ done
++ if [ -x /usr/sbin/radeontool ]
++ then
++ /usr/sbin/radeontool light on
++ fi
+ fi
+- done
+ fi
+ [ -x /etc/acpi/local/lid.sh.post ] && /etc/acpi/local/lid.sh.post
+diff -Naur acpi-support-0.102.orig/vbesave acpi-support-0.102/vbesave
+--- acpi-support-0.102.orig/vbesave 2007-10-15 16:35:33.000000000 -0600
++++ acpi-support-0.102/vbesave 2007-10-15 17:27:00.000000000 -0600
+@@ -8,19 +8,23 @@
+ # Default-Stop: 0 1 6
+ ### END INIT INFO
+
++# Adding smgl stuff..
++PROGRAM=/usr/sbin/vbetool
++RUNLEVEL=3
++. /etc/init.d/smgl_init
++
+ test -f /usr/share/acpi-support/power-funcs || exit 0
+
+ test -x /usr/sbin/vbetool || exit 0
+ set -e
+
+-. /lib/lsb/init-functions
+-
+ test -f /etc/default/rcS && . /etc/default/rcS
+ test -f /etc/default/acpi-support && . /etc/default/acpi-support
+ test -f /usr/share/acpi-support/device-funcs && .
/usr/share/acpi-support/device-funcs
+
+-case "$1" in
+- start)
++# Changing to support smgl init way to do things...
++
++function start() {
+ if laptop-detect > /dev/null; then
+ LAPTOP=true;
+ fi
+@@ -30,26 +34,33 @@
+ fi
+
+ DeviceConfig
+- log_begin_msg "Saving VESA state..."
++ echo "Saving VESA state..."
+ if [ "$SAVE_VBE_STATE" = "true" ]; then
+ if [ "$VERBOSE" = no ]; then
+- if ! vbetool vbestate save > $VBESTATE 2>/dev/null; then
+- log_end_msg $?
+- exit 1
++ if ! $PROGRAM vbestate save > $VBESTATE 2>/dev/null; then
++ echo "$?"
+ fi
+ else
+- if ! vbetool vbestate save > $VBESTATE ; then
+- log_end_msg $?
+- exit 1
++ if ! $PROGRAM vbestate save > $VBESTATE ; then
++ echo "$?"
+ fi
+ fi
+- log_end_msg 0
++ echo "VESA state saved..."
+ fi
+- ;;
+- stop|restart|force-reload)
+- # Doesn't make sense (and shut up lintian)
+- ;;
+- *)
+- exit 0
+- ;;
+-esac
++ echo "Done..."
++}
++
++function stop ()
++{
++ echo "Unsupported..."
++}
++
++function restart ()
++{
++ echo "Unsupported..."
++}
++
++function force-reload ()
++{
++ echo "Unsupported..."
++}
diff --git a/mobile/acpi-support/init.d/acpi-support
b/mobile/acpi-support/init.d/acpi-support
new file mode 100755
index 0000000..00d65d3
--- /dev/null
+++ b/mobile/acpi-support/init.d/acpi-support
@@ -0,0 +1,53 @@
+#!/bin/sh
+# INIT script to check whether we're on batteries, and so start with laptop
+# mode etc enabled.
+
+### BEGIN INIT INFO
+# Provides: acpi-support
+# Required-Start: $local_fs $remote_fs
+# Required-Stop: $local_fs $remote_fs
+# Default-Start: 2 3 4 5
+# Default-Stop: 0 1 6
+### END INIT INFO
+
+# Adding smgl stuff..
+PROGRAM=/etc/acpi/power.sh
+RUNLEVEL=3
+. /etc/init.d/smgl_init
+
+test -f /usr/share/acpi-support/power-funcs || exit 0
+
+# BUGS: unless we start *really* late, we have no way of throttling
+# xscreensaver, since it won't be there to command.
+. /usr/share/acpi-support/power-funcs
+
+test -d /var/lib/acpi-support || exit 0
+
+# Changing to support smgl init way to do things...
+
+function start() {
+ echo "Checking battery state..."
+ if [ x"`echo /proc/acpi/ac_adapter/*`" != x"/proc/acpi/ac_adapter/*"
]; then
+ $PROGRAM
+ fi
+ # Source everything in /etc/acpi/start.d/
+ for SCRIPT in /etc/acpi/start.d/*.sh; do
+ if [ -f "$SCRIPT" ] ; then
+ . $SCRIPT
+ fi
+ done
+ echo "Done..."
+}
+
+function stop() {
+ echo "Disabling power management..."
+ if [ x"`echo /proc/acpi/ac_adapter/*`" != x"/proc/acpi/ac_adapter/*"
]; then
+ $PROGRAM stop
+ fi
+ echo "Done..."
+}
+
+function restart() {
+ echo "Unsupported..."
+}
+
diff --git a/mobile/acpi-support/init.d/vbesave
b/mobile/acpi-support/init.d/vbesave
new file mode 100755
index 0000000..0738fe0
--- /dev/null
+++ b/mobile/acpi-support/init.d/vbesave
@@ -0,0 +1,62 @@
+#!/bin/sh
+
+### BEGIN INIT INFO
+# Provides: vbesave
+# Required-Start: $local_fs $remote_fs
+# Required-Stop: $local_fs $remote_fs
+# Default-Start: 2 3 4 5
+# Default-Stop: 0 1 6
+### END INIT INFO
+
+# Adding smgl stuff..
+PROGRAM=/usr/sbin/vbetool
+RUNLEVEL=3
+. /etc/init.d/smgl_init
+
+test -f /usr/share/acpi-support/power-funcs || exit 0
+
+test -x /usr/sbin/vbetool || exit 0
+set -e
+
+test -f /etc/default/rcS && . /etc/default/rcS
+test -f /etc/default/acpi-support && . /etc/default/acpi-support
+test -f /usr/share/acpi-support/device-funcs && .
/usr/share/acpi-support/device-funcs
+
+# Changing to support smgl init way to do things...
+
+function start() {
+ if laptop-detect > /dev/null; then
+ LAPTOP=true;
+ fi
+
+ if [ x$LAPTOP != xtrue ]; then
+ exit 0;
+ fi
+
+ DeviceConfig
+ echo "Saving VESA state..."
+ if [ "$SAVE_VBE_STATE" = "true" ]; then
+ if [ "$VERBOSE" = no ]; then
+ if ! $PROGRAM vbestate save > $VBESTATE 2>/dev/null; then
+ echo "$?"
+ fi
+ else
+ if ! $PROGRAM vbestate save > $VBESTATE ; then
+ echo "$?"
+ fi
+ fi
+ echo "VESA state saved..."
+ fi
+ echo "Done..."
+}
+
+function stop ()
+{
+ echo "Unsupported..."
+}
+
+function restart ()
+{
+ echo "Unsupported..."
+}
+
diff --git a/mobile/gnokii/DETAILS b/mobile/gnokii/DETAILS
index 9f8ca48..713bfbd 100755
--- a/mobile/gnokii/DETAILS
+++ b/mobile/gnokii/DETAILS
@@ -11,10 +11,10 @@ fi
SOURCE_IGNORE=volatile
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-cvs
else
- VERSION=0.6.18
+ VERSION=0.6.20
SOURCE="$SPELL-$VERSION.tar.bz2"
SOURCE_URL[0]=http://www.$SPELL.org/download/$SPELL/$SOURCE
-
SOURCE_HASH=sha512:665cebd2e2169352232d2e88197ce1c8c49c62ce7a0d6cf50567a5347640aff397d8ba36a3953dba07c36cd90f319ae4620f534a0911b3d31f52812b8865d536
+
SOURCE_HASH=sha512:3a676a72790651d41eb427e618a296223a2ea7d8d20ade563b1c2a0b65c864ce67df68e632a24faa7c1a48f3b98a55a4739b8740a79a2d1dc7a9c78289501e31
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/$SPELL-$VERSION"
fi
WEB_SITE=http://www.gnokii.org/
diff --git a/mobile/gnokii/HISTORY b/mobile/gnokii/HISTORY
index 181b651..756c988 100644
--- a/mobile/gnokii/HISTORY
+++ b/mobile/gnokii/HISTORY
@@ -1,3 +1,9 @@
+2007-10-28 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
+ * DETAILS: updated spell to 0.6.20
+
+2007-10-07 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
+ * DETAILS: updated spell to 0.6.19
+
2007-09-08 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* BUILD: added for make_single
* DETAILS: updated spell to 0.6.18
diff --git a/mobile/jpilot/1E5DF2D6.gpg b/mobile/jpilot/1E5DF2D6.gpg
new file mode 100644
index 0000000..e7f6633
Binary files /dev/null and b/mobile/jpilot/1E5DF2D6.gpg differ
diff --git a/mobile/jpilot/DEPENDS b/mobile/jpilot/DEPENDS
index 6eeba57..2ac3099 100755
--- a/mobile/jpilot/DEPENDS
+++ b/mobile/jpilot/DEPENDS
@@ -1,3 +1,3 @@
depends pilot-link &&
-depends gtk+
+depends gtk+2

diff --git a/mobile/jpilot/DETAILS b/mobile/jpilot/DETAILS
index 7b069ef..23f07c5 100755
--- a/mobile/jpilot/DETAILS
+++ b/mobile/jpilot/DETAILS
@@ -1,12 +1,14 @@
SPELL=jpilot
- VERSION=0.99.7
+ VERSION=0.99.9
SOURCE=$SPELL-$VERSION.tar.gz
+ SOURCE2=$SOURCE.asc
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://jpilot.org/$SOURCE
+ SOURCE2_URL[0]=${SOURCE_URL[0]}.asc
WEB_SITE=http://jpilot.org
-
SOURCE_HASH=sha512:11f5fc06c6ee00819c494183bbc17f343898cb688dfef995caaa3603ffd8c2c3d024fe3d5761e4726107492bdb0b4211d42eb09d93e89211e486880fde1ba4d9
+ SOURCE_GPG=1E5DF2D6.gpg:$SOURCE2:UPSTREAM_KEY
+ SOURCE2_IGNORE=signature
ENTERED=20011124
- UPDATED=20020206
LICENSE[0]=GPL
KEYWORDS="palm mobile"
SHORT="jpilot is desktop organizer software for the palm pilot."
diff --git a/mobile/jpilot/HISTORY b/mobile/jpilot/HISTORY
index 138f0c1..daac5df 100644
--- a/mobile/jpilot/HISTORY
+++ b/mobile/jpilot/HISTORY
@@ -1,3 +1,9 @@
+2007-09-04 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
+ * 1E5DF2D6.gpg: added gpg keyring
+ * DETAILS: updated spell to 0.99.9
+ converted to upstream signature checking
+ * DEPENDS: use gtk+2
+
2006-09-21 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: [automated] Removed BUILD_API=2.

diff --git a/mobile/laptop-detect/BUILD b/mobile/laptop-detect/BUILD
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/mobile/laptop-detect/BUILD
@@ -0,0 +1 @@
+true
diff --git a/mobile/laptop-detect/DEPENDS b/mobile/laptop-detect/DEPENDS
new file mode 100755
index 0000000..a0bcf95
--- /dev/null
+++ b/mobile/laptop-detect/DEPENDS
@@ -0,0 +1 @@
+depends dmidecode
diff --git a/mobile/laptop-detect/DETAILS b/mobile/laptop-detect/DETAILS
new file mode 100755
index 0000000..90395b4
--- /dev/null
+++ b/mobile/laptop-detect/DETAILS
@@ -0,0 +1,14 @@
+ SPELL=laptop-detect
+ VERSION=0.13.2
+ SOURCE=${SPELL}_$VERSION.tar.gz
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELL}
+
SOURCE_URL[0]=http://ftp.debian.org/debian/pool/main/l/laptop-detect/$SOURCE
+
SOURCE_HASH=sha512:3bf3f79bb10434c1e3209c41fe651749435126e93afa173cea231efed9a5df36f05a3df603a5fa1fb3bedb99b921d91c8995b475b1435dd1e71f5d2f1afd4e70
+ WEB_SITE=http://packages.qa.debian.org/l/laptop-detect.html
+ ENTERED=20070916
+ LICENSE=GPL
+ SHORT="laptop-detect attempt to detect a laptop"
+cat << EOF
+Laptop mode attempts to determine whether it is being run
+on a laptop or a desktop and appraises its caller of this.
+EOF
diff --git a/mobile/laptop-detect/HISTORY b/mobile/laptop-detect/HISTORY
new file mode 100644
index 0000000..a93c75b
--- /dev/null
+++ b/mobile/laptop-detect/HISTORY
@@ -0,0 +1,3 @@
+2007-09-16 Javier Vasquez <jevv.cr AT gmail.com>
+ * DEPENDS, PRE_BUILD, INSTALL, DETAILS, HISTORY:
+ created this spell, ver. 0.13.2
diff --git a/mobile/laptop-detect/INSTALL b/mobile/laptop-detect/INSTALL
new file mode 100755
index 0000000..8149fa8
--- /dev/null
+++ b/mobile/laptop-detect/INSTALL
@@ -0,0 +1,2 @@
+install -v -m 755 laptop-detect ${INSTALL_ROOT}/usr/sbin &&
+install -v -m 644 laptop-detect.8 ${INSTALL_ROOT}/usr/share/man/man8
diff --git a/mobile/laptop-detect/PRE_BUILD b/mobile/laptop-detect/PRE_BUILD
new file mode 100755
index 0000000..d72c0b3
--- /dev/null
+++ b/mobile/laptop-detect/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+#VERSION = `grep -iE 'laptop-detect *\\([0-9][0-9.]*\\)' debian/changelog |
head -1 | sed 's:.*(\\([0-9][0-9.]*\\)).*:\1:'` &&
+sed -e "s/@VERSION@/0.13.2/g" < laptop-detect.in > laptop-detect
diff --git a/mobile/laptop-mode-tools/DETAILS
b/mobile/laptop-mode-tools/DETAILS
index f7ccd15..eb4cff6 100755
--- a/mobile/laptop-mode-tools/DETAILS
+++ b/mobile/laptop-mode-tools/DETAILS
@@ -1,13 +1,13 @@
SPELL=laptop-mode-tools
- VERSION=1.31
+ VERSION=1.34
SOURCE=${SPELL}_$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://samwel.tk/laptop_mode/tools/downloads/$SOURCE
- SOURCE_URL[1]=http://gd.tuwien.ac.at/opsys/linux/gentoo/distfiles/$SOURCE
-
SOURCE_HASH=sha512:439f4d585bb72ed6ece1116177fb1d5a2df618925f91d6988fd5d9e4cb93dfceb2e296e953eec8096383cecead10b7a50caa7b081e1fc9da1ee0c59a8e369698
+
SOURCE_HASH=sha512:0ce1d8f754dd0764f2222209ddb2c49233ea93498cac92e4179389c904381901066375050c1b565bec5d32a85825ba2d7f9fd3e6c6d70470fb1df4f3f154d052
+ LICENSE[0]=GPL
+ PATCHLEVEL=1
WEB_SITE=http://www.samwel.tk/laptop_mode
- ENTERED=20070512
- LICENSE=GPL
+ ENTERED=20070916
SHORT="laptop-mode linux feature tools"
cat << EOF
Laptop Mode Tools is a laptop power saving package for Linux systems. It
allows
diff --git a/mobile/laptop-mode-tools/HISTORY
b/mobile/laptop-mode-tools/HISTORY
index c952c54..448a571 100644
--- a/mobile/laptop-mode-tools/HISTORY
+++ b/mobile/laptop-mode-tools/HISTORY
@@ -1,3 +1,27 @@
+2007-10-17 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: Increment PATCHLEVEL
+ Change LICENSE -> LICENSE[0]
+ * init.d/laptop-mode: Remove control characters
+ Remove force-reload, it's causing "not a valid identifier" on boot
+ * laptop-mode-tools-1_34.patch: Add removal of forced script restart
+ during install
+ Do not send SIGHUP to acpid, thus restarting it, during install
+ Do not try to start laptop-mode during install
+ Don't look under /usr/local for modules
+ Change -eq to = and -ne to != in some parts where it complains about
+ expecting an integer when it is receiving an integer, but quoted
+
+2007-10-15 Javier Vasquez <jevv.cr AT gmail.com>
+ * laptop-mode-tools-1_34.patch: Removing
+ dependency upon LSB, on INIT script...
+ * DEPENDS: Removing dependency upon LSB
+ * FINAL: Removing FINAL, no longer necessary
+
+2007-09-16 Javier Vasquez <jevv.cr AT gmail.com>
+ * DETAILS: Updating to 1.34
+ * PRE_BUILD: Removing sed and using a patch
+ from debian + smgl init.d fixes
+
2007-05-17 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* INSTALL: moved the sedit to PRE_BUILD
* PRE_BUILD: fix the man path fix
@@ -5,3 +29,4 @@
2007-05-12 Javier Vasquez <jevv.cr AT gmail.com>
* BUILD, DEPENDS, DETAILS, INSTALL, HISTORY:
created this spell, ver. 1.31
+
diff --git a/mobile/laptop-mode-tools/PRE_BUILD
b/mobile/laptop-mode-tools/PRE_BUILD
index 2405dee..a14ed35 100755
--- a/mobile/laptop-mode-tools/PRE_BUILD
+++ b/mobile/laptop-mode-tools/PRE_BUILD
@@ -1,3 +1,3 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&
-sed -i 's:usr/local:usr/share:g' install.sh
+patch -p1 < "$SCRIPT_DIRECTORY/laptop-mode-tools-1_34.patch"
diff --git a/mobile/laptop-mode-tools/init.d/laptop-mode
b/mobile/laptop-mode-tools/init.d/laptop-mode
new file mode 100755
index 0000000..ccdfe74
--- /dev/null
+++ b/mobile/laptop-mode-tools/init.d/laptop-mode
@@ -0,0 +1,70 @@
+#!/bin/sh
+#
+# chkconfig: - 20 90
+# description: Starts and stops "laptop-mode" - tweaks system behavior
+# to extend battery life.
+#
+# config: /etc/laptop-mode/laptop-mode.conf
+
+PROGRAM=/usr/sbin/laptop_mode
+RUNLEVEL=3
+NEEDS="+local_fs"
+
+. /etc/init.d/smgl_init
+
+test -f /usr/sbin/laptop_mode || exit 0
+
+#. /lib/lsb/init-functions
+
+# Enable laptop mode when the system is booted when running on battery.
+
+TEMPFILE=`mktemp`
+echo "Failed to start laptop mode" > $TEMPFILE
+
+
+trap "cat $TEMPFILE; rm $TEMPFILE; exit 10" HUP INT ABRT QUIT SEGV TERM
+set -e
+
+function start() {
+ touch /var/run/laptop-mode-enabled
+ $PROGRAM auto > $TEMPFILE
+ cat $TEMPFILE
+}
+
+function restart() {
+ # Full restart: first stop laptop mode completely (to restore default
mount options etc.)
+ rm -f /var/run/laptop-mode-enabled
+ $PROGRAM stop > $TEMPFILE
+ cat $TEMPFILE
+
+ # Now remove files containing stored status, re-enable, and start it up
again.
+ rm -f /var/run/laptop-mode-*
+ touch /var/run/laptop-mode-enabled
+ $PROGRAM auto force > $TEMPFILE
+ cat $TEMPFILE
+}
+
+function reload() {
+ # Full restart: first stop laptop mode completely (to restore default
mount options etc.)
+ rm -f /var/run/laptop-mode-enabled
+ $PROGRAM stop > $TEMPFILE
+ cat $TEMPFILE
+
+ # Now remove files containing stored status, re-enable, and start it up
again.
+ rm -f /var/run/laptop-mode-*
+ touch /var/run/laptop-mode-enabled
+ $PROGRAM auto force > $TEMPFILE
+ cat $TEMPFILE
+}
+
+function stop() {
+ rm -f /var/run/laptop-mode-enabled
+ $PROGRAM stop > $TEMPFILE
+ cat $TEMPFILE
+}
+
+function status() {
+ echo "Laptop mode status:"
+ echo
+ $PROGRAM status
+}
diff --git a/mobile/laptop-mode-tools/laptop-mode-tools-1_34.patch
b/mobile/laptop-mode-tools/laptop-mode-tools-1_34.patch
new file mode 100644
index 0000000..794a5e9
--- /dev/null
+++ b/mobile/laptop-mode-tools/laptop-mode-tools-1_34.patch
@@ -0,0 +1,282 @@
+diff -Naur laptop-mode-tools-1.34.orig/etc/init.d/laptop-mode
laptop-mode-tools-1.34/etc/init.d/laptop-mode
+--- laptop-mode-tools-1.34.orig/etc/init.d/laptop-mode 2007-10-17
20:43:21.952504025 -0700
++++ laptop-mode-tools-1.34/etc/init.d/laptop-mode 2007-10-17
21:01:13.801986666 -0700
+@@ -6,9 +6,15 @@
+ #
+ # config: /etc/laptop-mode/laptop-mode.conf
+
++PROGRAM=/usr/sbin/laptop_mode
++RUNLEVEL=3
++NEEDS="+local_fs"
++
++. /etc/init.d/smgl_init
++
+ test -f /usr/sbin/laptop_mode || exit 0
+
+-. /lib/lsb/init-functions
++#. /lib/lsb/init-functions
+
+ # Enable laptop mode when the system is booted when running on battery.
+
+@@ -16,44 +22,62 @@
+ echo "Failed to start laptop mode" > $TEMPFILE
+
+
+-trap "log_failure_msg $( cat $TEMPFILE ) ; rm $TEMPFILE; exit 10" HUP INT
ABRT QUIT SEGV TERM
++trap "cat $TEMPFILE; rm $TEMPFILE; exit 10" HUP INT ABRT QUIT SEGV TERM
+ set -e
+
+-case $1 in
+- start)
++function start() {
+ touch /var/run/laptop-mode-enabled
+- /usr/sbin/laptop_mode auto > $TEMPFILE
+- log_success_msg $( cat $TEMPFILE )
+- ;;
++ $PROGRAM auto > $TEMPFILE
++ cat $TEMPFILE
++}
+
+- restart|reload|force-reload)
++function restart() {
+ # Full restart: first stop laptop mode completely (to restore default
mount options etc.)
+ rm -f /var/run/laptop-mode-enabled
+- /usr/sbin/laptop_mode stop > $TEMPFILE
+- log_success_msg $( cat $TEMPFILE )
++ $PROGRAM stop > $TEMPFILE
++ cat $TEMPFILE
+
+ # Now remove files containing stored status, re-enable, and start it up
again.
+ rm -f /var/run/laptop-mode-*
+ touch /var/run/laptop-mode-enabled
+- /usr/sbin/laptop_mode auto force > $TEMPFILE
+- log_success_msg $( cat $TEMPFILE )
+- ;;
++ $PROGRAM auto force > $TEMPFILE
++ cat $TEMPFILE
++}
+
+- stop)
++function reload() {
++ # Full restart: first stop laptop mode completely (to restore default
mount options etc.)
+ rm -f /var/run/laptop-mode-enabled
+- /usr/sbin/laptop_mode stop > $TEMPFILE
+- log_success_msg $( cat $TEMPFILE )
+- ;;
++ $PROGRAM stop > $TEMPFILE
++ cat $TEMPFILE
++
++ # Now remove files containing stored status, re-enable, and start it up
again.
++ rm -f /var/run/laptop-mode-*
++ touch /var/run/laptop-mode-enabled
++ $PROGRAM auto force > $TEMPFILE
++ cat $TEMPFILE
++}
+
+- status)
++function force-reload() {
++ # Full restart: first stop laptop mode completely (to restore default
mount options etc.)
++ rm -f /var/run/laptop-mode-enabled
++ $PROGRAM stop > $TEMPFILE
++ cat $TEMPFILE
++
++ # Now remove files containing stored status, re-enable, and start it up
again.
++ rm -f /var/run/laptop-mode-*
++ touch /var/run/laptop-mode-enabled
++ $PROGRAM auto force > $TEMPFILE
++ cat $TEMPFILE
++}
++
++function stop() {
++ rm -f /var/run/laptop-mode-enabled
++ $PROGRAM stop > $TEMPFILE
++ cat $TEMPFILE
++}
++
++function status() {
+ echo "Laptop mode status:"
+ echo
+- /usr/sbin/laptop_mode status
+- ;;
+-
+- *)
+- echo "Usage: $0 {stop|start|restart|reload|force-reload|status}" >&2
+- exit 2
+- ;;
+-esac
+-exit 0
++ $PROGRAM status
++}
+diff -Naur laptop-mode-tools-1.34.orig/install.sh
laptop-mode-tools-1.34/install.sh
+--- laptop-mode-tools-1.34.orig/install.sh 2007-10-17 20:43:21.952504025
-0700
++++ laptop-mode-tools-1.34/install.sh 2007-10-17 21:01:13.802986513 -0700
+@@ -2,43 +2,9 @@
+
+ # If your distribution puts this in other locations, please adjust the
values of
+ # these variables before installing!
+-# INIT_D=/etc/init.d
+-MAN_D=/usr/local/man/man8
+-
+-if [ "$INIT_D" == "" ] ; then
+- # Try non-link directories first, then try links. This helps if one of
+- # the locations is linked to another, which is the case on some
distros.
+- if [ -d /etc/rc.d/init.d -a ! -L /etc/rc.d/init.d ] ; then
+- INIT_D=/etc/rc.d/init.d
+- elif [ -d /etc/rc.d -a ! -L /etc/rc.d -a ! -d /etc/rc.d/init.d ] ;
then
+- INIT_D=/etc/rc.d
+- elif [ -d /etc/init.d -a ! -L /etc/init.d ] ; then
+- INIT_D=/etc/init.d
+- elif [ -d /etc/rc.d/init.d ] ; then
+- INIT_D=/etc/rc.d/init.d
+- elif [ -d /etc/rc.d ] ; then
+- INIT_D=/etc/rc.d
+- elif [ -d /etc/init.d ] ; then
+- INIT_D=/etc/init.d
+- else
+- echo "Cannot determine location of init scripts. Please
modify install.sh."
+- exit 31
+- fi
+-fi
+-
+-if ( which invoke-rc.d > /dev/null ) ; then
+- # Debian uses invoke-rc.d
+- RCPROG=invoke-rc.d
+- INITSCRIPT=laptop-mode
+-elif ( which service > /dev/null ) ; then
+- # RedHat uses service
+- RCPROG=service
+- INITSCRIPT=laptop-mode
+-else
+- # Any other -- we start it ourselves.
+- RCPROG=
+- INITSCRIPT=$INIT_D/laptop-mode
+-fi
++MAN_D=/usr/share/man/man8
++RCPROG="/sbin/telinit run"
++INITSCRIPT=laptop-mode
+
+ if [ "`whoami`" != "root" ] ; then
+ echo "You need to be root to install the laptop mode tools."
+@@ -49,9 +15,6 @@
+ echo "Warning: the kernel you are running does not support laptop
mode."
+ fi
+
+-echo 'Stopping existing laptop mode service (if any).'
+-$RCPROG $INITSCRIPT stop
+-
+ INSTALL="install -o root -g root"
+
+ mkdir -p /etc/laptop-mode /etc/laptop-mode/batt-start
/etc/laptop-mode/batt-stop /etc/laptop-mode/lm-ac-start
/etc/laptop-mode/lm-ac-stop /etc/laptop-mode/nolm-ac-start
/etc/laptop-mode/nolm-ac-stop /usr/lib/laptop-mode-tools/modules
/etc/laptop-mode/conf.d /etc/laptop-mode/modules
+@@ -147,7 +110,6 @@
+ echo "$0: Failed to install ACPI event file in
/etc/acpi/events. Installation failed."
+ exit 14
+ fi
+- killall -HUP acpid
+ echo "Installed ACPI support."
+ ACPI_DONE=1
+ fi
+@@ -202,31 +164,6 @@
+ echo "Install either acpid, apmd, pbbuttonsd or pmud (depending on
what your laptop supports) and reinstall."
+ fi
+
+-if [ -d $INIT_D ] ; then
+- if ( ! $INSTALL -m 700 etc/init.d/laptop-mode $INIT_D ) ; then
+- echo "$0: failed to install init script in $INIT_D. Installation
failed."
+- exit 16
+- fi
+- if [ -f /etc/rcS.d/S99laptop_mode ] ; then
+- # Old symlink.
+- rm $RCS_D/S99laptop-mode
+- fi
+- if ( which update-rc.d > /dev/null ) ; then
+- if ( ! update-rc.d laptop-mode defaults ) ; then
+- echo "$0: update-rc.d failed, laptop mode will not be initialized at
bootup."
+- exit 17
+- fi
+- elif ( which chkconfig > /dev/null ) ; then
+- if ( ! chkconfig laptop-mode on ) ; then
+- echo "$0: chkconfig failed, laptop mode will not be initialized at
bootup."
+- exit 30
+- fi
+- fi
+-else
+- echo "Directory $INIT_D not found: not installing script to initialize"
+- echo "laptop mode at boot time."
+-fi
+-
+ if ( ! mkdir -p $MAN_D ) ; then
+ echo "$0: Could not create directory $MAN_D. Installation failed."
+ exit 22
+@@ -236,9 +173,4 @@
+ exit 23
+ fi
+
+-if ( ! $RCPROG $INITSCRIPT start ) ; then
+- echo "$0: Could not start laptop mode init script
/etc/init.d/laptop-mode."
+- exit 24
+-fi
+-
+ echo "Installation complete."
+diff -Naur laptop-mode-tools-1.34.orig/usr/sbin/laptop_mode
laptop-mode-tools-1.34/usr/sbin/laptop_mode
+--- laptop-mode-tools-1.34.orig/usr/sbin/laptop_mode 2007-10-17
20:43:21.952504025 -0700
++++ laptop-mode-tools-1.34/usr/sbin/laptop_mode 2007-10-17
21:02:29.838386836 -0700
+@@ -374,18 +374,20 @@
+
+
#############################################################################
+
+-KLEVEL="$(uname -r |
+- {
+- IFS='.-' read a b c
+- echo $a.$b
+- }
+-)"
+-KMINOR="$(uname -r |
+- {
+- IFS='.-' read a b c d
+- echo $c
+- }
+-)"
++#KLEVEL="$(uname -r |
++# {
++# IFS='.-' read a b c
++# echo $a.$b
++# }
++#)"
++KLEVEL=`uname -r | sed 's/^\([0-9][0-9]*\.[0-9][0-9]*\)\..*/\1/'`
++#KMINOR="$(uname -r |
++# {
++# IFS='.-' read a b c d
++# echo $c
++# }
++#)"
++KMINOR=`uname -r | sed 's/^[0-9][0-9]*\.[0-9][0-9]*\.\(.*\)/\1/'`
+
+ case "$KLEVEL" in
+ "2.4" ) ;;
+@@ -787,7 +789,7 @@
+ if [ -f /var/run/laptop-mode-state ] ; then
+ read WAS_ACTIVE WAS_ON_AC WAS_ACTIVATE_WITH_POSSIBLE_DATA_LOSS <
/var/run/laptop-mode-state
+ if [ "$WAS_ON_AC" != "" ] ; then
+- if [ "$WAS_ACTIVE" -eq "$ACTIVATE" -a "$WAS_ON_AC" -eq
"$ON_AC" -a "$WAS_ACTIVATE_WITH_POSSIBLE_DATA_LOSS" -eq
"$ACTIVATE_WITH_POSSIBLE_DATA_LOSS" -a "$FORCE" -eq 0 ] ; then
++ if [ "$WAS_ACTIVE" = "$ACTIVATE" -a "$WAS_ON_AC" = "$ON_AC"
-a "$WAS_ACTIVATE_WITH_POSSIBLE_DATA_LOSS" =
"$ACTIVATE_WITH_POSSIBLE_DATA_LOSS" -a "$FORCE" = 0 ] ; then
+ echo -n "$STATE, "
+ if [ "$WAS_ACTIVE" -eq 1 ] ; then
+ echo -n "active [unchanged]"
+@@ -1153,7 +1155,7 @@
+ # Retrieve original non-laptop mode mount
options and restore them.
+ # If the file that stores them doesn't exist,
then laptop mode
+ # has never been started.
+- if [ "$WAS_ACTIVE" -ne 0 -a -f
/var/run/laptop-mode-nolm-mountopts ] ; then

++ if [ "$WAS_ACTIVE" != 0 -a -f
/var/run/laptop-mode-nolm-mountopts ] ; then

+ SAVED_OPTS=`grep "^$DEV "
/var/run/laptop-mode-nolm-mountopts`
+ SAVED_OPTS=${SAVED_OPTS#* } # trim
device name
+
+@@ -1593,7 +1595,7 @@
+ # Finally, call laptop-mode-tools modules. The modules can use the settings
+ # from the INI files, but they may NOT assume the settings actually exist,
+ # as no defaults have been given for them.
+-for SCRIPT in /usr/lib/laptop-mode-tools/modules/*
/usr/local/lib/laptop-mode-tools/modules/* /etc/laptop-mode/modules/*; do
++for SCRIPT in /usr/lib/laptop-mode-tools/modules/*
/etc/laptop-mode/modules/*; do
+ if [ -e "$SCRIPT" ] ; then
+ "$SCRIPT" >> $OUTPUT
+ else
diff --git a/mobile/libopensync-plugin-evolution2/DETAILS
b/mobile/libopensync-plugin-evolution2/DETAILS
index 814de63..7756c35 100755
--- a/mobile/libopensync-plugin-evolution2/DETAILS
+++ b/mobile/libopensync-plugin-evolution2/DETAILS
@@ -1,7 +1,7 @@
SPELL=libopensync-plugin-evolution2
- VERSION=0.20
- SOURCE="$SPELL-$VERSION.tar.gz?rev=&format=raw"
- SOURCE_URL[0]=http://www.opensync.org/attachment/wiki/download/$SOURCE
+ VERSION=0.22
+ SOURCE="$SPELL-$VERSION.tar.bz2"
+ SOURCE_URL[0]=http://www.opensync.org/download/releases/$VERSION/$SOURCE

SOURCE_HASH=sha512:ef399c59b62982588c9101c7a26da34d1cef8b15aaee7901ab721dc2f7ff6ecdebf8f4505fc98b42bfbe8c43bcc75e0c53554f57bb44461e865cb549c99a7434
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/$SPELL-$VERSION"
WEB_SITE=http://www.opensync.org/
diff --git a/mobile/libopensync-plugin-evolution2/HISTORY
b/mobile/libopensync-plugin-evolution2/HISTORY
index e901712..8ef3fbc 100644
--- a/mobile/libopensync-plugin-evolution2/HISTORY
+++ b/mobile/libopensync-plugin-evolution2/HISTORY
@@ -1,3 +1,6 @@
+2007-09-27 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
+ * DETAILS: version update, fixup source and source_url
+
2006-11-10 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
* DETAILS: version update

diff --git a/mobile/libopensync-plugin-file/DETAILS
b/mobile/libopensync-plugin-file/DETAILS
index 963b33d..a743b27 100755
--- a/mobile/libopensync-plugin-file/DETAILS
+++ b/mobile/libopensync-plugin-file/DETAILS
@@ -1,8 +1,8 @@
SPELL=libopensync-plugin-file
VERSION=0.22

SOURCE_HASH=sha512:c8df060db87eb7eeb8e6dff6dc486eb4edd348bc22ec73e7d38930d9a1aef4f40e3d29f4d010ee7671fb1e59615512d92b9a3f3e49b714187c932d196460442e
- SOURCE="$SPELL-$VERSION.tar.bz2?rev=&format=raw"
- SOURCE_URL[0]=http://www.opensync.org/attachment/wiki/download/$SOURCE
+ SOURCE="$SPELL-$VERSION.tar.bz2"
+ SOURCE_URL[0]=http://www.opensync.org/download/releases/$VERSION/$SOURCE
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/$SPELL-$VERSION"
WEB_SITE=http://www.opensync.org/
LICENSE[0]=LGPL
diff --git a/mobile/libopensync-plugin-file/HISTORY
b/mobile/libopensync-plugin-file/HISTORY
index e18456b..b0491d6 100644
--- a/mobile/libopensync-plugin-file/HISTORY
+++ b/mobile/libopensync-plugin-file/HISTORY
@@ -1,3 +1,6 @@
+2007-09-27 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
+ * DETAILS: version update to 0.22, source_url fixup
+
2007-02-20 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.21

diff --git a/mobile/libopensync-plugin-gnokii/DETAILS
b/mobile/libopensync-plugin-gnokii/DETAILS
index 72de2c2..6a4887f 100755
--- a/mobile/libopensync-plugin-gnokii/DETAILS
+++ b/mobile/libopensync-plugin-gnokii/DETAILS
@@ -1,7 +1,7 @@
SPELL=libopensync-plugin-gnokii
- VERSION=0.20
- SOURCE="$SPELL-$VERSION.tar.gz?rev=&format=raw"
- SOURCE_URL[0]=http://www.opensync.org/attachment/wiki/download/$SOURCE
+ VERSION=0.22
+ SOURCE="$SPELL-$VERSION.tar.bz2"
+ SOURCE_URL[0]=http://www.opensync.org/download/releases/$VERSION/$SOURCE

SOURCE_HASH=sha512:6d9d98bdd98a732f65b07cd4947c2e61e51dc2192d559b15e644eec9dc63b5f6747cf726cde960efdc9146f082a7b35d03cc4b94cebfaef963ef53824a3c5593
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/$SPELL-$VERSION"
WEB_SITE=http://www.opensync.org/
diff --git a/mobile/libopensync-plugin-gnokii/HISTORY
b/mobile/libopensync-plugin-gnokii/HISTORY
index 14acb61..86e1e55 100644
--- a/mobile/libopensync-plugin-gnokii/HISTORY
+++ b/mobile/libopensync-plugin-gnokii/HISTORY
@@ -1,2 +1,6 @@
+2007-09-27 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
+ * DETAILS: version update 0.22, source_url fixup
+ * PRE_BUILD: remove -Werror
+
2006-11-10 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
* DETAILS, DEPENDS, HISTORY: created spell
diff --git a/mobile/libopensync-plugin-gnokii/PRE_BUILD
b/mobile/libopensync-plugin-gnokii/PRE_BUILD
new file mode 100755
index 0000000..dccb8c1
--- /dev/null
+++ b/mobile/libopensync-plugin-gnokii/PRE_BUILD
@@ -0,0 +1,5 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+sedit "s:\-Werror::g" src/Makefile.in &&
+sedit "s:\-Werror::g" src/Makefile.am
+
diff --git a/mobile/libopensync-plugin-google-calendar/DETAILS
b/mobile/libopensync-plugin-google-calendar/DETAILS
index 2a2aca2..9f87a06 100755
--- a/mobile/libopensync-plugin-google-calendar/DETAILS
+++ b/mobile/libopensync-plugin-google-calendar/DETAILS
@@ -1,7 +1,7 @@
SPELL=libopensync-plugin-google-calendar
- VERSION=0.20a
- SOURCE="$SPELL-$VERSION.tar.gz?rev=&format=raw"
- SOURCE_URL[0]=http://www.opensync.org/attachment/wiki/download/$SOURCE
+ VERSION=0.22
+ SOURCE="$SPELL-$VERSION.tar.bz2"
+ SOURCE_URL[0]=http://www.opensync.org/download/releases/$VERSION/$SOURCE

SOURCE_HASH=sha512:c3f7e37a60c3ebdeb0b7863056f732dd82b9a7bf0c2105417c4b9216635085e9886e6e098f9ebeec2cc953ef1439ec34ef0e159e0d49684c14a571f25db605ca
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/$SPELL-$VERSION"
WEB_SITE=http://www.opensync.org/
diff --git a/mobile/libopensync-plugin-google-calendar/HISTORY
b/mobile/libopensync-plugin-google-calendar/HISTORY
index 14acb61..f756dfc 100644
--- a/mobile/libopensync-plugin-google-calendar/HISTORY
+++ b/mobile/libopensync-plugin-google-calendar/HISTORY
@@ -1,2 +1,5 @@
+2007-09-27 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
+ * DETAILS: version update 0.22, source_url fixup
+
2006-11-10 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
* DETAILS, DEPENDS, HISTORY: created spell
diff --git a/mobile/libopensync-plugin-gpe/DETAILS
b/mobile/libopensync-plugin-gpe/DETAILS
index 65b2c39..a726adf 100755
--- a/mobile/libopensync-plugin-gpe/DETAILS
+++ b/mobile/libopensync-plugin-gpe/DETAILS
@@ -1,7 +1,7 @@
SPELL=libopensync-plugin-gpe
- VERSION=0.20
- SOURCE="$SPELL-$VERSION.tar.gz?rev=&format=raw"
- SOURCE_URL[0]=http://www.opensync.org/attachment/wiki/download/$SOURCE
+ VERSION=0.22
+ SOURCE="$SPELL-$VERSION.tar.bz2"
+ SOURCE_URL[0]=http://www.opensync.org/download/releases/$VERSION/$SOURCE

SOURCE_HASH=sha512:c004ba4194feeac5c68d468cca29f4a5abe5e1bef43ebeb80dc82e9f9ef9e48b27cf53eabd6de6a6a13bccac2123e20c291e942b1c84e98e709ded5bb3696473
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/$SPELL-$VERSION"
WEB_SITE=http://www.opensync.org/
diff --git a/mobile/libopensync-plugin-gpe/HISTORY
b/mobile/libopensync-plugin-gpe/HISTORY
index 14acb61..f817f7a 100644
--- a/mobile/libopensync-plugin-gpe/HISTORY
+++ b/mobile/libopensync-plugin-gpe/HISTORY
@@ -1,2 +1,5 @@
+2007-09-27 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
+ * DETAILS: source_url fixup
+
2006-11-10 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
* DETAILS, DEPENDS, HISTORY: created spell
diff --git a/mobile/libopensync-plugin-irmc/DETAILS
b/mobile/libopensync-plugin-irmc/DETAILS
index 100c6d4..771bb7e 100755
--- a/mobile/libopensync-plugin-irmc/DETAILS
+++ b/mobile/libopensync-plugin-irmc/DETAILS
@@ -1,7 +1,7 @@
SPELL=libopensync-plugin-irmc
- VERSION=0.20
- SOURCE="$SPELL-$VERSION.tar.gz?rev=&format=raw"
- SOURCE_URL[0]=http://www.opensync.org/attachment/wiki/download/$SOURCE
+ VERSION=0.22
+ SOURCE="$SPELL-$VERSION.tar.bz2"
+ SOURCE_URL[0]=http://www.opensync.org/download/releases/$VERSION/$SOURCE

SOURCE_HASH=sha512:085bc3e49eec637b06115f098a0546f808eeaae0ba619ba6c0876936ea427f7ea95ad6eefca941697a04ca23883846763ca771e8c74cac902ede73bf62c490f9
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/$SPELL-$VERSION"
WEB_SITE=http://www.opensync.org/
diff --git a/mobile/libopensync-plugin-irmc/HISTORY
b/mobile/libopensync-plugin-irmc/HISTORY
index f3ce497..fc10b29 100644
--- a/mobile/libopensync-plugin-irmc/HISTORY
+++ b/mobile/libopensync-plugin-irmc/HISTORY
@@ -1,3 +1,6 @@
+2007-09-27 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
+ * DETAILS: version update, source_url fixup
+
2006-11-10 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
* DETAILS: version update

diff --git a/mobile/libopensync-plugin-kdepim/DETAILS
b/mobile/libopensync-plugin-kdepim/DETAILS
index f5e4af1..7731573 100755
--- a/mobile/libopensync-plugin-kdepim/DETAILS
+++ b/mobile/libopensync-plugin-kdepim/DETAILS
@@ -1,8 +1,8 @@
SPELL=libopensync-plugin-kdepim
VERSION=0.22

SOURCE_HASH=sha512:850cdb015100e868e7a5289c851fc751cbe2601b439885b744fdccaedd6431105cfd03b323851788e2aacb17f84f3a00488bba5908906e170ba2020d2199a592
- SOURCE="$SPELL-$VERSION.tar.bz2?rev=&format=raw"
- SOURCE_URL[0]=http://www.opensync.org/attachment/wiki/download/$SOURCE
+ SOURCE="$SPELL-$VERSION.tar.bz2"
+ SOURCE_URL[0]=http://www.opensync.org/download/releases/$VERSION/$SOURCE
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/$SPELL-$VERSION"
WEB_SITE=http://www.opensync.org/
LICENSE[0]=GPL
diff --git a/mobile/libopensync-plugin-kdepim/HISTORY
b/mobile/libopensync-plugin-kdepim/HISTORY
index dc7b10e..f0a5f88 100644
--- a/mobile/libopensync-plugin-kdepim/HISTORY
+++ b/mobile/libopensync-plugin-kdepim/HISTORY
@@ -1,3 +1,6 @@
+2007-09-27 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
+ * DETAILS: source_url fixup
+
2007-05-12 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.22

diff --git a/mobile/libopensync-plugin-moto/DETAILS
b/mobile/libopensync-plugin-moto/DETAILS
index c71d48a..41de269 100755
--- a/mobile/libopensync-plugin-moto/DETAILS
+++ b/mobile/libopensync-plugin-moto/DETAILS
@@ -1,7 +1,7 @@
SPELL=libopensync-plugin-moto
- VERSION=0.20
- SOURCE="$SPELL-$VERSION.tar.gz?rev=&format=raw"
- SOURCE_URL[0]=http://www.opensync.org/attachment/wiki/download/$SOURCE
+ VERSION=0.22
+ SOURCE="$SPELL-$VERSION.tar.bz2"
+ SOURCE_URL[0]=http://www.opensync.org/download/releases/$VERSION/$SOURCE

SOURCE_HASH=sha512:3b411f13ad81789cfd51bc7153344056c6a6f2e4297fb0933bb4396f3d49f8621165aefb185fd9f9f0ebea59b636c1e4a57d1d05e328821596fc167faf9d57b3
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/$SPELL-$VERSION"
WEB_SITE=http://www.opensync.org/
diff --git a/mobile/libopensync-plugin-moto/HISTORY
b/mobile/libopensync-plugin-moto/HISTORY
index 00f4a00..3b99744 100644
--- a/mobile/libopensync-plugin-moto/HISTORY
+++ b/mobile/libopensync-plugin-moto/HISTORY
@@ -1,2 +1,5 @@
+2007-09-27 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
+ * DETAILS: version update, source_url fixup
+
2006-11-10 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
* DETAILS, DEPENDS, BUILD, INSTALL, HISTORY: created spell
diff --git a/mobile/libopensync-plugin-opie/DETAILS
b/mobile/libopensync-plugin-opie/DETAILS
index 940ba5a..285d6ca 100755
--- a/mobile/libopensync-plugin-opie/DETAILS
+++ b/mobile/libopensync-plugin-opie/DETAILS
@@ -1,7 +1,7 @@
SPELL=libopensync-plugin-opie
- VERSION=0.20
- SOURCE="$SPELL-$VERSION.tar.gz?rev=&format=raw"
- SOURCE_URL[0]=http://www.opensync.org/attachment/wiki/download/$SOURCE
+ VERSION=0.22
+ SOURCE="$SPELL-$VERSION.tar.bz2"
+ SOURCE_URL[0]=http://www.opensync.org/download/releases/$VERSION/$SOURCE

SOURCE_HASH=sha512:dd4b4781cc18bf333c74a50b74886a038071a6fc7ad41adc5466c69759072c2092a7c61ba67250eb9588bffceffdddef98fb96a1e2868ccece4e431aa0f0dd4b
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/$SPELL-$VERSION"
WEB_SITE=http://www.opensync.org/
diff --git a/mobile/libopensync-plugin-opie/HISTORY
b/mobile/libopensync-plugin-opie/HISTORY
index 14acb61..af3eb44 100644
--- a/mobile/libopensync-plugin-opie/HISTORY
+++ b/mobile/libopensync-plugin-opie/HISTORY
@@ -1,2 +1,5 @@
+2007-09-27 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
+ * DETAILS: version bump, source_url fixup
+
2006-11-10 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
* DETAILS, DEPENDS, HISTORY: created spell
diff --git a/mobile/libopensync-plugin-palm/DETAILS
b/mobile/libopensync-plugin-palm/DETAILS
index 905f9a0..62554f6 100755
--- a/mobile/libopensync-plugin-palm/DETAILS
+++ b/mobile/libopensync-plugin-palm/DETAILS
@@ -1,7 +1,7 @@
SPELL=libopensync-plugin-palm
- VERSION=0.20
- SOURCE="$SPELL-$VERSION.tar.gz?rev=&format=raw"
- SOURCE_URL[0]=http://www.opensync.org/attachment/wiki/download/$SOURCE
+ VERSION=0.22
+ SOURCE="$SPELL-$VERSION.tar.bz2"
+ SOURCE_URL[0]=http://www.opensync.org/download/releases/$VERSION/$SOURCE

SOURCE_HASH=sha512:2b8da570427ee2d743653fe41434fa1827fa580d37134dfcd8b14c0be91f19aa821b754c651c5e5cb1f14a5fbcbb8a8b48ada9ffd06d5e2988336296c669ab82
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/$SPELL-$VERSION"
WEB_SITE=http://www.opensync.org/
diff --git a/mobile/libopensync-plugin-palm/HISTORY
b/mobile/libopensync-plugin-palm/HISTORY
index 8b4e784..d0a1d6a 100644
--- a/mobile/libopensync-plugin-palm/HISTORY
+++ b/mobile/libopensync-plugin-palm/HISTORY
@@ -1,3 +1,6 @@
+2007-09-27 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
+ * DETAILS: version update, source_url fixup
+
2006-11-10 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
* DETAILS: version update

diff --git a/mobile/libopensync-plugin-python/DETAILS
b/mobile/libopensync-plugin-python/DETAILS
index 58c83ef..864b5e7 100755
--- a/mobile/libopensync-plugin-python/DETAILS
+++ b/mobile/libopensync-plugin-python/DETAILS
@@ -1,8 +1,8 @@
SPELL=libopensync-plugin-python
VERSION=0.22

SOURCE_HASH=sha512:ae52dace9ea82084d170f242ab7f1d1cc565a09eda45c71abc7a9e7fc726b963adbd121c731c22a105485162e9a9a924189f4669c6d13bf0156b42be0db211e7
- SOURCE="$SPELL-$VERSION.tar.bz2?rev=&format=raw"
- SOURCE_URL[0]=http://www.opensync.org/attachment/wiki/download/$SOURCE
+ SOURCE="$SPELL-$VERSION.tar.bz2"
+ SOURCE_URL[0]=http://www.opensync.org/download/releases/$VERSION/$SOURCE
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/$SPELL-$VERSION"
WEB_SITE=http://www.opensync.org/
LICENSE[0]=LGPL
diff --git a/mobile/libopensync-plugin-python/HISTORY
b/mobile/libopensync-plugin-python/HISTORY
index 0903c43..9abf55a 100644
--- a/mobile/libopensync-plugin-python/HISTORY
+++ b/mobile/libopensync-plugin-python/HISTORY
@@ -1,3 +1,6 @@
+2007-09-27 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
+ * DETAILS: source url fixup
+
2007-05-12 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.22

diff --git a/mobile/libopensync-plugin-sunbird/DETAILS
b/mobile/libopensync-plugin-sunbird/DETAILS
index 44444f4..d0fd442 100755
--- a/mobile/libopensync-plugin-sunbird/DETAILS
+++ b/mobile/libopensync-plugin-sunbird/DETAILS
@@ -1,7 +1,7 @@
SPELL=libopensync-plugin-sunbird
- VERSION=0.20
- SOURCE="$SPELL-$VERSION.tar.gz?rev=&format=raw"
- SOURCE_URL[0]=http://www.opensync.org/attachment/wiki/download/$SOURCE
+ VERSION=0.22
+ SOURCE="$SPELL-$VERSION.tar.bz2"
+ SOURCE_URL[0]=http://www.opensync.org/download/releases/$VERSION/$SOURCE

SOURCE_HASH=sha512:e859a35fd34e47762402084277cb03e5bd6a1ce9775ee82f9b82e9484caacbe3d4c972828fce442bb2b72014adde295de7381ef7fc43271f89d6a3255cf18b5c
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/$SPELL-$VERSION"
WEB_SITE=http://www.opensync.org/
diff --git a/mobile/libopensync-plugin-sunbird/HISTORY
b/mobile/libopensync-plugin-sunbird/HISTORY
index 14acb61..0b0cdf7 100644
--- a/mobile/libopensync-plugin-sunbird/HISTORY
+++ b/mobile/libopensync-plugin-sunbird/HISTORY
@@ -1,2 +1,5 @@
+2007-09-27 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
+ * DETAILS: update to 0.22, source_url fixup
+
2006-11-10 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
* DETAILS, DEPENDS, HISTORY: created spell
diff --git a/mobile/libopensync-plugin-synce/DETAILS
b/mobile/libopensync-plugin-synce/DETAILS
index e7910f9..b0b890f 100755
--- a/mobile/libopensync-plugin-synce/DETAILS
+++ b/mobile/libopensync-plugin-synce/DETAILS
@@ -1,7 +1,7 @@
SPELL=libopensync-plugin-synce
- VERSION=0.20
- SOURCE="$SPELL-$VERSION.tar.gz?rev=&format=raw"
- SOURCE_URL[0]=http://www.opensync.org/attachment/wiki/download/$SOURCE
+ VERSION=0.22
+ SOURCE="$SPELL-$VERSION.tar.bz2"
+ SOURCE_URL[0]=http://www.opensync.org/download/releases/$VERSION/$SOURCE

SOURCE_HASH=sha512:8bc61ac3ac1dba1ab97cb75bc4eeaf44e8f0cf5440ef48403dc4963f592f78711470e3eee2719e57b47bc263c6133c6e7ea8f827de670a7b724477f0858ff3c6
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/$SPELL-$VERSION"
WEB_SITE=http://www.sourcemage.org/
diff --git a/mobile/libopensync-plugin-synce/HISTORY
b/mobile/libopensync-plugin-synce/HISTORY
index 14acb61..0a2bd05 100644
--- a/mobile/libopensync-plugin-synce/HISTORY
+++ b/mobile/libopensync-plugin-synce/HISTORY
@@ -1,2 +1,5 @@
+2007-09-27 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
+ * DETAILS: version update, source_url fixup
+
2006-11-10 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
* DETAILS, DEPENDS, HISTORY: created spell
diff --git a/mobile/libopensync-plugin-syncml/DETAILS
b/mobile/libopensync-plugin-syncml/DETAILS
index 8a69577..8e926dc 100755
--- a/mobile/libopensync-plugin-syncml/DETAILS
+++ b/mobile/libopensync-plugin-syncml/DETAILS
@@ -1,7 +1,7 @@
SPELL=libopensync-plugin-syncml
- VERSION=0.21
- SOURCE="$SPELL-$VERSION.tar.bz2?rev=&format=raw"
- SOURCE_URL[0]=http://www.opensync.org/attachment/wiki/download/$SOURCE
+ VERSION=0.22
+ SOURCE="$SPELL-$VERSION.tar.bz2"
+ SOURCE_URL[0]=http://www.opensync.org/download/releases/$VERSION/$SOURCE

SOURCE_HASH=sha512:ac9425c946267238dcc00e3efebc73803e5b0f8adc466f9b76238e0ce925eaffc2794576d53b274e5b670c59a78f77cff72b596e6bc9b79d87a0a68bc5140079
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/$SPELL-$VERSION"
WEB_SITE=http://www.opensync.org/
diff --git a/mobile/libopensync-plugin-syncml/HISTORY
b/mobile/libopensync-plugin-syncml/HISTORY
index 4a44882..ff41fd6 100644
--- a/mobile/libopensync-plugin-syncml/HISTORY
+++ b/mobile/libopensync-plugin-syncml/HISTORY
@@ -1,3 +1,6 @@
+2007-09-27 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
+ * DETAILS: version update, source_url fixup
+
2007-02-20 Treeve Jelbert <treeve@!pi.be>
* DETAILS: version 0.21
* DEPENDS: add libsoup
diff --git a/mobile/libopensync/DETAILS b/mobile/libopensync/DETAILS
index b7908fe..890f43e 100755
--- a/mobile/libopensync/DETAILS
+++ b/mobile/libopensync/DETAILS
@@ -1,8 +1,8 @@
SPELL=libopensync
VERSION=0.22

SOURCE_HASH=sha512:90b6c7af9890d51bddfa5ce9ff5403f642d1deb7dc839e517366f9fd0afa5cd582b9a0e6e37d4a110f2aba7421da6705da0a761ad3ea40e9def3d3580f1b6aa2
- SOURCE="$SPELL-$VERSION.tar.bz2?rev=&format=raw"
- SOURCE_URL[0]=http://www.opensync.org/attachment/wiki/download/$SOURCE
+ SOURCE="$SPELL-$VERSION.tar.bz2"
+ SOURCE_URL[0]=http://www.opensync.org/download/releases/$VERSION/$SOURCE
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/$SPELL-$VERSION"
WEB_SITE=http://www.opensync.org/
LICENSE[0]=LGPL
diff --git a/mobile/libopensync/HISTORY b/mobile/libopensync/HISTORY
index cd665be..921578c 100644
--- a/mobile/libopensync/HISTORY
+++ b/mobile/libopensync/HISTORY
@@ -1,3 +1,6 @@
+2007-09-27 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
+ * DETAILS: fixup source and source url
+
2007-05-12 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.22

diff --git a/mobile/libsyncml/DETAILS b/mobile/libsyncml/DETAILS
index 104af17..a40e4eb 100755
--- a/mobile/libsyncml/DETAILS
+++ b/mobile/libsyncml/DETAILS
@@ -1,8 +1,8 @@
SPELL=libsyncml
- VERSION=0.4.3
- SOURCE="$SPELL-$VERSION.tar.gz?rev=&format=raw"
- SOURCE_URL[0]=http://$SPELL.opensync.org/attachment/wiki/download/$SOURCE
-
SOURCE_HASH=sha512:b054749c0736a8434c349fc24e132d6b99cd4e817ee08e7d661ec2dc89fbd6a27059f238f47638119f3ca3a35dd23cc3772df5c77e8ef0f11afc5f76b5d6ec05
+ VERSION=0.4.5
+ SOURCE=$SPELL-$VERSION.tar.bz2
+
SOURCE_URL[0]=http://libsyncml.opensync.org/download/releases/$VERSION/$SOURCE
+
SOURCE_HASH=sha512:913721d7f3e07f3e38c654b278b5b4d0c0b90db7e88683ed49281c38db60e4c901bdcc56680d03e98166d7f1a76897ffac869483d77037ca2bf94304c917ae93
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/$SPELL-$VERSION"
WEB_SITE=http://libsyncml.opensync.org/
LICENSE[0]=LGPL
@@ -13,16 +13,20 @@ Libsyncml is a implementation of the SyncML protocol.

The goals of Libsyncml are:

- * Provide a reliable implementation of the syncml standard * Implement
the
- Data Synchronization part. Optionally the Device Management part later *
- Size. Libsyncml should have a small footprint so that it can be used on
- mobile devices * Support of many transport bindings like http server
- and client and obex over IR, bluetooth etc * Support for wbxml using
- libwbxml * Direct parsing of wbxml without the need to convert wbxml
- into xml * Portability. The framework should run on as many platforms
- as possible (Linux, Windows, Mac OS, BSD, etc) * Easily usable from
- other languages. Libsyncml is written in c so that i can be embedded
- into other languages * Support for Syncml 1.0, 1.1 and 1.2
+ * Provide a reliable implementation of the syncml standard
+ * Implement the Data Synchronization part. Optionally the
+ Device Management part later
+ * Size. Libsyncml should have a small footprint so that it can
+ be used on mobile devices
+ * Support of many transport bindings like http server
+ and client and obex over IR, bluetooth etc
+ * Support for wbxml using libwbxml
+ * Direct parsing of wbxml without the need to convert wbxml into xml
+ * Portability. The framework should run on as many platforms
+ as possible (Linux, Windows, Mac OS, BSD, etc)
+ * Easily usable from other languages. Libsyncml is written
+ in c so that i can be embedded into other languages
+ * Support for Syncml 1.0, 1.1 and 1.2

The license of the Libsyncml is LGPL
EOF
diff --git a/mobile/libsyncml/HISTORY b/mobile/libsyncml/HISTORY
index 0b6803f..8b88db4 100644
--- a/mobile/libsyncml/HISTORY
+++ b/mobile/libsyncml/HISTORY
@@ -1,3 +1,9 @@
+2007-10-28 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
+ * DETAILS: update to 0.4.5
+
+2007-09-27 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
+ * DETAILS: update to 0.4.4
+
2007-02-20 Treeve Jelbert <treeve AT sourcemage.org>
* version 0.43

diff --git a/mobile/obexftp/DETAILS b/mobile/obexftp/DETAILS
index ed084e8..51cf8de 100755
--- a/mobile/obexftp/DETAILS
+++ b/mobile/obexftp/DETAILS
@@ -4,7 +4,7 @@
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$SOURCEFORGE_URL/openobex/$SOURCE
- WEB_SITE=http://openobex.sourceforge.net
+ WEB_SITE=http://dev.zuckschwerdt.org/openobex/wiki/ObexFtp
ENTERED=20041111
KEYWORDS="mobile"
SHORT="BT Obex file transfer."
diff --git a/mobile/obexftp/HISTORY b/mobile/obexftp/HISTORY
index d352e33..3164671 100644
--- a/mobile/obexftp/HISTORY
+++ b/mobile/obexftp/HISTORY
@@ -1,3 +1,6 @@
+2007-10-04 Julien "_kaze_" ROZO <julien AT rozo.org>
+ * DETAILS: corrected WEB_SITE
+
2007-04-15 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* DEPENDS: added subdependecy on openobex with bluez-libs #13610

diff --git a/mobile/powermgmt-base/BUILD b/mobile/powermgmt-base/BUILD
new file mode 100755
index 0000000..8f58e6d
--- /dev/null
+++ b/mobile/powermgmt-base/BUILD
@@ -0,0 +1 @@
+make
diff --git a/mobile/powermgmt-base/DETAILS b/mobile/powermgmt-base/DETAILS
new file mode 100755
index 0000000..ce9d86e
--- /dev/null
+++ b/mobile/powermgmt-base/DETAILS
@@ -0,0 +1,15 @@
+ SPELL=powermgmt-base
+ VERSION=1.29
+ SOURCE=${SPELL}_$VERSION.tar.gz
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELL}-$VERSION
+
SOURCE_URL[0]=http://ftp.debian.org/debian/pool/main/p/powermgmt-base/$SOURCE
+
SOURCE_HASH=sha512:755b9039ecdbc0ff654b6dd9d5a705cbb53256f50ee509555a00dcc88bc70641e89039158329b0cdfa5d53255d313ddd3e0277a6716c270e075d1558523b2142
+ WEB_SITE=http://packages.qa.debian.org/p/powermgmt-base.html
+ ENTERED=20070917
+ BUILD_API=2
+ LICENSE=GPL
+ SHORT="powermgmt-base Common utils and configs for power
management"
+cat << EOF
+This contains utilities and configuration files for
+power management that are common to APM and ACPI.
+EOF
diff --git a/mobile/powermgmt-base/HISTORY b/mobile/powermgmt-base/HISTORY
new file mode 100644
index 0000000..77c13a6
--- /dev/null
+++ b/mobile/powermgmt-base/HISTORY
@@ -0,0 +1,3 @@
+2007-09-16 Javier Vasquez <jevv.cr AT gmail.com>
+ * BUILD, INSTALL, DETAILS, HISTORY:
+ created this spell, ver. 1.29
diff --git a/mobile/powermgmt-base/INSTALL b/mobile/powermgmt-base/INSTALL
new file mode 100755
index 0000000..2796948
--- /dev/null
+++ b/mobile/powermgmt-base/INSTALL
@@ -0,0 +1,6 @@
+cd $SOURCE_DIRECTORY &&
+make install &&
+ln -v -s /sbin/on_ac_power /usr/bin/on_ac_power &&
+install -v -m 644 man/acpi_available.1 ${INSTALL_ROOT}/usr/share/man/man1 &&
+install -v -m 644 man/apm_available.1 ${INSTALL_ROOT}/usr/share/man/man1 &&
+install -v -m 644 man/on_ac_power.1 ${INSTALL_ROOT}/usr/share/man/man1
diff --git a/mobile/synce-dccm/DEPENDS b/mobile/synce-dccm/DEPENDS
index 2e23436..3db59c9 100755
--- a/mobile/synce-dccm/DEPENDS
+++ b/mobile/synce-dccm/DEPENDS
@@ -1 +1 @@
-depends synce-libsynce
+depends SYNCE_DCCM
diff --git a/mobile/synce-dccm/DETAILS b/mobile/synce-dccm/DETAILS
index e585c64..2e6d359 100755
--- a/mobile/synce-dccm/DETAILS
+++ b/mobile/synce-dccm/DETAILS
@@ -1,6 +1,6 @@
SPELL=synce-dccm
- VERSION=0.9.1
-
SOURCE_HASH=sha512:f2ca70dd73bcba1180721b8de3e2a964600184ca87323813620663a07efe1a8fdb02032a3947ee39db219563fb4feea418b019277aa4d826d928255b3b4ea01c
+ VERSION=0
+ SOURCE_HASH=sha512:
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$SOURCEFORGE_URL/synce/$SOURCE
diff --git a/mobile/synce-dccm/HISTORY b/mobile/synce-dccm/HISTORY
index e56404f..454d88b 100644
--- a/mobile/synce-dccm/HISTORY
+++ b/mobile/synce-dccm/HISTORY
@@ -1,3 +1,6 @@
+2004-10-24 Arjan Bouter <abouter AT sourcemage.org>
+ * DETAILS: version 0.10.0
+
2006-10-03 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: [automated] Removed UPDATED.

diff --git a/mobile/synce-librapi2/DEPENDS b/mobile/synce-librapi2/DEPENDS
index 2e23436..dd26eb3 100755
--- a/mobile/synce-librapi2/DEPENDS
+++ b/mobile/synce-librapi2/DEPENDS
@@ -1 +1,5 @@
-depends synce-libsynce
+depends synce-libsynce &&
+optional_depends pyrex \
+ '--enable-python-bindings' \
+ '--disable-python-bindings' \
+ 'For python binding'
diff --git a/mobile/synce-librapi2/DETAILS b/mobile/synce-librapi2/DETAILS
index 30b4c51..b5a51d4 100755
--- a/mobile/synce-librapi2/DETAILS
+++ b/mobile/synce-librapi2/DETAILS
@@ -1,8 +1,8 @@
SPELL=synce-librapi2
- VERSION=0.9.1
-
SOURCE_HASH=sha512:8ab4febd93a219f4fcbd75271cf02835702a2104c4cb7c43413d0ecd966a719a1652881f87056ebe3f886ba8386bb7d45fa048234b5210c3d20360224e474047
+ VERSION=0.10.0
+
SOURCE_HASH=sha512:b8b01a5e375aca559d7e9145e46ad1977dc7ca9b58e97514b529a561cedf1eec39beac2caafd27e8a43dc6809dc10edd93926be8c6bcbbf1941421dab901dcdd
SOURCE=$SPELL-$VERSION.tar.gz
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/librapi2-$VERSION
SOURCE_URL[0]=$SOURCEFORGE_URL/synce/$SOURCE
WEB_SITE=http://synce.sourceforge.net/
ENTERED=20050524
diff --git a/mobile/synce-librapi2/HISTORY b/mobile/synce-librapi2/HISTORY
index e56404f..daeff09 100644
--- a/mobile/synce-librapi2/HISTORY
+++ b/mobile/synce-librapi2/HISTORY
@@ -1,3 +1,7 @@
+2007-10-31 Arjan Bouter <abouter AT sourcemage.org>
+ * DETAILS: version 0.10.0
+ fixed SOURCE_DIRECTORY
+
2006-10-03 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: [automated] Removed UPDATED.

diff --git a/mobile/synce-libsynce/DETAILS b/mobile/synce-libsynce/DETAILS
index c72ae4d..961e918 100755
--- a/mobile/synce-libsynce/DETAILS
+++ b/mobile/synce-libsynce/DETAILS
@@ -1,15 +1,13 @@
SPELL=synce-libsynce
- VERSION=0.9.1
-
SOURCE_HASH=sha512:5ef1b77b06d6afc97e9918728d4fdeb9069650e43644abaf8fabdb0fd355c4352f008edd760ad6982d1b9a189656341d90c83f60f0930b02466c791e78aecafb
+ VERSION=0.10.0
+
SOURCE_HASH=sha512:e28ba7299a9512f08a556385b5b6103ab6c7f6cf46aab51546785c63a167b737bcbfdfdb2269bf476a59b692c54c80eb74b527fdfe4797bccfde2a2bf2fb10ca
SOURCE=$SPELL-$VERSION.tar.gz
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/libsynce-$VERSION
SOURCE_URL[0]=$SOURCEFORGE_URL/synce/$SOURCE
WEB_SITE=http://synce.sourceforge.net/
ENTERED=20050524
KEYWORDS="mobile"
SHORT='SynCE provides communication with Windows Mobile devices'
cat << EOF
-The purpose of the SynCE project is to provide a means of communication with
a
-Windows CE device from a computer running Linux, FreeBSD or a similar
operating
-system.
+Synce-libsynce installs the base libraries for the synce project.
EOF
diff --git a/mobile/synce-libsynce/HISTORY b/mobile/synce-libsynce/HISTORY
index 8e64513..b79932a 100644
--- a/mobile/synce-libsynce/HISTORY
+++ b/mobile/synce-libsynce/HISTORY
@@ -1,3 +1,10 @@
+2007-11-03 Arjan Bouter <abouter AT sourcemage.org>
+ * DETAILS: re-added the long description
+
+2007-10-31 Arjan Bouter <abouter AT sourcemage.org>
+ * DETAILS: version 0.10.0
+ fixed SOURCE_DIRECTORY
+
2006-10-03 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: [automated] Removed UPDATED.

diff --git a/mobile/synce-odccm/DEPENDS b/mobile/synce-odccm/DEPENDS
new file mode 100755
index 0000000..4434bb2
--- /dev/null
+++ b/mobile/synce-odccm/DEPENDS
@@ -0,0 +1,2 @@
+depends synce-libsynce &&
+depends gnet2
diff --git a/mobile/synce-odccm/DETAILS b/mobile/synce-odccm/DETAILS
new file mode 100755
index 0000000..a8f8aac
--- /dev/null
+++ b/mobile/synce-odccm/DETAILS
@@ -0,0 +1,13 @@
+ SPELL=synce-odccm
+ VERSION=0.10.0
+
SOURCE_HASH=sha512:e87e8bcad84c770ef7443ffd534b687f2ea829fa4b12af4d7867f3c1d2ea7a53b1abfbcc902de32a04ca7139507185f366325a4590b24558383d9329e3938630
+ SOURCE=$SPELL-$VERSION.tar.gz
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/odccm-$VERSION
+ SOURCE_URL[0]=$SOURCEFORGE_URL/synce/$SOURCE
+ WEB_SITE=http://synce.sourceforge.net/
+ ENTERED=20050524
+ KEYWORDS="mobile"
+ SHORT='dccm implementation'
+cat << EOF
+odccm is a legacy-free dccm-implementation for Windows Mobile 5 (and newer)
devices.
+EOF
diff --git a/mobile/synce-odccm/HISTORY b/mobile/synce-odccm/HISTORY
new file mode 100644
index 0000000..7d68158
--- /dev/null
+++ b/mobile/synce-odccm/HISTORY
@@ -0,0 +1,20 @@
+2007-10-24 Arjan Bouter <abouter AT sourcemage.org>
+ * DETAILS: version 0.10.0
+ * synce-dccm split into odccm and vdccm
+ * DEPENDS: added dep on gnet2
+ * PROVIDES: added
+
+2006-10-03 Juuso Alasuutari <iuso AT sourcemage.org>
+ * DETAILS: [automated] Removed UPDATED.
+
+2006-09-21 Juuso Alasuutari <iuso AT sourcemage.org>
+ * DETAILS: [automated] Removed BUILD_API=2.
+
+2006-03-12 Karsten Behrmann <BearPerson AT sourcemage.org>
+ * DETAILS: (automated) Add KEYWORDS
+
+2005-11-18 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.9.1
+
+2005-05-24 Sergey Lipnevich <sergey AT sourcemage.org>
+ * ALL: spell created.
diff --git a/mobile/synce-rra/DEPENDS b/mobile/synce-rra/DEPENDS
index e723104..cb884fb 100755
--- a/mobile/synce-rra/DEPENDS
+++ b/mobile/synce-rra/DEPENDS
@@ -1,2 +1,6 @@
-depends libmimedir &&
+depends libmimedir &&
+optional_depends pyrex \
+ '--enable-python-bindings' \
+ '--disable-python-bindings' \
+ 'For python bindings'
depends synce-librapi2
diff --git a/mobile/synce-rra/DETAILS b/mobile/synce-rra/DETAILS
index 9292c2a..2de700d 100755
--- a/mobile/synce-rra/DETAILS
+++ b/mobile/synce-rra/DETAILS
@@ -1,6 +1,6 @@
SPELL=synce-rra
- VERSION=0.9.1
-
SOURCE_HASH=sha512:7ec46f1a56cfd01d107c0a085f4bd8bc526e13018c60f4ce57219a3a527153d5de8e78efde8f48a8c603220009e962e311a2d6e68400bf059cb4b9840c8edcc8
+ VERSION=0.10.0
+
SOURCE_HASH=sha512:fe3ab752d324ef642ddee3b93424781c5a744b5e367a8078256c44f12e77dc791b1018b1e2ae3697017c804716f3d747dac844d21e880add7fa64da7e61ce819
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$SOURCEFORGE_URL/synce/$SOURCE
diff --git a/mobile/synce-rra/HISTORY b/mobile/synce-rra/HISTORY
index af7ff54..0e215b2 100644
--- a/mobile/synce-rra/HISTORY
+++ b/mobile/synce-rra/HISTORY
@@ -1,3 +1,6 @@
+2007-10-31 Arjan Bouter <abouter AT sourcemage.org>
+ * DETAILS: version 0.10.0
+
2006-10-03 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: [automated] Removed UPDATED.

diff --git a/mobile/synce-serial/DETAILS b/mobile/synce-serial/DETAILS
index 489e727..012743d 100755
--- a/mobile/synce-serial/DETAILS
+++ b/mobile/synce-serial/DETAILS
@@ -1,6 +1,6 @@
SPELL=synce-serial
- VERSION=0.9.1
-
SOURCE_HASH=sha512:885939de913265cee74e68d19e36b5b6c24a62b06badb1c6f62a945dbfaa6a38d2e8c7257632d7a2bf400338f8c53d9062c92f4667b0aec886fd62af92157082
+ VERSION=0.10.0
+
SOURCE_HASH=sha512:20dc25bd613271ecf4b10c4d8fa054ef153313840a3e8366d2b9e75491b6ebb973e016bfef6972174933332d5797f46bd141047fd63f1622246e3e28a9ba1383
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$SOURCEFORGE_URL/synce/$SOURCE
diff --git a/mobile/synce-serial/HISTORY b/mobile/synce-serial/HISTORY
index e56404f..9f23f09 100644
--- a/mobile/synce-serial/HISTORY
+++ b/mobile/synce-serial/HISTORY
@@ -1,3 +1,6 @@
+2007-10-31 Arjan Bouter <abouter AT sourcemage.org>
+ * DETAILS: version 0.10.0
+
2006-10-03 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: [automated] Removed UPDATED.

diff --git a/mobile/synce-usb-rndis-lite/BUILD
b/mobile/synce-usb-rndis-lite/BUILD
new file mode 100755
index 0000000..8f58e6d
--- /dev/null
+++ b/mobile/synce-usb-rndis-lite/BUILD
@@ -0,0 +1 @@
+make
diff --git a/mobile/synce-usb-rndis-lite/DETAILS
b/mobile/synce-usb-rndis-lite/DETAILS
new file mode 100755
index 0000000..78e5906
--- /dev/null
+++ b/mobile/synce-usb-rndis-lite/DETAILS
@@ -0,0 +1,13 @@
+ SPELL=synce-usb-rndis-lite
+ VERSION=0.10.0
+ SOURCE=$SPELL-$VERSION.tar.gz
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+ SOURCE_URL[0]=$SOURCEFORGE_URL/synce/$SOURCE
+
SOURCE_IGNORE=sha512:d30a266bbaa567794c72e9aee04040922bcacb3c889d1ccf42ccfa4ed139ffea6a24998b5c14841e86d4698d08ee0d9979c48116ef4fcca3867c9c95eee467cc
+ WEB_SITE=http://www.synce.org
+ ENTERED=20071024
+ LICENSE[0]=GPL
+ SHORT="usb rndis driver"
+cat << EOF
+usb rndis driver
+EOF
diff --git a/mobile/synce-usb-rndis-lite/HISTORY
b/mobile/synce-usb-rndis-lite/HISTORY
new file mode 100644
index 0000000..c0a5ec7
--- /dev/null
+++ b/mobile/synce-usb-rndis-lite/HISTORY
@@ -0,0 +1,3 @@
+2007-10-24 Arjan Bouter <abouter AT sourcemage.org>
+ * DETAILS,HISTORY: created spell
+
diff --git a/mobile/synce-vdccm/DEPENDS b/mobile/synce-vdccm/DEPENDS
new file mode 100755
index 0000000..2e23436
--- /dev/null
+++ b/mobile/synce-vdccm/DEPENDS
@@ -0,0 +1 @@
+depends synce-libsynce
diff --git a/mobile/synce-vdccm/DETAILS b/mobile/synce-vdccm/DETAILS
new file mode 100755
index 0000000..b65777e
--- /dev/null
+++ b/mobile/synce-vdccm/DETAILS
@@ -0,0 +1,14 @@
+ SPELL=synce-vdccm
+ VERSION=0.10.0
+
SOURCE_HASH=sha512:454a9da7ff48d8956b8a9cc189ebef8e5dbe1c2c96f1a99a4ee3dedde57ae9af2029b65369110123dc0594fb33e21d53fb00cc72d1e164bda52baaab75410538
+ SOURCE=$SPELL-$VERSION.tar.gz
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+ SOURCE_URL[0]=$SOURCEFORGE_URL/synce/$SOURCE
+ WEB_SITE=http://synce.sourceforge.net/
+ ENTERED=20050524
+ KEYWORDS="mobile"
+ SHORT='dccm implementation'
+cat << EOF
+This vdccm is a replacement of the original dccm and the vdccm comming
+with SynCE-KDE.
+EOF
diff --git a/mobile/synce-vdccm/HISTORY b/mobile/synce-vdccm/HISTORY
new file mode 100644
index 0000000..790cbdf
--- /dev/null
+++ b/mobile/synce-vdccm/HISTORY
@@ -0,0 +1,19 @@
+2007-10-24 Arjan Bouter <abouter AT sourcemage.org>
+ * DETAILS: version 0.10.0
+ * synce-dccm split into odccm and vdccm
+ * PROVIDES: added
+
+2006-10-03 Juuso Alasuutari <iuso AT sourcemage.org>
+ * DETAILS: [automated] Removed UPDATED.
+
+2006-09-21 Juuso Alasuutari <iuso AT sourcemage.org>
+ * DETAILS: [automated] Removed BUILD_API=2.
+
+2006-03-12 Karsten Behrmann <BearPerson AT sourcemage.org>
+ * DETAILS: (automated) Add KEYWORDS
+
+2005-11-18 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.9.1
+
+2005-05-24 Sergey Lipnevich <sergey AT sourcemage.org>
+ * ALL: spell created.
diff --git a/net/bind/DEPENDS b/net/bind/DEPENDS
deleted file mode 100755
index a69731c..0000000
--- a/net/bind/DEPENDS
+++ /dev/null
@@ -1 +0,0 @@
-depends gcc34
diff --git a/net/bind/DETAILS b/net/bind/DETAILS
index 7838527..7a5b2c4 100755
--- a/net/bind/DETAILS
+++ b/net/bind/DETAILS
@@ -11,7 +11,6 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-${VERSION}
SOURCE2_URL[0]=ftp://ftp.internic.net/domain/$SOURCE2
SOURCE3_URL[0]=ftp://ftp.isc.org/isc/bind9/$VERSION/$SOURCE3
SOURCE3_IGNORE=signature
- GCC_VERSION=3.4
SOURCE_GPG="isc.gpg:$SOURCE3:UPSTREAM_KEY"
FORCE_DOWNLOAD[2]=true
LICENSE[0]=ISC
diff --git a/net/bind/HISTORY b/net/bind/HISTORY
index dc51462..8740d78 100644
--- a/net/bind/HISTORY
+++ b/net/bind/HISTORY
@@ -1,3 +1,7 @@
+2007-10-24 Elisamuel Resto <ryuji AT mages.ath.cx>
+ * DETAILS: removed gcc34
+ * DEPENDS: removed
+
2007-09-27 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: Updated to 9.4.1-P1
Use upstream GPG key
diff --git a/net/dhcpcd/DETAILS b/net/dhcpcd/DETAILS
index 0cd9624..824238f 100755
--- a/net/dhcpcd/DETAILS
+++ b/net/dhcpcd/DETAILS
@@ -1,6 +1,6 @@
SPELL=dhcpcd
- VERSION=3.1.4
-
SOURCE_HASH=sha512:f762802f8cc1422b47517e0e333917b19b6dfab9b79a85e289f1305ecf67204ae3eb97567374d03f0cd16aab2cb8b22bf5251ae653ffd21c5988fcc0045d060e
+ VERSION=3.1.7
+
SOURCE_HASH=sha512:b6d00997ed59f88a9b3ab5cd705a94a50e8b8102a041ba1bfdbf7965906d46aa448b08550f9b8485ad4e0056083a65c5eccb809774fb1d2cf05cd5121c3d9ad3
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://download.berlios.de/$SPELL/$SOURCE
diff --git a/net/dhcpcd/HISTORY b/net/dhcpcd/HISTORY
index 4562ac4..b95a112 100644
--- a/net/dhcpcd/HISTORY
+++ b/net/dhcpcd/HISTORY
@@ -1,3 +1,6 @@
+2007-10-21 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 3.1.7
+
2007-08-15 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 3.1.4

diff --git a/net/howl/BUILD b/net/howl/BUILD
deleted file mode 100755
index 2b305c9..0000000
--- a/net/howl/BUILD
+++ /dev/null
@@ -1,3 +0,0 @@
-# fix the pkgconfig file to use the correct include path
-sedit "s:-@VERSION@::" howl.pc.in &&
-default_build
diff --git a/net/howl/HISTORY b/net/howl/HISTORY
index 8133e2d..04d67c8 100644
--- a/net/howl/HISTORY
+++ b/net/howl/HISTORY
@@ -1,3 +1,9 @@
+2007-10-03 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * PRE_BUILD, kernel-headers.patch: added patch to compile with current
+ kernel headers, bug #14028
+ moved sedit from BUILD to here
+ * BUILD: removed
+
2006-10-03 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: [automated] Removed UPDATED.

diff --git a/net/howl/PRE_BUILD b/net/howl/PRE_BUILD
new file mode 100755
index 0000000..ee1c3df
--- /dev/null
+++ b/net/howl/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+sedit "s:-@VERSION@::" howl.pc.in &&
+patch -p0 < $SCRIPT_DIRECTORY/kernel-headers.patch
diff --git a/net/howl/kernel-headers.patch b/net/howl/kernel-headers.patch
new file mode 100644
index 0000000..a460669
--- /dev/null
+++ b/net/howl/kernel-headers.patch
@@ -0,0 +1,13 @@
+--- src/lib/howl/Posix/posix_interface.c.orig 2007-10-03 10:50:56.000000000
+0200
++++ src/lib/howl/Posix/posix_interface.c 2007-10-03 10:51:02.000000000
+0200
+@@ -41,6 +41,10 @@
+ typedef __uint32_t u32;
+ typedef __uint16_t u16;
+ typedef __uint8_t u8;
++typedef uint64_t __u64;
++typedef uint32_t __u32;
++typedef uint16_t __u16;
++typedef uint8_t __u8;
+ # include <linux/sockios.h>
+ # include <linux/ethtool.h>
+ #endif
diff --git a/net/jigdo/DETAILS b/net/jigdo/DETAILS
index 61281f2..e474be0 100755
--- a/net/jigdo/DETAILS
+++ b/net/jigdo/DETAILS
@@ -1,13 +1,12 @@
SPELL=jigdo
- VERSION=0.7.2
- SOURCE_HASH='sha1:adaf1957fa1e4872d7162591060816b9e04ee264'
+ VERSION=0.7.3
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://atterer.net/jigdo/$SOURCE
+ SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
WEB_SITE=http://atterer.net/jigdo/
LICENSE[0]=GPL
ENTERED=20021001
- UPDATED=20050817
KEYWORDS="net"
SHORT='Large file distribution facilitator'
cat << EOF
diff --git a/net/jigdo/HISTORY b/net/jigdo/HISTORY
index 42388c4..3a3572c 100644
--- a/net/jigdo/HISTORY
+++ b/net/jigdo/HISTORY
@@ -1,3 +1,7 @@
+2007-10-20 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 0.7.3
+ * PRE_BUILD: actually delete and patch applied in PRE_BUILD
+
2006-09-21 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: [automated] Removed BUILD_API=2.

diff --git a/net/jigdo/PRE_BUILD b/net/jigdo/PRE_BUILD
deleted file mode 100755
index 109d89d..0000000
--- a/net/jigdo/PRE_BUILD
+++ /dev/null
@@ -1,3 +0,0 @@
-default_pre_build &&
-cd $SOURCE_DIRECTORY &&
-patch -p1 < $SCRIPT_DIRECTORY/scan.diff
diff --git a/net/jigdo/jigdo-0.7.3.tar.bz2.sig
b/net/jigdo/jigdo-0.7.3.tar.bz2.sig
new file mode 100644
index 0000000..5e61c2f
Binary files /dev/null and b/net/jigdo/jigdo-0.7.3.tar.bz2.sig differ
diff --git a/net/jigdo/scan.diff b/net/jigdo/scan.diff
deleted file mode 100644
index d4abeb5..0000000
--- a/net/jigdo/scan.diff
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -urN jigdo-0.7.2/src/scan.hh jigdo/src/scan.hh
---- jigdo-0.7.2/src/scan.hh 2005-07-02 18:05:04.000000000 -0400
-+++ jigdo/src/scan.hh 2005-08-17 14:52:07.000000000 -0400
-@@ -425,9 +425,11 @@
- const byte* data;
- size_t dataSize;
- try {
-- if (cacheFile->findName(data, dataSize, name, fileInfo.st_size,
-+ long long int size = fileInfo.st_size;
-+ if (cacheFile->findName(data, dataSize, name, size,
- fileInfo.st_mtime).failed())
- continue;
-+ fileInfo.st_size = size;
- } catch (DbError e) {
- string err = subst(_("Error accessing cache: %1"), e.message);
- reporter.error(err);
-Binary files jigdo-0.7.2/src/.scan.hh.swp and jigdo/src/.scan.hh.swp differ
diff --git a/net/monit/DETAILS b/net/monit/DETAILS
index 839b94c..d0e5887 100755
--- a/net/monit/DETAILS
+++ b/net/monit/DETAILS
@@ -1,14 +1,22 @@
SPELL=monit
- VERSION=4.9
-
SOURCE_HASH=sha512:e1bf455d1d4fe881da3731e83d701f333d2444c01963d4c6f6114573156b42ee8612a4379479e304bb627f51c289d8f97dec7e813e91c3302b19023b12d98864
+ VERSION=4.10
+








SOURCE_HASH=sha512:de4eaf5d6a4cee9f0431b80146bfc09a5464bb2a0e8333ab73ad72adbd9c48078c2e228ee9265ad6f36f4754ec81f2aa57516cb5a6fbf0f1e9a43d458692ec62
SOURCE="$SPELL-$VERSION.tar.gz"
SOURCE_URL[0]="http://www.tildeslash.com/monit/dist/$SOURCE";
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
WEB_SITE="http://www.tildeslash.com/$SPELL/";
LICENSE[0]='GPL'
- UPDATED=20060112
KEYWORDS="net"
SHORT='A utility for monitoring Unix system services'
cat << EOF
-Monit is a utility for managing and monitoring processes, files,
directories, and devices on a Unix system. It conducts automatic maintenance
and repair and can execute meaningful causal actions in error situations. It
can be used to monitor files, directories, and devices for changes, such as
timestamps changes, checksum changes, or size changes. It is controlled via
an easy to configure control file based on a free-format, token-oriented
syntax. It logs to syslog or to its own log file and notifies users about
error conditions via customizable alert messages. It can perform various
TCP/IP network checks, protocol checks, and can utilize SSL for such checks.
It provides an HTTP(S) interface for access.
+Monit is a utility for managing and monitoring processes, files, directories,
+and devices on a Unix system. It conducts automatic maintenance and repair
+and can execute meaningful causal actions in error situations. It can be used
+to monitor files, directories, and devices for changes, such as timestamps
+changes, checksum changes, or size changes. It is controlled via an easy to
+configure control file based on a free-format, token-oriented syntax. It logs
+to syslog or to its own log file and notifies users about error conditions
+via customizable alert messages. It can perform various TCP/IP network
checks,
+protocol checks, and can utilize SSL for such checks. It provides an HTTP(S)
+interface for access.
EOF
diff --git a/net/monit/HISTORY b/net/monit/HISTORY
index 2ba72a8..72f16f4 100644
--- a/net/monit/HISTORY
+++ b/net/monit/HISTORY
@@ -1,3 +1,7 @@
+2007-11-06 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
+ * DETAILS: updated spell to 4.10
+ fixed long description wrap
+
2007-02-20 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
* DETAILS: update to 4.9

diff --git a/net/pktstat/DETAILS b/net/pktstat/DETAILS
index 49b3ece..270bffd 100755
--- a/net/pktstat/DETAILS
+++ b/net/pktstat/DETAILS
@@ -1,6 +1,6 @@
SPELL=pktstat
- VERSION=1.8.3
-
SOURCE_HASH='sha512:00c7f91fc2e05e6d524af26031f2d9453879a37a0d88a9f6bc230b84eadcae34029c8d43029b48ada165f2a5a16cde88ee6291c4d80f01934671a4d50e5f15da'
+ VERSION=1.8.4
+
SOURCE_HASH='sha512:b932c5ae11a603bdb93dd38e010d36fae1d309ba80af2940b39b8167793b063313d1b06fc80f35dd69475e07186efc0fdd892b9f438b8490098752b5694e6dee'
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION

SOURCE_URL[0]=http://www.adaptive-enterprises.com.au/~d/software/pktstat/$SOURCE
diff --git a/net/pktstat/HISTORY b/net/pktstat/HISTORY
index 13595b6..af85503 100644
--- a/net/pktstat/HISTORY
+++ b/net/pktstat/HISTORY
@@ -1,3 +1,6 @@
+2007-10-14 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 1.8.4
+
2006-11-14 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.8.3

diff --git a/net/samba/DETAILS b/net/samba/DETAILS
index 0ab7a65..881121a 100755
--- a/net/samba/DETAILS
+++ b/net/samba/DETAILS
@@ -1,6 +1,6 @@
SPELL=samba
- VERSION=3.0.26a
-
SOURCE_HASH=sha512:00fddae80001d0dbd8cc8fe8b7fb1fdc0e5befcba4431fcba95b9f424abb687d17e9f698ec127a8fdd6522b144bfd6de021c7043be7f5e51aa37049c70ca51e2
+ VERSION=3.0.27a
+
SOURCE_HASH=sha512:550514ed91ec3ffe4eb21e0d5d95eb6f090d175eefb820a7f08c2821f98d64e0fa47251fb63b6ccf7d3c61164b860b1b3dda359bc714f9dab7a99be6832ca3d0
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://us1.samba.org/samba/ftp/$SOURCE
@@ -13,7 +13,7 @@ if [[ "$SAMBA_VSCAN" == "y" ]] ; then
SOURCE2_URL[0]=http://www.openantivirus.org/download/$SOURCE2

SOURCE2_HASH=sha512:6a4d6f9c033777a54af19f5e4d637ba0515cfb6ca3c815357d8ee4d735586f372d9b7e2b315a783be21ce524aa6f39e1536f91031f496acffbda225a6c8a996f
fi
- SECURITY_PATCH=4
+ SECURITY_PATCH=6
LICENSE[0]=GPL
WEB_SITE=http://www.samba.org/
KEYWORDS="net"
diff --git a/net/samba/HISTORY b/net/samba/HISTORY
index 21e862d..8014829 100644
--- a/net/samba/HISTORY
+++ b/net/samba/HISTORY
@@ -1,3 +1,9 @@
+2007-11-21 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 3.0.27a, SECURITY_PATCH=6, CVE-2007-4572
+
+2007-11-17 George Sherwood <george AT beernabeer.com>
+ * DETAILS: Updated to version 3.0.27. SECURITY_PATCH++
+
2007-09-11 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 3.0.26a, SECURITY_PATCH=4, CVE-2007-4138
* PRE_BUILD, samba-3.0.25c-python_bindings_fix.patch: removed patch
diff --git a/net/shorewall-common/DETAILS b/net/shorewall-common/DETAILS
index 08745b3..0c76f33 100755
--- a/net/shorewall-common/DETAILS
+++ b/net/shorewall-common/DETAILS
@@ -1,5 +1,5 @@
SPELL=shorewall-common
- VERSION=4.0.3
+ VERSION=4.0.5
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 8800af6..e87371b 100644
--- a/net/shorewall-common/HISTORY
+++ b/net/shorewall-common/HISTORY
@@ -1,3 +1,6 @@
+2007-10-24 Elisamuel Resto <ryuji AT mages.ath.cx>
+ * DETAILS: VERSION updated to 4.0.5
+
2007-09-02 David Kowis <dkowis AT shlrm.org>
* DETAILS, BUILD, PRE_BUILD, INSTALL, DEPENDS: created this spell
to replace existing shorewall spell
diff --git a/net/shorewall-docs-html/DETAILS b/net/shorewall-docs-html/DETAILS
index b066915..c9d3a05 100755
--- a/net/shorewall-docs-html/DETAILS
+++ b/net/shorewall-docs-html/DETAILS
@@ -1,5 +1,5 @@
SPELL=shorewall-docs-html
- VERSION=4.0.3
+ VERSION=4.0.5
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 d15a1ec..041e33a 100644
--- a/net/shorewall-docs-html/HISTORY
+++ b/net/shorewall-docs-html/HISTORY
@@ -1,3 +1,6 @@
+2007-10-24 Elisamuel Resto <ryuji AT mages.ath.cx>
+ * DETAILS: VERSION updated to 4.0.5
+
2007-09-02 David Kowis <dkowis AT shlrm.org>
* DETAILS, BUILD, INSTALL: created this spell
to replace existing shorewall spell
diff --git a/net/shorewall-docs-xml/DETAILS b/net/shorewall-docs-xml/DETAILS
index f8b13d9..f150539 100755
--- a/net/shorewall-docs-xml/DETAILS
+++ b/net/shorewall-docs-xml/DETAILS
@@ -1,5 +1,5 @@
SPELL=shorewall-docs-xml
- VERSION=4.0.3
+ VERSION=4.0.5
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 d15a1ec..041e33a 100644
--- a/net/shorewall-docs-xml/HISTORY
+++ b/net/shorewall-docs-xml/HISTORY
@@ -1,3 +1,6 @@
+2007-10-24 Elisamuel Resto <ryuji AT mages.ath.cx>
+ * DETAILS: VERSION updated to 4.0.5
+
2007-09-02 David Kowis <dkowis AT shlrm.org>
* DETAILS, BUILD, INSTALL: created this spell
to replace existing shorewall spell
diff --git a/net/shorewall-lite/DETAILS b/net/shorewall-lite/DETAILS
index 05d8d53..0305d26 100755
--- a/net/shorewall-lite/DETAILS
+++ b/net/shorewall-lite/DETAILS
@@ -1,5 +1,5 @@
SPELL=shorewall-lite
- VERSION=4.0.3
+ VERSION=4.0.5
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 383e500..d2465b2 100644
--- a/net/shorewall-lite/HISTORY
+++ b/net/shorewall-lite/HISTORY
@@ -1,3 +1,6 @@
+2007-10-24 Elisamuel Resto <ryuji AT mages.ath.cx>
+ * DETAILS: VERSION updated to 4.0.5
+
2007-09-02 David Kowis <dkowis AT shlrm.org>
* DETAILS, BUILD, PRE_BUILD, INSTALL, DEPENDS: created this spell
to replace existing shorewall spell
diff --git a/net/shorewall-perl/DETAILS b/net/shorewall-perl/DETAILS
index 75da237..f3e6d42 100755
--- a/net/shorewall-perl/DETAILS
+++ b/net/shorewall-perl/DETAILS
@@ -1,5 +1,5 @@
SPELL=shorewall-perl
- VERSION=4.0.3
+ VERSION=4.0.5
MAINVER=${VERSION:0:3}
RELEASE=shorewall-$VERSION
SOURCE=$SPELL-$VERSION.tar.bz2
diff --git a/net/shorewall-perl/HISTORY b/net/shorewall-perl/HISTORY
index 66886ec..bfb761e 100644
--- a/net/shorewall-perl/HISTORY
+++ b/net/shorewall-perl/HISTORY
@@ -1,3 +1,6 @@
+2007-10-24 Elisamuel Resto <ryuji AT mages.ath.cx>
+ * DETAILS: VERSION updated to 4.0.5
+
2007-09-02 David Kowis <dkowis AT shlrm.org>
* DETAILS, BUILD, INSTALL, DEPENDS: created this spell
to replace existing shorewall spell
diff --git a/net/shorewall-shell/DETAILS b/net/shorewall-shell/DETAILS
index 37434e4..19af047 100755
--- a/net/shorewall-shell/DETAILS
+++ b/net/shorewall-shell/DETAILS
@@ -1,5 +1,5 @@
SPELL=shorewall-shell
- VERSION=4.0.3
+ VERSION=4.0.5
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 66886ec..bfb761e 100644
--- a/net/shorewall-shell/HISTORY
+++ b/net/shorewall-shell/HISTORY
@@ -1,3 +1,6 @@
+2007-10-24 Elisamuel Resto <ryuji AT mages.ath.cx>
+ * DETAILS: VERSION updated to 4.0.5
+
2007-09-02 David Kowis <dkowis AT shlrm.org>
* DETAILS, BUILD, INSTALL, DEPENDS: created this spell
to replace existing shorewall spell
diff --git a/net/shorewall/DETAILS b/net/shorewall/DETAILS
index cd06abf..0097e06 100755
--- a/net/shorewall/DETAILS
+++ b/net/shorewall/DETAILS
@@ -1,5 +1,5 @@
SPELL=shorewall
- VERSION=4.0.3
+ VERSION=4.0.5
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
WEB_SITE=http://www.shorewall.net/
ENTERED=20020513
diff --git a/net/shorewall/HISTORY b/net/shorewall/HISTORY
index 5300b87..6628408 100644
--- a/net/shorewall/HISTORY
+++ b/net/shorewall/HISTORY
@@ -1,3 +1,6 @@
+2007-10-24 Elisamuel Resto <ryuji AT mages.ath.cx>
+ * DETAILS: VERSION updated to 4.0.5
+
2007-09-02 David Kowis <dkowis AT shlrm.org>
* DETAILS: to version 4.0.3 and turned into a spell to just cast
the correct packages
@@ -166,4 +169,3 @@

2002-04-21 Joel Mayes <bluebird AT optushome.com.au>
* Initial spell creation
-
diff --git a/net/tor/DETAILS b/net/tor/DETAILS
index f743fd5..79da9c0 100755
--- a/net/tor/DETAILS
+++ b/net/tor/DETAILS
@@ -1,19 +1,19 @@
SPELL=tor

if [ "$TOR_DEVEL" == "y" ]; then
- VERSION=0.2.0.6-alpha
+ VERSION=0.2.0.9-alpha
SECURITY_PATCH=2
SOURCE=$SPELL-$VERSION.tar.gz
- SOURCE_URL[0]=http://tor.eff.org/dist/$SOURCE
+ SOURCE_URL[0]=http://www.torproject.org/dist/$SOURCE
SOURCE2=$SOURCE.asc
SOURCE2_URL[0]=${SOURCE_URL[0]}.asc
SOURCE_GPG=28988BF5.gpg:$SOURCE2:UPSTREAM_KEY
SOURCE2_IGNORE=signature
else
- VERSION=0.1.2.17
+ VERSION=0.1.2.18
SECURITY_PATCH=2
SOURCE=$SPELL-$VERSION.tar.gz
- SOURCE_URL[0]=http://tor.eff.org/dist/$SOURCE
+ SOURCE_URL[0]=http://www.torproject.org/dist/$SOURCE
SOURCE2=$SOURCE.asc
SOURCE2_URL[0]=${SOURCE_URL[0]}.asc
SOURCE_GPG=28988BF5.gpg:$SOURCE2:UPSTREAM_KEY
@@ -22,7 +22,7 @@ fi

SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
LICENSE[0]=BSD
- WEB_SITE=http://tor.eff.org/
+ WEB_SITE=http://www.torproject.org/
ENTERED=20050415
KEYWORDS="net"
SHORT="An anonymous Internet communication system"
diff --git a/net/tor/HISTORY b/net/tor/HISTORY
index c2111f3..88e2d34 100644
--- a/net/tor/HISTORY
+++ b/net/tor/HISTORY
@@ -1,3 +1,8 @@
+2007-10-31 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
+ * DETAILS: updated TOR_DEVEL=n to 0.1.2.18
+ updated TOR_DEVEL=y to 0.2.0.9-alpha
+ URLS are now torproject
+
2007-09-01 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
* DETAILS: updated TOR_DEVEL=y to 0.2.0.6-alpha
SECURITY_PATCH++
diff --git a/news/liferea/DETAILS b/news/liferea/DETAILS
index f72fdd9..292e43a 100755
--- a/news/liferea/DETAILS
+++ b/news/liferea/DETAILS
@@ -1,9 +1,9 @@
SPELL=liferea
if [ "$LIFEREA_DEVEL" == "y" ]; then
- VERSION=1.4.4
+ VERSION=1.4.8
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
else
- VERSION=1.4.4
+ VERSION=1.4.8
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
fi
SOURCE=$SPELL-$VERSION.tar.gz
@@ -11,6 +11,7 @@ fi
SOURCE_URL[0]=${SOURCEFORGE_URL}/liferea/$SOURCE
WEB_SITE=http://liferea.sourceforge.net
ENTERED=20040407
+ SECURITY_PATCH=1
LICENSE[0]=GPL
KEYWORDS="news"
SHORT="A simple FeedReader clone for Unix distributions with GTK2"
diff --git a/news/liferea/HISTORY b/news/liferea/HISTORY
index d5272f0..809b56f 100644
--- a/news/liferea/HISTORY
+++ b/news/liferea/HISTORY
@@ -1,3 +1,12 @@
+2007-11-22 George Sherwood <george AT beernabeer.com>
+ * DETAILS: Updated to version 1.4.8. SECURITY_PATCH++
+
+2007-10-30 George Sherwood <george AT beernabeer.com>
+ * DETAILS: Updated to version 1.4.6
+
+2007-10-11 George Sherwood <george AT beernabeer.com>
+ * DETAILS: Updated to version 1.4.5b
+
2007-10-01 George Sherwood <george AT beernabeer.com>
* DETAILS: Updated to version 1.4.4

diff --git a/news/liferea/liferea-1.4.4.tar.gz.sig
b/news/liferea/liferea-1.4.4.tar.gz.sig
deleted file mode 100644
index 32b5fe4..0000000
Binary files a/news/liferea/liferea-1.4.4.tar.gz.sig and /dev/null differ
diff --git a/news/liferea/liferea-1.4.6.tar.gz.sig
b/news/liferea/liferea-1.4.6.tar.gz.sig
new file mode 100644
index 0000000..d156a22
Binary files /dev/null and b/news/liferea/liferea-1.4.6.tar.gz.sig differ
diff --git a/news/liferea/liferea-1.4.8.tar.gz.sig
b/news/liferea/liferea-1.4.8.tar.gz.sig
new file mode 100644
index 0000000..dab1794
Binary files /dev/null and b/news/liferea/liferea-1.4.8.tar.gz.sig differ
diff --git a/odbc-drivers/odbcjdbc/DETAILS b/odbc-drivers/odbcjdbc/DETAILS
index 96482b9..31f36d6 100755
--- a/odbc-drivers/odbcjdbc/DETAILS
+++ b/odbc-drivers/odbcjdbc/DETAILS
@@ -2,8 +2,8 @@
local SPELLX SFCVS
SPELLX=OdbcFb32
WEB_SITE=http://www.ibphoenix.com
- VERSION=beta-2.0.0142
-
SOURCE_HASH=sha512:dd107d1e572e83788fabae1bc9173678f9a27bdc4e28c514ce748069cf82bc8db8cab2112736f5bd8818a3af42ca52ef329dda4d0a1e9526f002d420c0e06f56
+ VERSION=beta-2.0.0144
+
SOURCE_HASH=sha512:572bea6d18d8a8106a9db25f0a4d27d1d86d0ce7744542af80b9b084b3b9c3e822f0925b4b1d4edb613cb584771eb1c64421178368337959343df859b4aa6e19
SOURCE=${SPELLX}-$VERSION-src.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/ODBC\_V2-0-BETA
SOURCE_URL[0]=http://www.praktik.km.ua/downloads/$SOURCE
diff --git a/odbc-drivers/odbcjdbc/HISTORY b/odbc-drivers/odbcjdbc/HISTORY
index 3bc3e90..6cfb1b5 100644
--- a/odbc-drivers/odbcjdbc/HISTORY
+++ b/odbc-drivers/odbcjdbc/HISTORY
@@ -1,3 +1,7 @@
+2006-11-03 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 2.0.0144
+ * fix.diff: don't patch makefile.environ
+
2006-07-25 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 2.0.0142
tarball name hase changed
diff --git a/odbc-drivers/odbcjdbc/fix.diff b/odbc-drivers/odbcjdbc/fix.diff
index b087b72..b5121be 100644
--- a/odbc-drivers/odbcjdbc/fix.diff
+++ b/odbc-drivers/odbcjdbc/fix.diff
@@ -23,17 +23,3 @@ diff -uNr
ODBC_V2-0-BETA/OdbcJdbc/Builds/Gcc.lin/makefile.linux ODBC_V2-0-BETA.c
#LINKFLAGS = -rdynamic -export-dynamic -shared
LINKFLAGS = -shared
EXTLIBS = $(EXTLIBDIR) -lcrypt -ldl
-diff -uNr ODBC_V2-0-BETA/OdbcJdbc/Builds/makefile.environ
ODBC_V2-0-BETA.cp/OdbcJdbc/Builds/makefile.environ
---- ODBC_V2-0-BETA/OdbcJdbc/Builds/makefile.environ 2003-12-13
19:27:26.000000000 +0100
-+++ ODBC_V2-0-BETA.cp/OdbcJdbc/Builds/makefile.environ 2006-07-03
21:56:27.000000000 +0200
-@@ -3,8 +3,8 @@
- #FBINCDIR = /mnt/third_party/interbase/sun5-2003-3-10/include
- #FBLIBDIR = /mnt/third_party/interbase/sun5-2003-3-10/lib
- #
--FBINCDIR = d:/Firebird/include
--FBLIBDIR = d:/Firebird/lib
-+#FBINCDIR = /usr/firebird/include
-+#FBLIBDIR = /usr/firebird/lib
- #
- ISCDBCDIR = ../../IscDbc
- ODBCJDBCDIR = ../..
diff --git a/perl-cpan/class-methodmaker/DETAILS
b/perl-cpan/class-methodmaker/DETAILS
index 1735310..0e20040 100755
--- a/perl-cpan/class-methodmaker/DETAILS
+++ b/perl-cpan/class-methodmaker/DETAILS
@@ -1,9 +1,9 @@
SPELL=class-methodmaker
- VERSION=2.05
+ VERSION=2.08
SOURCE=Class-MethodMaker-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/Class-MethodMaker-$VERSION
SOURCE_URL[0]=http://www.cpan.org/authors/id/F/FL/FLUFFY/$SOURCE
-
SOURCE_HASH=sha512:bc7ec9d78606a8610cb44e07156ea404edbb47903e7e79a4b237c93d2ec13bc1701f984f727e73c8e3a9203adc1ba4c629a8e9ddf8f3d38c4b4e7d8dd917b447
+
SOURCE_HASH=sha512:a4181535d19f22eb992894be8cbdb0043c05e4728dbdd2ae944b5727e4dda8099fccfd13a583efc8001f3cae3de1b232eba4467f4f05429ba17d7733e5c72b4a
LICENSE=ART
WEB_SITE="http://search.cpan.org/search?module=Class::MethodMaker";
ENTERED=20020403
diff --git a/perl-cpan/class-methodmaker/HISTORY
b/perl-cpan/class-methodmaker/HISTORY
index 1699427..575e698 100644
--- a/perl-cpan/class-methodmaker/HISTORY
+++ b/perl-cpan/class-methodmaker/HISTORY
@@ -1,3 +1,6 @@
+2007-10-15 Remko van der Vossen <wich AT sourcemage.org>
+ * DETAILS: Version bumped to 2.0.8
+
2006-09-21 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: [automated] Removed BUILD_API=2.

diff --git a/perl-cpan/cpan/DETAILS b/perl-cpan/cpan/DETAILS
index 6798f27..7454865 100755
--- a/perl-cpan/cpan/DETAILS
+++ b/perl-cpan/cpan/DETAILS
@@ -1,13 +1,12 @@
SPELL=cpan
- VERSION=1.76
+ VERSION=1.9203
SOURCE=CPAN-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/CPAN-$VERSION
SOURCE_URL[0]=$PERL_CPAN_URL/authors/id/A/AN/ANDK/$SOURCE
-
SOURCE_HASH=sha512:847c62b194e2791d0abd2f430d52f45e7c6eb86101b14cd5a6845bc7602557db8d240d0e07e66578d2b7eb1cbec9322731830c9260a6f56ea579fbdccb44090c
+
SOURCE_HASH=sha512:39618489e96782f9b57e56bea5b5219a8e9a339df1b288b0d675c1839f9bd458d4bd84e35a81d64a6b178dabe3b053c4c6a3a24e1a1a6de14341a76171567f4d
LICENSE=ART
WEB_SITE="http://search.cpan.org/search?module=CPAN";
ENTERED=20020312
- UPDATED=20020424
KEYWORDS="archive perl"
SHORT="Perl Archive browse and download"
cat << EOF
diff --git a/perl-cpan/cpan/HISTORY b/perl-cpan/cpan/HISTORY
index 99e23ac..7c15c40 100644
--- a/perl-cpan/cpan/HISTORY
+++ b/perl-cpan/cpan/HISTORY
@@ -1,3 +1,6 @@
+2007-10-24 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * DETAILS: updated spell to 1.9203 #14051
+
2007-05-11 Colin "Phoul" Childs <phoul AT sourcemage.org>
* DETAILS: Added $PERL_CPAN_URL

diff --git a/perl-cpan/gnupg-interface/DETAILS
b/perl-cpan/gnupg-interface/DETAILS
index c55ba39..6bb500f 100755
--- a/perl-cpan/gnupg-interface/DETAILS
+++ b/perl-cpan/gnupg-interface/DETAILS
@@ -1,9 +1,9 @@
SPELL=gnupg-interface
- VERSION=0.33
+ VERSION=0.36
SOURCE=GnuPG-Interface-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/GnuPG-Interface-$VERSION
- SOURCE_URL[0]=http://www.cpan.org/authors/id/F/FT/FTOBIN/$SOURCE
-
SOURCE_HASH=sha512:a163439b305ed148f8c16db3606b4b399eb150fc49513027be5ff3a3f5132b6d809364a2a183c9ccbb42b5e9609ddc289aca8c78e16a8279bf614697ef1f74dc
+ SOURCE_URL[0]=http://search.cpan.org/CPAN/authors/id/J/JE/JESSE/$SOURCE
+
SOURCE_HASH=sha512:2b2481e6e44000c9d6e3e710c1e65221be02bdf08b5a11ab5b8814889efd8ebaa3be11b091e4c5a9b82fe8f2a46b54420a4c6ec3d97961da5e2f944eaa7b1135
LICENSE=ART
WEB_SITE="http://search.cpan.org/search?module=GnuPG::Interface";
ENTERED=20020403
diff --git a/perl-cpan/gnupg-interface/HISTORY
b/perl-cpan/gnupg-interface/HISTORY
index 1e30353..296196f 100644
--- a/perl-cpan/gnupg-interface/HISTORY
+++ b/perl-cpan/gnupg-interface/HISTORY
@@ -1,3 +1,6 @@
+2007-10-20 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 0.36, new SOURCE_URL[0]
+
2006-10-04 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: fixed SOURCE

diff --git a/perl-cpan/perl-cairo/DETAILS b/perl-cpan/perl-cairo/DETAILS
index 8ce5cc3..eadb6c5 100755
--- a/perl-cpan/perl-cairo/DETAILS
+++ b/perl-cpan/perl-cairo/DETAILS
@@ -1,7 +1,7 @@
SPELL=perl-cairo
SNAME=Cairo
- VERSION=1.041
-
SOURCE_HASH=sha512:6251ef47694ba0ab259364c1df135a2bb069a72a3f0e468abc44e7fde764cb8d218d47a1a753d5ac65375f110282d589e6d132eb97677346046ae4d02201f0f8
+ VERSION=1.043
+
SOURCE_HASH=sha512:64d98afa9bb1acd08342fd064a0cff516636cc89a6d92dbb793248dfc4d5d2c825b64564f9af75ac13036afc39de8902acf097806342aece65c97df469bc0bf7
SOURCE=$SNAME-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SNAME-$VERSION
SOURCE_URL[0]=$SOURCEFORGE_URL/gtk2-perl/$SOURCE
diff --git a/perl-cpan/perl-cairo/HISTORY b/perl-cpan/perl-cairo/HISTORY
index 94e2f55..f8f208f 100644
--- a/perl-cpan/perl-cairo/HISTORY
+++ b/perl-cpan/perl-cairo/HISTORY
@@ -1,3 +1,6 @@
+2007-10-14 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.043
+
2007-07-02 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.041

diff --git a/perl-cpan/perl-glib/DETAILS b/perl-cpan/perl-glib/DETAILS
index 74fec6d..2224443 100755
--- a/perl-cpan/perl-glib/DETAILS
+++ b/perl-cpan/perl-glib/DETAILS
@@ -1,7 +1,7 @@
SPELL=perl-glib
SNAME=Glib
- VERSION=1.160
-
SOURCE_HASH=sha512:ef16081924824e937e03955a00905eaa98dbb2ac291327717b99efaf701f4279fa2f2880e7456a1da6089b51c22ba5e6180bb0449f3100998cc47713e6538efd
+ VERSION=1.161
+
SOURCE_HASH=sha512:0f6c115205e4ddff979ac2d84ab92b7f867042f583a744a30c294997d79f89128ac664f394e36efa0c4acc31a1fc9472e6cd9a7e08562dd50cc3b9bdc09c8ebb
SOURCE=$SNAME-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SNAME-$VERSION
SOURCE_URL[0]=$SOURCEFORGE_URL/gtk2-perl/$SOURCE
diff --git a/perl-cpan/perl-glib/HISTORY b/perl-cpan/perl-glib/HISTORY
index c316a23..55708b7 100644
--- a/perl-cpan/perl-glib/HISTORY
+++ b/perl-cpan/perl-glib/HISTORY
@@ -1,3 +1,6 @@
+2007-10-15 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.161
+
2007-09-28 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.160

diff --git a/perl-cpan/perl-gtk2/DETAILS b/perl-cpan/perl-gtk2/DETAILS
index 022907c..3f405af 100755
--- a/perl-cpan/perl-gtk2/DETAILS
+++ b/perl-cpan/perl-gtk2/DETAILS
@@ -1,7 +1,7 @@
SPELL=perl-gtk2
SNAME=Gtk2
- VERSION=1.160
-
SOURCE_HASH=sha512:16abdf4842df4b02a0876e774d6337ee233da5ba1a74e5c7307a77bdbdf8696d29d4a8f13297d32474bb2d5670a3cd8b1122e9a045218abd00a75704ea0929ca
+ VERSION=1.161
+
SOURCE_HASH=sha512:fbcddd2dc5db9c08055c1522c00d743d0d996baa1af0036b05327e4cd6de503b72768780f30e8bfbeab9f792f6cfa498bf46a7b5cd5843f118a3e2b531dffe6c
SOURCE=$SNAME-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SNAME-$VERSION
SOURCE_URL[0]=$SOURCEFORGE_URL/gtk2-perl/$SOURCE
diff --git a/perl-cpan/perl-gtk2/HISTORY b/perl-cpan/perl-gtk2/HISTORY
index e3d1e4c..e9b2e14 100644
--- a/perl-cpan/perl-gtk2/HISTORY
+++ b/perl-cpan/perl-gtk2/HISTORY
@@ -1,3 +1,6 @@
+2007-10-15 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: updated to 1.161
+
2007-09-27 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: updated to 1.160

diff --git a/perl-cpan/version/DETAILS b/perl-cpan/version/DETAILS
index 88f6147..3234a32 100755
--- a/perl-cpan/version/DETAILS
+++ b/perl-cpan/version/DETAILS
@@ -1,6 +1,6 @@
SPELL=version
- VERSION=0.7203
-
SOURCE_HASH=sha512:9ae7b47ea5eadcbac2dc1f2df75ede97bdf3931c64de50a39d21e5808e479c1ff831a061ecc1d36088bab9e7cb8c5e44555818963b2f7c60f84565c79c16958d
+ VERSION=0.74
+
SOURCE_HASH=sha512:d68c66dae417dc200d44fb8b3ea7df7cb2d2386ed60b10543e6b64082dd628677803f57038fb58ad5b288e25a60700c87273547fd7f56f449be22d43e9477c3b
SOURCE=version-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/version-$VERSION
SOURCE_URL[0]=http://www.cpan.org/authors/id/J/JP/JPEACOCK//$SOURCE
diff --git a/perl-cpan/version/HISTORY b/perl-cpan/version/HISTORY
index f033b64..e6bf689 100644
--- a/perl-cpan/version/HISTORY
+++ b/perl-cpan/version/HISTORY
@@ -1,3 +1,6 @@
+2007-11-05 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.74
+
2007-08-01 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.7203

diff --git a/perl-cpan/xml-sax-expat/DETAILS b/perl-cpan/xml-sax-expat/DETAILS
index 79035d4..cffa6d2 100755
--- a/perl-cpan/xml-sax-expat/DETAILS
+++ b/perl-cpan/xml-sax-expat/DETAILS
@@ -1,10 +1,10 @@
SPELL=xml-sax-expat
SNAME=XML-SAX-Expat
- VERSION=0.37
+ VERSION=0.39
+
SOURCE_HASH=sha512:adc163b7d35e94a33443c8061045ebceb4b59020ba30f2a4b30fb424abf9f8e4553a26acfc553531e62b08244986fb05bb39121a81ef0cafd96b72af37c457ae
SOURCE=$SNAME-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SNAME-$VERSION
- SOURCE_URL[0]=http://www.cpan.org/authors/id/R/RB/RBERJON/$SOURCE
-
SOURCE_HASH=sha512:e42940dc3845ae14e9b84dc847f73012fb2752b917ca4859165b57967f653564303959f750660568e4fd580de8f359f4342e0f6b28a467efc38c6ba0a770fd83
+ SOURCE_URL[0]=http://www.cpan.org/authors/id/B/BJ/BJOERN/$SOURCE
WEB_SITE=http://search.cpan.org/search?dist=XML-SAX-Expat
ENTERED=20020722
LICENSE[0]=ART
diff --git a/perl-cpan/xml-sax-expat/HISTORY b/perl-cpan/xml-sax-expat/HISTORY
index 024010f..37a8f08 100644
--- a/perl-cpan/xml-sax-expat/HISTORY
+++ b/perl-cpan/xml-sax-expat/HISTORY
@@ -1,3 +1,7 @@
+2007-11-02 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.39
+ new url
+
2007-09-24 Eric Sandall <sandalle AT sourcemage.org>
* INSTALL: Fails to install with multiple jobs

diff --git a/perl-cpan/xml-sax/CONFLICTS b/perl-cpan/xml-sax/CONFLICTS
deleted file mode 100755
index 650b1ca..0000000
--- a/perl-cpan/xml-sax/CONFLICTS
+++ /dev/null
@@ -1 +0,0 @@
-conflicts XML-SAX y
diff --git a/perl-cpan/xml-sax/DETAILS b/perl-cpan/xml-sax/DETAILS
index 222fa44..1488b8e 100755
--- a/perl-cpan/xml-sax/DETAILS
+++ b/perl-cpan/xml-sax/DETAILS
@@ -1,10 +1,10 @@
SPELL=xml-sax
SNAME=XML-SAX
- VERSION=0.15
+ VERSION=0.16
+
SOURCE_HASH=sha512:0e92db3a3a51a9073f32060946d190bffeee3bf2a80b7a666ae885b884545c86ad8572f572b62d70faa753e5142214fefed449b47a7e71d960c03a962e202588
SOURCE=$SNAME-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SNAME-$VERSION
SOURCE_URL[0]=http://www.cpan.org/authors/id/G/GR/GRANTM/$SOURCE
-
SOURCE_HASH=sha512:04d12d4191bb0306fda6a8525ecb4671847b26d9c30662e50f3fbb0703d4e44d25f13e773e8456d1f953a306b66735b406080c81dceb9f5100ed56e93aab70d0
WEB_SITE=http://search.cpan.org/search?dist=XML-SAX
ENTERED=20020722
LICENSE[0]=ART
diff --git a/perl-cpan/xml-sax/HISTORY b/perl-cpan/xml-sax/HISTORY
index 853df45..0496b06 100644
--- a/perl-cpan/xml-sax/HISTORY
+++ b/perl-cpan/xml-sax/HISTORY
@@ -1,3 +1,7 @@
+2007-11-02 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.16
+ * CONFLICTS: remove obsolete file
+
2007-06-20 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.15
new url
diff --git a/perl-cpan/xml-simple/DETAILS b/perl-cpan/xml-simple/DETAILS
index 2db9726..c947c73 100755
--- a/perl-cpan/xml-simple/DETAILS
+++ b/perl-cpan/xml-simple/DETAILS
@@ -1,9 +1,9 @@
SPELL=xml-simple
- VERSION=2.16
+ VERSION=2.18
+
SOURCE_HASH=sha512:4b70846049ea57c166d9dc097b4aa63381a2035d0e8733eab81a1df9dbab96e6a5bd2d0c4121bb0f88bba740f1137501345148b968bf1855fe795dcf9ddbbd5e
SOURCE=XML-Simple-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/XML-Simple-$VERSION
SOURCE_URL[0]=http://www.cpan.org/authors/id/G/GR/GRANTM/$SOURCE
-
SOURCE_HASH=sha512:99639e2fe2e13b4925c9bfd8da3fccffdd49278d1e02a85166dea337df77a5bd0884f8ee53bcbd76f63c73bcf0d149dedd36976b23776202b0a93ae41fb25b5f
LICENSE=ART
WEB_SITE="http://search.cpan.org/search?module=XML::Simple";
ENTERED=20030122
diff --git a/perl-cpan/xml-simple/HISTORY b/perl-cpan/xml-simple/HISTORY
index 2af6f51..bee309a 100644
--- a/perl-cpan/xml-simple/HISTORY
+++ b/perl-cpan/xml-simple/HISTORY
@@ -1,3 +1,6 @@
+2007-11-02 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 2.18
+
2006-11-24 Eric Sandall <sandalle AT sourcemage.org>
* DEPENDS: Added dependency on xml-sax-expat (Bug #13285)
Removed incorrect dependency on xml-parser-expat
diff --git a/php-pear/php/DETAILS b/php-pear/php/DETAILS
index afdd78a..b6fd64f 100755
--- a/php-pear/php/DETAILS
+++ b/php-pear/php/DETAILS
@@ -1,12 +1,12 @@
SPELL=php
if [[ "$PHP_RC" == y ]]; then
- VERSION=5.2.4
-
SOURCE_HASH=sha512:283fda35fe122c843db1b1f941ded842322031f30128f01ec2a406b9197127b7e2d504a16d4ce4c511baf83d404b117fa59fd23c1b7b153352466c9350d4dba1
+ VERSION=5.2.5
+
SOURCE_HASH=sha512:d362c195a018bad5013c2b8539fdf345944266b6336ecc2315a0809ddc2a543bb09bcdd31d6203c056b1d9f4f65ce0b4f4e32c83df529582b05925b3a5b727f6
else
- VERSION=5.2.4
-
SOURCE_HASH=sha512:283fda35fe122c843db1b1f941ded842322031f30128f01ec2a406b9197127b7e2d504a16d4ce4c511baf83d404b117fa59fd23c1b7b153352466c9350d4dba1
+ VERSION=5.2.5
+
SOURCE_HASH=sha512:d362c195a018bad5013c2b8539fdf345944266b6336ecc2315a0809ddc2a543bb09bcdd31d6203c056b1d9f4f65ce0b4f4e32c83df529582b05925b3a5b727f6
fi
- SECURITY_PATCH=5
+ SECURITY_PATCH=6
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://static.php.net/www.php.net/distributions/$SOURCE
diff --git a/php-pear/php/HISTORY b/php-pear/php/HISTORY
index eb0d59e..95a30a5 100644
--- a/php-pear/php/HISTORY
+++ b/php-pear/php/HISTORY
@@ -1,3 +1,6 @@
+2007-11-10 George Sherwood <george AT beernabeer.com>
+ * DETAILS: Updated to version 5.2.5. SECURITY_PATCH++
+
2007-08-30 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 5.2.4, SECURITY_PATCH=5

diff --git a/printer/cups/DETAILS b/printer/cups/DETAILS
index 2e667cf..9bf29f2 100755
--- a/printer/cups/DETAILS
+++ b/printer/cups/DETAILS
@@ -1,6 +1,6 @@
SPELL=cups
- VERSION=1.3.3
-
SOURCE_HASH=sha512:68012a501d1ef06935ec26466cd5213df43151734ad544280e011f35f3479f3a1fd42c7a2db44394314ea8c07ca3f5ee62f7328fb5b0c8d7313f9adf0fe83ee3
+ VERSION=1.3.4
+
SOURCE_HASH=sha512:23cb9aac0e3c7503de08f8dccf974a92f835206d0fc8c14a4a19dcbccddc262605ff75e943f28571785b8caeeedf6ae4e85fd6026dc6fb25ce3151f5716cd266
SOURCE=$SPELL-$VERSION-source.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=ftp://ftp.easysw.com/pub/${SPELL}/$VERSION/$SOURCE
diff --git a/printer/cups/HISTORY b/printer/cups/HISTORY
index d98bdd0..ab20e4e 100644
--- a/printer/cups/HISTORY
+++ b/printer/cups/HISTORY
@@ -1,3 +1,6 @@
+2007-10-31 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 1.3.4
+
2007-09-28 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.3.3

diff --git a/printer/cupsddk/DETAILS b/printer/cupsddk/DETAILS
index 4a0dc8c..38a1c27 100755
--- a/printer/cupsddk/DETAILS
+++ b/printer/cupsddk/DETAILS
@@ -1,6 +1,6 @@
SPELL=cupsddk
- VERSION=1.2.1
-
SOURCE_HASH=sha512:31bacbcda1cbbbce3f7d08170780c1f8ad0bf701d1f8f5acaf81753f505f186327ff2faaf0746a7634389b24a7d55e9e0d3469635cb9c9a2ee5d71ebcf086f10
+ VERSION=1.2.3
+
SOURCE_HASH=sha512:c898116f303c22f6f227d4327de56ddf07b5fb6ef0d66e61b01e064fc1911d596f43bf8acecab76af4c30f8a2603897154d7f37f1c7452e716c221968a7515a7
SOURCE=${SPELL}-${VERSION}-source.tar.bz2
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
SOURCE_URL[0]=ftp://ftp.easysw.com/pub/${SPELL}/${VERSION}/${SOURCE}
diff --git a/printer/cupsddk/HISTORY b/printer/cupsddk/HISTORY
index 3c6b51d..abc8c4e 100644
--- a/printer/cupsddk/HISTORY
+++ b/printer/cupsddk/HISTORY
@@ -1,3 +1,6 @@
+2007-10-15 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.2.3
+
2007-09-29 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.2.1

diff --git a/printer/gv/DETAILS b/printer/gv/DETAILS
index 05c18f5..6f62bee 100755
--- a/printer/gv/DETAILS
+++ b/printer/gv/DETAILS
@@ -1,6 +1,6 @@
SPELL=gv
- VERSION=3.6.2
-
SOURCE_HASH=sha512:9f73fb9a2a23eb026f93e518493fac235a50b5756364e4e71d1b5baf32831c6bdc2d7f34b145f3a4d357540480f994a8fa7db478f9cd06b7e0b50bdd0f08a7b9
+ VERSION=3.6.3
+
SOURCE_HASH=sha512:5b0fbcccd0ccd5899fdf111cff9aa08ce15122c4b1e06f89ccb5b6de838cf67a540afdf5d18a36bdbc6853344eca3fcd22b3807775b32d959e8f1edabb6ccff6
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$GNU_URL/gv/$SOURCE
diff --git a/printer/gv/HISTORY b/printer/gv/HISTORY
index 5367eff..8269236 100644
--- a/printer/gv/HISTORY
+++ b/printer/gv/HISTORY
@@ -1,3 +1,6 @@
+2007-10-16 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 3.6.3
+
2006-10-21 George Sherwood <george AT beernabeer.com>
* DETAILS: Update to version 3.6.2.

diff --git a/printer/photoprint/DETAILS b/printer/photoprint/DETAILS
index eac9c4b..98c3fb9 100755
--- a/printer/photoprint/DETAILS
+++ b/printer/photoprint/DETAILS
@@ -1,6 +1,6 @@
SPELL=photoprint
- VERSION=0.3.5
-
SOURCE_HASH=sha512:0c38e469e3daf164a0fd86fd400f85430a96c17922952172d27768dec92beb7f319bb61c87eb45eb31a17e1eb9f475d10888537e64a29944399abe7b8445817f
+ VERSION=0.3.6
+
SOURCE_HASH=sha512:d917ce54b3c620b1a2d2ab1b22b1b95614c28a7f28955f72f621325af7695a2aa2eacfa23cbbde3ff98df86cfd2a5e267654d467171d6097f25e0b5669fed020
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
WEB_SITE=http://www.blackfiveservices.co.uk/photoprint.shtml
diff --git a/printer/photoprint/HISTORY b/printer/photoprint/HISTORY
index ecbc2de..788e684 100644
--- a/printer/photoprint/HISTORY
+++ b/printer/photoprint/HISTORY
@@ -1,3 +1,6 @@
+2007-11-01 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.3.6
+
2007-09-19 Treeve Jelbert <treeve AT sourcemage.org>
* DEPENDS: netpbm is optional

diff --git a/printer/splix/DETAILS b/printer/splix/DETAILS
index fcb3722..d86668a 100755
--- a/printer/splix/DETAILS
+++ b/printer/splix/DETAILS
@@ -1,6 +1,6 @@
SPELL=splix
- VERSION=1.0.1-1
-
SOURCE_HASH=sha512:fc58aa8c47b3266b73e87e87e64db54347a6598f701da50ef411e0d68014faa6fa2e1fff69b7f5b6401adabd58ad011e9ba702fac06f822dd3d7abaef63a37f2
+ VERSION=1.0.2
+
SOURCE_HASH=sha512:99dbba1743ef3ca808a478d6f75847d2209bf265f1f350c06437134212ee0b731b362b8a974c905fe03de822494ef2635fa2018f0fdcb41a08eefc911eb79a3e
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
diff --git a/printer/splix/HISTORY b/printer/splix/HISTORY
index 1fda2be..39789fe 100644
--- a/printer/splix/HISTORY
+++ b/printer/splix/HISTORY
@@ -1,3 +1,6 @@
+2007-10-19 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.0.2
+
2007-02-13 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.0.1-1
* DEPENDS: add cupsddk, to translate ppd files
diff --git a/python-devel/bittorrent-bencode/DEPENDS
b/python-devel/bittorrent-bencode/DEPENDS
new file mode 100755
index 0000000..bc66e00
--- /dev/null
+++ b/python-devel/bittorrent-bencode/DEPENDS
@@ -0,0 +1,2 @@
+depends python &&
+depends setuptools
diff --git a/python-devel/bittorrent-bencode/DETAILS
b/python-devel/bittorrent-bencode/DETAILS
new file mode 100755
index 0000000..fb4ca23
--- /dev/null
+++ b/python-devel/bittorrent-bencode/DETAILS
@@ -0,0 +1,19 @@
+ SPELL=bittorrent-bencode
+ VERSION=5.0.8
+ SOURCE="BitTorrent-bencode-${VERSION}.tar.gz"
+
SOURCE_URL[0]=http://pypi.python.org/packages/source/B/BitTorrent-bencode/${SOURCE}
+
SOURCE_HASH=sha512:5ce58de0a5b9347be5ca2cdcba986e84aa40d68204f0996ef1f66d30b93726e0dcd175251858c2b9cc4428c029ac3f6c3bec2a37f897f1ba78567247b0a47b68
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/BitTorrent-bencode-${VERSION}"
+ WEB_SITE="http://www.bittorrent.com/";
+ LICENSE[0]=http://www.bittorrent.com/license/
+ ENTERED=20071021
+ SHORT="The BitTorrent bencode module as leight-weight, standalone
package"
+cat << EOF
+This package simply re-packages the existing bencoding and bdecoding
+implemention from the 'official' BitTorrent client as a separate,
leight-weight
+package for re-using them without having the entire BitTorrent software as
+a dependency.
+
+It currently uses the implementation from BitTorrent Version 5.0.8, the file
+bencode.py is a verbatim, unmodified copy from that distribution.
+EOF
diff --git a/python-devel/bittorrent-bencode/HISTORY
b/python-devel/bittorrent-bencode/HISTORY
new file mode 100644
index 0000000..40ea50e
--- /dev/null
+++ b/python-devel/bittorrent-bencode/HISTORY
@@ -0,0 +1,5 @@
+2007-11-01 Elisamuel Resto <ryuji AT mages.ath.cx>
+ * DEPENDS: depends on setuptools
+
+2007-10-21 Lalo Martins <lalo AT sourcemage.org>
+ * DETAILS, DEPENDS, PRE_BUILD, HISTORY: created spell
diff --git a/python-devel/bittorrent-bencode/PRE_BUILD
b/python-devel/bittorrent-bencode/PRE_BUILD
new file mode 100755
index 0000000..cbe95ad
--- /dev/null
+++ b/python-devel/bittorrent-bencode/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+sed -i 's/packages = find_packages(),/py_modules = ["BTL", "bencode"],/'
setup.py
diff --git a/python-devel/bzr/DEPENDS b/python-devel/bzr/DEPENDS
index 4e25b04..fa7d088 100755
--- a/python-devel/bzr/DEPENDS
+++ b/python-devel/bzr/DEPENDS
@@ -5,4 +5,6 @@ optional_depends paramiko \
'' \
'' \
'for SFTP transport support' &&
-optional_depends bzrtools '' '' 'provides rsync support, and other useful
extra functionality'
+
+optional_depends pycurl '' '' 'provides support for pulling by http using
curl' &&
+suggest_depends bzrtools '' '' 'provides rsync support, and other useful
extra functionality'
diff --git a/python-devel/bzr/DETAILS b/python-devel/bzr/DETAILS
index c92207f..fee3d80 100755
--- a/python-devel/bzr/DETAILS
+++ b/python-devel/bzr/DETAILS
@@ -1,15 +1,15 @@
SPELL=bzr
- VERSION=0.8.2
+ VERSION=0.91
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=${SOURCE}.sig
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- SOURCE_URL[0]=http://www.bazaar-ng.org/pkg/$SOURCE
- SOURCE2_URL[0]=http://www.bazaar-ng.org/pkg/$SOURCE2
+ SOURCE_URL[0]=http://bazaar-vcs.org/releases/src/$SOURCE
+ SOURCE2_URL[0]=http://bazaar-vcs.org/releases/src/$SOURCE2
SOURCE2_IGNORE=signature
SOURCE_GPG="canonical.gpg:${SOURCE2}:UPSTREAM_KEY"
LICENSE[0]=GPL
KEYWORDS="scm distributed python devel"
- WEB_SITE=http://www.bazaar-ng.org/
+ WEB_SITE=http://bazaar-vcs.org
ENTERED=20050610
SHORT="Improved Bazaar SCM"
cat << EOF
diff --git a/python-devel/bzr/HISTORY b/python-devel/bzr/HISTORY
index b5bd970..894f846 100644
--- a/python-devel/bzr/HISTORY
+++ b/python-devel/bzr/HISTORY
@@ -1,3 +1,10 @@
+2007-10-24 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * DEPENDS: added optional pycurl
+ made bzrtools suggested to avoid a circular dependency
+ * DETAILS: Fixed SOURCE_URLs
+ fixed WEB_SITE
+ updated spell to 0.91 #14045
+
2006-09-21 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: [automated] Removed BUILD_API=2.

diff --git a/python-devel/bzrtools/DETAILS b/python-devel/bzrtools/DETAILS
index c301ad0..c6837ee 100755
--- a/python-devel/bzrtools/DETAILS
+++ b/python-devel/bzrtools/DETAILS
@@ -1,14 +1,14 @@
SPELL=bzrtools
- VERSION=0.8
+ VERSION=0.91.0
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SOURCE.sig
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL
SOURCE_URL[0]=http://panoramicfeedback.com/opensource/$SOURCE
SOURCE2_URL[0]=http://panoramicfeedback.com/opensource/$SOURCE2
SOURCE2_IGNORE=signature
SOURCE_GPG="canonical.gpg:$SOURCE2:UPSTREAM_KEY"
LICENSE[0]=GPL
- WEB_SITE=http://bazaar.canonical.com/BzrTools
+ WEB_SITE=http://bazaar-vcs.org/BzrTools
ENTERED=20051018
DOCS="COPYING README NEWS"
KEYWORDS="python devel"
diff --git a/python-devel/bzrtools/HISTORY b/python-devel/bzrtools/HISTORY
index 20c423d..8cf17d4 100644
--- a/python-devel/bzrtools/HISTORY
+++ b/python-devel/bzrtools/HISTORY
@@ -1,3 +1,7 @@
+2007-10-24 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * DETAILS: updated spell to 0.91.0 #14045
+ fixed WEB_SITE, SOURCE_DIRECTORY
+
2006-10-03 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: [automated] Removed UPDATED.

diff --git a/python-devel/cheetah/DETAILS b/python-devel/cheetah/DETAILS
index d7d1450..4c273f9 100755
--- a/python-devel/cheetah/DETAILS
+++ b/python-devel/cheetah/DETAILS
@@ -1,6 +1,6 @@
SPELL=cheetah
- VERSION=2.0rc8
-
SOURCE_HASH=sha512:806bac97db42ff93565539688d9260ccc22dc409470d4c544d50c0fcfd9266df0d6e735d3f083cd7528907e7f2c4ba60f646927812b9839046cff1fbee722f59
+ VERSION=2.0
+
SOURCE_HASH=sha512:4bd5ecf7554e280a29ea4bf25c4d92c53063f3a4d70ed0a70e1f55069976e507386ad9458241e1fb832bf885bf4b8e75dbfad4ee856b40fbdbc38418cbe73151
SOURCE=Cheetah-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/Cheetah-$VERSION
SOURCE_URL[0]=$SOURCEFORGE_URL/cheetahtemplate/$SOURCE
diff --git a/python-devel/cheetah/HISTORY b/python-devel/cheetah/HISTORY
index 097d9ef..12766ec 100644
--- a/python-devel/cheetah/HISTORY
+++ b/python-devel/cheetah/HISTORY
@@ -1,3 +1,6 @@
+2007-10-14 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 2.0
+
2007-06-14 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 2.0rc8
* CONFLICTS, *.sig: removde, obsolete
diff --git a/python-devel/dabo/DETAILS b/python-devel/dabo/DETAILS
index 83e419a..b07f7ac 100755
--- a/python-devel/dabo/DETAILS
+++ b/python-devel/dabo/DETAILS
@@ -1,6 +1,6 @@
SPELL=dabo
- VERSION=0.8.1
-
SOURCE_HASH=sha512:850b41e5f223f907d84bc8dcf0bfb1b28537a80ea9a6bd2506b040fd9ba35b4cc5d66dad55b920bf801d27325db9fbbc0a10863ed09eb2d3161a860c16460526
+ VERSION=0.8.2
+
SOURCE_HASH=sha512:b597759d7dc22b76ec06f40be0f6af394636ea4fbac939167ce88ef00cccc46998d91baef1d4b3f252f8ef1e079dd2568e718cef3390d0d5ef41d797c4f11136
SOURCE=$SPELL-$VERSION-mac-nix.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL
WEB_SITE=http://dabodev.com
diff --git a/python-devel/dabo/HISTORY b/python-devel/dabo/HISTORY
index f1bb60c..1c5dbd0 100644
--- a/python-devel/dabo/HISTORY
+++ b/python-devel/dabo/HISTORY
@@ -1,3 +1,7 @@
+2007-11-03 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.8.2
+ * PRE_BUILD, setup.diff: deleted
+
2007-07-26 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.8.1

diff --git a/python-devel/dabo/PRE_BUILD b/python-devel/dabo/PRE_BUILD
deleted file mode 100755
index a01e0f0..0000000
--- a/python-devel/dabo/PRE_BUILD
+++ /dev/null
@@ -1,3 +0,0 @@
- default_pre_build
- cd $SOURCE_DIRECTORY &&
- patch -p0 <$SPELL_DIRECTORY/setup.diff
diff --git a/python-devel/dabo/setup.diff b/python-devel/dabo/setup.diff
deleted file mode 100644
index 888a4e2..0000000
--- a/python-devel/dabo/setup.diff
+++ /dev/null
@@ -1,14 +0,0 @@
---- setup.py 2005-11-30 23:33:01.000000000 +0100
-+++ setup.py.cp 2005-12-30 16:17:10.000000000 +0100
-@@ -1,9 +1,8 @@
--import ez_setup # From http://peak.telecommunity.com/DevCenter/setuptools
--ez_setup.use_setuptools()
--
- from setuptools import setup, find_packages
- from dabo.__version__ import version
-
-+import sys, os
-+
- daboVersion = version["version"]
-
- setup(
diff --git a/python-devel/elixir/DEPENDS b/python-devel/elixir/DEPENDS
new file mode 100755
index 0000000..b359872
--- /dev/null
+++ b/python-devel/elixir/DEPENDS
@@ -0,0 +1,3 @@
+depends python &&
+depends sqlalchemy
+
diff --git a/python-devel/elixir/DETAILS b/python-devel/elixir/DETAILS
new file mode 100755
index 0000000..18a76ca
--- /dev/null
+++ b/python-devel/elixir/DETAILS
@@ -0,0 +1,21 @@
+ SPELL=elixir
+ SPELLX=Elixir
+ VERSION=0.4.0
+
SOURCE_HASH=sha512:c0e2d137b2d8ed32dcc47e22d3fc6c173d5e9656db7c1d251a89051dcab6f9d37615f3ee510e85145a1da6fe58f77f64124dbb3c25f6ce8fcf22f6d3511f51de
+ SOURCE=$SPELLX-$VERSION.tar.gz
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION
+ WEB_SITE=http://elixir.ematia.de/
+SOURCE_URL[0]=http://pypi.python.org/packages/source/E/Elixir/$SOURCE
+ LICENSE[0]=MIT
+ ENTERED=20070906
+ KEYWORDS="python sql"
+ SHORT="declarative layer on top of SQLAlchemy"
+cat << EOF
+Elixir is a declarative layer on top of SQLAlchemy. It is a fairly thin
+wrapper, which provides the ability to define model objects following the
+Active Record design pattern, and using a DSL syntax similar to that of the
+Ruby on Rails ActiveRecord system.
+Elixir does not intend to replace SQLAlchemy's core features, but instead
+focuses on providing a simpler syntax for defining model objects when you do
+not need the full expressiveness of SQLAlchemy's manual mapper definitions.
+EOF
diff --git a/python-devel/elixir/HISTORY b/python-devel/elixir/HISTORY
new file mode 100644
index 0000000..0436050
--- /dev/null
+++ b/python-devel/elixir/HISTORY
@@ -0,0 +1,7 @@
+2007-10-29 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.4.0
+
+2007-09-14 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.3.0
+ spell created
+
diff --git a/python-devel/hellanzb/DEPENDS b/python-devel/hellanzb/DEPENDS
new file mode 100755
index 0000000..af1f98d
--- /dev/null
+++ b/python-devel/hellanzb/DEPENDS
@@ -0,0 +1,15 @@
+depends twisted &&
+depends par2cmdline &&
+depends unrar &&
+optional_depends flac \
+ "" \
+ "" \
+ "for flac audio files management" &&
+#optional_depends mac \
+# "" \
+# "" \
+# "for monkey audio file management" &&
+optional_depends libnotify \
+ "" \
+ "" \
+ "for libnotfy support"
diff --git a/python-devel/hellanzb/DETAILS b/python-devel/hellanzb/DETAILS
new file mode 100755
index 0000000..726b003
--- /dev/null
+++ b/python-devel/hellanzb/DETAILS
@@ -0,0 +1,17 @@
+ SPELL=hellanzb
+ VERSION=0.13
+ SOURCE="${SPELL}-${VERSION}.tar.gz"
+ SOURCE_URL[0]=http://www.hellanzb.com/distfiles/${SOURCE}
+
SOURCE_HASH=sha512:74f35f4f6e9dfae940952580854da782c3c3d057f375fcdf193c0584c8a79e4cb290a83f7fbdc99e6aeeec74b5d32f6c8535585f9f3caeb76eade8af6f15f6cd
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
+ WEB_SITE="http://www.hellanzb.com/";
+ LICENSE[0]=BSD
+ ENTERED=20071006
+ SHORT="hellanzb is a Python application designed for *nix
environments that retrieves nzb files and fully processes them."
+cat << EOF
+hellanzb is a Python application designed for *nix environments that
retrieves
+nzb files and fully processes them. The goal being to make getting files
+from Usenet (e.g.: Giganews Newsgroups) as hands-free as possible. Once fully
+installed, all thats required is moving an nzb file to the queue directory.
The
+rest; fetching, par-checking, un-raring, etc. is taken care of by hellanzb.
+EOF
diff --git a/python-devel/hellanzb/HISTORY b/python-devel/hellanzb/HISTORY
new file mode 100644
index 0000000..99dbe28
--- /dev/null
+++ b/python-devel/hellanzb/HISTORY
@@ -0,0 +1,8 @@
+2007-10-25 Elisamuel Resto <ryuji AT mages.ath.cx>
+ * INSTALL: created, install the sample config file
+
+2007-10-24 Elisamuel Resto <ryuji AT mages.ath.cx>
+ * PRE_BUILD, hellanzb-0.13-datafiles.patch: Remove insalling of
config and docs into non-fhs location
+
+2007-10-06 Elisamuel Resto <ryuji AT mages.ath.cx>
+ * DETAILS, DEPENDS, HISTORY: created spell
diff --git a/python-devel/hellanzb/INSTALL b/python-devel/hellanzb/INSTALL
new file mode 100755
index 0000000..9310866
--- /dev/null
+++ b/python-devel/hellanzb/INSTALL
@@ -0,0 +1,2 @@
+default_install &&
+install_config_file etc/hellanzb.conf.sample $INSTALL_ROOT/etc/hellanzb.conf
diff --git a/python-devel/hellanzb/PRE_BUILD b/python-devel/hellanzb/PRE_BUILD
new file mode 100755
index 0000000..a4473ff
--- /dev/null
+++ b/python-devel/hellanzb/PRE_BUILD
@@ -0,0 +1,2 @@
+default_pre_build &&
+patch -p1 < $SPELL_DIRECTORY/$SPELL-$VERSION-datafiles.patch
diff --git a/python-devel/hellanzb/hellanzb-0.13-datafiles.patch
b/python-devel/hellanzb/hellanzb-0.13-datafiles.patch
new file mode 100644
index 0000000..78e1171
--- /dev/null
+++ b/python-devel/hellanzb/hellanzb-0.13-datafiles.patch
@@ -0,0 +1,24 @@
+diff -Naur hellanzb-0.13/Hellanzb/Core.py hellanzb-0.13/Hellanzb/Core.py
+--- hellanzb-0.13/Hellanzb/Core.py 2007-03-27 00:20:43.000000000 -0400
++++ hellanzb-0.13/Hellanzb/Core.py 2007-10-25 10:04:38.831982064 -0400
+@@ -39,6 +39,7 @@
+ try:
+ confDirs.append(os.path.join(os.getcwd(), 'etc'))
+ confDirs.append(os.getcwd())
++ confDirs.append('/etc')
+ except OSError, ose:
+ if ose.errno != 2:
+ raise
+diff -Naur ./hellanzb-0.13/setup.py ./hellanzb-0.13/setup.py
+--- hellanzb-0.13/setup.py 2007-03-27 00:20:43.000000000 -0400
++++ hellanzb-0.13/setup.py 2007-10-25 10:02:28.970175892 -0400
+@@ -38,8 +38,7 @@
+ packages = [ 'Hellanzb', 'Hellanzb.NZBLeecher',
'Hellanzb.HellaXMLRPC',
+ 'Hellanzb.external', 'Hellanzb.external.elementtree' ],
+ scripts = [ 'hellanzb.py' ],
+- data_files = [ ( 'etc', [ 'etc/hellanzb.conf.sample' ] ),
+- ( 'share/doc/hellanzb', [ 'CHANGELOG', 'CREDITS',
'README', 'LICENSE' ] ) ],
++ data_files = [ ( 'share/doc/hellanzb', [ 'CHANGELOG', 'CREDITS',
'README', 'LICENSE' ] ) ],
+ )
+ py2app_options = dict(
+ app = [ 'hellanzb.py' ],
diff --git a/python-devel/ipython/DETAILS b/python-devel/ipython/DETAILS
index adc5450..d211700 100755
--- a/python-devel/ipython/DETAILS
+++ b/python-devel/ipython/DETAILS
@@ -1,6 +1,6 @@
SPELL=ipython
- VERSION=0.7.1.fix1
-
SOURCE_HASH='sha512:b918ba8c353bf127e1ee0d48bfc4fa430db71c145f3f09fd00d043f41efd8d8739499e21ec90f503e1a077fa1d0d0c30f3970c60b2d31011701a8844664616f1'
+ VERSION=0.8.1
+
SOURCE_HASH=sha512:7b535b3b4e972aa74b97104c7613172b3f92b6f6ca134419dd6f61ece6de49c6b949f32385b414256ecd6a0041e1dc220db0ff46330a8c303e7f8b8600e24bda
SOURCE=$SPELL-$VERSION.tar.gz
DOCS='README* doc/*'
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
@@ -8,29 +8,29 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
LICENSE[0]=BSD
WEB_SITE=http://$SPELL.scipy.org/
GATHER_DOCS=off
- UPDATED=20060122
KEYWORDS="interpreter python devel"
SHORT='IPython is interactive Python interpreter'
cat << EOF
-IPython is a free software project (released under the BSD license) which
tries to:
+IPython is a free software project (released under the BSD license) which
+tries to:

1. Provide an interactive shell superior to Python's default. IPython has
many
features for object introspection, system shell access, and its own
special
- command system for adding functionality when working interactively. It
tries
- to be a very efficient environment both for Python code development and
for
- exploration of problems using Python objects (in situations like data
- analysis).
+ command system for adding functionality when working interactively. It
+ tries to be a very efficient environment both for Python code development
+ and for exploration of problems using Python objects (in situations like
+ data analysis).
2. Serve as an embeddable, ready to use interpreter for your own programs.
IPython can be started with a single call from inside another program,
- providing access to the current namespace. This can be very useful both
for
- debugging purposes and for situations where a blend of batch-processing
and
- interactive exploration are needed.
+ providing access to the current namespace. This can be very useful both
+ for debugging purposes and for situations where a blend of
batch-processing
+ and interactive exploration are needed.
3. Offer a flexible framework which can be used as the base environment for
other systems with Python as the underlying language. Specifically
scientific environments like Mathematica, IDL and Mathcad inspired its
design, but similar ideas can be useful in many fields.
-4. Allow interactive testing of threaded graphical toolkits. IPython has
support
- for interactive, non-blocking control of GTK, Qt and WX applications via
- special threading flags. The normal Python shell can only do this for
Tkinter
- applications.
+4. Allow interactive testing of threaded graphical toolkits. IPython has
+ support for interactive, non-blocking control of GTK, Qt and WX
applications
+ via special threading flags. The normal Python shell can only do this for
+ Tkinter applications.
EOF
diff --git a/python-devel/ipython/HISTORY b/python-devel/ipython/HISTORY
index ca12e1b..94cd339 100644
--- a/python-devel/ipython/HISTORY
+++ b/python-devel/ipython/HISTORY
@@ -1,3 +1,7 @@
+2007-11-03 Alexander Tsamutali <astsmtl AT gmail.com>
+ * DETAILS: updated spell to 0.8.1
+ fixed long description wrap
+
2006-09-21 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: [automated] Removed BUILD_API=2.

diff --git a/python-devel/m2crypto/DETAILS b/python-devel/m2crypto/DETAILS
index 765fb2b..fc8600e 100755
--- a/python-devel/m2crypto/DETAILS
+++ b/python-devel/m2crypto/DETAILS
@@ -1,9 +1,9 @@
SPELL=m2crypto
- VERSION=0.18
+ VERSION=0.18.2
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://chandlerproject.org/pub/Projects/MeTooCrypto/$SOURCE
-
SOURCE_HASH=sha512:c41cb78c1ac65ecbda8f06bd19f46182ecd3330566a5f1bf88486852506b042529356af0d8b8a156ceedbb96b67855fe64780166baaa77b1030449f2acf8f491
+
SOURCE_HASH=sha512:bc97142df2b6404cc0cc30746f88b62d4d274fc22e1522bff64e90cce5aaf3089cb2388a5a063172dcfbba6f909ecbdaab6539d1fb39832f2ad8dfdb39430dbf
WEB_SITE=http://chandlerproject.org/Projects/MeTooCrypto
ENTERED=20050118
LICENSE[0]=GPL
diff --git a/python-devel/m2crypto/HISTORY b/python-devel/m2crypto/HISTORY
index 64c9ed2..e6dafc3 100644
--- a/python-devel/m2crypto/HISTORY
+++ b/python-devel/m2crypto/HISTORY
@@ -1,3 +1,6 @@
+2007-10-14 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 0.18.2
+
2007-08-02 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 0.18

diff --git a/python-devel/mercurial/DETAILS b/python-devel/mercurial/DETAILS
index 542924e..c29d236 100755
--- a/python-devel/mercurial/DETAILS
+++ b/python-devel/mercurial/DETAILS
@@ -1,9 +1,10 @@
SPELL=mercurial
- VERSION=0.9.3
+ VERSION=0.9.5
+
SOURCE_HASH=sha512:2d2afa41e5b49d31511bd7cbb0d8938d8e45aceb7dba9ac7adba5a6feb0a9cc14490b350f9a3bdf72bbf62f1f07a627c0600e5c853889a903ac46591391e357c
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_URL[0]=http://www.selenic.com/mercurial/release/$SOURCE
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
+# SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
LICENSE[0]=GPL
KEYWORDS="scm python devel"
WEB_SITE=http://selenic.com/mercurial
diff --git a/python-devel/mercurial/HISTORY b/python-devel/mercurial/HISTORY
index aaccc55..6a9c695 100644
--- a/python-devel/mercurial/HISTORY
+++ b/python-devel/mercurial/HISTORY
@@ -1,3 +1,6 @@
+2007-10-27 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: updated to 0.9.5
+
2007-05-15 Pieter Lenaerts <e-type AT sourcemage.org>
* DETAILS: updated to 0.9.3

diff --git a/python-devel/mercurial/mercurial-0.9.3.tar.gz.sig
b/python-devel/mercurial/mercurial-0.9.3.tar.gz.sig
deleted file mode 100644
index 1132ded..0000000
Binary files a/python-devel/mercurial/mercurial-0.9.3.tar.gz.sig and
/dev/null differ
diff --git a/python-devel/paste/DETAILS b/python-devel/paste/DETAILS
index 34ef52b..ad093fd 100755
--- a/python-devel/paste/DETAILS
+++ b/python-devel/paste/DETAILS
@@ -1,7 +1,7 @@
SPELL=paste
CHEESESHOP_PKG=Paste
- VERSION=1.4.2
-
SOURCE_HASH=sha512:abe8b442039d70a51e9cb4e2a449ea75085cf8126f639a595c4d6839c961a8a79ae4c099129199f7036ddef607d1bb0c4b4e3280b295ca6f5aa3b8edc2b1e350
+ VERSION=1.5
+
SOURCE_HASH=sha512:7178bdc17dc4df5458f684871e0daee57bec7dd3890cd9b297d1f7aa1b4e7b84fda297fa4fc5eefec638f2340f4f2dc9d91f494694880a0bb2f06dadb7fe4dc1
SOURCE="$CHEESESHOP_PKG-$VERSION.tar.gz"

SOURCE_URL[0]="http://cheeseshop.python.org/packages/source/${CHEESESHOP_PKG:0:1}/${CHEESESHOP_PKG}/$SOURCE";
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$CHEESESHOP_PKG-$VERSION"
diff --git a/python-devel/paste/HISTORY b/python-devel/paste/HISTORY
index 74d4a85..9425a75 100644
--- a/python-devel/paste/HISTORY
+++ b/python-devel/paste/HISTORY
@@ -1,3 +1,6 @@
+2007-10-27 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.5
+
2007-09-14 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.4.2

diff --git a/python-devel/pastedeploy/DEPENDS
b/python-devel/pastedeploy/DEPENDS
new file mode 100755
index 0000000..c72e1a1
--- /dev/null
+++ b/python-devel/pastedeploy/DEPENDS
@@ -0,0 +1 @@
+depends initools
diff --git a/python-devel/pastedeploy/DETAILS
b/python-devel/pastedeploy/DETAILS
new file mode 100755
index 0000000..b233f17
--- /dev/null
+++ b/python-devel/pastedeploy/DETAILS
@@ -0,0 +1,21 @@
+ SPELL=pastedeploy
+ CHEESESHOP_PKG=PasteDeploy
+ VERSION=1.3.1
+
SOURCE_HASH=sha512:47d30764f91215adda9a4e9a9dcf2226613caed3e573bd579a62dc6879f0bbe28451acb9d30141b4d986487d334b533adc085d96de6020e36923b382443e3877
+ SOURCE="$CHEESESHOP_PKG-$VERSION.tar.gz"
+
SOURCE_URL[0]="http://cheeseshop.python.org/packages/source/${CHEESESHOP_PKG:0:1}/${CHEESESHOP_PKG}/$SOURCE";
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$CHEESESHOP_PKG-$VERSION"
+ WEB_SITE="http://pythonpaste.org/deploy/";
+ LICENSE[0]='MIT'
+ UPDATED=20071101
+ SHORT='Python Paste Deploy'
+cat << EOF
+Paste Deployment is a system for finding and configuring WSGI applications
+and servers. For WSGI application consumers it provides a single, simple
+function (loadapp) for loading a WSGI application from a configuration file
+or a Python Egg. For WSGI application providers it only asks for a single,
+simple entry point to your application, so that application users don't need
to
+be exposed to the implementation details of your application.
+The result is something a system administrator can install and manage
without
+knowing any Python, or the details of the WSGI application or its container.
+EOF
diff --git a/python-devel/pastedeploy/HISTORY
b/python-devel/pastedeploy/HISTORY
new file mode 100644
index 0000000..f0668b3
--- /dev/null
+++ b/python-devel/pastedeploy/HISTORY
@@ -0,0 +1,3 @@
+2007-11-01 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.3.1
+ spell created
diff --git a/python-devel/rabbyt/DEPENDS b/python-devel/rabbyt/DEPENDS
new file mode 100755
index 0000000..1ec3c3e
--- /dev/null
+++ b/python-devel/rabbyt/DEPENDS
@@ -0,0 +1,2 @@
+depends python &&
+depends OPENGL
diff --git a/python-devel/rabbyt/DETAILS b/python-devel/rabbyt/DETAILS
new file mode 100755
index 0000000..8b3909a
--- /dev/null
+++ b/python-devel/rabbyt/DETAILS
@@ -0,0 +1,16 @@
+ SPELL=rabbyt
+ VERSION=0.7.5
+ SOURCE=Rabbyt-$VERSION.tar.gz
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/Rabbyt-$VERSION
+
SOURCE_URL[0]=http://pypi.python.org/packages/source/R/Rabbyt/Rabbyt-0.7.5.tar.gz
+
SOURCE_HASH=sha512:c06aec86a8b10893cf0a2dd853a44d41225c9abf9750ef4ac5ae71e6679a5d765bcdcc293fe51b4345c5c200f4b48043b8e1d6827bf24758fd598543da6a078e
+ LICENSE[0]=MIT
+ WEB_SITE=http://matthewmarshall.org/projects/rabbyt/
+ KEYWORDS="python devel"
+ SHORT="fast sprite library for Python"
+cat << EOF
+Rabbyt is a sprite library for Python with game development in mind.
+It has two goals:
+ 1. Be fast, without sacrificing ease of use.
+ 2. Be easy to use, without sacrificing speed.
+EOF
diff --git a/python-devel/rabbyt/HISTORY b/python-devel/rabbyt/HISTORY
new file mode 100644
index 0000000..f6a2c97
--- /dev/null
+++ b/python-devel/rabbyt/HISTORY
@@ -0,0 +1,2 @@
+2007-10-27 Alexander Tsamutali <astsmtl AT gmail.com>
+ * DETAILS, DEPENDS, HISTORY: Created this spell
diff --git a/python-devel/setuptools/DETAILS b/python-devel/setuptools/DETAILS
index 41bf4ca..71d6cc5 100755
--- a/python-devel/setuptools/DETAILS
+++ b/python-devel/setuptools/DETAILS
@@ -1,7 +1,7 @@
SPELL=setuptools
CHEESESHOP_PKG=$SPELL
- VERSION=0.6c6
-
SOURCE_HASH=sha512:01e16bdc92a338541da57993e9711d3651eacb4b4bb46e83028a6189041927ad204310ec8c86bf2d0a556b50fdacdd35bd88f4f24ee47148db8a1d35aab02592
+ VERSION=0.6c7
+
SOURCE_HASH=sha512:25016bde2bfefb4f370edb49a8b40c8447383e5d947c14ce48b4e3cb6b38df867b30e653f73c1813d1d868359832983f4f04808654851a9a7d053939cc248726
SOURCE="$SPELL-$VERSION.tar.gz"

SOURCE_URL[0]="http://cheeseshop.python.org/packages/source/${CHEESESHOP_PKG:0:1}/${CHEESESHOP_PKG}/$SOURCE";
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/python-devel/setuptools/HISTORY b/python-devel/setuptools/HISTORY
index 4526fc4..3ca22a6 100644
--- a/python-devel/setuptools/HISTORY
+++ b/python-devel/setuptools/HISTORY
@@ -1,3 +1,6 @@
+2007-11-01 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.6c7
+
2007-06-13 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.6c6

diff --git a/python-devel/simplejson/DETAILS b/python-devel/simplejson/DETAILS
index 8453ff7..c3e1c14 100755
--- a/python-devel/simplejson/DETAILS
+++ b/python-devel/simplejson/DETAILS
@@ -1,5 +1,5 @@
SPELL=simplejson
- VERSION=1.7.1
+ VERSION=1.7.3
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SOURCE.asc
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/python-devel/simplejson/HISTORY b/python-devel/simplejson/HISTORY
index 4b1f7bc..17a637f 100644
--- a/python-devel/simplejson/HISTORY
+++ b/python-devel/simplejson/HISTORY
@@ -1,3 +1,6 @@
+2007-11-01 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.7.3
+
2007-06-14 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.7.1
spell created
diff --git a/python-devel/sqlalchemy/DETAILS b/python-devel/sqlalchemy/DETAILS
index 8a065d6..2b42a3c 100755
--- a/python-devel/sqlalchemy/DETAILS
+++ b/python-devel/sqlalchemy/DETAILS
@@ -1,7 +1,7 @@
SPELL=sqlalchemy
CHEESESHOP_PKG=SQLAlchemy
- VERSION=0.4.0beta6
-
SOURCE_HASH=sha512:36da2c96cba8f42e48c31a3056c3e432a2aca4696c9b242ae21c90e5981983abf38e2978dd97a22ccb3d189a923a225757b2328e92370103656949bb74feca19
+ VERSION=0.4.0
+
SOURCE_HASH=sha512:de130003d0b96e6649ea915373f73a3c26fbc2366d9530ec15bbc04b75cd06c21e7b309e1f616d58d171ad217e602133f447320f66c30ca7afa78e22258f5885
SOURCE="$CHEESESHOP_PKG-$VERSION.tar.gz"

SOURCE_URL[0]="http://cheeseshop.python.org/packages/source/${CHEESESHOP_PKG:0:1}/${CHEESESHOP_PKG}/$SOURCE";
SOURCE_URL[1]=$SOURCEFORGE_URL/$SPELL/$SOURCE
diff --git a/python-devel/sqlalchemy/HISTORY b/python-devel/sqlalchemy/HISTORY
index 25ca715..30059fa 100644
--- a/python-devel/sqlalchemy/HISTORY
+++ b/python-devel/sqlalchemy/HISTORY
@@ -1,3 +1,6 @@
+2007-10-17 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.4.0
+
2007-09-27 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.4.0beta6

diff --git a/python-devel/turbogears/DEPENDS b/python-devel/turbogears/DEPENDS
index 7c4371a..e1ce598 100755
--- a/python-devel/turbogears/DEPENDS
+++ b/python-devel/turbogears/DEPENDS
@@ -2,10 +2,11 @@ depends setuptools &&
depends cherrypy &&
depends mochikit &&
depends ruledispatch &&
-depends sqlobject &&
+depends pastedeploy &&
depends pastescript &&
depends configobj &&
depends simplejson &&
depends turbokid &&
depends turbocheetah &&
-depends formencode
+depends formencode &&
+depends sqlalchemy
diff --git a/python-devel/turbogears/DETAILS b/python-devel/turbogears/DETAILS
index 8ad9eaa..e66d964 100755
--- a/python-devel/turbogears/DETAILS
+++ b/python-devel/turbogears/DETAILS
@@ -1,6 +1,6 @@
SPELL=turbogears
- VERSION=1.0.4b1
-
SOURCE_HASH=sha512:1b6e17a7e56f618a8f5d1ae83e2af6ed1cacd66d7d00352039e9c305e3fb2722bdf3f1c1a45da780fddff1431dc1d3ba729ba2f8796bcc07be23ed08f74a6620
+ VERSION=1.0.4b2
+
SOURCE_HASH=sha512:6831656817a2b5117a3eb632574e916e4e0ebf26b002c807678c4e738f5f1b3fc1560b42d2c3f73b9c6ad4ba63a4329c56b28248b2e722f3a28fd3e7f69273c3
SOURCE=TurboGears-$VERSION.zip
SOURCE_URL[0]="http://files.turbogears.org/eggs/$SOURCE";
SOURCE_DIRECTORY="$BUILD_DIRECTORY/TurboGears-$VERSION"
diff --git a/python-devel/turbogears/HISTORY b/python-devel/turbogears/HISTORY
index 93d8ec6..674997e 100644
--- a/python-devel/turbogears/HISTORY
+++ b/python-devel/turbogears/HISTORY
@@ -1,7 +1,16 @@
-2007-09-14 Treeve Jelbert <treeve AT sourcemage.org>.2
+2007-11-02 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: remove sqlobject, require sqlalchemy
+
+2007-11-01 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.0.4b2
+ * DEPENDS: add pastedeploy
+ sqlobject is optional
+ add optional sqlalchemy
+
+2007-09-14 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.0.4b1

-2007-07-21 Treeve Jelbert <treeve AT sourcemage.org>.2
+2007-07-21 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.0.3.2

2007-07-19 Treeve Jelbert <treeve AT sourcemage.org>
diff --git a/python-devel/turbojson/DETAILS b/python-devel/turbojson/DETAILS
index 8afebd0..15e012c 100755
--- a/python-devel/turbojson/DETAILS
+++ b/python-devel/turbojson/DETAILS
@@ -1,7 +1,7 @@
SPELL=turbojson
SPELLX=TurboJson
- VERSION=1.1
-
SOURCE_HASH=sha512:46fd0333aaab43b880db49cca9d4d6efe70d6d6f19d35c6f46e2026c910030e35094f16699ba409067aab9b3c824d08b7dc54616ae771c2ffb8775dd8612c7a4
+ VERSION=1.1.1
+
SOURCE_HASH=sha512:fc6f55ea8bf135b57730ed4b165c36ef88dfbb642ced66ba386f6cd011750157948d6bb2f33c948c7872302f4d2b62c4e1a0f73915737b60bfb2b3460549947c
SOURCE="$SPELLX-$VERSION.tar.gz"

SOURCE_URL[0]=http://cheeseshop.python.org/packages/source/T/$SPELLX/$SOURCE
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELLX-$VERSION"
diff --git a/python-devel/turbojson/HISTORY b/python-devel/turbojson/HISTORY
index 559296e..4e231ad 100644
--- a/python-devel/turbojson/HISTORY
+++ b/python-devel/turbojson/HISTORY
@@ -1,3 +1,6 @@
+2007-11-01 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.1.1
+
2007-07-19 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.1
new URL
diff --git a/security-libs/cracklib/DETAILS b/security-libs/cracklib/DETAILS
index 795f873..2692805 100755
--- a/security-libs/cracklib/DETAILS
+++ b/security-libs/cracklib/DETAILS
@@ -1,11 +1,12 @@
SPELL=cracklib
- VERSION=2.8.9
+ VERSION=2.8.12
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SPELL-words.gz
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
SOURCE2_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
+# SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
+
SOURCE_HASH='sha512:8d08411f500960c22e682f15b7bae135cc5f17821b59f52adb04ba41066f0f0bb34e3911f3e2edabc1f2ec27a433818af89b897f2c1805fcb11469da6b1023f4'

SOURCE2_HASH='sha512:b7e902c0ce186434ba38d2a26a91948f38517bbd705d9b49fab6bb05449357756b3142859c83c9e9e63182472981a83913382591bf1f777b160921f25d0f84ea'
WEB_SITE=http://sf.net/projects/$SPELL
ENTERED=20050310
diff --git a/security-libs/cracklib/HISTORY b/security-libs/cracklib/HISTORY
index 262f0da..c6b8f3b 100644
--- a/security-libs/cracklib/HISTORY
+++ b/security-libs/cracklib/HISTORY
@@ -1,3 +1,6 @@
+2007-10-13 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 2.8.12
+
2006-09-21 Robin Cook <rcook AT wyrms.net>
* DETAILS: updated VERSION to 2.8.9
* PRE_BUILD: commented out the autoconf for now as causes build to
fail
diff --git a/security-libs/cracklib/cracklib-2.8.9.tar.gz.sig
b/security-libs/cracklib/cracklib-2.8.9.tar.gz.sig
deleted file mode 100644
index 9201f03..0000000
Binary files a/security-libs/cracklib/cracklib-2.8.9.tar.gz.sig and /dev/null
differ
diff --git a/security-libs/linux-pam/DETAILS b/security-libs/linux-pam/DETAILS
index 1c31580..aca09d1 100755
--- a/security-libs/linux-pam/DETAILS
+++ b/security-libs/linux-pam/DETAILS
@@ -1,5 +1,5 @@
SPELL=linux-pam
- VERSION=0.99.8.1
+ VERSION=0.99.9.0
SOURCE=Linux-PAM-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/Linux-PAM-$VERSION
SOURCE_URL[0]=$KERNEL_URL/pub/linux/libs/pam/pre/library/$SOURCE
diff --git a/security-libs/linux-pam/HISTORY b/security-libs/linux-pam/HISTORY
index 6885d24..b318a8c 100644
--- a/security-libs/linux-pam/HISTORY
+++ b/security-libs/linux-pam/HISTORY
@@ -1,3 +1,6 @@
+2007-10-13 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 0.99.9.0
+
2007-08-01 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 0.99.8.1

diff --git a/security-libs/otpw/BUILD b/security-libs/otpw/BUILD
new file mode 100755
index 0000000..f307964
--- /dev/null
+++ b/security-libs/otpw/BUILD
@@ -0,0 +1 @@
+make otpw-gen pam_otpw.so
diff --git a/security-libs/otpw/DEPENDS b/security-libs/otpw/DEPENDS
new file mode 100755
index 0000000..5ca206d
--- /dev/null
+++ b/security-libs/otpw/DEPENDS
@@ -0,0 +1 @@
+depends linux-pam
diff --git a/security-libs/otpw/DETAILS b/security-libs/otpw/DETAILS
new file mode 100755
index 0000000..6deb3e3
--- /dev/null
+++ b/security-libs/otpw/DETAILS
@@ -0,0 +1,29 @@
+ SPELL=otpw
+if [[ $OTPW_VER == 1.3 ]]; then
+ VERSION=1.3
+ SOURCE=$SPELL-$VERSION.tar.gz
+ SOURCE_URL[0]=http://www.cl.cam.ac.uk/~mgk25/download/${SOURCE}
+
SOURCE_HASH=sha512:998f47a27b7f5692c559fb64c1e0719ce9fb30b592bb7c19ee66d62d0fe6307213d5fe35b2d13c66a4a02afd178fe2567396a1ce7004e9ca8e5ffeea9fab6f78
+else
+ VERSION=1.4
+ SOURCE=$SPELL-snapshot.tar.gz
+ SOURCE_URL[0]=http://www.cl.cam.ac.uk/~mgk25/download/$SOURCE
+
SOURCE_HASH=sha512:01772f3ad27c9934874c82744f9cb767a40eefa665cebda22c0b62a4882ff4ef12ce0aa07f327a3bf9aa3fcff8f4b61c21856697061f44802ab9ca5fcf9cfa82
+fi
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}"
+ WEB_SITE="http://www.cl.cam.ac.uk/~mgk25/otpw.html";
+ LICENSE[0]=GPL
+ ENTERED=20071106
+ SHORT="A one-time password login package"
+cat << EOF
+The OTPW package consists of the one-time-password generator otpw-gen plus
+two verification routines otpw_prepare() and otpw_verify() that can easily
+be added to programs such as login or ftpd on POSIX systems. For platforms
+that support the Pluggable Authentication Method (PAM) interface, a suitable
+wrapper is included as well. Login software extended this way will allow
+reasonably secure user authentication over insecure network lines. The user
+carries a password list on paper. The scheme is designed to be robust against
+theft of the paper list and race-for-the-last-letter attacks. Cryptographic
+hash values of the one-time passwords are stored for verification in the
+user’s home directory.
+EOF
diff --git a/security-libs/otpw/HISTORY b/security-libs/otpw/HISTORY
new file mode 100644
index 0000000..87396ad
--- /dev/null
+++ b/security-libs/otpw/HISTORY
@@ -0,0 +1,4 @@
+2007-11-06 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
+ * PREPARE, DETAILS, DEPENDS: created spell
+ * PRE_BUILD, BUILD, INSTALL, HISTORY: created spell
+ * PRE_BUILD: doesn't like stack-protector
diff --git a/security-libs/otpw/INSTALL b/security-libs/otpw/INSTALL
new file mode 100755
index 0000000..2e5748a
--- /dev/null
+++ b/security-libs/otpw/INSTALL
@@ -0,0 +1,7 @@
+mkdir -vp $INSTALL_ROOT/usr/bin/ $INSTALL_ROOT/lib/security/ \
+ $INSTALL_ROOT/usr/share/man/man1/ \
+ $INSTALL_ROOT/usr/share/doc/otpw/ &&
+cp -v otpw-gen $INSTALL_ROOT/usr/bin/ &&
+cp -v pam_otpw.so $INSTALL_ROOT/lib/security/ &&
+cp -v otpw-gen.1 $INSTALL_ROOT/usr/share/man/man1/ &&
+cp -v README $INSTALL_ROOT/usr/share/doc/otpw/
diff --git a/security-libs/otpw/PREPARE b/security-libs/otpw/PREPARE
new file mode 100755
index 0000000..f6ed2b0
--- /dev/null
+++ b/security-libs/otpw/PREPARE
@@ -0,0 +1 @@
+config_query_list OTPW_VER "Two versions available:" 1.3 snapshot
diff --git a/security-libs/otpw/PRE_BUILD b/security-libs/otpw/PRE_BUILD
new file mode 100755
index 0000000..eda5dbb
--- /dev/null
+++ b/security-libs/otpw/PRE_BUILD
@@ -0,0 +1,5 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+CFLAGS=${CFLAGS/-fstack-protector} &&
+CFLAGS=${CFLAGS/-fstack-protector-all} &&
+sedit "s:CFLAGS=.*:CFLAGS=$CFLAGS:" Makefile
diff --git a/security-libs/pam_sotp/BUILD b/security-libs/pam_sotp/BUILD
new file mode 100755
index 0000000..2bb4204
--- /dev/null
+++ b/security-libs/pam_sotp/BUILD
@@ -0,0 +1,2 @@
+create_group shadow &&
+default_build
diff --git a/security-libs/pam_sotp/DEPENDS b/security-libs/pam_sotp/DEPENDS
new file mode 100755
index 0000000..5ca206d
--- /dev/null
+++ b/security-libs/pam_sotp/DEPENDS
@@ -0,0 +1 @@
+depends linux-pam
diff --git a/security-libs/pam_sotp/DETAILS b/security-libs/pam_sotp/DETAILS
new file mode 100755
index 0000000..6abc431
--- /dev/null
+++ b/security-libs/pam_sotp/DETAILS
@@ -0,0 +1,14 @@
+ SPELL=pam_sotp
+ VERSION=0.3.3
+ SOURCE="${SPELL}-${VERSION}.tar.bz2"
+ SOURCE_URL[0]=http://www.cavecanen.org/cs/projects/${SPELL}/dl/${SOURCE}
+
SOURCE_HASH=sha512:483a6c2d371e38561b318c44fedc9763ed002382de96169a7a0ebdfcc9d49101eb1185ad85331f998d2e44b23d216c0c499cb0c3be9fa3d613c64f55946a342d
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
+ WEB_SITE="http://www.cavecanen.org/cs/projects/pam_sotp/ "
+ LICENSE[0]=GPL
+ ENTERED=20071106
+ SHORT="An OTP module for PAM."
+cat << EOF
+pam_sotp is a module for PAM which provides support for one time passwords
+(OTP) authentication.
+EOF
diff --git a/security-libs/pam_sotp/HISTORY b/security-libs/pam_sotp/HISTORY
new file mode 100644
index 0000000..0f1a4f8
--- /dev/null
+++ b/security-libs/pam_sotp/HISTORY
@@ -0,0 +1,2 @@
+2007-11-06 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
+ * DETAILS, DEPENDS, BUILD, HISTORY: created spell
diff --git a/security/snort/B10683B0.gpg b/security/snort/B10683B0.gpg
new file mode 100644
index 0000000..5f29430
Binary files /dev/null and b/security/snort/B10683B0.gpg differ
diff --git a/security/snort/DETAILS b/security/snort/DETAILS
index 99c329b..2300816 100755
--- a/security/snort/DETAILS
+++ b/security/snort/DETAILS
@@ -1,5 +1,5 @@
SPELL=snort
- VERSION=2.7.0.1
+ VERSION=2.8.0
SECURITY_PATCH=1
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE3=$SOURCE.sig
@@ -8,7 +8,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://www.snort.org/dl/current/$SOURCE
SOURCE3_URL[0]=${SOURCE_URL[0]}.sig

SOURCE2_URL[0]=http://www.snort.org/pub-bin/downloads.cgi/Download/comm_rules/$SOURCE2
- SOURCE_GPG=FC0308A6.gpg:$SOURCE3:UPSTREAM_KEY
+ SOURCE_GPG=B10683B0.gpg:$SOURCE3:UPSTREAM_KEY
SOURCE3_IGNORE=signature
SOURCE2_IGNORE=volatile
WEB_SITE=http://www.snort.org/
diff --git a/security/snort/FC0308A6.gpg b/security/snort/FC0308A6.gpg
deleted file mode 100644
index 9e87e0d..0000000
Binary files a/security/snort/FC0308A6.gpg and /dev/null differ
diff --git a/security/snort/HISTORY b/security/snort/HISTORY
index 863d4c3..e22dd3f 100644
--- a/security/snort/HISTORY
+++ b/security/snort/HISTORY
@@ -1,3 +1,7 @@
+2007-10-13 George Sherwood <george AT beernabeer.com>
+ * DETAILS: Updated to version 2.8.0. Updated to new sig.
+ * B10683B0.gpg: Added new sig file for versions 2.8.0 and greater
+
2007-08-17 George Sherwood <george AT beernabeer.com>
* DETAILS: updated spell to 2.7.0.1

diff --git a/shell-term-fm/mc/BUILD b/shell-term-fm/mc/BUILD
index 1241e0a..599e8cf 100755
--- a/shell-term-fm/mc/BUILD
+++ b/shell-term-fm/mc/BUILD
@@ -1,5 +1,5 @@
if [ "$MC_GLIB" == "glib" ]; then
OPTS="$OPTS --with-glib12"
-fi &&
-OPTS="$OPTS --with-screen=ncurses" &&
+fi &&
+OPTS="$OPTS $MC_CHARSET --with-screen=ncurses" &&
default_build
diff --git a/shell-term-fm/mc/CONFIGURE b/shell-term-fm/mc/CONFIGURE
index bc9c0c5..8dd9d6c 100755
--- a/shell-term-fm/mc/CONFIGURE
+++ b/shell-term-fm/mc/CONFIGURE
@@ -1 +1,6 @@
-config_query_list MC_GLIB "MC depends on either glib or glib2" glib2 glib
+config_query_list MC_GLIB "MC depends on either glib or glib2" glib2 glib
&&
+config_query_option MC_CHARSET \
+ "Enable charset selection and conversion?" \
+ n \
+ "--enable-charset" \
+ "--disable-charset"
diff --git a/shell-term-fm/mc/HISTORY b/shell-term-fm/mc/HISTORY
index 1f517a8..2b8f1fc 100644
--- a/shell-term-fm/mc/HISTORY
+++ b/shell-term-fm/mc/HISTORY
@@ -1,3 +1,6 @@
+2007-10-28 Pol Vinogradov <vin.public AT gmail.com>
+ * BUILD, CONFIGURE: added charset feature
+
2007-03-13 Ladislav Hagara <hgr AT vabo.cz>
* PRE_BUILD, mc-4.6.1-bash-all.patch: added patch from Gentoo
http://savannah.gnu.org/bugs/?18136
diff --git a/shell-term-fm/rox-lib2/BUILD b/shell-term-fm/rox-lib2/BUILD
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/shell-term-fm/rox-lib2/BUILD
@@ -0,0 +1 @@
+true
diff --git a/shell-term-fm/rox-lib2/DEPENDS b/shell-term-fm/rox-lib2/DEPENDS
new file mode 100755
index 0000000..a934ce3
--- /dev/null
+++ b/shell-term-fm/rox-lib2/DEPENDS
@@ -0,0 +1,2 @@
+depends pygtk2 &&
+depends python
diff --git a/shell-term-fm/rox-lib2/DETAILS b/shell-term-fm/rox-lib2/DETAILS
new file mode 100755
index 0000000..22bfef5
--- /dev/null
+++ b/shell-term-fm/rox-lib2/DETAILS
@@ -0,0 +1,19 @@
+ SPELL=rox-lib2
+ VERSION=2.0.4
+ SOURCE=$SPELL-$VERSION.tar.bz2
+ SOURCE2=$SOURCE.sig
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+ SOURCE_URL[0]=$SOURCEFORGE_URL/rox/$SOURCE
+ SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
+ SOURCE_GPG=thomas.leonard.gpg:$SOURCE.sig:ESTABLISHED_UPSTREAM_KEY
+ SOURCE2_IGNORE=signature
+ LICENSE[0]=LGPL
+ WEB_SITE=http://rox.sourceforge.net
+ KEYWORDS="libs"
+ ENTERED=20071018
+ SHORT='ROX shared code for ROX-Apps'
+cat << EOF
+ROX-Lib contains shared code which can be used by other ROX applications. It
+does not require root access to install, and does not need to be compiled
(it's
+all python).
+EOF
diff --git a/shell-term-fm/rox-lib2/HISTORY b/shell-term-fm/rox-lib2/HISTORY
new file mode 100644
index 0000000..3b8663b
--- /dev/null
+++ b/shell-term-fm/rox-lib2/HISTORY
@@ -0,0 +1,3 @@
+2007-10-18 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS, DEPENDS, BUILD, INSTALL: Created
+
diff --git a/shell-term-fm/rox-lib2/INSTALL b/shell-term-fm/rox-lib2/INSTALL
new file mode 100755
index 0000000..baaeb04
--- /dev/null
+++ b/shell-term-fm/rox-lib2/INSTALL
@@ -0,0 +1,2 @@
+chown -R root:root ROX-Lib2 &&
+cp -av ROX-Lib2 $INSTALL_ROOT/usr/lib
diff --git a/shell-term-fm/rox-video-thumbnail/BUILD
b/shell-term-fm/rox-video-thumbnail/BUILD
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/shell-term-fm/rox-video-thumbnail/BUILD
@@ -0,0 +1 @@
+true
diff --git a/shell-term-fm/rox-video-thumbnail/DEPENDS
b/shell-term-fm/rox-video-thumbnail/DEPENDS
new file mode 100755
index 0000000..7511bbe
--- /dev/null
+++ b/shell-term-fm/rox-video-thumbnail/DEPENDS
@@ -0,0 +1,3 @@
+depends mplayer &&
+depends rox &&
+depends rox-lib2
diff --git a/shell-term-fm/rox-video-thumbnail/DETAILS
b/shell-term-fm/rox-video-thumbnail/DETAILS
new file mode 100755
index 0000000..0af1661
--- /dev/null
+++ b/shell-term-fm/rox-video-thumbnail/DETAILS
@@ -0,0 +1,15 @@
+ SPELL=rox-video-thumbnail
+ VERSION=0.1.13
+ SOURCE=VideoThumbnail-$VERSION.tar.gz
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/VideoThumbnail
+ SOURCE_URL[0]=http://www.kerofin.demon.co.uk/rox/$SOURCE
+ SOURCE_GPG="gurus.gpg:$SOURCE.sig:WORKS_FOR_ME"
+ LICENSE[0]=GPL
+ WEB_SITE=http://www.kerofin.demon.co.uk/rox/VideoThumbnail.html
+ KEYWORDS="video"
+ ENTERED=20071018
+ SHORT='Video thumbnailer for ROX'
+cat << EOF
+This is a helper program for ROX-Filer. It provides images for video files.
It
+repackages my vidthumb.py script as a fully-fledged application directory.
+EOF
diff --git a/shell-term-fm/rox-video-thumbnail/FINAL
b/shell-term-fm/rox-video-thumbnail/FINAL
new file mode 100755
index 0000000..d81e9f3
--- /dev/null
+++ b/shell-term-fm/rox-video-thumbnail/FINAL
@@ -0,0 +1,2 @@
+message "${MESSAGE_COLOR}You must now browse to $INSTALL_ROOT/usr/share/rox"
\
+ "with ROX-Filer and select VideoThumbnail to setup for a
user${DEFAULT_COLOR}"
diff --git a/shell-term-fm/rox-video-thumbnail/HISTORY
b/shell-term-fm/rox-video-thumbnail/HISTORY
new file mode 100644
index 0000000..3b8663b
--- /dev/null
+++ b/shell-term-fm/rox-video-thumbnail/HISTORY
@@ -0,0 +1,3 @@
+2007-10-18 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS, DEPENDS, BUILD, INSTALL: Created
+
diff --git a/shell-term-fm/rox-video-thumbnail/INSTALL
b/shell-term-fm/rox-video-thumbnail/INSTALL
new file mode 100755
index 0000000..6b27ee6
--- /dev/null
+++ b/shell-term-fm/rox-video-thumbnail/INSTALL
@@ -0,0 +1,3 @@
+mkdir -p $INSTALL_ROOT/usr/share/rox/VideoThumbnail &&
+chown -R root:root * &&
+cp -av * $INSTALL_ROOT/usr/share/rox/VideoThumbnail
diff --git
a/shell-term-fm/rox-video-thumbnail/VideoThumbnail-0.1.13.tar.gz.sig
b/shell-term-fm/rox-video-thumbnail/VideoThumbnail-0.1.13.tar.gz.sig
new file mode 100644
index 0000000..a28ebb0
Binary files /dev/null and
b/shell-term-fm/rox-video-thumbnail/VideoThumbnail-0.1.13.tar.gz.sig differ
diff --git a/shell-term-fm/rox/thomas.leonard.gpg
b/shell-term-fm/rox/thomas.leonard.gpg
deleted file mode 100644
index 5f608dd..0000000
Binary files a/shell-term-fm/rox/thomas.leonard.gpg and /dev/null differ
diff --git a/shell-term-fm/thomas.leonard.gpg
b/shell-term-fm/thomas.leonard.gpg
new file mode 100644
index 0000000..5f608dd
Binary files /dev/null and b/shell-term-fm/thomas.leonard.gpg differ
diff --git a/smgl/smgl-fhs/HISTORY b/smgl/smgl-fhs/HISTORY
index c76d60f..11bf1a8 100644
--- a/smgl/smgl-fhs/HISTORY
+++ b/smgl/smgl-fhs/HISTORY
@@ -1,3 +1,15 @@
+2007-10-13 Eric Sandall <sandalle AT sourcemage.org>
+ * INSTALL: fhs_mkdir already applies $INSTALL_ROOT
+ Use TRACK_ROOT, not INSTALL_ROOT, for symlinks (thanks Jaka)
+
+2007-10-12 Eric Sandall <sandalle AT sourcemage.org>
+ * INSTALL: Fix symlinks relative to INSTALL_ROOT, otherwise you get
+ problems with broken symlinks as reported in Bug #13777
+ Need to make the /usr/X11R6/{lib,include} directories to create
+ symlinks under them and the directories we want to symlink to under
+ /usr also need to exist before symlinking
+ Fix X11 module locations (at least for DRI)
+
2007-05-06 Thomas Orgis <soukus AT sourcemage.org>
* INSTALL: ensure minimal passwd files with root:root
for possibly cast in yet-empty to-be chroot dir
diff --git a/smgl/smgl-fhs/INSTALL b/smgl/smgl-fhs/INSTALL
index 2e965ad..e3cf284 100755
--- a/smgl/smgl-fhs/INSTALL
+++ b/smgl/smgl-fhs/INSTALL
@@ -111,12 +111,17 @@ done &&
#
# http://www.pathname.com/fhs/2.2/fhs-4.4.html
#
-for X11_directory in bin lib/X11 include/X11
+for X11_subdir in lib include
do
- fhs_mkdir /usr/X11R6/$X11_directory &&
- pushd $INSTALL_ROOT/ &&
- ln -sf usr/$X11_directory \
- usr/X11R6/$X11_directory &&
+ fhs_mkdir /usr/X11R6/$X11_subdir
+done &&
+
+for X11_directory in bin lib/X11 include/X11 lib/modules
+do
+ fhs_mkdir /usr/$X11_directory &&
+ pushd $INSTALL_ROOT/ &&
+ ln -sf $TRACK_ROOT/usr/$X11_directory \
+ usr/X11R6/$X11_directory &&
popd
done &&

diff --git a/spelling/hunspell/DETAILS b/spelling/hunspell/DETAILS
index d689e2e..38f43e9 100755
--- a/spelling/hunspell/DETAILS
+++ b/spelling/hunspell/DETAILS
@@ -1,5 +1,5 @@
SPELL=hunspell
- VERSION=1.1.4
+ VERSION=1.1.12
SOURCE=${SPELL}-${VERSION}.tar.gz
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
SOURCE_URL[0]=${SOURCEFORGE_URL}/${SPELL}/${SOURCE}
diff --git a/spelling/hunspell/HISTORY b/spelling/hunspell/HISTORY
index 8afef31..c246a0e 100644
--- a/spelling/hunspell/HISTORY
+++ b/spelling/hunspell/HISTORY
@@ -1,3 +1,6 @@
+2007-10-13 George Sherwood <george AT beernabeer.com>
+ * DETAILS: Updated to version 1.1.12
+
2006-10-03 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: [automated] Removed UPDATED.

diff --git a/spelling/hunspell/hunspell-1.1.12.tar.gz.sig
b/spelling/hunspell/hunspell-1.1.12.tar.gz.sig
new file mode 100644
index 0000000..9ed7cef
Binary files /dev/null and b/spelling/hunspell/hunspell-1.1.12.tar.gz.sig
differ
diff --git a/spelling/hunspell/hunspell-1.1.4.tar.gz.sig
b/spelling/hunspell/hunspell-1.1.4.tar.gz.sig
deleted file mode 100644
index 7304065..0000000
Binary files a/spelling/hunspell/hunspell-1.1.4.tar.gz.sig and /dev/null
differ
diff --git a/telephony/asterisk-addons/DETAILS
b/telephony/asterisk-addons/DETAILS
index e9073b5..26a1315 100755
--- a/telephony/asterisk-addons/DETAILS
+++ b/telephony/asterisk-addons/DETAILS
@@ -1,5 +1,5 @@
SPELL=asterisk-addons
- VERSION=1.4.1
+ VERSION=1.4.3
SOURCE=${SPELL}-${VERSION}.tar.gz
SOURCE2=${SOURCE}.asc
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
@@ -7,7 +7,7 @@ SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
SOURCE2_URL[0]=${SOURCE_URL}.asc
SOURCE_URL[1]=http://ftp2.digium.com/pub/asterisk/releases/${SOURCE}
SOURCE2_URL[1]=http://ftp2.digium.com/pub/asterisk/releases/${SOURCE2}
- SOURCE_GPG=asterisk-addons.gpg:$SOURCE2:UPSTREAM_KEY
+ SOURCE_GPG=asterisk.gpg:$SOURCE2:UPSTREAM_KEY
SOURCE2_IGNORE=signature
WEB_SITE=http://www.asterisk.org/
ENTERED=20051223
diff --git a/telephony/asterisk-addons/HISTORY
b/telephony/asterisk-addons/HISTORY
index d04b478..ce229b7 100644
--- a/telephony/asterisk-addons/HISTORY
+++ b/telephony/asterisk-addons/HISTORY
@@ -1,3 +1,8 @@
+2007-10-06 Martin Spitzbarth <m.spitzbarth AT gmx.de>
+ * DETAILS: updated spell to 1.4.3
+ switched to the asterisk.gpg keyring for source verification
+ * asterisk-addons.gpg: deleted the file
+
2007-08-09 Martin Spitzbarth <m.spitzbarth AT gmx.de>
* DETAILS: fixed download url and mirrors

diff --git a/telephony/asterisk-addons/asterisk-addons.gpg
b/telephony/asterisk-addons/asterisk-addons.gpg
deleted file mode 100644
index 15adb49..0000000
Binary files a/telephony/asterisk-addons/asterisk-addons.gpg and /dev/null
differ
diff --git a/telephony/asterisk/DETAILS b/telephony/asterisk/DETAILS
index e9eb996..bb176ac 100755
--- a/telephony/asterisk/DETAILS
+++ b/telephony/asterisk/DETAILS
@@ -1,5 +1,5 @@
SPELL=asterisk
- VERSION=1.4.11
+ VERSION=1.4.13
SOURCE=${SPELL}-${VERSION}.tar.gz
SOURCE2=${SOURCE}.asc
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
@@ -13,7 +13,7 @@ SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
DOCS="$DOCS UPGRADE.txt BUGS CREDITS"
WEB_SITE=http://www.asterisk.org/
ENTERED=20051223
- SECURITY_PATCH=6
+ SECURITY_PATCH=7
LICENSE[0]=GPL2
KEYWORDS="telephony"
SHORT="Asterisk PBX"
diff --git a/telephony/asterisk/HISTORY b/telephony/asterisk/HISTORY
index 672ce3b..b4c65ef 100644
--- a/telephony/asterisk/HISTORY
+++ b/telephony/asterisk/HISTORY
@@ -1,3 +1,12 @@
+2007-10-11 Martin Spitzbarth <m.spitzbarth AT gmx.de>
+ * patches/1.4r80750_app_voicemail.c: deleted (obolsete since 1.4.12.1)
+ * DETAILS: updated spell to 1.4.13
+ SECURITY_PATCH++, fixes bug 14035
+
+2007-10-06 Martin Spitzbarth <m.spitzbarth AT gmx.de>
+ * DETAILS: updated spell to 1.4.12.1
+ * PRE_BUILD: removed a patch that is now included in the release
+
2007-08-25 Martin Spitzbarth <m.spitzbarth AT gmx.de>
* DETAILS: updated spell to 1.4.11
SECURITY_PATCH++, Bug #13959
diff --git a/telephony/asterisk/PRE_BUILD b/telephony/asterisk/PRE_BUILD
index b1b6d27..785fa29 100755
--- a/telephony/asterisk/PRE_BUILD
+++ b/telephony/asterisk/PRE_BUILD
@@ -1,7 +1,5 @@
default_pre_build &&
cd ${SOURCE_DIRECTORY} &&
-# This patch will be included in 1.4.12 when it is released:
-patch -p2 < $SCRIPT_DIRECTORY/patches/1.4r80750_app_voicemail.c &&
sed -i -e "s|/usr/bin/awk|/bin/awk|" main/editline/makelist &&
sed -i -e "s/OVERWRITE=y/OVERWRITE=n/" Makefile

diff --git a/telephony/asterisk/patches/1.4r80750_app_voicemail.c
b/telephony/asterisk/patches/1.4r80750_app_voicemail.c
deleted file mode 100644
index 25c0efb..0000000
--- a/telephony/asterisk/patches/1.4r80750_app_voicemail.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- branches/1.4/apps/app_voicemail.c 2007/08/24 15:49:37 80749
-+++ branches/1.4/apps/app_voicemail.c 2007/08/24 15:51:03 80750
-@@ -4421,7 +4421,7 @@
- mail_fetchstructure
(vms->mailstream,vms->msgArray[vms->curmsg],&body);
-
- /* We have the body, now we extract the file name of the first
attachment. */
-- if (body->nested.part->next &&
body->nested.part->next->body.parameter->value) {
-+ if (body->nested.part && body->nested.part->next &&
body->nested.part->next->body.parameter->value) {
- attachedfilefmt =
ast_strdupa(body->nested.part->next->body.parameter->value);
- } else {
- ast_log(LOG_ERROR, "There is no file attached to this IMAP
message.\n");
diff --git a/telephony/libtelepathy/DETAILS b/telephony/libtelepathy/DETAILS
index b584338..7945086 100755
--- a/telephony/libtelepathy/DETAILS
+++ b/telephony/libtelepathy/DETAILS
@@ -1,5 +1,5 @@
SPELL=libtelepathy
- VERSION=0.0.58
+ VERSION=0.2.0
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE2=$SOURCE.asc
diff --git a/telephony/libtelepathy/HISTORY b/telephony/libtelepathy/HISTORY
index 25220b0..d3abe62 100644
--- a/telephony/libtelepathy/HISTORY
+++ b/telephony/libtelepathy/HISTORY
@@ -1,3 +1,6 @@
+2007-10-02 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 0.2.0
+
2007-09-26 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.0.58
new upstream key
diff --git a/telephony/sofia-sip/DETAILS b/telephony/sofia-sip/DETAILS
index d19e4cd..952aa18 100755
--- a/telephony/sofia-sip/DETAILS
+++ b/telephony/sofia-sip/DETAILS
@@ -1,6 +1,6 @@
SPELL=sofia-sip
- VERSION=1.12.6
-
SOURCE_HASH=sha512:0589283bce66823a25af2ae587006f4b1a2e596e46a4650c80031db6b262bef4d022e207aa613e3287ed761f768c808b7035efdacf13756a0bc072d4dd6d4e17
+ VERSION=1.12.7
+
SOURCE_HASH=sha512:c76827829dff3e388fd92cc000bcfa50542c3629638045c48ed8e0a7ca473f94dc72fc33830d433c3e5b9d6948eb96ae5f067581476d1b3e0e316bdd75a218b2
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
diff --git a/telephony/sofia-sip/HISTORY b/telephony/sofia-sip/HISTORY
index 0dc9d8e..2f80eb0 100644
--- a/telephony/sofia-sip/HISTORY
+++ b/telephony/sofia-sip/HISTORY
@@ -1,3 +1,6 @@
+2007-10-30 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.12.7
+
2007-04-26 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.12.6

diff --git a/telephony/telepathy-glib/DETAILS
b/telephony/telepathy-glib/DETAILS
index cfb9794..41ea3d6 100755
--- a/telephony/telepathy-glib/DETAILS
+++ b/telephony/telepathy-glib/DETAILS
@@ -1,5 +1,5 @@
SPELL=telepathy-glib
- VERSION=0.5.14
+ VERSION=0.6.0
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SOURCE.asc
WEB_SITE=http://telepathy.freedesktop.org
diff --git a/telephony/telepathy-glib/HISTORY
b/telephony/telepathy-glib/HISTORY
index bb61650..3f5dd2e 100644
--- a/telephony/telepathy-glib/HISTORY
+++ b/telephony/telepathy-glib/HISTORY
@@ -1,3 +1,6 @@
+2007-10-02 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 0.6.0
+
2007-09-12 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.5.14

diff --git a/telephony/telepathy-mission-control/DETAILS
b/telephony/telepathy-mission-control/DETAILS
index 718f66a..9a83a23 100755
--- a/telephony/telepathy-mission-control/DETAILS
+++ b/telephony/telepathy-mission-control/DETAILS
@@ -1,9 +1,9 @@
SPELL=telepathy-mission-control
- VERSION=4.37
-
SOURCE_HASH=sha512:626c91eec7410328f8082a61092316085cba649af847433a54b59f376bae644e8e458f54a1e681b0cfdcfe82ca55cfe45dcdfed033d383d2295d238d3c23c216
+ VERSION=4.42
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$SOURCEFORGE_URL/mission-control/$SOURCE
+ SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
WEB_SITE=http://mission-control.sourceforge.net
LICENSE[0]=LGPL
ENTERED=20070511
diff --git a/telephony/telepathy-mission-control/HISTORY
b/telephony/telepathy-mission-control/HISTORY
index 4e8fedc..ec48b34 100644
--- a/telephony/telepathy-mission-control/HISTORY
+++ b/telephony/telepathy-mission-control/HISTORY
@@ -1,3 +1,6 @@
+2007-10-02 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 4.42
+
2007-09-12 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 4.37

diff --git
a/telephony/telepathy-mission-control/telepathy-mission-control-4.42.tar.gz.sig

b/telephony/telepathy-mission-control/telepathy-mission-control-4.42.tar.gz.sig
new file mode 100644
index 0000000..29c375d
Binary files /dev/null and
b/telephony/telepathy-mission-control/telepathy-mission-control-4.42.tar.gz.sig
differ
diff --git a/telephony/telepathy-sofiasip/DETAILS
b/telephony/telepathy-sofiasip/DETAILS
index 376cdf6..7b933f0 100755
--- a/telephony/telepathy-sofiasip/DETAILS
+++ b/telephony/telepathy-sofiasip/DETAILS
@@ -1,6 +1,6 @@
SPELL=telepathy-sofiasip
- VERSION=0.3.30
-
SOURCE_HASH=sha512:d4d06a6a7f2f10d85592a7990c0a9fff47ccb4bcaf2c5077b33f6254399b3542cfe1c549077e67d284348b859bab9e8e0f3ed2c0a1a5a97dd80fc17691a035ff
+ VERSION=0.4.3
+
SOURCE_HASH=sha512:85e4864fc49181679036faa4c5e5ea4aa81d3cb1a7bc7dc9e6587f8de29c068a2c5c1e39cc789628249c8898a1f577d3b2376f811bd021bf59ca8311db247f59
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
WEB_SITE=http://sourceforge.net/projects/tp-sofiasip
diff --git a/telephony/telepathy-sofiasip/HISTORY
b/telephony/telepathy-sofiasip/HISTORY
index 29f3125..7c0496f 100644
--- a/telephony/telepathy-sofiasip/HISTORY
+++ b/telephony/telepathy-sofiasip/HISTORY
@@ -1,3 +1,6 @@
+2007-10-30 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.4.3
+
2007-09-20 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.3.30

diff --git a/telephony/telepathy.gpg b/telephony/telepathy.gpg
index 7080bee..ec42930 100644
Binary files a/telephony/telepathy.gpg and b/telephony/telepathy.gpg differ
diff --git a/utils/acpid/DETAILS b/utils/acpid/DETAILS
index c08a738..639840b 100755
--- a/utils/acpid/DETAILS
+++ b/utils/acpid/DETAILS
@@ -1,12 +1,11 @@
SPELL=acpid
- VERSION=1.0.4
+ VERSION=1.0.6
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$SOURCEFORGE_URL/acpid/$SOURCE
WEB_SITE=http://acpid.sourceforge.net/
-
SOURCE_HASH=sha512:2d264d7cca97ab28433ad563102b09f1b6b5f2e6187e1e16d5084d9bba026d4d3b455f5557f4655e525c39429a4f385dfa89f0952bae8cd231eeee5ec7e02a54
+
SOURCE_HASH=sha512:d207777c5da37a7a375f151148f5a0686a90182228e88af788cb4550d92eea51552d12ac33e309f2d0335ce34109497da8e643521a8c12429ed0b05012aa8179
ENTERED=20020730
- UPDATED=20041217
LICENSE=GPL
KEYWORDS="acpi utils"
SHORT="an extensible daemon for delivering ACPI events."
diff --git a/utils/acpid/HISTORY b/utils/acpid/HISTORY
index 7338d73..0b792b9 100644
--- a/utils/acpid/HISTORY
+++ b/utils/acpid/HISTORY
@@ -1,3 +1,7 @@
+2007-11-03 Vlad Glagolev <codex AT sourcemage.org>
+ * DETAILS: Updated spell to 1.0.6, removed 'UPDATED'
+ * PRE_BUILD: removed, removed that patch (fixed in 1.0.6)
+
2006-06-28 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: Removed BUILD_API=2, set grimoire-wide

diff --git a/utils/acpid/PRE_BUILD b/utils/acpid/PRE_BUILD
deleted file mode 100755
index 17b720f..0000000
--- a/utils/acpid/PRE_BUILD
+++ /dev/null
@@ -1,3 +0,0 @@
-default_pre_build &&
-cd $SOURCE_DIRECTORY &&
-patch -p1 < $SPELL_DIRECTORY/ud_socket-type-conversion.patch
diff --git a/utils/acpid/ud_socket-type-conversion.patch
b/utils/acpid/ud_socket-type-conversion.patch
deleted file mode 100644
index 50a2a2a..0000000
--- a/utils/acpid/ud_socket-type-conversion.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/ud_socket.c b/ud_socket.c
-index bb74241..a130fc8 100644
---- a/ud_socket.c
-+++ b/ud_socket.c
-@@ -58,7 +58,7 @@ ud_accept(int listenfd, struct ucred *cr
- while (1) {
- int newsock = 0;
- struct sockaddr_un cliaddr;
-- int len = sizeof(struct sockaddr_un);
-+ socklen_t len = sizeof(struct sockaddr_un);
-
- newsock = accept(listenfd, (struct sockaddr *)&cliaddr, &len);
- if (newsock < 0) {
diff --git a/utils/avahi/DETAILS b/utils/avahi/DETAILS
index ffd3ba0..1e837c4 100755
--- a/utils/avahi/DETAILS
+++ b/utils/avahi/DETAILS
@@ -1,13 +1,14 @@
SPELL=avahi
VERSION=0.6.20
-
SOURCE_HASH=sha512:8021b3abb4250c82991ec6cb8b548345f7f8b4425e504a40682436f259edc523125e1d17a99a08ea593868a54daf574b83e00ac229bf80c22329c99724bf699e
SOURCE=${SPELL}-${VERSION}.tar.gz
-SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
SOURCE_URL=http://avahi.org/download/${SOURCE}
- WEB_SITE=http://avahi.org/
- ENTERED=20060626
+
SOURCE_HASH=sha512:8021b3abb4250c82991ec6cb8b548345f7f8b4425e504a40682436f259edc523125e1d17a99a08ea593868a54daf574b83e00ac229bf80c22329c99724bf699e
+SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
SECURITY_PATCH=2
+ PATCHLEVEL=1
LICENSE[0]=GPL
+ WEB_SITE=http://avahi.org/
+ ENTERED=20060626
SHORT="LAN service discovery system"
cat << EOF
Avahi is a system which facilitates service discovery on a local network.
This
diff --git a/utils/avahi/HISTORY b/utils/avahi/HISTORY
index 894530f..b9a23fd 100644
--- a/utils/avahi/HISTORY
+++ b/utils/avahi/HISTORY
@@ -1,3 +1,8 @@
+2007-10-18 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: Incremented PATCHLEVEL=1
+ * PRE_BUILD: Create netdev group
+ See https://bugzilla.redhat.com/show_bug.cgi?id=219218
+
2007-07-03 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.6.20

@@ -52,3 +57,4 @@

2006-06-26 Pieter Lenaerts <e-type AT sourcemage.org>
* BUILD, DETAILS, DEPENDS, HISTORY: created spell
+
diff --git a/utils/avahi/PRE_BUILD b/utils/avahi/PRE_BUILD
index e41287f..83ffda9 100755
--- a/utils/avahi/PRE_BUILD
+++ b/utils/avahi/PRE_BUILD
@@ -1,6 +1,6 @@
-
-default_pre_build &&
-cd $SOURCE_DIRECTORY &&
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
patch -p1 < $SPELL_DIRECTORY/qt.patch &&
#patch -p0 < $SCRIPT_DIRECTORY/dbus.patch &&
-autoreconf
+autoreconf &&
+create_group netdev
diff --git a/utils/bluez-hcidump/DETAILS b/utils/bluez-hcidump/DETAILS
index e1ff230..2e6fef1 100755
--- a/utils/bluez-hcidump/DETAILS
+++ b/utils/bluez-hcidump/DETAILS
@@ -1,8 +1,8 @@
SPELL=bluez-hcidump
- VERSION=1.31
+ VERSION=1.40
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_URL[0]=http://bluez.sourceforge.net/download/$SOURCE
-
SOURCE_HASH=sha512:8d584016b54fd02763559a80cc488fabd6019f3cfb92502a7da40537c1c7638cb6ecfd83a8c626f6f7748a10ec86aa815d144b3bf932723ab964a877aca190c8
+
SOURCE_HASH=sha512:9e0e61e433618672e478a0a84d6ef604c15fd51db9b65d3f48260485fff9a78cdc9335065be0f213e62d8ab31c418e31a36526b1ad4106c8e48ccdcafe319141
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
WEB_SITE=http://www.bluez.org/
ENTERED=20060727
diff --git a/utils/bluez-hcidump/HISTORY b/utils/bluez-hcidump/HISTORY
index c7d569c..b3999fa 100644
--- a/utils/bluez-hcidump/HISTORY
+++ b/utils/bluez-hcidump/HISTORY
@@ -1,3 +1,6 @@
+2007-10-24 Julien "_kaze_" ROZO <julien AT rozo.org>
+ * DETAILS: updated version to 1.40
+
2006-10-03 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: [automated] Removed UPDATED.

diff --git a/utils/bluez-utils/DETAILS b/utils/bluez-utils/DETAILS
index 942bdc4..0b6b633 100755
--- a/utils/bluez-utils/DETAILS
+++ b/utils/bluez-utils/DETAILS
@@ -1,12 +1,11 @@
SPELL=bluez-utils
- VERSION=3.2
+ VERSION=3.22
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://bluez.sourceforge.net/download/$SOURCE
- SOURCE_GPG="gurus.gpg:$SOURCE.sig"
- WEB_SITE=http://bluez.sourceforge.net
+
SOURCE_HASH=sha512:746e160fecfa806d88528dcee96686c0bca4f789cd684e4135e4034f27eaaefbb6efcfee997ffd706112965def0b2069b8bd61cb23c2b5d47829e9eed01fa25c
+ WEB_SITE=http://www.bluez.org/
ENTERED=20030714
- PATCHLEVEL=1
LICENSE[0]=GPL
KEYWORDS="bluetooth utils"
SHORT="Utility software for the bluez Bluetooth stack"
diff --git a/utils/bluez-utils/HISTORY b/utils/bluez-utils/HISTORY
index 863e512..89cac13 100644
--- a/utils/bluez-utils/HISTORY
+++ b/utils/bluez-utils/HISTORY
@@ -1,3 +1,15 @@
+2007-10-31 Julien "_kaze_" ROZO <julien AT rozo.org>
+ * DETAILS: updated version to 3.22
+
+2007-10-24 Julien "_kaze_" ROZO <julien AT rozo.org>
+ * DETAILS: updated version to 3.20
+
+2007-10-01 Julien "_kaze_" ROZO <julien AT rozo.org>
+ * DETAILS: corrected WEB_SITE
+
+2007-09-28 Martin Klein <martin AT makl.de>
+ * DETAILS: updated spell to 3.19
+
2007-05-02 Arjan Bouter <abouter AT sourcemage.org>
* CONFIGURE: added more choice

diff --git a/utils/coreutils/HISTORY b/utils/coreutils/HISTORY
index d7ba31a..37c4a45 100644
--- a/utils/coreutils/HISTORY
+++ b/utils/coreutils/HISTORY
@@ -1,3 +1,6 @@
+2007-10-31 David Brown <dmlb2000 AT gmail.com>
+ * PRE_BUILD: check for 2.7 as well as 2.6 glibc
+
2007-09-14 David Brown <dmlb2000 AT gmail.com>
* PRE_BUILD: forgot to change the patch check to --enable-selinux
* CONFIGURE: should be --enable not --with
diff --git a/utils/coreutils/PRE_BUILD b/utils/coreutils/PRE_BUILD
index c035bae..1cc6889 100755
--- a/utils/coreutils/PRE_BUILD
+++ b/utils/coreutils/PRE_BUILD
@@ -11,7 +11,7 @@ then
patch -p1 < ${SCRIPT_DIRECTORY}/coreutils-selinux.patch
fi &&
case "$(installed_version glibc)" in
- 2.6*)
+ 2.6*|2.7*)
patch -p1 < ${SCRIPT_DIRECTORY}/coreutils-futimens.patch
;;
*)
diff --git a/utils/cpufrequtils/BUILD b/utils/cpufrequtils/BUILD
index 8f58e6d..89cff77 100755
--- a/utils/cpufrequtils/BUILD
+++ b/utils/cpufrequtils/BUILD
@@ -1 +1,3 @@
-make
+make_single &&
+make &&
+make_normal
diff --git a/utils/cpufrequtils/HISTORY b/utils/cpufrequtils/HISTORY
index ce72bd1..2b8593a 100644
--- a/utils/cpufrequtils/HISTORY
+++ b/utils/cpufrequtils/HISTORY
@@ -1,3 +1,9 @@
+2007-10-10 Martin Spitzbarth <m.spitzbarth AT gmx.de>
+ * PRE_BUILD: created the file,
+ use INSTALL_ROOT,
+ install manpages to /usr/share/man
+ * BUILD: using make_single
+
2007-02-10 Juuso Alasuutari <iuso AT sourcemage.org>
* DEPENDS: Added depends libtool.

diff --git a/utils/cpufrequtils/PRE_BUILD b/utils/cpufrequtils/PRE_BUILD
new file mode 100755
index 0000000..a8102f0
--- /dev/null
+++ b/utils/cpufrequtils/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+sedit "s:DESTDIR ?=:DESTDIR ?= $INSTALL_ROOT:" Makefile &&
+sedit "s:/usr/man:/usr/share/man:" Makefile
diff --git a/utils/dbus-python/DETAILS b/utils/dbus-python/DETAILS
index 3b4d9da..f42ef4a 100755
--- a/utils/dbus-python/DETAILS
+++ b/utils/dbus-python/DETAILS
@@ -1,6 +1,6 @@
SPELL=dbus-python
- VERSION=0.82.0
-
SOURCE_HASH=sha512:ae474a0ff9252ba85cd30daf055aab40f114be6005bdea38c6b1c416302f95d0dc8cede0f499298202d42724a759ad9ecb9ca9d1379e387c6e32d03b6a351309
+ VERSION=0.82.3
+
SOURCE_HASH=sha512:38fbbaec965370d89d850459effcef8b7240fb604822f29f6e8833dae6b13e61f53135e13ed1583a66b5a0c714a0bfefac454b94532dca2ac88bf9ffd462dbc0
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://dbus.freedesktop.org/releases/$SPELL/$SOURCE
diff --git a/utils/dbus-python/HISTORY b/utils/dbus-python/HISTORY
index bbb5bbd..8087758 100644
--- a/utils/dbus-python/HISTORY
+++ b/utils/dbus-python/HISTORY
@@ -1,3 +1,6 @@
+2007-10-30 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.82.3
+
2007-06-30 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 0.82.0, fixed WEB_SITE

diff --git a/utils/dmenu/DETAILS b/utils/dmenu/DETAILS
index d32e206..a833f51 100755
--- a/utils/dmenu/DETAILS
+++ b/utils/dmenu/DETAILS
@@ -1,8 +1,8 @@
SPELL=dmenu
- VERSION=3.2
+ VERSION=3.3
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_URL[0]=http://suckless.org/download/${SOURCE}
-
SOURCE_HASH=sha512:00f4f90cbd887083d77523968ebb1ff523183730186626b8525baec7d468af19783e876981f25b4ced0fb6380b6c6fedb52351913f27a574db4851f5662f2fda
+
SOURCE_HASH=sha512:6331e8359aada8f4e2399ab20fb4349b50a3052ea1ca25d12ffdd04ef0d2e42778290dae10deb9f60514f33969e0d872fc16b57d21e2f1bdb6320373a83a0f09
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
WEB_SITE=http://tools.suckless.org/view.sh/x+tools
ENTERED=20061230
diff --git a/utils/dmenu/HISTORY b/utils/dmenu/HISTORY
index b084df8..fbfd8bf 100644
--- a/utils/dmenu/HISTORY
+++ b/utils/dmenu/HISTORY
@@ -1,3 +1,6 @@
+2007-10-07 Mathieu Lonjaret <lejatorn AT sourcemage.org>
+ * DETAILS: update to 3.3
+
2007-08-09 Mathieu Lonjaret <lejatorn AT sourcemage.org>
* DETAILS: update to 3.2

diff --git a/utils/hal-info/DEPENDS b/utils/hal-info/DEPENDS
new file mode 100755
index 0000000..f374ba5
--- /dev/null
+++ b/utils/hal-info/DEPENDS
@@ -0,0 +1,12 @@
+optional_depends hal \
+ "--enable-killswitch-ipw-wlan" \
+ "--disable-killswitch-ipw-wlan" \
+ "for WLAN killswitch support" &&
+
+if is_depends_enabled $SPELL hal; then
+ local hal_ver=$(installed_version hal) &&
+ case $hal_ver in
+ 0.5.[02-9]|0.5.[0-9].*|0.[24]*) force_depends hal ;;
+ *) true ;;
+ esac
+fi
diff --git a/utils/hal-info/DETAILS b/utils/hal-info/DETAILS
index 83be703..dfdce53 100755
--- a/utils/hal-info/DETAILS
+++ b/utils/hal-info/DETAILS
@@ -1,9 +1,9 @@
SPELL=hal-info
- VERSION=20070618
-
SOURCE_HASH=sha512:accc9075048978d3114e92583e7874f1220d94db903b89065d5d194fdf88d4303c130475426ec1136bdef3376b1327dfd0f3123a53639a68fd753b1b5ce96be4
+ VERSION=20071030
+
SOURCE_HASH=sha512:c02e6499cf1d1910ef4865f819a42be7b6b3fe828c735e09e50279a574ad0f5fa3829bd98e6b5043aa49907867179fabe2c88e666c5e91ff28f9a2f84cb1cd70
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- SOURCE_URL[0]=http://people.freedesktop.org/~david/dist/$SOURCE
+ SOURCE_URL[0]=http://hal.freedesktop.org/releases/$SOURCE
WEB_SITE=http://freedesktop.org/wiki/Software/hal
LICENSE[0]=GPL
ENTERED=20070424
diff --git a/utils/hal-info/HISTORY b/utils/hal-info/HISTORY
index 3fe1139..859c95c 100644
--- a/utils/hal-info/HISTORY
+++ b/utils/hal-info/HISTORY
@@ -1,3 +1,13 @@
+2007-11-14 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * DEPENDS: force_depends on older hal versions, needs 0.5.10+ #14079
+
+2007-10-30 Julien "_kaze_" ROZO <julien AT rozo.org>
+ * DEPENDS: added, optionally depends on hal for WLAN killswitch
support
+
+2007-10-30 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 20071030
+ new url
+
2007-06=2- Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 20070618

diff --git a/utils/hal/DEPENDS b/utils/hal/DEPENDS
index 7b55f5d..ad31911 100755
--- a/utils/hal/DEPENDS
+++ b/utils/hal/DEPENDS
@@ -8,12 +8,16 @@ depends python &&
depends udev &&
depends xml-parser-expat &&
depends pkgconfig &&
-depends hal-info &&
depends dbus-python &&

# bug #13500
sub_depends udev VOLUME_ID &&

+depends glibc &&
+if [[ $(installed_version glibc | sed -n 's/^\(.\)\.\(.\).*/\1\2/p') -lt 26
]]; then
+ force_depends glibc
+fi &&
+
#optional_depends consolekit \
# "--enable-console-kit" \
# "--disable-console-kit" \
diff --git a/utils/hal/DETAILS b/utils/hal/DETAILS
index d1f61a9..12541ab 100755
--- a/utils/hal/DETAILS
+++ b/utils/hal/DETAILS
@@ -1,9 +1,9 @@
SPELL=hal
- VERSION=0.5.9.1
-
SOURCE_HASH=sha512:0705eb15a406090829b4339cc0714acda8ebb11cf840e8c20d7e9a3ff7cca9ed48c55d323b3b14599becf87b079ed3e694cc1b46f1e87ec7237648bc4d456cda
+ VERSION=0.5.10
+
SOURCE_HASH=sha512:eec0e82046e3f772e7e7415338d5cb317e1febb0b93544764260076e4555ab7255ba0d24cd0e8f7ec0d5ff5a7c428e40dc4ff624f05463e88513e67131a843ba
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- SOURCE_URL[0]=http://freedesktop.org/~david/dist/$SOURCE
+ SOURCE_URL[0]=http://hal.freedesktop.org/releases/$SOURCE
# SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
WEB_SITE=http://freedesktop.org/Software/hal
ENTERED=20040904
diff --git a/utils/hal/HISTORY b/utils/hal/HISTORY
index a4cf5bd..39bf607 100644
--- a/utils/hal/HISTORY
+++ b/utils/hal/HISTORY
@@ -1,3 +1,13 @@
+2007-11-14 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * DEPENDS: removed hal-info #14079 (circular dependency and wrong)
+ added a force_depends on glibc, needs newer kernel headers than
those
+ that came with glibc 2.4 #14080
+
+2007-10-30 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.5.10
+ new url
+ * libparted_check.patch: updated
+
2007-09-24 Treeve Jelbert <treeve AT sourcemage.org>
* BUILD, CONFIGURE: uncomment selinx stuff

diff --git a/utils/hal/libparted_check.patch b/utils/hal/libparted_check.patch
index d7d8131..09586a4 100644
--- a/utils/hal/libparted_check.patch
+++ b/utils/hal/libparted_check.patch
@@ -1,35 +1,33 @@
-diff -uNr hal-0.5.9.1/configure hal-0.5.9.1.cp/configure
---- hal-0.5.9.1/configure 2007-06-12 20:27:26.000000000 +0200
-+++ hal-0.5.9.1.cp/configure 2007-06-21 10:04:22.000000000 +0200
-@@ -22743,8 +22743,8 @@
+diff -uNr hal-0.5.10/configure hal-0.5.10.cp/configure
+--- hal-0.5.10/configure 2007-09-25 21:08:31.000000000 +0200
++++ hal-0.5.10.cp/configure 2007-10-30 20:50:49.000000000 +0100
+@@ -21845,8 +21845,8 @@
{ (exit 1); exit 1; }; }
fi

-- { echo "$as_me:$LINENO: checking for libparted == 1.7.1, 1.8.0, 1.8.1,
1.8.2, 1.8.6" >&5
--echo $ECHO_N "checking for libparted == 1.7.1, 1.8.0, 1.8.1, 1.8.2,
1.8.6... $ECHO_C" >&6; }
-+ { echo "$as_me:$LINENO: checking for libparted == 1.7.1, 1.8.0, 1.8.1,
1.8.2, 1.8.6, 1.8.7" >&5
-+echo $ECHO_N "checking for libparted == 1.7.1, 1.8.0, 1.8.1, 1.8.2, 1.8.6,
1.8.8... $ECHO_C" >&6; }
+- { echo "$as_me:$LINENO: checking for libparted == 1.7.1, 1.8.0, 1.8.1,
1.8.2, 1.8.6, 1.8.7" >&5
+-echo $ECHO_N "checking for libparted == 1.7.1, 1.8.0, 1.8.1, 1.8.2, 1.8.6,
1.8.7... $ECHO_C" >&6; }
++ { echo "$as_me:$LINENO: checking for libparted == 1.7.1, 1.8.0, 1.8.1,
1.8.2, 1.8.6, 1.8.7, 1.8.8" >&5
++echo $ECHO_N "checking for libparted == 1.7.1, 1.8.0, 1.8.1, 1.8.2, 1.8.6,
1.8.7, 1.8.8... $ECHO_C" >&6; }
LDFLAGS=-lparted
if test "$cross_compiling" = yes; then
{ { echo "$as_me:$LINENO: error: cannot run test program while cross
compiling
-@@ -22774,7 +22774,8 @@
- (major == 1 && minor == 8 && micro == 0) ||
+@@ -21878,7 +21878,8 @@
(major == 1 && minor == 8 && micro == 1) ||
(major == 1 && minor == 8 && micro == 2) ||
-- (major == 1 && minor == 8 && micro == 6))
-+ (major == 1 && minor == 8 && micro == 6) ||
+ (major == 1 && minor == 8 && micro == 6) ||
+- (major == 1 && minor == 8 && micro == 7))
++ (major == 1 && minor == 8 && micro == 7) ||
+ (major == 1 && minor == 8 && micro == 8))
return 0;

return 1;
-@@ -22809,8 +22810,8 @@
- sed 's/^/| /' conftest.$ac_ext >&5
+@@ -21914,7 +21915,7 @@

( exit $ac_status )
--{ { echo "$as_me:$LINENO: error: *** Requires libparted ==
1.7.1/1.8.0/1.8.1/1.8.2 or 1.8.6" >&5
--echo "$as_me: error: *** Requires libparted == 1.7.1/1.8.0/1.8.1/1.8.2 or
1.8.6" >&2;}
-+{ { echo "$as_me:$LINENO: error: *** Requires libparted ==
1.7.1/1.8.0/1.8.1/1.8.2 or 1.8.6/7" >&5
-+echo "$as_me: error: *** Requires libparted == 1.7.1/1.8.0/1.8.1/1.8.2 or
1.8.6/7/8" >&2;}
+ { { echo "$as_me:$LINENO: error: *** Requires libparted ==
1.7.1/1.8.0/1.8.1/1.8.2/1.8.6 or 1.8.7" >&5
+-echo "$as_me: error: *** Requires libparted ==
1.7.1/1.8.0/1.8.1/1.8.2/1.8.6 or 1.8.7" >&2;}
++echo "$as_me: error: *** Requires libparted ==
1.7.1/1.8.0/1.8.1/1.8.2/1.8.6/1.8.7 or 1.8.8" >&2;}
{ (exit 1); exit 1; }; }
fi
rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext
conftest.$ac_objext conftest.$ac_ext
diff --git a/utils/hnb/BUILD b/utils/hnb/BUILD
index 5e1fa3a..8f58e6d 100755
--- a/utils/hnb/BUILD
+++ b/utils/hnb/BUILD
@@ -1,2 +1 @@
-sedit "s/usr\/local/usr/g" Makefile &&
make
diff --git a/utils/hnb/HISTORY b/utils/hnb/HISTORY
index 3b839fd..22ac936 100644
--- a/utils/hnb/HISTORY
+++ b/utils/hnb/HISTORY
@@ -1,3 +1,7 @@
+2007-10-10 Martin Spitzbarth <m.spitzbarth AT gmx.de>
+ * PRE_BUILD: created, change paths to honour INSTALL_ROOT and the FHS
+ * BUILD: moved changes to Makefile into PRE_BUILD
+
2006-06-28 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: Removed BUILD_API=2, set grimoire-wide

diff --git a/utils/hnb/PRE_BUILD b/utils/hnb/PRE_BUILD
new file mode 100755
index 0000000..2fab926
--- /dev/null
+++ b/utils/hnb/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+sedit "s:/usr/local/bin:${INSTALL_ROOT}/usr/bin:" Makefile &&
+sedit "s:/usr/local/man:${INSTALL_ROOT}/usr/share/man:" Makefile
diff --git a/utils/iso-codes/DETAILS b/utils/iso-codes/DETAILS
index 4158f5d..1cba0e3 100755
--- a/utils/iso-codes/DETAILS
+++ b/utils/iso-codes/DETAILS
@@ -1,5 +1,5 @@
SPELL=iso-codes
- VERSION=1.4
+ VERSION=1.5
SOURCE=${SPELL}-${VERSION}.tar.bz2
SOURCE2=${SOURCE}.sig
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
diff --git a/utils/iso-codes/HISTORY b/utils/iso-codes/HISTORY
index 10840e9..28c3ade 100644
--- a/utils/iso-codes/HISTORY
+++ b/utils/iso-codes/HISTORY
@@ -1,3 +1,6 @@
+2007-10-07 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 1.5
+
2007-08-30 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.4

diff --git a/utils/less/DETAILS b/utils/less/DETAILS
index f9b41a0..65d8d0e 100755
--- a/utils/less/DETAILS
+++ b/utils/less/DETAILS
@@ -1,12 +1,12 @@
SPELL=less
- VERSION=406
+ VERSION=409
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://www.greenwoodsoftware.com/$SPELL/$SOURCE
SOURCE_URL[1]=$GNU_URL/$SPELL/$SOURCE
SOURCE_URL[2]=ftp://ftp.gnu.org/pub/gnu/$SPELL/$SOURCE
WEB_SITE=http://www.greenwoodsoftware.com/less
-
SOURCE_HASH=sha512:9e5305dc95db9ee82b8c0b2727b3a1a41751ef97fb54102a184407cf13a47374c0c5e67a50f2da9d064e28b11207f22adc0ddbecda039b21653e5413b4aeb67e
+
SOURCE_HASH=sha512:0bc2c3c3876bfddebde7421fb6947105a24a8e30108ebd2d41f7322cc78da970c9ebd6ab8e63d2225d1e6820de57d61cf340fc162f76a486c06c637a676fcdde
ENTERED=20010922
KEYWORDS="utils"
SHORT="less is a paginator that allows backward and forward
movement."
diff --git a/utils/less/HISTORY b/utils/less/HISTORY
index 28273fc..4b67382 100644
--- a/utils/less/HISTORY
+++ b/utils/less/HISTORY
@@ -1,3 +1,9 @@
+2007-10-13 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 409
+
+2007-10-02 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 408
+
2007-06-19 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 406

diff --git a/utils/lshw/DETAILS b/utils/lshw/DETAILS
index e128df0..dd5907b 100755
--- a/utils/lshw/DETAILS
+++ b/utils/lshw/DETAILS
@@ -1,6 +1,6 @@
SPELL=lshw
- VERSION=B.02.11.01
-
SOURCE_HASH=sha512:83685973d660a1fb3867bafd867f88380d4efb881e19c96650702ec26c87d51dfdb6e0b250b60aa7388ef0154adcc620d948c580324b7cb0872c0474e3075df0
+ VERSION=B.02.12.01
+
SOURCE_HASH=sha512:6c693f1cd948d5bfef616b34f36a5d9be30eda837688b608686ba4a3bd146aa7c43fbef2aea2152902ffa44b6f6b03a8dcdd1174755abe5e346e9274cfc89bd9
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]="$SOURCEFORGE_URL/ezix/$SOURCE"
diff --git a/utils/lshw/HISTORY b/utils/lshw/HISTORY
index 5162c5d..56f4ea8 100644
--- a/utils/lshw/HISTORY
+++ b/utils/lshw/HISTORY
@@ -1,3 +1,6 @@
+2007-10-14 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: B.02.12.01
+
2007-08-06 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: B.02.11.01

diff --git a/utils/nss_ldap/DETAILS b/utils/nss_ldap/DETAILS
index 6f56fc6..9b45c3a 100755
--- a/utils/nss_ldap/DETAILS
+++ b/utils/nss_ldap/DETAILS
@@ -1,12 +1,12 @@
SPELL=nss_ldap
- VERSION=255
-
SOURCE_HASH=sha512:ad4d96386e593fa5ff4c0fde7c968c089cb1ff658b58699750a15c406c17259ad1a83c7a7fdd8741a91bc40fbe657bf89fbaefe3050ce8599a46c4fb69ed3541
+ VERSION=259
+
SOURCE_HASH=sha512:d20514df1b8dba4ad67cf5d130aa4a2e1b0aea1ee09832bc27078f26a62ecf56b0294b5fcd3425b5b6969889afc99f7fc335a34994034dcfb10f3ab5385d3393
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://www.padl.com/download/$SOURCE
WEB_SITE=http://www.padl.com/OSS/nss_ldap.html
ENTERED=20020210
- SECURITY_PATCH=1
+ SECURITY_PATCH=2
KEYWORDS="ldap utils"
SHORT='nss_ldap is a library for using ldap for name service'
cat << EOF
diff --git a/utils/nss_ldap/HISTORY b/utils/nss_ldap/HISTORY
index 9340ee4..2f014ea 100644
--- a/utils/nss_ldap/HISTORY
+++ b/utils/nss_ldap/HISTORY
@@ -1,3 +1,6 @@
+2007-11-26 Arjan Bouter <abouter AT sourcemage.org>
+ * DETAILS: version 2.5.9
+
2007-04-14 Thomas Orgis <sobukus AT sourcemake.org>
* DETAILS: update to version 255
* CONFIGURE,DEPENDS,DETAILS,PRE_BUILD,nss_ldap-context.patch.bz2:
diff --git a/utils/ntp/HISTORY b/utils/ntp/HISTORY
index e6514b9..6c8014d 100644
--- a/utils/ntp/HISTORY
+++ b/utils/ntp/HISTORY
@@ -1,3 +1,6 @@
+2007-11-04 Julien "_kaze_" ROZO <julien AT rozo.org>
+ * TRIGGERS: added, if ntp depends on openssl, then ntp is casted on
openssl update
+
2007-09-18 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 4.2.4p4
disable ftp url, it seems to be blocked
diff --git a/utils/ntp/TRIGGERS b/utils/ntp/TRIGGERS
new file mode 100755
index 0000000..3eb1092
--- /dev/null
+++ b/utils/ntp/TRIGGERS
@@ -0,0 +1,3 @@
+if is_depends_enabled $SPELL openssl; then
+ on_cast openssl check_self
+fi
diff --git a/utils/pciutils/DETAILS b/utils/pciutils/DETAILS
index 215a5c6..c4bbfff 100755
--- a/utils/pciutils/DETAILS
+++ b/utils/pciutils/DETAILS
@@ -1,6 +1,6 @@
SPELL=pciutils
- VERSION=2.2.6
-
SOURCE_HASH=sha512:3e88e04b894bd489b857415b7f4177565d14ed9129394d89de40223f2d9397b4988ad846b959d1c3c01a038da888d191e7d1949a09b4c034ca37abca99428c5e
+ VERSION=2.2.8
+
SOURCE_HASH=sha512:4d8a2fc79520fc9106c83c0e0f4e254e49f959b93c460a26e4f5cbcb70c35f5d13d306d65309ac2300e326bd8a06b575318dd6b79a29e3c58ee86c0924e2dd61
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/$SOURCE
diff --git a/utils/pciutils/HISTORY b/utils/pciutils/HISTORY
index dec6c36..c6bdd80 100644
--- a/utils/pciutils/HISTORY
+++ b/utils/pciutils/HISTORY
@@ -1,3 +1,10 @@
+2007-10-21 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 2.2.8
+
+2007-10-06 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 2.2.7
+ * INSTALL: updated to use "make install-lib"
+
2007-06-21 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 2.2.6

diff --git a/utils/pciutils/INSTALL b/utils/pciutils/INSTALL
index 5f0973a..965702c 100755
--- a/utils/pciutils/INSTALL
+++ b/utils/pciutils/INSTALL
@@ -1,9 +1,3 @@
-make_normal &&
-make install &&
-
-cd lib &&
-make &&
-
-mkdir -p $INSTALL_ROOT/usr/include/pci &&
-cp *.h $INSTALL_ROOT/usr/include/pci &&
-cp libpci.a $INSTALL_ROOT/usr/lib
+make_normal &&
+make install &&
+make install-lib
diff --git a/utils/psmisc/DETAILS b/utils/psmisc/DETAILS
index 1226cc4..e929f97 100755
--- a/utils/psmisc/DETAILS
+++ b/utils/psmisc/DETAILS
@@ -1,6 +1,6 @@
SPELL=psmisc
- VERSION=22.5
-
SOURCE_HASH[0]=sha512:3e5ea300c73093d3822de3244285ee132c8edd29bd83ed512783d97e12732350efc9f365ff7d7f51669689a8ee110bb54f0600a23654f638a6f36d730f2692fd
+ VERSION=22.6
+
SOURCE_HASH[0]=sha512:4eca4231be28f8ed64c0254bae83a9ecb30f583ff113bea949122f708c00828617b9fef0beca1b98579c5e6c9909e463b5537b3c51b8c539ceedd0b1ae5a1aec
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
diff --git a/utils/psmisc/HISTORY b/utils/psmisc/HISTORY
index aacd3bf..3ae2dc6 100644
--- a/utils/psmisc/HISTORY
+++ b/utils/psmisc/HISTORY
@@ -1,3 +1,6 @@
+2007-11-04 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 22.6
+
2007-06-13 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* DEPENDS: added g++ #13836

diff --git a/utils/smartmontools/HISTORY b/utils/smartmontools/HISTORY
index 25ad3cd..23b4704 100644
--- a/utils/smartmontools/HISTORY
+++ b/utils/smartmontools/HISTORY
@@ -1,3 +1,6 @@
+2007-10-02 Julien "_kaze_" ROZO <julien AT rozo.org>
+ * init.d/smartd : added a missing p in "Stopping smartd"
+
2007-01-25 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version bump to 5.37

diff --git a/utils/smartmontools/init.d/smartd
b/utils/smartmontools/init.d/smartd
index b9f98bc..c356099 100755
--- a/utils/smartmontools/init.d/smartd
+++ b/utils/smartmontools/init.d/smartd
@@ -36,7 +36,7 @@ restart() {

stop() {
# reloadproc causes loss of connection when remotely connected
- echo "Stoping smartd..."
+ echo "Stopping smartd..."
if [ -e /var/run/smartd.pid ]; then
kill `cat /var/run/smartd.pid`
sleep 1
diff --git a/utils/strigi/DETAILS b/utils/strigi/DETAILS
index fd001e5..7edf986 100755
--- a/utils/strigi/DETAILS
+++ b/utils/strigi/DETAILS
@@ -1,6 +1,5 @@
SPELL=strigi
# KDEVER=3.92.0
- WEB_SITE=http://www.vandenoever.info/software/strigi/
if [[ "$STRIGI_SVN" == "y" ]]; then
if [[ "$STRIGI_SVN_AUTOUPDATE" == "y" ]]; then
VERSION=$(date +%Y%m%d)
@@ -13,16 +12,16 @@ fi

SOURCE_URL[0]=svn://anonsvn.kde.org/home/kde/trunk//kdesupport/$SPELL:$SPELL
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL
else
- VERSION=0.5.5
-
SOURCE_HASH=sha512:c1ab6ee24016e89a02cfaeeee28141afc829eb6087fb97fc425200f046ab69444621ef8e3ccb92a73bd0e0705e270faac0bbe7616fbe72acd848fa6b47218f9e
+ VERSION=0.5.7
+
SOURCE_HASH=sha512:184f7d40623bc7192dd83703b424f7f9aabc3c40b38745b0ef0d6789675f0b23cb0a4fc326f5c0acd1c149a9bb97386b9d02d5e4232ae6b263869bda6ddcc0ba
SOURCE=$SPELL-$VERSION.tar.bz2
# SOURCE_URL[0]=$KDE_URL/unstable/${KDEVER//.0}/src/$SOURCE
- SOURCE_URL[0]=$WEB_SITE/$SOURCE
+ SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
fi
+ WEB_SITE=http://strigi.sourceforge.net/
LICENSE[0]=LGPL
ENTERED=20070309
- PATCHLEVEL=1
KEYWORDS="search engine"
SHORT="desktop search engine"
cat << EOF
diff --git a/utils/strigi/HISTORY b/utils/strigi/HISTORY
index 7a0a0ae..000812d 100644
--- a/utils/strigi/HISTORY
+++ b/utils/strigi/HISTORY
@@ -1,3 +1,12 @@
+2007-10-30 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.5.7
+ use SOURCEFORGE_URL
+
+2007-10-19 Treeve Jelbert <treeve AT sourcemage.org>
+ * strigi.sh: add /opt/share to XDG_DATA_DIRS, for use by kde4
+ * DETAILS: PATCHLEVEL++
+ new WEB_SITE
+
2007-09-12 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* PPREPARE: ask the autoupdate query only if svn was chosen

diff --git a/utils/strigi/strigi.sh b/utils/strigi/strigi.sh
index 6e3c824..b5da9d4 100755
--- a/utils/strigi/strigi.sh
+++ b/utils/strigi/strigi.sh
@@ -1,3 +1,3 @@
#!/bin/sh
#set environment for using strigi
-export XDG_DATA_DIRS=/usr/share
+export XDG_DATA_DIRS=/usr/share:/opt/share
diff --git a/utils/sudo/DETAILS b/utils/sudo/DETAILS
index de26f0b..fb6ab76 100755
--- a/utils/sudo/DETAILS
+++ b/utils/sudo/DETAILS
@@ -1,5 +1,5 @@
SPELL=sudo
- VERSION=1.6.9p4
+ VERSION=1.6.9p6
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=ftp://ftp.sudo.ws/pub/$SPELL/$SOURCE
diff --git a/utils/sudo/HISTORY b/utils/sudo/HISTORY
index c50bb8e..8784336 100644
--- a/utils/sudo/HISTORY
+++ b/utils/sudo/HISTORY
@@ -1,3 +1,6 @@
+2007-10-13 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: Updated to 1.6.9p6
+
2007-08-16 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: Updated to 1.6.9p4

diff --git a/utils/sudo/sudo-1.6.9p4.tar.gz.sig
b/utils/sudo/sudo-1.6.9p4.tar.gz.sig
deleted file mode 100644
index 5d511df..0000000
Binary files a/utils/sudo/sudo-1.6.9p4.tar.gz.sig and /dev/null differ
diff --git a/utils/sudo/sudo-1.6.9p6.tar.gz.sig
b/utils/sudo/sudo-1.6.9p6.tar.gz.sig
new file mode 100644
index 0000000..b6164bd
Binary files /dev/null and b/utils/sudo/sudo-1.6.9p6.tar.gz.sig differ
diff --git a/utils/usbutils/DETAILS b/utils/usbutils/DETAILS
index 575b8de..1385a41 100755
--- a/utils/usbutils/DETAILS
+++ b/utils/usbutils/DETAILS
@@ -1,12 +1,11 @@
SPELL=usbutils
- VERSION=0.72
+ VERSION=0.73
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$SOURCEFORGE_URL/linux-usb/$SOURCE
-
SOURCE_HASH=sha512:2840deb4fc80f1e57660784782a821624d73860df808ca541cebcfd044b8556e448d8b9b8d2ed7d800caa20fbd202a828263958f7fad1913c12a6e7d32f91de5
+
SOURCE_HASH=sha512:97610f483ed819376dd5a3a4414481651511a5250fd4a6e85a3426a2f9473df6a8dd68fac3a4d6a900e23384652a2399193b870608447accbd0fd0bad339ca24
WEB_SITE=http://www.linux-usb.org/
ENTERED=20021218
- UPDATED=20050720
LICENSE[0]=GPL
KEYWORDS="usb utils"
SHORT="Utilities to manage USB devices"
diff --git a/utils/usbutils/HISTORY b/utils/usbutils/HISTORY
index 9b31a14..36958da 100644
--- a/utils/usbutils/HISTORY
+++ b/utils/usbutils/HISTORY
@@ -1,3 +1,6 @@
+2007-10-24 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 0.73
+
2006-06-28 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: Removed BUILD_API=2, set grimoire-wide

diff --git a/utils/util-linux/DETAILS b/utils/util-linux/DETAILS
index 56e636a..4a7ba1f 100755
--- a/utils/util-linux/DETAILS
+++ b/utils/util-linux/DETAILS
@@ -1,7 +1,7 @@
SPELL=util-linux
if [[ $UTIL_LINUX_NG == y ]]
then
- VERSION=2.13
+ VERSION=2.13.0.1
SOURCE=$SPELL-ng-$VERSION.tar.gz
SOURCE2=$SOURCE.sign
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-ng-$VERSION
diff --git a/utils/util-linux/HISTORY b/utils/util-linux/HISTORY
index e8c73c4..cdc5732 100644
--- a/utils/util-linux/HISTORY
+++ b/utils/util-linux/HISTORY
@@ -1,3 +1,6 @@
+2007-11-01 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: updated version to 2.13.0.1
+
2007-09-13 David Brown <dmlb2000 AT gmail.com>
* PRE_BUILD: added patch for nls and selinux enabled
* util-linux-ng-nls.patch: fix for a little thing with LC_ALL
undefined
diff --git a/utils/vbetool/BUILD b/utils/vbetool/BUILD
index 147ec5f..f2b48df 100755
--- a/utils/vbetool/BUILD
+++ b/utils/vbetool/BUILD
@@ -1,2 +1,9 @@
-LDFLAGS="$LDFLAGS -lz"
+if [[ ${SMGL_COMPAT_ARCHS[1]} == "x86_64" ]]
+then
+ OPTS="--with-x86emu \
+ $OPTS"
+fi &&
+
+LDFLAGS="$LDFLAGS -lz" &&
+
default_build
diff --git a/utils/vbetool/HISTORY b/utils/vbetool/HISTORY
index a3fd184..1be06cd 100644
--- a/utils/vbetool/HISTORY
+++ b/utils/vbetool/HISTORY
@@ -1,2 +1,7 @@
+2007-10-17 Eric Sandall <sandalle AT sourcemage.org>
+ * PRE_BUILD: x86_64 requires CONFIG_IA32_EMULATION
+ * BUILD: Pass --with-x86emu on x86_64
+
2007-04-07 David Brown <dmlb2000 AT gmail.com>
* ALL: created spell
+
diff --git a/utils/vbetool/PRE_BUILD b/utils/vbetool/PRE_BUILD
new file mode 100755
index 0000000..aa12ea3
--- /dev/null
+++ b/utils/vbetool/PRE_BUILD
@@ -0,0 +1,14 @@
+if [[ ${SMGL_COMPAT_ARCHS[1]} == "x86_64" ]]
+then
+ if [[ $(get_kernel_config CONFIG_IA32_EMULATION) != "y" &&
+ $(get_kernel_config CONFIG_IA32_EMULATION) != "m" ]]
+ then
+ message "${PROBLEM_COLOR}You are running x86_64 and need to enable"
\
+ "IA32 emulation support (CONFIG_IA32_EMULATION) in your kernel"
\
+ "for ${SPELL_COLOR}$SPELL${DEFAULT_COLOR}${PROBLEM_COLOR} to"
\
+ "compile.${DEFAULT_COLOR}"
+ return 1
+ fi
+fi &&
+
+default_pre_build
diff --git a/utils/virtualbox-module/BUILD b/utils/virtualbox-module/BUILD
deleted file mode 100755
index 8f58e6d..0000000
--- a/utils/virtualbox-module/BUILD
+++ /dev/null
@@ -1 +0,0 @@
-make
diff --git a/utils/virtualbox-module/DETAILS b/utils/virtualbox-module/DETAILS
deleted file mode 100755
index 9c4b0ea..0000000
--- a/utils/virtualbox-module/DETAILS
+++ /dev/null
@@ -1,14 +0,0 @@
- SPELL=virtualbox-module
- VERSION=1.5.0
- SOURCE=vbox-kernel-module-src-$VERSION.tar.gz
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/vboxdrv
- SOURCE_URL[0]=http://www.virtualbox.org/download/$VERSION/$SOURCE
-
SOURCE_HASH=sha512:57c441b359ecce5ac9b506118c163c06c4762a8b035386465a02f54c5dc5af289f4703d363599c24747d83e6c1101635366c30bbed3d1fdb18df0ff8aba929cd
- LICENSE[0]=GPL
- WEB_SITE=http://www.virtualbox.org/
- ENTERED=20070613
- KEYWORDS="utils"
- SHORT="VirtualBox kernel module"
-cat << EOF
-VirtualBox kernel module.
-EOF
diff --git a/utils/virtualbox-module/HISTORY b/utils/virtualbox-module/HISTORY
deleted file mode 100644
index 8f2086c..0000000
--- a/utils/virtualbox-module/HISTORY
+++ /dev/null
@@ -1,6 +0,0 @@
-2007-09-03 Ladislav Hagara <hgr AT vabo.cz>
- * DETAILS: 1.5.0
-
-2007-06-13 Ladislav Hagara <hgr AT vabo.cz>
- * DETAILS, BUILD: created this spell, version 1.4.0
-
diff --git a/utils/virtualbox/DEPENDS b/utils/virtualbox/DEPENDS
index 73ac4d8..0d8a68c 100755
--- a/utils/virtualbox/DEPENDS
+++ b/utils/virtualbox/DEPENDS
@@ -1,5 +1,5 @@
depends virtualbox-module &&
depends qt-x11 &&
-depends LD86 &&
+depends dev86 &&
depends iasl &&
depends xalan-c
diff --git a/utils/virtualbox/DETAILS b/utils/virtualbox/DETAILS
index 47e4f57..0ab35ce 100755
--- a/utils/virtualbox/DETAILS
+++ b/utils/virtualbox/DETAILS
@@ -1,9 +1,9 @@
SPELL=virtualbox
- VERSION=1.5.0
+ VERSION=1.5.2
SOURCE=VirtualBox-${VERSION}_OSE.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/VirtualBox-${VERSION}_OSE
SOURCE_URL[0]=http://www.virtualbox.org/download/$VERSION/$SOURCE
-
SOURCE_HASH=sha512:1d5b0eb9cdc005619f87bd506ca49351650793d3a5ec3676fc9f3563852c558985b3d144f6a388d75364b96c1ae109421c3a4afaf1b476dc1bc43b05e3089130
+
SOURCE_HASH=sha512:eafce674f0eb0ed59a964388b2dff8be240e85c15c47b649a6e7e9ed072ec66a1970e1b7f095be4ca39ec1e83da36b6dc42e1ab4c2eef129e453e9e864589300
LICENSE[0]=GPL
WEB_SITE=http://www.virtualbox.org/
ENTERED=20070612
diff --git a/utils/virtualbox/HISTORY b/utils/virtualbox/HISTORY
index e43dc9f..4f61f2b 100644
--- a/utils/virtualbox/HISTORY
+++ b/utils/virtualbox/HISTORY
@@ -1,5 +1,5 @@
-2007-09-16 Bearcat M. Sandor <sourcemage AT feline-soul.com>
- * DEPENDS: Changed dev86 to LD86
+2007-10-19 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 1.5.2

2007-09-03 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.5.0, updated SOURCE and SOURCE_DIRECTORY
diff --git a/utils/vlock/BUILD b/utils/vlock/BUILD
index 8f58e6d..29ea58e 100755
--- a/utils/vlock/BUILD
+++ b/utils/vlock/BUILD
@@ -1 +1,5 @@
-make
+if is_depends_enabled $SPELL linux-pam; then
+ make PREFIX="$INSTALL_ROOT/usr" AUTH_METHOD=pam USE_PAM=y
+else
+ make PREFIX="$INSTALL_ROOT/usr" AUTH_METHOD=shadow USE_PAM=n
+fi
diff --git a/utils/vlock/DEPENDS b/utils/vlock/DEPENDS
index 59c8634..5c38206 100755
--- a/utils/vlock/DEPENDS
+++ b/utils/vlock/DEPENDS
@@ -1,16 +1,9 @@
optional_depends linux-pam "YES_PAM" "NO_PAM" \
"use pam for authentication and disable native shadow support" &&
-# only in devel sorcery (?)
-if declare -f is_depends_enabled &> /dev/null
+
+# only ask if no pam selected
+if ! is_depends_enabled $SPELL linux-pam
then
- # only ask if no pam selected
- if ! is_depends_enabled $SPELL linux-pam
- then
- config_query VLOCK_SUID \
- "Set vlock binary suid root for non-root users and shadow passwords?" n
- fi
-else
- # always ask, even if meaningless
config_query VLOCK_SUID \
- "Set vlock binary suid root for non-root users and shadow passwords (not
with pam)?" n
+ "Set vlock binary suid root for non-root users and shadow passwords?" n
fi
diff --git a/utils/vlock/DETAILS b/utils/vlock/DETAILS
index 35d0271..87b4140 100755
--- a/utils/vlock/DETAILS
+++ b/utils/vlock/DETAILS
@@ -1,21 +1,16 @@
SPELL=vlock
- VERSION=1.3
+ VERSION=2.1
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- SOURCE_URL[0]=ftp://tsx-11.mit.edu/pub/linux/sources/usr.bin/$SOURCE
- WEB_SITE=http://freshmeat.net/projects/vlock/
+ SOURCE_URL[0]=http://cthulhu.c3d2.de/~toidinamai/vlock/archive/$SOURCE
+ WEB_SITE=http://cthulhu.c3d2.de/~toidinamai/vlock/vlock.html
SOURCE_GPG=gurus.gpg:$SOURCE.sig
ENTERED=20020815
- UPDATED=20030810
- PATCHLEVEL=1
KEYWORDS="utils"
SHORT="vlock locks virtual consoles, as well as normal TTYs."
-
cat << EOF
-
vlock locks virtual consoles, as well as normal TTYs. It can prevent console
switching, and it supports PAM authentication by default. Ideal for work
environments, lan parties, or anywhere you'll want to be able to walk away
from
your computer while leaving things running.
-
EOF
diff --git a/utils/vlock/HISTORY b/utils/vlock/HISTORY
index a6254b9..5ae1df3 100644
--- a/utils/vlock/HISTORY
+++ b/utils/vlock/HISTORY
@@ -1,3 +1,11 @@
+2007-11-05 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * PRE_BUILD: removed
+ * BUILD: pass some flags to make it build
+ * INSTALL: use make install, it works now
+ * DETAILS: Fixed SOURCE_URL[0]
+ fixed WEB_SITE
+ updated spell to 2.1
+
2006-10-19 Thomas Orgis <sobukus AT sourcemage.org>
* DEPENDS, PRE_BUILD, INSTALL: added optional suid install and
added $INSTALL_ROOT in INSTALL, removed some question marks
diff --git a/utils/vlock/INSTALL b/utils/vlock/INSTALL
index 5a0f2f8..3bb7287 100755
--- a/utils/vlock/INSTALL
+++ b/utils/vlock/INSTALL
@@ -1,7 +1,5 @@
-install vlock "$INSTALL_ROOT/usr/bin" &&
+make install PREFIX="$INSTALL_ROOT/usr" &&
if [[ "$VLOCK_SUID" == "y" ]]
then
chmod u+s "$INSTALL_ROOT/usr/bin/vlock"
-fi &&
-gzip -9 vlock.1 &&
-install vlock.1.gz "$INSTALL_ROOT/usr/share/man/man1"
+fi
diff --git a/utils/vlock/PRE_BUILD b/utils/vlock/PRE_BUILD
deleted file mode 100755
index e81e5bb..0000000
--- a/utils/vlock/PRE_BUILD
+++ /dev/null
@@ -1,11 +0,0 @@
-default_pre_build &&
-cd $SOURCE_DIRECTORY &&
-sedit "s/-O2/$CFLAGS/" Makefile &&
-if list_find "$OPTS" "NO_PAM"
-then
- message "seding Makefile to disable PAM and enable shadow" &&
- # shadow code in vlock conflicts with pam code
- # but it's fine with or without shadow passwords and current glibc
- sedit 's/^\(CFLAGS =.*\)-DUSE_PAM/\1 -DSHADOW_PWD/' Makefile &&
- sedit 's/^\(LDFLAGS =.*\)-ldl -lpam -lpam_misc/\1-lcrypt/' Makefile
-fi
diff --git a/utils/vlock/vlock-1.3.tar.gz.sig
b/utils/vlock/vlock-1.3.tar.gz.sig
deleted file mode 100644
index c9688ba..0000000
Binary files a/utils/vlock/vlock-1.3.tar.gz.sig and /dev/null differ
diff --git a/utils/vlock/vlock-2.1.tar.gz.sig
b/utils/vlock/vlock-2.1.tar.gz.sig
new file mode 100644
index 0000000..91216f1
Binary files /dev/null and b/utils/vlock/vlock-2.1.tar.gz.sig differ
diff --git a/utils/watchdog/BUILD b/utils/watchdog/BUILD
deleted file mode 100755
index d3cea88..0000000
--- a/utils/watchdog/BUILD
+++ /dev/null
@@ -1,3 +0,0 @@
- patch -p1 < $SCRIPT_DIRECTORY/watchdog-gcc3.patch &&
-
- default_build
diff --git a/utils/watchdog/DETAILS b/utils/watchdog/DETAILS
index 686d535..3438dbe 100755
--- a/utils/watchdog/DETAILS
+++ b/utils/watchdog/DETAILS
@@ -1,5 +1,5 @@
SPELL=watchdog
- VERSION=5.2
+ VERSION=5.4
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION

SOURCE_URL[0]=http://www.ibiblio.org/pub/Linux/system/daemons/$SPELL/$SOURCE
@@ -7,11 +7,10 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION

SOURCE_URL[2]=ftp://ftp.cse.cuhk.edu.hk/pub1/Linux/system/daemons/$SPELL/$SOURCE

SOURCE_URL[3]=ftp://ftp.fee.vutbr.cz/pub/systems/linux/current/system/daemons/$SPELL/$SOURCE

SOURCE_URL[4]=ftp://ftp.uni-jena.de/pub/linux/MIRROR.sunsite/system/daemons/$SPELL/$SOURCE
-
SOURCE_HASH=sha512:6229e9c2ababf8067a34620c4cd25a87519cbb61d849bcaabca361b52b668db20969402ee35ed4301c6113795e3d0f189f07145467a1d673ab15f85a5cccbe6c
+
SOURCE_HASH=sha512:f4af5802eee0b2d5c70a7650587a543d0a9ce5a301213b20cd0ac2c5d8c3cc526d6606b2b746e065342f05e1bd1952987062bc468c6a3795c52200ef6f9c0ad6
LICENSE[0]=GPL

WEB_SITE=http://www.gnu.org/directory/System_administration/monitor/watchdog.html
ENTERED=20030731
- UPDATED=20030822
KEYWORDS="utils"
SHORT="A software watchdog daemon"
cat << EOF
diff --git a/utils/watchdog/HISTORY b/utils/watchdog/HISTORY
index 38b3272..c883ef3 100644
--- a/utils/watchdog/HISTORY
+++ b/utils/watchdog/HISTORY
@@ -1,3 +1,15 @@
+2007-10-23 Pol Vinogradov <vin.public AT gmail.com>
+ * DETAILS: updated to 5.4
+ * BUILD, watchdog-gcc33.patch: removed, not needed anymore
+
+2007-10-21 Pol Vinogradov <vin.public AT gmail.com>
+ * init.d/watchdog: fixed paths for devices files, make
+ /dev/temperature existance check optional, added -f key to lns
+
+2007-10-20 Pol Vinogradov <vin.public AT gmail.com>
+ * DETAILS: removed UPDATED, PATCHLEVEL++
+ * watchdog-gcc3.patch: updated so it builds with gcc 4.x
+
2006-06-28 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: Removed BUILD_API=2, set grimoire-wide

diff --git a/utils/watchdog/init.d/watchdog b/utils/watchdog/init.d/watchdog
index 0fb7e2c..e1de559 100644
--- a/utils/watchdog/init.d/watchdog
+++ b/utils/watchdog/init.d/watchdog
@@ -12,13 +12,12 @@ NEEDS="+remote_fs"
start()
{
echo "Starting watchdog..."
- . /etc/sysconfig/devices
- if ! ([ -e $DEVICES/misc/watchdog ] && [ -e $DEVICES/misc/temperature ]);
then
+ if [ -e /dev/misc/watchdog ] || [ -e /dev/misc/temperature ]; then
+ [ -e /dev/watchdog ] || ln -sf $DEVICES/misc/watchdog /dev/watchdog
+ [ -e /dev/temperature ] || ln -sf $DEVICES/misc/temperature
/dev/temperature
+ else
echo "No watchdog support in the kernel!"
exit 5
- else
- [ -e /dev/watchdog ] || ln -s $DEVICES/misc/watchdog /dev/watchdog
- [ -e /dev/temperature ] || ln -s $DEVICES/misc/temperature
/dev/temperature
fi
loadproc $PROGRAM $ARGS
}
diff --git a/utils/watchdog/watchdog-gcc3.patch
b/utils/watchdog/watchdog-gcc3.patch
deleted file mode 100644
index aec2700..0000000
--- a/utils/watchdog/watchdog-gcc3.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -Nur watchdog-5.2-orig/include/sundries.h
watchdog-5.2/include/sundries.h
---- watchdog-5.2-orig/include/sundries.h 1998-09-10 17:19:11.000000000
+0200
-+++ watchdog-5.2/include/sundries.h 2003-07-31 01:40:07.000000000 +0200
-@@ -51,7 +51,7 @@
- #if defined(__GNUC_MINOR__) && __GNUC__ == 2 && __GNUC_MINOR__ >= 5
- void die (int errcode, const char *fmt, ...) __attribute__ ((noreturn));
- #else /* GNUC < 2.5 */
--void volatile die (int errcode, const char *fmt, ...);
-+void die (int errcode, const char *fmt, ...);
- #endif /* GNUC < 2.5 */
- #else /* !__GNUC__ */
- void die (int errcode, const char *fmt, ...);
-diff -Nur watchdog-5.2-orig/src/quotactl.c watchdog-5.2/src/quotactl.c
---- watchdog-5.2-orig/src/quotactl.c 1999-09-09 11:03:06.000000000 +0200
-+++ watchdog-5.2/src/quotactl.c 2003-07-31 01:40:26.000000000 +0200
-@@ -34,6 +34,7 @@
- return syscall(__NR_quotactl, cmd, special, id, addr);
- }
- #else
-+#include <errno.h>
- #include <sys/types.h>
- #define __LIBRARY__
- #include <linux/unistd.h>
diff --git a/utils/which/DETAILS b/utils/which/DETAILS
index 73f3add..023c004 100755
--- a/utils/which/DETAILS
+++ b/utils/which/DETAILS
@@ -1,7 +1,7 @@
SPELL=which
- VERSION=2.16
+ VERSION=2.18
SOURCE=$SPELL-$VERSION.tar.gz
-
SOURCE_HASH=sha512:a058a0c4b97442954164e8386fc67303e3982506b3e6280a69706ac4e3d6445f077d0079be6c2e075840fcb87058d79d988a8e39237f937c9da664bb6b8da12b
+
SOURCE_HASH=sha512:c88b586d431a87e842280d4b18b3156c31444da43753489491714ffb4f80ef849b2ebd3a2787ab9375e9e0b908ce2440b542f2c3d828ea4a30b49ffcdf3e3e3d
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$GNU_URL/$SPELL/$SOURCE
SOURCE_URL[1]=ftp://ftp.gnu.org/pub/gnu/$SPELL/$SOURCE
diff --git a/utils/which/HISTORY b/utils/which/HISTORY
index bf1ce61..18f7563 100644
--- a/utils/which/HISTORY
+++ b/utils/which/HISTORY
@@ -1,3 +1,6 @@
+2007-10-30 Elisamuel Resto <ryuji AT mages.ath.cx>
+ * DETAILS" version bump 2.16 -> 2.18
+
2006-06-28 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: Removed BUILD_API=2, set grimoire-wide

diff --git a/utils/wtf/DETAILS b/utils/wtf/DETAILS
index b360a06..ada7640 100755
--- a/utils/wtf/DETAILS
+++ b/utils/wtf/DETAILS
@@ -1,9 +1,9 @@
SPELL=wtf
- VERSION=20051104
+ VERSION=20071004
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://www.mu.org/~mux/wtf/$SOURCE
-
SOURCE_HASH=sha512:5d9d1d55778f52578322091ff587c24fa9141b6d59f389b1e8a38888e305dd0400fd6083eb77760d382827aff3e473c2b48681eb4464e8fadf7aed3eb07da417
+
SOURCE_HASH=sha512:389f5452f128a4a2811ce5a1121e2465f2ee8902bb7bbd0a6a0699dae19c21dc0bc98bb59d59bbfae5861bb5987fca0a7dbb7ebe01fe041936983c9ed4df1a67
WEB_SITE=http://www.mu.org/~mux/wtf/
ENTERED=20050831
LICENSE=PD
diff --git a/utils/wtf/HISTORY b/utils/wtf/HISTORY
index 8846592..5b118c7 100644
--- a/utils/wtf/HISTORY
+++ b/utils/wtf/HISTORY
@@ -1,3 +1,6 @@
+2007-10-15 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 20071004
+
2006-10-03 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: [automated] Removed UPDATED.

diff --git a/video-libs/avifile/BUILD b/video-libs/avifile/BUILD
index 8ce3616..7c7240b 100755
--- a/video-libs/avifile/BUILD
+++ b/video-libs/avifile/BUILD
@@ -1,4 +1,6 @@
# needed for xvid detection
LDFLAGS="$LDFLAGS -lm" &&
disable_pic &&
+# disable qt stuff, doesn't work with the gcc34/gcc4 combination
+OPTS="--without-qt $OPTS" &&
default_build
diff --git a/video-libs/avifile/DEPENDS b/video-libs/avifile/DEPENDS
index 1fc8d74..c740ed9 100755
--- a/video-libs/avifile/DEPENDS
+++ b/video-libs/avifile/DEPENDS
@@ -1,10 +1,5 @@
depends gcc34 &&

-optional_depends qt-x11 \
- "" \
- "--without-qt" \
- "for aviplay" &&
-
optional_depends win32codecs \
"" \
"" \
diff --git a/video-libs/avifile/HISTORY b/video-libs/avifile/HISTORY
index 41229e3..1e7e10c 100644
--- a/video-libs/avifile/HISTORY
+++ b/video-libs/avifile/HISTORY
@@ -1,3 +1,8 @@
+2007-12-01 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * PRE_BUILD: remove player and samples from the build as they don't
+ compile/link anymore, fixes bug #14148
+ * DEPENDS, BUILD: remove qt-x11 support, doesn't link anymore
+
2007-04-29 John Harding <johnh AT kuberaconsulting.com>
* BUILD: added disable_pic at ruskie's suggestion
when it wouldn't compile here. It worked.
diff --git a/video-libs/avifile/PRE_BUILD b/video-libs/avifile/PRE_BUILD
index ad15d9f..8643360 100755
--- a/video-libs/avifile/PRE_BUILD
+++ b/video-libs/avifile/PRE_BUILD
@@ -2,4 +2,7 @@ default_pre_build &&
cd $SOURCE_DIRECTORY &&
# fix the pkgconfig file, avifile install header to include/avifile-0.7,
# not include/avifile
-sedit 's:\(@includedir@/avifile\):\1-0.7:' avifile.pc.in
+sedit 's:\(@includedir@/avifile\):\1-0.7:' avifile.pc.in &&
+# remove player and samples from the build, they both fail due to issues
+# with newer gcc versions
+sedit 's:player samples::' Makefile.in
diff --git a/video-libs/libquicktime/DETAILS b/video-libs/libquicktime/DETAILS
index 0cd0e40..e6974c9 100755
--- a/video-libs/libquicktime/DETAILS
+++ b/video-libs/libquicktime/DETAILS
@@ -1,6 +1,6 @@
SPELL=libquicktime
- VERSION=1.0.0
-
SOURCE_HASH=sha512:150461a7aaf3bde9b3b1110cf34228d4187e9297a04922ca67fd29a8fec66698f533f7a0df8558459846587a7a6e8f07a394cac4fe72a3790d03dddb08e401ba
+ VERSION=1.0.1
+
SOURCE_HASH=sha512:da1090d0e8d65461e7e64e65deb52ad175a57e3db0e9ea3fe5663e27f0eebeba4997f5b6c15df77df4daf9c149040e9806e0c16012e18663bb0b0b3b0454100a
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=${SOURCEFORGE_URL}/libquicktime/${SOURCE}
diff --git a/video-libs/libquicktime/HISTORY b/video-libs/libquicktime/HISTORY
index 2350782..8c61b10 100644
--- a/video-libs/libquicktime/HISTORY
+++ b/video-libs/libquicktime/HISTORY
@@ -1,3 +1,6 @@
+2007-10-14 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.0.1
+
2007-04-17 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.0.0

diff --git a/video-libs/unicap/DETAILS b/video-libs/unicap/DETAILS
index 39d9589..b85c4c3 100755
--- a/video-libs/unicap/DETAILS
+++ b/video-libs/unicap/DETAILS
@@ -1,10 +1,10 @@
SPELL=unicap
- VERSION=0.2.13
+ VERSION=0.2.17
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
SOURCE_URL[1]=http://unicap-imaging.org/downloads/$SOURCE
-
SOURCE_HASH=sha512:de481c036f87748a6660a5047b2dde980a21963c6b437353c63e399e76c4c7bf5b0644a97c7ac208fbc5aaafa9cb5aea2e3a8c284a32ee2ebc0d0a3fe7be0322
+
SOURCE_HASH=sha512:af65309db5c01992dd193a49370521defd95d23591b5109d6d6d9dea8dfd3293fc2e871fed1a683fd09cede0a09870e1c2f7aa158cfe550acca7be7d6b5d91ee
WEB_SITE=http://unicap-imaging.org/
ENTERED=20070515
LICENSE[0]=GPL
diff --git a/video-libs/unicap/HISTORY b/video-libs/unicap/HISTORY
index c5bb761..dc35a3a 100644
--- a/video-libs/unicap/HISTORY
+++ b/video-libs/unicap/HISTORY
@@ -1,3 +1,6 @@
+2007-10-14 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 0.2.17
+
2007-08-06 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 0.2.13

diff --git a/video-libs/x264/DETAILS b/video-libs/x264/DETAILS
index 1acc3c8..35b131e 100755
--- a/video-libs/x264/DETAILS
+++ b/video-libs/x264/DETAILS
@@ -1,6 +1,6 @@
SPELL=x264
- VERSION=20070821-2245
-
SOURCE_HASH=sha512:0a8526050950cef58b873d1ebb1d7967b9f231f0fc0d0ff7bbd1ac5bc14d6c66714ea32f9cd880883db51a7ca28784c6eb707749580a1039c065c20c87c63a14
+ VERSION=20071104-2245
+
SOURCE_HASH=sha512:110558e36588ff9674a139d912e320e458e609a1abaab27c7352c9f05a2cc57ed873e58b28eed7a5528c8e800bc83693d3e15f0b27d17f99e5a18a9b274d924c
SOURCE=$SPELL-snapshot-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-snapshot-$VERSION
SOURCE_URL[0]=ftp://ftp.videolan.org/pub/videolan/x264/snapshots/$SOURCE
diff --git a/video-libs/x264/HISTORY b/video-libs/x264/HISTORY
index f85bc26..0578a42 100644
--- a/video-libs/x264/HISTORY
+++ b/video-libs/x264/HISTORY
@@ -1,3 +1,6 @@
+2007-11-05 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 20071104-2245
+
2007-08-22 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 20070821-2245

diff --git a/video-libs/xine-lib/DEPENDS b/video-libs/xine-lib/DEPENDS
index 8b7ef37..fb9b599 100755
--- a/video-libs/xine-lib/DEPENDS
+++ b/video-libs/xine-lib/DEPENDS
@@ -6,9 +6,18 @@ optional_depends X11-LIBS \
"To support X display" &&

# output devices
-optional_depends "alsa-lib" "" "" "for ALSA audio output" &&
+optional_depends "alsa-lib" \
+ "--with-alsa" \
+ "--without-alsa" \
+ "for ALSA audio output" &&
+
optional_depends "esound" "" "" "for esd audio output" &&
-optional_depends "arts" "" "" "for arts audio output" &&
+optional_depends "arts" \
+ "--with-arts" \
+ "--without-arts" \
+ "for arts audio output" &&
+
+optional_depends "pulseaudio" "" "" "for pulseaudio output" &&
optional_depends "aalib" "" "" "for ascii art video output" &&
optional_depends "sdl" "" "" "for SDL video output" &&
optional_depends "libcaca" "" "" "for colored ascii art video output" &&
diff --git a/video-libs/xine-lib/HISTORY b/video-libs/xine-lib/HISTORY
index c70d9e9..9c203c6 100644
--- a/video-libs/xine-lib/HISTORY
+++ b/video-libs/xine-lib/HISTORY
@@ -1,3 +1,11 @@
+2007-11-09 Treeve Jelbert <treeve AT sourcemage.org>
+ * PRE_BUILD: insert limits.h in src/input/vcd/libcdio/_cdio_linux.c
+ fixes bug #14090
+ * DEPENDS: add some explicit on/off options
+
+2007-10-16 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * DEPENDS: added optional_depends on pulseaudio
+
2007-08-27 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.1.8

diff --git a/video-libs/xine-lib/PRE_BUILD b/video-libs/xine-lib/PRE_BUILD
index bd2e595..8f391dd 100755
--- a/video-libs/xine-lib/PRE_BUILD
+++ b/video-libs/xine-lib/PRE_BUILD
@@ -1,6 +1,6 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&
-
+sed -i "32i#include <limits.h>" src/input/vcd/libcdio/_cdio_linux.c &&
# fix a typo (missing quoting) so detection of ffmpeg-cvs works correctly
# compiles but fails to run otherwise
sedit 's/x$FFMPEG_POSTPROC_LIBS/"\0"/' configure &&
diff --git a/video/camorama/DETAILS b/video/camorama/DETAILS
index 026258d..763e385 100755
--- a/video/camorama/DETAILS
+++ b/video/camorama/DETAILS
@@ -1,9 +1,9 @@
SPELL=camorama
- VERSION=0.18
+ VERSION=0.19
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- SOURCE_URL[0]=http://camorama.fixedgear.org/downloads/$SOURCE
-
SOURCE_HASH=sha512:3fd46ea3aa6a0e4c8bd2670a00fd25324811de77515e6a23c37a53bc1e7068a1cc1a6333fa12e061b0b12657c146e4ae38abfe3644550a34245a4c9441772c37
+
SOURCE_URL[0]=http://ftp.gnome.org/pub/GNOME/sources/$SPELL/$VERSION/$SOURCE
+
SOURCE_HASH=sha512:efdbe3cdf90a4f4a39b02f141395431c24ac2a7a56ef7faa75b38ae145cdc33f3748daca6bf33a4fa21549b7fef0e7e26d135fd265906e0531e2638739492689
WEB_SITE=http://camorama.fixedgear.org/
ENTERED=20070806
LICENSE[0]=GPL
diff --git a/video/camorama/HISTORY b/video/camorama/HISTORY
index d2e129f..6c5f20f 100644
--- a/video/camorama/HISTORY
+++ b/video/camorama/HISTORY
@@ -1,3 +1,7 @@
+2007-10-14 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 0.19, new SOURCE_URL[0]
+ * PRE_BUILD: removed
+
2007-08-06 Ladislav Hagara <hgr AT vabo.cz>
* PRE_BUILD, DEPENDS, DETAILS: created this spell, version 0.18

diff --git a/video/camorama/PRE_BUILD b/video/camorama/PRE_BUILD
deleted file mode 100755
index f331d46..0000000
--- a/video/camorama/PRE_BUILD
+++ /dev/null
@@ -1,4 +0,0 @@
-default_pre_build &&
-cd $SOURCE_DIRECTORY &&
-
-sedit 's:GNOMELOCALEDIR:PACKAGE_LOCALE_DIR:' src/main.c
diff --git a/video/ffmpeg-svn/300_c++_compliant_headers.diff
b/video/ffmpeg-svn/300_c++_compliant_headers.diff
new file mode 100644
index 0000000..a209c4d
--- /dev/null
+++ b/video/ffmpeg-svn/300_c++_compliant_headers.diff
@@ -0,0 +1,19 @@
+Index: ffmpeg-0.cvs20070307/libavcodec/avcodec.h
+===================================================================
+--- ffmpeg-0.cvs20070307.orig/libavcodec/avcodec.h 2007-03-29
22:22:06.000000000 +0200
++++ ffmpeg-0.cvs20070307/libavcodec/avcodec.h 2007-03-29 22:23:03.000000000
+0200
+@@ -34,6 +34,14 @@
+ #include "avutil.h"
+ #include <sys/types.h> /* size_t */
+
++#if !defined INT64_C
++#if defined __WORDSIZE && __WORDSIZE == 64
++#define INT64_C(c) c ## L
++#else
++#define INT64_C(c) c ## LL
++#endif
++#endif
++
+ #define AV_STRINGIFY(s) AV_TOSTRING(s)
+ #define AV_TOSTRING(s) #s
+
diff --git a/video/ffmpeg-svn/BUILD b/video/ffmpeg-svn/BUILD
index 5f5ff83..37facfd 100755
--- a/video/ffmpeg-svn/BUILD
+++ b/video/ffmpeg-svn/BUILD
@@ -1,9 +1,11 @@
CFLAGS="${CFLAGS/-funroll-loops/} -O3"
disable_pic &&

-if [ $FFAMR != none ];then
- OPTS="--enable-$FFAMR $OPTS"
-fi &&
+#if [ $FFAMR != none ];then
+# OPTS="--enable-lib$FFAMR $FFMPEG_SWSCALE $OPTS"
+#fi &&
+
+OPTS="$FFMPEG_SWSCALE $OPTS" &&

./configure --prefix=${INSTALL_ROOT}/usr \
--mandir=${INSTALL_ROOT}/usr/share/man \
diff --git a/video/ffmpeg-svn/CONFIGURE b/video/ffmpeg-svn/CONFIGURE
new file mode 100755
index 0000000..98c253d
--- /dev/null
+++ b/video/ffmpeg-svn/CONFIGURE
@@ -0,0 +1,3 @@
+default_configure &&
+config_query_option FFMPEG_SWSCALE 'enable software scaler support?' y \
+ '--enable-swscaler' '--disable-swscaler'
diff --git a/video/ffmpeg-svn/DEPENDS b/video/ffmpeg-svn/DEPENDS
index 5c66786..bc02b9e 100755
--- a/video/ffmpeg-svn/DEPENDS
+++ b/video/ffmpeg-svn/DEPENDS
@@ -8,7 +8,7 @@ optional_depends "lame" \
"" \
"for mp3 encoding via libmp3lame" &&
optional_depends "libvorbis" \
- "--enable-libogg --enable-libvorbis" \
+ "--enable-libvorbis" \
"" \
"for ogg/vorbis support" &&
optional_depends "faad2" \
diff --git a/video/ffmpeg-svn/DETAILS b/video/ffmpeg-svn/DETAILS
index e469bef..b8fcd6a 100755
--- a/video/ffmpeg-svn/DETAILS
+++ b/video/ffmpeg-svn/DETAILS
@@ -9,29 +9,25 @@ fi
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL
SOURCE_URL[0]=svn://svn.mplayerhq.hu/ffmpeg/trunk:$SPELL
SOURCE_IGNORE=volatile
-case $FFAMR in
- none);;
- *)
+#case $FFAMR in
+# none);;
+# *)
# amr_nb)
- VERSION2=26104-610
- SOURCE2=$VERSION2.zip
-SOURCE2_URL[0]=http://www.3gpp.org/ftp/Specs/archive/26_series/26.104/$SOURCE2
-
SOURCE2_HASH=sha512:2ab3c1be43b17b655674b93a17b3ebcf3b95a6483bf9c2177dc00dd2a2f2802cb6685e679982cb0edefce90bb854c7842be324d5f1bd17cf0d349f9c737c2d68
-# amr_nb-fixed)
- VERSION3=26073-600
- SOURCE3=$VERSION3.zip
-SOURCE3_URL[0]=http://www.3gpp.org/ftp/Specs/archive/26_series/26.073/$SOURCE3
-
SOURCE3_HASH=sha512:db9a7f5514d1a4a27062720f8ba5357f89cc6953c81b5b09defb37469e9a0b1195e9722d7b415152ad9642e1b1d7dddfd4e739bfc42b0c2fa6094d44faa50cde
+# VERSION2=26104-610
+# SOURCE2=$VERSION2.zip
+#SOURCE2_URL[0]=http://www.3gpp.org/ftp/Specs/archive/26_series/26.104/$SOURCE2
+#
SOURCE2_HASH=sha512:2ab3c1be43b17b655674b93a17b3ebcf3b95a6483bf9c2177dc00dd2a2f2802cb6685e679982cb0edefce90bb854c7842be324d5f1bd17cf0d349f9c737c2d68
# amr_wb)
- VERSION4=26204-600
- SOURCE4=$VERSION4.zip
-SOURCE4_URL[0]=http://www.3gpp.org/ftp/Specs/archive/26_series/26.204/$SOURCE4
-
SOURCE4_HASH=sha512:fe7c4a6cc669345d2857df7a056dc62b28d076afb06f3184f26deb2ebc6da5222be38e532b0cb5493b33b387bda39348f532fd02f16387ccd8564ea0e3f2c948
- ;;
-esac
+# VERSION3=26204-600
+# SOURCE3=$VERSION4.zip
+#SOURCE3_URL[0]=http://www.3gpp.org/ftp/Specs/archive/26_series/26.204/$SOURCE4
+#
SOURCE3_HASH=sha512:fe7c4a6cc669345d2857df7a056dc62b28d076afb06f3184f26deb2ebc6da5222be38e532b0cb5493b33b387bda39348f532fd02f16387ccd8564ea0e3f2c948
+# ;;
+#esac
WEB_SITE=http://ffmpeg.sourceforge.net
ENTERED=20030514
LICENSE[0]=GPL
+ PATCHLEVEL=1
STAGED_INSTALL=off
KEYWORDS="video"
SHORT="ffmpeg is complete video and audio broadcasting solution"
diff --git a/video/ffmpeg-svn/HISTORY b/video/ffmpeg-svn/HISTORY
index e4de220..99cc8d1 100644
--- a/video/ffmpeg-svn/HISTORY
+++ b/video/ffmpeg-svn/HISTORY
@@ -1,3 +1,22 @@
+2007-11-19 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * PREPARE, DETAILS: removed amr-nb-fixed, not supported anymore
+ * BUILD, DETAILS, PREPARE, PRE_BUILD: commented out the whole amr
+ stuff as it requires the real libs now which we don't have
+ * BUILD: always pass the swscale options, not only if amr is enabled
+
+2007-11-17 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * PRE_BUILD, 300_c++_compliant_headers.diff: added small patch
+ from debian to make the headers C++ compliant.
+
+2007-11-14 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * DEPENDS: removed --enable-libogg switch from vorbis support,
+ it's not there anymore
+
+2007-09-02 Arjan Bouter <abouter AT sourcemage.org>
+ * CONFIGURE: added a question for libswscale
+ * BUILD: added swscale option to OPTS
+ * DETAILS: patchlevel++
+
2007-08-30 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
* DEPENDS: sync options with normal ffmpeg spell
forgot to recheck some stuff
diff --git a/video/ffmpeg-svn/PREPARE b/video/ffmpeg-svn/PREPARE
index 7a16e1a..91728c5 100755
--- a/video/ffmpeg-svn/PREPARE
+++ b/video/ffmpeg-svn/PREPARE
@@ -1,3 +1,6 @@
persistent_read ffmpeg-cvs FFMPEG_CVS_AUTOUPDATE DEFAULT
config_query FFMPEG_SVN_AUTOUPDATE "Update to the latest SVN on every cast?"
${DEFAULT:-n}
-config_query_list FFAMR "which AMR codec?" none amr_nb amr_nb-fixed amr_wb
+#if [[ $FFAMR == amr-nb-fixed ]]; then
+# FFAMR=amr-nb
+#fi &&
+#config_query_list FFAMR "which AMR codec?" none amr-nb amr-nb-fixed amr-wb
diff --git a/video/ffmpeg-svn/PRE_BUILD b/video/ffmpeg-svn/PRE_BUILD
index 133962c..1099b3a 100755
--- a/video/ffmpeg-svn/PRE_BUILD
+++ b/video/ffmpeg-svn/PRE_BUILD
@@ -2,22 +2,22 @@ default_pre_build &&
cd $SOURCE_DIRECTORY &&
sedit 's:-lpostproc:-Llibpostproc -lpostproc:' libavcodec/Makefile &&
sedit 's:-Werror::' libavformat/Makefile &&
+patch -p1 < ${SCRIPT_DIRECTORY}/300_c++_compliant_headers.diff

-message amr=$FFAMR &&
-cd libavcodec &&
-case $FFAMR in
- none);;
- *)
-message amr_nb=$VERSION2 &&
- unpack_file 2 &&
- unzip ${VERSION2}*.zip &&
- mv c-code amr_float &&
-message amr_nb-fixed=$VERSION3 &&
- unpack_file 3 &&
- unzip ${VERSION3}*.zip &&
- mv c-code amr &&
-message amr_wb=$VERSION4 &&
- unpack_file 4 &&
- unzip ${VERSION4}*.zip &&
- mv c-code amrwb_float
-esac
+#cd libavcodec &&
+#case $FFAMR in
+# none);;
+# *)
+#message amr-nb=$VERSION2 &&
+# unpack_file 2 &&
+# unzip ${VERSION2}*.zip &&
+# mv c-code amr_float &&
+#message amr-nb-fixed=$VERSION3 &&
+# unpack_file 3 &&
+# unzip ${VERSION3}*.zip &&
+# mv c-code amr &&
+#message amr-wb=$VERSION4 &&
+# unpack_file 4 &&
+# unzip ${VERSION4}*.zip &&
+# mv c-code amrwb_float
+#esac
diff --git a/video/goggles/DETAILS b/video/goggles/DETAILS
index 76d0f4b..40189a9 100755
--- a/video/goggles/DETAILS
+++ b/video/goggles/DETAILS
@@ -1,10 +1,10 @@
SPELL=goggles
- VERSION=0.8.0
+ VERSION=0.9.1
SOURCE=$SPELL-$VERSION.tar.bz2
+ SOURCE_GPG=gurus.gpg:$SOURCE.sig:WORKS_FOR_ME
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://www.fifthplanet.net/files/$SOURCE
WEB_SITE=http://www.fifthplanet.net/goggles.html
-
SOURCE_HASH=sha512:f9c5d5f70e9fe866d6e2d06ba29614dc2f19329bc598ed4b305aa022c909e24ab8029853b89a98c2145b38ab37cc3c65a63cd9fb909ffd7fbaef0e637cc6dd00
LICENSE[0]=GPL
ENTERED=20050318
KEYWORDS="dvd player video"
diff --git a/video/goggles/HISTORY b/video/goggles/HISTORY
index 07cc5be..9ad1883 100644
--- a/video/goggles/HISTORY
+++ b/video/goggles/HISTORY
@@ -1,3 +1,6 @@
+2007-10-03 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * DETAILS: updated to 0.9.1, fixes bug #13973
+
2006-10-03 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: [automated] Removed UPDATED.

diff --git a/video/goggles/goggles-0.9.1.tar.bz2.sig
b/video/goggles/goggles-0.9.1.tar.bz2.sig
new file mode 100644
index 0000000..4aa9e8f
Binary files /dev/null and b/video/goggles/goggles-0.9.1.tar.bz2.sig differ
diff --git a/video/kdenlive/DEPENDS b/video/kdenlive/DEPENDS
index 85bc6de..6b0bccc 100755
--- a/video/kdenlive/DEPENDS
+++ b/video/kdenlive/DEPENDS
@@ -1,4 +1,5 @@
depends mlt++ &&
depends kdelibs &&
+depends unsermake &&
optional_depends arts "" "--without-arts" "for arts support" &&
optional_depends kdesdk "" "" "to create documentation"
diff --git a/video/kdenlive/DETAILS b/video/kdenlive/DETAILS
index 9e590b5..b602ac2 100755
--- a/video/kdenlive/DETAILS
+++ b/video/kdenlive/DETAILS
@@ -1,7 +1,7 @@
SPELL=kdenlive
VERSION=0.5
-
SOURCE_HASH=sha512:287384f0478abb34de91396f06d350e22448671c3eb203df859bcc2cc4bb1c0012a0f1a5f035aa78d7c2641b8bfd8421777d3d14f9ad877cdbb589631260903e
- SOURCE=$SPELL-$VERSION.tar.gz
+SOURCE_HASH=sha512:73aff644d86808d8703dfd1eba824203e6aa8008d64ff773c5863fa27a3397ec823b6068865b81c1ba2d8e8d48f562799a361e0f7c20acb2330dcd73a5205e03
+ SOURCE=$SPELL-$VERSION-1.tar.gz # The -1 is only for 0.5-1 release!
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-${VERSION/.0//}
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
WEB_SITE=http://kdenlive.sourceforge.net/
@@ -9,6 +9,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-${VERSION/.0//}
ENTERED=20030113
DOCS="README"
KEYWORDS="video"
+ PATCHLEVEL=1
SHORT="non-linear video editing suite"
cat << EOF
kdenlive! (pronounced Kay-den-live) is a non-linear video editing
diff --git a/video/kdenlive/HISTORY b/video/kdenlive/HISTORY
index b60a822..c33b8b5 100755
--- a/video/kdenlive/HISTORY
+++ b/video/kdenlive/HISTORY
@@ -1,3 +1,7 @@
+2007-10-07 Thomas Orgis <sobukus AT sourcemage.org>
+ * DETAILS, DEPENDS: Use the fixed 0.5 tarball that includes the icons.
+ That bumps PATCHLEVEL as the previous install was incomplete.
+
2007-08-12 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.5
* BUILD: deleted, no longer needed
diff --git a/video/kmplayer/DETAILS b/video/kmplayer/DETAILS
index d357e86..83e6974 100755
--- a/video/kmplayer/DETAILS
+++ b/video/kmplayer/DETAILS
@@ -1,6 +1,6 @@
SPELL=kmplayer
- VERSION=0.9.4a
-
SOURCE_HASH=sha512:e476f410dc1605084fe6f43d5ed0b1a5177826eeebdc826acb2b2bbc5827ee6dbf57e444d29c8cdadd81b27dc935a24785ff4f32b1c9125bc58c42c6b5fce4cb
+ VERSION=0.10.0a
+
SOURCE_HASH=sha512:1592a5c9c4a4a6a7b37ad11b27c9c8b854ce3af3006edc4200478092a61bcd86843db5db1f1f8a2d2dd4c2d1ba2d3e620061e698994ab9ac73c5b85bb8bf0ad1
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
WEB_SITE=http://kmplayer.kde.org/
diff --git a/video/kmplayer/HISTORY b/video/kmplayer/HISTORY
index 917d248..a6d5e0b 100644
--- a/video/kmplayer/HISTORY
+++ b/video/kmplayer/HISTORY
@@ -1,3 +1,6 @@
+2007-10-27 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.10.0a
+
2007-08-23 Treeve Jelbert <treeve AT sourcemage.org>
* DEPENDS: add pkgconfig, cairo, expat
replace gst-plugins (obsolete) by gst-plugins-base
diff --git a/video/mplayer/BUILD b/video/mplayer/BUILD
index 1a07763..e69a6c4 100755
--- a/video/mplayer/BUILD
+++ b/video/mplayer/BUILD
@@ -1,11 +1,13 @@
if [[ $MPLAYER_SVN = y ]]; then
- OPTS="$OPTS --with-extraincdir=${TRACK_ROOT}/usr/include/ffmpeg"
+ OPTS="$OPTS --with-extraincdir=${INSTALL_ROOT}/usr/include/ffmpeg"
fi &&

+disable_pic &&
+
OPTS="$MPLAYER_OPTS $OPTS" &&

CFLAGS= ./configure --prefix=${INSTALL_ROOT}/usr \
- --confdir=${TRACK_ROOT}/etc/mplayer \
+ --confdir=${TRACK_ROOT}/etc/mplayer \
--mandir=${INSTALL_ROOT}/usr/share/man \
$OPTS &&

diff --git a/video/mplayer/DEPENDS b/video/mplayer/DEPENDS
index 48747ae..4499d59 100755
--- a/video/mplayer/DEPENDS
+++ b/video/mplayer/DEPENDS
@@ -10,23 +10,24 @@ if [ "$MPLAYER_SVN" == "y" ]; then
depends subversion &&
optional_depends ffmpeg-svn \
"--disable-libavcodec_a --disable-libavformat_a --disable-libpostproc_a
--disable-libavutil_a" "" "to use system ffmpeg instead of internal one" &&
- optional_depends libvorbis "--disable-tremor-internal" "" "to use
external libvorbis to play ogg/vorbis audio"
- optional_depends faad2 "--enable-faad-external" "" "to use shared faad
for AAC decoding"
+ optional_depends pulseaudio "" "--disable-pulse" "for pulseaudio audio
output"
else
optional_depends libdvdnav \
"" \
"--disable-dvdnav" \
"support for DVD navigation" &&
- optional_depends libvorbis "--disable-tremor-internal" "" "to use
external libvorbis to play ogg/vorbis audio" &&
- optional_depends faad2 "--enable-faad-external" "" "to use shared faad
for AAC decoding"
+ optional_depends polypaudio "" "--disable-polyp" "for polypaudio audio
output"
fi &&

+optional_depends libvorbis "--disable-tremor-internal" "" "to use external
libvorbis to play ogg/vorbis audio" &&
+optional_depends faad2 "--enable-faad-external" "" "to use shared faad for
AAC decoding"
+
# audio codecs
optional_depends libmpcdec "" "--disable-musepack" "for musepack (mpc)
support" &&
optional_depends libmad "" "--disable-mad" "to play mp3 audio using libmad"
&&
optional_depends xmms "--enable-xmms" "" "for xmms input plugin support" &&
optional_depends ladspa "" "--disable-ladspa" "for LADSPA audio filter"
&&
-optional_depends libdts "" "--disable-libdts" "for DTS audio support" &&
+optional_depends libdca "" "--disable-libdca" "for DTS audio support" &&
optional_depends lame "" "" "to encode files with mp3 audio (mencoder)" &&
optional_depends speex "" "--disable-speex" "support for speex (an open
source speech encoder)" &&

@@ -34,7 +35,7 @@ optional_depends speex "" "--disable-speex" "support for
speex (an open source
optional_depends faac "" "--disable-faac" "for faac support"
&&
optional_depends libtheora "" "--disable-theora" "for Theora video support"
&&
optional_depends zlib "" "" "to play movies using losless compression
algorithms" &&
-optional_depends win32codecs "" "--disable-win32" "to use windows codec
DLLs for video decoding" "z-rejected" &&
+optional_depends win32codecs "" "--disable-win32dll" "to use windows codec
DLLs for video decoding" "z-rejected" &&
optional_depends libdv "" "--disable-libdv" "to play files encoded with
libdv (used by most digital camcorders)" &&
optional_depends quicktime-codecs "" "--disable-qtx" "for some audio/video
codecs sometimes used in quicktime files" "z-rejected" &&
optional_depends real-codecs "" "--disable-real" "to decode RealMedia
files" "z-rejected" &&
@@ -49,7 +50,6 @@ optional_depends esound "" "--disable-esd" "for direct esd
audio output" &&
optional_depends arts "" "--disable-arts" "for arts audio output" &&
optional_depends alsa-lib "" "--disable-alsa" "for alsa audio output" &&
optional_depends nas "" "--disable-nas" "for NAS audio output" &&
-optional_depends polypaudio "" "--disable-polyp" "for polypaudio audio
output" &&

# video devices
optional_depends X11-LIBS "" "--disable-x11 --disable-xv --disable-xvmc
--disable-xmga" "for X11 output support" &&
@@ -66,11 +66,7 @@ optional_depends jpeg "" "--disable-jpeg" "to output to
.jpeg files" &&

# misc
optional_depends cdparanoia "" "--disable-cdparanoia" "to play audio cds"
&&
-if [[ $MPLAYER_SVN = y ]]; then
- optional_depends live "" "--disable-live" "for live.com Streaming Media
(sdp/rtsp) support"
-else
- optional_depends live "--enable-live --with-livelibdir=/usr/lib/live"
"--disable-live" "for live.com Streaming Media (sdp/rtsp) support"
-fi &&
+optional_depends live "" "--disable-live" "for live.com Streaming Media
(sdp/rtsp) support" &&
optional_depends lirc "" "--disable-lirc" "for remote-control" &&
optional_depends freetype2 "" "--disable-freetype" "for truetype subtitle
font support" &&
optional_depends fontconfig "" "--disable-fontconfig" "for fontconfig font
lookup support" &&
diff --git a/video/mplayer/DETAILS b/video/mplayer/DETAILS
index 397afb7..74ced5e 100755
--- a/video/mplayer/DETAILS
+++ b/video/mplayer/DETAILS
@@ -11,7 +11,7 @@ if [ "$MPLAYER_SVN" == "y" ]; then
FORCE_DOWNLOAD=on
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-svn
else
- VERSION=1.0rc1
+ VERSION=1.0rc2
SOURCE=MPlayer-$VERSION.tar.bz2
SOURCE_URL[0]=ftp://ftp1.mplayerhq.hu/MPlayer/releases/$SOURCE
SOURCE_URL[1]=ftp://ftp2.mplayerhq.hu/MPlayer/releases/$SOURCE
diff --git a/video/mplayer/HISTORY b/video/mplayer/HISTORY
index ba5414e..4dd6dfd 100644
--- a/video/mplayer/HISTORY
+++ b/video/mplayer/HISTORY
@@ -1,3 +1,24 @@
+2007-10-18 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * DEPENDS: removed the MPLAYER_SVN check around the live dependency,
+ both versions use the new flags now, moved polypaudio
+ optional_depends to stable version, added pulseaudio
+ optional_depends to svn version
+
+2007-10-15 Juuso Alasuutari <iuso AT sourcemage.org>
+ * DEPENDS: Removed redundant and broken libdts option,
+ libdca is the same library (libdts must be the old name
+ or something).
+
+2007-10-10 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * BUILD: use TRACK_ROOT for confdir as that's used at runtime
+
+2007-10-09 Pol Vinogradov <vin.public AT gmail.com>
+ * DETAILS: updated to 1.0rc2
+ * BUILD: added disable_pic, install_rootifying all
+ * DEPENDS; fixed option for win32codecs, added libdca
+ optionally
+ * PRE_BUILD, Makefile.patch: removed as it's fixed by upstream
+
2007-09-16 Arwed v. Merkatz <v.merkatz AT gmx.net>
* DEPENDS: moved dvdnav option to non-svn version, svn requires the
libdvdnav fork hosted on mplayerhq.hu that we don't support yet
diff --git a/video/mplayer/MPlayer-1.0rc1.tar.bz2.sig
b/video/mplayer/MPlayer-1.0rc1.tar.bz2.sig
deleted file mode 100644
index 7feaeba..0000000
Binary files a/video/mplayer/MPlayer-1.0rc1.tar.bz2.sig and /dev/null differ
diff --git a/video/mplayer/MPlayer-1.0rc2.tar.bz2.sig
b/video/mplayer/MPlayer-1.0rc2.tar.bz2.sig
new file mode 100644
index 0000000..94d9cab
Binary files /dev/null and b/video/mplayer/MPlayer-1.0rc2.tar.bz2.sig differ
diff --git a/video/mplayer/Makefile.patch b/video/mplayer/Makefile.patch
deleted file mode 100644
index 2d1589e..0000000
--- a/video/mplayer/Makefile.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- Makefile~ 2006-10-23 00:32:31.000000000 +0200
-+++ Makefile 2006-11-19 12:53:15.000000000 +0100
-@@ -439,7 +439,6 @@
- done
- endif
- @$(INSTALL) -d $(DATADIR)
-- @$(INSTALL) -d $(DATADIR)/font
- ifeq ($(GUI),yes)
- @$(INSTALL) -d $(DATADIR)/skins
- @echo "*** Download skin(s) at http://www.mplayerhq.hu/dload.html";
diff --git a/video/mplayer/PRE_BUILD b/video/mplayer/PRE_BUILD
deleted file mode 100755
index 69cda24..0000000
--- a/video/mplayer/PRE_BUILD
+++ /dev/null
@@ -1,5 +0,0 @@
-default_pre_build &&
-cd $SOURCE_DIRECTORY &&
-if [[ $MPLAYER_SVN != y ]]; then
-patch -p0 < $SCRIPT_DIRECTORY/Makefile.patch
-fi
diff --git a/video/totem/DETAILS b/video/totem/DETAILS
index 01b059a..f5cba67 100755
--- a/video/totem/DETAILS
+++ b/video/totem/DETAILS
@@ -1,5 +1,5 @@
SPELL=totem
- VERSION=2.20.0
+ VERSION=2.20.1
BRANCH=`echo $VERSION|cut -d . -f 1,2`
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/video/totem/HISTORY b/video/totem/HISTORY
index 63c3cfa..8b5140b 100644
--- a/video/totem/HISTORY
+++ b/video/totem/HISTORY
@@ -1,3 +1,6 @@
+2007-10-18 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * DETAILS: updated to 2.20.1
+
2007-09-21 Robin Cook <rcook AT wyrms.net>
* DETAILS: updated VERSION to 2.20.0

diff --git a/video/totem/totem-2.20.0.tar.bz2.sig
b/video/totem/totem-2.20.0.tar.bz2.sig
deleted file mode 100644
index a10c979..0000000
Binary files a/video/totem/totem-2.20.0.tar.bz2.sig and /dev/null differ
diff --git a/video/totem/totem-2.20.1.tar.bz2.sig
b/video/totem/totem-2.20.1.tar.bz2.sig
new file mode 100644
index 0000000..a31faf3
Binary files /dev/null and b/video/totem/totem-2.20.1.tar.bz2.sig differ
diff --git a/video/ucview/DETAILS b/video/ucview/DETAILS
index 18ba304..c6496c7 100755
--- a/video/ucview/DETAILS
+++ b/video/ucview/DETAILS
@@ -1,9 +1,9 @@
SPELL=ucview
- VERSION=0.11
+ VERSION=0.16
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://unicap-imaging.org/downloads/$SOURCE
-
SOURCE_HASH=sha512:49f25b6c6c53fb9a084f1562b1eda5c2a0df942ae18deb25c4a0d640486faeb44d2ca1a7ac9f3e38b03f630e19bcb7fe615828a12d055a36808b69f1c2bdacec
+
SOURCE_HASH=sha512:90a0efe9848b9b60c6df9d28c3e004468d00140a4e5d2403c9daa130eb1495acd223f836b0c477dad0b4b0e8434cf2c5862cea15113e454690e298b4dfa66daf
WEB_SITE=http://unicap-imaging.org/
ENTERED=20070515
LICENSE[0]=GPL
diff --git a/video/ucview/HISTORY b/video/ucview/HISTORY
index eea6aa3..e579665 100644
--- a/video/ucview/HISTORY
+++ b/video/ucview/HISTORY
@@ -1,3 +1,6 @@
+2007-10-14 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 0.16
+
2007-08-06 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 0.11

diff --git a/video/vlc/BUILD b/video/vlc/BUILD
index 14b1d2b..260ccad 100755
--- a/video/vlc/BUILD
+++ b/video/vlc/BUILD
@@ -8,18 +8,22 @@ fi &&
export OPTS="$OPTS --disable-dependency-tracking --enable-release" &&

if test "$(get_spell_provider $SPELL GECKO)" = firefox; then
- OPTS="$OPTS MOZILLA_CONFIG=/usr/lib/firefox/firefox-config
XPIDL=/usr/lib/firefox/ XPIDL_INCL=-I/usr/share/idl/firefox" &&
- CPPFLAGS="$CPPFLAGS -I/usr/include/nspr"
+ OPTS="$OPTS MOZILLA_CONFIG=${INSTALL_ROOT}/usr/lib/firefox/firefox-config
XPIDL=${INSTALL_ROOT}/usr/lib/firefox/
XPIDL_INCL=-I${INSTALL_ROOT}/usr/share/idl/firefox" &&
+ CPPFLAGS="$CPPFLAGS -I${INSTALL_ROOT}/usr/include/nspr"
+elif test "$(get_spell_provider $SPELL GECKO)" = iceweasel; then
+ OPTS="$OPTS MOZILLA_CONFIG=${INSTALL_ROOT}/usr/bin/iceweasel-config
XPIDL=${INSTALL_ROOT}/usr/lib/iceweasel/xpidl XPIDL\
+_INCL=-I${INSTALL_ROOT}/usr/share/idl/iceweasel" &&
+ CPPFLAGS="$CPPFLAGS -I${INSTALL_ROOT}/usr/include/nspr"
elif test "$(get_spell_provider $SPELL GECKO)" = seamonkey; then
- OPTS="$OPTS MOZILLA_CONFIG=/usr/bin/seamonkey-config
XPIDL=/usr/lib/seamonkey/xpidl XPIDL_INCL=-I/usr/share/idl/seamonkey" &&
- CPPFLAGS="$CPPFLAGS -I/usr/include/nspr"
+ OPTS="$OPTS MOZILLA_CONFIG=${INSTALL_ROOT}/usr/bin/seamonkey-config
XPIDL=${INSTALL_ROOT}/usr/lib/seamonkey/xpidl
XPIDL_INCL=-I${INSTALL_ROOT}/usr/share/idl/seamonkey" &&
+ CPPFLAGS="$CPPFLAGS -I${INSTALL_ROOT}/usr/include/nspr"
elif test "$(get_spell_provider $SPELL GECKO)" = xulrunner; then
- OPTS="$OPTS MOZILLA_CONFIG=/usr/bin/xulrunner-config
XPIDL=/usr/lib/xulrunner/xpidl XPIDL_INCL=-I/usr/share/idl/xulrunner" &&
- CPPFLAGS="$CPPFLAGS -I/usr/include/nspr"
+ OPTS="$OPTS MOZILLA_CONFIG=${INSTALL_ROOT}/usr/bin/xulrunner-config
XPIDL=${INSTALL_ROOT}/usr/lib/xulrunner/xpidl
XPIDL_INCL=-I${INSTALL_ROOT}/usr/share/idl/xulrunner" &&
+ CPPFLAGS="$CPPFLAGS -I${INSTALL_ROOT}/usr/include/nspr"
fi &&

# needs to be exported so vlc configure sees it, no idea why
-export CPPFLAGS="$CPPFLAGS -I/usr/include/dirac" &&
+export CPPFLAGS="$CPPFLAGS -I${INSTALL_ROOT}/usr/include/dirac" &&

sedit 's/libavcodec, libavformat/\0, libpostproc/' configure

diff --git a/video/vlc/DEPENDS b/video/vlc/DEPENDS
index 48f7973..8f78ef4 100755
--- a/video/vlc/DEPENDS
+++ b/video/vlc/DEPENDS
@@ -100,7 +100,7 @@ optional_depends "flac" \
"--disable-flac" \
"for flac audio decoder" &&

-optional_depends "libdts" \
+optional_depends "libdca" \
"--enable-dts" \
"--disable-dts" \
"for DTS audio decoder" &&
diff --git a/video/vlc/HISTORY b/video/vlc/HISTORY
index 0d12f2d..f7529be 100644
--- a/video/vlc/HISTORY
+++ b/video/vlc/HISTORY
@@ -1,3 +1,12 @@
+2007-11-21 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * PRE_BUILD, ffmpeg-api.patch: fix for latest ffmpeg-svn support
+
+2007-10-22 Pol Vinogradov <vin.public AT gmail.com>
+ * BUILD: install_rootifying paths, added iceweasel support
+
+2007-10-17 Pol Vinogradov <vin.public AT gmail.com>
+ * DEPENDS: swittched to libdca instead of libdts
+
2007-07-02 Arwed v. Merkatz <v.merkatz AT gmx.net>
* DEPENDS: added optional_depends on x264

diff --git a/video/vlc/PRE_BUILD b/video/vlc/PRE_BUILD
index 0f7b0e7..73f6f8d 100755
--- a/video/vlc/PRE_BUILD
+++ b/video/vlc/PRE_BUILD
@@ -12,5 +12,8 @@ fi &&
# available
patch -p0 < $SCRIPT_DIRECTORY/old-faad2.patch &&

+# patch for ffmpeg-svn of 2007-11-21, also supports older versions
+patch -p0 < $SPELL_DIRECTORY/ffmpeg-api.patch &&
+
# fix png linking
sedit 's/-lpng -lz/-lpng -lm -lz/' configure
diff --git a/video/vlc/ffmpeg-api.patch b/video/vlc/ffmpeg-api.patch
new file mode 100644
index 0000000..03037a6
--- /dev/null
+++ b/video/vlc/ffmpeg-api.patch
@@ -0,0 +1,14 @@
+--- modules/codec/ffmpeg/mux.c.orig 2007-11-21 21:47:16.000000000 +0100
++++ modules/codec/ffmpeg/mux.c 2007-11-21 21:49:41.000000000 +0100
+@@ -133,7 +133,11 @@
+ return VLC_EGENERIC;
+ }
+
++#if (LIBAVFORMAT_BUILD >= ((52<<16)+(0<<8)+0))
++ p_sys->oc->pb = &p_sys->io;
++#else
+ p_sys->oc->pb = p_sys->io;
++#endif
+ p_sys->oc->nb_streams = 0;
+
+ p_sys->b_write_header = VLC_TRUE;
diff --git a/video/xawtv/DEPENDS b/video/xawtv/DEPENDS
index afffbe6..19ce46d 100755
--- a/video/xawtv/DEPENDS
+++ b/video/xawtv/DEPENDS
@@ -2,6 +2,12 @@ depends gcc34 &&
depends X11-SERVER &&
depends jpeg &&

+. $GRIMOIRE/FUNCTIONS &&
+if check_if_xorg_modular_server; then
+ depends libfs &&
+ depends xset
+fi &&
+
optional_depends libpng \
"" \
"" \
diff --git a/video/xawtv/HISTORY b/video/xawtv/HISTORY
index 95cedc4..8eabeb0 100644
--- a/video/xawtv/HISTORY
+++ b/video/xawtv/HISTORY
@@ -1,3 +1,7 @@
+2007-10-03 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * DEPENDS: depends on libfs and xset if using xorg-modular, bug 13014
+ * PRE_BUILD, INSTALL: added path adjustments for xorg-modular
+
2006-04-13 Arwed v. Merkatz <v.merkatz AT gmx.net>
* BUILD: disable use of libquicktime as xawtv is incompatible to the
current one
diff --git a/video/xawtv/INSTALL b/video/xawtv/INSTALL
index db1afc0..fdc3470 100755
--- a/video/xawtv/INSTALL
+++ b/video/xawtv/INSTALL
@@ -2,5 +2,10 @@ yes | make install &&

# Install fonts
cd ${SOURCE2/.tar.bz2/} &&
+if check_if_xorg_modular_server; then
+install -m 644 *.pcf.gz \
+${INSTALL_ROOT}/usr/lib/X11/fonts/misc
+else
install -m 644 *.pcf.gz \
${INSTALL_ROOT}/usr/X11R6/lib/X11/fonts/misc
+fi
diff --git a/video/xawtv/PRE_BUILD b/video/xawtv/PRE_BUILD
index edf2367..74d5c1f 100755
--- a/video/xawtv/PRE_BUILD
+++ b/video/xawtv/PRE_BUILD
@@ -1,4 +1,8 @@
default_pre_build &&
cd ${SOURCE_DIRECTORY} &&
-unpack_file 2
-# patch -p0 < $SCRIPT_DIRECTORY/gcc-4.0.patch
+unpack_file 2 &&
+if check_if_xorg_modular_server; then
+ sed -i 's:FSlib.h:X11/fonts/FSlib.h:' console/fs.h &&
+ sed -i 's:-L@x_libraries@ @FSLIB@:-lFS:' Makefile.in &&
+ sed -i 's:/usr/X11R6/lib/X11:/usr/lib/X11:' configure
+fi
diff --git a/windowmanagers/dwm/DETAILS b/windowmanagers/dwm/DETAILS
index 451f256..4c940d6 100755
--- a/windowmanagers/dwm/DETAILS
+++ b/windowmanagers/dwm/DETAILS
@@ -1,8 +1,8 @@
SPELL=dwm
- VERSION=4.3
+ VERSION=4.5
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_URL[0]=http://suckless.org/download/${SOURCE}
-
SOURCE_HASH=sha512:b1df0a9803253ec0fb0153930df98643ee7db7d21f5dda66902e749844c013486734e4e95626a9187fcbae2b2a11f2db52cf87f8c0298d79275fe262d7353c9b
+
SOURCE_HASH=sha512:fa9825f87203f5ade808362af0dc2bfb382ec51b57155eecdbec5ccd875777fa3bbf1afdb9ea3dd72178d7bd84b3103111ff52ddd10546a4254bb56e738c5a5e
# SOURCE_GPG=gurus.gpg:${SOURCE}.sig
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
WEB_SITE=http://dwm.suckless.org/
diff --git a/windowmanagers/dwm/HISTORY b/windowmanagers/dwm/HISTORY
index 8b32dfe..87cf6ce 100644
--- a/windowmanagers/dwm/HISTORY
+++ b/windowmanagers/dwm/HISTORY
@@ -1,3 +1,6 @@
+2007-10-07 Mathieu Lonjaret <lejatorn AT sourcemage.org>
+ * DETAILS: update to 4.5
+
2007-08-09 Mathieu Lonjaret <lejatorn AT sourcemage.org>
* DETAILS: update to 4.3

diff --git a/windowmanagers/fluxbox/DETAILS b/windowmanagers/fluxbox/DETAILS
index 403356c..7659520 100755
--- a/windowmanagers/fluxbox/DETAILS
+++ b/windowmanagers/fluxbox/DETAILS
@@ -11,7 +11,7 @@ if [ "$FLUXBOX_SVN" == "y" ]; then
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-svn
SOURCE_IGNORE=volatile
else
- VERSION=1.0rc3
+ VERSION=1.0.0
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
SOURCE_GPG=gurus.gpg:${SOURCE}.sig
diff --git a/windowmanagers/fluxbox/HISTORY b/windowmanagers/fluxbox/HISTORY
index 3b8b8e7..ed236d1 100644
--- a/windowmanagers/fluxbox/HISTORY
+++ b/windowmanagers/fluxbox/HISTORY
@@ -1,3 +1,6 @@
+2007-10-28 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * DETAILS: updated spell to 1.0.0
+
2007-04-22 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* DETAILS: updated spell to 1.0rc3

diff --git a/windowmanagers/fluxbox/fluxbox-1.0.0.tar.bz2.sig
b/windowmanagers/fluxbox/fluxbox-1.0.0.tar.bz2.sig
new file mode 100644
index 0000000..02e4cbc
Binary files /dev/null and b/windowmanagers/fluxbox/fluxbox-1.0.0.tar.bz2.sig
differ
diff --git a/windowmanagers/fluxbox/fluxbox-1.0rc3.tar.bz2.sig
b/windowmanagers/fluxbox/fluxbox-1.0rc3.tar.bz2.sig
deleted file mode 100644
index dc126f2..0000000
Binary files a/windowmanagers/fluxbox/fluxbox-1.0rc3.tar.bz2.sig and
/dev/null differ
diff --git a/windowmanagers/fvwm/DETAILS b/windowmanagers/fvwm/DETAILS
index f37d51f..028fbfb 100755
--- a/windowmanagers/fvwm/DETAILS
+++ b/windowmanagers/fvwm/DETAILS
@@ -17,8 +17,50 @@ if [[ "${FVWM_RELEASE}" == "cvs" ]] ; then
FORCE_DOWNLOAD=on

elif [[ "${FVWM_RELEASE}" == "unstable" ]] ; then
- VERSION=2.5.21
-
SOURCE_HASH=sha512:3ad24d321777ecfa37c4fc1b152738f1da8410c07e7045ffcc705cfb09ca0b50e7ef082cd5b077b7ad37ed285cd6c27ce4d660522a219cc53ba63432b5a06052
+ VERSION=2.5.23
+
SOURCE_HASH=sha512:18e0027e7fbd6a8a9139b24391ccb3d6779c1574e1e9e1041a034b32c6064c7268cf4b72046935d68bd00b65df43382cad11501d3fb381db3693c0820e992396
+if [[ "${FVWM_PATCHSET}" == "y" ]]; then
+local FVWM_PATCHSET_URL=http://abdn.ac.uk/~u15dm4/fvwm
+ SOURCE2=MenuTranslucency.patch
+ SOURCE2_URL[0]=${FVWM_PATCHSET_URL}/${SOURCE2}
+
SOURCE2_HASH=sha512:198f3a93d46576ffe94655fd0ff769a611d1ed804d62cff79f8afcf9c12b3f79d396d9b46e6248298a0b66df1df0b5417c45ac9918f6d6a0bb768500d120bed8
+ SOURCE3=ResizeOutlineThin.patch
+ SOURCE3_URL[0]=${FVWM_PATCHSET_URL}/${SOURCE3}
+
SOURCE3_HASH=sha512:3c18abd1dd41f2a97a4e21e317a40bc20a1de4213b04f05f7e63184536c11e029c44606105ca55359480e9dad1bb06317fccb5b8b2a6d1d4fe734cf9115ec5ca
+ SOURCE4=Conditionals.patch
+ SOURCE4_URL[0]=${FVWM_PATCHSET_URL}/${SOURCE4}
+
SOURCE4_HASH=sha512:de72181eac17e590849cd82a55a6f69d18e583246c988ec3b94911f58e163dfcfc9b33c9563e268f9357eb3d3bb1291b6a066ea636a0e313b0627ed8d8328353
+ SOURCE5=FlatSeparators.patch
+ SOURCE5_URL[0]=${FVWM_PATCHSET_URL}/${SOURCE5}
+
SOURCE5_HASH=sha512:adda6f904e26ebd0f74f9469d65d6ae1c9276233973915f0a467e666b00caed5602c3f9c985a9073c641f0e00ec37cd2f7e4025c09823b19fda81bfeab71fdb5
+ SOURCE6=BorderUnderTitle.patch
+ SOURCE6_URL[0]=${FVWM_PATCHSET_URL}/${SOURCE6}
+
SOURCE6_HASH=sha512:c6c67713ff708a992ddb80c278dcfabf102924535697ccaf97778b78ed501e204b99c0d103c4704615b72ccaa143b2c78aa0010c131ca5a4271ba2b8ffa980d7
+ SOURCE7=InactiveFont.patch
+ SOURCE7_URL[0]=${FVWM_PATCHSET_URL}/${SOURCE7}
+
SOURCE7_HASH=sha512:0be8b4b2c7837846553e99ad3e162993e0e1ad75b10fec80990eda53254e60777e46f326f9a6467071b90f8d4889d7cba923af42c7c22395a24702ac73ba78b0
+ SOURCE8=FluxboxHandles.patch
+ SOURCE8_URL[0]=${FVWM_PATCHSET_URL}/${SOURCE8}
+
SOURCE8_HASH=sha512:0e91234d5f8af53265818c1f1915f5061b419edbaadcb6b1159c819aed0b179aece4f51e2ece79d9f3f1713bcc8c002de86bee74e871ea50547850c9326ff197
+ SOURCE9=RoundedCorners.patch
+ SOURCE9_URL[0]=${FVWM_PATCHSET_URL}/${SOURCE9}
+
SOURCE9_HASH=sha512:740aca83c31a4245f66fc23a57cef1e486007c63c7c21b9199dbd285822d8e132ee6ad8e41aaffb67890bfeb247195aefe3f5724fdf1ad899677779aa0ff3a77
+ SOURCE10=TopBorder.patch
+ SOURCE10_URL[0]=${FVWM_PATCHSET_URL}/${SOURCE10}
+
SOURCE10_HASH=sha512:f8806634a390ace81936b1f95aba948e7c68c6941d1b466f960803c5df288e302970e847322d139afc4de2c2002636a071548e083af912050e68b4424c2db5da
+ SOURCE11=ButtonWidth.patch
+ SOURCE11_URL[0]=${FVWM_PATCHSET_URL}/${SOURCE11}
+
SOURCE11_HASH=sha512:64acb52e4bf4af2e3c2aac1f3389aa0a17dec368b00da950c27d112da36bd534dd395f4a39fc93efc5abb5d64785a5d30b1e9040b75a59354c5c522bdc6bbcda
+ SOURCE12=MultiBorder.patch
+ SOURCE12_URL[0]=${FVWM_PATCHSET_URL}/${SOURCE12}
+
SOURCE12_HASH=sha512:c7dfa230661823df28704d626cabc7cb75abe246571271624561d5af0653f2264c52efd4c1537dc7aee8b0dd036143d4f54b6325205622f1970f3eba18a92601
+ SOURCE13=Hover.patch
+ SOURCE13_URL[0]=${FVWM_PATCHSET_URL}/${SOURCE13}
+
SOURCE13_HASH=sha512:72083b5e6cdf5d91288a85fffd5f02744d015f6830e34857247916bf79eedfdd5548e50133b1d2954ad8b4f353f412705d2b23212e46f3a14bbbaad27cce3113
+ SOURCE14=FvwmIconMan.patch
+ SOURCE14_URL[0]=${FVWM_PATCHSET_URL}/${SOURCE14}
+
SOURCE14_HASH=sha512:81d37125859d6479285694f788976f3193eaacdb1b3ad89ce107beb271ecc1b6aa60f773125002e7b9ebacd8faaaa9537c440b66595cda64eb1eeb3b5c0cabbe
+fi
else
VERSION=2.4.20

SOURCE_HASH=sha512:6704f3204a9850628da2bf53acd8afca64368d0a744a91a4200fe17212deaecc92f1616457f8a43bcc8f01a5d6a2159928526eac3d66af7c00a4f39a2c875501
diff --git a/windowmanagers/fvwm/HISTORY b/windowmanagers/fvwm/HISTORY
index 40cdfda..83f6180 100644
--- a/windowmanagers/fvwm/HISTORY
+++ b/windowmanagers/fvwm/HISTORY
@@ -1,3 +1,53 @@
+2007-10-14 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS, PRE_BUILD: fetch patchset directly
+ * patches/BorderUnderTitle.patch.bz2,
+ patches/ButtonWidth.patch.bz2,
+ patches/Conditionals.patch.bz2,
+ patches/FlatSeparators.patch.bz2,
+ patches/FluxboxHandles.patch.bz2,
+ patches/FvwmIconMan.patch.bz2,
+ patches/Hover.patch.bz2,
+ patches/InactiveFont.patch.bz2,
+ patches/MenuTranslucency.patch.bz2,
+ patches/MultiBorder.patch.bz2,
+ patches/ResizeOutlineThin.patch.bz2,
+ patches/RoundedCorners.patch.bz2,
+ patches/TopBorder.patch.bz2: removed.
+
+2007-10-13 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: updated to 2.5.23
+ * patches/02-ResizeOutlineThin.patch.bz2,
+ patches/03-Conditionals.patch.bz2,
+ patches/04-FlatSeparators.patch.bz2,
+ patches/05-BorderUnderTitle.patch.bz2,
+ patches/06-InactiveFont.patch.bz2,
+ patches/07-FluxboxHandles.patch.bz2,
+ patches/08-RoundedCorners.patch.bz2,
+ patches/09-TopBorder.patch.bz2,
+ patches/10-ButtonWidth.patch.bz2,
+ patches/11-MultiBorder.patch.bz2,
+ patches/12-Hover.patch.bz2,
+ patches/15-FvwmIconMan.patch.bz2,
+ patches/16-FvwmButtonsTips.patch.bz2,
+ patches/17-DefaultCharset.patch.bz2,
+ patches/18-FirstItemUnderPointer.patch.bz2,
+ patches/19-FluxCorner.patch.bz2,
+ patches/20-ThinGeometryProxy.patch.bz2: removed
+ * patches/BorderUnderTitle.patch.bz2,
+ patches/ButtonWidth.patch.bz2,
+ patches/Conditionals.patch.bz2,
+ patches/FlatSeparators.patch.bz2,
+ patches/FluxboxHandles.patch.bz2,
+ patches/FvwmIconMan.patch.bz2,
+ patches/Hover.patch.bz2,
+ patches/InactiveFont.patch.bz2,
+ patches/MenuTranslucency.patch.bz2,
+ patches/MultiBorder.patch.bz2,
+ patches/ResizeOutlineThin.patch.bz2,
+ patches/RoundedCorners.patch.bz2,
+ patches/TopBorder.patch.bz2: added new version of the patchset
+ * PRE_BUILD: changed so it uses the new version of the patchset
+
2007-03-03 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* patches/{02-ResizeOutlineThin.patch,
03-Conditionals.patch,
@@ -206,3 +256,4 @@
* DETAILS: Added licence field and md5sum to details,
bumped version up to 2.4.8 that fixed bug#433.

+
diff --git a/windowmanagers/fvwm/PRE_BUILD b/windowmanagers/fvwm/PRE_BUILD
index 6d1f844..75221f9 100755
--- a/windowmanagers/fvwm/PRE_BUILD
+++ b/windowmanagers/fvwm/PRE_BUILD
@@ -1,10 +1,18 @@
default_pre_build &&
-if [[ "$FVWM_RELEASE" == "unstable" ]] &&
+if [[ "$FVWM_RELEASE" == "unstable" ]] &&
[[ "$FVWM_PATCHSET" == "y" ]]; then
- cd ${SCRIPT_DIRECTORY}/patches
- for patch in *.patch.bz2; do
- cd ${SOURCE_DIRECTORY} &&
- message "${MESSAGE_COLOR}applying
${FILE_COLOR}$patch${DEFAULT_COLOR}" &&
- bzcat ${SCRIPT_DIRECTORY}/patches/$patch | patch -p1
- done
+ cd ${SOURCE_DIRECTORY} &&
+ patch -p0 < ${SOURCE_CACHE}/${SOURCE2} &&
+ patch -p0 < ${SOURCE_CACHE}/${SOURCE3} &&
+ patch -p0 < ${SOURCE_CACHE}/${SOURCE4} &&
+ patch -p0 < ${SOURCE_CACHE}/${SOURCE5} &&
+ patch -p0 < ${SOURCE_CACHE}/${SOURCE6} &&
+ patch -p0 < ${SOURCE_CACHE}/${SOURCE7} &&
+ patch -p0 < ${SOURCE_CACHE}/${SOURCE8} &&
+ patch -p0 < ${SOURCE_CACHE}/${SOURCE9} &&
+ patch -p0 < ${SOURCE_CACHE}/${SOURCE10} &&
+ patch -p0 < ${SOURCE_CACHE}/${SOURCE11} &&
+ patch -p0 < ${SOURCE_CACHE}/${SOURCE12} &&
+ patch -p0 < ${SOURCE_CACHE}/${SOURCE13} &&
+ patch -p0 < ${SOURCE_CACHE}/${SOURCE14}
fi
diff --git a/windowmanagers/fvwm/patches/02-ResizeOutlineThin.patch.bz2
b/windowmanagers/fvwm/patches/02-ResizeOutlineThin.patch.bz2
deleted file mode 100644
index ec44807..0000000
Binary files a/windowmanagers/fvwm/patches/02-ResizeOutlineThin.patch.bz2 and
/dev/null differ
diff --git a/windowmanagers/fvwm/patches/03-Conditionals.patch.bz2
b/windowmanagers/fvwm/patches/03-Conditionals.patch.bz2
deleted file mode 100644
index ef1fee0..0000000
Binary files a/windowmanagers/fvwm/patches/03-Conditionals.patch.bz2 and
/dev/null differ
diff --git a/windowmanagers/fvwm/patches/04-FlatSeparators.patch.bz2
b/windowmanagers/fvwm/patches/04-FlatSeparators.patch.bz2
deleted file mode 100644
index 81af565..0000000
Binary files a/windowmanagers/fvwm/patches/04-FlatSeparators.patch.bz2 and
/dev/null differ
diff --git a/windowmanagers/fvwm/patches/05-BorderUnderTitle.patch.bz2
b/windowmanagers/fvwm/patches/05-BorderUnderTitle.patch.bz2
deleted file mode 100644
index 43b4bd6..0000000
Binary files a/windowmanagers/fvwm/patches/05-BorderUnderTitle.patch.bz2 and
/dev/null differ
diff --git a/windowmanagers/fvwm/patches/06-InactiveFont.patch.bz2
b/windowmanagers/fvwm/patches/06-InactiveFont.patch.bz2
deleted file mode 100644
index 3c4b83f..0000000
Binary files a/windowmanagers/fvwm/patches/06-InactiveFont.patch.bz2 and
/dev/null differ
diff --git a/windowmanagers/fvwm/patches/07-FluxboxHandles.patch.bz2
b/windowmanagers/fvwm/patches/07-FluxboxHandles.patch.bz2
deleted file mode 100644
index d27cfc1..0000000
Binary files a/windowmanagers/fvwm/patches/07-FluxboxHandles.patch.bz2 and
/dev/null differ
diff --git a/windowmanagers/fvwm/patches/08-RoundedCorners.patch.bz2
b/windowmanagers/fvwm/patches/08-RoundedCorners.patch.bz2
deleted file mode 100644
index 1e0573a..0000000
Binary files a/windowmanagers/fvwm/patches/08-RoundedCorners.patch.bz2 and
/dev/null differ
diff --git a/windowmanagers/fvwm/patches/09-TopBorder.patch.bz2
b/windowmanagers/fvwm/patches/09-TopBorder.patch.bz2
deleted file mode 100644
index d6b2c0e..0000000
Binary files a/windowmanagers/fvwm/patches/09-TopBorder.patch.bz2 and
/dev/null differ
diff --git a/windowmanagers/fvwm/patches/10-ButtonWidth.patch.bz2
b/windowmanagers/fvwm/patches/10-ButtonWidth.patch.bz2
deleted file mode 100644
index cf20398..0000000
Binary files a/windowmanagers/fvwm/patches/10-ButtonWidth.patch.bz2 and
/dev/null differ
diff --git a/windowmanagers/fvwm/patches/11-MultiBorder.patch.bz2
b/windowmanagers/fvwm/patches/11-MultiBorder.patch.bz2
deleted file mode 100644
index 3af2d45..0000000
Binary files a/windowmanagers/fvwm/patches/11-MultiBorder.patch.bz2 and
/dev/null differ
diff --git a/windowmanagers/fvwm/patches/12-Hover.patch.bz2
b/windowmanagers/fvwm/patches/12-Hover.patch.bz2
deleted file mode 100644
index 9905be0..0000000
Binary files a/windowmanagers/fvwm/patches/12-Hover.patch.bz2 and /dev/null
differ
diff --git a/windowmanagers/fvwm/patches/15-FvwmIconMan.patch.bz2
b/windowmanagers/fvwm/patches/15-FvwmIconMan.patch.bz2
deleted file mode 100644
index 5327586..0000000
Binary files a/windowmanagers/fvwm/patches/15-FvwmIconMan.patch.bz2 and
/dev/null differ
diff --git a/windowmanagers/fvwm/patches/16-FvwmButtonsTips.patch.bz2
b/windowmanagers/fvwm/patches/16-FvwmButtonsTips.patch.bz2
deleted file mode 100644
index edd3282..0000000
Binary files a/windowmanagers/fvwm/patches/16-FvwmButtonsTips.patch.bz2 and
/dev/null differ
diff --git a/windowmanagers/fvwm/patches/17-DefaultCharset.patch.bz2
b/windowmanagers/fvwm/patches/17-DefaultCharset.patch.bz2
deleted file mode 100644
index 0b031bc..0000000
Binary files a/windowmanagers/fvwm/patches/17-DefaultCharset.patch.bz2 and
/dev/null differ
diff --git a/windowmanagers/fvwm/patches/18-FirstItemUnderPointer.patch.bz2
b/windowmanagers/fvwm/patches/18-FirstItemUnderPointer.patch.bz2
deleted file mode 100644
index 8299985..0000000
Binary files a/windowmanagers/fvwm/patches/18-FirstItemUnderPointer.patch.bz2
and /dev/null differ
diff --git a/windowmanagers/fvwm/patches/19-FluxCorner.patch.bz2
b/windowmanagers/fvwm/patches/19-FluxCorner.patch.bz2
deleted file mode 100644
index ff995e8..0000000
Binary files a/windowmanagers/fvwm/patches/19-FluxCorner.patch.bz2 and
/dev/null differ
diff --git a/windowmanagers/fvwm/patches/20-ThinGeometryProxy.patch.bz2
b/windowmanagers/fvwm/patches/20-ThinGeometryProxy.patch.bz2
deleted file mode 100644
index fd29d65..0000000
Binary files a/windowmanagers/fvwm/patches/20-ThinGeometryProxy.patch.bz2 and
/dev/null differ
diff --git a/windowmanagers/wmii/DEPENDS b/windowmanagers/wmii/DEPENDS
index 1cdedf9..f1bcb25 100755
--- a/windowmanagers/wmii/DEPENDS
+++ b/windowmanagers/wmii/DEPENDS
@@ -1,2 +1,6 @@
-optional_depends dmenu &&
+optional_depends plan9port \
+"" "" "to support configuration with rc shell script" &&
+optional_depends dmenu \
+"" "" "for dynamic menus (of programs and actions)" &&
+depends libixp &&
depends X11-LIBS
diff --git a/windowmanagers/wmii/DETAILS b/windowmanagers/wmii/DETAILS
index ab3057f..e5d80a9 100755
--- a/windowmanagers/wmii/DETAILS
+++ b/windowmanagers/wmii/DETAILS
@@ -1,9 +1,11 @@
SPELL=wmii
- VERSION="+ixp-20070516"
- SOURCE=$SPELL$VERSION.tgz
+ #VERSION="+ixp-20070516"
+ VERSION="20071003"
+ SOURCE=$SPELL-$VERSION.tgz
SOURCE_URL[0]=http://suckless.org/snaps/${SOURCE}
- SOURCE_GPG=gurus.gpg:${SOURCE}.sig
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL$VERSION
+
SOURCE_HASH[0]=sha512:8ef68b6c62c37f73bd86077ddb555a5adc0b42c1735cc24d4f993231412d57960578c772bb9f3d81151080e3bf3912ae97c440be2b75156e45de03aa320e422e
+ #SOURCE_GPG=gurus.gpg:${SOURCE}.sig
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
WEB_SITE=http://wmii.suckless.org
ENTERED=20050602
LICENSE[0]=GPL
diff --git a/windowmanagers/wmii/HISTORY b/windowmanagers/wmii/HISTORY
index b0ef9ab..526e979 100644
--- a/windowmanagers/wmii/HISTORY
+++ b/windowmanagers/wmii/HISTORY
@@ -1,3 +1,7 @@
+2007-10-28 Mathieu Lonjaret <lejatorn AT sourcemage.org>
+ * DETAILS: updated to 20071003 snap
+ * DEPENDS: readdded libixp, added plan9port for rc shell config
+
2007-05-30 Arjan Bouter <abouter AT sourcemage.org>
* DETAILS: snapshot bumped to 20070516
DEPENDS: removed libixp as it is included in the snapshot
diff --git a/windowmanagers/xmonad/DETAILS b/windowmanagers/xmonad/DETAILS
index 79bd329..4ca8b53 100755
--- a/windowmanagers/xmonad/DETAILS
+++ b/windowmanagers/xmonad/DETAILS
@@ -1,8 +1,8 @@
SPELL=xmonad
- VERSION=0.3
+ VERSION=0.4
SOURCE="${SPELL}-${VERSION}.tar.gz"

SOURCE_URL[0]=http://hackage.haskell.org/packages/archive/${SPELL}/${VERSION}/${SOURCE}
-
SOURCE_HASH=sha512:fc8087d7bdca09a98d87396338b01258e353aca994e7bc75ca103e4a22d028d2da0620e2271289c6d97081e5b810dd3c491bb213888570c9aadda0e1b0452156
+
SOURCE_HASH=sha512:72edff77c0cc55c9cb94f4656681696f7c4ef0447bf770f15e260f67ff31f519b5329dfdd76a866992dcc8cb9c3aecc40ed370d3fae47e995857a2a0619f5023
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
WEB_SITE="http://xmonad.org";
LICENSE[0]=BSD3
diff --git a/windowmanagers/xmonad/HISTORY b/windowmanagers/xmonad/HISTORY
index f34c408..4b2433e 100644
--- a/windowmanagers/xmonad/HISTORY
+++ b/windowmanagers/xmonad/HISTORY
@@ -1,3 +1,6 @@
+2007-10-21 Alexander Tsamutali <astsmtl AT gmail.com>
+ * DETAILS: updated spell to 0.4
+
2007-09-05 Alexander Tsamutali <astsmtl AT gmail.com>
* DETAILS: updated spell to 0.3

diff --git a/x11-libs/dri/CONFIGURE b/x11-libs/dri/CONFIGURE
index 010aacf..ada4f05 100755
--- a/x11-libs/dri/CONFIGURE
+++ b/x11-libs/dri/CONFIGURE
@@ -18,7 +18,7 @@ then
config_query_option DRI_DRIVER_RADEON "Support for radeon\(7000-7500\)" n
"radeon" ""
config_query_option DRI_DRIVER_R200 "Support for radeon\(8500-9200\)" n
"r200" ""
config_query_option DRI_DRIVER_R128 "Support for rage\(128\)" n "r128" ""
- config_query_option DRI_DRIVER_R64 "Support for rage\(64\)" n "mach64" ""
+ config_query_option DRI_DRIVER_MACH64 "Support for mach64" n "mach64" ""
fi
if [ "${X11_MGA_DRIVER_IA32}" == "mga" ] ; then
config_query_option DRI_DRIVER_MGA "Support for
Matrox\(G200,G400,G450,G550\)" n "mga" ""
@@ -103,6 +103,7 @@ else
config_query_option DRI_DRIVER_RADEON "Support for radeon\(7000-7500\)" n
"radeon" ""
config_query_option DRI_DRIVER_R200 "Support for radeon\(8500-9200\)" n
"r200" ""
config_query_option DRI_DRIVER_R128 "Support for rage\(128\)" n "r128" ""
+ config_query_option DRI_DRIVER_MACH64 "Support for mach64" n "mach64" ""
fi
if [ "$X11_MGA_DRIVER_OTHER" == "mga" ] ; then
config_query_option DRI_DRIVER_MGA "Support for
Matrox\(G200,G400,G450,G550\)" n "mga" ""
@@ -123,7 +124,7 @@ X11_DRIVER_AMD64="${X11_ATI_DRIVER_AMD64}
${X11_TDFX_DRIVER_AMD64} ${X11_I810_DR
X11_DRIVER_OTHER="${X11_ATI_DRIVER_OTHER} ${X11_TDFX_DRIVER_OTHER}
${X11_MGA_DRIVER_OTHER} ${X11_GLINT_DRIVER_OTHER} ${X11_VGA_DRIVER_OTHER}" &&

X11_DRIVER="${X11_DRIVER_IA32} ${X11_DRIVER_PPC} ${X11_DRIVER_AMD64}
${X11_DRIVER_OTHER}" &&
-DRI_DRIVER="${DRI_DRIVER_RADEON} ${DRI_DRIVER_R200} ${DRI_DRIVER_R128}
${DRI_DRIVER_MGA} ${DRI_DRIVER_SIS} ${DRI_DRIVER_TDFX} ${DRI_DRIVER_I830}
${DRI_DRIVER_SAVAGE} ${DRI_DRIVER_FFB}" &&
+DRI_DRIVER="${DRI_DRIVER_RADEON} ${DRI_DRIVER_R200} ${DRI_DRIVER_R128}
${DRI_DRIVER_MGA} ${DRI_DRIVER_SIS} ${DRI_DRIVER_TDFX} ${DRI_DRIVER_I830}
${DRI_DRIVER_SAVAGE} ${DRI_DRIVER_FFB} ${DRI_DRIVER_MACH64}" &&

persistent_add X11_DRIVER DRI_DRIVER &&

diff --git a/x11-libs/dri/HISTORY b/x11-libs/dri/HISTORY
index 5c3aff3..ed363d6 100644
--- a/x11-libs/dri/HISTORY
+++ b/x11-libs/dri/HISTORY
@@ -1,3 +1,6 @@
+2007-11-04 Arjan Bouter <abouter AT sourcemage.org>
+ * CONFIGURE: added mach64 support
+
2006-09-21 Juuso Alasuutari <iuso AT sourcemage.org>
* PROVIDES: [automated] Fixed invalid entries.

diff --git a/x11-libs/wine/DETAILS b/x11-libs/wine/DETAILS
index 3ad47fe..82b5381 100755
--- a/x11-libs/wine/DETAILS
+++ b/x11-libs/wine/DETAILS
@@ -11,7 +11,7 @@ if [[ $WINE_VCS == y ]]; then
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-git
FORCE_DOWNLOAD=1
else
- VERSION=0.9.46
+ VERSION=0.9.48
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE2=$SOURCE.sign
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
diff --git a/x11-libs/wine/HISTORY b/x11-libs/wine/HISTORY
index 80b80de..9f191f2 100644
--- a/x11-libs/wine/HISTORY
+++ b/x11-libs/wine/HISTORY
@@ -1,3 +1,9 @@
+2007-10-27 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.9.48
+
+2007-10-12 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.9.47
+
2007-09-28 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.9.46

diff --git a/x11-toolkits/gtk+2/DETAILS b/x11-toolkits/gtk+2/DETAILS
index 15ef97b..912d035 100755
--- a/x11-toolkits/gtk+2/DETAILS
+++ b/x11-toolkits/gtk+2/DETAILS
@@ -1,5 +1,5 @@
SPELL=gtk+2
- VERSION=2.12.0
+ VERSION=2.12.1
BRANCH=`echo $VERSION | cut -d . -f 1,2`
SOURCE=gtk+-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/gtk+-$VERSION
diff --git a/x11-toolkits/gtk+2/HISTORY b/x11-toolkits/gtk+2/HISTORY
index 2519e02..b46f81c 100644
--- a/x11-toolkits/gtk+2/HISTORY
+++ b/x11-toolkits/gtk+2/HISTORY
@@ -1,3 +1,6 @@
+2007-10-17 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 2.12.1
+
2007-09-15 George Sherwood <george AT beernabeer.com>
* DETAILS: Updated to version 2.12.0

diff --git a/x11-toolkits/gtk+2/gtk+-2.12.0.tar.bz2.sig
b/x11-toolkits/gtk+2/gtk+-2.12.0.tar.bz2.sig
deleted file mode 100644
index d122617..0000000
Binary files a/x11-toolkits/gtk+2/gtk+-2.12.0.tar.bz2.sig and /dev/null differ
diff --git a/x11-toolkits/gtk+2/gtk+-2.12.1.tar.bz2.sig
b/x11-toolkits/gtk+2/gtk+-2.12.1.tar.bz2.sig
new file mode 100644
index 0000000..ddce46f
Binary files /dev/null and b/x11-toolkits/gtk+2/gtk+-2.12.1.tar.bz2.sig differ
diff --git a/x11-toolkits/gtkmm2/DETAILS b/x11-toolkits/gtkmm2/DETAILS
index b7e64c9..89eec2b 100755
--- a/x11-toolkits/gtkmm2/DETAILS
+++ b/x11-toolkits/gtkmm2/DETAILS
@@ -1,5 +1,5 @@
SPELL=gtkmm2
- VERSION=2.12.0
+ VERSION=2.12.1
BRANCH=`echo $VERSION|cut -d . -f 1,2`
SOURCE=gtkmm-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/gtkmm-$VERSION
diff --git a/x11-toolkits/gtkmm2/HISTORY b/x11-toolkits/gtkmm2/HISTORY
index 3d8ab62..8116fd6 100644
--- a/x11-toolkits/gtkmm2/HISTORY
+++ b/x11-toolkits/gtkmm2/HISTORY
@@ -1,3 +1,6 @@
+2007-10-07 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 2.12.1
+
2007-09-22 Robin Cook <rcook AT wyrms.net>
* DETAILS: updated VERSION to 2.12.0

diff --git a/x11-toolkits/gtkmm2/gtkmm-2.12.0.tar.bz2.sig
b/x11-toolkits/gtkmm2/gtkmm-2.12.0.tar.bz2.sig
deleted file mode 100644
index 87d9256..0000000
Binary files a/x11-toolkits/gtkmm2/gtkmm-2.12.0.tar.bz2.sig and /dev/null
differ
diff --git a/x11-toolkits/gtkmm2/gtkmm-2.12.1.tar.bz2.sig
b/x11-toolkits/gtkmm2/gtkmm-2.12.1.tar.bz2.sig
new file mode 100644
index 0000000..94e3203
Binary files /dev/null and b/x11-toolkits/gtkmm2/gtkmm-2.12.1.tar.bz2.sig
differ
diff --git a/x11-toolkits/kiwi/DETAILS b/x11-toolkits/kiwi/DETAILS
index 718ecf4..fe2e2ed 100755
--- a/x11-toolkits/kiwi/DETAILS
+++ b/x11-toolkits/kiwi/DETAILS
@@ -1,9 +1,9 @@
SPELL=kiwi
- VERSION=1.9.16
+ VERSION=1.9.18
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$GNOME_URL/sources/$SPELL/${VERSION%.*}/$SOURCE
-
SOURCE_HASH=sha512:70dec9a0a2de1486667b331485b853e0d1f031cfc3a72d9bed13ba58824cac598c086b78510a793a2a90b4208902c9a94b5d9059a8b7391905347f7d2d533a64
+
SOURCE_HASH=sha512:4c8e25423149ad7d950a5140e9fb855feb302462024cfd8298b38b434ac3ca5aa6679da407f1639ecf0e2a3b744830e4680df582aa352087f907ebf54d2d7b15
WEB_SITE=http://www.async.com.br/projects/kiwi/
ENTERED=20070113
LICENSE[0]=LGPL
diff --git a/x11-toolkits/kiwi/HISTORY b/x11-toolkits/kiwi/HISTORY
index 561f1cf..19b206a 100644
--- a/x11-toolkits/kiwi/HISTORY
+++ b/x11-toolkits/kiwi/HISTORY
@@ -1,3 +1,6 @@
+2007-09-17 Alexander Tsamutali <astsmtl AT gmail.com>
+ * DETAILS: updated spell to 1.9.18
+
2007-09-08 Alexander Tsamutali <astsmtl AT gmail.com>
* DETAILS: updated spell to 1.9.16

diff --git a/x11-toolkits/openmotif/BUILD b/x11-toolkits/openmotif/BUILD
deleted file mode 100755
index 81eca21..0000000
--- a/x11-toolkits/openmotif/BUILD
+++ /dev/null
@@ -1,4 +0,0 @@
-if ! check_if_xorg_modular_libs ; then
- OPTS="--prefix=/usr/X11R6 $OPTS"
-fi &&
-default_build
diff --git a/x11-toolkits/openmotif/CONFIGURE
b/x11-toolkits/openmotif/CONFIGURE
deleted file mode 100755
index b42cba1..0000000
--- a/x11-toolkits/openmotif/CONFIGURE
+++ /dev/null
@@ -1,3 +0,0 @@
-#config_query_option OMOTIF_CATALOG "Enable message catalog?" n \
-# "--enable-message-catalog" \
-# "--disable-message-catalog"
diff --git a/x11-toolkits/openmotif/CONFLICTS
b/x11-toolkits/openmotif/CONFLICTS
deleted file mode 100755
index 688b708..0000000
--- a/x11-toolkits/openmotif/CONFLICTS
+++ /dev/null
@@ -1 +0,0 @@
-conflicts lesstif
diff --git a/x11-toolkits/openmotif/DEPENDS b/x11-toolkits/openmotif/DEPENDS
deleted file mode 100755
index 47e20b5..0000000
--- a/x11-toolkits/openmotif/DEPENDS
+++ /dev/null
@@ -1,7 +0,0 @@
-. $GRIMOIRE/FUNCTIONS &&
-
-depends X11-LIBS &&
-
-if check_if_xorg_modular_libs ; then
- depends libxp
-fi
diff --git a/x11-toolkits/openmotif/DETAILS b/x11-toolkits/openmotif/DETAILS
deleted file mode 100755
index 6cf830f..0000000
--- a/x11-toolkits/openmotif/DETAILS
+++ /dev/null
@@ -1,15 +0,0 @@
- SPELL=openmotif
- VERSION=2.2.3
- SOURCE=openMotif-$VERSION.tar.gz
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/openMotif-$VERSION
- SOURCE_URL[0]=http://ftp.motifzone.net/om${VERSION}/src/$SOURCE
-
SOURCE_HASH=sha512:322381faf50bde6bbd2253f1b52a25e5471df87a2b01fba4de7e0d1bb4c1267e2b0d358e13e1b924a60d9e85316959fa6b2be5a458964d03f47a936bb618eae8
- WEB_SITE=http://www.motifzone.net/
- ENTERED=20020510
- PATCHLEVEL=1
- LICENSE[0]=http://www.opengroup.org/openmotif/license
- KEYWORDS="x11 libs"
- SHORT="OSF/Motif GUI X11 toolkit"
-cat << EOF
-This is OpenMotif...
-EOF
diff --git a/x11-toolkits/openmotif/HISTORY b/x11-toolkits/openmotif/HISTORY
deleted file mode 100644
index f75c371..0000000
--- a/x11-toolkits/openmotif/HISTORY
+++ /dev/null
@@ -1,92 +0,0 @@
-2006-09-27 Eric Sandall <sandalle AT sourcemage.org>
- * DEPENDS: FUNCTIONS is not sourced here automatically, so source it
for
- check_if_xorg_modular_libs().
-
-2006-09-26 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
- * DEPENDS: use check_if_xorg_modular_libs
- * BUILD: use check_if_xorg_modular_libs and make sure to install
- to proper spot
- * DETAILS: patchlevel++
-
-2006-09-21 Juuso Alasuutari <iuso AT sourcemage.org>
- * PROVIDES: [automated] Fixed invalid entries.
-
-2006-06-28 Eric Sandall <sandalle AT sourcemage.org>
- * DETAILS: Removed BUILD_API=2, set grimoire-wide
-
-2006-05-24 Eric Sandall <sandalle AT sourcemage.org>
- * DEPENDS: If X11-LIBS is provided by xorg-server, depend on libxp
(Xprint)
-
-2006-03-12 Karsten Behrmann <BearPerson AT sourcemage.org>
- * DETAILS: (automated) Add KEYWORDS
-
-2005-11-29 Seth Woolley <seth AT tautology.org>
- * DETAILS: MD5 -> SHA512
-
-2005-05-01 Thomas Houssin <Thomas.Houssin AT sourcemage.orgQ
- * PRE_BUILD : apply several patches (including security patches) ;
mostly
- taken from gentoo
- * Patches added :
- - openmotif-2.2.3-CAN-2004-0687-0688.patch.bz2
- - openmotif-2.2.3-CAN-2004-0914-newer.patch.bz2
- - openmotif-2.2.3-CAN-2004-0914_sec8.patch
- - openmotif-2.2.3-CAN-2005-0605.patch
- - openmotif-2.2.3-XmResizeHashTable.patch
- - openmotif-2.2.3-char_not_supported.patch
- - openmotif-2.2.3-mwm-configdir.patch
- - openmotif-2.2.3-pixel_length.patch
- - openmotif-2.2.3-popup_timeout.patch
- - openmotif-2.2.3-utf8.patch
- - openmotif-2.2.3-automake.patch
- - openmotif-2.2.3-no_demos.patch
-
-2005-02-02 Eric Sandall <sandalle AT sourcemage.org>
- * DETAILS: Updated to 2.2.3
- SOURCE_URL changed for new site
- New WEB_SITE
- * CONFIGURE: Removed query for non-existent theme option
- Pass proper arguments for config_query_option for message catalog
- Disable message catalog for now as it breaks compilation
- * BUILD: Remove Makefile.diff.bz2 application
- Remove flag for OMOTIF_THEMES
- * Makefile.diff.bz2: Removed
-
-2004-12-18 Eric Sandall <sandalle AT sourcemage.org>
- * DETAILS: Added BUILD_API=2
- Removed MAINTAINER
- * CONFIGURE: Added queries for themes and message catalog
- * DEPENDS: Added dependency on X11-LIBS (even though they have
- a --without-x flag :()
- * BUILD: Converted to build_api 2
- Removed explicit --enable-themes
-
-2003-10-05 Ladislav Hagara <hgr AT vabo.cz>
- * added PROVIDES (provides MOTIF)
-
-2003-05-28 Jason Flatt <jason AT flattfamily.com>
- * Removed hash mark which blocked the bug fix included in last update.
- Cleaned up this file based on the Gimoire Guru Handbook.
-
-2002-09-08 Eric Sandall <sandalle AT sourcemage.org>
- * Cleaned up BUILD to conform more closely to default_build
- Cleaned up DETAILS
- Fixed Bug #530
-
-2002-08-10 Joel Mayes <bluebird AT optushome.com.au>
- * updated MD5[0] field to reflect the .tar not .tar.(bz2|gz|Z)
-
-2002-06-24 Joel Mayes <bluebird AT optushome.com.au>
- * Added LICENSE field to DETAILS
- Changed SOURCE from .tgz to .tar.gz
-
-2002-06-21 Joel Mayes <bluebird AT optushome.com.au>
- * Added MD5 field to DETAILS
-
-2002-06-21 Joel Mayes <bluebird AT optushome.com.au>
- * SOURCE_URL changed to http://ftp.motifzone.net/2.2/src/$SOURCE
- Version bump -> 2.2.2
-
-2002-05-27 Adam Clark <adamsgl AT dhbit.ca>
- * moved spell to X11 section
- added this HISTORY file
-
diff --git a/x11-toolkits/openmotif/PRE_BUILD
b/x11-toolkits/openmotif/PRE_BUILD
deleted file mode 100755
index 00407b8..0000000
--- a/x11-toolkits/openmotif/PRE_BUILD
+++ /dev/null
@@ -1,22 +0,0 @@
-default_pre_build &&
-cd $SOURCE_DIRECTORY &&
-patch -p1 < ${SCRIPT_DIRECTORY}/patches/openmotif-2.2.3-mwm-configdir.patch
&&
-bzcat
${SCRIPT_DIRECTORY}/patches/openmotif-2.2.3-CAN-2004-0687-0688.patch.bz2 |
patch -p1 &&
-bzcat
${SCRIPT_DIRECTORY}/patches/openmotif-2.2.3-CAN-2004-0914-newer.patch.bz2 |
patch -p0 &&
-patch -p1 <
${SCRIPT_DIRECTORY}/patches/openmotif-2.2.3-CAN-2004-0914_sec8.patch &&
-patch -p1 <
${SCRIPT_DIRECTORY}/patches/openmotif-2.2.3-char_not_supported.patch &&
-patch -p1 < ${SCRIPT_DIRECTORY}/patches/openmotif-2.2.3-pixel_length.patch &&
-patch -p1 < ${SCRIPT_DIRECTORY}/patches/openmotif-2.2.3-popup_timeout.patch
&&
-patch -p0 <
${SCRIPT_DIRECTORY}/patches/openmotif-2.2.3-XmResizeHashTable.patch &&
-patch -p1 < ${SCRIPT_DIRECTORY}/patches/openmotif-2.2.3-utf8.patch &&
-patch -p1 < ${SCRIPT_DIRECTORY}/patches/openmotif-2.2.3-no_demos.patch &&
-patch -p0 < ${SCRIPT_DIRECTORY}/patches/openmotif-2.2.3-automake.patch &&
-patch -p0 < ${SCRIPT_DIRECTORY}/patches/openmotif-2.2.3-CAN-2005-0605.patch
&&
-
-# autotool stuff
-#export WANT_AUTOCONF=2.5 &&
-
-libtoolize --force --copy &&
-aclocal &&
-automake -a -c -f --foreign &&
-autoconf
diff --git a/x11-toolkits/openmotif/PROVIDES b/x11-toolkits/openmotif/PROVIDES
deleted file mode 100755
index 26ea992..0000000
--- a/x11-toolkits/openmotif/PROVIDES
+++ /dev/null
@@ -1 +0,0 @@
-MOTIF
diff --git
a/x11-toolkits/openmotif/patches/openmotif-2.2.3-CAN-2004-0687-0688.patch.bz2
b/x11-toolkits/openmotif/patches/openmotif-2.2.3-CAN-2004-0687-0688.patch.bz2
deleted file mode 100644
index b61d8e0..0000000
Binary files
a/x11-toolkits/openmotif/patches/openmotif-2.2.3-CAN-2004-0687-0688.patch.bz2
and /dev/null differ
diff --git
a/x11-toolkits/openmotif/patches/openmotif-2.2.3-CAN-2004-0914-newer.patch.bz2

b/x11-toolkits/openmotif/patches/openmotif-2.2.3-CAN-2004-0914-newer.patch.bz2
deleted file mode 100644
index f00beea..0000000
Binary files
a/x11-toolkits/openmotif/patches/openmotif-2.2.3-CAN-2004-0914-newer.patch.bz2
and /dev/null differ
diff --git
a/x11-toolkits/openmotif/patches/openmotif-2.2.3-CAN-2004-0914_sec8.patch
b/x11-toolkits/openmotif/patches/openmotif-2.2.3-CAN-2004-0914_sec8.patch
deleted file mode 100644
index 0bf4bcb..0000000
--- a/x11-toolkits/openmotif/patches/openmotif-2.2.3-CAN-2004-0914_sec8.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- openMotif-2.2.3/lib/Xm/XpmWrFFrI.c.CAN-2004-0914_sec8 2004-11-29
15:04:10.105373839 +0100
-+++ openMotif-2.2.3/lib/Xm/XpmWrFFrI.c 2004-11-29 15:04:10.150367679 +0100
-@@ -322,10 +322,7 @@
- #ifndef NO_ZPIPE
- size_t len = strlen(filename);
-
-- if(len == 0 ||
-- filename[0] == '/' ||
-- strstr(filename, "../") != NULL ||
-- filename[len-1] == '/')
-+ if(len == 0)
- return(XpmOpenFailed);
-
- if (len > 2 && !strcmp(".Z", filename + (len - 2))) {
diff --git
a/x11-toolkits/openmotif/patches/openmotif-2.2.3-CAN-2005-0605.patch
b/x11-toolkits/openmotif/patches/openmotif-2.2.3-CAN-2005-0605.patch
deleted file mode 100644
index f70a884..0000000
--- a/x11-toolkits/openmotif/patches/openmotif-2.2.3-CAN-2005-0605.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- lib/Xm/Xpmscan.c.orig 2005-03-02 17:00:16.415070960 +0100
-+++ lib/Xm/Xpmscan.c 2005-03-02 17:01:38.949709879 +0100
-@@ -672,8 +672,8 @@
- char *dst;
- unsigned int *iptr;
- char *data;
-- unsigned int x, y, i;
-- int bits, depth, ibu, ibpp, offset;
-+ unsigned int x, y;
-+ int bits, depth, ibu, ibpp, offset, i;
- unsigned long lbt;
- Pixel pixel, px;
-
-@@ -684,6 +684,9 @@
- ibpp = image->bits_per_pixel;
- offset = image->xoffset;
-
-+ if (image->bitmap_unit < 0)
-+ return (XpmNoMemory);
-+
- if ((image->bits_per_pixel | image->depth) == 1) {
- ibu = image->bitmap_unit;
- for (y = 0; y < height; y++)
---- lib/Xm/Xpmcreate.c.orig 2005-03-02 17:02:00.626412844 +0100
-+++ lib/Xm/Xpmcreate.c 2005-03-02 17:02:35.183562480 +0100
-@@ -1265,10 +1265,10 @@
- register char *src;
- register char *dst;
- register unsigned int *iptr;
-- register unsigned int x, y, i;
-+ register unsigned int x, y;
- register char *data;
- Pixel pixel, px;
-- int nbytes, depth, ibu, ibpp;
-+ int nbytes, depth, ibu, ibpp, i;
-
- data = image->data;
- iptr = pixelindex;
diff --git
a/x11-toolkits/openmotif/patches/openmotif-2.2.3-XmResizeHashTable.patch
b/x11-toolkits/openmotif/patches/openmotif-2.2.3-XmResizeHashTable.patch
deleted file mode 100644
index 5982f72..0000000
--- a/x11-toolkits/openmotif/patches/openmotif-2.2.3-XmResizeHashTable.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- lib/Xm/Hash.c
-+++ lib/Xm/Hash.c
-@@ -198,6 +198,8 @@
- } else {
- table -> buckets[index] = current;
- }
-+ } else {
-+ last = current;
- }
- current = next;
- }
diff --git a/x11-toolkits/openmotif/patches/openmotif-2.2.3-automake.patch
b/x11-toolkits/openmotif/patches/openmotif-2.2.3-automake.patch
deleted file mode 100644
index ed8fc14..0000000
--- a/x11-toolkits/openmotif/patches/openmotif-2.2.3-automake.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- clients/uil/Makefile.am Fri Aug 15 04:56:19 2003
-+++ clients/uil/Makefile.am.new Tue Feb 8 12:06:15 2005
-@@ -65,6 +65,7 @@
- lib_LTLIBRARIES = libUil.la
-
- libUil_la_SOURCES = $(SRCS)
-+libUil_la_CFLAGS = $(AM_CFLAGS)
-
- libUil_la_DEPENDENCIES = UilDBDef.h UilParser.lo
-
diff --git
a/x11-toolkits/openmotif/patches/openmotif-2.2.3-char_not_supported.patch
b/x11-toolkits/openmotif/patches/openmotif-2.2.3-char_not_supported.patch
deleted file mode 100644
index edd841b..0000000
--- a/x11-toolkits/openmotif/patches/openmotif-2.2.3-char_not_supported.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- openMotif-2.2.3/lib/Xm/TextF.c.char_not_supported 2004-06-03
12:59:10.241822710 +0200
-+++ openMotif-2.2.3/lib/Xm/TextF.c 2004-06-03 13:02:18.987890852 +0200
-@@ -3723,20 +3723,17 @@
- cache_ptr = tmp = XmStackAlloc(buf_size, cache);
-
- tmp_str = (wchar_t *)str;
-- ret_val = wctomb(tmp, *tmp_str);
-+ // Fixed MZ BZ#1257: by Brad Despres <brad AT sd.aonix.com>
- count = 0;
-- while ( (ret_val > 0)&& (buf_size >= MB_CUR_MAX) && (count < n) )
-- {
-- count += 1;
-- tmp += ret_val;
-- buf_size -= ret_val;
-- tmp_str++;
-- ret_val = wctomb(tmp, *tmp_str);
-- }
--
-+ do {
-+ ret_val = wctomb(tmp, *tmp_str);
-+ count += 1;
-+ tmp += ret_val;
-+ buf_size -= ret_val;
-+ tmp_str++;
-+ } while ( (ret_val > 0)&& (buf_size >= MB_CUR_MAX) && (count < n) ) ;
- if (ret_val == -1) /* bad character */
- return (False);
--
- is_printable = XTextWidth(TextF_Font(tf), cache_ptr, tmp - cache_ptr);
- XmStackFree(cache_ptr, cache);
- return (is_printable);
diff --git
a/x11-toolkits/openmotif/patches/openmotif-2.2.3-mwm-configdir.patch
b/x11-toolkits/openmotif/patches/openmotif-2.2.3-mwm-configdir.patch
deleted file mode 100644
index c83f34a..0000000
--- a/x11-toolkits/openmotif/patches/openmotif-2.2.3-mwm-configdir.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-diff -urN openMotif-2.2.2.orig/clients/mwm/WmResParse.c
openMotif-2.2.2/clients/mwm/WmResParse.c
---- openMotif-2.2.2.orig/clients/mwm/WmResParse.c 2002-01-10
21:55:37.000000000 +0100
-+++ openMotif-2.2.2/clients/mwm/WmResParse.c 2003-06-04 22:20:22.000000000
+0200
-@@ -2411,7 +2411,7 @@
- if (MwmBehavior)
- {
- strcpy(cfileName, LIBDIR);
-- strncat(cfileName, "/", MAXWMPATH-strlen(cfileName));
-+ strncat(cfileName, "/mwm/", MAXWMPATH-strlen(cfileName));
- strncat(cfileName, LANG, MAXWMPATH-strlen(cfileName));
- strncat(cfileName, SLASH_MWMRC, MAXWMPATH - strlen(cfileName));
- }
-@@ -2427,7 +2427,7 @@
- * Try /$LANG/system.mwmrc within the install tree
- */
- strcpy(cfileName, LIBDIR);
-- strncat(cfileName, "/", MAXWMPATH-strlen(cfileName));
-+ strncat(cfileName, "/mwm/", MAXWMPATH-strlen(cfileName));
- strncat(cfileName, LANG, MAXWMPATH-strlen(cfileName));
- strncat(cfileName, SLASH_MWMRC, MAXWMPATH - strlen(cfileName));
- #endif /* WSM */
-@@ -2449,7 +2449,7 @@
- if (MwmBehavior)
- {
- strcpy(cfileName, LIBDIR);
-- strncat(cfileName, SLASH_MWMRC, MAXWMPATH - strlen(cfileName));
-+ strncat(cfileName, "/mwm" SLASH_MWMRC, MAXWMPATH - strlen(cfileName));
- #ifdef PANELIST
- fileP = fopen (cfileName, "r");
- #else /* PANELIST */
-@@ -2473,7 +2473,7 @@
- * Try /system.mwmrc within the install tree
- */
- strcpy(cfileName, LIBDIR);
-- strncat(cfileName, SLASH_MWMRC, MAXWMPATH - strlen(cfileName));
-+ strncat(cfileName, "/mwm" SLASH_MWMRC, MAXWMPATH - strlen(cfileName));
-
- if (LANG != NULL)
- {
diff --git a/x11-toolkits/openmotif/patches/openmotif-2.2.3-no_demos.patch
b/x11-toolkits/openmotif/patches/openmotif-2.2.3-no_demos.patch
deleted file mode 100644
index d0a3969..0000000
--- a/x11-toolkits/openmotif/patches/openmotif-2.2.3-no_demos.patch
+++ /dev/null
@@ -1,101 +0,0 @@
---- openmotif/configure.in.no_demos 2003-09-19 18:40:33.000000000 +0200
-+++ openmotif/configure.in 2003-12-16 12:16:33.000000000 +0100
-@@ -259,88 +259,4 @@
- doc/man/man5/Makefile \
- tools/Makefile \
- tools/wml/Makefile \
--demos/Makefile \
--demos/lib/Makefile \
--demos/lib/Xmd/Makefile \
--demos/lib/Wsm/Makefile \
--demos/lib/Exm/Makefile \
--demos/lib/Exm/wml/Makefile \
--demos/programs/Makefile \
--demos/programs/Exm/Makefile \
--demos/programs/Exm/app_in_c/Makefile \
--demos/programs/Exm/app_in_uil/Makefile \
--demos/programs/Exm/simple_app/Makefile \
--demos/programs/airport/Makefile \
--demos/programs/animate/Makefile \
--demos/programs/drag_and_drop/Makefile \
--demos/programs/draw/Makefile \
--demos/programs/earth/Makefile \
--demos/programs/filemanager/Makefile \
--demos/programs/fileview/Makefile \
--demos/programs/getsubres/Makefile \
--demos/programs/hellomotif/Makefile \
--demos/programs/hellomotifi18n/Makefile \
--demos/programs/hellomotifi18n/C/Makefile \
--demos/programs/hellomotifi18n/C/uid/Makefile \
--demos/programs/hellomotifi18n/english/Makefile \
--demos/programs/hellomotifi18n/english/uid/Makefile \
--demos/programs/hellomotifi18n/french/Makefile \
--demos/programs/hellomotifi18n/french/uid/Makefile \
--demos/programs/hellomotifi18n/hebrew/Makefile \
--demos/programs/hellomotifi18n/hebrew/uid/Makefile \
--demos/programs/hellomotifi18n/japan/Makefile \
--demos/programs/hellomotifi18n/japan/uid/Makefile \
--demos/programs/hellomotifi18n/japanese/Makefile \
--demos/programs/hellomotifi18n/japanese/uid/Makefile \
--demos/programs/hellomotifi18n/swedish/Makefile \
--demos/programs/hellomotifi18n/swedish/uid/Makefile \
--demos/programs/i18ninput/Makefile \
--demos/programs/panner/Makefile \
--demos/programs/periodic/Makefile \
--demos/programs/piano/Makefile \
--demos/programs/popups/Makefile \
--demos/programs/sampler2_0/Makefile \
--demos/programs/setdate/Makefile \
--demos/programs/todo/Makefile \
--demos/programs/workspace/Makefile \
--demos/programs/tooltips/Makefile \
--demos/programs/FontSel/Makefile \
--demos/programs/ButtonBox/Makefile \
--demos/programs/ColorSel/Makefile \
--demos/programs/Column/Makefile \
--demos/programs/DropDown/Makefile \
--demos/programs/MultiList/Makefile \
--demos/programs/MultiList/pixmaps/Makefile \
--demos/programs/IconB/Makefile \
--demos/programs/Outline/Makefile \
--demos/programs/Paned/Makefile \
--demos/programs/TabStack/Makefile \
--demos/programs/Tree/Makefile \
--demos/programs/pixmaps/Makefile \
--demos/unsupported/Makefile \
--demos/unsupported/Exm/Makefile \
--demos/unsupported/aicon/Makefile \
--demos/unsupported/dainput/Makefile \
--demos/unsupported/dogs/Makefile \
--demos/unsupported/hellomotif/Makefile \
--demos/unsupported/motifshell/Makefile \
--demos/unsupported/uilsymdump/Makefile \
--demos/unsupported/xmapdef/Makefile \
--demos/unsupported/xmfonts/Makefile \
--demos/unsupported/xmforc/Makefile \
--demos/unsupported/xmform/Makefile \
--demos/doc/Makefile \
--demos/doc/programGuide/Makefile \
--demos/doc/programGuide/ch05/Makefile \
--demos/doc/programGuide/ch05/Scale/Makefile \
--demos/doc/programGuide/ch06/Makefile \
--demos/doc/programGuide/ch06/spin_box/Makefile \
--demos/doc/programGuide/ch06/combo_box/Makefile \
--demos/doc/programGuide/ch08/Makefile \
--demos/doc/programGuide/ch08/Notebook/Makefile \
--demos/doc/programGuide/ch08/Container/Makefile \
--demos/doc/programGuide/ch16/Makefile \
--demos/doc/programGuide/ch17/Makefile \
--demos/doc/programGuide/ch17/simple_drop/Makefile \
--demos/doc/programGuide/ch17/simple_drag/Makefile \
- ])
---- openmotif/Makefile.am.no_demos 2003-12-16 12:17:02.000000000 +0100
-+++ openmotif/Makefile.am 2003-12-16 12:17:03.000000000 +0100
-@@ -28,6 +28,5 @@
- include \
- tools \
- clients \
-- doc \
-- demos
-+ doc
- AUTOMAKE_OPTIONS = 1.4
diff --git
a/x11-toolkits/openmotif/patches/openmotif-2.2.3-pixel_length.patch
b/x11-toolkits/openmotif/patches/openmotif-2.2.3-pixel_length.patch
deleted file mode 100644
index 7aba08b..0000000
--- a/x11-toolkits/openmotif/patches/openmotif-2.2.3-pixel_length.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- openMotif-2.2.3/lib/Xm/DataF.c.pixel_length 2004-06-03
15:11:52.932820812 +0200
-+++ openMotif-2.2.3/lib/Xm/DataF.c 2004-06-03 15:12:27.323091126 +0200
-@@ -8648,7 +8648,7 @@
- curr_str++;
- i++;
- } else {
-- wchar_t tmp;
-+ wchar_t tmp[XmTextF_max_char_size(tf)+1];
- int num_conv;
- num_conv = mbtowc(&tmp, curr_str, XmTextF_max_char_size(tf));
- if (num_conv >= 0 && df_FindPixelLength(tf, (char*) &tmp, 1)) {
diff --git
a/x11-toolkits/openmotif/patches/openmotif-2.2.3-popup_timeout.patch
b/x11-toolkits/openmotif/patches/openmotif-2.2.3-popup_timeout.patch
deleted file mode 100644
index f216abe..0000000
--- a/x11-toolkits/openmotif/patches/openmotif-2.2.3-popup_timeout.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- openMotif-2.2.3/lib/Xm/MenuUtil.c.popup_timeout 2002-01-31
15:49:35.000000000 +0100
-+++ openMotif-2.2.3/lib/Xm/MenuUtil.c 2004-06-08 17:14:46.311285603 +0200
-@@ -156,6 +156,9 @@
- cursor, time)) == GrabSuccess)
- break;
-
-+ if (status == GrabInvalidTime)
-+ time = CurrentTime;
-+
- XmeMicroSleep(1000);
- }
- if (status != GrabSuccess)
diff --git a/x11-toolkits/openmotif/patches/openmotif-2.2.3-utf8.patch
b/x11-toolkits/openmotif/patches/openmotif-2.2.3-utf8.patch
deleted file mode 100644
index bb7c7f8..0000000
--- a/x11-toolkits/openmotif/patches/openmotif-2.2.3-utf8.patch
+++ /dev/null
@@ -1,77 +0,0 @@
---- openMotif-2.2.3/tools/wml/UilSymCSet.h.utf8 2004-03-04
17:41:48.000000000 +0100
-+++ openMotif-2.2.3/tools/wml/UilSymCSet.h 2004-03-17 12:54:23.000000000
+0100
-@@ -32,6 +32,7 @@
- "JISX0201.1976-0", /* jis_katakana */
- "KSC5601.1987-0", /* ksc_hangul */
- "KSC5601.1987-1", /* ksc_hangul_gr */
-+ "UTF-8", /* utf-8 */
- };
- externaldef(uil_sym_glbl) char **charset_xmstring_names_table =
- charset_xmstring_names_table_vec;
-@@ -66,6 +67,7 @@
- XmSTRING_DIRECTION_L_TO_R, /* jis_katakana */
- XmSTRING_DIRECTION_L_TO_R, /* ksc_hangul */
- XmSTRING_DIRECTION_L_TO_R, /* ksc_hangul_gr */
-+ XmSTRING_DIRECTION_L_TO_R, /* utf-8 */
- };
- externaldef(uil_sym_glbl) unsigned char *charset_writing_direction_table =
- charset_wrdirection_table_vec;
-@@ -100,6 +102,7 @@
- XmSTRING_DIRECTION_L_TO_R, /* jis_katakana */
- XmSTRING_DIRECTION_L_TO_R, /* ksc_hangul */
- XmSTRING_DIRECTION_L_TO_R, /* ksc_hangul_gr */
-+ XmSTRING_DIRECTION_L_TO_R, /* utf-8 */
- };
- externaldef(uil_sym_glbl) unsigned char *charset_parsing_direction_table =
- charset_parsdirection_table_vec;
-@@ -134,6 +137,7 @@
- sym_k_onebyte_charsize, /* jis_katakana */
- sym_k_twobyte_charsize, /* ksc_hangul */
- sym_k_twobyte_charsize, /* ksc_hangul_gr */
-+ sym_k_onebyte_charsize, /* utf-8 */
- };
- externaldef(uil_sym_glbl) unsigned char *charset_character_size_table =
- charset_charsize_table_vec;
-@@ -215,6 +219,7 @@
- "KSC_HANGUL_GL", /* ksc_hangul */
- "KSC_HANGUL_GR", /* ksc_hangul_gr */
- "KSC5601.1987-1", /* ksc_hangul_gr */
-+ "UTF-8", /* utf-8 */
- };
- externaldef(uil_sym_glbl) char **charset_lang_names_table =
- charset_lang_names_table_vec;
-@@ -295,10 +300,11 @@
- sym_k_ksc_hangul_charset,
- sym_k_ksc_hangul_gr_charset,
- sym_k_ksc_hangul_gr_charset,
-+ sym_k_utf8_charset,
- };
- externaldef(uil_sym_glbl) unsigned short int *charset_lang_codes_table =
- charset_lang_codes_table_vec;
- /*
- * The number of entries in charset_lang_..._table tables
- */
--externaldef(uil_sym_glbl) unsigned short int charset_lang_table_max = 72;
-+externaldef(uil_sym_glbl) unsigned short int charset_lang_table_max = 73;
---- openMotif-2.2.3/tools/wml/UilSymGen.h.utf8 2004-03-04 17:41:48.000000000
+0100
-+++ openMotif-2.2.3/tools/wml/UilSymGen.h 2004-03-17 12:54:23.000000000
+0100
-@@ -1417,6 +1417,7 @@
- #define sym_k_jis_katakana_charset 21
- #define sym_k_ksc_hangul_charset 22
- #define sym_k_ksc_hangul_gr_charset 23
-+#define sym_k_utf8_charset 24
-
- /* Define literals for automatic children */
-
---- openMotif-2.2.3/tools/wml/motif.wml.utf8 2003-10-08 23:07:47.000000000
+0200
-+++ openMotif-2.2.3/tools/wml/motif.wml 2004-03-17 12:56:09.000000000
+0100
-@@ -163,6 +163,9 @@
- ksc_hangul_gr
- { XmStringCharsetName = "KSC5601.1987-1";
- CharacterSize = TwoByte; };
-+ utf8
-+ { XmStringCharsetName = "UTF-8"; };
-+
- XmFONTLIST_DEFAULT_TAG
- { FontListElementTag = XmFONTLIST_DEFAULT_TAG; };
-
diff --git a/x11-toolkits/qt4/175791_4.diff b/x11-toolkits/qt4/175791_4.diff
deleted file mode 100644
index 645daa6..0000000
--- a/x11-toolkits/qt4/175791_4.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/corelib/codecs/qutfcodec.cpp
-+++ src/corelib/codecs/qutfcodec.cpp
-@@ -140,7 +140,7 @@ void QUtf8Codec::convertToUnicode(QString *target, const
char *chars, int len, C
-
- int originalLength = target->length();
- QString &result = *target;
-- result.resize(originalLength + len); // worst case
-+ result.resize(originalLength + len + 1); // worst case
- QChar *qch = result.data() + originalLength;
- uchar ch;
- int invalid = 0;
diff --git a/x11-toolkits/qt4/DETAILS b/x11-toolkits/qt4/DETAILS
index 120ed42..0e74572 100755
--- a/x11-toolkits/qt4/DETAILS
+++ b/x11-toolkits/qt4/DETAILS
@@ -2,21 +2,21 @@
SPELLX=qt-x11-opensource-src
case $QT_VER in
snapshot)
- VERSION=4.3.2-snapshot-$(date +%Y%m%d)
+ VERSION=4.3.3-snapshot-$(date +%Y%m%d)
SOURCE_HASH=ignore
SOURCE=$SPELLX-$VERSION.tar.bz2
URI=qt/snapshots/$SOURCE
;;
prerelease)
- VERSION=4.3.1
-
SOURCE_HASH=sha512:2f2abaf38cd006ed6e83e06820ac4ff7d434e71459332b6bbef95564a60709b422f731b5aa86eca38b44e21e300b68b6957441d6515cf9a2e0935aee32ac97ac
+ VERSION=4.3.2
+
SOURCE_HASH=sha512:74658efebd69ef11cc75ac7d71cfca82ba6d5c1c61e09de51e5615afc170047d411213dab0d472d04ba1865b5c4a6cd46ab4df5ed55194bdd4e9bf3fea3e29e1
SOURCE=$SPELLX-$VERSION.tar.gz
URI=qt/source/$SOURCE
SECURITY_PATCH=2
;;
*) #stable
- VERSION=4.3.1
-
SOURCE_HASH=sha512:2f2abaf38cd006ed6e83e06820ac4ff7d434e71459332b6bbef95564a60709b422f731b5aa86eca38b44e21e300b68b6957441d6515cf9a2e0935aee32ac97ac
+ VERSION=4.3.2
+
SOURCE_HASH=sha512:74658efebd69ef11cc75ac7d71cfca82ba6d5c1c61e09de51e5615afc170047d411213dab0d472d04ba1865b5c4a6cd46ab4df5ed55194bdd4e9bf3fea3e29e1
SOURCE=$SPELLX-$VERSION.tar.gz
URI=qt/source/$SOURCE
SECURITY_PATCH=2
diff --git a/x11-toolkits/qt4/HISTORY b/x11-toolkits/qt4/HISTORY
index 4344d91..357c376 100644
--- a/x11-toolkits/qt4/HISTORY
+++ b/x11-toolkits/qt4/HISTORY
@@ -1,3 +1,11 @@
+2007-10-16 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: update snapshot to 4.3.3
+
+2007-10-13 George Sherwood <george AT beernabeer.com>
+ * DETAILS: Updated to version 4.3.2
+ * PRE_BUILD: Removed incorporated patch
+ * 175791_4.diff: Removed. Incoporated upstream.
+
2007-09-08 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: SECURITY_PATCH++
* PRE_BUILD: apply patch
diff --git a/x11-toolkits/qt4/PRE_BUILD b/x11-toolkits/qt4/PRE_BUILD
index fcc3f38..71fe71e 100755
--- a/x11-toolkits/qt4/PRE_BUILD
+++ b/x11-toolkits/qt4/PRE_BUILD
@@ -1,10 +1,6 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&

-# apply patches
-if [[ $QT_VER != snapshot ]]; then
- patch -p0 < $SPELL_DIRECTORY/175791_4.diff
-fi &&

# add better optimisation flags
# -O2 gives segmentation fault in moc when building tools
diff --git a/x11-toolkits/sptk/DETAILS b/x11-toolkits/sptk/DETAILS
index d3f0f94..e326ab0 100755
--- a/x11-toolkits/sptk/DETAILS
+++ b/x11-toolkits/sptk/DETAILS
@@ -1,6 +1,6 @@
SPELL=sptk
- VERSION=3.5.5-r1
-
SOURCE_HASH=sha512:433552fd1c9362b6abdc99cb39f2f46308d312fd0301e9a621ea011ed563b8808f94ef4a475b52286dcd8690a7bb67a2ae1508282c58407fae32416018432adc
+ VERSION=3.5.6
+
SOURCE_HASH=sha512:b6f1a0ca85b18236f79fda4edc5abe8833175790faecc373d0a83aba5a64f10e3f793e1543f4389f813283b2e0368eaf688ddbefb008f299f42a06138c85cfe8
SOURCE=$SPELL-$VERSION.tbz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELL}-${VERSION//-r?}
WEB_SITE=http://www.sptk.net
diff --git a/x11-toolkits/sptk/HISTORY b/x11-toolkits/sptk/HISTORY
index 9289db3..90102a5 100644
--- a/x11-toolkits/sptk/HISTORY
+++ b/x11-toolkits/sptk/HISTORY
@@ -1,3 +1,6 @@
+2007-11-03 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 3.5.6
+
2007-09-27 Treeve Jelbert <treeve AT sourcemage.org>
* BUILD: eliminate for loop

diff --git a/x11-toolkits/wxgtk-no-unicode/DEPENDS
b/x11-toolkits/wxgtk-no-unicode/DEPENDS
index 9785cde..492fb75 100755
--- a/x11-toolkits/wxgtk-no-unicode/DEPENDS
+++ b/x11-toolkits/wxgtk-no-unicode/DEPENDS
@@ -1,6 +1,4 @@
-depends gcc34 &&
-
- depends gtk+ &&
+depends gtk+2 '--enable-gtk2' &&

depends X11-LIBS '--with-x --with-libxpm' &&

diff --git a/x11-toolkits/wxgtk-no-unicode/DETAILS
b/x11-toolkits/wxgtk-no-unicode/DETAILS
index 90f0416..20e91ff 100755
--- a/x11-toolkits/wxgtk-no-unicode/DETAILS
+++ b/x11-toolkits/wxgtk-no-unicode/DETAILS
@@ -1,7 +1,7 @@
SPELL=wxgtk-no-unicode
SPELLX=wxAll
VERSION=2.4.2
-
SOURCE_HASH=sha512:19cc25c933411fb71369e35584f6b7daa454b79d6d91a38f81501cd5a318fffd423f010d9ec3db856222badee6b58c0d3b6d023326b2d19a48c1b4b846774894
+
SOURCE_HASH=sha512:19cc25c933411fb71369e35584f6b7daa454b79d6d91a38f81501cd5a318fffd423f010d9ec3db856222badee6b58c0d3b6d023326b2d19a48c1b4b846774894
SOURCE=$SPELLX-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/wxWindows-${VERSION}
SOURCE_URL[0]=$SOURCEFORGE_URL/wxwindows/$SOURCE
@@ -9,7 +9,6 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/wxWindows-${VERSION}
WEB_SITE=http://www.wxwidgets.org/
ENTERED=20011217
TMPFS=off
- GCC_VERSION=3.4
KEYWORDS="x11 libs"
SHORT='GTK+ verion of wxWidgets API'
cat << EOF
diff --git a/x11-toolkits/wxgtk-no-unicode/HISTORY
b/x11-toolkits/wxgtk-no-unicode/HISTORY
index 20497eb..e2b4394 100644
--- a/x11-toolkits/wxgtk-no-unicode/HISTORY
+++ b/x11-toolkits/wxgtk-no-unicode/HISTORY
@@ -1,3 +1,15 @@
+2007-10-07 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
+ * DETAILS: no more use of gcc 3.4
+ * DEPENDS: use gtk+2, no more gcc 3.4
+ * PRE_BUILD: added to apply patches
+ * wxGTK-2.4.1-contrib.patch: various cleanups
+ * wxGTK-2.4.2-cleanup.patch: various cleanups
+ * wxGTK-2.4.2-contrib_animate.patch: various cleanups
+ * wxGTK-2.4.2-gcc4.patch: fixes to build against gcc 4
+ * wxGTK-2.4.2-menu.cpp.patch: various cleanups
+ * wxGTK-2.4.2-noftinternals.patch: fixes for freetype update
+ * wxGTK-2.4.2-pango_fix.patch: fixes for pango
+
2007-03-12 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: Added GCC_VERSION=3.4, audacity 1.2.6 won't build
with patched wxgtk-no-unicode.
diff --git a/x11-toolkits/wxgtk-no-unicode/PRE_BUILD
b/x11-toolkits/wxgtk-no-unicode/PRE_BUILD
new file mode 100755
index 0000000..b73fec0
--- /dev/null
+++ b/x11-toolkits/wxgtk-no-unicode/PRE_BUILD
@@ -0,0 +1,12 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+patch -p1 < ${SPELL_DIRECTORY}/wxGTK-2.4.2-menu.cpp.patch &&
+patch -p1 < ${SPELL_DIRECTORY}/wxGTK-2.4.1-contrib.patch &&
+pushd contrib/src &&
+patch -p0 < ${SPELL_DIRECTORY}/wxGTK-2.4.2-contrib_animate.patch &&
+popd
+patch -p0 < ${SPELL_DIRECTORY}/wxGTK-2.4.2-pango_fix.patch &&
+patch -p1 < ${SPELL_DIRECTORY}/wxGTK-2.4.2-cleanup.patch &&
+patch -p0 < ${SPELL_DIRECTORY}/wxGTK-2.4.2-gcc4.patch &&
+patch -p1 < ${SPELL_DIRECTORY}/wxGTK-2.4.2-noftinternals.patch
+
diff --git a/x11-toolkits/wxgtk-no-unicode/wxGTK-2.4.1-contrib.patch
b/x11-toolkits/wxgtk-no-unicode/wxGTK-2.4.1-contrib.patch
new file mode 100644
index 0000000..6332e0e
--- /dev/null
+++ b/x11-toolkits/wxgtk-no-unicode/wxGTK-2.4.1-contrib.patch
@@ -0,0 +1,13 @@
+--- wxGTK-2.4.1/contrib/src/xrc/Makefile.in 2003-09-09 16:46:13.468009816
+0100
++++ wxGTK-2.4.1/contrib/src/xrc/Makefile.in 2003-09-09 16:46:50.065446160
+0100
+@@ -17,7 +17,9 @@
+ HEADER_SUBDIR=xrc
+
+ EXPAT_DEFS=-I$(expat_dir)/xmlparse -I$(expat_dir)/xmltok
+-EXPAT_OBJECTS=xmltok.o xmlrole.o xmlparse.o
++EXPAT_OBJECTS=$(expat_dir)/xmltok/xmltok.o \
++ $(expat_dir)/xmltok/xmlrole.o \
++ $(expat_dir)/xmlparse/xmlparse.o
+
+ HEADERS=xh_all.h xh_bttn.h xh_chckb.h xh_chckl.h xh_choic.h xh_combo.h \
+ xh_dlg.h xh_gauge.h xh_html.h xh_menu.h xh_notbk.h xh_panel.h \
diff --git a/x11-toolkits/wxgtk-no-unicode/wxGTK-2.4.2-cleanup.patch
b/x11-toolkits/wxgtk-no-unicode/wxGTK-2.4.2-cleanup.patch
new file mode 100644
index 0000000..b75b5e6
--- /dev/null
+++ b/x11-toolkits/wxgtk-no-unicode/wxGTK-2.4.2-cleanup.patch
@@ -0,0 +1,446 @@
+diff -ur wxGTK-2.4.2/contrib/include/wx/fl/controlbar.h
wxGTK-2.4.2-fixed/contrib/include/wx/fl/controlbar.h
+--- wxGTK-2.4.2/contrib/include/wx/fl/controlbar.h 2003-09-21
07:32:10.000000000 -0400
++++ wxGTK-2.4.2-fixed/contrib/include/wx/fl/controlbar.h 2003-11-10
16:54:25.840115752 -0500
+@@ -825,7 +825,8 @@
+ };
+
+ // FIXME: this array definition compiles but probably doesn't do what was
intended (GD)
+-WXFL_DEFINE_ARRAY_LONG(float, cbArrayFloat);
++//WXFL_DEFINE_ARRAY_LONG(float, cbArrayFloat);
++WXFL_DEFINE_ARRAY_LONG(long, cbArrayFloat);
+
+ /*
+ Helper class used internally by the wxFrameLayout class.
+diff -ur wxGTK-2.4.2/contrib/src/canvas/canvas.cpp
wxGTK-2.4.2-fixed/contrib/src/canvas/canvas.cpp
+--- wxGTK-2.4.2/contrib/src/canvas/canvas.cpp 2003-09-21 07:32:40.000000000
-0400
++++ wxGTK-2.4.2-fixed/contrib/src/canvas/canvas.cpp 2003-11-10
16:43:15.910960464 -0500
+@@ -325,7 +325,7 @@
+
+ if ( rightu - leftu < 2*recold.width && bottomu - topu <
2*recold.height)
+ {
+- dc.Blit(leftu,topu,rightu - leftu,bottomu -
topu,&dcm,leftu,topu,wxCOPY,FALSE);
++ dc.Blit((int)leftu,(int)topu,(int)(rightu -
leftu),(int)(bottomu - topu),&dcm,(int)leftu,(int)topu,wxCOPY,FALSE);
+ }
+ else
+ {
+@@ -1280,7 +1280,7 @@
+ int pw=m_pen.GetWidth();
+ m_pen.SetWidth(m_admin->LogicalToDeviceXRel(pw));
+ dc->SetPen( m_pen );
+- dc->DrawLine( x1, y1, x2, y2 );
++ dc->DrawLine( (int)x1, (int)y1, (int)x2, (int)y2 );
+
+ dc->DestroyClippingRegion();
+ m_pen.SetWidth(pw);
+@@ -1467,7 +1467,7 @@
+ else
+ {
+ dc->SetClippingRegion( clip_x, clip_y, clip_width, clip_height );
+- dc->DrawBitmap( bmp, x, y, TRUE );
++ dc->DrawBitmap( bmp, (int)x, (int)y, TRUE );
+ dc->DestroyClippingRegion();
+ }
+ }
+@@ -2548,14 +2548,14 @@
+ double dmvx = m_virtm_maxX - m_virtm_minX;
+ double dmvy = m_virtm_maxY - m_virtm_minY;
+
+- SetScrollbar(wxHORIZONTAL,(m_virt_minX-m_virtm_minX)/dmvx
*1000,dvx/dmvx *1000,1000,FALSE);
++ SetScrollbar(wxHORIZONTAL,(int)((m_virt_minX-m_virtm_minX)/dmvx
*1000),(int)(dvx/dmvx *1000),1000,FALSE);
+ if (m_yaxis)
+ {
+- SetScrollbar(wxVERTICAL,(m_virtm_maxY-m_virt_maxY)/dmvy
*1000,dvy/dmvy *1000,1000,FALSE);
++ SetScrollbar(wxVERTICAL,(int)((m_virtm_maxY-m_virt_maxY)/dmvy
*1000),(int)(dvy/dmvy *1000),1000,FALSE);
+ }
+ else
+ {
+- SetScrollbar(wxVERTICAL,(m_virt_minY-m_virtm_minY)/dmvy
*1000,dvy/dmvy *1000,1000,FALSE);
++ SetScrollbar(wxVERTICAL,(int)((m_virt_minY-m_virtm_minY)/dmvy
*1000),(int)(dvy/dmvy *1000),1000,FALSE);
+ }
+
+ m_scrolled=TRUE;
+@@ -2628,13 +2628,13 @@
+ {
+ double
x=m_virtm_minX+event.GetPosition()/1000.0*(m_virtm_maxX-m_virtm_minX);
+ x=LogicalToDeviceXRel(x-m_virt_minX);
+- ScrollWindow(-x, 0, (const wxRect *) NULL);
++ ScrollWindow((int)-x, 0, (const wxRect *) NULL);
+ }
+ else
+ {
+ double
y=m_virtm_minY+event.GetPosition()/1000.0*(m_virtm_maxY-m_virtm_minY);
+ y=LogicalToDeviceYRel(y-m_virt_minY);
+- ScrollWindow(0, -y, (const wxRect *) NULL);
++ ScrollWindow(0, (int)-y, (const wxRect *) NULL);
+ }
+ }
+ else if (event.GetEventType()==wxEVT_SCROLLWIN_PAGEUP)
+@@ -2642,12 +2642,12 @@
+ if (event.GetOrientation()==wxHORIZONTAL)
+ {
+ double x=GetBufferWidth();
+- ScrollWindow(x, 0, (const wxRect *) NULL);
++ ScrollWindow((int)x, 0, (const wxRect *) NULL);
+ }
+ else
+ {
+ double y=GetBufferHeight();
+- ScrollWindow(0, y, (const wxRect *) NULL);
++ ScrollWindow(0, (int)y, (const wxRect *) NULL);
+ }
+ }
+ else if (event.GetEventType()==wxEVT_SCROLLWIN_PAGEDOWN)
+@@ -2655,12 +2655,12 @@
+ if (event.GetOrientation()==wxHORIZONTAL)
+ {
+ double x=-GetBufferWidth();
+- ScrollWindow(x, 0, (const wxRect *) NULL);
++ ScrollWindow((int)x, 0, (const wxRect *) NULL);
+ }
+ else
+ {
+ double y=-GetBufferHeight();
+- ScrollWindow(0, y, (const wxRect *) NULL);
++ ScrollWindow(0, (int)y, (const wxRect *) NULL);
+ }
+ }
+ else if (event.GetEventType()==wxEVT_SCROLLWIN_LINEUP)
+@@ -2668,12 +2668,12 @@
+ if (event.GetOrientation()==wxHORIZONTAL)
+ {
+ int x=GetBufferWidth()/10;
+- ScrollWindow(x, 0, (const wxRect *) NULL);
++ ScrollWindow((int)x, 0, (const wxRect *) NULL);
+ }
+ else
+ {
+ int y=GetBufferHeight()/10;
+- ScrollWindow(0, y, (const wxRect *) NULL);
++ ScrollWindow(0, (int)y, (const wxRect *) NULL);
+ }
+ }
+ else if (event.GetEventType()==wxEVT_SCROLLWIN_LINEDOWN)
+@@ -2681,12 +2681,12 @@
+ if (event.GetOrientation()==wxHORIZONTAL)
+ {
+ int x=-GetBufferWidth()/10;
+- ScrollWindow(x, 0, (const wxRect *) NULL);
++ ScrollWindow((int)x, 0, (const wxRect *) NULL);
+ }
+ else
+ {
+ int y=-GetBufferHeight()/10;
+- ScrollWindow(0, y, (const wxRect *) NULL);
++ ScrollWindow(0, (int)y, (const wxRect *) NULL);
+ }
+ }
+
+@@ -2700,28 +2700,28 @@
+ case WXK_PRIOR:
+ {
+ double y=GetBufferHeight();
+- ScrollWindow(0, y, (const wxRect *) NULL);
++ ScrollWindow(0, (int)y, (const wxRect *) NULL);
+ }
+ break;
+ case WXK_PAGEDOWN:
+ case WXK_NEXT:
+ {
+ double y=-GetBufferHeight();
+- ScrollWindow(0, y, (const wxRect *) NULL);
++ ScrollWindow(0, (int)y, (const wxRect *) NULL);
+ }
+ break;
+ case WXK_HOME:
+ {
+ double y=m_virtm_minY;
+ y=LogicalToDeviceYRel(y-m_virt_minY);
+- ScrollWindow(0, -y, (const wxRect *) NULL);
++ ScrollWindow(0, (int)-y, (const wxRect *) NULL);
+ }
+ break;
+ case WXK_END:
+ {
+ double y=m_virtm_minY+(m_virtm_maxY-m_virtm_minY);
+ y=LogicalToDeviceYRel(y-m_virt_minY);
+- ScrollWindow(0, -y, (const wxRect *) NULL);
++ ScrollWindow(0, (int)-y, (const wxRect *) NULL);
+ }
+ break;
+ case WXK_UP:
+diff -ur wxGTK-2.4.2/contrib/src/fl/controlbar.cpp
wxGTK-2.4.2-fixed/contrib/src/fl/controlbar.cpp
+--- wxGTK-2.4.2/contrib/src/fl/controlbar.cpp 2003-09-21 07:32:40.000000000
-0400
++++ wxGTK-2.4.2-fixed/contrib/src/fl/controlbar.cpp 2003-11-10
20:24:24.019901312 -0500
+@@ -2675,8 +2679,8 @@
+ {
+ if ( !pCur->IsFixed() )
+ {
+- ratios.Add( 0.0 );
+- ratios[ ratios.GetCount() - 1 ] = pCur->mLenRatio;
++ ratios.Add( (long)0.0 );
++ ratios[ ratios.GetCount() - 1 ] = (long)pCur->mLenRatio;
+ }
+
+ pCur = pCur->mpNext;
+diff -ur wxGTK-2.4.2/contrib/src/mmedia/sndcpcm.cpp
wxGTK-2.4.2-fixed/contrib/src/mmedia/sndcpcm.cpp
+--- wxGTK-2.4.2/contrib/src/mmedia/sndcpcm.cpp 2003-09-21 07:32:44.000000000
-0400
++++ wxGTK-2.4.2-fixed/contrib/src/mmedia/sndcpcm.cpp 2003-11-10
21:25:18.066401808 -0500
+@@ -51,7 +51,7 @@
+ // -----------------------------------------------------------------------
+
+ #define DEFINE_CONV(name, input_type, output_type, convert) \
+-static void Convert_##name##(const void *buf_in, void *buf_out, wxUint32
len) \
++static void Convert_##name(const void *buf_in, void *buf_out, wxUint32 len)
\
+ {\
+ register input_type src; \
+ register const input_type *t_buf_in = (input_type *)buf_in; \
+diff -ur wxGTK-2.4.2/contrib/src/mmedia/vidxanm.cpp
wxGTK-2.4.2-fixed/contrib/src/mmedia/vidxanm.cpp
+--- wxGTK-2.4.2/contrib/src/mmedia/vidxanm.cpp 2003-09-21 07:32:46.000000000
-0400
++++ wxGTK-2.4.2-fixed/contrib/src/mmedia/vidxanm.cpp 2003-11-10
22:21:10.604738512 -0500
+@@ -465,11 +465,13 @@
+ // Get current display
+ #ifdef __WXGTK__
+ m_internal->xanim_dpy = gdk_display;
+- GtkPizza *pizza = GTK_PIZZA( m_video_output->m_wxwindow );
+- GdkWindow *window = pizza->bin_window;
++ // GtkPizza *pizza = GTK_PIZZA( m_video_output->m_wxwindow ); // unused
++ // GdkWindow *window = pizza->bin_window; // unused
+
+- m_internal->xanim_window =
+- ((GdkWindowPrivate *)window)->xwindow;
++ /* I think this is what you want. Not to sure. */
++ /* m_internal->xanim_window =
++ ((GdkWindowPrivate *)window)->xwindow; */
++ m_internal->xanim_window = gdk_x11_get_default_root_xwindow();
+ #endif
+ // Get the XANIM atom
+ m_internal->xanim_atom = XInternAtom(m_internal->xanim_dpy,
+@@ -477,7 +479,7 @@
+
+ // Build the command
+ xanim_command.Printf(wxT("xanim -Zr +Ze +Sr +f +W%d +f +q "
+- "+Av70 %s %s"), m_internal->xanim_window,
++ "+Av70 %s %s"), (int)m_internal->xanim_window,
+ (xanim_chg_size) ? _T("") : _T(""),
+ WXSTRINGCAST m_filename);
+
+diff -ur wxGTK-2.4.2/contrib/src/ogl/composit.cpp
wxGTK-2.4.2-fixed/contrib/src/ogl/composit.cpp
+--- wxGTK-2.4.2/contrib/src/ogl/composit.cpp 2003-09-21 07:32:46.000000000
-0400
++++ wxGTK-2.4.2-fixed/contrib/src/ogl/composit.cpp 2003-11-10
14:17:19.286169776 -0500
+@@ -1182,8 +1182,8 @@
+ double maxX, maxY;
+
+ GetBoundingBoxMax(&maxX, &maxY);
+- double x, y;
+- int direction;
++ double x = 0.0, y = 0.0;
++ int direction = 0;
+ /*
+ if (m_leftSide)
+ {
+diff -ur wxGTK-2.4.2/contrib/src/ogl/drawn.cpp
wxGTK-2.4.2-fixed/contrib/src/ogl/drawn.cpp
+--- wxGTK-2.4.2/contrib/src/ogl/drawn.cpp 2003-09-21 07:32:47.000000000
-0400
++++ wxGTK-2.4.2-fixed/contrib/src/ogl/drawn.cpp 2003-11-10
20:55:51.544953888 -0500
+@@ -430,7 +431,7 @@
+ {
+ // Check for overriding this operation for outline
+ // colour
+- if (m_image->m_outlineColours.Member((wxObject *)m_gdiIndex))
++ if (m_image->m_outlineColours.Member((wxObject *)(long)m_gdiIndex))
+ {
+ if (m_image->m_outlinePen)
+ dc.SetPen(* m_image->m_outlinePen);
+@@ -451,7 +452,7 @@
+ {
+ // Check for overriding this operation for outline or fill
+ // colour
+- if (m_image->m_outlineColours.Member((wxObject *)m_gdiIndex))
++ if (m_image->m_outlineColours.Member((wxObject *)(long)m_gdiIndex))
+ {
+ // Need to construct a brush to match the outline pen's colour
+ if (m_image->m_outlinePen)
+@@ -461,7 +462,7 @@
+ dc.SetBrush(* br);
+ }
+ }
+- else if (m_image->m_fillColours.Member((wxObject *)m_gdiIndex))
++ else if (m_image->m_fillColours.Member((wxObject *)(long)m_gdiIndex))
+ {
+ if (m_image->m_fillBrush)
+ {
+@@ -1828,7 +1833,9 @@
+ bool wxPseudoMetaFile::LoadFromMetaFile(const wxString& filename, double
*rwidth, double *rheight)
+ {
+ if (!wxFileExists(filename))
+- return NULL;
++ // Are you kidding me!?!? bool function returns NULL!?!?
++ // return NULL;
++ return FALSE;
+
+ wxXMetaFile *metaFile = new wxXMetaFile;
+
+@@ -2441,7 +2449,7 @@
+
+ if (isOutline)
+ {
+- m_outlineColours.Append((wxObject*) (n - 1));
++ m_outlineColours.Append((wxObject*) (long)(n - 1));
+ }
+ }
+
+@@ -2456,7 +2464,7 @@
+
+ if (isFill)
+ {
+- m_fillColours.Append((wxObject*) (n - 1));
++ m_fillColours.Append((wxObject*) (long)(n - 1));
+ }
+ }
+
+diff -ur wxGTK-2.4.2/contrib/src/ogl/lines.cpp
wxGTK-2.4.2-fixed/contrib/src/ogl/lines.cpp
+--- wxGTK-2.4.2/contrib/src/ogl/lines.cpp 2003-09-21 07:32:47.000000000
-0400
++++ wxGTK-2.4.2-fixed/contrib/src/ogl/lines.cpp 2003-11-10
14:21:33.562513896 -0500
+@@ -601,7 +601,7 @@
+ double positionOnLineX, positionOnLineY;
+
+ // Position of start point of line, at the end of which we draw the arrow.
+- double startPositionX, startPositionY;
++ double startPositionX = 0.0, startPositionY = 0.0;
+
+ switch (arrow->GetPosition())
+ {
+diff -ur wxGTK-2.4.2/contrib/src/stc/scintilla/src/Editor.cxx
wxGTK-2.4.2-fixed/contrib/src/stc/scintilla/src/Editor.cxx
+--- wxGTK-2.4.2/contrib/src/stc/scintilla/src/Editor.cxx 2003-09-21
07:32:48.000000000 -0400
++++ wxGTK-2.4.2-fixed/contrib/src/stc/scintilla/src/Editor.cxx 2003-11-10
15:14:25.429316848 -0500
+@@ -1695,10 +1695,10 @@
+ (ll->styles[numCharsInLine]
== static_cast<char>(styleByte & styleMask));
+ allSame = allSame &&
+
(ll->indicators[numCharsInLine] == static_cast<char>(styleByte & ~styleMask));
+- if
(vstyle.styles[ll->styles[numCharsInLine]].caseForce == Style::caseUpper)
++ if
(vstyle.styles[(int)ll->styles[numCharsInLine]].caseForce == Style::caseUpper)
+ allSame = allSame &&
+
(ll->chars[numCharsInLine] == static_cast<char>(toupper(chDoc)));
+- else if
(vstyle.styles[ll->styles[numCharsInLine]].caseForce == Style::caseLower)
++ else if
(vstyle.styles[(int)ll->styles[numCharsInLine]].caseForce == Style::caseLower)
+ allSame = allSame &&
+
(ll->chars[numCharsInLine] == static_cast<char>(tolower(chDoc)));
+ else
+@@ -1739,9 +1739,9 @@
+ ll->chars[numCharsInLine] = chDoc;
+ ll->styles[numCharsInLine] =
static_cast<char>(styleByte & styleMask);
+ ll->indicators[numCharsInLine] =
static_cast<char>(styleByte & ~styleMask);
+- if
(vstyle.styles[ll->styles[numCharsInLine]].caseForce == Style::caseUpper)
++ if
(vstyle.styles[(int)ll->styles[numCharsInLine]].caseForce == Style::caseUpper)
+ ll->chars[numCharsInLine] =
static_cast<char>(toupper(chDoc));
+- else if
(vstyle.styles[ll->styles[numCharsInLine]].caseForce == Style::caseLower)
++ else if
(vstyle.styles[(int)ll->styles[numCharsInLine]].caseForce == Style::caseLower)
+ ll->chars[numCharsInLine] =
static_cast<char>(tolower(chDoc));
+ numCharsInLine++;
+ }
+@@ -1768,7 +1768,7 @@
+ if ((ll->styles[charInLine] != ll->styles[charInLine
+ 1]) ||
+ isControl || isControlNext) {
+ ll->positions[startseg] = 0;
+- if
(vstyle.styles[ll->styles[charInLine]].visible) {
++ if
(vstyle.styles[(int)ll->styles[charInLine]].visible) {
+ if (isControl) {
+ if (ll->chars[charInLine] ==
'\t') {
+
ll->positions[charInLine + 1] = ((((startsegx + 2) /
+@@ -1788,10 +1788,10 @@
+ if ((lenSeg == 1) && (' ' ==
ll->chars[startseg])) {
+ lastSegItalics =
false;
+ // Over half the
segments are single characters and of these about half are space characters.
+-
ll->positions[charInLine + 1] =
vstyle.styles[ll->styles[charInLine]].spaceWidth;
++
ll->positions[charInLine + 1] =
vstyle.styles[(int)ll->styles[charInLine]].spaceWidth;
+ } else {
+- lastSegItalics =
vstyle.styles[ll->styles[charInLine]].italic;
+-
surface->MeasureWidths(vstyle.styles[ll->styles[charInLine]].font, ll->chars
+ startseg,
++ lastSegItalics =
vstyle.styles[(int)ll->styles[charInLine]].italic;
++
surface->MeasureWidths(vstyle.styles[(int)ll->styles[charInLine]].font,
ll->chars + startseg,
+
lenSeg, ll->positions + startseg + 1);
+ }
+ }
+@@ -4537,7 +4537,7 @@
+ }
+
+ bool Editor::PositionIsHotspot(int position) {
+- return vs.styles[pdoc->StyleAt(position)].hotspot;
++ return vs.styles[(int)pdoc->StyleAt(position)].hotspot;
+ }
+
+ bool Editor::PointIsHotspot(Point pt) {
+diff -ur wxGTK-2.4.2/contrib/src/stc/scintilla/src/PropSet.cxx
wxGTK-2.4.2-fixed/contrib/src/stc/scintilla/src/PropSet.cxx
+--- wxGTK-2.4.2/contrib/src/stc/scintilla/src/PropSet.cxx 2003-09-21
07:32:49.000000000 -0400
++++ wxGTK-2.4.2-fixed/contrib/src/stc/scintilla/src/PropSet.cxx
2003-11-10 15:18:08.784361720 -0500
+@@ -422,11 +422,11 @@
+ for (int i=0;i<256; i++) {
+ wordSeparator[i] = false;
+ }
+- wordSeparator['\r'] = true;
+- wordSeparator['\n'] = true;
++ wordSeparator[(int)'\r'] = true;
++ wordSeparator[(int)'\n'] = true;
+ if (!onlyLineEnds) {
+- wordSeparator[' '] = true;
+- wordSeparator['\t'] = true;
++ wordSeparator[(int)' '] = true;
++ wordSeparator[(int)'\t'] = true;
+ }
+ for (int j = 0; wordlist[j]; j++) {
+ int curr = static_cast<unsigned char>(wordlist[j]);
+@@ -539,7 +539,7 @@
+ j++;
+ }
+ }
+- j = starts['^'];
++ j = starts[(int)'^'];
+ if (j >= 0) {
+ while (words[j][0] == '^') {
+ const char *a = words[j] + 1;
+diff -ur wxGTK-2.4.2/contrib/src/stc/scintilla/src/RESearch.cxx
wxGTK-2.4.2-fixed/contrib/src/stc/scintilla/src/RESearch.cxx
+--- wxGTK-2.4.2/contrib/src/stc/scintilla/src/RESearch.cxx 2003-09-21
07:32:49.000000000 -0400
++++ wxGTK-2.4.2-fixed/contrib/src/stc/scintilla/src/RESearch.cxx
2003-11-10 15:18:44.884873608 -0500
+@@ -764,10 +764,10 @@
+ return NOTFOUND;
+ break;
+ case BOT:
+- bopat[*ap++] = lp;
++ bopat[(int)*ap++] = lp;
+ break;
+ case EOT:
+- eopat[*ap++] = lp;
++ eopat[(int)*ap++] = lp;
+ break;
+ case BOW:
+ if (lp!=bol && iswordc(ci.CharAt(lp-1)) ||
!iswordc(ci.CharAt(lp)))
+diff -ur wxGTK-2.4.2/contrib/src/svg/dcsvg.cpp
wxGTK-2.4.2-fixed/contrib/src/svg/dcsvg.cpp
+--- wxGTK-2.4.2/contrib/src/svg/dcsvg.cpp 2003-09-21 07:32:54.000000000
-0400
++++ wxGTK-2.4.2-fixed/contrib/src/svg/dcsvg.cpp 2003-11-10
14:11:29.309374336 -0500
+@@ -233,13 +233,13 @@
+
+ // wxT("upper left") and wxT("upper right")
+ CalcBoundingBox(x, y);
+- CalcBoundingBox(x + w*cos(rad), y - h*sin(rad));
++ CalcBoundingBox(x + w*(int)cos(rad), y - h*(int)sin(rad));
+
+ // wxT("bottom left") and wxT("bottom right")
+ x += (wxCoord)(h*sin(rad));
+ y += (wxCoord)(h*cos(rad));
+ CalcBoundingBox(x, y);
+- CalcBoundingBox(x + h*sin(rad), y + h*cos(rad));
++ CalcBoundingBox(x + h*(int)sin(rad), y + h*(int)cos(rad));
+
+ if (m_backgroundMode == wxSOLID)
+ {
+diff -ur wxGTK-2.4.2/src/gtk/dnd.cpp wxGTK-2.4.2-fixed/src/gtk/dnd.cpp
+--- wxGTK-2.4.2/src/gtk/dnd.cpp 2003-09-21 07:31:57.000000000 -0400
++++ wxGTK-2.4.2-fixed/src/gtk/dnd.cpp 2003-11-10 12:11:14.265227768 -0500
+@@ -449,7 +449,7 @@
+ GList *child = m_dragContext->targets;
+ while (child)
+ {
+- GdkAtom formatAtom = (GdkAtom) GPOINTER_TO_INT(child->data);
++ GdkAtom formatAtom = (GdkAtom) child->data;
+ wxDataFormat format( formatAtom );
+
+ #ifdef __WXDEBUG__
diff --git a/x11-toolkits/wxgtk-no-unicode/wxGTK-2.4.2-contrib_animate.patch
b/x11-toolkits/wxgtk-no-unicode/wxGTK-2.4.2-contrib_animate.patch
new file mode 100644
index 0000000..5813628
--- /dev/null
+++ b/x11-toolkits/wxgtk-no-unicode/wxGTK-2.4.2-contrib_animate.patch
@@ -0,0 +1,10 @@
+--- Makefile.in 2003-09-21 12:32:39.000000000 +0100
++++ Makefile.in.new 2003-09-28 13:51:51.006341440 +0100
+@@ -1,6 +1,6 @@
+ # $Id: wxGTK-2.4.2-contrib_animate.patch,v 1.2 2007/07/24 22:52:52
dirtyepic dead $
+
+-CONTRIB_SUBDIRS=canvas fl gizmos mmedia net ogl plot stc svg xrc animate
#applet
++CONTRIB_SUBDIRS=canvas fl gizmos mmedia net ogl plot stc svg xrc #animate
#applet
+
+ all:
+ @for d in $(CONTRIB_SUBDIRS); do (cd $$d && $(MAKE)); done
diff --git a/x11-toolkits/wxgtk-no-unicode/wxGTK-2.4.2-gcc4_v2.patch
b/x11-toolkits/wxgtk-no-unicode/wxGTK-2.4.2-gcc4_v2.patch
deleted file mode 100644
index 0dfe7a7..0000000
--- a/x11-toolkits/wxgtk-no-unicode/wxGTK-2.4.2-gcc4_v2.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/common/sckfile.cpp.orig 2005-04-16 16:50:11.000000000 -0700
-+++ src/common/sckfile.cpp 2005-04-16 16:50:14.000000000 -0700
-@@ -9,7 +9,7 @@
- // Licence: wxWindows license
-
/////////////////////////////////////////////////////////////////////////////
- #ifdef __GNUG__
--#pragma implementation "sckfile.h"
-+#pragma implementation "file.h"
- #endif
-
- // For compilers that support precompilation, includes "wx.h".
diff --git a/x11-toolkits/wxgtk-no-unicode/wxGTK-2.4.2-menu.cpp.patch
b/x11-toolkits/wxgtk-no-unicode/wxGTK-2.4.2-menu.cpp.patch
new file mode 100644
index 0000000..8219a15
--- /dev/null
+++ b/x11-toolkits/wxgtk-no-unicode/wxGTK-2.4.2-menu.cpp.patch
@@ -0,0 +1,45 @@
+diff -Nur wxGTK-2.4.2/src/gtk/menu.cpp wxGTK-2.4.2-patched/src/gtk/menu.cpp
+--- wxGTK-2.4.2/src/gtk/menu.cpp 2003-09-21 05:31:57.000000000 -0600
++++ wxGTK-2.4.2-patched/src/gtk/menu.cpp 2004-03-31 22:37:42.422032816
-0700
+@@ -30,13 +30,13 @@
+ #ifdef __WXGTK20__
+ #include <glib-object.h>
+
+- #define gtk_accel_group_attach(g, o) _gtk_accel_group_attach((g), (o))
+- #define gtk_accel_group_detach(g, o) _gtk_accel_group_detach((g), (o))
++ #define gtk_accel_group_attach(g, o) gtk_window_add_accel_group((o),
(g))
++ #define gtk_accel_group_detach(g, o) gtk_window_remove_accel_group((o),
(g))
+ #define gtk_menu_ensure_uline_accel_group(m) gtk_menu_get_accel_group(m)
+
+- #define ACCEL_OBJECT GObject
++ #define ACCEL_OBJECT GtkWindow
+ #define ACCEL_OBJECTS(a) (a)->acceleratables
+- #define ACCEL_OBJ_CAST(obj) G_OBJECT(obj)
++ #define ACCEL_OBJ_CAST(obj) ((GtkWindow*) obj)
+ #else // GTK+ 1.x
+ #define ACCEL_OBJECT GtkObject
+ #define ACCEL_OBJECTS(a) (a)->attach_objects
+diff -Nur wxGTK-2.4.2/src/gtk/settings.cpp
wxGTK-2.4.2-patched/src/gtk/settings.cpp
+--- wxGTK-2.4.2/src/gtk/settings.cpp 2003-09-21 05:31:57.000000000 -0600
++++ wxGTK-2.4.2-patched/src/gtk/settings.cpp 2004-03-31
23:03:41.888957808 -0700
+@@ -340,9 +340,17 @@
+ }
+ else
+ {
+- const gchar *font_name =
+-
_gtk_rc_context_get_default_font_name(gtk_settings_get_default());
+- g_systemFont = new
wxFont(wxString::FromAscii(font_name));
++ GtkSettings *settings = gtk_settings_get_default();
++ gchar *font_name = NULL;
++ g_object_get ( settings,
++ "gtk-font-name",
++ &font_name,
++ NULL);
++ if (!font_name)
++ g_systemFont = new wxFont( 12, wxSWISS, wxNORMAL,
wxNORMAL );
++ else
++ g_systemFont = new
wxFont(wxString::FromAscii(font_name));
++ g_free (font_name);
+ }
+ gtk_widget_destroy( widget );
+ #else
diff --git a/x11-toolkits/wxgtk-no-unicode/wxGTK-2.4.2-noftinternals.patch
b/x11-toolkits/wxgtk-no-unicode/wxGTK-2.4.2-noftinternals.patch
new file mode 100644
index 0000000..da21124
--- /dev/null
+++ b/x11-toolkits/wxgtk-no-unicode/wxGTK-2.4.2-noftinternals.patch
@@ -0,0 +1,44 @@
+--- wxGTK-2.4.2/src/generic/dcpsg.cpp 2006-10-07 15:05:34.000000000 +0200
++++ wxGTK-2.4.2/src/generic/dcpsg.cpp 2006-10-07 15:08:21.000000000 +0200
+@@ -1146,7 +1146,7 @@
+ FILE *file;
+ };
+
+-static int paps_move_to( FT_Vector* to,
++static int paps_move_to( const FT_Vector* to,
+ void *user_data)
+ {
+ OutlineInfo *outline_info = (OutlineInfo*)user_data;
+@@ -1156,7 +1156,7 @@
+ return 0;
+ }
+
+-static int paps_line_to( FT_Vector* to,
++static int paps_line_to( const FT_Vector* to,
+ void *user_data)
+ {
+ OutlineInfo *outline_info = (OutlineInfo*)user_data;
+@@ -1166,8 +1166,8 @@
+ return 0;
+ }
+
+-static int paps_conic_to( FT_Vector* control,
+- FT_Vector* to,
++static int paps_conic_to( const FT_Vector* control,
++ const FT_Vector* to,
+ void *user_data)
+ {
+ OutlineInfo *outline_info = (OutlineInfo*)user_data;
+@@ -1179,9 +1179,9 @@
+ return 0;
+ }
+
+-static int paps_cubic_to( FT_Vector* control1,
+- FT_Vector* control2,
+- FT_Vector* to,
++static int paps_cubic_to( const FT_Vector* control1,
++ const FT_Vector* control2,
++ const FT_Vector* to,
+ void *user_data)
+ {
+ OutlineInfo *outline_info = (OutlineInfo*)user_data;
diff --git a/x11-toolkits/wxgtk-no-unicode/wxGTK-2.4.2-pango_fix.patch
b/x11-toolkits/wxgtk-no-unicode/wxGTK-2.4.2-pango_fix.patch
new file mode 100644
index 0000000..2cec83f
--- /dev/null
+++ b/x11-toolkits/wxgtk-no-unicode/wxGTK-2.4.2-pango_fix.patch
@@ -0,0 +1,14 @@
+--- wx-config.in.orig 2003-09-21 18:31:27.000000000 +0700
++++ wx-config.in 2005-11-24 04:56:18.313149073 +0600
+@@ -145,9 +145,9 @@
+ fi
+
+ if test $static_flag = yes ; then
+- echo "$libs @LDFLAGS@ @WXCONFIG_RPATH@
@libdir@/@WXCONFIG_LIBS_STATIC@ @LIBS@ @DMALLOC_LIBS@"
++ echo "$libs @LDFLAGS@ @WXCONFIG_RPATH@
@libdir@/@WXCONFIG_LIBS_STATIC@ @LIBS@ @DMALLOC_LIBS@ -lpangox-1.0 "
+ else
+- echo $libs @LDFLAGS@ @WXCONFIG_RPATH@ @WXCONFIG_LIBS@
@DMALLOC_LIBS@
++ echo "$libs @LDFLAGS@ @WXCONFIG_RPATH@ @WXCONFIG_LIBS@
@DMALLOC_LIBS@ -lpangox-1.0 "
+ fi
+
+ ;;
diff --git a/x11-toolkits/wxgtk/CONFLICTS b/x11-toolkits/wxgtk/CONFLICTS
index dff565e..79ffdd2 100755
--- a/x11-toolkits/wxgtk/CONFLICTS
+++ b/x11-toolkits/wxgtk/CONFLICTS
@@ -1 +1,2 @@
-conflicts wxgtk-no-unicode
+conflicts wxgtk-no-unicode &&
+conflicts wxgtk y
diff --git a/x11-toolkits/wxgtk/HISTORY b/x11-toolkits/wxgtk/HISTORY
index ad9d319..ed884a6 100644
--- a/x11-toolkits/wxgtk/HISTORY
+++ b/x11-toolkits/wxgtk/HISTORY
@@ -1,3 +1,6 @@
+2007-10-24 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * CONFLICTS: added self #14031
+
2007-09-27 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 2.8.6 (new)

diff --git a/x11-toolkits/xdialog/BUILD b/x11-toolkits/xdialog/BUILD
deleted file mode 100755
index 7d3b49a..0000000
--- a/x11-toolkits/xdialog/BUILD
+++ /dev/null
@@ -1,11 +0,0 @@
-make_single &&
- ./configure --prefix=${INSTALL_ROOT}/usr \
- --sysconfdir=${INSTALL_ROOT}/etc \
- --localstatedir=${INSTALL_ROOT}/var \
- --mandir=${INSTALL_ROOT}/usr/share/man \
- --infodir=${INSTALL_ROOT}/usr/share/info \
- $OPTS &&
-sedit "s:RANLIB = @RANLIB@:RANLIB = /usr/bin/ranlib:" lib/Makefile &&
-make &&
-make_normal &&
-make install
diff --git a/x11-toolkits/xdialog/DEPENDS b/x11-toolkits/xdialog/DEPENDS
index 06d9971..edffa0e 100755
--- a/x11-toolkits/xdialog/DEPENDS
+++ b/x11-toolkits/xdialog/DEPENDS
@@ -1,4 +1 @@
-optional_depends gtk+2 \
- "--with-gtk2" \
- "--without-gtk2" \
- "for GTK2 support"
+depends gtk+2
diff --git a/x11-toolkits/xdialog/DETAILS b/x11-toolkits/xdialog/DETAILS
index 42901e4..4e5d1f5 100755
--- a/x11-toolkits/xdialog/DETAILS
+++ b/x11-toolkits/xdialog/DETAILS
@@ -2,7 +2,7 @@
VERSION=2.3.1
SOURCE=Xdialog-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/Xdialog-$VERSION
- SOURCE_URL[0]=http://thgodef.nerim.net/$SPELL/${SOURCE}
+ SOURCE_URL[0]=http://xdialog.free.fr/$SOURCE

SOURCE_HASH=sha512:2a0f6e15297ae3ef54a41da1b1fe2ef376d28757d47433df2b8e9918cd4f95871a630b94ec544bd848e518df7f86934030a71bf0371a1466286bf7d912335525
WEB_SITE=http://xdialog.dyns.net/
ENTERED=20050228
diff --git a/x11-toolkits/xdialog/HISTORY b/x11-toolkits/xdialog/HISTORY
index bd9ec63..1a5ed06 100644
--- a/x11-toolkits/xdialog/HISTORY
+++ b/x11-toolkits/xdialog/HISTORY
@@ -1,3 +1,9 @@
+2007-10-24 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * DEPENDS: made gtk+2 required #14043
+ * BUILD: make it api2 and simplify
+ removed; make -j works and the ranlib edit doesn't seem needed
+ * DETAILS: Fixed SOURCE_URL[0]
+
2006-10-10 Juuso Alasuutari <iuso AT sourcemage.org>
* DEPENDS: Removed invalid trailing backslash.

diff --git a/x11/conky/DEPENDS b/x11/conky/DEPENDS
index 8979a03..0f5cfba 100755
--- a/x11/conky/DEPENDS
+++ b/x11/conky/DEPENDS
@@ -1 +1,6 @@
-depends X11-LIBS
+depends X11-LIBS &&
+
+optional_depends wireless_tools \
+ '--enable-wlan' \
+ '--disable-wlan' \
+ 'for Wireless support'
diff --git a/x11/conky/DETAILS b/x11/conky/DETAILS
index f0d0ded..7f90c73 100755
--- a/x11/conky/DETAILS
+++ b/x11/conky/DETAILS
@@ -1,13 +1,14 @@
SPELL=conky
- VERSION=1.4.2
+ VERSION=1.4.7
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
-
SOURCE_HASH=sha512:b6fe5de9f1ca82212b89f72566adbd32691f0fd5a65f80848a9a394a22e973600086301cf7622b723bcb1969988aea2fe7e7f34b57bf28e98725213075847944
- WEB_SITE=http://conky.sourceforge.net/
- ENTERED=20051018
+ SOURCE_GPG="gurus.gpg:$SOURCE.sig:WORKS_FOR_ME"
+#
SOURCE_HASH=sha512:b6fe5de9f1ca82212b89f72566adbd32691f0fd5a65f80848a9a394a22e973600086301cf7622b723bcb1969988aea2fe7e7f34b57bf28e98725213075847944
LICENSE[0]=BSD
KEYWORDS="x11"
+ WEB_SITE=http://conky.sourceforge.net/
+ ENTERED=20051018
SHORT="an advanced, highly configurable system monitor for X."
cat << EOF
conky is system monitor for X originally based on the torsmo code, but more
diff --git a/x11/conky/HISTORY b/x11/conky/HISTORY
index d852f68..e974ecd 100644
--- a/x11/conky/HISTORY
+++ b/x11/conky/HISTORY
@@ -1,3 +1,7 @@
+2007-10-01 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: Updated to 1.4.7
+ * DEPENDS: Optionally depends on wireless_tools for WLAN support
+
2006-08-31 Pol Vinogradov <vin.public AT gmail.com>
* DETAILS: updated to 1.4.2, removed UPDATED

diff --git a/x11/conky/conky-1.4.7.tar.gz.sig
b/x11/conky/conky-1.4.7.tar.gz.sig
new file mode 100644
index 0000000..e9291d8
Binary files /dev/null and b/x11/conky/conky-1.4.7.tar.gz.sig differ
diff --git a/x11/gtk-recordmydesktop/DEPENDS b/x11/gtk-recordmydesktop/DEPENDS
index 2c721a2..021da09 100755
--- a/x11/gtk-recordmydesktop/DEPENDS
+++ b/x11/gtk-recordmydesktop/DEPENDS
@@ -1,3 +1,2 @@
depends recordmydesktop &&
-depends pygtk2 &&
-depends gnome-python-extras
+depends pygtk2
diff --git a/x11/gtk-recordmydesktop/DETAILS b/x11/gtk-recordmydesktop/DETAILS
index c447547..dd793f2 100755
--- a/x11/gtk-recordmydesktop/DETAILS
+++ b/x11/gtk-recordmydesktop/DETAILS
@@ -1,9 +1,9 @@
SPELL=gtk-recordmydesktop
- VERSION=0.3.4
+ VERSION=0.3.6
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$SOURCEFORGE_URL/recordmydesktop/$SOURCE
-
SOURCE_HASH=sha512:9cfb3a9823dca5c5e604dfc38cb85f867854ad53009a90889dd3dd915826e03023cfd38e043871f3b56bf22921bb56fdba7d185a680eb59047e2567743feeefd
+
SOURCE_HASH=sha512:b875f779ffe05516e21f40e0bc23ceb08702db97d5c90a9172e967894579b6031ba0820ea9ebffc7b2ab81966cde1cfa91da4f3a747e6021deff531a55257790
WEB_SITE=http://recordmydesktop.sourceforge.net/
ENTERED=20061003
LICENSE[0]=GPL
diff --git a/x11/gtk-recordmydesktop/HISTORY b/x11/gtk-recordmydesktop/HISTORY
index 06686e4..682f3da 100644
--- a/x11/gtk-recordmydesktop/HISTORY
+++ b/x11/gtk-recordmydesktop/HISTORY
@@ -1,3 +1,7 @@
+2007-11-04 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * DEPENDS: removed gnome-python-extras
+ * DETAILS: updated spell to 0.3.6
+
2007-04-01 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 0.3.4

diff --git a/x11/recordmydesktop/DETAILS b/x11/recordmydesktop/DETAILS
index 4bc8f79..bd1d723 100755
--- a/x11/recordmydesktop/DETAILS
+++ b/x11/recordmydesktop/DETAILS
@@ -1,9 +1,9 @@
SPELL=recordmydesktop
- VERSION=0.3.4
+ VERSION=0.3.6
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
-
SOURCE_HASH=sha512:afb675ecd3bfbe39239b9414aca8efefad85e82f2555a02a2bc393d8dc8d232103639adcda2e5efde84fa820aac27d33cc09e168972661b138d88981eb7f864e
+
SOURCE_HASH=sha512:ef28c3a1524777d987e504939f7f9426a40802dbe04c84418d3f49643648df3a248b2bd00b2a9e2cdc295cd30afb0e9f097a2ee9dc7c36c43b5c781a08ecc778
WEB_SITE=http://recordmydesktop.sourceforge.net/
ENTERED=20060815
LICENSE[0]=GPL
diff --git a/x11/recordmydesktop/HISTORY b/x11/recordmydesktop/HISTORY
index 09971c6..dc86398 100644
--- a/x11/recordmydesktop/HISTORY
+++ b/x11/recordmydesktop/HISTORY
@@ -1,3 +1,6 @@
+2007-11-04 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * DETAILS: updated spell to 0.3.6
+
2007-04-01 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 0.3.4

diff --git a/x11/xlockmore/DETAILS b/x11/xlockmore/DETAILS
index 2ff4b90..ce6db73 100755
--- a/x11/xlockmore/DETAILS
+++ b/x11/xlockmore/DETAILS
@@ -1,12 +1,11 @@
SPELL=xlockmore
- VERSION=5.19
+ VERSION=5.25
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- SOURCE_URL[0]=ftp://ftp.tux.org/pub/tux/bagleyd/xlockmore/$SOURCE
-
SOURCE_HASH=sha512:dce0f92b241525f3492dde3008f523b9084a717c495f97c7f3c067a8a70cddf3a61706fb7cc7c7ce2168a65a0c62b70dfd15a8c60f199f087ac9fd90821352dd
+ SOURCE_URL[0]=ftp://ftp.ibiblio.org/pub/Linux/X11/screensavers/$SOURCE
+
SOURCE_HASH=sha512:92cfbf35dba927ec26d11e7128edbd72c7a8fdb7f589646cd2bf78b0bcefb79361bcc5215e9f8277837287c7c936f4b4df465960474e0fcdb7c50897063d8c94
WEB_SITE=http://www.tux.org/~bagleyd/xlockmore.html
ENTERED=20010922
- UPDATED=20030810
LICENSE[0]=BSD
KEYWORDS="x11"
SHORT="xlockmore is an enhanced version of xlock."
diff --git a/x11/xlockmore/HISTORY b/x11/xlockmore/HISTORY
index 195b35c..5be2dc3 100644
--- a/x11/xlockmore/HISTORY
+++ b/x11/xlockmore/HISTORY
@@ -1,3 +1,7 @@
+2007-11-04 Vlad Glagolev <codex AT sourcemage.org>
+ * DETAILS: Updated spell to 5.25, fixed DL url,
+ Removed 'UPDATED'
+
2006-06-28 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: Removed BUILD_API=2, set grimoire-wide

diff --git a/x11/xneur/DEPENDS b/x11/xneur/DEPENDS
index 1dde63f..6f01240 100755
--- a/x11/xneur/DEPENDS
+++ b/x11/xneur/DEPENDS
@@ -1 +1,21 @@
-depends X11-LIBS
+depends X11-LIBS &&
+
+optional_depends aspell \
+ "--with-aspell" \
+ "--without-aspell" \
+ "for aspell support" &&
+
+optional_depends gstreamer \
+ "--with-gstreamer" \
+ "--without-gstreamer" \
+ "for Gstreamer sound engine" &&
+
+optional_depends openal \
+ "--with-openal" \
+ "--without-openal" \
+ "for OpenAL sound engine" &&
+
+optional_depends pcre \
+ "--with-pcre" \
+ "--without-pcre" \
+ "for regular expressions support"
diff --git a/x11/xneur/DETAILS b/x11/xneur/DETAILS
index 7ef3b64..87a2cf4 100755
--- a/x11/xneur/DETAILS
+++ b/x11/xneur/DETAILS
@@ -1,8 +1,8 @@
SPELL=xneur
- VERSION=0.6.2
+ VERSION=0.8.0
SOURCE=${SPELL}-${VERSION}.tar.bz2
SOURCE_URL[0]=http://dists.${SPELL}.ru/release-${VERSION}/tgz/${SOURCE}
-
SOURCE_HASH=sha512:08f42457276ba308fa7990650259773d08f32b29768ba2834fcf64a4e486255d43cc6d82267bba04743a116eb4ff35227560020ff81d4d6e39dbbee521cce637
+
SOURCE_HASH=sha512:9d9387a3b342b78ef0395e9fd6ddbccfef1cf4e7a1d12f25664e005d915332bbc250e9e2379e9ebb1b90f7886feaf72c1a218113168b216f6f6d9d749d9f7128
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
WEB_SITE=http://xneur.ru/
LICENSE[0]=GPL
diff --git a/x11/xneur/HISTORY b/x11/xneur/HISTORY
index 9033053..8468cf6 100644
--- a/x11/xneur/HISTORY
+++ b/x11/xneur/HISTORY
@@ -1,3 +1,7 @@
+2007-10-13 Pol Vinogradov <vin.public AT gmail.com>
+ * DETAILS: updated to 0.8.0
+ * DEPENDS: added aspell, gstreamer, openal and pcre optionally
+
2007-07-26 Pol Vinogradov <vin.public AT gmail.com>
* DETAILS: updated to 0.6.2

diff --git a/x11/xosview/HISTORY b/x11/xosview/HISTORY
index 4f7e579..935cfaf 100644
--- a/x11/xosview/HISTORY
+++ b/x11/xosview/HISTORY
@@ -1,3 +1,7 @@
+2007-12-01 Eric Sandall <sandalle AT sourcemage.org>
+ * glibc-2.6.patch: Added to remove custom snprintf (Bug #14141)
+ * PRE_BUILD: Apply glibc-2.6.patch
+
2006-06-28 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: Removed BUILD_API=2, set grimoire-wide

diff --git a/x11/xosview/PRE_BUILD b/x11/xosview/PRE_BUILD
new file mode 100755
index 0000000..7fa05e2
--- /dev/null
+++ b/x11/xosview/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+patch -p1 < $SCRIPT_DIRECTORY/glibc-2.6.patch
diff --git a/x11/xosview/glibc-2.6.patch b/x11/xosview/glibc-2.6.patch
new file mode 100644
index 0000000..8f705ba
--- /dev/null
+++ b/x11/xosview/glibc-2.6.patch
@@ -0,0 +1,101 @@
+diff -Naur xosview-1.8.3.orig/Xrm.cc xosview-1.8.3/Xrm.cc
+--- xosview-1.8.3.orig/Xrm.cc 2007-12-01 10:37:19.247343664 -0800
++++ xosview-1.8.3/Xrm.cc 2007-12-01 10:43:33.736684594 -0800
+@@ -17,7 +17,6 @@
+ #include <iostream.h>
+ #endif
+ #include <unistd.h> // for access(), etc. BCG
+-#include "snprintf.h"
+ #include "general.h"
+ #ifndef NULL
+ #define NULL 0
+diff -Naur xosview-1.8.3.orig/bitfieldmeter.cc xosview-1.8.3/bitfieldmeter.cc
+--- xosview-1.8.3.orig/bitfieldmeter.cc 2007-12-01 10:37:19.247343664
-0800
++++ xosview-1.8.3/bitfieldmeter.cc 2007-12-01 10:43:36.752856477 -0800
+@@ -11,7 +11,6 @@
+ #include <fstream.h>
+ #endif
+ #include <stdlib.h>
+-#include "snprintf.h"
+ #include "general.h"
+ #include "bitfieldmeter.h"
+ #include "xosview.h"
+diff -Naur xosview-1.8.3.orig/config/Makefile.top.in
xosview-1.8.3/config/Makefile.top.in
+--- xosview-1.8.3.orig/config/Makefile.top.in 2007-12-01 10:37:19.247343664
-0800
++++ xosview-1.8.3/config/Makefile.top.in 2007-12-01 10:46:37.839175999
-0800
+@@ -19,7 +19,6 @@
+ bitfieldmeter.o \
+ bitmeter.o \
+ xosview.o \
+-snprintf.o \
+ main.o
+
+ CFILES := $(OBJS:.o=.cc)
+diff -Naur xosview-1.8.3.orig/fieldmeter.cc xosview-1.8.3/fieldmeter.cc
+--- xosview-1.8.3.orig/fieldmeter.cc 2007-12-01 10:37:19.243343436 -0800
++++ xosview-1.8.3/fieldmeter.cc 2007-12-01 10:43:39.521014224 -0800
+@@ -17,7 +17,6 @@
+ #include <fstream.h>
+ #endif
+ #include <stdlib.h>
+-#include "snprintf.h"
+ #include "general.h"
+ #include "fieldmeter.h"
+ #include "xosview.h"
+diff -Naur xosview-1.8.3.orig/snprintf.cc xosview-1.8.3/snprintf.cc
+--- xosview-1.8.3.orig/snprintf.cc 2007-12-01 10:37:19.243343436 -0800
++++ xosview-1.8.3/snprintf.cc 1969-12-31 16:00:00.000000000 -0800
+@@ -1,17 +0,0 @@
+-#ifndef HAVE_SNPRINTF
+-
+-#include <stdarg.h>
+-#include <stdio.h>
+-
+-extern "C" int snprintf ( char *str, int n, const char *format, ...)
+- {
+- /* punt the warning */
+- n++;
+- va_list ap;
+- va_start(ap, format);
+- int rval = vsprintf(str, format, ap);
+- va_end(ap);
+- return rval;
+- }
+-
+-#endif
+diff -Naur xosview-1.8.3.orig/snprintf.h xosview-1.8.3/snprintf.h
+--- xosview-1.8.3.orig/snprintf.h 2007-12-01 10:37:19.243343436 -0800
++++ xosview-1.8.3/snprintf.h 1969-12-31 16:00:00.000000000 -0800
+@@ -1,10 +0,0 @@
+-#ifndef snprintf_h
+-#define snprintf_h
+-
+-#ifndef HAVE_SNPRINTF
+-extern "C" int snprintf ( char *str, int n, const char *format, ...);
+-#else
+-#include <stdio.h>
+-#endif
+-
+-#endif
+diff -Naur xosview-1.8.3.orig/xosview.cc xosview-1.8.3/xosview.cc
+--- xosview-1.8.3.orig/xosview.cc 2007-12-01 10:37:19.239343207 -0800
++++ xosview-1.8.3/xosview.cc 2007-12-01 10:43:42.205167189 -0800
+@@ -9,7 +9,6 @@
+ #include <unistd.h>
+ #include <stdlib.h>
+ #include <sys/time.h>
+-#include "snprintf.h"
+ #include "general.h"
+ #include "xosview.h"
+ #include "meter.h"
+diff -Naur xosview-1.8.3.orig/xwin.cc xosview-1.8.3/xwin.cc
+--- xosview-1.8.3.orig/xwin.cc 2007-12-01 10:37:19.239343207 -0800
++++ xosview-1.8.3/xwin.cc 2007-12-01 10:43:44.781313993 -0800
+@@ -5,7 +5,6 @@
+ #include <X11/Xatom.h>
+ #include <stdlib.h>
+ #include <unistd.h>
+-#include "snprintf.h"
+ #include "general.h"
+ #include "xwin.h"
+ #include "Xrm.h"
diff --git a/x11/xsensors/DETAILS b/x11/xsensors/DETAILS
index d0e094c..a2dfd3c 100755
--- a/x11/xsensors/DETAILS
+++ b/x11/xsensors/DETAILS
@@ -1,9 +1,9 @@
SPELL=xsensors
- VERSION=0.50
+ VERSION=0.60
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://www.linuxhardware.org/xsensors/$SOURCE
-
SOURCE_HASH=sha512:4d4599c93ec7b376eaeec5a02b8297219a77172d8ba6b70f5b250d9639e5c3f7ec3d4c0bfaaabd7b0466b32e32636245612e258fa1304b05bf3d23e5cc9db77f
+
SOURCE_HASH=sha512:608c61b03b3e5b3e35a1c591f7100fbd1c98983d1c2f3a41e67e14a4e50225a2db2da9ffdd71ea743e127741a0f8cf82394896f532b2f78a95d74e402cd5c7ad
WEB_SITE=http://www.linuxhardware.org/
ENTERED=20060205
LICENSE[0]=GPL2
diff --git a/x11/xsensors/HISTORY b/x11/xsensors/HISTORY
index 3bf3888..42c35d5 100644
--- a/x11/xsensors/HISTORY
+++ b/x11/xsensors/HISTORY
@@ -1,2 +1,5 @@
+2007-11-06 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 0.60
+
2006-02-05 Richard Johns <johnsr AT lincoln.ac.nz>
* DETAILS, DEPENDS: Created spell
diff --git a/xfce/libxfcegui4/DEPENDS b/xfce/libxfcegui4/DEPENDS
index 632c090..5756228 100755
--- a/xfce/libxfcegui4/DEPENDS
+++ b/xfce/libxfcegui4/DEPENDS
@@ -1,4 +1,3 @@
-depends gtk+2 &&
-depends libxml2 &&
-depends libxfce4util &&
-depends dbh
+depends gtk+2 &&
+depends libxml2 &&
+depends libxfce4util
diff --git a/xfce/libxfcegui4/DETAILS b/xfce/libxfcegui4/DETAILS
index 1a13fd6..d624e93 100755
--- a/xfce/libxfcegui4/DETAILS
+++ b/xfce/libxfcegui4/DETAILS
@@ -7,6 +7,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_GPG="gurus.gpg:$SOURCE.sig"
LICENSE[0]=LGPL
ENTERED=20030608
+ PATCHLEVEL=1
KEYWORDS="xfce"
SHORT="various gtk widgets for xfce"
cat << EOF
diff --git a/xfce/libxfcegui4/HISTORY b/xfce/libxfcegui4/HISTORY
index 38bda36..490f624 100644
--- a/xfce/libxfcegui4/HISTORY
+++ b/xfce/libxfcegui4/HISTORY
@@ -1,3 +1,6 @@
+2007-11-05 Vlad Glagolev <codex AT sourcemage.org>
+ * DEPENDS: fixed dbh dep, cleaned up
+
2007-04-10 George Sherwood <george AT beernabeer.com>
* DETAILS: updated spell to 4.4.1

diff --git a/xfce/thunar/DEPENDS b/xfce/thunar/DEPENDS
index f9fb363..4767752 100755
--- a/xfce/thunar/DEPENDS
+++ b/xfce/thunar/DEPENDS
@@ -1,5 +1,4 @@
-depends xfce4-panel &&
-depends exo &&
+depends exo &&

optional_depends dbus \
"--enable-dbus" \
@@ -26,7 +25,12 @@ optional_depends pcre \
"--disable-pcre" \
"for regular expressions support" &&

-optional_depends startup-notification \
- "--enable-startup-notification" \
- "--disable-startup-notification" \
- "for startup notification library support"
+optional_depends startup-notification \
+ "--enable-startup-notification" \
+ "--disable-startup-notification" \
+ "for startup notification library support" &&
+
+optional_depends gamin \
+ "" \
+ "" \
+ "for filesystem change updates"
diff --git a/xfce/thunar/DETAILS b/xfce/thunar/DETAILS
index a804052..240532e 100755
--- a/xfce/thunar/DETAILS
+++ b/xfce/thunar/DETAILS
@@ -7,7 +7,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/Thunar-$VERSION
SOURCE_GPG="gurus.gpg:$SOURCE.sig"
LICENSE[0]=GPL
ENTERED=20030608
- PATCHLEVEL=1
+ PATCHLEVEL=2
KEYWORDS="xfce"
SHORT="File manager for the XFce Desktop Environment"
cat << EOF
diff --git a/xfce/thunar/HISTORY b/xfce/thunar/HISTORY
index df0823f..c28b7bc 100644
--- a/xfce/thunar/HISTORY
+++ b/xfce/thunar/HISTORY
@@ -1,3 +1,7 @@
+2007-11-05 Vlad Glagolev <codex AT sourcemage.org>
+ * DEPENDS: fixed xfce-panel dep, added gamin as optional
+ * PRE_BUILD: cleaned up
+
2007-08-20 Pol Vinogradov <vin.public AT gmail.com>
* DEPENDS: added dbus, gtk-doc, hal, libexif, pcre and
startup-notification as optional
diff --git a/xfce/thunar/PRE_BUILD b/xfce/thunar/PRE_BUILD
index 6956dfc..e49f767 100755
--- a/xfce/thunar/PRE_BUILD
+++ b/xfce/thunar/PRE_BUILD
@@ -1,14 +1,19 @@
-default_pre_build
&&
-cd ${SOURCE_DIRECTORY}
&&
-sedit "s:doc/Thunar:doc/${SPELL}:g" docs/Makefile.am
&&
-sedit "s:doc/Thunar:doc/${SPELL}:g" docs/Makefile.in
&&
-sedit "s:doc/Thunar:doc/${SPELL}:g" docs/manual/Makefile.am
&&
-sedit "s:doc/Thunar:doc/${SPELL}:g" docs/manual/Makefile.in
&&
+default_pre_build &&
+cd ${SOURCE_DIRECTORY} &&
+
+sedit "s:doc/Thunar:doc/${SPELL}:g" \
+ docs/Makefile.am \
+ docs/Makefile.in \
+ docs/manual/Makefile.am \
+ docs/manual/Makefile.in &&
+
for lang in C es eu fr ja pl ru zh_TW
do
- sedit "s:doc/Thunar:doc/${SPELL}:g" docs/manual/${lang}/Makefile.am
&&
- sedit "s:doc/Thunar:doc/${SPELL}:g" docs/manual/${lang}/Makefile.in
&&
- sedit "s:doc/Thunar:doc/${SPELL}:g" docs/manual/${lang}/images/Makefile.am
&&
- sedit "s:doc/Thunar:doc/${SPELL}:g" docs/manual/${lang}/images/Makefile.in
-done
&&
+ sedit "s:doc/Thunar:doc/${SPELL}:g" \
+ docs/manual/${lang}/Makefile.am \
+ docs/manual/${lang}/Makefile.in \
+ docs/manual/${lang}/images/Makefile.am \
+ docs/manual/${lang}/images/Makefile.in
+done &&
+
sedit "s:doc/Thunar:doc/${SPELL}:g" ThunarHelp.in
diff --git a/xfce/thunar/Thunar-0.8.0.tar.bz2.sig
b/xfce/thunar/Thunar-0.8.0.tar.bz2.sig
index bade4d4..b000e55 100644
Binary files a/xfce/thunar/Thunar-0.8.0.tar.bz2.sig and
b/xfce/thunar/Thunar-0.8.0.tar.bz2.sig differ
diff --git a/xfce/xfburn/DEPENDS b/xfce/xfburn/DEPENDS
new file mode 100755
index 0000000..f84d451
--- /dev/null
+++ b/xfce/xfburn/DEPENDS
@@ -0,0 +1,16 @@
+depends CD-BURN-UTILITY &&
+depends cdrdao &&
+depends exo &&
+depends glib2 &&
+depends gtk+2 &&
+depends intltool &&
+depends libxfcegui4 &&
+
+if [ "$XFBURN_SVN" == "y" ]; then
+ depends subversion
+fi &&
+
+optional_depends thunar \
+ "--enable-thunar-vfs" \
+ "--disable-thunar-vfs" \
+ "for Thunar's VFS layer"
diff --git a/xfce/xfburn/DETAILS b/xfce/xfburn/DETAILS
new file mode 100755
index 0000000..a2bf82d
--- /dev/null
+++ b/xfce/xfburn/DETAILS
@@ -0,0 +1,29 @@
+ SPELL=xfburn
+ if [[ "$XFBURN_SVN" == "y" ]]; then
+ if [[ "$XFBURN_SVN_AUTOUPDATE" == "y" ]]; then
+ VERSION=$(date +%Y%m%d)
+ else
+ VERSION=svn
+ fi
+ SOURCE=${SPELL}-svn.tar.bz2
+ SOURCE_HINTS=old_svn_compat
+ SOURCE_URL[0]=svn:///svn.xfce.org/svn/xfce/${SPELL}/trunk:${SPELL}-svn
+ SOURCE_IGNORE='volatile'
+SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-svn
+ else
+ VERSION=0.2.0
+ SOURCE=${SPELL}-${VERSION}.tar.bz2
+ SOURCE_URL[0]=http://foo-projects.org/~pollux/${SPELL}/${SOURCE}
+
SOURCE_HASH=sha512:14ba8edf1fc881dcfa853f96f36e5181ff6c86fba008bf60967500246846efc036c04aaec78f21a660c5135c5f3d2325bef12d7cd21ab78574d466ca75aadcfd
+SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
+ fi
+ WEB_SITE=http://www.xfce.org/projects/xfburn/
+ ENTERED=20071005
+ LICENSE[0]=GPL
+ KEYWORDS="xfce disk"
+ SHORT="Xfburn is a GUI CD burning frontend for XFCE"
+cat << EOF
+Xfburn is a simple CD burning tool acting as a front-end to mkisofs,
+cdrdao, readcd and cdrecord. It can blank CD-RW, copy CDs, burn and
+create iso images, and burn personal composition of data.
+EOF
diff --git a/xfce/xfburn/HISTORY b/xfce/xfburn/HISTORY
new file mode 100644
index 0000000..e3b62fb
--- /dev/null
+++ b/xfce/xfburn/HISTORY
@@ -0,0 +1,2 @@
+2007-10-05 Pol Vinogradov <vin.public AT gmail.com>
+ * DEPENDS, DETAILS, PRE_BUILD, PREPARE: created spell
diff --git a/xfce/xfburn/PREPARE b/xfce/xfburn/PREPARE
new file mode 100755
index 0000000..7b4b191
--- /dev/null
+++ b/xfce/xfburn/PREPARE
@@ -0,0 +1,6 @@
+config_query XFBURN_SVN "Use svn version?" n &&
+
+if [ "$XFBURN_SVN" == "y" ]; then
+ config_query XFBURN_SVN_AUTOUPDATE \
+ "Queue for update on every system update?" n
+fi
diff --git a/xfce/xfburn/PRE_BUILD b/xfce/xfburn/PRE_BUILD
new file mode 100755
index 0000000..0f3feca
--- /dev/null
+++ b/xfce/xfburn/PRE_BUILD
@@ -0,0 +1,9 @@
+default_pre_build &&
+cd ${SOURCE_DIRECTORY} &&
+
+if [ "$XFBURN_SVN" == "y" ]; then
+ aclocal &&
+ autoheader &&
+ autoconf &&
+ automake
+fi
diff --git a/xfce/xfwm4/DETAILS b/xfce/xfwm4/DETAILS
index 7895669..b735333 100755
--- a/xfce/xfwm4/DETAILS
+++ b/xfce/xfwm4/DETAILS
@@ -7,6 +7,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_GPG="gurus.gpg:$SOURCE.sig"
LICENSE[0]=GPL
ENTERED=20030608
+ PATCHLEVEL=1
KEYWORDS="xfce"
SHORT="Next generation window manager for xfce"
cat << EOF
diff --git a/xfce/xfwm4/HISTORY b/xfce/xfwm4/HISTORY
index 4e013bd..fe13e4c 100644
--- a/xfce/xfwm4/HISTORY
+++ b/xfce/xfwm4/HISTORY
@@ -1,3 +1,9 @@
+2007-10-23 George Sherwood <george AT beernabeer.com>
+ * DETAILS: PATCHLEVEL++
+ * PRE_BUILD: Added to apply patch from
+ http://bugzilla.xfce.org/show_bug.cgi?id=3346
+ * xfwm4-gtk+2.patch: Upstream patch fixes Bug 14005
+
2007-09-30 Arwed v. Merkatz <v.merkatz AT gmx.net>
* DEPENDS: provider for XDAMAGE is libxdamage, not xorg-server

diff --git a/xfce/xfwm4/PRE_BUILD b/xfce/xfwm4/PRE_BUILD
new file mode 100755
index 0000000..b831fe9
--- /dev/null
+++ b/xfce/xfwm4/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+patch -p0 < $SCRIPT_DIRECTORY/xfwm4-gtk+2.patch
diff --git a/xfce/xfwm4/xfwm4-gtk+2.patch b/xfce/xfwm4/xfwm4-gtk+2.patch
new file mode 100644
index 0000000..c56bfbb
--- /dev/null
+++ b/xfce/xfwm4/xfwm4-gtk+2.patch
@@ -0,0 +1,157 @@
+Index: src/display.c
+===================================================================
+--- src/display.c (revision 25820)
++++ src/display.c (working copy)
+@@ -178,6 +178,19 @@
+ FALSE, display_info->atoms) != 0);
+ }
+
++static void
++myDisplayCreateTimestampWin (DisplayInfo *display_info)
++{
++ XSetWindowAttributes attributes;
++
++ attributes.event_mask = PropertyChangeMask;
++ attributes.override_redirect = TRUE;
++ display_info->timestamp_win =
++ XCreateWindow (display_info->dpy, DefaultRootWindow
(display_info->dpy),
++ -100, -100, 10, 10, 0, 0, CopyFromParent,
CopyFromParent,
++ CWEventMask | CWOverrideRedirect, &attributes);
++}
++
+ DisplayInfo *
+ myDisplayInit (GdkDisplay *gdisplay)
+ {
+@@ -309,6 +322,8 @@
+ display->resize_cursor[CORNER_COUNT + SIDE_BOTTOM] =
+ XCreateFontCursor (display->dpy, XC_bottom_side);
+
++ myDisplayCreateTimestampWin (display);
++
+ display->xfilter = NULL;
+ display->screens = NULL;
+ display->clients = NULL;
+@@ -340,6 +355,8 @@
+ display->move_cursor = None;
+ XFreeCursor (display->dpy, display->root_cursor);
+ display->root_cursor = None;
++ XDestroyWindow (display->dpy, display->timestamp_win);
++ display->timestamp_win = None;
+
+ if (display->hostname)
+ {
+Index: src/display.h
+===================================================================
+--- src/display.h (revision 25820)
++++ src/display.h (working copy)
+@@ -226,6 +226,7 @@
+ gboolean quit;
+ gboolean reload;
+
++ Window timestamp_win;
+ Cursor busy_cursor;
+ Cursor move_cursor;
+ Cursor root_cursor;
+Index: src/client.c
+===================================================================
+--- src/client.c (revision 25820)
++++ src/client.c (working copy)
+@@ -4868,21 +4868,19 @@
+
+ if (passdata.c)
+ {
+- GdkPixbuf *icon;
+-
+ TRACE ("entering cycle loop");
+ passdata.wireframe = wireframeCreate (passdata.c);
+- icon = getAppIcon (display_info, passdata.c->window, 32, 32);
+ passdata.tabwin = tabwinCreate (passdata.c->screen_info->gscr, c,
+ passdata.c, passdata.cycle_range,
+
screen_info->params->cycle_workspaces);
+ eventFilterPush (display_info->xfilter, clientCycleEventFilter,
&passdata);
+ gtk_main ();
+ eventFilterPop (display_info->xfilter);
+- wireframeDelete (screen_info, passdata.wireframe);
+ TRACE ("leaving cycle loop");
+ tabwinDestroy (passdata.tabwin);
+ g_free (passdata.tabwin);
++ wireframeDelete (screen_info, passdata.wireframe);
++ updateXserverTime (display_info);
+ }
+
+ if (passdata.c)
+Index: src/hints.c
+===================================================================
+--- src/hints.c (revision 25820)
++++ src/hints.c (working copy)
+@@ -1167,27 +1167,18 @@
+ return setXAtomManagerOwner(display_info, display_info->atoms[atom_id],
root, w);
+ }
+
+-
+-static Bool
+-checkPropEvent (Display *display, XEvent *xevent, XPointer arg)
++void
++updateXserverTime (DisplayInfo *display_info)
+ {
+- DisplayInfo *display_info;
+ ScreenInfo *screen_info;
++ char c = '\0';
+
+- display_info = (DisplayInfo *) arg;
+- g_return_val_if_fail (display_info, FALSE);
++ g_return_if_fail (display_info);
+
+- screen_info = myDisplayGetDefaultScreen (display_info);
+- g_return_val_if_fail (screen_info, FALSE);
+-
+- if ((xevent->type == PropertyNotify) &&
+- (xevent->xproperty.window == screen_info->xfwm4_win) &&
+- (xevent->xproperty.atom ==
display_info->atoms[XFWM4_TIMESTAMP_PROP]))
+- {
+- return TRUE;
+- }
+-
+- return FALSE;
++ XChangeProperty (display_info->dpy, display_info->timestamp_win,
++ display_info->atoms[XFWM4_TIMESTAMP_PROP],
++ display_info->atoms[XFWM4_TIMESTAMP_PROP],
++ 8, PropModeReplace, (unsigned char *) &c, 1);
+ }
+
+ Time
+@@ -1196,7 +1187,6 @@
+ ScreenInfo *screen_info;
+ XEvent xevent;
+ Time timestamp;
+- char c = '\0';
+
+ g_return_val_if_fail (display_info, (Time) CurrentTime);
+ timestamp = myDisplayGetCurrentTime (display_info);
+@@ -1206,12 +1196,8 @@
+ g_return_val_if_fail (screen_info, (Time) CurrentTime);
+
+ TRACE ("getXServerTime: Using X server roundtrip");
+- XChangeProperty (display_info->dpy, screen_info->xfwm4_win,
+- display_info->atoms[XFWM4_TIMESTAMP_PROP],
+- display_info->atoms[XFWM4_TIMESTAMP_PROP],
+- 8, PropModeReplace, (unsigned char *) &c, 1);
+- XIfEvent (display_info->dpy, &xevent, checkPropEvent, (XPointer)
display_info);
+-
++ updateXserverTime (display_info);
++ XWindowEvent (display_info->dpy, display_info->timestamp_win,
PropertyChangeMask, &xevent);
+ timestamp = (Time) myDisplayUpdateCurrentTime (display_info,
&xevent);
+ }
+
+Index: src/hints.h
+===================================================================
+--- src/hints.h (revision 25820)
++++ src/hints.h (working copy)
+@@ -269,6 +269,7 @@
+ int,
+ Window ,
+ Window);
++void updateXserverTime
(DisplayInfo *);
+ Time getXServerTime
(DisplayInfo *);
+
+ #ifdef ENABLE_KDE_SYSTRAY_PROXY




Archive powered by MHonArc 2.6.24.

Top of Page