Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to devel-xorg-modular grimoire by Eric Sandall (bb6257ef43ae895e0ad004f2fcc5da573fa6ce59)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Eric Sandall <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to devel-xorg-modular grimoire by Eric Sandall (bb6257ef43ae895e0ad004f2fcc5da573fa6ce59)
  • Date: Tue, 15 Sep 2009 04:36:01 -0500

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

ChangeLog |
6
audio-drivers/alsa-lib/DETAILS |
2
audio-drivers/alsa-lib/HISTORY |
3
audio-drivers/alsa-lib/alsa-lib-1.0.21.tar.bz2.sig |
0
audio-drivers/alsa-lib/alsa-lib-1.0.21a.tar.bz2.sig
|binary
audio-drivers/pulseaudio/DETAILS |
2
audio-drivers/pulseaudio/HISTORY |
6
audio-drivers/pulseaudio/pulseaudio-0.9.15.tar.gz.sig |
0
audio-drivers/pulseaudio/pulseaudio-0.9.17.tar.gz.sig
|binary
audio-libs/libdca/DETAILS |
3
audio-libs/libdca/HISTORY |
3
audio-players/muine/DETAILS |
9
audio-players/muine/HISTORY |
3
audio-plugins/gnonlin/DETAILS |
7
audio-plugins/gnonlin/HISTORY |
3
audio-plugins/gnonlin/gnonlin-0.10.8.tar.gz.sig |
0
audio-soft/paprefs/DEPENDS |
3
audio-soft/paprefs/DETAILS |
2
audio-soft/paprefs/HISTORY |
6
audio-soft/paprefs/paprefs-0.9.8.tar.gz.sig |
0
audio-soft/paprefs/paprefs-0.9.9.tar.gz.sig
|binary
audio-soft/pavucontrol/DETAILS |
2
audio-soft/pavucontrol/HISTORY |
3
audio-soft/pavucontrol/pavucontrol-0.9.8.tar.gz.sig |
0
audio-soft/pavucontrol/pavucontrol-0.9.9.tar.gz.sig
|binary
chat-im/ayttm/DETAILS |
3
chat-im/ayttm/HISTORY |
3
chat-im/ayttm/ayttm-0.5.0-111.tar.bz2.sig |
0
chat-im/ayttm/ayttm-0.6.0.tar.bz2.sig
|binary
collab/bugzilla/DETAILS |
6
collab/bugzilla/HISTORY |
4
crypto/beecrypt/BUILD |
15
crypto/beecrypt/HISTORY |
4
crypto/botan/DETAILS |
2
crypto/botan/HISTORY |
3
database/sqlite/DETAILS |
4
database/sqlite/HISTORY |
7
database/sqlite/PRE_BUILD |
2
database/sqlite/no-tcl.patch |
14
dev/null
|binary
devel/automake/DEPENDS |
1
devel/automake/HISTORY |
3
devel/clisp/DEPENDS |
2
devel/clisp/DETAILS |
8
devel/clisp/HISTORY |
4
devel/doxygen/HISTORY |
3
devel/doxygen/INSTALL |
1
devel/git/DETAILS |
2
devel/git/HISTORY |
3
devel/graphviz/DETAILS |
5
devel/graphviz/HISTORY |
3
devel/mono/DETAILS |
4
devel/mono/HISTORY |
3
devel/phpmyadmin/DETAILS |
4
devel/phpmyadmin/HISTORY |
3
disk/btrfs-progs/DETAILS |
4
disk/btrfs-progs/HISTORY |
4
disk/btrfs-progs/PRE_BUILD |
4
disk/di/DETAILS |
4
disk/di/HISTORY |
3
disk/libmtp/DETAILS |
4
disk/libmtp/HISTORY |
3
e-16/e16/DETAILS |
4
e-16/e16/HISTORY |
3
ftp/lftp/DETAILS |
2
ftp/lftp/HISTORY |
3
gnome2-apps/epiphany/DETAILS |
2
gnome2-apps/epiphany/HISTORY |
5
gnome2-apps/epiphany/PRE_BUILD |
6
gnome2-apps/epiphany/epiphany-2.27.91.tar.bz2.sig |
0
gnome2-apps/epiphany/epiphany-2.27.92.tar.bz2.sig
|binary
gnome2-apps/epiphany/epiphany.patch |
24
gnome2-apps/gnumeric/DETAILS |
4
gnome2-apps/gnumeric/HISTORY |
3
gnome2-apps/gpointing-device-settings/DEPENDS |
2
gnome2-apps/gpointing-device-settings/DETAILS |
14
gnome2-apps/gpointing-device-settings/HISTORY |
3
gnome2-libs/gnome2-user-docs/DEPENDS |
1
gnome2-libs/gnome2-user-docs/HISTORY |
3
gnome2-libs/goffice-dev/DETAILS |
4
gnome2-libs/goffice-dev/HISTORY |
3
gnome2-libs/libbonobo/DEPENDS |
1
gnome2-libs/libbonobo/HISTORY |
3
gnome2-libs/libcanberra/DETAILS |
2
gnome2-libs/libcanberra/HISTORY |
3
gnome2-libs/libcanberra/libcanberra-0.12.tar.gz.sig |
0
gnome2-libs/libcanberra/libcanberra-0.16.tar.gz.sig
|binary
graphics-libs/agg/HISTORY |
4
graphics-libs/agg/PRE_BUILD |
1
graphics-libs/agg/agg-2.5-libtool22_fix-1.patch |
24
graphics-libs/devil/DETAILS |
17
graphics-libs/devil/HISTORY |
3
graphics-libs/libpng/DETAILS |
4
graphics-libs/libpng/HISTORY |
3
graphics/imagemagick/DETAILS |
2
graphics/imagemagick/HISTORY |
3
graphics/imagemagick/ImageMagick-6.5.5-6.tar.bz2.sig |
0
graphics/imagemagick/ImageMagick-6.5.5-9.tar.bz2.sig
|binary
graphics/mesademos/DETAILS |
12
graphics/mesademos/HISTORY |
6
http/elinks/DETAILS |
2
http/elinks/HISTORY |
3
http/firefox/DETAILS |
10
http/firefox/HISTORY |
3
http/gnash/DETAILS |
2
http/gnash/HISTORY |
4
http/gnash/PRE_BUILD |
10
http/midori/DETAILS |
4
http/midori/HISTORY |
3
http/nginx/DETAILS |
10
http/nginx/HISTORY |
4
http/surf/DEPENDS |
5
http/surf/DETAILS |
33
http/surf/HISTORY |
4
http/surf/PREPARE |
6
http/w3m/HISTORY |
4
http/w3m/INSTALL |
8
http/w3m/profile.d/pager.sh |
10
http/xshttpd/DETAILS |
2
http/xshttpd/HISTORY |
4
http/xshttpd/PRE_BUILD |
2
http/xshttpd/johans.gpg
|binary
http/xulrunner/DETAILS |
8
http/xulrunner/HISTORY |
3
kernels/kvm/HISTORY |
5
kernels/kvm/PRE_BUILD |
3
kernels/kvm/bug2823323.patch |
16
kernels/linux/HISTORY |
11
kernels/linux/info/patches/ck_bfs/2.6.31-sched-bfs-211.patch |
5
kernels/linux/info/patches/smgl_patches/smgl-logo-0.2-for-2.6.22.patch |
2
kernels/linux/info/patches/smgl_patches/smgl-logo-0.2-for-2.6.31.patch |
5
kernels/linux/info/patches/zen_patches/2.6.30-zen4.patch |
6
kernels/linux/latest.defaults |
2
kernels/virtualbox-module/DETAILS |
2
kernels/virtualbox-module/HISTORY |
3
kernels/xen-hypervisor/DETAILS |
4
kernels/xen-hypervisor/HISTORY |
3
libs/libelf/DETAILS |
4
libs/libelf/HISTORY |
3
libs/libxml2/DETAILS |
4
libs/libxml2/HISTORY |
3
libs/neon/DETAILS |
2
libs/neon/HISTORY |
3
mail/procmail/BUILD |
1
mail/procmail/HISTORY |
5
mail/procmail/procmail-3.22-glibc-2.10.patch |
70 +
net/iptables/DETAILS |
2
net/iptables/HISTORY |
3
net/nagios-plugins/DETAILS |
4
net/nagios-plugins/HISTORY |
3
net/nagios/CONFIGURE |
6
net/nagios/DETAILS |
4
net/nagios/HISTORY |
14
net/nagios/PRE_BUILD |
14
net/nagios/nagios-2.0-both.patch |
565 ----------
net/nagios/nagios-2.0-ipaddress.patch |
360 ------
net/nagios/nagios-2.0-snmpcommunity.patch |
287 -----
net/nagios/nagios-2.0-statusmap.patch |
50
net/nagios/nagios-3.0-statusmap.patch |
55
net/ntop/DEPENDS |
1
net/ntop/HISTORY |
3
net/samba/DETAILS |
4
net/samba/HISTORY |
3
net/vnstat/DETAILS |
4
net/vnstat/HISTORY |
3
net/whois/DETAILS |
4
net/whois/HISTORY |
3
net/wicd/DETAILS |
4
net/wicd/HISTORY |
3
perl-cpan/class-singleton/DETAILS |
4
perl-cpan/class-singleton/HISTORY |
3
perl-cpan/datetime-locale/DETAILS |
4
perl-cpan/datetime-locale/HISTORY |
3
perl-cpan/datetime-timezone/DEPENDS |
1
perl-cpan/datetime-timezone/DETAILS |
4
perl-cpan/datetime-timezone/HISTORY |
4
perl-cpan/datetime/DETAILS |
4
perl-cpan/datetime/HISTORY |
3
perl-cpan/email-mime-encodings/DETAILS |
4
perl-cpan/email-mime-encodings/HISTORY |
3
perl-cpan/email-mime-modifier/DETAILS |
4
perl-cpan/email-mime-modifier/HISTORY |
3
perl-cpan/email-mime/DETAILS |
4
perl-cpan/email-mime/HISTORY |
3
perl-cpan/email-send/DETAILS |
6
perl-cpan/email-send/HISTORY |
3
perl-cpan/perl-cgi/DETAILS |
4
perl-cpan/perl-cgi/HISTORY |
3
perl-cpan/template-toolkit/DETAILS |
4
perl-cpan/template-toolkit/HISTORY |
3
perl-cpan/uri/DETAILS |
4
perl-cpan/uri/HISTORY |
3
php-pear/imagick/DEPENDS |
3
php-pear/imagick/HISTORY |
3
php-pear/php/CONFIGURE |
83 +
php-pear/php/DEPENDS |
172 +--
php-pear/php/HISTORY |
7
php-pear/php/INSTALL |
6
php-pear/php/PREPARE |
1
printer/cups/DETAILS |
8
printer/cups/HISTORY |
3
python-pypi/pygments/DETAILS |
4
python-pypi/pygments/HISTORY |
4
security/thc-hydra/DEPENDS |
16
security/thc-hydra/DETAILS |
7
security/thc-hydra/HISTORY |
3
smgl/fakeroot/DETAILS |
4
smgl/fakeroot/HISTORY |
3
smgl/fakeroot/fakeroot_1.5.1.tar.gz.sig |
0
smgl/smgl-upstart/HISTORY |
6
smgl/smgl-upstart/INSTALL |
2
smgl/smgl-upstart/inittab.native |
7
smgl/smgl-upstart/upstart-init/native/README |
5
smgl/smgl-upstart/upstart-init/native/alsa.conf |
7
smgl/smgl-upstart/upstart-init/native/avahi.conf |
2
smgl/smgl-upstart/upstart-init/native/clamav |
13
smgl/smgl-upstart/upstart-init/native/clamav.conf |
13
smgl/smgl-upstart/upstart-init/native/dbus.conf |
8
smgl/smgl-upstart/upstart-init/native/devices.conf |
15
smgl/smgl-upstart/upstart-init/native/freshclam |
11
smgl/smgl-upstart/upstart-init/native/freshclam.conf |
11
smgl/smgl-upstart/upstart-init/native/gdm.conf |
2
smgl/smgl-upstart/upstart-init/native/hald.conf |
9
smgl/smgl-upstart/upstart-init/native/hostname.conf |
2
smgl/smgl-upstart/upstart-init/native/libvirtd.conf |
15
smgl/smgl-upstart/upstart-init/native/lighttpd.conf |
2
smgl/smgl-upstart/upstart-init/native/lvm.conf |
19
smgl/smgl-upstart/upstart-init/native/mount_all.conf |
118 +-
smgl/smgl-upstart/upstart-init/native/mount_root.conf |
73 +
smgl/smgl-upstart/upstart-init/native/mpd.conf |
2
smgl/smgl-upstart/upstart-init/native/network.conf |
11
smgl/smgl-upstart/upstart-init/native/rc.conf |
18
smgl/smgl-upstart/upstart-init/native/scripts/lvm.sh |
4
smgl/smgl-upstart/upstart-init/native/shutdown.conf |
11
smgl/smgl-upstart/upstart-init/native/slapd.conf |
2
smgl/smgl-upstart/upstart-init/native/syslog.conf |
8
smgl/smgl-upstart/upstart-init/native/tty1.conf |
3
smgl/smgl-upstart/upstart-init/native/tty2.conf |
4
smgl/smgl-upstart/upstart-init/native/xend.conf |
25
smgl/smgl-upstart/upstart-init/native/xinetd.conf |
4
utils/coreutils/DETAILS |
2
utils/coreutils/HISTORY |
3
utils/gnuplot/DETAILS |
4
utils/gnuplot/HISTORY |
3
utils/kexec-tools/DETAILS |
4
utils/kexec-tools/HISTORY |
3
utils/kexec-tools/kexec-tools-2.0.0.tar.bz2.sig |
0
utils/kexec-tools/kexec-tools-2.0.1.tar.bz2.sig
|binary
utils/less/HISTORY |
4
utils/less/INSTALL |
9
utils/less/profile.d/pager.sh |
10
utils/most/HISTORY |
4
utils/most/INSTALL |
9
utils/most/profile.d/pager.sh |
10
utils/psmisc/DETAILS |
5
utils/psmisc/HISTORY |
6
utils/pybackpack/BUILD |
1
utils/pybackpack/DEPENDS |
9
utils/pybackpack/DETAILS |
15
utils/pybackpack/HISTORY |
3
utils/pybackpack/INSTALL |
1
utils/pybackpack/desktop/pybackpack.desktop |
10
utils/unison/DETAILS |
10
utils/unison/HISTORY |
6
utils/unison/INSTALL |
2
utils/util-linux/HISTORY |
5
utils/util-linux/INSTALL |
7
utils/util-linux/profile.d/pager.sh |
10
utils/virtualbox/DETAILS |
4
utils/virtualbox/HISTORY |
3
utils/xen-tools/DETAILS |
4
utils/xen-tools/HISTORY |
3
utils/xen/DETAILS |
5
utils/xen/HISTORY |
3
video-libs/live/DETAILS |
4
video-libs/live/HISTORY |
3
video/totem/DEPENDS |
6
video/totem/HISTORY |
3
wm-addons/devilspie/DETAILS |
5
wm-addons/devilspie/HISTORY |
3
x11-toolkits/pygoocanvas/DETAILS |
6
x11-toolkits/pygoocanvas/HISTORY |
3
x11/xdaliclock/DETAILS |
4
x11/xdaliclock/HISTORY |
3
x11/xscreensaver/DETAILS |
4
x11/xscreensaver/HISTORY |
3
286 files changed, 1439 insertions(+), 1709 deletions(-)

New commits:
commit 851db2720ff90934f3999e49de469a15d0c8fb9d
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>

libdca: SOURCE must be defined before it is used, now it is possible to
download
it

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

nginx: => 0.7.62, 0.6.39 (security update)

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

iptables 1.4.5

commit 3e766e42c45239603c95c840ce0ca5a946fe199c
Author: Quentin Rameau <quinq AT sourcemage.org>
Commit: Quentin Rameau <quinq AT sourcemage.org>

smgl/fakeroot: updated to version 1.13

commit d7dd01534c2b7b7a0ff2388a2a38e348d4d35bcf
Author: Bearcat M. Şandor <bearcat AT clowder.feline-soul.net>
Commit: Bearcat M. Şandor <bearcat AT clowder.feline-soul.net>

gnonlin updated to 0.10.13, changed from gpg to sha hash

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

smgl-upstart: improved native init scripts

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

psmisc: removed pidof info from DETAILS, pidof is not provided by psmisc

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

psmisc: version 22.8

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

thc-hydra: version 5.4 and fixed DEPENDS

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

Please enter a description of the spell here
xen-tools: version 3.4.1

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

xen-hypervisor: version 3.4.1

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

xen: version bump to 3.4.1, added long desc

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

gpointing-device-settings: new spell, touchpad config gui

commit 697dd72905ed8dc1bf34890613bbcf2b7175770d
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: David Kowis <dkowis AT Kain.shlrm.org>

imagick: added missing dep

commit 0d4f540210061ba44777d2568a29200eae7dd983
Author: David Kowis <dkowis AT shlrm.org>
Commit: David Kowis <dkowis AT Kain.shlrm.org>

graphviz: to latest stable version

Makes it build on 64-bit

commit 12035d8f334c31aa07f5fc258eca80ded8c7ae68
Author: David Kowis <dkowis AT shlrm.org>
Commit: David Kowis <dkowis AT Kain.shlrm.org>

bugzilla: Security fix! Version to 3.4.2

There are goodies, but I didn't add them, because it's a pain to get all
this working right. We're not using the new goodies yet anyhow. It'd be
nice to, but we'll get to that eventually.

commit 8940e7c35c2f0f9132f99c79836a89891c268e51
Author: David Kowis <dkowis AT shlrm.org>
Commit: David Kowis <dkowis AT Kain.shlrm.org>

uri: to latest version

commit b73a62d824f9c904b1302087855682ce92895960
Author: David Kowis <dkowis AT shlrm.org>
Commit: David Kowis <dkowis AT Kain.shlrm.org>

email-mime-modifier: to latest version

commit e325b7baafc5bd568438d19d98797e098292b4a5
Author: David Kowis <dkowis AT shlrm.org>
Commit: David Kowis <dkowis AT Kain.shlrm.org>

email-mime-encodings: to latest version

commit f08a9b3e659511df1c4ef03d1a66c9cab7d45e56
Author: David Kowis <dkowis AT shlrm.org>
Commit: David Kowis <dkowis AT Kain.shlrm.org>

email-mime: updated to latest version

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

imagick: added missing dep

commit 98cbf8468a9a12b07b227945a73ecbc802fe3bff
Author: David Kowis <dkowis AT shlrm.org>
Commit: David Kowis <dkowis AT Kain.shlrm.org>

email-send: updated to latest version

commit d7dfe9b06ac1d9043b133e5cc2ddc583ca28a1d7
Author: David Kowis <dkowis AT shlrm.org>
Commit: David Kowis <dkowis AT Kain.shlrm.org>

template-toolkit: to latest version

commit 1a1479271283af57ed05d4d084b0f4655ea1c396
Author: David Kowis <dkowis AT shlrm.org>
Commit: David Kowis <dkowis AT Kain.shlrm.org>

class-singleton: actually the right version now

commit 08b69192da0e7eb6860bc24691a211d3eec07908
Author: David Kowis <dkowis AT shlrm.org>
Commit: David Kowis <dkowis AT Kain.shlrm.org>

Revert "class-singleton: changed download url"

This reverts commit 27241510dec3593f2652f8eca20b882e41f3fd4e.
Oops, didn't have the version right

commit b846f41349f303a44a587e3c1b6561f92ef5036e
Author: David Kowis <dkowis AT shlrm.org>
Commit: David Kowis <dkowis AT Kain.shlrm.org>

class-singleton: changed download url

commit 485e574d99f97b14f3f14fd0ae8bb7984e31e3bd
Author: David Kowis <dkowis AT shlrm.org>
Commit: David Kowis <dkowis AT Kain.shlrm.org>

class-singleton: to latest version

commit bdffb5ad229df09a60927f4cd922b32bec10bedd
Author: David Kowis <dkowis AT shlrm.org>
Commit: David Kowis <dkowis AT Kain.shlrm.org>

datetime-timezone: removed module-build dependency

commit bd82394d5146c35ecf1d4398ed77fbb1178d69b8
Author: David Kowis <dkowis AT shlrm.org>
Commit: David Kowis <dkowis AT Kain.shlrm.org>

datetime-local: to latest version

commit 3b910479e7394bfcecdeab53d8c29bf01fe24118
Author: David Kowis <dkowis AT shlrm.org>
Commit: David Kowis <dkowis AT Kain.shlrm.org>

datetime-timezone: to latest version

commit 46ea7c76fc93460879ffa1889757a7e60d8afea2
Author: David Kowis <dkowis AT shlrm.org>
Commit: David Kowis <dkowis AT Kain.shlrm.org>

datetime: update to latest version

commit 91c6f1c7ff60bd8ffcdffcdfc14c6735cfccbfda
Author: David Kowis <dkowis AT shlrm.org>
Commit: David Kowis <dkowis AT Kain.shlrm.org>

perl-cgi: updated to latest version

commit 80bd30ee7dab581cd77fd046673d0f76fb66f2c1
Author: David Kowis <dkowis AT shlrm.org>
Commit: David Kowis <dkowis AT Kain.shlrm.org>

class-singleton: actually the right version now

commit 69f458e31fb6681cf8709b83faaa178815a026eb
Author: David Kowis <dkowis AT shlrm.org>
Commit: David Kowis <dkowis AT Kain.shlrm.org>

Revert "class-singleton: changed download url"

This reverts commit 27241510dec3593f2652f8eca20b882e41f3fd4e.
Oops, didn't have the version right

commit 27241510dec3593f2652f8eca20b882e41f3fd4e
Author: David Kowis <dkowis AT shlrm.org>
Commit: David Kowis <dkowis AT Kain.shlrm.org>

class-singleton: changed download url

commit 4385b090051d97557c8d915b8dc9609416ea56e4
Author: David Kowis <dkowis AT shlrm.org>
Commit: David Kowis <dkowis AT Kain.shlrm.org>

class-singleton: to latest version

commit 02c6cab8e58dd13659714965b0ac30fe42ff466c
Author: David Kowis <dkowis AT shlrm.org>
Commit: David Kowis <dkowis AT Kain.shlrm.org>

datetime-timezone: removed module-build dependency

commit c1157699808339ad02ae1634cc6b63e0a1d63280
Author: David Kowis <dkowis AT shlrm.org>
Commit: David Kowis <dkowis AT Kain.shlrm.org>

datetime-local: to latest version

commit a487e80a3ff60448ac907c7349092393d53e8ce3
Author: David Kowis <dkowis AT shlrm.org>
Commit: David Kowis <dkowis AT Kain.shlrm.org>

datetime-timezone: to latest version

commit cad620e3e544c7156a42579e88c88a9d1fc0715e
Author: David Kowis <dkowis AT shlrm.org>
Commit: David Kowis <dkowis AT Kain.shlrm.org>

datetime: update to latest version

commit d517a42cc5d679502ee5139e01a4c20ff1183919
Author: David Kowis <dkowis AT shlrm.org>
Commit: David Kowis <dkowis AT Kain.shlrm.org>

perl-cgi: updated to latest version

commit e75123960ce6a65b5efc60d30936ed11090d2272
Author: David Kowis <dkowis AT shlrm.org>
Commit: David Kowis <dkowis AT Kain.shlrm.org>

php: added a message

commit 48da5e813903faa461f7c44e6ac7594370810fc1
Author: David Kowis <dkowis AT shlrm.org>
Commit: David Kowis <dkowis AT Kain.shlrm.org>

procmail: patch applied to build with glibc 2.10

commit 480ec3d17a3d6967162f25da49665f2ca30b784b
Author: David Kowis <dkowis AT shlrm.org>
Commit: David Kowis <dkowis AT Kain.shlrm.org>

php: adding history message

Shame on me for forgetting this :(

commit 5240950a71cb873a6c15fe1984047b03045ed737
Author: David Kowis <dkowis AT shlrm.org>
Commit: David Kowis <dkowis AT Kain.shlrm.org>

php: big changes to the php spell

Reworked it significantly to make it suck less. Database drivers are
grouped in a sane fashion. Usage of PCRE is smarter. All the drivers are
selectable now.

Restructred like a mad man

Oops

Don't include ndbm or dbm, they're deprecated

Fixing some bugs

More oops

BLARGH

Last glitch I hope...

Fixing this I think

Install the right config file

Slightly smarter pear check

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

muine 0.8.11

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

devel/doxygen: fixed manpage install path

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

utils/unison: fixed install path

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

cups 1.4.1

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

utils/pybackpack: new spell, a GUI backup utility

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

neon 0.29.0

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

libmtp 1.0.1

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

botan 1.8.7

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

http/gnash: updated to 0.8.5, mmore fioxes and cleanups

commit 32dc9bf226b868194dabe657e5c69260433077ee
Author: Donald Johnson <ltdonny AT gmail.com>
Commit: Donald Johnson <ltdonny AT gmail.com>

pygoocanvas -> 0.14.1 and changed source URL

commit 820d7b1f62a1dc54eb8cef2a24fdf7743553b4ae
Author: Quentin Rameau <quinq AT sourcemage.org>
Commit: Quentin Rameau <quinq AT sourcemage.org>

http/w3m: corrected HISTORY entry

commit 36c91c27bf7f9551abf93c3be11eabf349a22788
Author: Quentin Rameau <quinq AT sourcemage.org>
Commit: Quentin Rameau <quinq AT sourcemage.org>

utils/util-linux: corrected HISTORY entry

commit bfe5dc98a137f087be223207bde17bd384e7cf38
Author: Quentin Rameau <quinq AT sourcemage.org>
Commit: Quentin Rameau <quinq AT sourcemage.org>

utils/most: corrected HISTORY entry

commit bf2a289d10bd593d5b4f8ff2eedb518fae67ba54
Author: Quentin Rameau <quinq AT sourcemage.org>
Commit: Quentin Rameau <quinq AT sourcemage.org>

utils/less: corrected HISTORY entry

utils/less: corrected HISTORY entry

commit 117d1a01c56b1593e3b656ffa7d299253b84d092
Author: Quentin Rameau <quinq AT sourcemage.org>
Commit: Quentin Rameau <quinq AT sourcemage.org>

utils/most: forgot to include profile script

commit 7462d64206ac6212e284a89dbca58c19b2f8487c
Author: Quentin Rameau <quinq AT sourcemage.org>
Commit: Quentin Rameau <quinq AT sourcemage.org>

http/w3m: added profile editor script

commit 10928d3b0bbf77f2d16cbb54a2a675e1705c73f8
Author: Quentin Rameau <quinq AT sourcemage.org>
Commit: Quentin Rameau <quinq AT sourcemage.org>

utils/util-linux: added profile editor script

commit 065459ec8358320e3da245ca24578bc220dfdfba
Author: Quentin Rameau <quinq AT sourcemage.org>
Commit: Quentin Rameau <quinq AT sourcemage.org>

utils/most: added profile editor script

commit b2f6766b04dd98a08f2ec0f7a2c09f035b8b7eb8
Author: Quentin Rameau <quinq AT sourcemage.org>
Commit: Quentin Rameau <quinq AT sourcemage.org>

utils/less: added profile editor script

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

phpmyadmin: Updated to version 3.2.2

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

git: => 1.6.4.3

commit 394ff2dedd95232ffbb83eea09344c3898bb3a0e
Author: Quentin Rameau <quinq AT sourcemage.org>
Commit: Quentin Rameau <quinq AT sourcemage.org>

http/surf: added stable version 0.1.2

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

utils/unison: updated to 2.32.52 and 2.27.157

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

whois 4.7.36

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

live 2009.09.04

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

libxml2 2.7.4

commit 20127ea94c920b8586309f852c45429c7159dd65
Author: Peng Chang (Charles) <chp AT sourcemage.org>
Commit: Peng Chang (Charles) <chp AT sourcemage.org>

Revert "mesalib: updated 2 urls"

This reverts commit fc56ee1b854e25a9cb940ea9c4015802211bfe69.
This change should've been made in devel-xorg-modular

commit 734a7fc592bf9e0517d12e988d1ada644845e6e4
Author: Peng Chang (Charles) <chp AT sourcemage.org>
Commit: Peng Chang (Charles) <chp AT sourcemage.org>

Revert "mesalib: => 7.5.1"

This reverts commit 6c609b98621933e9889861e4ea7986b20e06d2ed.
This change should've been made in devel-xorg-modular

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

vnstat 1.9

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

gnumeric: Updated devel to version 1.9.11

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

goffice-dev: Updated to version 0.7.10

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

epiphany: Updated devel to version 2.27.92. Added upstream patch
to fix build problem with gtk+2

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

samba: Updated to version 3.4.1

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

imagemagick: Updated to version 6.5.5-9

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

sqlite: fixed compilation for non-tcl systems

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

clisp: version 2.48

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

xshttpd: devel version 3.7b13

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

ayttm: Updated to version 0.6.0

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

midori: Updated to version 0.1.10

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

sqlite 3.6.18

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

di 4.14

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

lftp 4.0.0

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

mesademos: updated SOURCE_URLs

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

linux: latest zen patches

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

smgl-upstart: added emits to avoid race conditions

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

pygments: => 1.1

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

xf86-video-ati: Updated stable to 6.12.4
6.12.4 SOURCE matches upstream posted MD5Updated stable to
(cherry picked from commit 02ff3c9804ee60b8e8c1acd233fd352a42307284)

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

xf86-video-ati: Removed XORG_VER
(cherry picked from commit 78edd33b54129e08b76d5bc2429ca79339966bb7)

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

xf86-video-ati: pdated stable to 6.12.3
SOURCE matches upstream posted MD5
(cherry picked from commit f62ce6bce8817e2b352111d9828fc74af608d4bf)

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

xrandr: Updated to 1.3.2
SOURCE matches upstream posted MD5
(cherry picked from commit 58ebf4e766625d40bb02d0d8532e590cad28bdea)

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

util-macros: Updated to 1.3.0
SOURCE matches upstream posted MD5
(cherry picked from commit bc74164866426aac0c672b056efcce580daf286a)

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

xf86-input-aiptek: Removed PKG and XORG_VER
(cherry picked from commit 107e1258515831b67b336a4c5695ae4895b058da)

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

xf86-input-aiptek: Updated to 1.3.0
SOURCE matches upstream posted MD5
(cherry picked from commit f75daf9dfd08f4bdf021bb903a49dce0252f96a8)

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

xf86-input-void: Updated to 1.3.0
SOURCE matches upstream posted MD5
(cherry picked from commit 0fb71da2d7d2420ca4059de2abeefb7c7fcd272a)

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

xf86-input-acecad: Removed XORG_VER and PKG
(cherry picked from commit c6ea003990869935d1e9ab30eab60a208d4f193f)

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

xf86-input-acecad: Updated to 1.4.0
SOURCE matches upstream posted MD5
(cherry picked from commit e4b1e5e49464165ec5fdfabe51d15611374665cf)

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

xf86-video-nv: Updated to 2.1.15
SOURCE matches upstream posted MD5
(cherry picked from commit 4d8bc2a7d10dc56da799a7e020adae2a6fde9738)

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

xf86-video-vmware: Updated to 10.16.8
SOURCE matches upstream posted MD5
(cherry picked from commit c022664788d86c63e3a3ad9bb55399f53e49ea6f)

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

xf86-video-sunffb: Removed XORG_VER and PKG
(cherry picked from commit e36cc49dc0a6721b78645dd14e8650e4b013772d)

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

xf86-video-sunffb: Updated to 1.2.1
SOURCE matches upstream posted MD5
DRI removed from build system
(cherry picked from commit 3304d34570c9d24f400be974ca15c15537983690)

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

xf86-video-newport: pdated to 0.2.3
SOURCE matches upstream posted MD5
(cherry picked from commit 990d00f1e5206ac67b6a24ada51c6da3a5167b7c)

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

xf86-video-tseng: Updated to 1.2.3
SOURCE matches upstream posted MD5
(cherry picked from commit 5dac4678afc2a666e4959eff6875af431326f38e)

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

xf86-video-tga: Removed PKG
(cherry picked from commit df3b0c5e252fc46a05a0c7b8d6337d34b4a60b0b)

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

xf86-video-tga: Updated to 1.2.1
SOURCE matches upstream posted MD5
(cherry picked from commit 18485d065abe37cc960f801f8f1cca9346b29e70)

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

xf86-video-ark: Removed XORG_VER and PKG
(cherry picked from commit bd75c56919278407ed4ac257d6d13d1491272f38)

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

xf86-video-ark: Updated to 0.7.2
SOURCE matches upstream posted MD5
(cherry picked from commit cf8658000cecbfe82cd43f9a646d277846340f00)

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

xf86-video-rendition: Updated to 4.2.3
SOURCE matches upstream posted MD5
(cherry picked from commit 66a23fea0f7cd001df36c847bf4b1151a27693a0)

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

xf86-video-geode: Updated to 2.11.4.1
SOURCE matches upstream posted MD5
(cherry picked from commit e7579aaf642d45fad1e114943ffc31ce60229b28)

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

libpciaccess: Updated to 0.10.8
SOURCE matches upstream posted MD5
(cherry picked from commit 85513309f1492b09ded20330c1f69626942de9c8)

commit 8baf9a506155680f15a305295e46b3b1e7fa7f3d
Author: Justin Boffemmyer <flux AT sourcemage.org>
Commit: Justin Boffemmyer <flux AT sourcemage.org>

net/nagios-plugins: updated to 1.4.13

commit 23b17a8a288923ab93a190d0dea01e10d676e741
Author: Justin Boffemmyer <flux AT sourcemage.org>
Commit: Justin Boffemmyer <flux AT sourcemage.org>

net/nagios: updated to 3.2.0

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

coreutils 7.6

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

pulseaudio 0.9.17

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

totem: Use colour in our dependency message

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

paprefs: Now depends on pulseaudio

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

beecrypt: Fix Bug #15293
Fix from
http://foo-projects.org/git/?p=lunar/moonbase.git;a=blob;f=crypto/beecrypt/BUILD

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

gnome2-user-docs: Depends on which

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

libbonobo: Depends on dbus-glib

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

linux: added 2.6.31-sched-bfs-211.patch

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

e16 1.0.1

commit 20f7c304be117b246fd5dcc9b30a722d3f7bfa37
Author: Quentin Rameau <quinq AT sourcemage.org>
Commit: Quentin Rameau <quinq AT sourcemage.org>

devel/mono: trunk version updated to 141692

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

elinks 0.11.7

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

libelf 0.8.12

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

btrfs-progs 0.19

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

graphics-libs/agg: added patch for right X headers and libs detection

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

xscreensaver 5.10

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

xulrunner 1.9.1.3

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

firefox 3.5.3, SECURITY_PATCH=29

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

linux: smgl-logo-0.2-for-2.6.31.patch adds SMGL Logo 0.2
patch for 2.6.31+ (Bug #15403)

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

linux: smgl-logo-0.2-for-2.6.22.patch supports 2.6.30

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

wicd: updated version to 1.6.2.2

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

kexec-tools: => 2.0.1

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

libpng: => 1.2.40, old apng patch applies OK

commit a829e32e3d69ef440439b872430c645aa72634d0
Author: Donald Johnson <ltdonny AT gmail.com>
Commit: Donald Johnson <ltdonny AT gmail.com>

devil: line-wrapped long desc

commit f4e23c647af9ebff4e83c7aa107fac496497031f
Author: Donald Johnson <ltdonny AT gmail.com>
Commit: Donald Johnson <ltdonny AT gmail.com>

devilspie: line wrapped long desc

commit 7946592c3c5d30e4f6f2a31c12a0f3be23d72c90
Author: Peng Chang (Charles) <chp AT sourcemage.org>
Commit: Peng Chang (Charles) <chp AT sourcemage.org>

mesademos: => 7.5.1

commit 6c609b98621933e9889861e4ea7986b20e06d2ed
Author: Peng Chang (Charles) <chp AT sourcemage.org>
Commit: Peng Chang (Charles) <chp AT sourcemage.org>

mesalib: => 7.5.1

commit fc56ee1b854e25a9cb940ea9c4015802211bfe69
Author: Peng Chang (Charles) <chp AT sourcemage.org>
Commit: Peng Chang (Charles) <chp AT sourcemage.org>

mesalib: updated 2 urls

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

paprefs 0.9.9

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

pavucontrol 0.9.9

commit 7ab63b0df41b5725e31197171cff0e33dac6a967
Author: David Kowis <dkowis AT shlrm.org>
Commit: David Kowis <dkowis AT Kain.shlrm.org>

Slightly smarter pear check

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

libcanberra 0.16

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

pulseaudio 0.9.16

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

xdaliclock 2.30

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

gnuplot 4.2.6

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

virtualbox-module 3.0.6

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

virtualbox 3.0.6

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

alsa-lib 1.0.21a

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

kvm: Patch from http://patchwork.kernel.org/patch/36141/
fixes
http://sourceforge.net/tracker/?func=detail&atid=893831&aid=2823323&group_id=180599

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

ntop: Depends on perl

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

automake: Depends on perl

commit 708caced1a12b8ef507d25fda778563c0a9b8a1f
Author: David Kowis <dkowis AT shlrm.org>
Commit: David Kowis <dkowis AT Kain.shlrm.org>

Install the right config file

commit f6eed53842509e602784c9671c445c5d764b04d4
Author: David Kowis <dkowis AT shlrm.org>
Commit: David Kowis <dkowis AT Kain.shlrm.org>

Fixing this I think

commit c6f382a5384026af40af4729305dacdf2c75b0d7
Author: David Kowis <dkowis AT shlrm.org>
Commit: David Kowis <dkowis AT Kain.shlrm.org>

Last glitch I hope...

commit e1e7a289defe5f7c146e93356a6c957355ed1474
Author: David Kowis <dkowis AT shlrm.org>
Commit: David Kowis <dkowis AT Kain.shlrm.org>

BLARGH

commit d8f8d030e4cded362c220255965e68c39b2c28df
Author: David Kowis <dkowis AT shlrm.org>
Commit: David Kowis <dkowis AT Kain.shlrm.org>

More oops

commit b830bc2c60c18c1352ca6bbe51bdd5576b10ad0a
Author: David Kowis <dkowis AT shlrm.org>
Commit: David Kowis <dkowis AT Kain.shlrm.org>

Fixing some bugs

commit 36e83f67c91c93336477383a3be344a62bdbaaa7
Author: David Kowis <dkowis AT shlrm.org>
Commit: David Kowis <dkowis AT Kain.shlrm.org>

Don't include ndbm or dbm, they're deprecated

commit b76fecfc5576227c03ebcb0ff879d9af699b215a
Author: David Kowis <dkowis AT shlrm.org>
Commit: David Kowis <dkowis AT Kain.shlrm.org>

Oops

commit 85675886c0837e74b5f5d3722ea224e905dd3b50
Author: David Kowis <dkowis AT shlrm.org>
Commit: David Kowis <dkowis AT Kain.shlrm.org>

Restructred like a mad man

diff --git a/ChangeLog b/ChangeLog
index 4c16eb8..4dc7959 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-09-15 Arjan Bouter <abouter AT sourcemage.org>
+ * gnome2-apps/gpointing-device-settings: new spell, touchpad
configuration GUI
+
+2009-09-13 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * utils/pybackpack: new spell, a GUI backup utility
+
2009-09-08 Arjan Bouter <abouter AT sourcemage.org>
* smgl/smgl-upstart: new spell, upstart init scripts

diff --git a/audio-drivers/alsa-lib/DETAILS b/audio-drivers/alsa-lib/DETAILS
index 7f283f6..39f4c48 100755
--- a/audio-drivers/alsa-lib/DETAILS
+++ b/audio-drivers/alsa-lib/DETAILS
@@ -11,7 +11,7 @@ if [[ $ALSA_LIB_GIT == y ]]; then
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-git"
FORCE_DOWNLOAD=1
else
- VERSION=1.0.21
+ VERSION=1.0.21a
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 c8bdfd3..f4d26e2 100644
--- a/audio-drivers/alsa-lib/HISTORY
+++ b/audio-drivers/alsa-lib/HISTORY
@@ -1,3 +1,6 @@
+2009-09-10 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 1.0.21a
+
2009-09-03 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.0.21

diff --git a/audio-drivers/alsa-lib/alsa-lib-1.0.21.tar.bz2.sig
b/audio-drivers/alsa-lib/alsa-lib-1.0.21.tar.bz2.sig
deleted file mode 100644
index 0178597..0000000
Binary files a/audio-drivers/alsa-lib/alsa-lib-1.0.21.tar.bz2.sig and
/dev/null differ
diff --git a/audio-drivers/alsa-lib/alsa-lib-1.0.21a.tar.bz2.sig
b/audio-drivers/alsa-lib/alsa-lib-1.0.21a.tar.bz2.sig
new file mode 100644
index 0000000..7868671
Binary files /dev/null and
b/audio-drivers/alsa-lib/alsa-lib-1.0.21a.tar.bz2.sig differ
diff --git a/audio-drivers/pulseaudio/DETAILS
b/audio-drivers/pulseaudio/DETAILS
index cdba0ef..ba70edf 100755
--- a/audio-drivers/pulseaudio/DETAILS
+++ b/audio-drivers/pulseaudio/DETAILS
@@ -1,5 +1,5 @@
SPELL=pulseaudio
- VERSION=0.9.15
+ VERSION=0.9.17
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 d53d23e..f212cbb 100644
--- a/audio-drivers/pulseaudio/HISTORY
+++ b/audio-drivers/pulseaudio/HISTORY
@@ -1,3 +1,9 @@
+2009-09-11 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 0.9.17
+
+2009-09-10 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 0.9.16
+
2009-08-23 Eric Sandall <sandalle AT sourcemage.org>
* DEPENDS: Suggested depends on PulseAudio tools:
pavucontrol, pavumeter, paprefs, paman, and padevchooser
diff --git a/audio-drivers/pulseaudio/pulseaudio-0.9.15.tar.gz.sig
b/audio-drivers/pulseaudio/pulseaudio-0.9.15.tar.gz.sig
deleted file mode 100644
index 1e5b8c8..0000000
Binary files a/audio-drivers/pulseaudio/pulseaudio-0.9.15.tar.gz.sig and
/dev/null differ
diff --git a/audio-drivers/pulseaudio/pulseaudio-0.9.17.tar.gz.sig
b/audio-drivers/pulseaudio/pulseaudio-0.9.17.tar.gz.sig
new file mode 100644
index 0000000..9ee9974
Binary files /dev/null and
b/audio-drivers/pulseaudio/pulseaudio-0.9.17.tar.gz.sig differ
diff --git a/audio-libs/libdca/DETAILS b/audio-libs/libdca/DETAILS
index 3dd7810..0e53e59 100755
--- a/audio-libs/libdca/DETAILS
+++ b/audio-libs/libdca/DETAILS
@@ -1,14 +1,15 @@
SPELL=libdca
if [ "$DCA_SVN" == "y" ]; then
VERSION=svn
+ SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_URL[0]=svn://svn.videolan.org/${SPELL}/trunk:${SPELL}
SOURCE_IGNORE=volatile
else
VERSION=0.0.5
+ SOURCE=$SPELL-$VERSION.tar.bz2

SOURCE_URL[0]=http://download.videolan.org/pub/videolan/$SPELL/$VERSION/$SOURCE

SOURCE_HASH=sha512:d9f0ed34efeb3f27af8424fcb3e6df56744c6735854a65b5709c02b42b4513b9c4618dcc19eb44293afa051bd95616651bda5fc3b49dfabe975d0babfb1bc287
fi;
- SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
WEB_SITE=http://www.videolan.org/dtsdec.html
LICENSE[0]=GPL
diff --git a/audio-libs/libdca/HISTORY b/audio-libs/libdca/HISTORY
index fb467dd..fbb6674 100644
--- a/audio-libs/libdca/HISTORY
+++ b/audio-libs/libdca/HISTORY
@@ -1,3 +1,6 @@
+2009-09-15 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: SOURCE must be defined before it is used
+
2008-08-27 Julien "_kaze_" ROZO <julien AT rozo.org>
* DETAILS: added svn version
* BUILD, DEPENDS, PREPARE: added for svn version
diff --git a/audio-players/muine/DETAILS b/audio-players/muine/DETAILS
index 91088c1..c2a44f9 100755
--- a/audio-players/muine/DETAILS
+++ b/audio-players/muine/DETAILS
@@ -1,8 +1,9 @@
SPELL=muine
- VERSION=0.8.5
- SOURCE="$SPELL-$VERSION.tar.gz"
- SOURCE_URL[0]=http://$SPELL-player.org/releases/$SOURCE
-
SOURCE_HASH=sha512:5ce69fe055ed0acd3d8f429a030bcd35059bcc2f7046e746138dcdf4c89e6ae9c57bafaf7713174363170098d17499d13d77d1d1e4c64489dfcb45b0abc3bf0d
+ VERSION=0.8.11
+ SOURCE="$SPELL-$VERSION.tar.bz2"
+ BRANCH=`echo $VERSION|cut -d . -f 1,2`
+ SOURCE_URL[0]=$GNOME_URL/sources/$SPELL/$BRANCH/$SOURCE
+
SOURCE_HASH=sha512:13063c1057cc4a5fb9c2cfca6249e3014415cbfa735a89f1ae411705412e379f1252789787aaca5e11f844fcd8c31a319c408c73539ffe173bc03985b3606d79
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/$SPELL-$VERSION"
WEB_SITE=http://www.muine-player.org
LICENSE[0]=GPL
diff --git a/audio-players/muine/HISTORY b/audio-players/muine/HISTORY
index 4beb181..39b15ab 100644
--- a/audio-players/muine/HISTORY
+++ b/audio-players/muine/HISTORY
@@ -1,3 +1,6 @@
+2009-09-14 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 0.8.11, gz -> bz2, added BRANCH, new SOURCE_URL[0]
+
2006-09-20 Nils Georg Heinrich Reichert <renilgh AT riseup.net>
* DEPENDS, HISTORY: added dependency 'gnome-sharp'

diff --git a/audio-plugins/gnonlin/DETAILS b/audio-plugins/gnonlin/DETAILS
index fe6deb8..4d43b77 100755
--- a/audio-plugins/gnonlin/DETAILS
+++ b/audio-plugins/gnonlin/DETAILS
@@ -1,11 +1,10 @@
SPELL=gnonlin
- VERSION=0.10.8
+ VERSION=0.10.13
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_URL[0]=http://gstreamer.freedesktop.org/src/$SPELL/$SOURCE
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- SOURCE_GPG="gurus.gpg:$SOURCE.sig:WORKS_FOR_ME"
-#
SOURCE_HASH=sha512:24b9a4a498dfd9ff1e19ee889ecc67991d5b7a1d811c87fe5a52880559fc2a0f87336eb748ea5afe97f8bef16adb3da6cefdb60941367e03953e5ebac66528b5
- LICENSE[0]=LGPL
+# SOURCE_GPG="gurus.gpg:$SOURCE.sig:WORKS_FOR_ME"
+
SOURCE_HASH=sha512:95cb9e5fed04b42d991221ec6753e0c4508348821e8d128b10fda4f1f7155281accde3f559e276aaf08f01e6d40b496a856380075a7c785a3281f95088b582fc
LICENSE[0]=LGPL
WEB_SITE=http://gnonlin.sourceforge.net
SHORT="A set of GStreamer elements for non-linear multimedia
editors"
cat << EOF
diff --git a/audio-plugins/gnonlin/HISTORY b/audio-plugins/gnonlin/HISTORY
index 072fa45..3114558 100644
--- a/audio-plugins/gnonlin/HISTORY
+++ b/audio-plugins/gnonlin/HISTORY
@@ -1,3 +1,6 @@
+2009-09-14 Bearcat M. Sandor <sourcemage AT feline-soul.com>
+ * DETAILS: Updated to 0.10.13, changed from pgp to sha hash
+
2008-03-11 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: Updated to 0.10.8
* DEPENDS: Depends on gst-plugins-base
diff --git a/audio-plugins/gnonlin/gnonlin-0.10.8.tar.gz.sig
b/audio-plugins/gnonlin/gnonlin-0.10.8.tar.gz.sig
deleted file mode 100644
index 2033283..0000000
Binary files a/audio-plugins/gnonlin/gnonlin-0.10.8.tar.gz.sig and /dev/null
differ
diff --git a/audio-soft/paprefs/DEPENDS b/audio-soft/paprefs/DEPENDS
index b95d8fb..495617f 100755
--- a/audio-soft/paprefs/DEPENDS
+++ b/audio-soft/paprefs/DEPENDS
@@ -1,8 +1,7 @@
depends gtkmm2 &&
depends libglademm &&
depends gconfmm &&
-
-runtime_depends pulseaudio &&
+depends pulseaudio &&

optional_depends lynx \
"--enable-lynx" \
diff --git a/audio-soft/paprefs/DETAILS b/audio-soft/paprefs/DETAILS
index 504c84c..baaf395 100755
--- a/audio-soft/paprefs/DETAILS
+++ b/audio-soft/paprefs/DETAILS
@@ -1,5 +1,5 @@
SPELL=paprefs
- VERSION=0.9.8
+ VERSION=0.9.9
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://0pointer.de/lennart/projects/paprefs/$SOURCE
diff --git a/audio-soft/paprefs/HISTORY b/audio-soft/paprefs/HISTORY
index 3b5bde4..d4a32ff 100644
--- a/audio-soft/paprefs/HISTORY
+++ b/audio-soft/paprefs/HISTORY
@@ -1,3 +1,9 @@
+2009-09-10 Eric Sandall <sandalle AT sourcemage.org>
+ * DEPENDS: Now depends on pulseaudio during compilation
+
+2009-09-10 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 0.9.9
+
2009-04-14 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 0.9.8

diff --git a/audio-soft/paprefs/paprefs-0.9.8.tar.gz.sig
b/audio-soft/paprefs/paprefs-0.9.8.tar.gz.sig
deleted file mode 100644
index 8ed065b..0000000
Binary files a/audio-soft/paprefs/paprefs-0.9.8.tar.gz.sig and /dev/null
differ
diff --git a/audio-soft/paprefs/paprefs-0.9.9.tar.gz.sig
b/audio-soft/paprefs/paprefs-0.9.9.tar.gz.sig
new file mode 100644
index 0000000..65f0d88
Binary files /dev/null and b/audio-soft/paprefs/paprefs-0.9.9.tar.gz.sig
differ
diff --git a/audio-soft/pavucontrol/DETAILS b/audio-soft/pavucontrol/DETAILS
index c77e98e..eb8b163 100755
--- a/audio-soft/pavucontrol/DETAILS
+++ b/audio-soft/pavucontrol/DETAILS
@@ -1,5 +1,5 @@
SPELL=pavucontrol
- VERSION=0.9.8
+ VERSION=0.9.9
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://0pointer.de/lennart/projects/pavucontrol/$SOURCE
diff --git a/audio-soft/pavucontrol/HISTORY b/audio-soft/pavucontrol/HISTORY
index cc8a0f8..f1fd33d 100644
--- a/audio-soft/pavucontrol/HISTORY
+++ b/audio-soft/pavucontrol/HISTORY
@@ -1,3 +1,6 @@
+2009-09-10 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 0.9.9
+
2009-04-14 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 0.9.8

diff --git a/audio-soft/pavucontrol/pavucontrol-0.9.8.tar.gz.sig
b/audio-soft/pavucontrol/pavucontrol-0.9.8.tar.gz.sig
deleted file mode 100644
index fa56382..0000000
Binary files a/audio-soft/pavucontrol/pavucontrol-0.9.8.tar.gz.sig and
/dev/null differ
diff --git a/audio-soft/pavucontrol/pavucontrol-0.9.9.tar.gz.sig
b/audio-soft/pavucontrol/pavucontrol-0.9.9.tar.gz.sig
new file mode 100644
index 0000000..4ab3a83
Binary files /dev/null and
b/audio-soft/pavucontrol/pavucontrol-0.9.9.tar.gz.sig differ
diff --git a/chat-im/ayttm/DETAILS b/chat-im/ayttm/DETAILS
index 7756baa..bb4e557 100755
--- a/chat-im/ayttm/DETAILS
+++ b/chat-im/ayttm/DETAILS
@@ -7,7 +7,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-cvs

SOURCE_URL[0]=cvs://:pserver:anonymous AT ayttm.cvs.sourceforge.net:/cvsroot/$SPELL:$SPELL
SOURCE_IGNORE=volatile
else
- VERSION=0.5.0-111
+ VERSION=0.6.0
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$SOURCEFORGE_URL/ayttm/$SOURCE
@@ -15,7 +15,6 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
fi
WEB_SITE=http://ayttm.sourceforge.net
ENTERED=20030504
- PATCHLEVEL=1
LICENSE[0]=GPL
KEYWORDS="messaging chat"
SHORT="ayttm is a universal instant messaging client"
diff --git a/chat-im/ayttm/HISTORY b/chat-im/ayttm/HISTORY
index dad6b37..ac059c4 100644
--- a/chat-im/ayttm/HISTORY
+++ b/chat-im/ayttm/HISTORY
@@ -1,3 +1,6 @@
+2009-09-11 George Sherwood <gsherwood AT sourcemage.org>
+ * DETAILS: Updated to version 0.6.0
+
2009-08-17 George Sherwood <gsherwood AT sourcemage.org>
* DEPENDS: Added depends cvs for cvs version
* PRE_BUILD: Removed cvs only patch.
diff --git a/chat-im/ayttm/ayttm-0.5.0-111.tar.bz2.sig
b/chat-im/ayttm/ayttm-0.5.0-111.tar.bz2.sig
deleted file mode 100644
index 213408f..0000000
Binary files a/chat-im/ayttm/ayttm-0.5.0-111.tar.bz2.sig and /dev/null differ
diff --git a/chat-im/ayttm/ayttm-0.6.0.tar.bz2.sig
b/chat-im/ayttm/ayttm-0.6.0.tar.bz2.sig
new file mode 100644
index 0000000..8a5fc39
Binary files /dev/null and b/chat-im/ayttm/ayttm-0.6.0.tar.bz2.sig differ
diff --git a/collab/bugzilla/DETAILS b/collab/bugzilla/DETAILS
index 781e288..2c44246 100755
--- a/collab/bugzilla/DETAILS
+++ b/collab/bugzilla/DETAILS
@@ -1,13 +1,13 @@
SPELL=bugzilla
- VERSION=3.2.2
-
SOURCE_HASH=sha512:a8b0ba95c3f48dd5a69ec660f2d4d062ffdf00086af842517f332498f6e0e94cf3e009576a5abf53e3997ad91c4a8ddef922a1c308294941ee951d86cce1801e
+ VERSION=3.4.2
+
SOURCE_HASH=sha512:135aa2523ff494cb6e77c947502e5ca0761637f947119f14a0a6f26fadf5aa968762acae620082f1768f77d99a871938e6fe71e74e064d7d58cc1b078bc5f2df
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE=$SPELL-$VERSION.tar.gz
LICENSE[0]=MPL
SOURCE_URL[0]=http://ftp.mozilla.org/pub/mozilla.org/webtools/$SOURCE
WEB_SITE=http://www.mozilla.org/projects/bugzilla/
ENTERED=20020430
- SECURITY_PATCH=2
+ SECURITY_PATCH=3
GATHER_DOCS=off
KEYWORDS="collab perl"
SHORT='Bugzilla is a web-based defect tracking system written in
Perl'
diff --git a/collab/bugzilla/HISTORY b/collab/bugzilla/HISTORY
index 18b8d1c..af38994 100644
--- a/collab/bugzilla/HISTORY
+++ b/collab/bugzilla/HISTORY
@@ -1,3 +1,7 @@
+2009-09-14 David Kowis <dkowis AT shlrm.org>
+ * DETAILS: MORE SECURITY FIX!
+ version to 3.4.2. No new goodies added, too much work :(
+
2009-02-14 David Kowis <dkowis AT shlrm.org>
* DETAILS: !!!!!!SECURITY FIX!!!!!!
Version to 3.2.2 fixes security vulnerabilities.
diff --git a/crypto/beecrypt/BUILD b/crypto/beecrypt/BUILD
new file mode 100755
index 0000000..9e3ea26
--- /dev/null
+++ b/crypto/beecrypt/BUILD
@@ -0,0 +1,15 @@
+# Fixes compilation error:
+# mpopt.s:62: Error: bad register name `%rdi'
+# http://bugs.sourcemage.org/show_bug.cgi?id=15293#c2
+
+if [[ "${SMGL_COMPAT_ARCHS[1]}" == "ia32" ]] ; then
+ # Workaround for bad configure script
+ export CFLAGS=${CFLAGS/-march=nocona/-march=i686} &&
+ export CFLAGS=${CFLAGS/-march=core2/-march=i686} &&
+ export CFLAGS=${CFLAGS/-march=athlon-fx/-march=i686} &&
+ export CFLAGS=${CFLAGS/-march=k8/-march=i686} &&
+ export CFLAGS=${CFLAGS/-march=opteron/-march=i686} &&
+ export CFLAGS=${CFLAGS/-march=em64t/-march=i686}
+fi &&
+
+default_build
diff --git a/crypto/beecrypt/HISTORY b/crypto/beecrypt/HISTORY
index 9fb2aec..ed5c9cf 100644
--- a/crypto/beecrypt/HISTORY
+++ b/crypto/beecrypt/HISTORY
@@ -1,3 +1,7 @@
+2009-09-10 Eric Sandall <sandalle AT sourcemage.org>
+ * BUILD: Fix Bug #15293
+ Fix from
http://foo-projects.org/git/?p=lunar/moonbase.git;a=blob;f=crypto/beecrypt/BUILD
+
2009-07-12 Treeve Jelbert <treeve@pibe>
* DETAILS: version 4.2.1

diff --git a/crypto/botan/DETAILS b/crypto/botan/DETAILS
index b6b4f3a..895547c 100755
--- a/crypto/botan/DETAILS
+++ b/crypto/botan/DETAILS
@@ -1,5 +1,5 @@
SPELL=botan
- VERSION=1.8.6
+ VERSION=1.8.7

SOURCE=Botan-$VERSION.tbz
SOURCE_URL[0]=http://files.randombit.net/botan/$SOURCE
diff --git a/crypto/botan/HISTORY b/crypto/botan/HISTORY
index 5a16802..122384a 100644
--- a/crypto/botan/HISTORY
+++ b/crypto/botan/HISTORY
@@ -1,3 +1,6 @@
+2009-09-13 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 1.8.7
+
2009-08-13 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.8.6

diff --git a/database/sqlite/DETAILS b/database/sqlite/DETAILS
index 6ec748b..187c9ec 100755
--- a/database/sqlite/DETAILS
+++ b/database/sqlite/DETAILS
@@ -1,6 +1,6 @@
SPELL=sqlite
- VERSION=3.6.17
-
SOURCE_HASH=sha512:d02b37f57e4d90f32a439ac9219fca941cbec607c406e326cb5bebe5b504be788d4ff9dc304c127a185f167309b9c1111cf90224bad8368ee0a5e95a076aaadd
+ VERSION=3.6.18
+
SOURCE_HASH=sha512:06d296d79229b8d530e0b80fa1878c273744e0aa915133668975a6bcfd738cf61d4b486fba2af7c908e7d31eb6980743b20a7c0352a4bb053c991131ee120a50
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_URL[0]=http://sqlite.org/$SOURCE
diff --git a/database/sqlite/HISTORY b/database/sqlite/HISTORY
index 7712515..79448a5 100644
--- a/database/sqlite/HISTORY
+++ b/database/sqlite/HISTORY
@@ -1,3 +1,10 @@
+2009-09-12 Vlad Glagolev <stealth AT sourcemage.org>
+ * PRE_BUILD: fixed compilation with no tcl installed
+ * no-tcl.patch: added
+
+2009-09-11 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 3.6.18
+
2009-08-11 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 3.6.17

diff --git a/database/sqlite/PRE_BUILD b/database/sqlite/PRE_BUILD
index 0efa151..ac7d2c8 100755
--- a/database/sqlite/PRE_BUILD
+++ b/database/sqlite/PRE_BUILD
@@ -1,4 +1,6 @@
default_pre_build &&
cd "$SOURCE_DIRECTORY" &&

+patch -p0 < "$SPELL_DIRECTORY/no-tcl.patch" &&
+
sed -i "s:OPTS:_OPTS:g" Makefile.in
diff --git a/database/sqlite/no-tcl.patch b/database/sqlite/no-tcl.patch
new file mode 100644
index 0000000..1ead145
--- /dev/null
+++ b/database/sqlite/no-tcl.patch
@@ -0,0 +1,14 @@
+--- Makefile.in.orig 2009-09-10 23:18:17.000000000 +0400
++++ Makefile.in 2009-09-12 16:50:04.107891742 +0400
+@@ -684,8 +684,9 @@
+ status.lo: $(TOP)/src/status.c $(HDR)
+ $(LTCOMPILE) $(TEMP_STORE) -c $(TOP)/src/status.c
+
+-sqlite3.h: $(TOP)/src/sqlite.h.in $(TOP)/manifest.uuid $(TOP)/VERSION
+- tclsh $(TOP)/tool/mksqlite3h.tcl $(TOP) >sqlite3.h
++sqlite3.h: $(TOP)/src/sqlite.h.in
++ sed -e s/--VERS--/$(RELEASE)/ $(TOP)/src/sqlite.h.in | \
++ sed -e s/--VERSION-NUMBER--/$(VERSION_NUMBER)/ >sqlite3.h
+
+ table.lo: $(TOP)/src/table.c $(HDR)
+ $(LTCOMPILE) $(TEMP_STORE) -c $(TOP)/src/table.c
diff --git a/devel/automake/DEPENDS b/devel/automake/DEPENDS
index cfb5ce6..1cb5041 100755
--- a/devel/automake/DEPENDS
+++ b/devel/automake/DEPENDS
@@ -1,3 +1,4 @@
depends autoconf &&
depends gnupg &&
+depends perl &&
depends smgl-fhs
diff --git a/devel/automake/HISTORY b/devel/automake/HISTORY
index 121bfb7..4d93e52 100644
--- a/devel/automake/HISTORY
+++ b/devel/automake/HISTORY
@@ -1,3 +1,6 @@
+2009-09-09 Eric Sandall <sandalle AT sourcemage.org>
+ * DEPENDS: Depends on perl
+
2009-05-18 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 1.11

diff --git a/devel/clisp/DEPENDS b/devel/clisp/DEPENDS
index daa7a07..8fc2cee 100755
--- a/devel/clisp/DEPENDS
+++ b/devel/clisp/DEPENDS
@@ -1,3 +1,5 @@
+depends ffcall
+
optional_depends 'readline' \
'--with-readline' \
'--without-readline' \
diff --git a/devel/clisp/DETAILS b/devel/clisp/DETAILS
index f28155c..298a17e 100755
--- a/devel/clisp/DETAILS
+++ b/devel/clisp/DETAILS
@@ -1,10 +1,10 @@
SPELL=clisp
- VERSION=2.43
+ VERSION=2.48
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE2=$SOURCE.sig
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-${VERSION//a/}
- SOURCE_URL[0]=$GNU_URL/$SPELL/release/${VERSION//a/}/$SOURCE
- SOURCE2_URL[0]=$GNU_URL/$SPELL/release/${VERSION//a/}/$SOURCE2
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+ SOURCE_URL[0]=$GNU_URL/$SPELL/release/$VERSION/$SOURCE
+ SOURCE2_URL[0]=$GNU_URL/$SPELL/release/$VERSION/$SOURCE2
SOURCE2_IGNORE=signature
LICENSE[0]=GPL
SOURCE_GPG=gnu.gpg:$SOURCE2:UPSTREAM_KEY
diff --git a/devel/clisp/HISTORY b/devel/clisp/HISTORY
index 9615998..21fba5a 100644
--- a/devel/clisp/HISTORY
+++ b/devel/clisp/HISTORY
@@ -1,3 +1,7 @@
+2009-09-12 Remko van der Vossen <wich AT sourcemage.org>
+ * DETAILS: Updated to 2.48
+ * DEPENDS: Added dependency on ffcall
+
2007-11-29 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: Updated to 2.43

diff --git a/devel/doxygen/HISTORY b/devel/doxygen/HISTORY
index 0010812..b4157ae 100644
--- a/devel/doxygen/HISTORY
+++ b/devel/doxygen/HISTORY
@@ -1,3 +1,6 @@
+2009-09-14 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * INSTALL: fixed manpage install path
+
2009-08-28 Ladislav Hagara <hgr AT vabo.cz>
* doxygen-qt4.patch: updated to new version

diff --git a/devel/doxygen/INSTALL b/devel/doxygen/INSTALL
new file mode 100755
index 0000000..68032d3
--- /dev/null
+++ b/devel/doxygen/INSTALL
@@ -0,0 +1 @@
+make MAN1DIR=share/man/man1 install
diff --git a/devel/git/DETAILS b/devel/git/DETAILS
index b4e023b..a515317 100755
--- a/devel/git/DETAILS
+++ b/devel/git/DETAILS
@@ -1,5 +1,5 @@
SPELL=git
- VERSION=1.6.4.2
+ VERSION=1.6.4.3
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 062d244..303dc82 100644
--- a/devel/git/HISTORY
+++ b/devel/git/HISTORY
@@ -1,3 +1,6 @@
+2009-09-13 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 1.6.4.3
+
2009-08-30 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.6.4.2, new WEB_SITE

diff --git a/devel/graphviz/DETAILS b/devel/graphviz/DETAILS
index 0927369..c911e34 100755
--- a/devel/graphviz/DETAILS
+++ b/devel/graphviz/DETAILS
@@ -1,10 +1,9 @@
SPELL=graphviz
- VERSION=2.22.2
+ VERSION=2.24
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://www.graphviz.org/pub/graphviz/ARCHIVE/$SOURCE
-
SOURCE_HASH=sha512:ee8642aa6fdc3f073d648cc311154bc33c22a81309a6165973415fb255894ad8410017b87f1322b1ae3a1a0250610a26cb6205ee071f025a8886d44042fa120c
-# SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
+
SOURCE_HASH=sha512:955697096742377871d51203b1e6036ed9a13fdd67d879de4ebde179c1dd05c77c3e20a44613dce0dc67c807efea15bb51ff817a08b1f4b559f9547eef30749c
WEB_SITE=http://www.research.att.com/sw/tools/graphviz/
GATHER_DOCS="off"
KEYWORDS="graph devel"
diff --git a/devel/graphviz/HISTORY b/devel/graphviz/HISTORY
index 8549cbc..9de2474 100644
--- a/devel/graphviz/HISTORY
+++ b/devel/graphviz/HISTORY
@@ -1,3 +1,6 @@
+2009-09-24 David Kowis <dkowis AT shlrm.org>
+ * DETAILS: version to latest stable. Needed to build on 64-bit at
least
+
2009-05-30 Eric Sandall <sandalle AT sourcemage.org>
* PRE_BUILD: Remove LIBPOSTFIX so we don't install to lib64 on
64bit archs
diff --git a/devel/mono/DETAILS b/devel/mono/DETAILS
index 6c91bf3..46a631d 100755
--- a/devel/mono/DETAILS
+++ b/devel/mono/DETAILS
@@ -1,9 +1,9 @@
SPELL=mono
if [[ "${MONO_TRUNK}" = 'y' ]]; then
- VERSION=140267
+ VERSION=141692
SOURCE=${SPELL}-${VERSION}.tar.bz2

SOURCE_URL=http://mono.ximian.com/monobuild/snapshot/snapshot_sources/mono/${SOURCE}
-
SOURCE_HASH=sha512:ae5b5f7f099c7a5cbbfa71d067d4795e4435448c39f0254b6a51c695f48b93c8a78a9c4023f070d33437fcb84293129528ee9f34b067959066a3f38eadf9ec3f
+
SOURCE_HASH=sha512:2067ee108f15610ea11c515fba67625995f5136c8888d21a1ef9417320538f5e46cc39c19c351873b5c126170bc23f21f042b544575506ca4c454beda4b8438a
else
VERSION=2.4.2.3
SECURITY_PATCH=1
diff --git a/devel/mono/HISTORY b/devel/mono/HISTORY
index 30ae9f6..80982cb 100644
--- a/devel/mono/HISTORY
+++ b/devel/mono/HISTORY
@@ -1,3 +1,6 @@
+2009-09-10 Quentin Rameau <quinq AT sourcemage.org>
+ * DETAILS: trunk snapshot 141692
+
2009-09-02 Arjan Bouter <abouter AT sourcemage.org>
* DETAILS: trunk snapshot 140267

diff --git a/devel/phpmyadmin/DETAILS b/devel/phpmyadmin/DETAILS
index 0f8e86a..1bebdee 100755
--- a/devel/phpmyadmin/DETAILS
+++ b/devel/phpmyadmin/DETAILS
@@ -1,7 +1,7 @@
SPELL=phpmyadmin
- VERSION=3.2.1
+ VERSION=3.2.2
SECURITY_PATCH=17
-
SOURCE_HASH=sha512:3d9b7cb05809a64feec66153e795993e648b2736971c016b0ea88441e19e68996879fcc00de226b80049cb9e50c94516a3e469fff1c633672ddc23b701ea88ac
+
SOURCE_HASH=sha512:cdd9a853256e8666e2e5186bf7873b4b7fcadda9f9213a08a940f50a1ffd89800ec05bd7551fb071308a7ad11ce228d8c8129dffdaa97b1eb705592bab74c0c7
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 0a0f5c6..0c84c31 100644
--- a/devel/phpmyadmin/HISTORY
+++ b/devel/phpmyadmin/HISTORY
@@ -1,3 +1,6 @@
+2009-09-13 George Sherwood <gsherwood AT sourcemage.org>
+ * DETAILS: Updated to version 3.2.2
+
2009-08-12 George Sherwood <gsherwood AT sourcemage.org>
* DETAILS: Updated to version 3.2.1

diff --git a/disk/btrfs-progs/DETAILS b/disk/btrfs-progs/DETAILS
index 72cd976..3f0d343 100755
--- a/disk/btrfs-progs/DETAILS
+++ b/disk/btrfs-progs/DETAILS
@@ -1,9 +1,9 @@
SPELL=btrfs-progs
- VERSION=0.18
+ VERSION=0.19
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION

SOURCE_URL[0]=http://www.kernel.org/pub/linux/kernel/people/mason/btrfs/$SOURCE
-
SOURCE_HASH=sha512:314bb2f438cb0761dd088539bf700cf667a74add3eac25611b2606e38146c8b32f818ab6a8d1c0c1c000d9a3485cc3c03262c0e5ded7b20b3ab79265e55cce9a
+
SOURCE_HASH=sha512:f0978432b524f307302d80e3a904684c21b6549f0b444f51a17f1d6f0a3dfebfc39ef185c3431a007fb354218aa7027e665ca6a3c58267bb8d0905ae34dc7b80
WEB_SITE=http://btrfs.wiki.kernel.org/
ENTERED=20090205
LICENSE[0]=GPL
diff --git a/disk/btrfs-progs/HISTORY b/disk/btrfs-progs/HISTORY
index 9db715c..4512316 100644
--- a/disk/btrfs-progs/HISTORY
+++ b/disk/btrfs-progs/HISTORY
@@ -1,3 +1,7 @@
+2009-09-10 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 0.19
+ * PRE_BUILD: fixed mandir
+
2009-02-05 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS, BUILD, PRE_BUILD: created this spell, version 0.18

diff --git a/disk/btrfs-progs/PRE_BUILD b/disk/btrfs-progs/PRE_BUILD
index 742fb92..cd3928f 100755
--- a/disk/btrfs-progs/PRE_BUILD
+++ b/disk/btrfs-progs/PRE_BUILD
@@ -1,4 +1,6 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&

-sedit "s:/local::" Makefile
+sedit "s:/local::" Makefile &&
+sedit "s:/local::" man/Makefile &&
+sedit 's:mandir = $(prefix)/man:mandir = $(prefix)/share/man:' man/Makefile
diff --git a/disk/di/DETAILS b/disk/di/DETAILS
index 9de332f..df18169 100755
--- a/disk/di/DETAILS
+++ b/disk/di/DETAILS
@@ -1,9 +1,9 @@
SPELL=di
- VERSION=4.13
+ VERSION=4.14
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://www.gentoo.com/di/$SOURCE
-
SOURCE_HASH=sha512:3c1e636f858529b10663fadb2c1d80ad050fe98aef8abbf788d3551335ccf3c873f7e02cab45e4a1719f225194573f331bf8fca51281559adba51338caf3e2e8
+
SOURCE_HASH=sha512:e5f3e93e0b99910fcc59fe7965b37900d707ae4e6c0f8e36be3e5031e95c5cc9cac3087d37d45aacb2989a12c48be0d783fde0cd41432befc53ce8f9424e4d9a
# SOURCE_GPG="gurus.gpg:${SOURCE}.sig:WORKS_FOR_ME"
WEB_SITE=http://www.gentoo.com/di/
ENTERED=20020527
diff --git a/disk/di/HISTORY b/disk/di/HISTORY
index 76a487f..ef60fba 100644
--- a/disk/di/HISTORY
+++ b/disk/di/HISTORY
@@ -1,3 +1,6 @@
+2009-09-11 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 4.14
+
2008-05-26 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 4.13

diff --git a/disk/libmtp/DETAILS b/disk/libmtp/DETAILS
index 4ad7ac9..defa88a 100755
--- a/disk/libmtp/DETAILS
+++ b/disk/libmtp/DETAILS
@@ -1,8 +1,8 @@
SPELL=libmtp
- VERSION=1.0.0
+ VERSION=1.0.1
SOURCE="$SPELL-$VERSION.tar.gz"
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
-
SOURCE_HASH=sha512:6069a47532f728ccf1e7d98652ecf6542f6920ada52c304668cee1c2341a31fe6dfe1d64a763a36c1b5ae78aecc27ded99bdac45f490faab8e042e9c55f7a6b5
+
SOURCE_HASH=sha512:caff7d42630f3cb12e072998b24d16b60574c7252b7bf7bdbd1cddd0a0034e5de8d9a5419a2fc103d5bf82a0197b9461a787285101a920a5dfcd90bcb22e0a4c
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
WEB_SITE="http://libmtp.sourceforge.net/";
LICENSE[0]=LGPL
diff --git a/disk/libmtp/HISTORY b/disk/libmtp/HISTORY
index 6847399..ced1f5e 100644
--- a/disk/libmtp/HISTORY
+++ b/disk/libmtp/HISTORY
@@ -1,3 +1,6 @@
+2009-09-13 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 1.0.1
+
2009-09-03 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.0.0

diff --git a/e-16/e16/DETAILS b/e-16/e16/DETAILS
index 087a428..74ac9b3 100755
--- a/e-16/e16/DETAILS
+++ b/e-16/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=1.0.0
+ VERSION=1.0.1
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-${VERSION%-*}
SOURCE_URL[0]=$SOURCEFORGE_URL/enlightenment/$SOURCE

-
SOURCE_HASH=sha512:27b1bccced02bb2e5c15fdc6102b42930737accb432c3a8033f4bfc84c4090c0bda151af365bf5a657615ccc478a1cd81ea20a7e552aed0fa24d8181f61ec7e6
+
SOURCE_HASH=sha512:14f508f160ccd5fb1538345ec9c9472f950ed2dd302a88f6966d02ee1c176a2851d0b017bb07829529032ac3c58b62fbb2e23aebb5bbe14f66fd6ec8e172d787
# SOURCE_GPG="gurus.gpg:${SOURCE}.sig"

fi
diff --git a/e-16/e16/HISTORY b/e-16/e16/HISTORY
index 1ab167d..e024b33 100644
--- a/e-16/e16/HISTORY
+++ b/e-16/e16/HISTORY
@@ -1,3 +1,6 @@
+2009-09-10 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 1.0.1
+
2009-06-03 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.0.0

diff --git a/ftp/lftp/DETAILS b/ftp/lftp/DETAILS
index 32692fd..1391e39 100755
--- a/ftp/lftp/DETAILS
+++ b/ftp/lftp/DETAILS
@@ -1,5 +1,5 @@
SPELL=lftp
- VERSION=3.7.15
+ VERSION=4.0.0
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 f9df90a..16fc3db 100644
--- a/ftp/lftp/HISTORY
+++ b/ftp/lftp/HISTORY
@@ -1,3 +1,6 @@
+2009-09-11 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 4.0.0
+
2009-07-22 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 3.7.15

diff --git a/gnome2-apps/epiphany/DETAILS b/gnome2-apps/epiphany/DETAILS
index 79efb30..9d167f1 100755
--- a/gnome2-apps/epiphany/DETAILS
+++ b/gnome2-apps/epiphany/DETAILS
@@ -1,6 +1,6 @@
SPELL=epiphany
if [[ "$EPIPHANY_WEBKIT" == "y" ]]; then
- VERSION=2.27.91
+ VERSION=2.27.92
else
VERSION=2.26.3
fi
diff --git a/gnome2-apps/epiphany/HISTORY b/gnome2-apps/epiphany/HISTORY
index 18ee367..f8c8772 100644
--- a/gnome2-apps/epiphany/HISTORY
+++ b/gnome2-apps/epiphany/HISTORY
@@ -1,3 +1,8 @@
+2009-09-12 George Sherwood <gsherwood AT sourcemage.org>
+ * DETAILS: Updated devel to 2.27.92
+ * PRE_BUILD: Added to apply upstream patch
+ * epiphany.patch: Added upstream patch to fix build problem with gtk
+
2009-08-24 George Sherwood <gsherwood AT sourcemage.org>
* DETAILS: Updated devel to 2.27.91

diff --git a/gnome2-apps/epiphany/PRE_BUILD b/gnome2-apps/epiphany/PRE_BUILD
new file mode 100755
index 0000000..21c02c1
--- /dev/null
+++ b/gnome2-apps/epiphany/PRE_BUILD
@@ -0,0 +1,6 @@
+default_pre_build &&
+
+if [[ "$EPIPHANY_WEBKIT" == "y" ]]; then
+ cd $SOURCE_DIRECTORY &&
+ patch -p0 < $SCRIPT_DIRECTORY/epiphany.patch
+fi
diff --git a/gnome2-apps/epiphany/epiphany-2.27.91.tar.bz2.sig
b/gnome2-apps/epiphany/epiphany-2.27.91.tar.bz2.sig
deleted file mode 100644
index 7d4ede7..0000000
Binary files a/gnome2-apps/epiphany/epiphany-2.27.91.tar.bz2.sig and
/dev/null differ
diff --git a/gnome2-apps/epiphany/epiphany-2.27.92.tar.bz2.sig
b/gnome2-apps/epiphany/epiphany-2.27.92.tar.bz2.sig
new file mode 100644
index 0000000..e469f71
Binary files /dev/null and
b/gnome2-apps/epiphany/epiphany-2.27.92.tar.bz2.sig differ
diff --git a/gnome2-apps/epiphany/epiphany.patch
b/gnome2-apps/epiphany/epiphany.patch
new file mode 100644
index 0000000..3feffcc
--- /dev/null
+++ b/gnome2-apps/epiphany/epiphany.patch
@@ -0,0 +1,24 @@
+--- lib/ephy-dialog.c.orig 2009-09-12 16:23:31.000000000 -0500
++++ lib/ephy-dialog.c 2009-09-12 16:25:20.000000000 -0500
+@@ -146,18 +146,18 @@
+
+ for (l = list; l != NULL; l = l->next)
+ {
+- sensitive = gtk_widget_is_sensitive (GTK_WIDGET
(l->data)) && sensitive;
++ sensitive = GTK_WIDGET_IS_SENSITIVE (GTK_WIDGET
(l->data)) && sensitive;
+ gtk_widget_set_sensitive (GTK_WIDGET (l->data),
sensitive);
+ }
+ }
+ else if (info->widget_type == PT_EDITABLE)
+ {
+- sensitive = gtk_widget_is_sensitive (info->widget) &&
sensitive;
++ sensitive = GTK_WIDGET_IS_SENSITIVE (info->widget) &&
sensitive;
+ gtk_editable_set_editable (GTK_EDITABLE (info->widget),
sensitive);
+ }
+ else
+ {
+- sensitive = gtk_widget_is_sensitive (info->widget) &&
sensitive;
++ sensitive = GTK_WIDGET_IS_SENSITIVE (info->widget) &&
sensitive;
+ gtk_widget_set_sensitive (info->widget, sensitive);
+ }
+ }
diff --git a/gnome2-apps/gnumeric/DETAILS b/gnome2-apps/gnumeric/DETAILS
index df7a3e1..8cb1834 100755
--- a/gnome2-apps/gnumeric/DETAILS
+++ b/gnome2-apps/gnumeric/DETAILS
@@ -1,8 +1,8 @@
SPELL=gnumeric
if [[ $GNUMERIC_DEVEL == y ]]; then
- VERSION=1.9.10
+ VERSION=1.9.11
SOURCE=$SPELL-$VERSION.tar.bz2
-
SOURCE_HASH=sha512:9edf7784670a8b4d678043eeb8d07f4c032753addf45ac7b0ef2a460fccfc7f74dd215d78a7f617d0acf409649b19bd7ac806ea8ba56069592d42d3f7e4b5553
+
SOURCE_HASH=sha512:1bb7426719499b0f9f32d7c34d9ef32fa44486eaca452bb16943198d8c09069b269d0b31f92ef25db2eec97712cfae6f26f0bb93c066ff242a6536ae731817a8
else
VERSION=1.8.4
SOURCE=$SPELL-$VERSION.tar.bz2
diff --git a/gnome2-apps/gnumeric/HISTORY b/gnome2-apps/gnumeric/HISTORY
index 31e8183..ee9ddac 100644
--- a/gnome2-apps/gnumeric/HISTORY
+++ b/gnome2-apps/gnumeric/HISTORY
@@ -1,3 +1,6 @@
+2009-09-12 George Sherwood <gsherwood AT sourcemage.org>
+ * DETAILS: Updated devel to 1.9.11
+
2009-08-22 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.9.10

diff --git a/gnome2-apps/gpointing-device-settings/DEPENDS
b/gnome2-apps/gpointing-device-settings/DEPENDS
new file mode 100755
index 0000000..56edf91
--- /dev/null
+++ b/gnome2-apps/gpointing-device-settings/DEPENDS
@@ -0,0 +1,2 @@
+depends gconf2 &&
+depends libxi
diff --git a/gnome2-apps/gpointing-device-settings/DETAILS
b/gnome2-apps/gpointing-device-settings/DETAILS
new file mode 100755
index 0000000..7b45b50
--- /dev/null
+++ b/gnome2-apps/gpointing-device-settings/DETAILS
@@ -0,0 +1,14 @@
+ SPELL=gpointing-device-settings
+ VERSION=1.3.1
+ SOURCE="${SPELL}-${VERSION}.tar.gz"
+
SOURCE_URL[0]="http://sourceforge.jp/frs/redir.php?m=jaist&f=/gsynaptics/38468/${SOURCE}";
+
SOURCE_HASH=sha512:9f82a47d097767660a5d0d9f7a17a1635279da35247d3014b522a2e5fd0e6e67488e36ad2929fddff516b67d9115ae1bd697bb218d10e66a2fbf0a1e2948a8ad
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
+ WEB_SITE="http://live.gnome.org/GPointingDeviceSettings";
+ LICENSE[0]=GPL
+ ENTERED=20090914
+ SHORT="Gnome synaptics GUI"
+cat << EOF
+GPointingDeviceSettings is a GUI tool for setting pointing device such as
TrackPoint or Touchpad.
+Each UI can be written as dynamic loadable module, so a third party can add
its own UI.
+EOF
diff --git a/gnome2-apps/gpointing-device-settings/HISTORY
b/gnome2-apps/gpointing-device-settings/HISTORY
new file mode 100644
index 0000000..9d4ab6b
--- /dev/null
+++ b/gnome2-apps/gpointing-device-settings/HISTORY
@@ -0,0 +1,3 @@
+2009-09-14 Arjan Bouter <abouter AT sourcemage.org>
+ * DEPENDS, DETAILS: spell created
+
diff --git a/gnome2-libs/gnome2-user-docs/DEPENDS
b/gnome2-libs/gnome2-user-docs/DEPENDS
index 5092354..8c9172f 100755
--- a/gnome2-libs/gnome2-user-docs/DEPENDS
+++ b/gnome2-libs/gnome2-user-docs/DEPENDS
@@ -1,2 +1,3 @@
depends rarian &&
+depends which &&
depends gnome-doc-utils
diff --git a/gnome2-libs/gnome2-user-docs/HISTORY
b/gnome2-libs/gnome2-user-docs/HISTORY
index 5aa480b..90922ac 100644
--- a/gnome2-libs/gnome2-user-docs/HISTORY
+++ b/gnome2-libs/gnome2-user-docs/HISTORY
@@ -1,3 +1,6 @@
+2009-09-10 Eric Sandall <sandalle AT sourcemage.org>
+ * DEPENDS: Depends on which
+
2009-05-22 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 2.26.2

diff --git a/gnome2-libs/goffice-dev/DETAILS b/gnome2-libs/goffice-dev/DETAILS
index cb081f5..ed1ee65 100755
--- a/gnome2-libs/goffice-dev/DETAILS
+++ b/gnome2-libs/goffice-dev/DETAILS
@@ -1,6 +1,6 @@
SPELL=goffice-dev
- VERSION=0.7.9
-
SOURCE_HASH=sha512:83bfe07be4cb39d01e6e508aae4e486095e8f635d9d4576d545bf81b6e1fb7d449183ee3988de02440baddd9354c955285b56f621b9ff32730ac7e5417e2b2f5
+ VERSION=0.7.10
+
SOURCE_HASH=sha512:2eb170a67d998da7e089cddf8f315bf594ebb4044d05eee1085dc3f9a3b827fed703aa4b0d412ce6d01895deb022e90da9f81ce0fdb52409cf6f615729839a5b
BRANCH=${VERSION%\.*}
SOURCE=goffice-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/goffice-$VERSION
diff --git a/gnome2-libs/goffice-dev/HISTORY b/gnome2-libs/goffice-dev/HISTORY
index 726ff51..5fec4a8 100644
--- a/gnome2-libs/goffice-dev/HISTORY
+++ b/gnome2-libs/goffice-dev/HISTORY
@@ -1,3 +1,6 @@
+2009-09-12 George Sherwood <gsherwood AT sourcemage.org>
+ * DETAILS: Updated to version 0.7.10
+
2009-08-22 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.7.9

diff --git a/gnome2-libs/libbonobo/DEPENDS b/gnome2-libs/libbonobo/DEPENDS
index 4609aaf..d652692 100755
--- a/gnome2-libs/libbonobo/DEPENDS
+++ b/gnome2-libs/libbonobo/DEPENDS
@@ -1,3 +1,4 @@
+depends dbus-glib &&
depends intltool &&
depends orbit2 &&
depends libxml2 &&
diff --git a/gnome2-libs/libbonobo/HISTORY b/gnome2-libs/libbonobo/HISTORY
index a137b31..57288e0 100644
--- a/gnome2-libs/libbonobo/HISTORY
+++ b/gnome2-libs/libbonobo/HISTORY
@@ -1,3 +1,6 @@
+2009-09-10 Eric Sandall <sandalle AT sourcemage.org>
+ * DEPENDS: Depends on dbus-glib
+
2009-03-07 Robin Cook <rcook AT wyrms.net>
* DETAILS: updated VERSION to 2.24.1

diff --git a/gnome2-libs/libcanberra/DETAILS b/gnome2-libs/libcanberra/DETAILS
index d871649..28d8079 100755
--- a/gnome2-libs/libcanberra/DETAILS
+++ b/gnome2-libs/libcanberra/DETAILS
@@ -1,5 +1,5 @@
SPELL=libcanberra
- VERSION=0.12
+ VERSION=0.16
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://0pointer.de/lennart/projects/$SPELL/$SOURCE
diff --git a/gnome2-libs/libcanberra/HISTORY b/gnome2-libs/libcanberra/HISTORY
index 3b94f12..82ebf31 100644
--- a/gnome2-libs/libcanberra/HISTORY
+++ b/gnome2-libs/libcanberra/HISTORY
@@ -1,3 +1,6 @@
+2009-09-10 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 0.16
+
2009-04-14 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 0.12

diff --git a/gnome2-libs/libcanberra/libcanberra-0.12.tar.gz.sig
b/gnome2-libs/libcanberra/libcanberra-0.12.tar.gz.sig
deleted file mode 100644
index 780fac5..0000000
Binary files a/gnome2-libs/libcanberra/libcanberra-0.12.tar.gz.sig and
/dev/null differ
diff --git a/gnome2-libs/libcanberra/libcanberra-0.16.tar.gz.sig
b/gnome2-libs/libcanberra/libcanberra-0.16.tar.gz.sig
new file mode 100644
index 0000000..fdab521
Binary files /dev/null and
b/gnome2-libs/libcanberra/libcanberra-0.16.tar.gz.sig differ
diff --git a/graphics-libs/agg/HISTORY b/graphics-libs/agg/HISTORY
index 729505f..6df8f95 100644
--- a/graphics-libs/agg/HISTORY
+++ b/graphics-libs/agg/HISTORY
@@ -1,3 +1,7 @@
+2009-09-10 Pol Vinogradov <vin.public AT gmail.com>
+ * PRE_BUILD, agg-2.5-libtool22_fix-1.patch: added patch for right X
+ headers and libs detection
+
2008-03-18 Eric Sandall <sandalle AT sourcemage.org>
* DEPENDS: Switch X11-LIBS to the one and only xorg-libs

diff --git a/graphics-libs/agg/PRE_BUILD b/graphics-libs/agg/PRE_BUILD
index 0326172..61e28c4 100755
--- a/graphics-libs/agg/PRE_BUILD
+++ b/graphics-libs/agg/PRE_BUILD
@@ -1,5 +1,6 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&
+patch -p1 < $SCRIPT_DIRECTORY/agg-2.5-libtool22_fix-1.patch &&
sedit '/configure/d' autogen.sh &&
chmod +x autogen.sh &&
./autogen.sh
diff --git a/graphics-libs/agg/agg-2.5-libtool22_fix-1.patch
b/graphics-libs/agg/agg-2.5-libtool22_fix-1.patch
new file mode 100644
index 0000000..e41ebea
--- /dev/null
+++ b/graphics-libs/agg/agg-2.5-libtool22_fix-1.patch
@@ -0,0 +1,24 @@
+Submitted By: Ken Moffat <ken at linuxfromscratch dot org>
+Date: 2008-10-15
+Initial Package Version: 2.5
+Upstream Status: unknown
+Origin: Opensuse
+Description: Allows agg-2.5 to link with libtool-2.2
+
+diff -Naur agg-2.5.orig/configure.in agg-2.5/configure.in
+--- agg-2.5.orig/configure.in 2006-10-09 05:06:36.000000000 +0100
++++ agg-2.5/configure.in 2008-10-15 22:36:39.000000000 +0100
+@@ -121,6 +121,13 @@
+ AC_MSG_WARN([*** X11 not found! Omitting X11 layer.])
+ fi
+ AM_CONDITIONAL(ENABLE_X11,[test x$no_x = x -a xno != x$enable_platform -a
x$win32_host != xyes])
++if test x"$x_includes" = x; then
++ x_includes="/usr/include"
++fi
++AC_SUBST(x_includes)
++if test x"$x_libraries" = x; then
++ x_libraries="/usr/lib"
++fi
+ AC_SUBST(x_includes)
+ AC_SUBST(x_libraries)
+ dnl ###############################################
diff --git a/graphics-libs/devil/DETAILS b/graphics-libs/devil/DETAILS
index 234331b..a2013fd 100755
--- a/graphics-libs/devil/DETAILS
+++ b/graphics-libs/devil/DETAILS
@@ -12,10 +12,19 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-${VERSION//-rc?}
ENTERED=20031008
SHORT="Developer's Image Library"
cat << EOF
-Developer's Image Library (DevIL) is a programmer's library to develop
applications with very powerful image loading capabilities, yet is easy for a
developer to learn and use. Ultimate control of images is left to the
developer, so unnecessary conversions, etc. are not performed. DevIL utilizes
a simple, yet powerful, syntax. DevIL can load, save, convert, manipulate,
filter and display a wide variety of image formats.
+Developer's Image Library (DevIL) is a programmer's library to develop
+applications with very powerful image loading capabilities, yet is easy for a
+developer to learn and use. Ultimate control of images is left to the
+developer, so unnecessary conversions, etc. are not performed. DevIL
utilizes a
+simple, yet powerful, syntax. DevIL can load, save, convert, manipulate,
filter
+and display a wide variety of image formats.

-Currently, DevIL can load .bmp, .cut, .dds, .doom, .gif, .ico, .jpg, .lbm,
.mdl, .mng, .pal, .pbm, .pcd, .pcx, .pgm, .pic, .png, .ppm, .psd, .psp, .raw,
.sgi, .tga and .tif files.
-Formats supported for saving include .bmp, .dds, .h, .jpg, .pal, .pbm, .pcx,
.pgm,.png, .ppm, .raw, .sgi, .tga and .tif.
+Currently, DevIL can load .bmp, .cut, .dds, .doom, .gif, .ico, .jpg, .lbm,
+.mdl, .mng, .pal, .pbm, .pcd, .pcx, .pgm, .pic, .png, .ppm, .psd, .psp, .raw,
+.sgi, .tga and .tif files. Formats supported for saving include .bmp, .dds,
+.h, .jpg, .pal, .pbm, .pcx, .pgm,.png, .ppm, .raw, .sgi, .tga and .tif.

-DevIL currently supports the following APIs for display: OpenGL, Windows
GDI, SDL, DirectX and Allegro. Compilers that can compile DevIL or use it
include Djgpp, MSVC++, Linux gcc, Delphi, Visual Basic, Power Basic and
Dev-C++.
+DevIL currently supports the following APIs for display: OpenGL, Windows GDI,
+SDL, DirectX and Allegro. Compilers that can compile DevIL or use it include
+Djgpp, MSVC++, Linux gcc, Delphi, Visual Basic, Power Basic and Dev-C++.
EOF
diff --git a/graphics-libs/devil/HISTORY b/graphics-libs/devil/HISTORY
index 96c9654..51a0a84 100644
--- a/graphics-libs/devil/HISTORY
+++ b/graphics-libs/devil/HISTORY
@@ -1,3 +1,6 @@
+2009-09-10 Donald Johnson <ltdonny AT gmail.com>
+ * DETAILS: Wrapped long desc
+
2009-04-12 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: Updated to 1.7.8
* CONFIGURE: Query for ILU and ILUT support
diff --git a/graphics-libs/libpng/DETAILS b/graphics-libs/libpng/DETAILS
index f79f4c4..972c431 100755
--- a/graphics-libs/libpng/DETAILS
+++ b/graphics-libs/libpng/DETAILS
@@ -1,6 +1,6 @@
SPELL=libpng
- VERSION=1.2.39
-
SOURCE_HASH=sha512:0898d76c549a9c75c8d13eeb7bb74ae71592395d5956bd10543d7192b06d2836a60cb9915e25d6c1b1a31b4c469923f18d8b9cf6fb15597a8248fc5d282870f4
+ VERSION=1.2.40
+
SOURCE_HASH=sha512:fbddb7ddc560225d7b1fa11b9a8ab4cc9de16f4ee1f7d034dfe63dcc5f2cc652496a214eac6a8da4b41a8df9783b0af0228cdc10be26f5b494d25685117c69ad
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
diff --git a/graphics-libs/libpng/HISTORY b/graphics-libs/libpng/HISTORY
index 16b80b2..4f2ac17 100644
--- a/graphics-libs/libpng/HISTORY
+++ b/graphics-libs/libpng/HISTORY
@@ -1,3 +1,6 @@
+2009-09-10 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 1.2.40
+
2009-08-13 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 1.2.39

diff --git a/graphics/imagemagick/DETAILS b/graphics/imagemagick/DETAILS
index 1fff2d6..b4f8cbd 100755
--- a/graphics/imagemagick/DETAILS
+++ b/graphics/imagemagick/DETAILS
@@ -1,5 +1,5 @@
SPELL=imagemagick
- VERSION=6.5.5-6
+ VERSION=6.5.5-9
SECURITY_PATCH=1
SOURCE=ImageMagick-${VERSION}.tar.bz2
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/ImageMagick-${VERSION}
diff --git a/graphics/imagemagick/HISTORY b/graphics/imagemagick/HISTORY
index dcb2ded..2bb2399 100644
--- a/graphics/imagemagick/HISTORY
+++ b/graphics/imagemagick/HISTORY
@@ -1,3 +1,6 @@
+2009-09-12 George Sherwood <gsherwood AT sourcemage.org>
+ * DETAILS: Updated to version 6.5.5-9
+
2009-09-05 George Sherwood <gsherwood AT sourcemage.org>
* DETAILS: Updated to version 6.5.5-6

diff --git a/graphics/imagemagick/ImageMagick-6.5.5-6.tar.bz2.sig
b/graphics/imagemagick/ImageMagick-6.5.5-6.tar.bz2.sig
deleted file mode 100644
index 0b23ba2..0000000
Binary files a/graphics/imagemagick/ImageMagick-6.5.5-6.tar.bz2.sig and
/dev/null differ
diff --git a/graphics/imagemagick/ImageMagick-6.5.5-9.tar.bz2.sig
b/graphics/imagemagick/ImageMagick-6.5.5-9.tar.bz2.sig
new file mode 100644
index 0000000..13b97b2
Binary files /dev/null and
b/graphics/imagemagick/ImageMagick-6.5.5-9.tar.bz2.sig differ
diff --git a/graphics/mesademos/DETAILS b/graphics/mesademos/DETAILS
index 63ea9d6..22761cf 100755
--- a/graphics/mesademos/DETAILS
+++ b/graphics/mesademos/DETAILS
@@ -1,14 +1,12 @@
SPELL=mesademos
- VERSION=7.5
+ VERSION=7.5.1
SOURCE=MesaLib-${VERSION}.tar.bz2
SOURCE2=MesaDemos-${VERSION}.tar.bz2
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/Mesa-${VERSION}
- SOURCE_URL[0]=${SOURCEFORGE_URL}/mesa3d/${SOURCE}
- SOURCE2_URL[0]=${SOURCEFORGE_URL}/mesa3d/${SOURCE2}
-#
SOURCE_HASH=sha512:ec1d923890aef9599ec3b4f29c3ebc44f83b10fc6228b8b565ff6f96a601b8a53780408996ab24818f099ce62cd32993afbd56f83fe105b0a8b183a6a9a14013
-#
SOURCE2_HASH=sha512:fd90b5cdf2fd0cfd43a165bfdc4a241fcda14d9b5ad7122e846884957af487e3e4bcf304543007b3399164651c7eb320b20180db7494e994728228e557cf560d
- SOURCE_GPG="gurus.gpg:$SOURCE.sig:UPSTREAM_HASH"
- SOURCE2_GPG="gurus.gpg:$SOURCE2.sig:UPSTREAM_HASH"
+ SOURCE_URL[0]=ftp://ftp.freedesktop.org/pub/mesa/$VERSION/$SOURCE
+ SOURCE2_URL[0]=ftp://ftp.freedesktop.org/pub/mesa/$VERSION/$SOURCE2
+
SOURCE_HASH=sha512:6ecbaf918c8dd5fae8852f4fdf26129904bee09c4feb67515d01ce5a48a801425e7b18258a5c4c6ae72fc94c70b9883c80dcf54879dcd4688fa01bd141338364
+
SOURCE2_HASH=sha512:72b0391acadc9e9c30f5a30f6b4169ed472547ef3cef2ef19883142ef6c610c11b59454571fb15ea33a3e5cb461c15925a87246fb9adf6205cd0ec58e5fcaca3
LICENSE[0]=GPL
LICENSE[1]=GPL
WEB_SITE=http://www.mesa3d.org
diff --git a/graphics/mesademos/HISTORY b/graphics/mesademos/HISTORY
index 9e41e78..930ca10 100644
--- a/graphics/mesademos/HISTORY
+++ b/graphics/mesademos/HISTORY
@@ -1,3 +1,9 @@
+2009-09-11 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: updated SOURCE_URLs
+
+2009-09-10 Peng Chang (Charles) <chp AT sourcemage.org>
+ * DETAILS: updated spell to 7.5.1
+
2009-07-17 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: Updated to 7.5
SOURCEs match upstream posted MD5s
diff --git a/http/elinks/DETAILS b/http/elinks/DETAILS
index 26cd6db..146bc98 100755
--- a/http/elinks/DETAILS
+++ b/http/elinks/DETAILS
@@ -11,7 +11,7 @@ if [[ $ELINKS_VCS == y ]]; then
SOURCE_IGNORE=volatile
FORCE_DOWNLOAD=on
else
- VERSION=0.11.6
+ VERSION=0.11.7
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE2=$SOURCE.asc
SOURCE_URL[0]=http://elinks.or.cz/download/$SOURCE
diff --git a/http/elinks/HISTORY b/http/elinks/HISTORY
index 7119acb..1281ab9 100644
--- a/http/elinks/HISTORY
+++ b/http/elinks/HISTORY
@@ -1,3 +1,6 @@
+2009-09-10 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 0.11.7
+
2009-03-22 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 0.11.6

diff --git a/http/firefox/DETAILS b/http/firefox/DETAILS
index 1a24d75..448c516 100755
--- a/http/firefox/DETAILS
+++ b/http/firefox/DETAILS
@@ -1,15 +1,15 @@
SPELL=firefox
if [[ $FIREFOX_CVS == y ]]; then
- VERSION=3.5.2
- SOURCE=$SPELL-$VERSION-source.tar.bz2
+ VERSION=3.5.3
+ SOURCE=$SPELL-$VERSION.source.tar.bz2
SOURCE2=$SOURCE.asc
SOURCE_GPG=firefox.gpg:$SOURCE2:UPSTREAM_KEY

SOURCE_URL[0]=ftp://ftp.mozilla.org/pub/$SPELL/releases/$VERSION/source/$SOURCE
#
SOURCE_HASH=sha512:eb38349212a352718987e611315405c869fad9ebd6026ce4662bbbb12c5914178c6d348ea12686a7efbb046870e44238a1b46e20fe3d9eb323e3d6ab8f9dfacc
SOURCE2_URL[0]=$SOURCE_URL.asc
else
- VERSION=3.5.2
- SOURCE=$SPELL-$VERSION-source.tar.bz2
+ VERSION=3.5.3
+ SOURCE=$SPELL-$VERSION.source.tar.bz2
SOURCE2=$SOURCE.asc
SOURCE_GPG=firefox.gpg:$SOURCE2:UPSTREAM_KEY

SOURCE_URL[0]=ftp://ftp.mozilla.org/pub/$SPELL/releases/$VERSION/source/$SOURCE
@@ -17,7 +17,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=28
+ SECURITY_PATCH=29
fi
SOURCE2_IGNORE=signature
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/http/firefox/HISTORY b/http/firefox/HISTORY
index 1bd2cfb..3cff077 100644
--- a/http/firefox/HISTORY
+++ b/http/firefox/HISTORY
@@ -1,3 +1,6 @@
+2009-09-10 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 3.5.3, SECURITY_PATCH=29, -source.tar.bz2 ->
.source.tar.bz2
+
2009-08-03 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 3.5.2, SECURITY_PATCH=28

diff --git a/http/gnash/DETAILS b/http/gnash/DETAILS
index 3d7ea45..e67ad68 100755
--- a/http/gnash/DETAILS
+++ b/http/gnash/DETAILS
@@ -1,5 +1,5 @@
SPELL=gnash
- VERSION=0.8.4
+ VERSION=0.8.5
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE2=$SOURCE.sig
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/http/gnash/HISTORY b/http/gnash/HISTORY
index 10e8e92..fb3c9a3 100644
--- a/http/gnash/HISTORY
+++ b/http/gnash/HISTORY
@@ -1,3 +1,7 @@
+2009-69-13 Pol Vinogradov <vin.public AT gmail.com>
+ * DETAILS: updated to 0.8.5
+ * PRE_BUILD: sedit -> sed -i, added one more fix
+
2009-01-25 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
* CONFIGURE: removed unneeded options
* INSTALL: split -bin spells from the rest since the first are already
diff --git a/http/gnash/PRE_BUILD b/http/gnash/PRE_BUILD
index 282756e..1de75a4 100755
--- a/http/gnash/PRE_BUILD
+++ b/http/gnash/PRE_BUILD
@@ -1,7 +1,7 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&
-sedit "s#\$HOME/.firefox/plugins#${INSTALL_ROOT}/usr/lib/firefox/plugins#g"
configure &&
-sedit "s#\$HOME/.mozilla/plugins#${INSTALL_ROOT}/usr/lib/mozilla/plugins#g"
configure &&
-sedit
"s#\$HOME/.seamonkey/plugins#${INSTALL_ROOT}/usr/lib/seamonkey/plugins#g"
configure &&
-sedit
"s#\$HOME/.xulrunner/plugins#${INSTALL_ROOT}/usr/lib/xulrunner/plugins#g"
configure
-
+sed -i "s#\$HOME/.firefox/plugins#${INSTALL_ROOT}/usr/lib/firefox/plugins#g"
configure &&
+sed -i "s#\$HOME/.mozilla/plugins#${INSTALL_ROOT}/usr/lib/mozilla/plugins#g"
configure &&
+sed -i
"s#\$HOME/.seamonkey/plugins#${INSTALL_ROOT}/usr/lib/seamonkey/plugins#g"
configure &&
+sed -i
"s#\$HOME/.xulrunner/plugins#${INSTALL_ROOT}/usr/lib/xulrunner/plugins#g"
configure &&
+sed -i "s:#include <boost/utility.hpp>:#include
<boost/utility.hpp>\n#include <cstring>:" libcore/vm/CodeStream.h
diff --git a/http/midori/DETAILS b/http/midori/DETAILS
index e97d62d..85701bd 100755
--- a/http/midori/DETAILS
+++ b/http/midori/DETAILS
@@ -10,11 +10,11 @@ if [[ $MIDORI_VCS == y ]]; then
SOURCE_IGNORE=volatile
FORCE_DOWNLOAD=on
else
- VERSION=0.1.9
+ VERSION=0.1.10
BRANCH=`echo $VERSION | cut -d . -f 1,2`
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_URL[0]=http://archive.xfce.org/src/apps/$SPELL/$BRANCH/$SOURCE
-
SOURCE_HASH=sha512:6395ef39abfbd084b69086329907390cf60a3cf09ecdd37b24ecb0a1cd0e3642199885ba8912112f8fac5ed9438adfc0e1c10176a58c3e0377189227208a6325
+
SOURCE_HASH=sha512:e364931635afcb8e023c7be8851e4ea442f156b5d06cae3529a66f7adeb23fca12db80a5a14b768e88d7167355db9105b1396fa67f4178ff6a8092ca6235b996
fi
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
WEB_SITE=http://software.twotoasts.de/?page=midori
diff --git a/http/midori/HISTORY b/http/midori/HISTORY
index e2b78e4..dff0927 100644
--- a/http/midori/HISTORY
+++ b/http/midori/HISTORY
@@ -1,3 +1,6 @@
+2009-09-11 George Sherwood <gsherwood AT sourcemage.org>
+ * DETAILS: Updated to version 0.1.10
+
2009-08-18 George Sherwood <gsherwood AT sourcemage.org>
* DETAILS: Updated SOURCE_URL for git version

diff --git a/http/nginx/DETAILS b/http/nginx/DETAILS
index e43bb23..bbe1f2a 100755
--- a/http/nginx/DETAILS
+++ b/http/nginx/DETAILS
@@ -1,10 +1,12 @@
SPELL=nginx
if [[ $NGINX_RELEASE == legacy ]]; then
- VERSION=0.6.38
-
SOURCE_HASH=sha512:99263b27a1c9af07afcc009b61e9df60a81ebb2a82a894ddcf7b83f6d3123404463eea1e5640129057d5f7e24ad8b84a04a1d1e3cd1d3c92d1b3395083cdd6a4
+ VERSION=0.6.39
+ SECURITY_PATCH=1
+
SOURCE_HASH=sha512:b8ec805b146eb4050b66987e00d23568cab8dfb620ad021b02e09aac6df37919d17e9ef6102b3b08fbb8b07262da46d595e263b3de62d83f0be624dd8a3822d8
else
- VERSION=0.7.61
-
SOURCE_HASH=sha512:6db888a296100f26311bca098d6b02c7f15dfeee30c666bb4d73822f3dc1e6c76d53e521be7107f820551cb14a39a18fd3c7b8f702f8c2cc029d57ddd5023d7f
+ VERSION=0.7.62
+ SECURITY_PATCH=1
+
SOURCE_HASH=sha512:e86dc4773f6f2efbb7c01beaabf4e07ab401e6ba4605b0011d19bb67c8ee83c71234f62b4d4a0cc8f4271f0748d73e1352c8566a1dc590b9611870a4b870c249
fi
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_URL[0]=http://sysoev.ru/$SPELL/$SOURCE
diff --git a/http/nginx/HISTORY b/http/nginx/HISTORY
index 5d6365b..e2e5e4e 100644
--- a/http/nginx/HISTORY
+++ b/http/nginx/HISTORY
@@ -1,3 +1,7 @@
+2009-09-15 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 0.6.39, 0.7.62; SECURITY_PATCH++
+ (http://www.securityfocus.com/bid/36384)
+
2009-08-08 Vlad Glagolev <stealth AT sourcemage.org>
* syslog-0.7.patch: backport needed changes from syslog-0.6.patch

diff --git a/http/surf/DEPENDS b/http/surf/DEPENDS
index 2a469bf..69ae2bc 100755
--- a/http/surf/DEPENDS
+++ b/http/surf/DEPENDS
@@ -1,3 +1,6 @@
-depends mercurial &&
+if [[ ${SURF_SCM} == "y" ]]
+then
+ depends mercurial
+fi &&
depends webkitgtk &&
depends dmenu
diff --git a/http/surf/DETAILS b/http/surf/DETAILS
index 544d129..92ae6a8 100755
--- a/http/surf/DETAILS
+++ b/http/surf/DETAILS
@@ -1,18 +1,27 @@
- SPELL="surf"
-if [[ "${SURF_AUTOUPDATE}" == "y" ]]
+ SPELL=surf
+if [[ ${SURF_SCM} == "y" ]]
then
- VERSION="$(date +%Y%m%d)"
+ if [[ ${SURF_SCM_AUTOUPDATE} == "y" ]]
+ then
+ VERSION=$(date +%Y%m%d)
+ else
+ VERSION=scm
+ fi
+ SOURCE=${SPELL}-scm.tar.bz2
+SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-scm
+ SOURCE_URL[0]=hg_http://code.suckless.org/hg/${SPELL}:${SPELL}-scm
+ FORCE_DOWNLOAD=on
+ SOURCE_IGNORE=volatile
else
- VERSION="scm"
+ VERSION=0.1.2
+ SOURCE=${SPELL}-${VERSION}.tar.gz
+SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
+ SOURCE_URL[0]=http://dl.suckless.org/${SPELL}/${SOURCE}
+
SOURCE_HASH=sha512:e4ec8bd0873bfaada3ac1a864ab957f0272e2db780a3f424719581c065a61fecee8245980a5bb77ae611e1214657112148ff2dfe0711ab1518d7a2b1f9837694
fi
- SOURCE="${SPELL}-scm.tar.bz2"
-SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-scm"
- SOURCE_URL[0]="hg_http://code.suckless.org/hg/${SPELL}:${SPELL}-scm";
- FORCE_DOWNLOAD="on"
- SOURCE_IGNORE="volatile"
- WEB_SITE="http://surf.suckless.org/";
- ENTERED="20090727"
- LICENSE[0]="MIT/XCL"
+ WEB_SITE=http://surf.suckless.org/
+ ENTERED=20090727
+ LICENSE[0]=MIT/XCL
SHORT="simple webbrowser based on webkit/gtk+."
cat << EOF
Surf is a simple webbrowser which is based on webkit/gtk+. It is able to
display
diff --git a/http/surf/HISTORY b/http/surf/HISTORY
index d8cb002..a738829 100644
--- a/http/surf/HISTORY
+++ b/http/surf/HISTORY
@@ -1,3 +1,7 @@
+2009-09-13 Quentin Rameau <quinq AT sourcemage.org>
+ * DETAILS: added stable version 0.1.2
+
2009-07-22 Quentin Rameau <quinq AT sourcemage.org>
* PREPARE, DEPENDS, DETAILS,
DOWNLOAD, PRE_BUILD, BUILD, HISTORY: created this spell
+
diff --git a/http/surf/PREPARE b/http/surf/PREPARE
index e1309e8..8444535 100755
--- a/http/surf/PREPARE
+++ b/http/surf/PREPARE
@@ -1 +1,5 @@
-config_query SURF_AUTOUPDATE "Update on every system update?" n
+config_query SURF_SCM "Build SCM version ?" n &&
+if [[ ${SURF_SCM} == "y" ]]
+then
+ config_query SURF_SCM_AUTOUPDATE "Update on every system update?" n
+fi
diff --git a/http/w3m/HISTORY b/http/w3m/HISTORY
index 5786b25..266c5bf 100644
--- a/http/w3m/HISTORY
+++ b/http/w3m/HISTORY
@@ -1,3 +1,7 @@
+2009-09-13 Quentin Rameau <quinq AT sourcemage.org>
+ * profile.d/pager.sh: added
+ * INSTALL: added, install pager.sh
+
2008-05-21 Justin Boffemmyer <flux AT sourcemage.org>
* PRE_BUILD: patch fb_imlib2.c
* fb_imlib2.c.patch: new file, removes #include <X11/Xlib.h> from
diff --git a/http/w3m/INSTALL b/http/w3m/INSTALL
new file mode 100755
index 0000000..28f299b
--- /dev/null
+++ b/http/w3m/INSTALL
@@ -0,0 +1,8 @@
+default_install &&
+
+mkdir -p $INSTALL_ROOT/etc/profile.d/ &&
+if install_config_file $SCRIPT_DIRECTORY/profile.d/pager.sh \
+ $INSTALL_ROOT/etc/profile.d/pager.sh;
+then
+ chmod 0755 $INSTALL_ROOT/etc/profile.d/pager.sh
+fi
diff --git a/http/w3m/profile.d/pager.sh b/http/w3m/profile.d/pager.sh
new file mode 100644
index 0000000..a1c2da7
--- /dev/null
+++ b/http/w3m/profile.d/pager.sh
@@ -0,0 +1,10 @@
+#!/bin/sh
+# First check if this variable is already set
+# then if not set, check it (maybe), then set it
+
+if [ -z "$PAGER" ] ; then
+ PAGER="w3m"
+fi
+
+export PAGER
+
diff --git a/http/xshttpd/DETAILS b/http/xshttpd/DETAILS
index a1aa657..c995f24 100755
--- a/http/xshttpd/DETAILS
+++ b/http/xshttpd/DETAILS
@@ -1,7 +1,7 @@
SPELL=xshttpd
case $XSHTTPD_BRANCH in
devel)
- VERSION=37b06
+ VERSION=37b13
;;
*)
VERSION=36g01
diff --git a/http/xshttpd/HISTORY b/http/xshttpd/HISTORY
index 6f915ab..69610fa 100644
--- a/http/xshttpd/HISTORY
+++ b/http/xshttpd/HISTORY
@@ -1,3 +1,7 @@
+2009-09-12 Remko van der Vossen <wich AT sourcemage.org>
+ * DETAILS: Devel version 37b13
+ * PRE_BUILD: Remove sedit for devel version
+
2009-02-05 Remko van der Vossen <wich AT sourcemage.org>
* PRE_BUILD: sedit for python > 2.5

diff --git a/http/xshttpd/PRE_BUILD b/http/xshttpd/PRE_BUILD
index de58520..9d7f3e4 100755
--- a/http/xshttpd/PRE_BUILD
+++ b/http/xshttpd/PRE_BUILD
@@ -5,6 +5,4 @@ if [[ $XSHTTPD_BRANCH == "stable" ]]; then
sedit "s/ruby18/$RUBY_SO_NAME/" configure
sedit 's,python2.5/Python.h,Python.h,' src/cgi.c
sedit 's,python2.5/Python.h,Python.h,' src/cloader.c
-else
- sedit 's,python2.5/Python.h,Python.h,' src/mod_python.c
fi
diff --git a/http/xshttpd/johans.gpg b/http/xshttpd/johans.gpg
index 179a973..843b84a 100644
Binary files a/http/xshttpd/johans.gpg and b/http/xshttpd/johans.gpg differ
diff --git a/http/xulrunner/DETAILS b/http/xulrunner/DETAILS
index ade5f09..547fc62 100755
--- a/http/xulrunner/DETAILS
+++ b/http/xulrunner/DETAILS
@@ -1,7 +1,7 @@
SPELL=xulrunner
- VERSION=1.9.1.2
- FFVERSION=3.5.2
- SOURCE=firefox-$FFVERSION-source.tar.bz2
+ VERSION=1.9.1.3
+ FFVERSION=3.5.3
+ SOURCE=firefox-$FFVERSION.source.tar.bz2
SOURCE2=$SOURCE.asc
SOURCE2_IGNORE=signature
SOURCE_GPG=firefox.gpg:$SOURCE2:WORKS_FOR_ME
@@ -9,7 +9,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION

SOURCE_URL[0]=ftp://ftp.mozilla.org/pub/firefox/releases/$FFVERSION/source/$SOURCE
SOURCE2_URL[0]=$SOURCE_URL.asc
WEB_SITE=http://www.mozilla.org/
- SECURITY_PATCH=9
+ SECURITY_PATCH=10
ENTERED=20060829
LICENSE[0]=MPL
DOCS="LICENSE README.txt"
diff --git a/http/xulrunner/HISTORY b/http/xulrunner/HISTORY
index 30087e3..86a6662 100644
--- a/http/xulrunner/HISTORY
+++ b/http/xulrunner/HISTORY
@@ -1,3 +1,6 @@
+2009-09-10 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 1.9.1.3, FFVERSION=3.5.3, -source.tar.bz2 ->
.source.tar.bz2
+
2009-09-05 Remko van der Vossen <wich AT sourcemage.org>
* DEPENDS: Added dependency on python

diff --git a/kernels/kvm/HISTORY b/kernels/kvm/HISTORY
index 063c281..828e056 100644
--- a/kernels/kvm/HISTORY
+++ b/kernels/kvm/HISTORY
@@ -1,3 +1,8 @@
+2009-09-10 Eric Sandall <sandalle AT sourcemage.org>
+ * PRE_BUILD: Apply bug2823323.patch
+ * bug2823323.patch: Patch from
http://patchwork.kernel.org/patch/36141/
+ fixes
http://sourceforge.net/tracker/?func=detail&atid=893831&aid=2823323&group_id=180599
+
2009-08-29 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: WEB_SITE moved to http://www.linux-kvm.org/

diff --git a/kernels/kvm/PRE_BUILD b/kernels/kvm/PRE_BUILD
new file mode 100755
index 0000000..39d5c9d
--- /dev/null
+++ b/kernels/kvm/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+patch $SOURCE_DIRECTORY/kvm/kernel/external-module-compat-comm.h \
+ $SCRIPT_DIRECTORY/bug2823323.patch
diff --git a/kernels/kvm/bug2823323.patch b/kernels/kvm/bug2823323.patch
new file mode 100644
index 0000000..026d5cc
--- /dev/null
+++ b/kernels/kvm/bug2823323.patch
@@ -0,0 +1,16 @@
+#
+# Patch from http://patchwork.kernel.org/patch/36141/ fixes
+#
http://sourceforge.net/tracker/?func=detail&atid=893831&aid=2823323&group_id=180599
+#
+diff -Nur kvm-88.orig/kvm/kernel/external-module-compat-comm.h
kvm-88/kvm/kernel/external-module-compat-comm.h
+--- kvm-88.orig/kvm/kernel/external-module-compat-comm.h 2009-07-17
20:47:08.000000000 -0300
++++ kvm-88/kvm/kernel/external-module-compat-comm.h 2009-07-17
20:55:21.000000000 -0300
+@@ -845,7 +845,7 @@
+
+ #include <linux/tracepoint.h>
+
+-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,30)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,31)
+
+ struct tracepoint;
+
diff --git a/kernels/linux/HISTORY b/kernels/linux/HISTORY
index 18ba120..22173dc 100644
--- a/kernels/linux/HISTORY
+++ b/kernels/linux/HISTORY
@@ -1,3 +1,14 @@
+2009-08-20 Arjan Bouter <abouter AT sourcemage.org>
+ * info/patches/zen-patches/2.6.30-zen4.patch: latest zen
+
+2009-09-11 Ladislav Hagara <hgr AT vabo.cz>
+ * info/patches/ck_bfs/2.6.31-sched-bfs-211.patch: added
+
+2009-09-10 Eric Sandall <sandalle AT sourcemage.org>
+ * info/patches/smgl_patches/smgl-logo-0.2-for-2.6.22.patch: Support
2.6.30
+ * info/patches/smgl_patches/smgl-logo-0.2-for-2.6.31.patch: SMGL Logo
0.2
+ patch for 2.6.31+ (Bug #15403)
+
2009-09-10 Ladislav Hagara <hgr AT vabo.cz>
* latest.defaults: 2.6.31
* info/kernels/2.6.31: added
diff --git a/kernels/linux/info/patches/ck_bfs/2.6.31-sched-bfs-211.patch
b/kernels/linux/info/patches/ck_bfs/2.6.31-sched-bfs-211.patch
new file mode 100755
index 0000000..679ee40
--- /dev/null
+++ b/kernels/linux/info/patches/ck_bfs/2.6.31-sched-bfs-211.patch
@@ -0,0 +1,5 @@
+appliedkernels="2.6.31"
+patchversion="${appliedkernels}-bfs211"
+source="${appliedkernels}-sched-bfs-211.patch"
+source_url="http://ck.kolivas.org/patches/bfs/${source}";
+md5sum="34afc1fe5f7ed87c70835f21265cfe51"
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
index 83a8700..85c109b 100755
--- 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
@@ -1,4 +1,4 @@
-appliedkernels="2.6.29 2.6.28 2.6.27 2.6.26 2.6.25 2.6.24 2.6.23 2.6.22"
+appliedkernels="2.6.30 2.6.29 2.6.28 2.6.27 2.6.26 2.6.25 2.6.24 2.6.23
2.6.22"
source="smgl-logo-0.2-for-2.6.22.patch.bz2"
source_url="http://download.sourcemage.org/distro/kernel/${source}";
source_gpg="gurus.gpg:${source}.sig"
diff --git
a/kernels/linux/info/patches/smgl_patches/smgl-logo-0.2-for-2.6.31.patch
b/kernels/linux/info/patches/smgl_patches/smgl-logo-0.2-for-2.6.31.patch
new file mode 100755
index 0000000..568dc9c
--- /dev/null
+++ b/kernels/linux/info/patches/smgl_patches/smgl-logo-0.2-for-2.6.31.patch
@@ -0,0 +1,5 @@
+appliedkernels="2.6.31"
+source="smgl-logo-0.2-for-2.6.31.patch.bz2"
+source_url="http://download.sourcemage.org/distro/kernel/${source}";
+source_gpg="gurus.gpg:${source}.sig"
+gpg_source_url=${source_url}.sig
diff --git a/kernels/linux/info/patches/zen_patches/2.6.30-zen4.patch
b/kernels/linux/info/patches/zen_patches/2.6.30-zen4.patch
new file mode 100644
index 0000000..8319068
--- /dev/null
+++ b/kernels/linux/info/patches/zen_patches/2.6.30-zen4.patch
@@ -0,0 +1,6 @@
+appliedkernels="2.6.30"
+depends=""
+patchversion="${appliedkernels}-zen4"
+source="${patchversion}.patch.lzma"
+source_url="http://zen-sources.org/files/${source}";
+md5="4758f1fcbfd54c455fc00411058f7ca5"
diff --git a/kernels/linux/latest.defaults b/kernels/linux/latest.defaults
index da35858..f982818 100644
--- a/kernels/linux/latest.defaults
+++ b/kernels/linux/latest.defaults
@@ -17,4 +17,4 @@ 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.25.4-rt5
-LATEST_zen_patches=2.6.30-zen3.5.patch
+LATEST_zen_patches=2.6.30-zen4.patch
diff --git a/kernels/virtualbox-module/DETAILS
b/kernels/virtualbox-module/DETAILS
index a6fe696..59f125f 100755
--- a/kernels/virtualbox-module/DETAILS
+++ b/kernels/virtualbox-module/DETAILS
@@ -1,5 +1,5 @@
SPELL=virtualbox-module
- VERSION=3.0.4
+ VERSION=3.0.6
SOURCE=virtualbox-module-$VERSION.tar.gz
SOURCE_IGNORE=volatile
SOURCE_DIRECTORY=$BUILD_DIRECTORY/vboxdrv
diff --git a/kernels/virtualbox-module/HISTORY
b/kernels/virtualbox-module/HISTORY
index 6e118db..4f87cb2 100644
--- a/kernels/virtualbox-module/HISTORY
+++ b/kernels/virtualbox-module/HISTORY
@@ -1,3 +1,6 @@
+2009-09-10 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 3.0.6
+
2009-08-05 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 3.0.4

diff --git a/kernels/xen-hypervisor/DETAILS b/kernels/xen-hypervisor/DETAILS
index b51af97..e2dcbcf 100755
--- a/kernels/xen-hypervisor/DETAILS
+++ b/kernels/xen-hypervisor/DETAILS
@@ -1,8 +1,8 @@
SPELL=xen-hypervisor
PACKAGE=xen
- VERSION=3.4.0
+ VERSION=3.4.1
SOURCE=${PACKAGE}-${VERSION}.tar.gz
-
SOURCE_HASH=sha512:e954ef551b9618cbc8c7188961c7f57570c494122171093892bd0a8abbe29ef9f7c1b3822335968ae84c835ae470f87fdaaa4a9630206b7f4511b1e2f1535a3b
+
SOURCE_HASH=sha512:d4af7572494fe251ac1c42f151e4f5052d222a5a371b3aed0a8dac3c76b3a2c8b810279389148a51404a266ba7542aa82f12e5439a98d22ba437be89d939b789
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${PACKAGE}-${VERSION}

SOURCE_URL[0]=http://bits.xensource.com/oss-xen/release/${VERSION}/${SOURCE}
WEB_SITE=http://www.xen.org
diff --git a/kernels/xen-hypervisor/HISTORY b/kernels/xen-hypervisor/HISTORY
index 7aed269..4270394 100644
--- a/kernels/xen-hypervisor/HISTORY
+++ b/kernels/xen-hypervisor/HISTORY
@@ -1,3 +1,6 @@
+2009-09-12 Arjan Bouter <abouter AT sourcemage.org>
+ * DETAILS: version 3.4.1
+
2009-07-30 Arjan Bouter <abouter AT sourcemage.org>
* DETAILS: version 3.4.0

diff --git a/libs/libelf/DETAILS b/libs/libelf/DETAILS
index 8025daf..fa790ca 100755
--- a/libs/libelf/DETAILS
+++ b/libs/libelf/DETAILS
@@ -1,9 +1,9 @@
SPELL=libelf
- VERSION=0.8.11
+ VERSION=0.8.12
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://www.mr511.de/software/$SOURCE
-
SOURCE_HASH=sha512:7871cb880865894d827186121001887a9e5b652df842b243cb7dfd0198771ec0adf094ad2034e05936dac3d77459a4dd5ad01473893d15f636ae495842c68a48
+
SOURCE_HASH=sha512:18fa0c6151d5812cd78c6063ec565f55f121cc675e55acf4179363b6cd99aeb29a4e303a48ee9e47367d27c454eb1d02c6f3ab3d397405265512f5179cdfd948
LICENSE[0]=LGPL
WEB_SITE=http://www.mr511.de/software/
ENTERED=20020526
diff --git a/libs/libelf/HISTORY b/libs/libelf/HISTORY
index 5181bf1..c01da21 100644
--- a/libs/libelf/HISTORY
+++ b/libs/libelf/HISTORY
@@ -1,3 +1,6 @@
+2009-09-10 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 0.8.12
+
2009-05-23 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 0.8.11

diff --git a/libs/libxml2/DETAILS b/libs/libxml2/DETAILS
index 8032001..d45d3b6 100755
--- a/libs/libxml2/DETAILS
+++ b/libs/libxml2/DETAILS
@@ -1,7 +1,7 @@
SPELL=libxml2
- VERSION=2.7.3
+ VERSION=2.7.4
SECURITY_PATCH=1
-
SOURCE_HASH=sha512:12da5d771722e2bf0008df362efc3e22bcb3be6f8b2b864a902c917999ea2cf0345a717a4749ebb5135fe4df9dd014fb55a7359a571cb71315626031e028151f
+
SOURCE_HASH=sha512:8782a6241a3f08cad251894c81e68414e11af1d842e4954f1a8c7031e2c84b1ed74bd6e99d9a1e818c147932449c26a6178a7de0943baaaa7b6516791679a027
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=ftp://xmlsoft.org/$SPELL/$SOURCE
diff --git a/libs/libxml2/HISTORY b/libs/libxml2/HISTORY
index dfeedb2..151bf24 100644
--- a/libs/libxml2/HISTORY
+++ b/libs/libxml2/HISTORY
@@ -1,3 +1,6 @@
+2009-09-13 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 2.7.4
+
2009-08-15 Arjan Bouter <abouter AT sourcemage.org>
* DEPENDS: added zlib

diff --git a/libs/neon/DETAILS b/libs/neon/DETAILS
index cefd831..b891b37 100755
--- a/libs/neon/DETAILS
+++ b/libs/neon/DETAILS
@@ -1,5 +1,5 @@
SPELL=neon
- VERSION=0.28.6
+ VERSION=0.29.0
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SOURCE.asc
SOURCE2_IGNORE=signature
diff --git a/libs/neon/HISTORY b/libs/neon/HISTORY
index 7a5644b..1130f3d 100644
--- a/libs/neon/HISTORY
+++ b/libs/neon/HISTORY
@@ -1,3 +1,6 @@
+2009-09-13 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 0.29.0
+
2009-08-20 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.28.6

diff --git a/mail/procmail/BUILD b/mail/procmail/BUILD
index 67e0112..b14fae4 100755
--- a/mail/procmail/BUILD
+++ b/mail/procmail/BUILD
@@ -1,3 +1,4 @@
+patch -p1 < $SPELL_DIRECTORY/procmail-3.22-glibc-2.10.patch &&
sedit "s:LOCKINGTEST=__defaults__:LOCKINGTEST=/tmp:" Makefile
sedit 's:$(BASENAME)/man:$(BASENAME)/share/man:' Makefile
make init &&
diff --git a/mail/procmail/HISTORY b/mail/procmail/HISTORY
index da3093c..428881f 100644
--- a/mail/procmail/HISTORY
+++ b/mail/procmail/HISTORY
@@ -1,3 +1,8 @@
+2009-09-14 David Kowis <dkowis AT shlrm.org>
+ * BUILD: added patching for building with glibc 2.10
+ * procmail-3.22-glibc-2.10.patch: patch to make procmail build with
+ glibc-2.10 from: http://bugs.gentoo.org/show_bug.cgi?id=270551
+
2006-10-03 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: [automated] Removed UPDATED.

diff --git a/mail/procmail/procmail-3.22-glibc-2.10.patch
b/mail/procmail/procmail-3.22-glibc-2.10.patch
new file mode 100644
index 0000000..2663bf5
--- /dev/null
+++ b/mail/procmail/procmail-3.22-glibc-2.10.patch
@@ -0,0 +1,70 @@
+diff -NrU5 procmail-3.22.orig/src/fields.c procmail-3.22/src/fields.c
+--- procmail-3.22.orig/src/fields.c 2009-05-21 18:21:25.000000000 +0200
++++ procmail-3.22/src/fields.c 2009-05-21 18:22:14.000000000 +0200
+@@ -108,20 +108,20 @@
+ extractfield(p);
+ }
+ /* try and append one valid field to rdheader from stdin
*/
+ int readhead P((void))
+ { int idlen;
+- getline();
++ procmail_getline();
+ if((idlen=breakfield(buf,buffilled))<=0) /* not the start of a valid
field */
+ return 0;
+ if(idlen==STRLEN(FROM)&&eqFrom_(buf)) /* it's a
From_ line */
+ { if(rdheader)
+ return 0; /* the From_ line was a fake!
*/
+- for(;buflast=='>';getline()); /* gather continued >From_ lines
*/
++ for(;buflast=='>';procmail_getline()); /* gather continued
>From_ lines */
+ }
+ else
+- for(;;getline()) /* get the rest of the continued field
*/
++ for(;;procmail_getline()) /* get the rest of the
continued field */
+ { switch(buflast) /* will this line be
continued? */
+ { case ' ':case '\t': /* yep, it sure is
*/
+ continue;
+ }
+ break;
+diff -NrU5 procmail-3.22.orig/src/formail.c procmail-3.22/src/formail.c
+--- procmail-3.22.orig/src/formail.c 2009-05-21 18:21:25.000000000 +0200
++++ procmail-3.22/src/formail.c 2009-05-21 18:22:14.000000000 +0200
+@@ -817,11 +817,11 @@
+ #ifdef MAILBOX_SEPARATOR
+ if(!strncmp(emboxsep,buf,STRLEN(emboxsep))) /* end of mail?
*/
+ { if(split) /* gobble up the next start separator
*/
+ { buffilled=0;
+ #ifdef sMAILBOX_SEPARATOR
+- getline();buffilled=0; /* but only if it's defined
*/
++ procmail_getline();buffilled=0; /* but only if it's
defined */
+ #endif
+ if(buflast!=EOF) /* if any
*/
+ goto splitit;
+ break;
+ }
+diff -NrU5 procmail-3.22.orig/src/formisc.c procmail-3.22/src/formisc.c
+--- procmail-3.22.orig/src/formisc.c 2009-05-21 18:21:25.000000000 +0200
++++ procmail-3.22/src/formisc.c 2009-05-21 18:22:14.000000000 +0200
+@@ -113,11 +113,11 @@
+ { if(buffilled==buflen)
+ buf=realloc(buf,buflen+=Bsize);
+ buf[buffilled++]=c;
+ }
+
+-int getline P((void)) /* read a newline-terminated line
*/
++int procmail_getline P((void)) /* read a
newline-terminated line */
+ { if(buflast==EOF) /* at the end of our Latin already?
*/
+ { loadchar('\n'); /* fake empty line
*/
+ return EOF; /* spread the word
*/
+ }
+ loadchar(buflast); /* load leftover into the buffer
*/
+diff -NrU5 procmail-3.22.orig/src/formisc.h procmail-3.22/src/formisc.h
+--- procmail-3.22.orig/src/formisc.h 2009-05-21 18:21:25.000000000 +0200
++++ procmail-3.22/src/formisc.h 2009-05-21 18:22:14.000000000 +0200
+@@ -15,6 +15,6 @@
+ closemine P((void)),
+ opensink P((void));
+ char*
+ skipwords P((char*start));
+ int
+- getline P((void));
++ procmail_getline P((void));
diff --git a/net/iptables/DETAILS b/net/iptables/DETAILS
index 280fbae..cb6608c 100755
--- a/net/iptables/DETAILS
+++ b/net/iptables/DETAILS
@@ -1,5 +1,5 @@
SPELL=iptables
- VERSION=1.4.4
+ VERSION=1.4.5
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE2=$SOURCE.sig
SOURCE_URL[0]=http://www.iptables.org/projects/$SPELL/files/$SOURCE
diff --git a/net/iptables/HISTORY b/net/iptables/HISTORY
index 5b7665e..8e4ce79 100644
--- a/net/iptables/HISTORY
+++ b/net/iptables/HISTORY
@@ -1,3 +1,6 @@
+2009-09-15 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 1.4.5
+
2009-06-16 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 1.4.4

diff --git a/net/nagios-plugins/DETAILS b/net/nagios-plugins/DETAILS
index a249812..aa2169f 100755
--- a/net/nagios-plugins/DETAILS
+++ b/net/nagios-plugins/DETAILS
@@ -1,9 +1,9 @@
SPELL=nagios-plugins
- VERSION=1.4.11
+ VERSION=1.4.13
SOURCE=${SPELL}-${VERSION}.tar.gz
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
SOURCE_URL=$SOURCEFORGE_URL/nagiosplug/$SOURCE
-
SOURCE_HASH=sha512:a27f73964df26e9e2cc86b7e406d1f1868848802608acb4281f300c5ddf4cc85ef85f4daba8fbe8ac9736fde7a90c95a0c01306cf439f4f2929d6c41aecfeb0e
+
SOURCE_HASH=sha512:6f6ff9c939720dfa9697d657af53d4b910e2dd8552e252e6c7b55fc5694815362e89e1cbef95d7d4237d73cd8b39bc96894b200a82fb25152cedcc4fc00ab0c8
LICENSE=GPL
WEB_SITE=http://www.nagios.org/
ENTERED_DATE=20051129
diff --git a/net/nagios-plugins/HISTORY b/net/nagios-plugins/HISTORY
index 114905e..739ba98 100644
--- a/net/nagios-plugins/HISTORY
+++ b/net/nagios-plugins/HISTORY
@@ -1,3 +1,6 @@
+2009-09-11 Justin Boffemmyer <flux AT sourcemage.org>
+ * DETAILS: updated to 1.4.13
+
2008-01-04 David Kowis <dkowis AT shlrm.org>
* DETAILS: Updated to 1.4.11
* removed signature file
diff --git a/net/nagios/CONFIGURE b/net/nagios/CONFIGURE
index 9307735..91a632a 100755
--- a/net/nagios/CONFIGURE
+++ b/net/nagios/CONFIGURE
@@ -8,10 +8,6 @@ config_query_option NAGIOS_PERL \
"--disable-embedded-perl --without-per/cache" &&


-config_query_list NAIGOS_IPSNMPPATCH \
- "Apply which patches?" \
- "Neither" "Secondary IP Address" \
- "Host SNMP Community" "Both" &&
-
config_query NAIGOS_STATUSPATCH "Apply Service Status patch?" n &&
+
config_query NAGIOS_HTML "Install html and cgi files?" y
diff --git a/net/nagios/DETAILS b/net/nagios/DETAILS
index a591055..0a5dced 100755
--- a/net/nagios/DETAILS
+++ b/net/nagios/DETAILS
@@ -1,6 +1,6 @@
SPELL=nagios
- VERSION=2.9
-
SOURCE_HASH=sha512:3a0bdb3910badb8a67264feb262d5c2620b1853fb4fe53c9a1f3c9c341c9f34b893d0e7e1b0bea675f6fd3a9222940bebe7ae9e552e34f2beea9e9408869c2cc
+ VERSION=3.2.0
+
SOURCE_HASH=sha512:f33128338ab1631e421e5ba29e48baafea2b0b7a4ea2558ace509f9a754929ebf8d19fa40e59ec17062661f9366e750c178eea9ebd1973c1f377bd994082c625
SOURCE=${SPELL}-${VERSION}.tar.gz
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
SOURCE_URL=${SOURCEFORGE_URL}/${SPELL}/${SOURCE}
diff --git a/net/nagios/HISTORY b/net/nagios/HISTORY
index 1067af3..1d43075 100644
--- a/net/nagios/HISTORY
+++ b/net/nagios/HISTORY
@@ -1,3 +1,17 @@
+2009-09-11 Justin Boffemmyer <flux AT sourcemage.org>
+ * DETAILS: updated version to 3.2.0
+ * CONFIGURE: removed queries for ipaddress and snmpcommunity patches
+ * PRE_BUILD: removed logic for old patches, updated 2.0 to 3.0 for
+ statusmap patch
+ * nagios-2.0-ipaddress.patch: removed, doesn't apply to current
version
+ * nagios-2.0-snmpcommunity.patch: removed, doesn't apply to current
+ version
+ * nagios-2.0-both.patch: removed, doesn't apply to current version
+ * nagios-2.0-statusmap.patch: removed, replaced by
+ nagios-3.0-statusmap.patch
+ * nagios-3.0-statusmap.patch: added, replaces
+ nagios-2.0-statusmap.patch
+
2007-07-20 David Kowis <dkowis AT shlrm.org>
* DETAILS: version to 2.9
* INSTALL: also copied over the contrib directory for usefulness
diff --git a/net/nagios/PRE_BUILD b/net/nagios/PRE_BUILD
index d233ebc..b87c58d 100755
--- a/net/nagios/PRE_BUILD
+++ b/net/nagios/PRE_BUILD
@@ -1,18 +1,6 @@
default_pre_build &&
cd ${SOURCE_DIRECTORY} &&

-case "${NAIGOS_IPSNMPPATCH}" in
- "Secondary IP Address")
- patch -p1 < ${SCRIPT_DIRECTORY}/nagios-2.0-ipaddresses.patch
- ;;
- "Host SNMP Community")
- patch -p1 < ${SCRIPT_DIRECTORY}/nagios-2.0-snmpcommunity.patch
- ;;
- "Both")
- patch -p1 < ${SCRIPT_DIRECTORY}/nagios-2.0-both.patch
- ;;
-esac &&
-
if [ "${NAIGOS_STATUSPATCH}" == "y" ]; then
- patch -p1 < ${SCRIPT_DIRECTORY}/nagios-2.0-statusmap.patch
+ patch -p1 < ${SCRIPT_DIRECTORY}/nagios-3.0-statusmap.patch
fi
diff --git a/net/nagios/nagios-2.0-both.patch
b/net/nagios/nagios-2.0-both.patch
deleted file mode 100644
index 28e50c1..0000000
--- a/net/nagios/nagios-2.0-both.patch
+++ /dev/null
@@ -1,565 +0,0 @@
-diff -u -a -b -B -r nagios-2.0/base/config.c nagios-2.0-both/base/config.c
---- nagios-2.0/base/config.c 2005-12-26 17:18:14.000000000 -0600
-+++ nagios-2.0-both/base/config.c 2006-02-27 09:39:45.000000000 -0600
-@@ -1845,6 +1845,13 @@
-
- found=FALSE;
-
-+ if (temp_host->community==NULL) {
-+ snprintf(temp_buffer,sizeof(temp_buffer),"Warning:
Host '%s' has no community defined!",temp_host->name);
-+ temp_buffer[sizeof(temp_buffer)-1]='\x0';
-+
write_to_logs_and_console(temp_buffer,NSLOG_VERIFICATION_WARNING,TRUE);
-+ warnings++;
-+ }
-+
- #ifdef REMOVED_061303
- /* make sure each host is a member of at least one hostgroup
*/
-
for(temp_hostgroup=hostgroup_list;temp_hostgroup!=NULL;temp_hostgroup=temp_hostgroup->next){
-diff -u -a -b -B -r nagios-2.0/base/utils.c nagios-2.0-both/base/utils.c
---- nagios-2.0/base/utils.c 2006-01-04 10:39:57.000000000 -0600
-+++ nagios-2.0-both/base/utils.c 2006-02-27 09:39:45.000000000 -0600
-@@ -733,6 +733,13 @@
- free(macro_x[MACRO_HOSTADDRESS]);
- macro_x[MACRO_HOSTADDRESS]=strdup(hst->address);
-
-+ /* begin modification to define sec. ipaddress */
-+ /* get the host secondary address */
-+ if(macro_x[MACRO_SECONDARYHOSTADDRESS]!=NULL)
-+ free(macro_x[MACRO_SECONDARYHOSTADDRESS]);
-+ macro_x[MACRO_SECONDARYHOSTADDRESS]=strdup(hst->secondary_address);
-+ /* end of modification */
-+
- /* get the host state */
- if(macro_x[MACRO_HOSTSTATE]!=NULL)
- free(macro_x[MACRO_HOSTSTATE]);
-@@ -931,6 +938,14 @@
- if(temp_hostgroup!=NULL)
- macro_x[MACRO_HOSTGROUPALIAS]=strdup(temp_hostgroup->alias);
-
-+ /* patch define SNMP Community */
-+ if(macro_x[MACRO_SNMPCOMMUNITY]!=NULL)
-+ free(macro_x[MACRO_SNMPCOMMUNITY]);
-+ macro_x[MACRO_SNMPCOMMUNITY]=NULL;
-+ if (strdup(hst->community)!=NULL)
-+ macro_x[MACRO_SNMPCOMMUNITY]=strdup(hst->community);
-+ /* end */
-+
- if((temp_hostextinfo=find_hostextinfo(hst->name))){
-
- /* get the action url */
-@@ -1221,6 +1236,11 @@
- else if(!strcmp(macro,"HOSTADDRESS"))
- macro_ondemand=strdup(hst->address);
-
-+ /* begin modification to define sec. ipaddress */
-+ else if(!strcmp(macro,"SECONDARYHOSTADDRESS"))
-+
macro_ondemand=strdup(hst->secondary_address);
-+ /* end of modification */
-+
- /* get the host state */
- else if(!strcmp(macro,"HOSTSTATE")){
- macro_ondemand=(char *)malloc(MAX_STATE_LENGTH);
-@@ -1266,7 +1286,10 @@
- strip(macro_ondemand);
- }
- }
--
-+ /* patch define SNMP Community */
-+ else if(!strcmp(macro,"SNMPCOMMUNITY"))
-+ macro_ondemand=strdup(hst->community);
-+ /* END */
- /* get the performance data */
- else if(!strcmp(macro,"HOSTPERFDATA")){
- if(hst->perf_data==NULL)
-@@ -2293,6 +2316,9 @@
- add_macrox_name(MACRO_HOSTNAME,"HOSTNAME");
- add_macrox_name(MACRO_HOSTALIAS,"HOSTALIAS");
- add_macrox_name(MACRO_HOSTADDRESS,"HOSTADDRESS");
-+ /* begin modification to define sec. ipaddress */
-+ add_macrox_name(MACRO_SECONDARYHOSTADDRESS,"SECONDARYHOSTADDRESS");
-+ /* end of modifications */
- add_macrox_name(MACRO_SERVICEDESC,"SERVICEDESC");
- add_macrox_name(MACRO_SERVICESTATE,"SERVICESTATE");
- add_macrox_name(MACRO_SERVICESTATEID,"SERVICESTATEID");
-@@ -2389,6 +2415,9 @@
- add_macrox_name(MACRO_PROCESSSTARTTIME,"PROCESSSTARTTIME");
- add_macrox_name(MACRO_HOSTCHECKTYPE,"HOSTCHECKTYPE");
- add_macrox_name(MACRO_SERVICECHECKTYPE,"SERVICECHECKTYPE");
-+ /* patch define SNMP Community */
-+ add_macrox_name(MACRO_SNMPCOMMUNITY,"SNMPCOMMUNITY");
-+ /* END */
-
- #ifdef DEBUG0
- printf("init_macrox_names() end\n");
-diff -u -a -b -B -r nagios-2.0/cgi/config.c nagios-2.0-both/cgi/config.c
---- nagios-2.0/cgi/config.c 2005-11-16 02:49:35.000000000 -0600
-+++ nagios-2.0-both/cgi/config.c 2006-02-27 09:39:45.000000000 -0600
-@@ -447,10 +447,16 @@
- printf("<TH CLASS='data'>Host Name</TH>");
- printf("<TH CLASS='data'>Alias/Description</TH>");
- printf("<TH CLASS='data'>Address</TH>");
-+ /* begin modification to define sec. ipaddress */
-+ printf("<TH CLASS='data'>secondary Address</TH>");
-+ /* end of modification */
- printf("<TH CLASS='data'>Parent Hosts</TH>");
- printf("<TH CLASS='data'>Max. Check Attempts</TH>");
- printf("<TH CLASS='data'>Check Interval</TH>\n");
- printf("<TH CLASS='data'>Host Check Command</TH>");
-+ /* patch define SNMP Community */
-+ printf("<TH CLASS='data'>SNMP Community</TH>");
-+ /* END */
- printf("<TH CLASS='data'>Obsess Over</TH>\n");
- printf("<TH CLASS='data'>Enable Active Checks</TH>\n");
- printf("<TH CLASS='data'>Enable Passive Checks</TH>\n");
-@@ -488,7 +494,10 @@
-
- printf("<TD CLASS='%s'><a
name='%s'>%s</a></TD>\n",bg_class,url_encode(temp_host->name),temp_host->name);
- printf("<TD CLASS='%s'>%s</TD>\n",bg_class,temp_host->alias);
-+ /* begin modification to define sec. ipaddress */
- printf("<TD
CLASS='%s'>%s</TD>\n",bg_class,temp_host->address);
-+ printf("<TD
CLASS='%s'>%s</TD>\n",bg_class,temp_host->secondary_address);
-+ /* end of modification */
-
- printf("<TD CLASS='%s'>",bg_class);
-
for(temp_hostsmember=temp_host->parent_hosts;temp_hostsmember!=NULL;temp_hostsmember=temp_hostsmember->next){
-@@ -514,6 +523,10 @@
- printf("<a
href='%s?type=commands#%s'>%s</a></TD>\n",CONFIG_CGI,url_encode(temp_host->host_check_command),temp_host->host_check_command);
- printf("</TD>\n");
-
-+ /* patch define SNMP Community */
-+ printf("<TD
CLASS='%s'>%s&nbsp;</TD>\n",bg_class,temp_host->community);
-+ /* END */
-+
- printf("<TD
CLASS='%s'>%s</TD>\n",bg_class,(temp_host->obsess_over_host==TRUE)?"Yes":"No");
-
- printf("<TD
CLASS='%s'>%s</TD>\n",bg_class,(temp_host->checks_enabled==TRUE)?"Yes":"No");
-diff -u -a -b -B -r nagios-2.0/cgi/extinfo.c nagios-2.0-both/cgi/extinfo.c
---- nagios-2.0/cgi/extinfo.c 2006-01-20 11:34:53.000000000 -0600
-+++ nagios-2.0-both/cgi/extinfo.c 2006-02-27 09:39:27.000000000 -0600
-@@ -319,7 +319,10 @@
- if(found==FALSE)
- printf("No hostgroups");
- printf("</DIV><BR>\n");
-- printf("<DIV
CLASS='data'>%s</DIV>\n",temp_host->address);
-+ /* begin modification to define sec.
ipaddress */
-+ printf("<DIV
CLASS='data'><b>primary:</b>%s</DIV>\n",temp_host->address);
-+ printf("<DIV
CLASS='data'><b>secondary:</b>%s</DIV>\n",temp_host->secondary_address);
-+ /* end of modification */
- }
- if(display_type==DISPLAY_SERVICE_INFO){
- printf("<DIV CLASS='data'>Service</DIV><DIV
CLASS='dataTitle'>%s</DIV><DIV CLASS='data'>On Host</DIV>\n",service_desc);
-diff -u -a -b -B -r nagios-2.0/common/objects.c
nagios-2.0-both/common/objects.c
---- nagios-2.0/common/objects.c 2005-12-27 12:55:10.000000000 -0600
-+++ nagios-2.0-both/common/objects.c 2006-02-27 10:04:45.000000000 -0600
-@@ -924,11 +924,15 @@
- return new_timerange;
- }
-
--
-+/* begin modification to define sec. ipaddress */
-+/* added char *secondary_address
-+/* begin modification to define snmp community */
-+/* added char *community */
- /* add a new host definition */
--host *add_host(char *name, char *alias, char *address, char *check_period,
int check_interval, int max_attempts, int notify_up, int notify_down, int
notify_unreachable, int notify_flapping, int notification_interval, char
*notification_period, int notifications_enabled, char *check_command, int
checks_enabled, int accept_passive_checks, char *event_handler, int
event_handler_enabled, int flap_detection_enabled, double low_flap_threshold,
double high_flap_threshold, int stalk_up, int stalk_down, int
stalk_unreachable, int process_perfdata, int failure_prediction_enabled, char
*failure_prediction_options, int check_freshness, int freshness_threshold,
int retain_status_information, int retain_nonstatus_information, int
obsess_over_host){
-+host *add_host(char *name, char *alias, char *address, char
*secondary_address, char *check_period, int check_interval, int max_attempts,
int notify_up, int notify_down, int notify_unreachable, int notify_flapping,
int notification_interval, char *notification_period, int
notifications_enabled, char *check_command, int checks_enabled, int
accept_passive_checks, char *event_handler, int event_handler_enabled, int
flap_detection_enabled, double low_flap_threshold, double
high_flap_threshold, int stalk_up, int stalk_down, int stalk_unreachable, int
process_perfdata, int failure_prediction_enabled, char
*failure_prediction_options, int check_freshness, int freshness_threshold,
int retain_status_information, int retain_nonstatus_information, int
obsess_over_host, char *community){
- host *temp_host;
- host *new_host;
-+/* end of modification */
- #ifdef NSCORE
- char temp_buffer[MAX_INPUT_BUFFER];
- int x;
-@@ -951,9 +955,15 @@
- strip(name);
- strip(alias);
- strip(address);
-+ /* begin modification to define sec. ipaddress */
-+ strip(secondary_address);
-+ /* end of modification */
- strip(check_command);
- strip(event_handler);
- strip(notification_period);
-+ /* patch define SNMP Community */
-+ strip(community);
-+ /* END */
-
- if(!strcmp(name,"") || !strcmp(alias,"") || !strcmp(address,"")){
- #ifdef NSCORE
-@@ -1209,6 +1219,27 @@
- free(new_host);
- return NULL;
- }
-+
-+ /* begin modification to define sec. ipaddress */
-+ if (secondary_address==NULL) {
-+ new_host->secondary_address=NULL;
-+ } else {
-+ new_host->secondary_address=strdup(secondary_address);
-+ if (new_host->secondary_address==NULL) {
-+#ifdef NSCORE
-+ snprintf(temp_buffer,sizeof(temp_buffer)-1,"Error:
Could not allocate memory for host '%s' secondary_address\n",name);
-+ temp_buffer[sizeof(temp_buffer)-1]='\x0';
-+
write_to_logs_and_console(temp_buffer,NSLOG_CONFIG_ERROR,TRUE);
-+#endif
-+ free(new_host->alias);
-+ free(new_host->address);
-+ free(new_host->name);
-+ free(new_host);
-+ return NULL;
-+ }
-+ }
-+ /* end of modification */
-+
- if(check_period!=NULL && strcmp(check_period,"")){
- new_host->check_period=strdup(check_period);
- if(new_host->check_period==NULL){
-@@ -1218,6 +1249,9 @@
-
write_to_logs_and_console(temp_buffer,NSLOG_CONFIG_ERROR,TRUE);
- #endif
- free(new_host->address);
-+ /* begin modification to define sec. ipaddress */
-+ free(new_host->secondary_address);
-+ /* end of modifications */
- free(new_host->alias);
- free(new_host->name);
- free(new_host);
-@@ -1236,6 +1270,9 @@
- #endif
- free(new_host->check_period);
- free(new_host->address);
-+ /* begin modification to define sec. ipaddress */
-+ free(new_host->secondary_address);
-+ /* end of modifications */
- free(new_host->alias);
- free(new_host->name);
- free(new_host);
-@@ -1256,6 +1293,9 @@
- free(new_host->notification_period);
- free(new_host->check_period);
- free(new_host->address);
-+ /* begin modification to define sec. ipaddress */
-+ free(new_host->secondary_address);
-+ /* end of modifications */
- free(new_host->alias);
- free(new_host->name);
- free(new_host);
-@@ -1278,6 +1318,9 @@
- free(new_host->notification_period);
- free(new_host->check_period);
- free(new_host->address);
-+ /* begin modification to define sec. ipaddress */
-+ free(new_host->secondary_address);
-+ /* end of modifications */
- free(new_host->alias);
- free(new_host->name);
- free(new_host);
-@@ -1302,6 +1345,9 @@
- free(new_host->notification_period);
- free(new_host->check_period);
- free(new_host->address);
-+ /* begin modification to define sec. ipaddress */
-+ free(new_host->secondary_address);
-+ /* end of modifications */
- free(new_host->alias);
- free(new_host->name);
- free(new_host);
-@@ -1311,6 +1357,35 @@
- else
- new_host->failure_prediction_options=NULL;
-
-+ /* patch define SNMP Community */
-+ if (community==NULL) {
-+ new_host->community=NULL;
-+ } else {
-+ new_host->community=strdup(community);
-+ if(new_host->community==NULL){
-+#ifdef NSCORE
-+ snprintf(temp_buffer,sizeof(temp_buffer)-1,"Error:
Could not allocate memory for host '%s' community\n",name);
-+ temp_buffer[sizeof(temp_buffer)-1]='\x0';
-+
write_to_logs_and_console(temp_buffer,NSLOG_CONFIG_ERROR,TRUE);
-+#endif
-+ if(new_host->event_handler!=NULL)
-+ free(new_host->event_handler);
-+ if(new_host->host_check_command!=NULL)
-+ free(new_host->host_check_command);
-+ if(new_host->notification_period!=NULL)
-+ free(new_host->notification_period);
-+ if (new_host->failure_prediction_options!=NULL)
-+ free(new_host->failure_prediction_options);
-+ free(new_host->check_period);
-+ free(new_host->address);
-+ free(new_host->alias);
-+ free(new_host->name);
-+ free(new_host);
-+ return NULL;
-+ }
-+ }
-+ /* END */
-+
-
- new_host->parent_hosts=NULL;
- new_host->max_attempts=max_attempts;
-@@ -1400,6 +1475,9 @@
- if(new_host->notification_period!=NULL)
- free(new_host->notification_period);
- free(new_host->address);
-+ /* begin modification to define sec. ipaddress */
-+ free(new_host->secondary_address);
-+ /* end of modifications */
- free(new_host->alias);
- free(new_host->name);
- free(new_host);
-@@ -1424,6 +1502,9 @@
- if(new_host->notification_period!=NULL)
- free(new_host->notification_period);
- free(new_host->address);
-+ /* begin modification to define sec. ipaddress */
-+ free(new_host->secondary_address);
-+ /* end of modifications */
- free(new_host->alias);
- free(new_host->name);
- free(new_host->plugin_output);
-@@ -1458,6 +1539,9 @@
- if(new_host->notification_period!=NULL)
- free(new_host->notification_period);
- free(new_host->address);
-+ /* begin modification to define sec. ipaddress */
-+ free(new_host->secondary_address);
-+ /* end of modifications */
- free(new_host->alias);
- free(new_host->name);
- free(new_host);
-@@ -1484,6 +1568,12 @@
- printf("\tHost Name: %s\n",new_host->name);
- printf("\tHost Alias: %s\n",new_host->alias);
- printf("\tHost Address: %s\n",new_host->address);
-+ /* begin modification to define sec. ipaddress */
-+ printf("\tSecondary Address:
%s\n",new_host->secondary_address);
-+ /* end of modifications */
-+ /* patch define SNMP Community */
-+ printf("\tSNMP Community: %s\n",new_host->community);
-+ /* END */
- printf("\tHost Check Command:
%s\n",new_host->host_check_command);
- printf("\tMax. Check Attempts: %d\n",new_host->max_attempts);
- printf("\tHost Event Handler:
%s\n",(new_host->event_handler==NULL)?"N/A":new_host->event_handler);
-diff -u -a -b -B -r nagios-2.0/include/nagios.h.in
nagios-2.0-both/include/nagios.h.in
---- nagios-2.0/include/nagios.h.in 2006-01-04 10:39:57.000000000 -0600
-+++ nagios-2.0-both/include/nagios.h.in 2006-02-27 12:20:47.000000000
-0600
-@@ -49,7 +49,7 @@
-
- #define MACRO_ENV_VAR_PREFIX "NAGIOS_"
-
--#define MACRO_X_COUNT 99 /* size of macro_x[]
array */
-+#define MACRO_X_COUNT 101 /* size of macro_x[]
array */
-
- #define MACRO_HOSTNAME 0
- #define MACRO_HOSTALIAS 1
-@@ -150,6 +150,11 @@
- #define MACRO_PROCESSSTARTTIME 96
- #define MACRO_HOSTCHECKTYPE 97
- #define MACRO_SERVICECHECKTYPE 98
-+#define MACRO_SECONDARYHOSTADDRESS 99
-+/* patch define SNMP Community */
-+#define MACRO_SNMPCOMMUNITY 100
-+/* END */
-+
-
-
-
-Only in nagios-2.0-both/include: nagios.h.in~
-diff -u -a -b -B -r nagios-2.0/include/objects.h
nagios-2.0-both/include/objects.h
---- nagios-2.0/include/objects.h 2005-12-27 12:55:10.000000000 -0600
-+++ nagios-2.0-both/include/objects.h 2006-02-27 10:03:10.000000000 -0600
-@@ -129,6 +129,9 @@
- char *name;
- char *alias;
- char *address;
-+ /* begin modification to define sec. ipaddress */
-+ char *secondary_address;
-+ /* end of modification */
- hostsmember *parent_hosts;
- char *host_check_command;
- int check_interval;
-@@ -159,6 +162,9 @@
- int failure_prediction_enabled;
- char *failure_prediction_options;
- int obsess_over_host;
-+ /* patch define SNMP Community */
-+ char *community;
-+ /* END */
- #ifdef NSCORE
- int problem_has_been_acknowledged;
- int acknowledgement_type;
-@@ -532,7 +538,12 @@
- contact *add_contact(char *,char *,char *,char *,char **,char *,char
*,int,int,int,int,int,int,int,int,int); /* adds a contact definition */
- commandsmember *add_service_notification_command_to_contact(contact *,char
*); /* adds a service notification command to
a contact definition */
- commandsmember *add_host_notification_command_to_contact(contact *,char *);
/* adds a host notification command to a contact
definition */
--host *add_host(char *,char *,char *,char *,int,int,int,int,int,int,int,char
*,int,char *,int,int,char *,int,int,double,double,int,int,int,int,int,char
*,int,int,int,int,int); /* adds a host definition */
-+/* begin modification to define sec. ipaddress */
-+/* added char * for method declaration */
-+/* begin modification to define snmp community */
-+/* added char * for method declaration */
-+host *add_host(char *,char *,char *,char *,char
*,int,int,int,int,int,int,int,char *,int,char *,int,int,char
*,int,int,double,double,int,int,int,int,int,char *,int,int,int,int,int,char
*); /* adds a host definition */
-+/* end of modification */
- hostsmember *add_parent_host_to_host(host *,char *);
/* adds a parent host to a host definition */
- contactgroupsmember *add_contactgroup_to_host(host *,char *);
/* adds a contactgroup to a host definition */
- timeperiod *add_timeperiod(char *,char *);
/* adds a timeperiod definition */
-diff -u -a -b -B -r nagios-2.0/xdata/xodtemplate.c
nagios-2.0-both/xdata/xodtemplate.c
---- nagios-2.0/xdata/xodtemplate.c 2006-01-12 10:13:08.000000000 -0600
-+++ nagios-2.0-both/xdata/xodtemplate.c 2006-02-27 10:00:58.000000000
-0600
-@@ -1207,6 +1207,9 @@
- new_host->host_name=NULL;
- new_host->alias=NULL;
- new_host->address=NULL;
-+ /* begin modification to define sec. ipaddress */
-+ new_host->secondary_address=NULL;
-+ /* end of modification */
- new_host->parents=NULL;
- new_host->hostgroups=NULL;
- new_host->check_command=NULL;
-@@ -1263,6 +1266,9 @@
- new_host->register_object=TRUE;
- new_host->_config_file=config_file;
- new_host->_start_line=start_line;
-+ /* patch define SNMP Community */
-+ new_host->community=NULL;
-+ /* END */
-
- /* add new host to head of list in memory */
- new_host->next=xodtemplate_host_list;
-@@ -2658,6 +2664,17 @@
- return ERROR;
- }
- }
-+ /* begin modification to define sec. ipaddress */
-+ else if(!strcmp(variable,"secondary_address")){
-+ temp_host->secondary_address=strdup(value);
-+ if(temp_host->secondary_address==NULL){
-+#ifdef DEBUG1
-+ printf("Error: Could not allocate memory
for host secondary address.\n");
-+#endif
-+ return ERROR;
-+ }
-+ }
-+ /* end of modification */
- else if(!strcmp(variable,"parents")){
- temp_host->parents=strdup(value);
- if(temp_host->parents==NULL){
-@@ -2851,7 +2868,17 @@
- }
- else if(!strcmp(variable,"register"))
- temp_host->register_object=(atoi(value)>0)?TRUE:FALSE;
-- else{
-+ /* patch define SNMP Community */
-+ else if(!strcmp(variable,"community")){
-+ temp_host->community=strdup(value);
-+ if(temp_host->community==NULL){
-+#ifdef DEBUG1
-+ printf("Error: Could not allocate memory for
community name.\n");
-+#endif
-+ return ERROR;
-+ }
-+ } else{
-+ /* END */
- #ifdef NSCORE
- snprintf(temp_buffer,sizeof(temp_buffer)-1,"Error:
Invalid host object directive '%s'.\n",variable);
- temp_buffer[sizeof(temp_buffer)-1]='\x0';
-@@ -5969,6 +5996,10 @@
- this_host->alias=strdup(template_host->alias);
- if(this_host->address==NULL && template_host->address!=NULL)
- this_host->address=strdup(template_host->address);
-+ /* begin modification to define sec. ipaddress */
-+ if(this_host->secondary_address==NULL &&
template_host->secondary_address!=NULL)
-+
this_host->secondary_address=strdup(template_host->secondary_address);
-+ /* end of modification */
- if(this_host->parents==NULL && template_host->parents!=NULL)
- this_host->parents=strdup(template_host->parents);
- if(this_host->hostgroups==NULL && template_host->hostgroups!=NULL)
-@@ -6066,6 +6097,10 @@
-
this_host->retain_nonstatus_information=template_host->retain_nonstatus_information;
- this_host->have_retain_nonstatus_information=TRUE;
- }
-+ /* patch define SNMP Community */
-+ if(this_host->community==NULL && template_host->community!=NULL)
-+ this_host->community=strdup(template_host->community);
-+ /* END */
-
- #ifdef DEBUG0
- printf("xodtemplate_resolve_host() end\n");
-@@ -8038,8 +8073,12 @@
- if(this_host->address==NULL && this_host->host_name!=NULL)
- this_host->address=strdup(this_host->host_name);
-
-+ /* begin modification to define sec. ipaddress */
-+ /* added
(this_host->secondary_address==NULL)?this_host->address:this_host->secondary_address,
*/
-+ /* added this_host->community */
- /* add the host definition */
--
new_host=add_host(this_host->host_name,this_host->alias,(this_host->address==NULL)?this_host->host_name:this_host->address,this_host->check_period,this_host->check_interval,this_host->max_check_attempts,this_host->notify_on_recovery,this_host->notify_on_down,this_host->notify_on_unreachable,this_host->notify_on_flapping,this_host->notification_interval,this_host->notification_period,this_host->notifications_enabled,this_host->check_command,this_host->active_checks_enabled,this_host->passive_checks_enabled,this_host->event_handler,this_host->event_handler_enabled,this_host->flap_detection_enabled,this_host->low_flap_threshold,this_host->high_flap_threshold,this_host->stalk_on_up,this_host->stalk_on_down,this_host->stalk_on_unreachable,this_host->process_perf_data,this_host->failure_prediction_enabled,this_host->failure_prediction_options,this_host->check_freshness,this_host->freshness_threshold,this_host->retain_status_information,this_host->retain_nonstatus_information,this_host->obsess_over_host);
-+
new_host=add_host(this_host->host_name,this_host->alias,(this_host->address==NULL)?this_host->host_name:this_host->address,(this_host->secondary_address==NULL)?this_host->address:this_host->secondary_address,this_host->check_period,this_host->check_interval,this_host->max_check_attempts,this_host->notify_on_recovery,this_host->notify_on_down,this_host->notify_on_unreachable,this_host->notify_on_flapping,this_host->notification_interval,this_host->notification_period,this_host->notifications_enabled,this_host->check_command,this_host->active_checks_enabled,this_host->passive_checks_enabled,this_host->event_handler,this_host->event_handler_enabled,this_host->flap_detection_enabled,this_host->low_flap_threshold,this_host->high_flap_threshold,this_host->stalk_on_up,this_host->stalk_on_down,this_host->stalk_on_unreachable,this_host->process_perf_data,this_host->failure_prediction_enabled,this_host->failure_prediction_options,this_host->check_freshness,this_host->freshness_threshold,this_host->retain_status_information,this_host->retain_nonstatus_information,this_host->obsess_over_host,this_host->community);
-+ /* end of modification */
-
- #ifdef TEST_DEBUG
- printf("HOST: %s, MAXATTEMPTS: %d, NOTINVERVAL: %d
\n",this_host->host_name,this_host->max_check_attempts,this_host->notification_interval);
-@@ -9447,6 +9486,10 @@
- fprintf(fp,"\talias\t%s\n",temp_host->alias);
- if(temp_host->address)
- fprintf(fp,"\taddress\t%s\n",temp_host->address);
-+ /* begin modification to define sec. ipaddress */
-+ if(temp_host->secondary_address)
-+
fprintf(fp,"\tsecondary_address\t%s\n",temp_host->secondary_address);
-+ /* end of modification */
- if(temp_host->parents)
- fprintf(fp,"\tparents\t%s\n",temp_host->parents);
- if(temp_host->check_period)
-@@ -9466,6 +9509,10 @@
-
fprintf(fp,"\tactive_checks_enabled\t%d\n",temp_host->active_checks_enabled);
-
fprintf(fp,"\tpassive_checks_enabled\t%d\n",temp_host->passive_checks_enabled);
-
fprintf(fp,"\tobsess_over_host\t%d\n",temp_host->obsess_over_host);
-+ /* patch define SNMP Community */
-+ if (temp_host->community)
-+ fprintf(fp,"\tcommunity\t%s\n",temp_host->community);
-+ /* END */
-
fprintf(fp,"\tevent_handler_enabled\t%d\n",temp_host->event_handler_enabled);
-
fprintf(fp,"\tlow_flap_threshold\t%f\n",temp_host->low_flap_threshold);
-
fprintf(fp,"\thigh_flap_threshold\t%f\n",temp_host->high_flap_threshold);
-@@ -9958,6 +10005,9 @@
- free(this_host->host_name);
- free(this_host->alias);
- free(this_host->address);
-+ /* begin modification to define sec. ipaddress */
-+ free(this_host->secondary_address);
-+ /* end of modification */
- free(this_host->parents);
- free(this_host->hostgroups);
- free(this_host->check_command);
-@@ -9966,6 +10016,9 @@
- free(this_host->contact_groups);
- free(this_host->notification_period);
- free(this_host->failure_prediction_options);
-+ /* patch define SNMP Community */
-+ free(this_host->community);
-+ /* END */
- free(this_host);
- }
- xodtemplate_host_list=NULL;
-diff -u -a -b -B -r nagios-2.0/xdata/xodtemplate.h
nagios-2.0-both/xdata/xodtemplate.h
---- nagios-2.0/xdata/xodtemplate.h 2005-11-16 02:49:35.000000000 -0600
-+++ nagios-2.0-both/xdata/xodtemplate.h 2006-02-27 09:39:51.000000000
-0600
-@@ -151,6 +151,9 @@
- char *host_name;
- char *alias;
- char *address;
-+ /* begin modification to define sec. ipaddress */
-+ char *secondary_address;
-+ /* end of modification */
- char *parents;
- char *hostgroups;
- char *check_command;
-@@ -160,6 +163,7 @@
- int active_checks_enabled;
- int passive_checks_enabled;
- int obsess_over_host;
-+ char *community;
- char *event_handler;
- int event_handler_enabled;
- int check_freshness;
diff --git a/net/nagios/nagios-2.0-ipaddress.patch
b/net/nagios/nagios-2.0-ipaddress.patch
deleted file mode 100644
index 21ffb93..0000000
--- a/net/nagios/nagios-2.0-ipaddress.patch
+++ /dev/null
@@ -1,360 +0,0 @@
-diff -u -a -b -B -r nagios-2.0/base/utils.c nagios-2.0-ipaddress/base/utils.c
---- nagios-2.0/base/utils.c 2006-01-04 10:39:57.000000000 -0600
-+++ nagios-2.0-ipaddress/base/utils.c 2006-02-27 09:28:57.000000000 -0600
-@@ -733,6 +733,13 @@
- free(macro_x[MACRO_HOSTADDRESS]);
- macro_x[MACRO_HOSTADDRESS]=strdup(hst->address);
-
-+ /* begin modification to define sec. ipaddress */
-+ /* get the host secondary address */
-+ if(macro_x[MACRO_SECONDARYHOSTADDRESS]!=NULL)
-+ free(macro_x[MACRO_SECONDARYHOSTADDRESS]);
-+ macro_x[MACRO_SECONDARYHOSTADDRESS]=strdup(hst->secondary_address);
-+ /* end of modification */
-+
- /* get the host state */
- if(macro_x[MACRO_HOSTSTATE]!=NULL)
- free(macro_x[MACRO_HOSTSTATE]);
-@@ -1221,6 +1228,11 @@
- else if(!strcmp(macro,"HOSTADDRESS"))
- macro_ondemand=strdup(hst->address);
-
-+ /* begin modification to define sec. ipaddress */
-+ else if(!strcmp(macro,"SECONDARYHOSTADDRESS"))
-+
macro_ondemand=strdup(hst->secondary_address);
-+ /* end of modification */
-+
- /* get the host state */
- else if(!strcmp(macro,"HOSTSTATE")){
- macro_ondemand=(char *)malloc(MAX_STATE_LENGTH);
-@@ -2293,6 +2305,9 @@
- add_macrox_name(MACRO_HOSTNAME,"HOSTNAME");
- add_macrox_name(MACRO_HOSTALIAS,"HOSTALIAS");
- add_macrox_name(MACRO_HOSTADDRESS,"HOSTADDRESS");
-+ /* begin modification to define sec. ipaddress */
-+ add_macrox_name(MACRO_SECONDARYHOSTADDRESS,"SECONDARYHOSTADDRESS");
-+ /* end of modifications */
- add_macrox_name(MACRO_SERVICEDESC,"SERVICEDESC");
- add_macrox_name(MACRO_SERVICESTATE,"SERVICESTATE");
- add_macrox_name(MACRO_SERVICESTATEID,"SERVICESTATEID");
-diff -u -a -b -B -r nagios-2.0/cgi/config.c nagios-2.0-ipaddress/cgi/config.c
---- nagios-2.0/cgi/config.c 2005-11-16 02:49:35.000000000 -0600
-+++ nagios-2.0-ipaddress/cgi/config.c 2006-02-27 09:28:57.000000000 -0600
-@@ -447,6 +447,9 @@
- printf("<TH CLASS='data'>Host Name</TH>");
- printf("<TH CLASS='data'>Alias/Description</TH>");
- printf("<TH CLASS='data'>Address</TH>");
-+ /* begin modification to define sec. ipaddress */
-+ printf("<TH CLASS='data'>secondary Address</TH>");
-+ /* end of modification */
- printf("<TH CLASS='data'>Parent Hosts</TH>");
- printf("<TH CLASS='data'>Max. Check Attempts</TH>");
- printf("<TH CLASS='data'>Check Interval</TH>\n");
-@@ -488,7 +491,10 @@
-
- printf("<TD CLASS='%s'><a
name='%s'>%s</a></TD>\n",bg_class,url_encode(temp_host->name),temp_host->name);
- printf("<TD CLASS='%s'>%s</TD>\n",bg_class,temp_host->alias);
-+ /* begin modification to define sec. ipaddress */
- printf("<TD
CLASS='%s'>%s</TD>\n",bg_class,temp_host->address);
-+ printf("<TD
CLASS='%s'>%s</TD>\n",bg_class,temp_host->secondary_address);
-+ /* end of modification */
-
- printf("<TD CLASS='%s'>",bg_class);
-
for(temp_hostsmember=temp_host->parent_hosts;temp_hostsmember!=NULL;temp_hostsmember=temp_hostsmember->next){
-diff -u -a -b -B -r nagios-2.0/cgi/extinfo.c
nagios-2.0-ipaddress/cgi/extinfo.c
---- nagios-2.0/cgi/extinfo.c 2006-01-20 11:34:53.000000000 -0600
-+++ nagios-2.0-ipaddress/cgi/extinfo.c 2006-02-27 09:28:57.000000000 -0600
-@@ -319,7 +319,10 @@
- if(found==FALSE)
- printf("No hostgroups");
- printf("</DIV><BR>\n");
-- printf("<DIV
CLASS='data'>%s</DIV>\n",temp_host->address);
-+ /* begin modification to define sec.
ipaddress */
-+ printf("<DIV
CLASS='data'><b>primary:</b>%s</DIV>\n",temp_host->address);
-+ printf("<DIV
CLASS='data'><b>secondary:</b>%s</DIV>\n",temp_host->secondary_address);
-+ /* end of modification */
- }
- if(display_type==DISPLAY_SERVICE_INFO){
- printf("<DIV CLASS='data'>Service</DIV><DIV
CLASS='dataTitle'>%s</DIV><DIV CLASS='data'>On Host</DIV>\n",service_desc);
-diff -u -a -b -B -r nagios-2.0/common/objects.c
nagios-2.0-ipaddress/common/objects.c
---- nagios-2.0/common/objects.c 2005-12-27 12:55:10.000000000 -0600
-+++ nagios-2.0-ipaddress/common/objects.c 2006-02-27 09:28:57.000000000
-0600
-@@ -924,11 +924,13 @@
- return new_timerange;
- }
-
--
-+/* begin modification to define sec. ipaddress */
-+/* added char *secondary_address
- /* add a new host definition */
--host *add_host(char *name, char *alias, char *address, char *check_period,
int check_interval, int max_attempts, int notify_up, int notify_down, int
notify_unreachable, int notify_flapping, int notification_interval, char
*notification_period, int notifications_enabled, char *check_command, int
checks_enabled, int accept_passive_checks, char *event_handler, int
event_handler_enabled, int flap_detection_enabled, double low_flap_threshold,
double high_flap_threshold, int stalk_up, int stalk_down, int
stalk_unreachable, int process_perfdata, int failure_prediction_enabled, char
*failure_prediction_options, int check_freshness, int freshness_threshold,
int retain_status_information, int retain_nonstatus_information, int
obsess_over_host){
-+host *add_host(char *name, char *alias, char *address, char
*secondary_address, char *check_period, int check_interval, int max_attempts,
int notify_up, int notify_down, int notify_unreachable, int notify_flapping,
int notification_interval, char *notification_period, int
notifications_enabled, char *check_command, int checks_enabled, int
accept_passive_checks, char *event_handler, int event_handler_enabled, int
flap_detection_enabled, double low_flap_threshold, double
high_flap_threshold, int stalk_up, int stalk_down, int stalk_unreachable, int
process_perfdata, int failure_prediction_enabled, char
*failure_prediction_options, int check_freshness, int freshness_threshold,
int retain_status_information, int retain_nonstatus_information, int
obsess_over_host){
- host *temp_host;
- host *new_host;
-+/* end of modification */
- #ifdef NSCORE
- char temp_buffer[MAX_INPUT_BUFFER];
- int x;
-@@ -951,6 +953,9 @@
- strip(name);
- strip(alias);
- strip(address);
-+ /* begin modification to define sec. ipaddress */
-+ strip(secondary_address);
-+ /* end of modification */
- strip(check_command);
- strip(event_handler);
- strip(notification_period);
-@@ -1209,6 +1214,27 @@
- free(new_host);
- return NULL;
- }
-+
-+ /* begin modification to define sec. ipaddress */
-+ if (secondary_address==NULL) {
-+ new_host->secondary_address=NULL;
-+ } else {
-+ new_host->secondary_address=strdup(secondary_address);
-+ if (new_host->secondary_address==NULL) {
-+#ifdef NSCORE
-+ snprintf(temp_buffer,sizeof(temp_buffer)-1,"Error:
Could not allocate memory for host '%s' secondary_address\n",name);
-+ temp_buffer[sizeof(temp_buffer)-1]='\x0';
-+
write_to_logs_and_console(temp_buffer,NSLOG_CONFIG_ERROR,TRUE);
-+#endif
-+ free(new_host->alias);
-+ free(new_host->address);
-+ free(new_host->name);
-+ free(new_host);
-+ return NULL;
-+ }
-+ }
-+ /* end of modification */
-+
- if(check_period!=NULL && strcmp(check_period,"")){
- new_host->check_period=strdup(check_period);
- if(new_host->check_period==NULL){
-@@ -1218,6 +1244,9 @@
-
write_to_logs_and_console(temp_buffer,NSLOG_CONFIG_ERROR,TRUE);
- #endif
- free(new_host->address);
-+ /* begin modification to define sec. ipaddress */
-+ free(new_host->secondary_address);
-+ /* end of modifications */
- free(new_host->alias);
- free(new_host->name);
- free(new_host);
-@@ -1236,6 +1265,9 @@
- #endif
- free(new_host->check_period);
- free(new_host->address);
-+ /* begin modification to define sec. ipaddress */
-+ free(new_host->secondary_address);
-+ /* end of modifications */
- free(new_host->alias);
- free(new_host->name);
- free(new_host);
-@@ -1256,6 +1288,9 @@
- free(new_host->notification_period);
- free(new_host->check_period);
- free(new_host->address);
-+ /* begin modification to define sec. ipaddress */
-+ free(new_host->secondary_address);
-+ /* end of modifications */
- free(new_host->alias);
- free(new_host->name);
- free(new_host);
-@@ -1278,6 +1313,9 @@
- free(new_host->notification_period);
- free(new_host->check_period);
- free(new_host->address);
-+ /* begin modification to define sec. ipaddress */
-+ free(new_host->secondary_address);
-+ /* end of modifications */
- free(new_host->alias);
- free(new_host->name);
- free(new_host);
-@@ -1302,6 +1340,9 @@
- free(new_host->notification_period);
- free(new_host->check_period);
- free(new_host->address);
-+ /* begin modification to define sec. ipaddress */
-+ free(new_host->secondary_address);
-+ /* end of modifications */
- free(new_host->alias);
- free(new_host->name);
- free(new_host);
-@@ -1400,6 +1441,9 @@
- if(new_host->notification_period!=NULL)
- free(new_host->notification_period);
- free(new_host->address);
-+ /* begin modification to define sec. ipaddress */
-+ free(new_host->secondary_address);
-+ /* end of modifications */
- free(new_host->alias);
- free(new_host->name);
- free(new_host);
-@@ -1424,6 +1468,9 @@
- if(new_host->notification_period!=NULL)
- free(new_host->notification_period);
- free(new_host->address);
-+ /* begin modification to define sec. ipaddress */
-+ free(new_host->secondary_address);
-+ /* end of modifications */
- free(new_host->alias);
- free(new_host->name);
- free(new_host->plugin_output);
-@@ -1458,6 +1505,9 @@
- if(new_host->notification_period!=NULL)
- free(new_host->notification_period);
- free(new_host->address);
-+ /* begin modification to define sec. ipaddress */
-+ free(new_host->secondary_address);
-+ /* end of modifications */
- free(new_host->alias);
- free(new_host->name);
- free(new_host);
-@@ -1484,6 +1534,9 @@
- printf("\tHost Name: %s\n",new_host->name);
- printf("\tHost Alias: %s\n",new_host->alias);
- printf("\tHost Address: %s\n",new_host->address);
-+ /* begin modification to define sec. ipaddress */
-+ printf("\tSecondary Address:
%s\n",new_host->secondary_address);
-+ /* end of modifications */
- printf("\tHost Check Command:
%s\n",new_host->host_check_command);
- printf("\tMax. Check Attempts: %d\n",new_host->max_attempts);
- printf("\tHost Event Handler:
%s\n",(new_host->event_handler==NULL)?"N/A":new_host->event_handler);
-diff -u -a -b -B -r nagios-2.0/include/nagios.h.in
nagios-2.0-ipaddress/include/nagios.h.in
---- nagios-2.0/include/nagios.h.in 2006-01-04 10:39:57.000000000 -0600
-+++ nagios-2.0-ipaddress/include/nagios.h.in 2006-02-27 09:28:57.000000000
-0600
-@@ -49,7 +49,7 @@
-
- #define MACRO_ENV_VAR_PREFIX "NAGIOS_"
-
--#define MACRO_X_COUNT 99 /* size of macro_x[]
array */
-+#define MACRO_X_COUNT 100 /* size of macro_x[]
array */
-
- #define MACRO_HOSTNAME 0
- #define MACRO_HOSTALIAS 1
-@@ -150,6 +150,7 @@
- #define MACRO_PROCESSSTARTTIME 96
- #define MACRO_HOSTCHECKTYPE 97
- #define MACRO_SERVICECHECKTYPE 98
-+#define MACRO_SECONDARYHOSTADDRESS 99
-
-
-
-diff -u -a -b -B -r nagios-2.0/include/objects.h
nagios-2.0-ipaddress/include/objects.h
---- nagios-2.0/include/objects.h 2005-12-27 12:55:10.000000000 -0600
-+++ nagios-2.0-ipaddress/include/objects.h 2006-02-27 09:28:57.000000000
-0600
-@@ -129,6 +129,9 @@
- char *name;
- char *alias;
- char *address;
-+ /* begin modification to define sec. ipaddress */
-+ char *secondary_address;
-+ /* end of modification */
- hostsmember *parent_hosts;
- char *host_check_command;
- int check_interval;
-@@ -532,7 +535,10 @@
- contact *add_contact(char *,char *,char *,char *,char **,char *,char
*,int,int,int,int,int,int,int,int,int); /* adds a contact definition */
- commandsmember *add_service_notification_command_to_contact(contact *,char
*); /* adds a service notification command to
a contact definition */
- commandsmember *add_host_notification_command_to_contact(contact *,char *);
/* adds a host notification command to a contact
definition */
--host *add_host(char *,char *,char *,char *,int,int,int,int,int,int,int,char
*,int,char *,int,int,char *,int,int,double,double,int,int,int,int,int,char
*,int,int,int,int,int); /* adds a host definition */
-+/* begin modification to define sec. ipaddress */
-+/* added char * for method declaration */
-+host *add_host(char *,char *,char *,char *,char
*,int,int,int,int,int,int,int,char *,int,char *,int,int,char
*,int,int,double,double,int,int,int,int,int,char *,int,int,int,int,int); /*
adds a host definition */
-+/* end of modification */
- hostsmember *add_parent_host_to_host(host *,char *);
/* adds a parent host to a host definition */
- contactgroupsmember *add_contactgroup_to_host(host *,char *);
/* adds a contactgroup to a host definition */
- timeperiod *add_timeperiod(char *,char *);
/* adds a timeperiod definition */
-diff -u -a -b -B -r nagios-2.0/xdata/xodtemplate.c
nagios-2.0-ipaddress/xdata/xodtemplate.c
---- nagios-2.0/xdata/xodtemplate.c 2006-01-12 10:13:08.000000000 -0600
-+++ nagios-2.0-ipaddress/xdata/xodtemplate.c 2006-02-27 09:28:57.000000000
-0600
-@@ -1207,6 +1207,9 @@
- new_host->host_name=NULL;
- new_host->alias=NULL;
- new_host->address=NULL;
-+ /* begin modification to define sec. ipaddress */
-+ new_host->secondary_address=NULL;
-+ /* end of modification */
- new_host->parents=NULL;
- new_host->hostgroups=NULL;
- new_host->check_command=NULL;
-@@ -2658,6 +2661,17 @@
- return ERROR;
- }
- }
-+ /* begin modification to define sec. ipaddress */
-+ else if(!strcmp(variable,"secondary_address")){
-+ temp_host->secondary_address=strdup(value);
-+ if(temp_host->secondary_address==NULL){
-+#ifdef DEBUG1
-+ printf("Error: Could not allocate memory
for host secondary address.\n");
-+#endif
-+ return ERROR;
-+ }
-+ }
-+ /* end of modification */
- else if(!strcmp(variable,"parents")){
- temp_host->parents=strdup(value);
- if(temp_host->parents==NULL){
-@@ -5969,6 +5983,10 @@
- this_host->alias=strdup(template_host->alias);
- if(this_host->address==NULL && template_host->address!=NULL)
- this_host->address=strdup(template_host->address);
-+ /* begin modification to define sec. ipaddress */
-+ if(this_host->secondary_address==NULL &&
template_host->secondary_address!=NULL)
-+
this_host->secondary_address=strdup(template_host->secondary_address);
-+ /* end of modification */
- if(this_host->parents==NULL && template_host->parents!=NULL)
- this_host->parents=strdup(template_host->parents);
- if(this_host->hostgroups==NULL && template_host->hostgroups!=NULL)
-@@ -8038,8 +8056,11 @@
- if(this_host->address==NULL && this_host->host_name!=NULL)
- this_host->address=strdup(this_host->host_name);
-
-+ /* begin modification to define sec. ipaddress */
-+ /* added
(this_host->secondary_address==NULL)?this_host->address:this_host->secondary_address,
*/
- /* add the host definition */
--
new_host=add_host(this_host->host_name,this_host->alias,(this_host->address==NULL)?this_host->host_name:this_host->address,this_host->check_period,this_host->check_interval,this_host->max_check_attempts,this_host->notify_on_recovery,this_host->notify_on_down,this_host->notify_on_unreachable,this_host->notify_on_flapping,this_host->notification_interval,this_host->notification_period,this_host->notifications_enabled,this_host->check_command,this_host->active_checks_enabled,this_host->passive_checks_enabled,this_host->event_handler,this_host->event_handler_enabled,this_host->flap_detection_enabled,this_host->low_flap_threshold,this_host->high_flap_threshold,this_host->stalk_on_up,this_host->stalk_on_down,this_host->stalk_on_unreachable,this_host->process_perf_data,this_host->failure_prediction_enabled,this_host->failure_prediction_options,this_host->check_freshness,this_host->freshness_threshold,this_host->retain_status_information,this_host->retain_nonstatus_information,this_host->obsess_over_host);
-+
new_host=add_host(this_host->host_name,this_host->alias,(this_host->address==NULL)?this_host->host_name:this_host->address,(this_host->secondary_address==NULL)?this_host->address:this_host->secondary_address,this_host->check_period,this_host->check_interval,this_host->max_check_attempts,this_host->notify_on_recovery,this_host->notify_on_down,this_host->notify_on_unreachable,this_host->notify_on_flapping,this_host->notification_interval,this_host->notification_period,this_host->notifications_enabled,this_host->check_command,this_host->active_checks_enabled,this_host->passive_checks_enabled,this_host->event_handler,this_host->event_handler_enabled,this_host->flap_detection_enabled,this_host->low_flap_threshold,this_host->high_flap_threshold,this_host->stalk_on_up,this_host->stalk_on_down,this_host->stalk_on_unreachable,this_host->process_perf_data,this_host->failure_prediction_enabled,this_host->failure_prediction_options,this_host->check_freshness,this_host->freshness_threshold,this_host->retain_status_information,this_host->retain_nonstatus_information,this_host->obsess_over_host);
-+ /* end of modification */
-
- #ifdef TEST_DEBUG
- printf("HOST: %s, MAXATTEMPTS: %d, NOTINVERVAL: %d
\n",this_host->host_name,this_host->max_check_attempts,this_host->notification_interval);
-@@ -9447,6 +9468,10 @@
- fprintf(fp,"\talias\t%s\n",temp_host->alias);
- if(temp_host->address)
- fprintf(fp,"\taddress\t%s\n",temp_host->address);
-+ /* begin modification to define sec. ipaddress */
-+ if(temp_host->secondary_address)
-+
fprintf(fp,"\tsecondary_address\t%s\n",temp_host->secondary_address);
-+ /* end of modification */
- if(temp_host->parents)
- fprintf(fp,"\tparents\t%s\n",temp_host->parents);
- if(temp_host->check_period)
-@@ -9958,6 +9983,9 @@
- free(this_host->host_name);
- free(this_host->alias);
- free(this_host->address);
-+ /* begin modification to define sec. ipaddress */
-+ free(this_host->secondary_address);
-+ /* end of modification */
- free(this_host->parents);
- free(this_host->hostgroups);
- free(this_host->check_command);
-Only in nagios-2.0-ipaddress/xdata: xodtemplate.c~
-diff -u -a -b -B -r nagios-2.0/xdata/xodtemplate.h
nagios-2.0-ipaddress/xdata/xodtemplate.h
---- nagios-2.0/xdata/xodtemplate.h 2005-11-16 02:49:35.000000000 -0600
-+++ nagios-2.0-ipaddress/xdata/xodtemplate.h 2006-02-27 09:28:57.000000000
-0600
-@@ -151,6 +151,9 @@
- char *host_name;
- char *alias;
- char *address;
-+ /* begin modification to define sec. ipaddress */
-+ char *secondary_address;
-+ /* end of modification */
- char *parents;
- char *hostgroups;
- char *check_command;
diff --git a/net/nagios/nagios-2.0-snmpcommunity.patch
b/net/nagios/nagios-2.0-snmpcommunity.patch
deleted file mode 100644
index 00c1d5e..0000000
--- a/net/nagios/nagios-2.0-snmpcommunity.patch
+++ /dev/null
@@ -1,287 +0,0 @@
-diff -u -a -b -B -r nagios-2.0/base/config.c
nagios-2.0-snmpcommunity/base/config.c
---- nagios-2.0/base/config.c 2005-12-26 17:18:14.000000000 -0600
-+++ nagios-2.0-snmpcommunity/base/config.c 2006-02-27 09:29:22.000000000
-0600
-@@ -1845,6 +1845,13 @@
-
- found=FALSE;
-
-+ if (temp_host->community==NULL) {
-+ snprintf(temp_buffer,sizeof(temp_buffer),"Warning:
Host '%s' has no community defined!",temp_host->name);
-+ temp_buffer[sizeof(temp_buffer)-1]='\x0';
-+
write_to_logs_and_console(temp_buffer,NSLOG_VERIFICATION_WARNING,TRUE);
-+ warnings++;
-+ }
-+
- #ifdef REMOVED_061303
- /* make sure each host is a member of at least one hostgroup
*/
-
for(temp_hostgroup=hostgroup_list;temp_hostgroup!=NULL;temp_hostgroup=temp_hostgroup->next){
-diff -u -a -b -B -r nagios-2.0/base/utils.c
nagios-2.0-snmpcommunity/base/utils.c
---- nagios-2.0/base/utils.c 2006-01-04 10:39:57.000000000 -0600
-+++ nagios-2.0-snmpcommunity/base/utils.c 2006-02-27 09:29:22.000000000
-0600
-@@ -931,6 +931,14 @@
- if(temp_hostgroup!=NULL)
- macro_x[MACRO_HOSTGROUPALIAS]=strdup(temp_hostgroup->alias);
-
-+ /* patch define SNMP Community */
-+ if(macro_x[MACRO_SNMPCOMMUNITY]!=NULL)
-+ free(macro_x[MACRO_SNMPCOMMUNITY]);
-+ macro_x[MACRO_SNMPCOMMUNITY]=NULL;
-+ if (strdup(hst->community)!=NULL)
-+ macro_x[MACRO_SNMPCOMMUNITY]=strdup(hst->community);
-+ /* end */
-+
- if((temp_hostextinfo=find_hostextinfo(hst->name))){
-
- /* get the action url */
-@@ -1266,7 +1274,10 @@
- strip(macro_ondemand);
- }
- }
--
-+ /* patch define SNMP Community */
-+ else if(!strcmp(macro,"SNMPCOMMUNITY"))
-+ macro_ondemand=strdup(hst->community);
-+ /* END */
- /* get the performance data */
- else if(!strcmp(macro,"HOSTPERFDATA")){
- if(hst->perf_data==NULL)
-@@ -2389,6 +2400,9 @@
- add_macrox_name(MACRO_PROCESSSTARTTIME,"PROCESSSTARTTIME");
- add_macrox_name(MACRO_HOSTCHECKTYPE,"HOSTCHECKTYPE");
- add_macrox_name(MACRO_SERVICECHECKTYPE,"SERVICECHECKTYPE");
-+ /* patch define SNMP Community */
-+ add_macrox_name(MACRO_SNMPCOMMUNITY,"SNMPCOMMUNITY");
-+ /* END */
-
- #ifdef DEBUG0
- printf("init_macrox_names() end\n");
-diff -u -a -b -B -r nagios-2.0/cgi/config.c
nagios-2.0-snmpcommunity/cgi/config.c
---- nagios-2.0/cgi/config.c 2005-11-16 02:49:35.000000000 -0600
-+++ nagios-2.0-snmpcommunity/cgi/config.c 2006-02-27 09:29:22.000000000
-0600
-@@ -451,6 +451,9 @@
- printf("<TH CLASS='data'>Max. Check Attempts</TH>");
- printf("<TH CLASS='data'>Check Interval</TH>\n");
- printf("<TH CLASS='data'>Host Check Command</TH>");
-+ /* patch define SNMP Community */
-+ printf("<TH CLASS='data'>SNMP Community</TH>");
-+ /* END */
- printf("<TH CLASS='data'>Obsess Over</TH>\n");
- printf("<TH CLASS='data'>Enable Active Checks</TH>\n");
- printf("<TH CLASS='data'>Enable Passive Checks</TH>\n");
-@@ -514,6 +517,10 @@
- printf("<a
href='%s?type=commands#%s'>%s</a></TD>\n",CONFIG_CGI,url_encode(temp_host->host_check_command),temp_host->host_check_command);
- printf("</TD>\n");
-
-+ /* patch define SNMP Community */
-+ printf("<TD
CLASS='%s'>%s&nbsp;</TD>\n",bg_class,temp_host->community);
-+ /* END */
-+
- printf("<TD
CLASS='%s'>%s</TD>\n",bg_class,(temp_host->obsess_over_host==TRUE)?"Yes":"No");
-
- printf("<TD
CLASS='%s'>%s</TD>\n",bg_class,(temp_host->checks_enabled==TRUE)?"Yes":"No");
-diff -u -a -b -B -r nagios-2.0/common/objects.c
nagios-2.0-snmpcommunity/common/objects.c
---- nagios-2.0/common/objects.c 2005-12-27 12:55:10.000000000 -0600
-+++ nagios-2.0-snmpcommunity/common/objects.c 2006-02-27 09:29:22.000000000
-0600
-@@ -926,9 +926,11 @@
-
-
- /* add a new host definition */
--host *add_host(char *name, char *alias, char *address, char *check_period,
int check_interval, int max_attempts, int notify_up, int notify_down, int
notify_unreachable, int notify_flapping, int notification_interval, char
*notification_period, int notifications_enabled, char *check_command, int
checks_enabled, int accept_passive_checks, char *event_handler, int
event_handler_enabled, int flap_detection_enabled, double low_flap_threshold,
double high_flap_threshold, int stalk_up, int stalk_down, int
stalk_unreachable, int process_perfdata, int failure_prediction_enabled, char
*failure_prediction_options, int check_freshness, int freshness_threshold,
int retain_status_information, int retain_nonstatus_information, int
obsess_over_host){
-+/* patch define SNMP Community */
-+host *add_host(char *name, char *alias, char *address, char *check_period,
int check_interval, int max_attempts, int notify_up, int notify_down, int
notify_unreachable, int notify_flapping, int notification_interval, char
*notification_period, int notifications_enabled, char *check_command, int
checks_enabled, int accept_passive_checks, char *event_handler, int
event_handler_enabled, int flap_detection_enabled, double low_flap_threshold,
double high_flap_threshold, int stalk_up, int stalk_down, int
stalk_unreachable, int process_perfdata, int failure_prediction_enabled, char
*failure_prediction_options, int check_freshness, int freshness_threshold,
int retain_status_information, int retain_nonstatus_information, int
obsess_over_host,char *community){
- host *temp_host;
- host *new_host;
-+/* END */
- #ifdef NSCORE
- char temp_buffer[MAX_INPUT_BUFFER];
- int x;
-@@ -954,6 +956,9 @@
- strip(check_command);
- strip(event_handler);
- strip(notification_period);
-+ /* patch define SNMP Community */
-+ strip(community);
-+ /* END */
-
- if(!strcmp(name,"") || !strcmp(alias,"") || !strcmp(address,"")){
- #ifdef NSCORE
-@@ -1311,6 +1316,35 @@
- else
- new_host->failure_prediction_options=NULL;
-
-+ /* patch define SNMP Community */
-+ if (community==NULL) {
-+ new_host->community=NULL;
-+ } else {
-+ new_host->community=strdup(community);
-+ if(new_host->community==NULL){
-+#ifdef NSCORE
-+ snprintf(temp_buffer,sizeof(temp_buffer)-1,"Error:
Could not allocate memory for host '%s' community\n",name);
-+ temp_buffer[sizeof(temp_buffer)-1]='\x0';
-+
write_to_logs_and_console(temp_buffer,NSLOG_CONFIG_ERROR,TRUE);
-+#endif
-+ if(new_host->event_handler!=NULL)
-+ free(new_host->event_handler);
-+ if(new_host->host_check_command!=NULL)
-+ free(new_host->host_check_command);
-+ if(new_host->notification_period!=NULL)
-+ free(new_host->notification_period);
-+ if (new_host->failure_prediction_options!=NULL)
-+ free(new_host->failure_prediction_options);
-+ free(new_host->check_period);
-+ free(new_host->address);
-+ free(new_host->alias);
-+ free(new_host->name);
-+ free(new_host);
-+ return NULL;
-+ }
-+ }
-+ /* END */
-+
-
- new_host->parent_hosts=NULL;
- new_host->max_attempts=max_attempts;
-@@ -1484,6 +1518,9 @@
- printf("\tHost Name: %s\n",new_host->name);
- printf("\tHost Alias: %s\n",new_host->alias);
- printf("\tHost Address: %s\n",new_host->address);
-+ /* patch define SNMP Community */
-+ printf("\tSNMP Community: %s\n",new_host->community);
-+ /* END */
- printf("\tHost Check Command:
%s\n",new_host->host_check_command);
- printf("\tMax. Check Attempts: %d\n",new_host->max_attempts);
- printf("\tHost Event Handler:
%s\n",(new_host->event_handler==NULL)?"N/A":new_host->event_handler);
-diff -u -a -b -B -r nagios-2.0/include/nagios.h.in
nagios-2.0-snmpcommunity/include/nagios.h.in
---- nagios-2.0/include/nagios.h.in 2006-01-04 10:39:57.000000000 -0600
-+++ nagios-2.0-snmpcommunity/include/nagios.h.in 2006-02-27
09:29:22.000000000 -0600
-@@ -49,7 +49,7 @@
-
- #define MACRO_ENV_VAR_PREFIX "NAGIOS_"
-
--#define MACRO_X_COUNT 99 /* size of macro_x[]
array */
-+#define MACRO_X_COUNT 100 /* size of macro_x[]
array */
-
- #define MACRO_HOSTNAME 0
- #define MACRO_HOSTALIAS 1
-@@ -150,6 +150,10 @@
- #define MACRO_PROCESSSTARTTIME 96
- #define MACRO_HOSTCHECKTYPE 97
- #define MACRO_SERVICECHECKTYPE 98
-+/* patch define SNMP Community */
-+#define MACRO_SNMPCOMMUNITY 99
-+/* END */
-+
-
-
-
-diff -u -a -b -B -r nagios-2.0/include/objects.h
nagios-2.0-snmpcommunity/include/objects.h
---- nagios-2.0/include/objects.h 2005-12-27 12:55:10.000000000 -0600
-+++ nagios-2.0-snmpcommunity/include/objects.h 2006-02-27 09:29:22.000000000
-0600
-@@ -159,6 +159,9 @@
- int failure_prediction_enabled;
- char *failure_prediction_options;
- int obsess_over_host;
-+ /* patch define SNMP Community */
-+ char *community;
-+ /* END */
- #ifdef NSCORE
- int problem_has_been_acknowledged;
- int acknowledgement_type;
-@@ -532,7 +535,9 @@
- contact *add_contact(char *,char *,char *,char *,char **,char *,char
*,int,int,int,int,int,int,int,int,int); /* adds a contact definition */
- commandsmember *add_service_notification_command_to_contact(contact *,char
*); /* adds a service notification command to
a contact definition */
- commandsmember *add_host_notification_command_to_contact(contact *,char *);
/* adds a host notification command to a contact
definition */
--host *add_host(char *,char *,char *,char *,int,int,int,int,int,int,int,char
*,int,char *,int,int,char *,int,int,double,double,int,int,int,int,int,char
*,int,int,int,int,int); /* adds a host definition */
-+/* patch define SNMP Community */
-+host *add_host(char *,char *,char *,char *,int,int,int,int,int,int,int,char
*,int,char *,int,int,char *,int,int,double,double,int,int,int,int,int,char
*,int,int,int,int,int,char *); /* adds a host definition */
-+/* END */
- hostsmember *add_parent_host_to_host(host *,char *);
/* adds a parent host to a host definition */
- contactgroupsmember *add_contactgroup_to_host(host *,char *);
/* adds a contactgroup to a host definition */
- timeperiod *add_timeperiod(char *,char *);
/* adds a timeperiod definition */
-diff -u -a -b -B -r nagios-2.0/xdata/xodtemplate.c
nagios-2.0-snmpcommunity/xdata/xodtemplate.c
---- nagios-2.0/xdata/xodtemplate.c 2006-01-12 10:13:08.000000000 -0600
-+++ nagios-2.0-snmpcommunity/xdata/xodtemplate.c 2006-02-27
09:29:22.000000000 -0600
-@@ -1263,6 +1263,9 @@
- new_host->register_object=TRUE;
- new_host->_config_file=config_file;
- new_host->_start_line=start_line;
-+ /* patch define SNMP Community */
-+ new_host->community=NULL;
-+ /* END */
-
- /* add new host to head of list in memory */
- new_host->next=xodtemplate_host_list;
-@@ -2851,7 +2854,17 @@
- }
- else if(!strcmp(variable,"register"))
- temp_host->register_object=(atoi(value)>0)?TRUE:FALSE;
-- else{
-+ /* patch define SNMP Community */
-+ else if(!strcmp(variable,"community")){
-+ temp_host->community=strdup(value);
-+ if(temp_host->community==NULL){
-+#ifdef DEBUG1
-+ printf("Error: Could not allocate memory for
community name.\n");
-+#endif
-+ return ERROR;
-+ }
-+ } else{
-+ /* END */
- #ifdef NSCORE
- snprintf(temp_buffer,sizeof(temp_buffer)-1,"Error:
Invalid host object directive '%s'.\n",variable);
- temp_buffer[sizeof(temp_buffer)-1]='\x0';
-@@ -6066,6 +6079,10 @@
-
this_host->retain_nonstatus_information=template_host->retain_nonstatus_information;
- this_host->have_retain_nonstatus_information=TRUE;
- }
-+ /* patch define SNMP Community */
-+ if(this_host->community==NULL && template_host->community!=NULL)
-+ this_host->community=strdup(template_host->community);
-+ /* END */
-
- #ifdef DEBUG0
- printf("xodtemplate_resolve_host() end\n");
-@@ -8039,7 +8056,9 @@
- this_host->address=strdup(this_host->host_name);
-
- /* add the host definition */
--
new_host=add_host(this_host->host_name,this_host->alias,(this_host->address==NULL)?this_host->host_name:this_host->address,this_host->check_period,this_host->check_interval,this_host->max_check_attempts,this_host->notify_on_recovery,this_host->notify_on_down,this_host->notify_on_unreachable,this_host->notify_on_flapping,this_host->notification_interval,this_host->notification_period,this_host->notifications_enabled,this_host->check_command,this_host->active_checks_enabled,this_host->passive_checks_enabled,this_host->event_handler,this_host->event_handler_enabled,this_host->flap_detection_enabled,this_host->low_flap_threshold,this_host->high_flap_threshold,this_host->stalk_on_up,this_host->stalk_on_down,this_host->stalk_on_unreachable,this_host->process_perf_data,this_host->failure_prediction_enabled,this_host->failure_prediction_options,this_host->check_freshness,this_host->freshness_threshold,this_host->retain_status_information,this_host->retain_nonstatus_information,this_host->obsess_over_host);
-+ /* patch define SNMP Community */
-+
new_host=add_host(this_host->host_name,this_host->alias,(this_host->address==NULL)?this_host->host_name:this_host->address,this_host->check_period,this_host->check_interval,this_host->max_check_attempts,this_host->notify_on_recovery,this_host->notify_on_down,this_host->notify_on_unreachable,this_host->notify_on_flapping,this_host->notification_interval,this_host->notification_period,this_host->notifications_enabled,this_host->check_command,this_host->active_checks_enabled,this_host->passive_checks_enabled,this_host->event_handler,this_host->event_handler_enabled,this_host->flap_detection_enabled,this_host->low_flap_threshold,this_host->high_flap_threshold,this_host->stalk_on_up,this_host->stalk_on_down,this_host->stalk_on_unreachable,this_host->process_perf_data,this_host->failure_prediction_enabled,this_host->failure_prediction_options,this_host->check_freshness,this_host->freshness_threshold,this_host->retain_status_information,this_host->retain_nonstatus_information,this_host->obsess_over_host,this_host->community);
-+ /* END */
-
- #ifdef TEST_DEBUG
- printf("HOST: %s, MAXATTEMPTS: %d, NOTINVERVAL: %d
\n",this_host->host_name,this_host->max_check_attempts,this_host->notification_interval);
-@@ -9466,6 +9485,10 @@
-
fprintf(fp,"\tactive_checks_enabled\t%d\n",temp_host->active_checks_enabled);
-
fprintf(fp,"\tpassive_checks_enabled\t%d\n",temp_host->passive_checks_enabled);
-
fprintf(fp,"\tobsess_over_host\t%d\n",temp_host->obsess_over_host);
-+ /* patch define SNMP Community */
-+ if (temp_host->community)
-+ fprintf(fp,"\tcommunity\t%s\n",temp_host->community);
-+ /* END */
-
fprintf(fp,"\tevent_handler_enabled\t%d\n",temp_host->event_handler_enabled);
-
fprintf(fp,"\tlow_flap_threshold\t%f\n",temp_host->low_flap_threshold);
-
fprintf(fp,"\thigh_flap_threshold\t%f\n",temp_host->high_flap_threshold);
-@@ -9966,6 +9989,9 @@
- free(this_host->contact_groups);
- free(this_host->notification_period);
- free(this_host->failure_prediction_options);
-+ /* patch define SNMP Community */
-+ free(this_host->community);
-+ /* END */
- free(this_host);
- }
- xodtemplate_host_list=NULL;
-Only in nagios-2.0-snmpcommunity/xdata: xodtemplate.c~
-diff -u -a -b -B -r nagios-2.0/xdata/xodtemplate.h
nagios-2.0-snmpcommunity/xdata/xodtemplate.h
---- nagios-2.0/xdata/xodtemplate.h 2005-11-16 02:49:35.000000000 -0600
-+++ nagios-2.0-snmpcommunity/xdata/xodtemplate.h 2006-02-27
09:29:22.000000000 -0600
-@@ -160,6 +160,7 @@
- int active_checks_enabled;
- int passive_checks_enabled;
- int obsess_over_host;
-+ char *community;
- char *event_handler;
- int event_handler_enabled;
- int check_freshness;
diff --git a/net/nagios/nagios-2.0-statusmap.patch
b/net/nagios/nagios-2.0-statusmap.patch
deleted file mode 100644
index 78581e0..0000000
--- a/net/nagios/nagios-2.0-statusmap.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-diff -u -a -b -B -r nagios-2.0/cgi/statusmap.c
nagios-2.0-statusmap/cgi/statusmap.c
---- nagios-2.0/cgi/statusmap.c 2005-11-16 02:49:35.000000000 -0600
-+++ nagios-2.0-statusmap/cgi/statusmap.c 2006-02-27 12:41:31.000000000
-0600
-@@ -1708,13 +1708,13 @@
-
-
temp_hoststatus=find_hoststatus(temp_hostextinfo->host_name);
- if(temp_hoststatus!=NULL){
-- if(temp_hoststatus->status==HOST_DOWN)
-+ if(temp_hoststatus->status==HOST_DOWN ||
get_servicestatus_count(temp_hostextinfo->host_name,SERVICE_CRITICAL))
- status_color=color_red;
-- else
if(temp_hoststatus->status==HOST_UNREACHABLE)
-- status_color=color_red;
-- else if(temp_hoststatus->status==HOST_UP)
-+ else
if(temp_hoststatus->status==HOST_UNREACHABLE ||
get_servicestatus_count(temp_hostextinfo->host_name,SERVICE_WARNING))
-+ status_color=color_yellow;
-+ else if(temp_hoststatus->status==HOST_UP
||get_servicestatus_count(temp_hostextinfo->host_name,SERVICE_OK))
- status_color=color_green;
-- else if(temp_hoststatus->status==HOST_PENDING)
-+ else if(temp_hoststatus->status==HOST_PENDING
||get_servicestatus_count(temp_hostextinfo->host_name,SERVICE_PENDING))
- status_color=color_grey;
- }
- else
-@@ -1931,6 +1931,14 @@
-
strncpy(temp_buffer,"Unreachable",sizeof(temp_buffer));
- status_color=color_red;
- }
-+ else if(temp_hoststatus->status==HOST_UP &&
get_servicestatus_count(name,SERVICE_CRITICAL)){
-+ strncpy(temp_buffer,"Up",sizeof(temp_buffer));
-+ status_color=color_red;
-+ }
-+ else if(temp_hoststatus->status==HOST_UP &&
get_servicestatus_count(name,SERVICE_WARNING)){
-+ strncpy(temp_buffer,"Up",sizeof(temp_buffer));
-+ status_color=color_yellow;
-+ }
- else if(temp_hoststatus->status==HOST_UP){
- strncpy(temp_buffer,"Up",sizeof(temp_buffer));
- status_color=color_green;
-@@ -2879,8 +2887,10 @@
- temp_hoststatus=find_hoststatus(temp_host->name);
- if(temp_hoststatus==NULL)
- bgcolor=color_lightgrey;
-- else if(temp_hoststatus->status==HOST_DOWN ||
temp_hoststatus->status==HOST_UNREACHABLE)
-+ else if(temp_hoststatus->status==HOST_DOWN ||
temp_hoststatus->status==HOST_UNREACHABLE ||
get_servicestatus_count(temp_host->name,SERVICE_CRITICAL))
- bgcolor=color_lightred;
-+ else if
(get_servicestatus_count(temp_host->name,SERVICE_WARNING) )
-+ bgcolor=color_yellow;
- else
- bgcolor=color_lightgreen;
-
-Only in nagios-2.0-statusmap/cgi: statusmap.c~
diff --git a/net/nagios/nagios-3.0-statusmap.patch
b/net/nagios/nagios-3.0-statusmap.patch
new file mode 100644
index 0000000..8c3f3ef
--- /dev/null
+++ b/net/nagios/nagios-3.0-statusmap.patch
@@ -0,0 +1,55 @@
+--- statusmap.c.orig 2006-03-21 22:31:46.000000000 +0100
++++ statusmap.c 2006-06-29 11:08:23.399501664 +0200
+@@ -1652,13 +1652,13 @@
+
+ temp_hoststatus=find_hoststatus(temp_host->name);
+ if(temp_hoststatus!=NULL){
+- if(temp_hoststatus->status==HOST_DOWN)
++ if(temp_hoststatus->status==HOST_DOWN ||
get_servicestatus_count(temp_host->name,SERVICE_CRITICAL))
+ status_color=color_red;
+- else
if(temp_hoststatus->status==HOST_UNREACHABLE)
+- status_color=color_red;
+- else if(temp_hoststatus->status==HOST_UP)
++ else
if(temp_hoststatus->status==HOST_UNREACHABLE
||get_servicestatus_count(temp_host->name,SERVICE_WARNING))
++ status_color=color_yellow;
++ else if(temp_hoststatus->status==HOST_UP
||get_servicestatus_count(temp_host->name,SERVICE_OK))
+ status_color=color_green;
+- else if(temp_hoststatus->status==HOST_PENDING)
++ else if(temp_hoststatus->status==HOST_PENDING
+||get_servicestatus_count(temp_host->name,SERVICE_PENDING)||get_servicestatus_count(temp_host->name,SERVICE_UNKNOWN))
+ status_color=color_grey;
+ }
+ else
+@@ -1875,6 +1875,14 @@
+
strncpy(temp_buffer,"Unreachable",sizeof(temp_buffer));
+ status_color=color_red;
+ }
++ else if(temp_hoststatus->status==HOST_UP &&
get_servicestatus_count(name,SERVICE_CRITICAL)){
++ strncpy(temp_buffer,"Up",sizeof(temp_buffer));
++ status_color=color_red;
++ }
++ else if(temp_hoststatus->status==HOST_UP &&
get_servicestatus_count(name,SERVICE_WARNING)){
++ strncpy(temp_buffer,"Up",sizeof(temp_buffer));
++ status_color=color_yellow;
++ }
+ else if(temp_hoststatus->status==HOST_UP){
+ strncpy(temp_buffer,"Up",sizeof(temp_buffer));
+ status_color=color_green;
+@@ -2814,10 +2814,14 @@
+
+ /* determine background color */
+ temp_hoststatus=find_hoststatus(temp_host->name);
+- if(temp_hoststatus==NULL)
++
if(temp_hoststatus==NULL||get_servicestatus_count(temp_host->name,SERVICE_UNKNOWN))
+ bgcolor=color_lightgrey;
+- else if(temp_hoststatus->status==HOST_DOWN ||
temp_hoststatus->status==HOST_UNREACHABLE)
++ else if(temp_hoststatus->status==HOST_DOWN ||
temp_hoststatus->status==HOST_UNREACHABLE ||
+get_servicestatus_count(temp_host->name,SERVICE_CRITICAL))
+ bgcolor=color_lightred;
++ else if
(get_servicestatus_count(temp_host->name,SERVICE_WARNING) )
++ bgcolor=color_yellow;
++ else if
(get_servicestatus_count(temp_host->name,SERVICE_PENDING) )
++ bgcolor=color_grey;
+ else
+ bgcolor=color_lightgreen;
+
diff --git a/net/ntop/DEPENDS b/net/ntop/DEPENDS
index 9f6d355..b3ba28a 100755
--- a/net/ntop/DEPENDS
+++ b/net/ntop/DEPENDS
@@ -7,6 +7,7 @@ depends libtool &&
depends libpcap &&
depends libpng &&
depends m4 &&
+depends perl &&
depends rrdtool &&
depends zlib &&

diff --git a/net/ntop/HISTORY b/net/ntop/HISTORY
index 831152d..5d11adb 100644
--- a/net/ntop/HISTORY
+++ b/net/ntop/HISTORY
@@ -1,3 +1,6 @@
+2009-09-09 Eric Sandall <sandalle AT sourcemage.org>
+ * DEPENDS: Depends on perl
+
2009-04-18 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: Updated to 3.3.9
Fixes Bug #15183
diff --git a/net/samba/DETAILS b/net/samba/DETAILS
index 502a9b6..ac00dd0 100755
--- a/net/samba/DETAILS
+++ b/net/samba/DETAILS
@@ -1,11 +1,11 @@
SPELL=samba
- VERSION=3.4.0
+ VERSION=3.4.1
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://download.samba.org/samba/ftp/$SOURCE
SOURCE_URL[1]=ftp://de3.samba.org/pub/$SPELL/$SOURCE
SOURCE_URL[2]=http://us1.samba.org/samba/ftp/old-versions/$SOURCE
-
SOURCE_HASH=sha512:711fc9e2e10e4b06f65fee0cc84f0c448cc44377ddf30c4c6db1f2b2022be6ce7ba82f8e749b1fb5ac90a08fe083e4c31ea670a150a567094c573378a2e943b3
+
SOURCE_HASH=sha512:e328a34581c68d6959ae4cbe7964a00193795db8d2a20f8430aded7c60af3bc801f01478679036b8e801edf3099904eaaf96a62f42381ad0e3fa957fd0c0a19c
if [[ "$SAMBA_VSCAN" == "y" ]] ; then
VSCAN_VERSION=0.3.6c-beta4
SOURCE2=$SPELL-vscan-$VSCAN_VERSION.tar.gz
diff --git a/net/samba/HISTORY b/net/samba/HISTORY
index 544be7e..8ba3866 100644
--- a/net/samba/HISTORY
+++ b/net/samba/HISTORY
@@ -1,3 +1,6 @@
+2009-09-12 George Sherwood <gsherwood AT sourcemage.org>
+ * DETAILS: Updated to version 3.4.1
+
2009-08-19 George Sherwood <gsherwood AT sourcemage.org>
* BUILD: Samba3 source is located now in source3
* DETAILS: Updated to version 3.4.0
diff --git a/net/vnstat/DETAILS b/net/vnstat/DETAILS
index 8be8c77..de8f396 100755
--- a/net/vnstat/DETAILS
+++ b/net/vnstat/DETAILS
@@ -1,9 +1,9 @@
SPELL=vnstat
- VERSION=1.8
+ VERSION=1.9
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://humdi.net/vnstat/$SOURCE
-
SOURCE_HASH=sha512:0f6ed48ed19765ac83fc2559e6c588733eb18c2b1bafff679b90768fa191114796629cebb6029c147512f87edfcc7d7c5bff64086eb98cdde3aaada8ad6c7a92
+
SOURCE_HASH=sha512:cc2e9936be1e846fa1c37e188000dff9d4d42da9883f568590bbe507187c64b8fb0f616350f18b2658272d3e0d96162abcfb89a31a33f78aec114f3035790dc8
WEB_SITE=http://humdi.net/vnstat/
ENTERED=20070513
LICENSE=GPL
diff --git a/net/vnstat/HISTORY b/net/vnstat/HISTORY
index c979429..ac5a3f5 100644
--- a/net/vnstat/HISTORY
+++ b/net/vnstat/HISTORY
@@ -1,3 +1,6 @@
+2009-09-13 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 1.9
+
2009-08-02 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.8

diff --git a/net/whois/DETAILS b/net/whois/DETAILS
index 2ee18e5..47eefa9 100755
--- a/net/whois/DETAILS
+++ b/net/whois/DETAILS
@@ -1,9 +1,9 @@
SPELL=whois
- VERSION=4.7.34
+ VERSION=4.7.36
SOURCE=${SPELL}_$VERSION.tar.gz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=http://ftp.debian.org/debian/pool/main/w/whois/$SOURCE
-
SOURCE_HASH=sha512:2a51acb0d2a270fd771564933d7b1cfb96081d9e5b0826c9d685149926ea14b473a7e2e03f7b9257415e84ec43b2fd0c3f566e34849614e8baf8ba3cd1635819
+
SOURCE_HASH=sha512:d4cdcebfe98d362f51c0cac8dfa6ef85b5b27093d7c10b2c8871a6cc4baa9950de783fd25486ec3715e4bcb4043c1479981778beccba34924e8151a6b6c77555
WEB_SITE=http://www.linux.it/~md/software/
ENTERED=20011228
LICENSE[0]=GPL
diff --git a/net/whois/HISTORY b/net/whois/HISTORY
index dc50c6d..5be4a07 100644
--- a/net/whois/HISTORY
+++ b/net/whois/HISTORY
@@ -1,3 +1,6 @@
+2009-09-13 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 4.7.36
+
2009-06-26 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 4.7.34

diff --git a/net/wicd/DETAILS b/net/wicd/DETAILS
index 7cb192a..8e3c601 100755
--- a/net/wicd/DETAILS
+++ b/net/wicd/DETAILS
@@ -1,8 +1,8 @@
SPELL=wicd
- VERSION=1.6.2.1
+ VERSION=1.6.2.2
SOURCE="${SPELL}-${VERSION}.tar.gz"
SOURCE_URL[0]=$SOURCEFORGE_URL/${SPELL}/${SOURCE}
-
SOURCE_HASH=sha512:d6c9e1ef4fad00cf23557018491567d49409ab9c1f8b1edd4a516ac0a16254644b30b14bcf5aa173c4f0fd795a4f06f555282cea812b04fcda4e7d7bd6759a7c
+
SOURCE_HASH=sha512:a96a538cf641dffe4fa4b37d801a4c9cc0c8e7fa28535757e41cc52d3c22eb31eaa30c726d5952ddf91dccbc9b9eb4c35e28ef1a91c0b8bb3141e45ba522e3d5
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
WEB_SITE="http://wicd.sourceforge.net/";
LICENSE[0]=GPL
diff --git a/net/wicd/HISTORY b/net/wicd/HISTORY
index d43de27..ed151f6 100644
--- a/net/wicd/HISTORY
+++ b/net/wicd/HISTORY
@@ -1,3 +1,6 @@
+2009-09-10 Julien "_kaze_" ROZO <julien AT rozo.org>
+ * DETAILS: updated version to 1.6.2.2
+
2009-09-03 Julien "_kaze_" ROZO <julien AT rozo.org>
* DETAILS: updated version to 1.6.2.1

diff --git a/perl-cpan/class-singleton/DETAILS
b/perl-cpan/class-singleton/DETAILS
index 28720d7..a33e1b5 100755
--- a/perl-cpan/class-singleton/DETAILS
+++ b/perl-cpan/class-singleton/DETAILS
@@ -1,10 +1,10 @@
SPELL=class-singleton
- VERSION=1.03
+ VERSION=1.4
SNAME=Class-Singleton
SOURCE=$SNAME-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SNAME-$VERSION
SOURCE_URL[0]=http://www.cpan.org/modules/by-module/Class/$SOURCE
-
SOURCE_HASH=sha512:f32c707b2d65e47d89e5c41d0434c4aa69f07c24e2a2f09a5b78f54143aeb745a9fa4ded1f04b17168f9f5c3c63ad3c6574aab8d7bdd9c5acdaf1db09fec88f0
+
SOURCE_HASH=sha512:1e7cbc992840fd454e31d79ea1fa78046f52c6c6c369c005248fc675adb0a28dcc1db6e0ebabf4cc0a9a80d684c164315ec6bd1bb56d451d1f09a829141d2328
LICENSE=ART
WEB_SITE="http://search.cpan.org/search?module=Class::Singleton";
ENTERED=20051201
diff --git a/perl-cpan/class-singleton/HISTORY
b/perl-cpan/class-singleton/HISTORY
index 781b7a4..df2fc1b 100644
--- a/perl-cpan/class-singleton/HISTORY
+++ b/perl-cpan/class-singleton/HISTORY
@@ -1,3 +1,6 @@
+2009-09-14 David Kowis <dkowis AT shlrm.org>
+ * DETAILS: to latest version
+
2008-01-07 Vlad Glagolev <stealth AT sourcemage.org>
* BUILD: useless

diff --git a/perl-cpan/datetime-locale/DETAILS
b/perl-cpan/datetime-locale/DETAILS
index 2a464d1..b95b0c4 100755
--- a/perl-cpan/datetime-locale/DETAILS
+++ b/perl-cpan/datetime-locale/DETAILS
@@ -1,10 +1,10 @@
SPELL=datetime-locale
- VERSION=0.22
+ VERSION=0.44
SNAME=DateTime-Locale
SOURCE=$SNAME-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SNAME-$VERSION
SOURCE_URL[0]=http://www.cpan.org/modules/by-module/DateTime/$SOURCE
-
SOURCE_HASH=sha512:057dd29304e564e4766eff84a7d013926f73d8eea79cb58c333a849cee98c77f6ce49ba4d0db01df2112abc5d1b8c8672a09c99d59a9338ff327a83fcceec24a
+
SOURCE_HASH=sha512:fd99833024b4840650566789bbf888c7eb2c38c809eea0e9e479f81af1251dee534b26b8c598c30127e1de3c36397070fc84ea05de7f468570c0825a7c2d929e
LICENSE=GPL
WEB_SITE="http://search.cpan.org/search?module=DateTime::Locale";
ENTERED=20051201
diff --git a/perl-cpan/datetime-locale/HISTORY
b/perl-cpan/datetime-locale/HISTORY
index 86d5bbe..e851b58 100644
--- a/perl-cpan/datetime-locale/HISTORY
+++ b/perl-cpan/datetime-locale/HISTORY
@@ -1,3 +1,6 @@
+2009-09-14 David Kowis <dkowis AT shlrm.org>
+ * DETAILS: to latest version
+
2008-01-07 Vlad Glagolev <stealth AT sourcemage.org>
* BUILD: useless

diff --git a/perl-cpan/datetime-timezone/DEPENDS
b/perl-cpan/datetime-timezone/DEPENDS
index f84475c..cc5ac5a 100755
--- a/perl-cpan/datetime-timezone/DEPENDS
+++ b/perl-cpan/datetime-timezone/DEPENDS
@@ -1,2 +1 @@
-depends module-build &&
depends class-singleton
diff --git a/perl-cpan/datetime-timezone/DETAILS
b/perl-cpan/datetime-timezone/DETAILS
index a7940cd..e51de3e 100755
--- a/perl-cpan/datetime-timezone/DETAILS
+++ b/perl-cpan/datetime-timezone/DETAILS
@@ -1,10 +1,10 @@
SPELL=datetime-timezone
- VERSION=0.3801
+ VERSION=0.98
SNAME=DateTime-TimeZone
SOURCE=$SNAME-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SNAME-$VERSION
SOURCE_URL[0]=http://www.cpan.org/modules/by-module/DateTime/$SOURCE
-
SOURCE_HASH=sha512:c57faf813e6ba898ecec26a499da1e3604c231a50c23c18b5f1066c0dd9797b1de1a6aaeb0445efcb35d62a23773f3e7257aaa83989f52ca9ba7a233765f59e3
+
SOURCE_HASH=sha512:1d36f78aecffcca9f5eda682bc49dba5eac6fdff43b561c44af9e11d98cfff55ee3fd7ae88efccd1a6574b09e897113b88a2c5a4c0719486ad3352959d9b5ee5
LICENSE=GPL
WEB_SITE="http://search.cpan.org/search?module=DateTime::TimeZone";
ENTERED=20051201
diff --git a/perl-cpan/datetime-timezone/HISTORY
b/perl-cpan/datetime-timezone/HISTORY
index 86d5bbe..b6f5394 100644
--- a/perl-cpan/datetime-timezone/HISTORY
+++ b/perl-cpan/datetime-timezone/HISTORY
@@ -1,3 +1,7 @@
+2009-09-14 David Kowis <dkowis AT shlrm.org>
+ * DETAILS: to latest version
+ * DEPENDS: no longer needs module-build
+
2008-01-07 Vlad Glagolev <stealth AT sourcemage.org>
* BUILD: useless

diff --git a/perl-cpan/datetime/DETAILS b/perl-cpan/datetime/DETAILS
index ccfed6f..20b971a 100755
--- a/perl-cpan/datetime/DETAILS
+++ b/perl-cpan/datetime/DETAILS
@@ -1,10 +1,10 @@
SPELL=datetime
- VERSION=0.2901
+ VERSION=0.50
SNAME=DateTime
SOURCE=$SNAME-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SNAME-$VERSION
SOURCE_URL[0]=http://www.cpan.org/modules/by-module/$SNAME/$SOURCE
-
SOURCE_HASH=sha512:ce1d37cbb4851bffd6b19aab3522ffff5215bef7480a9b02bef634281f3a14e58bf7af7ec03c3cb1846d8b54eecc8161938ff681ebad3dc7e235a60987dd5bbc
+
SOURCE_HASH=sha512:59a6b409721802111d3c0cd55fd2a2220e998d900abb75efbbc5a41ce116dbba3959672ad737ad831bf446786333bec086e8e6edc8937debe6381714485b1bed
LICENSE=GPL
WEB_SITE="http://search.cpan.org/search?module=DateTime";
ENTERED=20051201
diff --git a/perl-cpan/datetime/HISTORY b/perl-cpan/datetime/HISTORY
index 86d5bbe..e851b58 100644
--- a/perl-cpan/datetime/HISTORY
+++ b/perl-cpan/datetime/HISTORY
@@ -1,3 +1,6 @@
+2009-09-14 David Kowis <dkowis AT shlrm.org>
+ * DETAILS: to latest version
+
2008-01-07 Vlad Glagolev <stealth AT sourcemage.org>
* BUILD: useless

diff --git a/perl-cpan/email-mime-encodings/DETAILS
b/perl-cpan/email-mime-encodings/DETAILS
index ea5ee6c..fa520d7 100755
--- a/perl-cpan/email-mime-encodings/DETAILS
+++ b/perl-cpan/email-mime-encodings/DETAILS
@@ -1,8 +1,8 @@
SPELL=email-mime-encodings
- VERSION=1.311
+ VERSION=1.313
SOURCE="Email-MIME-Encodings-${VERSION}.tar.gz"
SOURCE_URL[0]=http://www.cpan.org/authors/id/R/RJ/RJBS/${SOURCE}
-
SOURCE_HASH=sha512:c7b85ac1b5d40b267a4f68187a4159b540d6c4d890dee53a8c6e7c911dc517d86eeb61f688c36d781b753e7df42d0228cdd602cdbb9f81f7f2197afccba21627
+
SOURCE_HASH=sha512:fdbe30921cfba85af0c2296c678c881988a6bd512dd76a30f678ff3c6c711971cad68e954c3da5226c742806fc10084bb623118fcfe66462657d0dc0be0efeb3
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/Email-MIME-Encodings-${VERSION}"

WEB_SITE="http://search.cpan.org/search?query=Email-MIME-Encodings&mode=all";
LICENSE[0]=ART
diff --git a/perl-cpan/email-mime-encodings/HISTORY
b/perl-cpan/email-mime-encodings/HISTORY
index 54451af..b5d088c 100644
--- a/perl-cpan/email-mime-encodings/HISTORY
+++ b/perl-cpan/email-mime-encodings/HISTORY
@@ -1,3 +1,6 @@
+2009-09-14 David Kowis <dkowis AT shlrm.org>
+ * DETAILS: updated to latest version
+
2008-07-01 David Kowis <dkowis AT shlrm.org>
* DETAILS: quill forgot the sha512
quill also doesn't set the extraction directory correctly
diff --git a/perl-cpan/email-mime-modifier/DETAILS
b/perl-cpan/email-mime-modifier/DETAILS
index 3ec09f0..865c510 100755
--- a/perl-cpan/email-mime-modifier/DETAILS
+++ b/perl-cpan/email-mime-modifier/DETAILS
@@ -1,8 +1,8 @@
SPELL=email-mime-modifier
- VERSION=1.442
+ VERSION=1.444
SOURCE="Email-MIME-Modifier-${VERSION}.tar.gz"
SOURCE_URL[0]=http://www.cpan.org/authors/id/R/RJ/RJBS/${SOURCE}
-
SOURCE_HASH=sha512:ac37fc532d024fa4a5a355cccf0ff78638b78e391ae110252f38f4d7d1477e47dc8b53a41c94fb503a0fa91ba80ec30477107f779f72db1717e442f9681917ef
+
SOURCE_HASH=sha512:5cbb0dbdc7423e41b6a49caad99d31cea5b8a9a87a51abb15b5de45f94b17a7fb1c7662d24a4e9399d84b8afd2af798fdd29ef01a72e084b365fa8b4268d8807
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/Email-MIME-Modifier-${VERSION}"

WEB_SITE="http://search.cpan.org/search?query=Email%3A%3AMIME%3A%3AModifier&mode=all";
LICENSE[0]=ART
diff --git a/perl-cpan/email-mime-modifier/HISTORY
b/perl-cpan/email-mime-modifier/HISTORY
index 4a6b7ea..28ebb77 100644
--- a/perl-cpan/email-mime-modifier/HISTORY
+++ b/perl-cpan/email-mime-modifier/HISTORY
@@ -1,3 +1,6 @@
+2009-09-14 David Kowis <dkowis AT shlrm.org>
+ * DETAILS: to latest version
+
2008-07-01 David Kowis <dkowis AT shlrm.org>
* DETAILS: fixing quill's shortcomings

diff --git a/perl-cpan/email-mime/DETAILS b/perl-cpan/email-mime/DETAILS
index 6798ddc..786fc88 100755
--- a/perl-cpan/email-mime/DETAILS
+++ b/perl-cpan/email-mime/DETAILS
@@ -1,8 +1,8 @@
SPELL=email-mime
- VERSION=1.861
+ VERSION=1.863
SOURCE="Email-MIME-${VERSION}.tar.gz"
SOURCE_URL[0]=http://www.cpan.org/authors/id/R/RJ/RJBS/${SOURCE}
-
SOURCE_HASH=sha512:fd5dbae9a81071f0a7e608704ff51d18047299d66db37c7a9ea30c4f990ebcf3421c880a1eecd53184e26c03e136e935437b31d882e958a121f4399aada61f2d
+
SOURCE_HASH=sha512:3529896f3018c09d86bb9781ecb5efa79fa36d4e8c332d1db177d6ac6a5d47e39a4f56021b517abf628c17775a204330f7bd363b6cabba633b71f0de39a8effd
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/Email-MIME-${VERSION}"
WEB_SITE="http://search.cpan.org/search?query=Email-MIME&mode=all";
LICENSE[0]=ART
diff --git a/perl-cpan/email-mime/HISTORY b/perl-cpan/email-mime/HISTORY
index 4a6b7ea..28ebb77 100644
--- a/perl-cpan/email-mime/HISTORY
+++ b/perl-cpan/email-mime/HISTORY
@@ -1,3 +1,6 @@
+2009-09-14 David Kowis <dkowis AT shlrm.org>
+ * DETAILS: to latest version
+
2008-07-01 David Kowis <dkowis AT shlrm.org>
* DETAILS: fixing quill's shortcomings

diff --git a/perl-cpan/email-send/DETAILS b/perl-cpan/email-send/DETAILS
index 13e8028..d054700 100755
--- a/perl-cpan/email-send/DETAILS
+++ b/perl-cpan/email-send/DETAILS
@@ -1,8 +1,8 @@
SPELL=email-send
- VERSION=2.192
+ VERSION=2.198
SOURCE="Email-Send-${VERSION}.tar.gz"
- SOURCE_URL[0]=http://www.cpan.org/authors/id/R/RJ/RJBS/${SOURCE}
-
SOURCE_HASH=sha512:0f7684d31211e65c6affbb225284626af52694a6216af64af4a4c20086e68c076f8f2ec7e590480d718120b7d2ae1a3288a0d094dfd64eb79076723cc57cd3ca
+ SOURCE_URL[0]=http://search.cpan.org/CPAN/authors/id/R/RJ/RJBS/${SOURCE}
+
SOURCE_HASH=sha512:ec747c798ab74efadeeacaa0a7754be36aa5fc790f4b14b2f52360a088c04c2446719fb701a34381e382eb79ee996c22955aa1363b258592b423f3b5528fa33b
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/Email-Send-${VERSION}"
WEB_SITE="http://search.cpan.org/search?query=Email-Send&mode=all";
LICENSE[0]=ART
diff --git a/perl-cpan/email-send/HISTORY b/perl-cpan/email-send/HISTORY
index 05e4198..8b950b3 100644
--- a/perl-cpan/email-send/HISTORY
+++ b/perl-cpan/email-send/HISTORY
@@ -1,3 +1,6 @@
+2009-09-14 David Kowis <dkowis AT shlrm.org>
+ * DETAILS: version to latest
+
2008-07-02 David Kowis <dkowis AT shlrm.org>
* DEPENDS: added a missing dependency

diff --git a/perl-cpan/perl-cgi/DETAILS b/perl-cpan/perl-cgi/DETAILS
index 0962b48..87668b4 100755
--- a/perl-cpan/perl-cgi/DETAILS
+++ b/perl-cpan/perl-cgi/DETAILS
@@ -1,9 +1,9 @@
SPELL=perl-cgi
- VERSION=3.38
+ VERSION=3.47
SOURCE=CGI.pm-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/CGI.pm-$VERSION
SOURCE_URL[0]=http://www.cpan.org/authors/id/L/LD/LDS/$SOURCE
-
SOURCE_HASH=sha512:75aa32d2754407e712e82f573fba8006521f1e444c760edab6bedc4e2bc48b2fdb1bf49779bb405f9c2d18a753cffcedbe548f01a5f801f6a6476c5b636aafb9
+
SOURCE_HASH=sha512:dc595c70783c124d9d6e55327bb825692e80b3797606ad3958d99f0249ca8f6c52be029fd9fce2767c867be7cd9034c372aa73a013502d6a1823d5637690e641
WEB_SITE=http://stein.cshl.org/WWW/software/CGI/
LICENSE=ART
ENTERED=20021220
diff --git a/perl-cpan/perl-cgi/HISTORY b/perl-cpan/perl-cgi/HISTORY
index 48f02cf..596f947 100644
--- a/perl-cpan/perl-cgi/HISTORY
+++ b/perl-cpan/perl-cgi/HISTORY
@@ -1,3 +1,6 @@
+2009-09-14 David Kowis <dkowis AT shlrm.org>
+ * DETAILS: updated to latest version: quill can't do this one
+
2008-06-28 David Kowis <dkowis AT shlrm.org>
* DETAILS: updated to latest version... We really need an automagic
way of doing this

diff --git a/perl-cpan/template-toolkit/DETAILS
b/perl-cpan/template-toolkit/DETAILS
index 5abaf99..c9118aa 100755
--- a/perl-cpan/template-toolkit/DETAILS
+++ b/perl-cpan/template-toolkit/DETAILS
@@ -1,6 +1,6 @@
SPELL=template-toolkit
- VERSION=2.19
-
SOURCE_HASH=sha512:184adf93993a8ca489e953a3731c50fcbf709eca5b7c9ce0587503097ce60e26b8e2829c525a167f3d05d629a189b7d6670339820bfc580c4a142d0426963a23
+ VERSION=2.22
+
SOURCE_HASH=sha512:e1d7a9e10090e589ca70b47d987fef8a1730b63b37ca29bb696ff8811d9c245fb4179aa39ce37c2d099d017f6af5a9552f2ed03f1361e8f989e8e63348e59686
SOURCE=Template-Toolkit-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/Template-Toolkit-$VERSION
SOURCE_URL[0]=http://cpan.org/modules/by-module/Template/$SOURCE
diff --git a/perl-cpan/template-toolkit/HISTORY
b/perl-cpan/template-toolkit/HISTORY
index 8dbd029..4c1c501 100644
--- a/perl-cpan/template-toolkit/HISTORY
+++ b/perl-cpan/template-toolkit/HISTORY
@@ -1,3 +1,6 @@
+2009-09-14 David Kowis <dkowis AT shlrm.org>
+ * DETAILS: version to 2.22
+
2008-06-30 David Kowis <dkowis AT shlrm.org>
* DETAILS: Fixed SOURCE_URL[0]
updated spell to 2.19
diff --git a/perl-cpan/uri/DETAILS b/perl-cpan/uri/DETAILS
index aec4236..f7cae12 100755
--- a/perl-cpan/uri/DETAILS
+++ b/perl-cpan/uri/DETAILS
@@ -1,6 +1,6 @@
SPELL=uri
- VERSION=1.38
-
SOURCE_HASH=sha512:9bd55b64be74aaeff6a77a151c1e8409b20c5b0c64c3389fbcf68ddbf83b2c23f778feb75d4387e6fc80536717a06b531682b9efbee875eac7e7a90a113f03e0
+ VERSION=1.40
+
SOURCE_HASH=sha512:0eba9b55268001bd388f6ee56a53d97e8d296b2c8056a88464e1509b85cfb397a8b090479836f9283db39c99923b8640b174e3d261e24134da9b055e9e3925e2
SOURCE=URI-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/URI-$VERSION
SOURCE_URL[0]=$PERL_CPAN_URL/authors/id/G/GA/GAAS/$SOURCE
diff --git a/perl-cpan/uri/HISTORY b/perl-cpan/uri/HISTORY
index 9aee3d6..e57d418 100644
--- a/perl-cpan/uri/HISTORY
+++ b/perl-cpan/uri/HISTORY
@@ -1,3 +1,6 @@
+2009-09-14 David Kowis <dkowis AT shlrm.org>
+ * DETAILS: version to 1.40
+
2009-05-28 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.38

diff --git a/php-pear/imagick/DEPENDS b/php-pear/imagick/DEPENDS
index 0bbf486..ed94efc 100755
--- a/php-pear/imagick/DEPENDS
+++ b/php-pear/imagick/DEPENDS
@@ -1 +1,2 @@
-depends PHP
+depends PHP &&
+depends imagemagick
diff --git a/php-pear/imagick/HISTORY b/php-pear/imagick/HISTORY
index 26643f8..760ed85 100644
--- a/php-pear/imagick/HISTORY
+++ b/php-pear/imagick/HISTORY
@@ -1,3 +1,6 @@
+2009-09-14 Vlad Glagolev <stealth AT sourcemage.org>
+ * DEPENDS: added missing dependency
+
2009-08-26 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 2.3.0

diff --git a/php-pear/php/CONFIGURE b/php-pear/php/CONFIGURE
index 87f57c7..b63fcc3 100755
--- a/php-pear/php/CONFIGURE
+++ b/php-pear/php/CONFIGURE
@@ -1,3 +1,13 @@
+. $GRIMOIRE/config_query_multi.function &&
+message "${MESSAGE_COLOR}PEAR support will enable the CLI version and force
depends on libxml2" &&
+message "It will also enable some PCRE support (internal
reccomended)${DEFAULT_COLOR}" &&
+# prior pear enabledness
+if list_find "$PHP5_OPTS" "--enable-pear" ; then
+ PHP5_PEAR="y"
+fi &&
+
+config_query PHP5_PEAR "Do you want PEAR support?" y &&
+
config_query_option PHP5_OPTS "Enable IPv6?" n \
"--enable-ipv6" "--disable-ipv6" &&

@@ -13,7 +23,7 @@ config_query_option PHP5_OPTS "Enable FTP support?" y \
config_query_option PHP5_OPTS "Enable calendar support?" y \
"--enable-calendar" "--disable-calendar" &&

-config_query_option PHP5_OPTS "Enable pcntl support (CLI/CGI only)" n \
+config_query_option PHP5_OPTS "Enable pcntl support (Only affects CLI/CGI)"
n \
"--enable-pcntl" "--disable-pcntl" &&

message "${MESSAGE_COLOR}Both FastCGI and CGI can be enabled at the same
time${DEFAULT_COLOR}" &&
@@ -24,26 +34,67 @@ config_query_option PHP5_OPTS "Enable FastCGI SAPI?" n \
config_query_option PHP5_OPTS "Enable CGI SAPI?" y \
"--enable-cgi" "--disable-cgi" &&

-config_query_option PHP5_OPTS "Enable CLI version? (needed for PEAR and
CGI/FastCGI)" y \
- "--enable-cli" "--disable-cli" &&
+if [[ "${PHP5_PEAR}" == "y" ]] || list_find "$PHP5_OPTS" "--enable-cgi" ||
list_find "$PHP5_OPTS" "--enable-fastcgi" ; then
+ message "${MESSAGE_COLOR}Enabling CLI version for PEAR/CGI/FastCGI
support${DEFAULT_COLOR}" &&
+ PHP5_OPTS="$PHP5_OPTS --enable-cli"
+else
+ config_query_option PHP5_OPTS "Enable CLI version?" y \
+ "--enable-cli" "--disable-cli"
+fi &&

config_query_option PHP5_OPTS "Enable multibyte support?" n \
"--enable-mbstring --enable-mbregex" \
"--disable-mbstring --disable-mbregex" &&

-config_query_option PHP5_OPTS "Enable the DBA database drivers?
(qdbm/gdbm/db/flatfile)" n \
- "--enable-dba" "--disable-dba" &&
+message "${MESSAGE_COLOR}See http://us.php.net/dba.installation for more
info${DEFAULT_COLOR}" &&
+message "${MESSAGE_COLOR}Not recommended: dbm, ndbm. NOTE: qdbm conflicts
with dbm and gdbm${DEFAULT_COLOR}" &&
+config_query_multi PHP5_DBA_DRIVERS "Select dbm-style database drivers (if
any)" none gdbm db4 flatfile inifile qdbm &&
+
+if ! list_find "${PHP5_DBA_DRIVERS}" "none"; then
+ if list_find "${PHP5_DBA_DRIVERS}" "flatfile"; then
+ PHP5_OPTS="$PHP5_OPTS --enable-inifile"
+ fi
+ if list_find "${PHP5_DBA_DRIVERS}" "flatfile"; then
+ PHP5_OPTS="$PHP5_OPTS --enable-flatfile"
+ fi
+fi &&

-if list_find "${PHP5_OPTS}" "--enable-dba"; then
- config_query_option PHP5_OPTS "Enable DBA inifile support?" y \
- "--enable-inifile" "--disable-inifile" &&
- config_query_option PHP5_OPTS "Enable DBA flatfile support?" y \
- "--enable-flatfile" "--disable-flatfile"
+# get the native simple drivers
+local DB_DRIVERS="mysql mysqli pgsql sqlite sqlite3 firebird unixODBC iODBC"
+config_query_multi PHP5_DATABASE_DRIVERS "Select vendor specific database
drivers to install (if any)" \
+ none all $DB_DRIVERS &&
+
+if ! list_find "${PHP5_DATABASE_DRIVERS}" "none"; then
+ PHP5_OPTS="$PHP5_OPTS --enable-dba" &&
+ for foo in $DB_DRIVERS; do
+ if list_find "${PHP5_DATABASE_DRIVERS}" "$foo" || list_find
"${PHP5_DATABASE_DRIVERS}" "all"; then
+ PHP5_OPTS="$PHP5_OPTS --with-$foo"
+ else
+ PHP5_OPTS="$PHP5_OPTS --without-$foo"
+ fi
+ done
fi &&

-config_query_option PHP5_OPTS "Enable the PDO database drivers?
(mysql/postgresql/oracle/*odbc)" y \
+#ask if they want the PDO drivers for the drivers they selected
+config_query_option PHP5_OPTS "Enable PHP Data Objects?" y \
"--enable-pdo" "--disable-pdo" &&

+if list_find "$PHP5_OPTS" "--enable-pdo"; then
+ local PDO_DRIVERS="mysql pgsql firebird unixODBC iODBC" &&
+ for foo in $PDO_DRIVERS; do
+ if list_find "${PHP5_DATABASE_DRIVERS}" "$foo" || list_find
"${PHP5_DATABASE_DRIVERS}" "all"; then
+ # odbc special case
+ if [[ "$foo" == "unixODBC" ]]; then
+ config_query_option PHP5_OPTS "Enable PDO
driver for unixodbc?" n "--with-pdo-odbc=unixODBC,${INSTALL_ROOT}/usr" ""
+ elif [[ "$foo" == "iODBC" ]]; then
+ config_query_option PHP5_OPTS "Enable PDO
driver for libiodbc?" n "--with-pdo-odbc=iODBC,${INSTALL_ROOT}/usr" ""
+ else
+ config_query_option PHP5_OPTS "Enable PDO
driver for $foo?" n "--with-pdo-$foo=${INSTALL_ROOT}/usr" "--without-pdo-$foo"
+ fi
+ fi
+ done
+fi &&
+
config_query_option PHP5_OPTS "Enable shmop support?" n \
"--enable-shmop" "--disable-shmop" &&

@@ -63,4 +114,12 @@ config_query_list PHP5_APACHE "Which Apache module to
build?" \
none handler filter &&

config_query_list PHP5_GD "Which GD library to use?" \
- none internal external
+ none internal external &&
+
+if [[ "$PHP5_PEAR" == "y" ]]; then
+ config_query_list PHP5_PCRE "Which PCRE library to use (internal
reccomended)?" \
+ internal external
+else
+ config_query_list PHP5_PCRE "Which PCRE library to use (internal
reccomended)?" \
+ internal external none
+fi
diff --git a/php-pear/php/DEPENDS b/php-pear/php/DEPENDS
index b967707..bcc89af 100755
--- a/php-pear/php/DEPENDS
+++ b/php-pear/php/DEPENDS
@@ -1,7 +1,19 @@
. ${GRIMOIRE}/FUNCTIONS &&

-depends flex &&
+# takes two params
+# $1 is the driver name
+# $2 is the spell name (for depending)
+function db_driver_depends() {
+ local db_driver="$1"
+ local db_spell="$2"
+ if list_find "$PHP5_DATABASE_DRIVERS" "$db_driver" || list_find
"$PHP5_DATABASE_DRIVERS" "all"; then
+ depends $db_spell "--with-$db_driver"
+ else
+ OPTS="$OPTS --without-$db_driver"
+ fi
+}

+depends flex &&
# Officially these are optional, but we require them because some other
# optional extensions depend on it, and they're omnipresent anyway
depends readline "--with-readline" &&
@@ -11,10 +23,14 @@ optional_depends bzip2 \
"--with-bz2" "--without-bz2" \
"for compression support" &&

-optional_depends libxml2 \
- '--enable-xml --enable-dom --with-xmlrpc' \
- '--disable-xml --disable-dom --without-xmlrpc
--disable-xmlreader --disable-xmlwriter --disable-simplexml' \
- 'For XML support (required for SOAP and PEAR)' &&
+if [[ "$PHP5_PEAR" == "y" ]]; then
+ depends libxml2 '--enable-xml --enable-dom --with-xmlrpc'
+else
+ optional_depends libxml2 \
+ '--enable-xml --enable-dom
--with-xmlrpc' \
+ '--disable-xml --disable-dom
--without-xmlrpc --disable-xmlreader --disable-xmlwriter --disable-simplexml'
\
+ 'For XML support (required for SOAP)'
+fi

optional_depends libxslt \
"--with-xsl" "--without-xsl" \
@@ -22,14 +38,9 @@ optional_depends libxslt \

if is_depends_enabled $SPELL libxml2 ; then
config_query_option PHP5_OPTS "Enable SOAP support?" n \
- "--enable-soap" "--disable-soap" &&
- if list_find "${PHP5_OPTS}" "--enable-cli"; then
- config_query_option PHP5_OPTS "Enable PEAR support?" y \
- "--enable-pear=${INSTALL_ROOT}/usr/share/pear" \
- "--without-pear"
- fi
+ "--enable-soap" "--disable-soap"
else
- PHP5_OPTS="${PHP5_OPTS} --disable-soap --without-pear"
+ PHP5_OPTS="${PHP5_OPTS} --disable-soap"
fi &&

optional_depends pth \
@@ -41,18 +52,27 @@ case "${PHP5_APACHE}" in
filter) depends APACHE2;;
esac &&

-optional_depends pcre \
- "--with-pcre-regex=${INSTALL_ROOT}/usr
--with-pcre=${INSTALL_ROOT}/usr" \
- "--without-pcre-regex --without-pcre" \
- "for perl regular expressions support (required for PEAR)"
&&
+if [[ "$PHP5_PCRE" == "none" ]]; then
+ PHP5_OPTS="$PHP5_OPTS --without-pcre-regex --without-pcre"
+elif [[ "$PHP5_PCRE" == "external" ]]; then
+ depends pcre "--with-pcre-regex=${INSTALL_ROOT}/usr
--with-pcre=${INSTALL_ROOT}/usr"
+fi &&

optional_depends C-CLIENT \
"--with-imap=${INSTALL_ROOT}/usr" "--without-imap" \
"for IMAP support" &&

+optional_depends openssl \
+ "--with-openssl" "--without-openssl" \
+ "for OpenSSL support" &&
+
if list_find "${OPTS}" "--with-imap"; then
- optional_depends openssl "--with-imap-ssl" "--without-imap-ssl" \
- "for SSL support with IMAP"
+ if is_depends_enabled $SPELL openssl; then
+ OPTS="$OPTS --with-imap-ssl"
+ else
+ optional_depends openssl "--with-imap-ssl"
"--without-imap-ssl" \
+ "for SSL
support with IMAP (but not elsewhere)"
+ fi
fi &&

optional_depends MAIL-TRANSPORT-AGENT \
@@ -93,10 +113,6 @@ optional_depends gmp \
"--with-gmp" "--without-gmp" \
"GNU multi-precision library support" &&

-optional_depends openssl \
- "--with-openssl" "--without-openssl" \
- "for OpenSSL support" &&
-
optional_depends krb5 \
"--with-kerberos" "--without-kerberos" \
"for Kerberos support" &&
@@ -110,85 +126,47 @@ optional_depends icu \
"--without-icu-dir" \
"for ICU unicode support" &&

-optional_depends ODBC-MGR "" "" "for ODBC support" &&
-
-case $(get_spell_provider $SPELL ODBC-MGR) in
- unixodbc) OPTS="${OPTS} --with-unixODBC=${INSTALL_ROOT}/usr
--without-iodbc" ;;
- libiodbc) OPTS="${--with-iodbc=${INSTALL_ROOT}}/usr --without-unixODBC" ;;
-esac &&
-
-optional_depends mysql "" "--without-mysql" "for MySQL support" &&
-if is_depends_enabled $SPELL mysql && [[ "${VERSION:0:3}" == "5.3" ]]; then
- config_query PHP5_MYSQLND "Do you want to use the MySQL Native Driver
[mysqlnd]? (experimental)" y &&
-
- if [[ "${PHP5_MYSQLND}" == "y" ]]; then
- PHP5_OPTS="${PHP5_OPTS} --with-mysql=mysqlnd"
- else
- PHP5_OPTS="${PHP5_OPTS} --with-mysql"
- fi
- config_query_option PHP5_OPTS "Do you want to build the MySQLi
extension?" n \
- "--with-mysqli" "--without-mysqli"
-elif is_depends_enabled $SPELL mysql && [[ "${VERSION:0:3}" != "5.3" ]]; then
- PHP5_OPTS="${PHP5_OPTS} --with-mysql"
+# new database madness
+# DB_DRIVERS="mysql mysqli pgsql sqlite sqlite3 firebird unixODBC iODBC"
+# PDO_DRIVERS="mysql pgsql firebird unixODBC iODBC"
+if list_find "$PHP5_DATABASE_DRIVERS" "mysql" || list_find
"$PHP5_DATABASE_DRIVERS" "all"; then
+ depends mysql "" &&
+ if [[ "${VERSION:0:3}" == "5.3" ]]; then
+ config_query PHP5_MYSQLND "Do you want to use the MySQL
Native Driver [mysqlnd]? (expiremental)" n &&
+ if [[ "${PHP5_MYSQLND}" == "y" ]]; then
+ PHP5_OPTS="$PHP5_OPTS --with-mysql=mysqlnd"
+ else
+ PHP5_OPTS="$PHP5_OPTS --with-mysql"
+ fi
+ fi
+else
+ OPTS="$OPTS --without-mysql"
fi &&
-
-optional_depends postgresql \
- "--with-pgsql" "--without-pgsql" \
- "for native Postgresql support" &&
-
-optional_depends sqlite \
- "--with-sqlite3=${INSTALL_ROOT}/usr --enable-sqlite-utf8"
"--without-sqlite" \
- "for SQLite support" &&
-
-if list_find "${PHP5_OPTS}" "--enable-pdo"; then
-
- if is_depends_enabled $SPELL postgresql ; then
- config_query_option PHP5_OPTS "Do you want to build the SQLite PDO
driver?" y \
- "--with-pdo-sqlite=${INSTALL_ROOT}/usr"
"--without-pdo-sqlite"
- fi &&
- optional_depends firebird \
- "--with-pdo-firebird=${INSTALL_ROOT}/opt/firebird"
"--without-pdo-firebird" \
- "for native Firebird support" &&
-
- if is_depends_enabled $SPELL postgresql ; then
- config_query_option PHP5_OPTS "Do you also want to build the PostgreSQL
PDO driver?" n \
- "--with-pdo-pgsql" "--without-pdo-pgsql"
- fi &&
-
- if is_depends_enabled $SPELL mysql ; then
- if [[ "${VERSION:0:3}" == "5.3" ]] && [[ "${PHP5_MYSQLND}" == "y" ]];
then
- config_query_option PHP5_OPTS "Do you also want to build the MySQL
PDO driver?" n \
- "--with-pdo-mysql=mysqlnd" "--without-pdo-mysql"
- else
- config_query_option PHP5_OPTS "Do you also want to build the MySQL
PDO driver?" n \
- "--with-pdo-mysql" "--without-pdo-mysql"
- fi
- fi &&
-
- case $(get_spell_provider $SPELL ODBC-MGR) in
- unixodbc) config_query_option PHP5_OPTS \
- "Do you also want to build the unixODBC PDO driver?"
n \
- "--with-pdo-odbc=unixODBC,${INSTALL_ROOT}/usr" \
- "--without-pdo-odbc" ;;
- libiodbc) config_query_option PHP5_OPTS \
- "Do you also want to build the iODBC PDO driver?" n \
- "--with-pdo-odbc=iODBC,${INSTALL_ROOT}/usr" \
- "--without-pdo-odbc" ;;
- esac
+db_driver_depends "mysqli" "mysql" &&
+db_driver_depends "pgsql" "postgresql" &&
+db_driver_depends "sqlite" "sqlite2" &&
+db_driver_depends "sqlite3" "sqlite" &&
+db_driver_depends "firebird" "firebird" &&
+# unixODBC and iODBC are mutually exclusive... first one in wins?
+if list_find "$PHP5_DATABASE_DRIVERS" "unixODBC" || list_find
"$PHP5_DATABASE_DRIVERS" "all"; then
+ depends unixodbc "--with-unixODBC=${INSTALL_ROOT}/usr --without-iodbc"
+elif list_find "$PHP5_DATABASE_DRIVERS" "iODBC"; then
+ depends unixodbc "--with-iodbc=${INSTALL_ROOT}/usr --without-unixODBC"
+else
+ OPTS="$OPTS --without-iodbc --without-unixODBC"
fi &&
+#ND

+#DBA drivers
if list_find "${PHP5_OPTS}" "--enable-dba"; then
- optional_depends qdbm \
- "--with-qdbm" "--without-qdbm" \
- "qdbm database routines" &&
-
- optional_depends db \
- "--with-db4" "--without-db4" \
- "qdbm database routines" &&
-
- optional_depends gdbm \
- "--with-gdbm" "--without-gdbm" \
- "database routines that use extensive hashing"
+ for foo in $PHP5_DBA_DRIVERS; do
+ # handle the few special cases
+ if [[ "$foo" == "db4" ]]; then
+ depends db "--with-db4"
+ elif [[ "$foo" != "flatfile" ]] && [[ "$foo" != "inifile" ]];
then
+ depends $foo "--with-$foo"
+ fi
+ done
fi &&

optional_depends openldap \
diff --git a/php-pear/php/HISTORY b/php-pear/php/HISTORY
index 3aa2cdc..b0f44a6 100644
--- a/php-pear/php/HISTORY
+++ b/php-pear/php/HISTORY
@@ -1,3 +1,10 @@
+2009-09-14 David Kowis <dkowis AT shlrm.org>
+ * CONFIGURE: added database driver selection, configured most of
+ spell here. Added smarter question for PCRE
+ * DEPENDS: removed optional driver dependency, and reorganized to
+ respond based on what happened in CONFIGURE
+ * PREPARE: added message regarding suhosin patchset
+
2009-07-30 Arjan Bouter <abouter AT sourcemage.org>
* DETAILS: set alpha version to 5.3.0 as that's more recent
set suhosin version to 5.2.10 as there's no 5.3.0 patch
diff --git a/php-pear/php/INSTALL b/php-pear/php/INSTALL
index 58b5fd3..b0a19c9 100755
--- a/php-pear/php/INSTALL
+++ b/php-pear/php/INSTALL
@@ -1,3 +1,7 @@
default_install &&

-install_config_file php.ini-production /etc/php.ini
+if [[ "${VERSION:0:3}" == "5.3" ]]; then
+ install_config_file $SOURCE_DIRECTORY/php.ini-production /etc/php.ini
+else
+ install_config_file $SOURCE_DIRECTORY/php.ini-recommended /etc/php.ini
+fi
diff --git a/php-pear/php/PREPARE b/php-pear/php/PREPARE
index f17b880..56af4b1 100755
--- a/php-pear/php/PREPARE
+++ b/php-pear/php/PREPARE
@@ -5,6 +5,7 @@ if [[ "${PHP5_RC}" != "y" ]]; then

if [[ "${PHP5_ALPHA}" != "y" ]]; then
message "For more information on Suhosin patchset see:
http://www.hardened-php.net/suhosin/"; &&
+ message "${MESSAGE_COLOR}Currently the Suhosin Patchset
forces version 5.2 of php${DEFAULT_COLOR}" &&
config_query PHP5_SUHOSIN "Do you want tho suhosin patchset
enabled?" n
fi
fi
diff --git a/printer/cups/DETAILS b/printer/cups/DETAILS
index 737ee97..b838989 100755
--- a/printer/cups/DETAILS
+++ b/printer/cups/DETAILS
@@ -1,10 +1,10 @@
SPELL=cups
if [[ $CUPS_VER == devel ]];then
- VERSION=1.4.0
-
SOURCE_HASH=sha512:92376522997b73c3fc65e1598e3aa7da80bf704292da4c0b21909f49df40329cc31054aea6d8c817eedf87748b051788781828bb7ad00234bebdc5829dbed5be
+ VERSION=1.4.1
+
SOURCE_HASH=sha512:b1a389e59c757d71800ce28c74ae1be3017be8b1cb38e84ff431715660d3bad46a40c55954bd623a5d5a4ac37826e11a4957d53f421c78ab76ce13789a557d84
else
- VERSION=1.3.11
-
SOURCE_HASH=sha512:9302b4b0f89dfca9b5263d2eb65263d142aa7a3e06b92a0aab14768a38bc8cbe05dcba4692877dd8f31509f307f74b0eae9845bebf109a1b4d0b10bcaab9e23c
+ VERSION=1.4.1
+
SOURCE_HASH=sha512:b1a389e59c757d71800ce28c74ae1be3017be8b1cb38e84ff431715660d3bad46a40c55954bd623a5d5a4ac37826e11a4957d53f421c78ab76ce13789a557d84
SECURITY_PATCH=3
fi
SOURCE=$SPELL-$VERSION-source.tar.bz2
diff --git a/printer/cups/HISTORY b/printer/cups/HISTORY
index cfbca2f..2287cce 100644
--- a/printer/cups/HISTORY
+++ b/printer/cups/HISTORY
@@ -1,3 +1,6 @@
+2009-09-13 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 1.4.1
+
2009-08-29 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.4.0 (devel)

diff --git a/python-pypi/pygments/DETAILS b/python-pypi/pygments/DETAILS
index f1668aa..29aa745 100755
--- a/python-pypi/pygments/DETAILS
+++ b/python-pypi/pygments/DETAILS
@@ -1,6 +1,6 @@
SPELL=pygments
- VERSION=1.0
-
SOURCE_HASH=sha512:dc285e8a8ef94658e78e4a0f3129d27f473edba0ceeda6bb84be5338b4942b7a9c03438b442fe192c69fa1c2c3a406ba18f2f812c0d1aa5123da4bf14134dc16
+ VERSION=1.1
+
SOURCE_HASH=sha512:6ff3054304ad1448f37eabffc43b9d08a2925d5b33ef19c98523d46908bd0ba83c882d168913b3dfc021e6d043a8fbf386a75151e6d60d7b900a92c542a5da01
SOURCE=Pygments-$VERSION.tar.gz
SOURCE_URL[0]=http://pypi.python.org/packages/source/P/Pygments/$SOURCE
SOURCE_DIRECTORY="$BUILD_DIRECTORY/Pygments-$VERSION"
diff --git a/python-pypi/pygments/HISTORY b/python-pypi/pygments/HISTORY
index 8a32f48..88a34de 100644
--- a/python-pypi/pygments/HISTORY
+++ b/python-pypi/pygments/HISTORY
@@ -1,5 +1,9 @@
+2009-09-11 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 1.1
+
2009-07-27 Donald Johnson <ltdonny AT gmail.com>
* DEPENDS: Added setuptools as a dependency.
+
2008-12-16 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: VERSION 1.0

diff --git a/security/thc-hydra/DEPENDS b/security/thc-hydra/DEPENDS
index 5513a1a..e0c4d3a 100755
--- a/security/thc-hydra/DEPENDS
+++ b/security/thc-hydra/DEPENDS
@@ -4,12 +4,22 @@ optional_depends "libssh" \
"" \
"Support for SSH module" &&

+optional_depends "postgresql" \
+ "" \
+ "" \
+ "Support for Postgres module" &&
+message "or alternatively, use libpqxx" &&
optional_depends "libpqxx" \
"" \
"" \
"Support for Postgres module" &&

-optional_depends "gtk+" \
- "" \
- "" \
+optional_depends "subversion" \
+ "" \
+ "" \
+ "Support for SVN module" &&
+
+optional_depends "gtk+2" \
+ "" \
+ "--disable-xhydra" \
"Compiles gtk+ GUI xhydra."
diff --git a/security/thc-hydra/DETAILS b/security/thc-hydra/DETAILS
index 6b4a63c..1300df1 100755
--- a/security/thc-hydra/DETAILS
+++ b/security/thc-hydra/DETAILS
@@ -1,12 +1,11 @@
SPELL=thc-hydra
- VERSION=5.3
+ VERSION=5.4
SOURCE=hydra-$VERSION-src.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/hydra-$VERSION-src
- SOURCE_URL[0]=http://www.thc.org/releases/$SOURCE
+ SOURCE_URL[0]=http://freeworld.thc.org/releases/$SOURCE
WEB_SITE=http://www.thc.org/thc-hydra
ENTERED=20041208
- UPDATED=20050429
-
SOURCE_HASH=sha512:937da53c503c52c196df4d7e92f268ad9807b0524ee7eed727992f0b48abe1175a09ac368a7e3e87c9828a9ba41658b8973f6f110e07af7592bd2a583e04d826
+
SOURCE_HASH=sha512:0afe21d16a49d364476cc35cb8cdb4885a5f622385c672d11e75ba85b6015c9d605b451b162f17d6fab22f05ddbcae53c4c04572d200f3487f91e32caef36aa4
LICENSE[0]=GPL
KEYWORDS="security"
SHORT="THC-Hydra - the best parallized login hacker"
diff --git a/security/thc-hydra/HISTORY b/security/thc-hydra/HISTORY
index 7819d3a..f364434 100644
--- a/security/thc-hydra/HISTORY
+++ b/security/thc-hydra/HISTORY
@@ -1,3 +1,6 @@
+2009-09-08 Arjan Bouter <abouter AT sourcemage.org>
+ * DETAILS: version 5.4
+
2006-10-17 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* DEPENDS: openssl isn't optional #12152

diff --git a/smgl/fakeroot/DETAILS b/smgl/fakeroot/DETAILS
index 8c02dcf..c76f44c 100755
--- a/smgl/fakeroot/DETAILS
+++ b/smgl/fakeroot/DETAILS
@@ -1,8 +1,8 @@
SPELL=fakeroot
- VERSION=1.5.1
+ VERSION=1.13
SOURCE=${SPELL}_${VERSION}.tar.gz
SOURCE_URL[0]=http://ftp.debian.org/debian/pool/main/f/$SPELL/$SOURCE
- SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
+
SOURCE_HASH=sha512:a23053d04c5222bb5a5667283d0a100a572ed83525854a63245c7b87fb76bc0f7af08a0479c5095b9c01c4cb901c84ebc0302c5be06e9f54d4a31ba574209bf2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
WEB_SITE=http://fakeroot.alioth.debian.org/
ENTERED=20050604
diff --git a/smgl/fakeroot/HISTORY b/smgl/fakeroot/HISTORY
index c6c67f0..5409bc4 100644
--- a/smgl/fakeroot/HISTORY
+++ b/smgl/fakeroot/HISTORY
@@ -1,3 +1,6 @@
+2009-09-15 Quentin Rameau <quinq AT sourcemage.org>
+ * DETAILS: updated to version 1.13
+
2006-10-03 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: [automated] Removed UPDATED.

diff --git a/smgl/fakeroot/fakeroot_1.5.1.tar.gz.sig
b/smgl/fakeroot/fakeroot_1.5.1.tar.gz.sig
deleted file mode 100644
index 920e35f..0000000
Binary files a/smgl/fakeroot/fakeroot_1.5.1.tar.gz.sig and /dev/null differ
diff --git a/smgl/smgl-upstart/HISTORY b/smgl/smgl-upstart/HISTORY
index fe229c4..6c3aa1f 100644
--- a/smgl/smgl-upstart/HISTORY
+++ b/smgl/smgl-upstart/HISTORY
@@ -1,3 +1,9 @@
+2009-09-15 Arjan Bouter <abouter AT sourcemage.org>
+ * improved the native init scripts
+
+2009-09-11 Arjan Bouter <abouter AT sourcemage.org>
+ * rewritten native scripts to emit events to avoid race conditions
+
2009-09-07 Arjan Bouter <abouter AT sourcemage.org>
* BUILD,DEPENDS,DETAILS,INSTALL,PRE_BUILD,upstart-init/*: created
spell
based on the upstart example scripts.
diff --git a/smgl/smgl-upstart/INSTALL b/smgl/smgl-upstart/INSTALL
index 7db4c4a..d4ff75a 100755
--- a/smgl/smgl-upstart/INSTALL
+++ b/smgl/smgl-upstart/INSTALL
@@ -1,4 +1,4 @@
UPSTART_DIR="${INSTALL_ROOT}/etc/init" &&
mkdir -p ${UPSTART_DIR} &&
-cp ${SCRIPT_DIRECTORY}/upstart-init/${UPSTART_INIT}/* ${UPSTART_DIR} &&
+cp -r ${SCRIPT_DIRECTORY}/upstart-init/${UPSTART_INIT}/* ${UPSTART_DIR} &&
install_config_file ${SCRIPT_DIRECTORY}/inittab.${UPSTART_INIT}
${INSTALL_ROOT}/etc/inittab
diff --git a/smgl/smgl-upstart/inittab.native
b/smgl/smgl-upstart/inittab.native
index ef2b240..ccb906e 100644
--- a/smgl/smgl-upstart/inittab.native
+++ b/smgl/smgl-upstart/inittab.native
@@ -1,15 +1,12 @@
-bootprog = rc
+#bootprog = rc
# change this to switch to your own upstart init-scripts
fileprefix = /etc/init
PATH = /sbin:/bin:/usr/sbin:/usr/bin
-INIT_PATH = smgl
+#INIT_PATH =

tty1:linux:/sbin/agetty /dev/tty1 9600
tty2:linux:/sbin/agetty /dev/tty2 9600
tty3:linux:/sbin/agetty /dev/tty3 9600
-tty4:linux:/sbin/agetty /dev/tty4 9600
-tty5:linux:/sbin/agetty /dev/tty5 9600
-tty6:linux:/sbin/agetty /dev/tty6 9600

finalprog =
quietrollback = yes
diff --git a/smgl/smgl-upstart/upstart-init/native/README
b/smgl/smgl-upstart/upstart-init/native/README
index e35c15d..19bbea9 100644
--- a/smgl/smgl-upstart/upstart-init/native/README
+++ b/smgl/smgl-upstart/upstart-init/native/README
@@ -1,9 +1,10 @@
Some useful things to know about upstart on smgl

-- The jobs upstart knows about are in the *.conf files, one file per
service/daemon/task/job
+- The jobs upstart knows about are in the *.conf files, one file per
service/daemon/task/job, add or remove the .conf
+ part to en-/disable the job
- The jobs MAY NOT FAIL, or the entire boot process is halted...
- use a script in the scripts dir and a job pointing to it when a job can
fail and make sure the script exits cleanly
-- daemons shouldn't disassociate themselves from the invoking tty if upstart
it to track them
+- if a job needs to emit a signal, name it <jobname>-start or <jobname>-stop
for consistency

feel free to post bugs with additional jobs on http://bugs.sourcemage.org
and assign them to abouter AT sourcemage.org
I'll get to them eventually, or just put them in the spell yourself if you
have git access ;)
diff --git a/smgl/smgl-upstart/upstart-init/native/alsa.conf
b/smgl/smgl-upstart/upstart-init/native/alsa.conf
index e044a98..def66bf 100644
--- a/smgl/smgl-upstart/upstart-init/native/alsa.conf
+++ b/smgl/smgl-upstart/upstart-init/native/alsa.conf
@@ -5,7 +5,7 @@
description "Restore alsa settings"
author "Arjan Bouter <abouter AT sourcemage.org>"

-start on started mount_all
+start on mount_all-start
stop on shutdown

emits alsa-start alsa-stop
@@ -13,9 +13,9 @@ emits alsa-start alsa-stop
task

script
- . /etc/sysconfig/alsa
+ [ -e /etc/sysconfig/alsa ] && . /etc/sysconfig/alsa
declare -r ASOUNDCFG=/etc/asound.state
- [[ "$START_ALSA" == no ]] && exit 0
+ [[ "$START_ALSA" == no ]] && return 0
if [[ -d /proc/asound ]]; then
if ! [[ -r "$ASOUNDCFG" ]]; then
echo "No mixer config in $ASOUNDCFG, you have to unmute your card!"
@@ -23,4 +23,5 @@ script
/usr/sbin/alsactl -f $ASOUNDCFG restore
fi
fi
+ initctl emit alsa-start
end script
diff --git a/smgl/smgl-upstart/upstart-init/native/avahi.conf
b/smgl/smgl-upstart/upstart-init/native/avahi.conf
index bdbd9ce..2fc2c17 100644
--- a/smgl/smgl-upstart/upstart-init/native/avahi.conf
+++ b/smgl/smgl-upstart/upstart-init/native/avahi.conf
@@ -5,7 +5,7 @@
description "Enable avahi-daemon"
author "Arjan Bouter <abouter AT sourcemage.org>"

-start on started syslog and network-up
+start on syslog-start and network-start
stop on shutdown

exec /usr/sbin/avahi-daemon -s
diff --git a/smgl/smgl-upstart/upstart-init/native/clamav
b/smgl/smgl-upstart/upstart-init/native/clamav
new file mode 100644
index 0000000..b3d72de
--- /dev/null
+++ b/smgl/smgl-upstart/upstart-init/native/clamav
@@ -0,0 +1,13 @@
+# clamav
+#
+# starts clamd
+
+description "Start ClamAV"
+author "Arjan Bouter <abouter AT sourcemage.org>"
+
+emits clamav-started clamav-stopped
+
+start on network-start and syslog-start
+stop on shutdown
+
+exec /usr/sbin/clamd
diff --git a/smgl/smgl-upstart/upstart-init/native/clamav.conf
b/smgl/smgl-upstart/upstart-init/native/clamav.conf
deleted file mode 100644
index fe8f580..0000000
--- a/smgl/smgl-upstart/upstart-init/native/clamav.conf
+++ /dev/null
@@ -1,13 +0,0 @@
-# clamav
-#
-# starts clamd
-
-description "Start ClamAV"
-author "Arjan Bouter <abouter AT sourcemage.org>"
-
-emits clamav-started clamav-stopped
-
-start on network-up and started syslog
-stop on shutdown
-
-exec /usr/sbin/clamd
diff --git a/smgl/smgl-upstart/upstart-init/native/dbus.conf
b/smgl/smgl-upstart/upstart-init/native/dbus.conf
index 4001878..4f4d899 100644
--- a/smgl/smgl-upstart/upstart-init/native/dbus.conf
+++ b/smgl/smgl-upstart/upstart-init/native/dbus.conf
@@ -7,8 +7,7 @@ author "Arjan Bouter <abouter AT sourcemage.org>"

emits dbus-start dbus-stop

-#start on started devices
-start on started mount_all
+start on mount_all-start
stop on shutdown

pre-start script
@@ -16,7 +15,8 @@ pre-start script
end script

script
-# [[ -e /var/run/dbus/pid ]] && rm /var/run/dbus/*
- dbus-daemon --system --nofork
+ [ -e /var/run/dbus/pid ] && rm -rf /var/run/dbus/*
+ dbus-daemon --system
dbus-uuidgen --ensure
+ initctl emit dbus-start
end script
diff --git a/smgl/smgl-upstart/upstart-init/native/devices.conf
b/smgl/smgl-upstart/upstart-init/native/devices.conf
index a045dd8..427adcc 100644
--- a/smgl/smgl-upstart/upstart-init/native/devices.conf
+++ b/smgl/smgl-upstart/upstart-init/native/devices.conf
@@ -6,15 +6,18 @@
description "Populates /dev"
author "Arjan Bouter <abouter AT sourcemage.org>"

-#start on started mount_root
+start on mount_root-start
stop on shutdown

+emits devices-start
+
task

-script
- . /etc/sysconfig/devices
+script
+ [ -e /etc/sysconfig/devices ] && . /etc/sysconfig/devices
case $DEVICES in
- udev) mount -t tmpfs dev /dev
+ udev) echo "using udev to manage /dev"
+ mount -t tmpfs dev /dev
ln -s /proc/self/fd /dev/fd
ln -s /dev/fd/0 /dev/stdin
ln -s /dev/fd/1 /dev/stdout
@@ -25,8 +28,10 @@ script
mount -t devpts devpts /dev/pts
udevd --daemon
udevadm trigger
- udevadm settle ;;
+ udevadm settle --quiet
+ echo "done starting udev" ;;
static) echo "static /dev nothing to do" ;;
*) echo "unsupported /dev system, aborting" ;;
esac
+ initctl emit devices-start
end script
diff --git a/smgl/smgl-upstart/upstart-init/native/freshclam
b/smgl/smgl-upstart/upstart-init/native/freshclam
new file mode 100644
index 0000000..ed678c4
--- /dev/null
+++ b/smgl/smgl-upstart/upstart-init/native/freshclam
@@ -0,0 +1,11 @@
+# freshclam
+#
+# starts freshclam
+
+description "Start Freshclam, the Clamav updater"
+author "Arjan Bouter <abouter AT sourcemage.org>"
+
+start on network-start and syslog-start
+stop on shutdown
+
+exec /usr/bin/freshclam -d
diff --git a/smgl/smgl-upstart/upstart-init/native/freshclam.conf
b/smgl/smgl-upstart/upstart-init/native/freshclam.conf
deleted file mode 100644
index caf8cba..0000000
--- a/smgl/smgl-upstart/upstart-init/native/freshclam.conf
+++ /dev/null
@@ -1,11 +0,0 @@
-# freshclam
-#
-# starts freshclam
-
-description "Start Freshclam, the Clamav updater"
-author "Arjan Bouter <abouter AT sourcemage.org>"
-
-start on network-up and started syslog
-stop on shutdown
-
-exec /usr/bin/freshclam -d
diff --git a/smgl/smgl-upstart/upstart-init/native/gdm.conf
b/smgl/smgl-upstart/upstart-init/native/gdm.conf
index 76d04b2..abb7d40 100644
--- a/smgl/smgl-upstart/upstart-init/native/gdm.conf
+++ b/smgl/smgl-upstart/upstart-init/native/gdm.conf
@@ -5,7 +5,7 @@
description "Start GDM"
author "Arjan Bouter <abouter AT sourcemage.org>"

-start on started hald
+start on hald-start
stop on shutdown

exec /usr/sbin/gdm
diff --git a/smgl/smgl-upstart/upstart-init/native/hald.conf
b/smgl/smgl-upstart/upstart-init/native/hald.conf
index 6fcdca3..1376314 100644
--- a/smgl/smgl-upstart/upstart-init/native/hald.conf
+++ b/smgl/smgl-upstart/upstart-init/native/hald.conf
@@ -5,7 +5,12 @@
description "Start a hald demon"
author "Arjan Bouter <abouter AT sourcemage.org>"

-start on network-up
+start on network-start
stop on shutdown

-exec /usr/sbin/hald --daemon=no
+emits hald-start hald-stop
+
+script
+ /usr/sbin/hald
+ initctl emit hald-start
+end script
diff --git a/smgl/smgl-upstart/upstart-init/native/hostname.conf
b/smgl/smgl-upstart/upstart-init/native/hostname.conf
index d124651..9ac58bc 100644
--- a/smgl/smgl-upstart/upstart-init/native/hostname.conf
+++ b/smgl/smgl-upstart/upstart-init/native/hostname.conf
@@ -5,7 +5,7 @@
description "Sets hostname"
author "Arjan Bouter <abouter AT sourcemage.org>"

-start on started devices
+start on devices-start
stop on shutdown

task
diff --git a/smgl/smgl-upstart/upstart-init/native/libvirtd.conf
b/smgl/smgl-upstart/upstart-init/native/libvirtd.conf
new file mode 100644
index 0000000..06aa4c1
--- /dev/null
+++ b/smgl/smgl-upstart/upstart-init/native/libvirtd.conf
@@ -0,0 +1,15 @@
+# libvirtd
+#
+# starts libvirtd
+
+description "Start libvirtd"
+author "Arjan Bouter <abouter AT sourcemage.org>"
+
+start on started xend
+stop on stopped xend
+
+pre-start script
+ [[ ! -d /var/run/libvirt ]] && mkdir -p /var/run/libvirt
+end script
+
+exec /usr/sbin/libvirtd
diff --git a/smgl/smgl-upstart/upstart-init/native/lighttpd.conf
b/smgl/smgl-upstart/upstart-init/native/lighttpd.conf
index bc664c3..455bc54 100644
--- a/smgl/smgl-upstart/upstart-init/native/lighttpd.conf
+++ b/smgl/smgl-upstart/upstart-init/native/lighttpd.conf
@@ -5,7 +5,7 @@
description "Start lighttpd"
author "Arjan Bouter <abouter AT sourcemage.org>"

-start on network-up and started syslog
+start on network-start and syslog-start
stop on shutdown

exec /usr/sbin/lighttpd -D -f /etc/lighttpd.conf
diff --git a/smgl/smgl-upstart/upstart-init/native/lvm.conf
b/smgl/smgl-upstart/upstart-init/native/lvm.conf
deleted file mode 100644
index 2e8776c..0000000
--- a/smgl/smgl-upstart/upstart-init/native/lvm.conf
+++ /dev/null
@@ -1,19 +0,0 @@
-# lvm
-#
-# scans and activates any LVM partitions
-
-description "Find and enable LVM"
-author "Arjan Bouter <abouter AT sourcemage.org>"
-
-#start on started devices
-stop on shutdown
-
-emits lvm-start lvm-stop
-
-task
-console output
-
-script
- vgscan
- vgchange -ay
-end script
diff --git a/smgl/smgl-upstart/upstart-init/native/mount_all.conf
b/smgl/smgl-upstart/upstart-init/native/mount_all.conf
index fa1d12a..2776c69 100644
--- a/smgl/smgl-upstart/upstart-init/native/mount_all.conf
+++ b/smgl/smgl-upstart/upstart-init/native/mount_all.conf
@@ -1,15 +1,119 @@
-# mountall
+# mount_all
#
-# mounts everything in /etc/fstab
+# mount local filesystems
+# based on the init.d init scripts

-description "Mount filesystems from /etc/fstab"
+description "Mounts local filesystems"
author "Arjan Bouter <abouter AT sourcemage.org>"

-#start on started devices
-#start on started lvm
+start on devices-start
stop on shutdown

-emits filesystems-mounted
+emits mount_all-start
+
task
+console output
+
+script
+
+ [ -e /etc/sysconfig/init ] && . /etc/sysconfig/init
+ [ -e /etc/sysconfig/mountall ] && . /etc/sysconfig/mountall
+
+ # find devices that were set up in initramfs/rd
+ if [ -x /sbin/dmsetup ]; then
+ echo "(re)Creating device mapper nodes..."
+ # won't check retval because kernel just may lack device mapper
+ dmsetup mknodes || echo "failed (re)creating nodes"
+ fi
+
+ if [ -x /sbin/vgscan ] && [ -x /sbin/vgchange ]; then
+ echo "Scanning for and initializing all available LVM volume groups..."
+ /sbin/vgscan --ignorelockingfailure --mknodes
+ /sbin/vgchange -ay --ignorelockingfailure
+ fi
+
+# if [ -x /usr/sbin/cryptsetup ] && [ -f /etc/crypttab ]; then
+# echo "Attempting to open luks encrypted partitions"
+# grep -v '^#' /etc/crypttab |
+# grep -v '^$' |
+# while read line
+# do
+# if [ -z "$line" ]; then
+# echo "empty crypttab, skipping"
+# else
+# parts=( $line )
+# echo "Opening ${parts[0]} as ${parts[1]}"
+# if cryptsetup isLuks ${parts[0]}; then
+# if [[ -b /dev/mapper/${parts[1]} ]]; then
+# builtin echo "Device already exists maybe its open already"
+# else
+# cryptsetup luksOpen ${parts[0]} ${parts[1]} < /dev/console >
/dev/console 2>&1
+# fi
+# else
+# builtin echo "Error device ${parts[0]} isn't a luks partition"
+# fi
+# fi
+# done
+# fi
+
+ [ -e /fastboot ] && return
+ [ -e /forcefsck ] && FORCE="-f"
+ [ "$NOSOFTFIX" != yes ] && FIX="-a"
+ [ "$FSCKFIX" = yes ] && FIX="-y"
+ [ -z "$FIX" ] && FIX="-n" # need at least -n, -y, or -a for
non-tty fsck
+ [ "$FORCE" = yes ] && FORCE="-f"
+
+ echo "Checking file systems..."
+ fsck -T -C -A -R $FIX $FORCE
+ if [ $? -gt 1 ]; then
+ $WARNING
+ echo "fsck failed."
+ echo "Please repair your file system"
+ echo "manually by running /sbin/fsck"
+ echo "without the -a option"
+ $NORMAL
+ /sbin/sulogin
+ /sbin/reboot -f
+ fi
+
+ [ -e /fastboot ] && rm -f /fastboot
+ [ -e /forcefsck ] && rm -f /forcefsck
+
+ if [ -x /sbin/swapon ]; then
+ echo "Activating swap... "
+ swapon -a
+ fi
+
+ echo "Mounting local filesystems..."
+# Fixed so as to not mount networked filesystems yet (no networking)
+# mountnetwork.sh will take care of this.
+ mount -a -t nocifs,noncpfs,nonfs,nosmbfs,notmpfs,no9p
+# mount tmpfs mounts after physical partitions they might mount to (bug 3597)
+ mount -a -t tmpfs
+
+ # bug 7311 - if proc was mounted, list it in mtab; awk is /usr friendly
+ if awk 'BEGIN{proc=1} /\/proc/{proc=0} END{exit proc}' /proc/mounts; then
+ builtin echo 'none /proc proc rw 0 0' >> /etc/mtab
+ fi
+
+#As per FHS sm bug #10509
+#FIXME: doing this here kills upstart... fix this bug again later...
+# echo "Cleaning out /var/run..."
+# [ -d /var/run ] && rm -rf /var/run/*
+
+# if [ "$CLEAN_TMP" == "yes" ] ; then
+# echo "Cleaning out /tmp..."
+# [ -d /tmp ] && shopt -s dotglob && rm -rf /tmp/* && shopt -u dotglob
+# fi
+
+ echo "Creating /var/run/utmp..."
+ [ -d /var/run ] && touch /var/run/utmp
+
+ echo "Writing dmesg log to /var/log/dmesg..."
+ [ -d /var/log ] && dmesg > /var/log/dmesg
+
+# echo "Making /tmp/.ICE-unix temporary directory..."
+# [ -d /tmp ] && mkdir -p /tmp/.ICE-unix && chmod 1777 /tmp/.ICE-unix

-exec mount -a
+ initctl emit mount_all-start
+end script
diff --git a/smgl/smgl-upstart/upstart-init/native/mount_root.conf
b/smgl/smgl-upstart/upstart-init/native/mount_root.conf
index b5dd89e..eb50886 100644
--- a/smgl/smgl-upstart/upstart-init/native/mount_root.conf
+++ b/smgl/smgl-upstart/upstart-init/native/mount_root.conf
@@ -1,25 +1,88 @@
# mount_root
#
# mount root filesystem and pseudo filesystems
+# based on the init.d init scripts

description "Mounts rootfs and various pseudo filesystems"
author "Arjan Bouter <abouter AT sourcemage.org>"

-#start on startup
+start on startup
stop on shutdown

-emits rootfs-mounted rootfs-unmounted
+emits mount_root-start mount_rootfs-stop

task
console output

script
- mount -o remount,rw /
- #cleaning up a bit
- rm /etc/mtab
+ [ -e /etc/sysconfig/init ] && . /etc/sysconfig/init
+
+ # proc and sys are needed for scanlvm
mount -t proc proc /proc
mount -t sysfs sysfs /sys
+
+ # find devices that were set up in initramfs/rd
+ if [ -x /sbin/dmsetup ]; then
+ echo "(re)Creating device mapper nodes..."
+ # won't check retval because kernel just may lack device mapper
+ /sbin/dmsetup mknodes
+ else
+ echo "Not running dmsetup"
+ fi
+
+ if [ -x /sbin/vgscan ] && [ -x /sbin/vgchange ]; then
+ echo "Scanning for and initializing all available LVM volume groups..."
+ /sbin/vgscan --ignorelockingfailure --mknodes &&
+ /sbin/vgchange -ay --ignorelockingfailure
+ else
+ echo "Not starting LVM"
+ fi
+
+ if [ -f /etc/mdadm.conf ] ; then
+ echo "Running mdadm"
+ mdadm --assemble --scan
+ mdadm --follow --scan --delay=120 --daemonise >
/var/run/mdadm.pid
+ elif [ -f /etc/raidtab ] ; then
+ echo "Running raidstart"
+ raidstart --all
+ else
+ echo "Not auto-starting RAID"
+ fi
+
+ echo "Mounting root file system read only..."
+ mount -n -o remount,ro /
+
+ echo "Checking rootfs"
+ [ -e /fastboot ] && return
+ [ -e /forcefsck ] && FORCE="-f"
+ [ "$NOSOFTFIX" != yes ] && FIX="-a"
+ [ "$FSCKFIX" = yes ] && FIX="-y"
+ [ -z "$FIX" ] && FIX="-n" # need at least -n, -y, or -a for
non-tty fsck
+ [ "$FORCE" = yes ] && FORCE="-f"
+
+ echo "Checking root file system..."
+ /sbin/fsck -T -C $FIX $FORCE /
+ if [ $? -gt 1 ]; then
+ $WARNING
+ echo "fsck failed."
+ echo "Please repair your file system"
+ echo "manually by running /sbin/fsck"
+ echo "without the -a option"
+ $NORMAL
+ /sbin/sulogin
+ /sbin/reboot -f
+ fi
+
+ echo "Mounting root file system read/write..."
+ mount -n -o remount,rw /
+ if ! [ -h /etc/mtab ]; then
+ builtin echo > /etc/mtab
+ fi
+ mount -f -o remount,rw /
+
mount -t tmpfs lock /var/lock
mount -t tmpfs run /var/run
mount -t tmpfs tmp /tmp
+ echo "done mounting rootfs"
+ initctl emit mount_root-start
end script
diff --git a/smgl/smgl-upstart/upstart-init/native/mpd.conf
b/smgl/smgl-upstart/upstart-init/native/mpd.conf
index 879834c..0d91216 100644
--- a/smgl/smgl-upstart/upstart-init/native/mpd.conf
+++ b/smgl/smgl-upstart/upstart-init/native/mpd.conf
@@ -5,7 +5,7 @@
description "Start Music Player Daemon"
author "Arjan Bouter <abouter AT sourcemage.org>"

-start on network-up and started alsa and started syslog
+start on network-start and alsa-start and syslog-start
stop on shutdown

script
diff --git a/smgl/smgl-upstart/upstart-init/native/network.conf
b/smgl/smgl-upstart/upstart-init/native/network.conf
index 2397533..1c7fc42 100644
--- a/smgl/smgl-upstart/upstart-init/native/network.conf
+++ b/smgl/smgl-upstart/upstart-init/native/network.conf
@@ -5,10 +5,10 @@
description "Start networking"
author "Arjan Bouter <abouter AT sourcemage.org>"

-start on started dbus
+start on dbus-start
stop on shutdown

-emits network-up network-down
+emits network-start

console output

@@ -16,8 +16,11 @@ script
ifconfig lo 127.0.0.1
. /etc/sysconfig/facilities
case $network in
- wicd) /usr/sbin/wicd ;;
- network) ifup -a ;;
+ wicd) echo "using wicd to manage your network"
+ /usr/sbin/wicd ;;
+ network) echo "using ifup -a to bring up networking"
+ ifup -a ;;
*) echo "unknown network provider, aborting" ;;
esac
+ initctl emit network-start
end script
diff --git a/smgl/smgl-upstart/upstart-init/native/rc.conf
b/smgl/smgl-upstart/upstart-init/native/rc.conf
deleted file mode 100644
index 46f295b..0000000
--- a/smgl/smgl-upstart/upstart-init/native/rc.conf
+++ /dev/null
@@ -1,18 +0,0 @@
-# rc
-#
-# starts essential jobs
-
-description "Start essential jobs"
-author "Arjan Bouter <abouter AT sourcemage.org>"
-
-start on startup
-stop on shutdown
-
-task
-
-script
- start mount_root
- start devices
- start lvm
- start mount_all
-end script
diff --git a/smgl/smgl-upstart/upstart-init/native/scripts/lvm.sh
b/smgl/smgl-upstart/upstart-init/native/scripts/lvm.sh
deleted file mode 100755
index 8df7081..0000000
--- a/smgl/smgl-upstart/upstart-init/native/scripts/lvm.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/bash
-
-vgscan
-vgchange -ay
diff --git a/smgl/smgl-upstart/upstart-init/native/shutdown.conf
b/smgl/smgl-upstart/upstart-init/native/shutdown.conf
index b418a86..57603c8 100644
--- a/smgl/smgl-upstart/upstart-init/native/shutdown.conf
+++ b/smgl/smgl-upstart/upstart-init/native/shutdown.conf
@@ -6,15 +6,22 @@ description "Shutdown"
author "Arjan Bouter <abouter AT sourcemage.org>"

start on shutdown
-stop on startup
+#stop on startup

task
console output

script
for running_job in $(initctl list|grep running|awk -F' ' '{print $1}'); do
- stop $running_job
+ if [[ "$running_job" = 'tty1' ]]; then
+ echo "leave tty1 running, just in case..."
+ else
+ stop $running_job
+ fi
done
+ echo "signalling everything else to stop"
+ initctl emit shutdown
+ echo "unmounting filesystems"
umount -a
sync
echo "powering off"
diff --git a/smgl/smgl-upstart/upstart-init/native/slapd.conf
b/smgl/smgl-upstart/upstart-init/native/slapd.conf
index fadb04a..5f7ca91 100644
--- a/smgl/smgl-upstart/upstart-init/native/slapd.conf
+++ b/smgl/smgl-upstart/upstart-init/native/slapd.conf
@@ -5,7 +5,7 @@
description "Start OpenLDAP slapd"
author "Arjan Bouter <abouter AT sourcemage.org>"

-start on network-up and started syslog
+start on network-up and syslog-start
stop on shutdown

script
diff --git a/smgl/smgl-upstart/upstart-init/native/syslog.conf
b/smgl/smgl-upstart/upstart-init/native/syslog.conf
index 6defcf9..21c67e0 100644
--- a/smgl/smgl-upstart/upstart-init/native/syslog.conf
+++ b/smgl/smgl-upstart/upstart-init/native/syslog.conf
@@ -2,10 +2,10 @@
#
# starts a syslog daemon

-description "Start and enable a syslog daemon"
+description "Start a syslog daemon"
author "Arjan Bouter <abouter AT sourcemage.org>"

-start on started mount_all
+start on filesystems-mounted
stop on shutdown

emits syslog-start syslog-stop
@@ -13,7 +13,9 @@ emits syslog-start syslog-stop
script
. /etc/sysconfig/facilities
case $syslog in
- smgl-metalog) metalog ;;
+ smgl-metalog) echo "Starting metalog"
+ initctl emit syslog-start &
+ metalog ;;
*) echo "unknown syslog provider, aborting" ;;
esac
end script
diff --git a/smgl/smgl-upstart/upstart-init/native/tty1.conf
b/smgl/smgl-upstart/upstart-init/native/tty1.conf
index fb0e15a..9bf1c8d 100644
--- a/smgl/smgl-upstart/upstart-init/native/tty1.conf
+++ b/smgl/smgl-upstart/upstart-init/native/tty1.conf
@@ -6,7 +6,8 @@
description "start agetty on tty1"
author "Arjan Bouter <abouter AT sourcemage.org>"

-start on started mount_all
+start on mount_root-start
+# let's keep a tty around for now ;)
#stop on shutdown

console owner
diff --git a/smgl/smgl-upstart/upstart-init/native/tty2.conf
b/smgl/smgl-upstart/upstart-init/native/tty2.conf
index b3eddd7..67d5971 100644
--- a/smgl/smgl-upstart/upstart-init/native/tty2.conf
+++ b/smgl/smgl-upstart/upstart-init/native/tty2.conf
@@ -6,8 +6,8 @@
description "start agetty on tty2"
author "Arjan Bouter <abouter AT sourcemage.org>"

-start on started avahi and started tty3
-stop on stopped avahi
+start on network-up
+stop on shutdown

console owner
respawn
diff --git a/smgl/smgl-upstart/upstart-init/native/xend.conf
b/smgl/smgl-upstart/upstart-init/native/xend.conf
new file mode 100644
index 0000000..ace598e
--- /dev/null
+++ b/smgl/smgl-upstart/upstart-init/native/xend.conf
@@ -0,0 +1,25 @@
+# xend
+#
+# starts xend
+
+description "Check for Xen and run xend"
+author "Arjan Bouter <abouter AT sourcemage.org>"
+
+start on network-up and syslog-start
+stop on shutdown
+
+pre-start script
+ if xen-detect > /dev/null 2>&1 ; then
+ echo 'Running in xen!'
+ mount -t xenfs xenfs /proc/xen
+ else
+ echo "Not running in Xen, won't start xend."
+ return 1
+ fi
+end script
+
+exec xend start
+
+#stop exec xend stop
+
+#status exec xend status
diff --git a/smgl/smgl-upstart/upstart-init/native/xinetd.conf
b/smgl/smgl-upstart/upstart-init/native/xinetd.conf
index fef7368..0245ddc 100644
--- a/smgl/smgl-upstart/upstart-init/native/xinetd.conf
+++ b/smgl/smgl-upstart/upstart-init/native/xinetd.conf
@@ -2,10 +2,10 @@
#
# starts xinetd

-description "Find and enable LVM"
+description "Start xinetd"
author "Arjan Bouter <abouter AT sourcemage.org>"

-start on network-up and started syslog
+start on network-up and syslog-start
stop on shutdown

exec /usr/sbin/xinetd -dontfork
diff --git a/utils/coreutils/DETAILS b/utils/coreutils/DETAILS
index 3706c96..f6f42be 100755
--- a/utils/coreutils/DETAILS
+++ b/utils/coreutils/DETAILS
@@ -1,5 +1,5 @@
SPELL=coreutils
- VERSION=7.5
+ VERSION=7.6
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SOURCE.sig
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/utils/coreutils/HISTORY b/utils/coreutils/HISTORY
index f8dc8be..a278eef 100644
--- a/utils/coreutils/HISTORY
+++ b/utils/coreutils/HISTORY
@@ -1,3 +1,6 @@
+2009-09-11 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 7.6
+
2009-08-21 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 7.5

diff --git a/utils/gnuplot/DETAILS b/utils/gnuplot/DETAILS
index a0d6aa1..897bf14 100755
--- a/utils/gnuplot/DETAILS
+++ b/utils/gnuplot/DETAILS
@@ -11,11 +11,11 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-cvs

SOURCE_URL[0]=cvs://:pserver:anonymous AT gnuplot.cvs.sourceforge.net:/cvsroot/gnuplot:gnuplot
SOURCE_IGNORE=volatile
else
- VERSION=4.2.5
+ VERSION=4.2.6
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
-
SOURCE_HASH=sha512:a8a49a34d89181749ad37d6096e8cb70df8602d91fbcf35fc966c4ddcb6bf6ba1cd2e39dfb802d69bdea02245c367c33d8f0763e8625d41f9c86c856f76caf15
+
SOURCE_HASH=sha512:3b725c20276d48ca57cfbe34e1ff7c82eca2ddc7b566cc85b0a1bc4fb38cec891cdb1097efd7a53047b478a6604d828990977bda9a6cbdffbd5550de573fadcc
fi
if [[ $GNUPLOT_LUA == "y" ]]; then
SOURCE2=${SPELL}_lua_terminal.tgz
diff --git a/utils/gnuplot/HISTORY b/utils/gnuplot/HISTORY
index 0efabd0..0fc097e 100644
--- a/utils/gnuplot/HISTORY
+++ b/utils/gnuplot/HISTORY
@@ -1,3 +1,6 @@
+2009-09-10 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 4.2.6
+
2009-05-20 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 4.2.5

diff --git a/utils/kexec-tools/DETAILS b/utils/kexec-tools/DETAILS
index e1f6c44..8871634 100755
--- a/utils/kexec-tools/DETAILS
+++ b/utils/kexec-tools/DETAILS
@@ -1,9 +1,9 @@
SPELL=kexec-tools
- VERSION=2.0.0
+ VERSION=2.0.1
SOURCE=$SPELL-$VERSION.tar.bz2

SOURCE_URL=$KERNEL_URL/pub/linux/kernel/people/horms/kexec-tools/$SOURCE
SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"

WEB_SITE=http://www.kernel.org/pub/linux/kernel/people/horms/kexec-tools/
ENTERED=20050724
LICENCE=GPL2
diff --git a/utils/kexec-tools/HISTORY b/utils/kexec-tools/HISTORY
index b3dfa15..dc8d13f 100644
--- a/utils/kexec-tools/HISTORY
+++ b/utils/kexec-tools/HISTORY
@@ -1,3 +1,6 @@
+2009-09-10 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 2.0.1; quoting paths
+
2009-01-23 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 2.0.0, new WEB_SITE & SOURCE_URL, gz -> bz2, removed
UPDATED

diff --git a/utils/kexec-tools/kexec-tools-2.0.0.tar.bz2.sig
b/utils/kexec-tools/kexec-tools-2.0.0.tar.bz2.sig
deleted file mode 100644
index fb606df..0000000
Binary files a/utils/kexec-tools/kexec-tools-2.0.0.tar.bz2.sig and /dev/null
differ
diff --git a/utils/kexec-tools/kexec-tools-2.0.1.tar.bz2.sig
b/utils/kexec-tools/kexec-tools-2.0.1.tar.bz2.sig
new file mode 100644
index 0000000..e4c3dd9
Binary files /dev/null and b/utils/kexec-tools/kexec-tools-2.0.1.tar.bz2.sig
differ
diff --git a/utils/less/HISTORY b/utils/less/HISTORY
index c866b8f..aa21ca4 100644
--- a/utils/less/HISTORY
+++ b/utils/less/HISTORY
@@ -1,3 +1,7 @@
+2009-09-13 Quentin Rameau <quinq AT sourcemage.org>
+ * profile.d/pager.sh: added
+ * INSTALL: install pager.sh
+
2009-07-27 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 436; quoting paths
* BUILD, DEPENDS: cleaned up
diff --git a/utils/less/INSTALL b/utils/less/INSTALL
index 8e5ac6b..b1212a3 100755
--- a/utils/less/INSTALL
+++ b/utils/less/INSTALL
@@ -8,4 +8,11 @@ cp less.1.gz ${INSTALL_ROOT}/usr/share/man/man1
&&

mv lesskey.nro lesskey.1 &&
gzip -9 lesskey.1 &&
-cp lesskey.1.gz ${INSTALL_ROOT}/usr/share/man/man1
+cp lesskey.1.gz ${INSTALL_ROOT}/usr/share/man/man1 &&
+
+mkdir -p $INSTALL_ROOT/etc/profile.d/ &&
+if install_config_file $SCRIPT_DIRECTORY/profile.d/pager.sh \
+ $INSTALL_ROOT/etc/profile.d/pager.sh;
+then
+ chmod 0755 $INSTALL_ROOT/etc/profile.d/pager.sh
+fi
diff --git a/utils/less/profile.d/pager.sh b/utils/less/profile.d/pager.sh
new file mode 100644
index 0000000..8db43ed
--- /dev/null
+++ b/utils/less/profile.d/pager.sh
@@ -0,0 +1,10 @@
+#!/bin/sh
+# First check if this variable is already set
+# then if not set, check it (maybe), then set it
+
+if [ -z "$PAGER" ] ; then
+ PAGER="less"
+fi
+
+export PAGER
+
diff --git a/utils/most/HISTORY b/utils/most/HISTORY
index 0eb4d2c..8d7273a 100644
--- a/utils/most/HISTORY
+++ b/utils/most/HISTORY
@@ -1,3 +1,7 @@
+2009-09-13 Quentin Rameau <quinq AT sourcemage.org>
+ * profile.d/pager.sh: added
+ * INSTALL: added, install pager.sh
+
2008-02-10 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 5.0.0a

diff --git a/utils/most/INSTALL b/utils/most/INSTALL
new file mode 100755
index 0000000..f25df1b
--- /dev/null
+++ b/utils/most/INSTALL
@@ -0,0 +1,9 @@
+default_install &&
+
+mkdir -p $INSTALL_ROOT/etc/profile.d/ &&
+if install_config_file $SCRIPT_DIRECTORY/profile.d/pager.sh \
+ $INSTALL_ROOT/etc/profile.d/pager.sh;
+then
+ chmod 0755 $INSTALL_ROOT/etc/profile.d/pager.sh
+fi
+
diff --git a/utils/most/profile.d/pager.sh b/utils/most/profile.d/pager.sh
new file mode 100644
index 0000000..ee463d7
--- /dev/null
+++ b/utils/most/profile.d/pager.sh
@@ -0,0 +1,10 @@
+#!/bin/sh
+# First check if this variable is already set
+# then if not set, check it (maybe), then set it
+
+if [ -z "$PAGER" ] ; then
+ PAGER="most"
+fi
+
+export PAGER
+
diff --git a/utils/psmisc/DETAILS b/utils/psmisc/DETAILS
index 1ecc239..6b250df 100755
--- a/utils/psmisc/DETAILS
+++ b/utils/psmisc/DETAILS
@@ -1,6 +1,6 @@
SPELL=psmisc
- VERSION=22.7
-
SOURCE_HASH[0]=sha512:d8ce792536db5b7b38e284bc5afcdfdac55bd1482e97c4010bd7c8c9fe5856cfdd04a4b0b2c776d1c69e57e5939e5cf51915fbfb849d37a5adbe49415cf6cc67
+ VERSION=22.8
+
SOURCE_HASH[0]=sha512:836132ccb59d7d3776765ca242cb56a64d3ebf64e3743a23f8536575cf424fe82c288051f35445768ecb0e29408852e5d356e3e2c92b0280de82922e6308c50e
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
@@ -22,6 +22,5 @@ The package contains the following programs:
* killall - kills a process by its name, similar to a pkill found in
some other Unices.
* pstree - Shows currently running processes in a tree format.
- * pidof - Finds proccess id of running programs, similar to pgrep
found in some other Unices.
EOF
diff --git a/utils/psmisc/HISTORY b/utils/psmisc/HISTORY
index 3acde83..17641fb 100644
--- a/utils/psmisc/HISTORY
+++ b/utils/psmisc/HISTORY
@@ -1,3 +1,9 @@
+2009-09-15 Arjan Bouter <abouter AT sourcemage.org>
+ * DETAILS: removed info about pidof, which is not provided by psmisc
+
+2009-09-13 Arjan Bouter <abouter AT sourcemage.org>
+ * DETAILS: version 22.8
+
2009-05-10 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 22.7

diff --git a/utils/pybackpack/BUILD b/utils/pybackpack/BUILD
new file mode 100755
index 0000000..7bcf699
--- /dev/null
+++ b/utils/pybackpack/BUILD
@@ -0,0 +1 @@
+./setup.py build
diff --git a/utils/pybackpack/DEPENDS b/utils/pybackpack/DEPENDS
new file mode 100755
index 0000000..a1a177f
--- /dev/null
+++ b/utils/pybackpack/DEPENDS
@@ -0,0 +1,9 @@
+depends python &&
+depends rdiff-backup &&
+depends pygtk2 &&
+depends gnome-python-desktop &&
+depends CD-BURN-UTILITY &&
+optional_depends nautilus-cd-burner \
+ "" \
+ "" \
+ "needed for backup to CD/DVD"
diff --git a/utils/pybackpack/DETAILS b/utils/pybackpack/DETAILS
new file mode 100755
index 0000000..25cc3fd
--- /dev/null
+++ b/utils/pybackpack/DETAILS
@@ -0,0 +1,15 @@
+ SPELL=pybackpack
+ VERSION=0.5.6
+ SOURCE="${SPELL}-${VERSION}.tar.gz"
+
SOURCE_URL[0]=http://andrewprice.me.uk/projects/${SPELL}/download/${SOURCE}
+
SOURCE_HASH=sha512:0129949655bc4ca4e1159bc3275e43aa5ac662f883216f2e4e2e573db12a07999d4bb08911112b16ede38b0827a5f64b7d83125cde2e57b7caebe9d5a22a31af
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
+ WEB_SITE="http://andrewprice.me.uk/projects/pybackpack/";
+ LICENSE[0]=GPL
+ ENTERED=20090913
+ SHORT="a user-friendly file backup tool"
+cat << EOF
+A graphical tool to make file backup simpler. Provides a user-friendly
+interface which allows you to back up your files easily to an archive,
+to a CD/DVD or to a remote location using SSH.
+EOF
diff --git a/utils/pybackpack/HISTORY b/utils/pybackpack/HISTORY
new file mode 100644
index 0000000..461857a
--- /dev/null
+++ b/utils/pybackpack/HISTORY
@@ -0,0 +1,3 @@
+2009-09-13 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * BUILD, DEPENDS, desktop, DETAILS, INSTALL: spell created
+
diff --git a/utils/pybackpack/INSTALL b/utils/pybackpack/INSTALL
new file mode 100755
index 0000000..d1abe26
--- /dev/null
+++ b/utils/pybackpack/INSTALL
@@ -0,0 +1 @@
+./setup.py install --prefix=${INSTALL_ROOT}/usr
diff --git a/utils/pybackpack/desktop/pybackpack.desktop
b/utils/pybackpack/desktop/pybackpack.desktop
new file mode 100644
index 0000000..a21a61b
--- /dev/null
+++ b/utils/pybackpack/desktop/pybackpack.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Encoding=UTF-8
+Version=1.0
+Name=pybackpack
+Type=Application
+Comment=a user-friendly file backup tool
+Exec=pybackpack
+Icon=
+Categories=Applications;GUI;Backup;
+Term=
diff --git a/utils/unison/DETAILS b/utils/unison/DETAILS
index 84c60e8..1f76637 100755
--- a/utils/unison/DETAILS
+++ b/utils/unison/DETAILS
@@ -1,14 +1,14 @@
SPELL=unison
if [ "$BETA" == "y" ]; then
- VERSION=2.27.57
+ VERSION=2.32.52
SOURCE=$SPELL-$VERSION.tar.gz
-
SOURCE_HASH=sha512:3f2068673d1bc6a00562f7998f0cbb5889d02570eba61f81854bdb097bf2f4f9dd14877b3653b9ca20368032cc2c217d7ebdf0be49ea70406b77aa9dacb94db9
+
SOURCE_HASH=sha512:a97ab23ca8b87575653f6fea4f7eba7fb5aacb8cfa0195ebfff70ecc38f88f26677b26d76c8ba68bd2dac24bdabfabc2f7334ab94bd4b4c0eeb94303438dbda1

SOURCE_URL[0]=http://www.cis.upenn.edu/~bcpierce/unison/download/releases/beta/$SOURCE
else
- VERSION=2.27.57
- SOURCE=$SPELL-$VERSION.tar.gz
+ VERSION=2.27.157
+ SOURCE=$SPELL-$VERSION.tar.gz

SOURCE_URL[0]=http://www.cis.upenn.edu/~bcpierce/unison/download/releases/stable/$SOURCE
-
SOURCE_HASH=sha512:3f2068673d1bc6a00562f7998f0cbb5889d02570eba61f81854bdb097bf2f4f9dd14877b3653b9ca20368032cc2c217d7ebdf0be49ea70406b77aa9dacb94db9
+
SOURCE_HASH=sha512:5be96462d1e23164c173b1ad6088832d5a0dfeb8a2d3f6f4b197f8fdef5216d1fdb0b43fdf2d95dfe58c4a857089e1bd3ca3fbf7406019ba3a7837326bb2c554
fi
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
WEB_SITE=http://www.cis.upenn.edu/~bcpierce/unison/
diff --git a/utils/unison/HISTORY b/utils/unison/HISTORY
index c7868c2..84839d3 100644
--- a/utils/unison/HISTORY
+++ b/utils/unison/HISTORY
@@ -1,3 +1,9 @@
+2009-09-14 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * INSTALL: fixed install path
+
+2009-09-13 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: updated BETA to 2.32.52, stable to 2.27.157
+
2008-04-29 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
* DETAILS: updated BETA=n to 2.27.57
updated BETA=y to 2.27.57
diff --git a/utils/unison/INSTALL b/utils/unison/INSTALL
index 3e61cd9..c75ce7a 100755
--- a/utils/unison/INSTALL
+++ b/utils/unison/INSTALL
@@ -1 +1 @@
- make CFLAGS="" UISTYLE="$UI" INSTALLDIR=$INSTALL_ROOT/usr/bin install
+ make CFLAGS="" UISTYLE="$UI" INSTALLDIR=$INSTALL_ROOT/usr/bin/ install
diff --git a/utils/util-linux/HISTORY b/utils/util-linux/HISTORY
index 15f37e3..f80fb70 100644
--- a/utils/util-linux/HISTORY
+++ b/utils/util-linux/HISTORY
@@ -1,3 +1,7 @@
+2009-09-13 Quentin Rameau <quinq AT sourcemage.org>
+ * profile.d/pager.sh: added
+ * INSTALL: install pager.sh
+
2009-09-08 Arjan Bouter <abouter AT sourcemage.org>
* PROVIDES: provides GETTY

@@ -340,3 +344,4 @@
2002-03-26 Jeff Schmidt <jschmidt AT fnal.gov>
* HISTORY: Added this file.
* DETAILS: updated version from ~n to ~o
+
diff --git a/utils/util-linux/INSTALL b/utils/util-linux/INSTALL
index e8663e5..41cbc70 100755
--- a/utils/util-linux/INSTALL
+++ b/utils/util-linux/INSTALL
@@ -2,4 +2,11 @@ make install DESTDIR="$INSTALL_ROOT" &&

if [[ ! -e "$INSTALL_ROOT/etc/filesystems" ]]; then
install -vm 644 "$SPELL_DIRECTORY/filesystems" "$INSTALL_ROOT/etc"
+fi &&
+
+mkdir -p $INSTALL_ROOT/etc/profile.d/ &&
+if install_config_file $SCRIPT_DIRECTORY/profile.d/pager.sh \
+ $INSTALL_ROOT/etc/profile.d/pager.sh;
+then
+ chmod 0755 $INSTALL_ROOT/etc/profile.d/pager.sh
fi
diff --git a/utils/util-linux/profile.d/pager.sh
b/utils/util-linux/profile.d/pager.sh
new file mode 100644
index 0000000..685f12d
--- /dev/null
+++ b/utils/util-linux/profile.d/pager.sh
@@ -0,0 +1,10 @@
+#!/bin/sh
+# First check if this variable is already set
+# then if not set, check it (maybe), then set it
+
+if [ -z "$PAGER" ] ; then
+ PAGER="more"
+fi
+
+export PAGER
+
diff --git a/utils/virtualbox/DETAILS b/utils/virtualbox/DETAILS
index 8d0fa6f..d9ad198 100755
--- a/utils/virtualbox/DETAILS
+++ b/utils/virtualbox/DETAILS
@@ -1,10 +1,10 @@
SPELL=virtualbox
- VERSION=3.0.4
+ VERSION=3.0.6
PATCHLEVEL=0
SOURCE=VirtualBox-$VERSION-OSE.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/VirtualBox-${VERSION%-*}_OSE

SOURCE_URL[0]=http://download.virtualbox.org/virtualbox/${VERSION%-*}/$SOURCE
-
SOURCE_HASH=sha512:5efbdfb37bd13741fb35ea15c38529582dfb2ea32abb36ac18c9641bd05abd22323df50ad829e2b388f209afcc11863d2cd0cffc78d0f2c91955fa9edf7a1e6c
+
SOURCE_HASH=sha512:f7817f007c21ccc797b2080b5b21a5a514e1614b58dc5c5f7112061a884fb100cc2df1fa8f2517a7790cb564536c16d6ae0e07a89657112bed0957178a3c7e4a
LICENSE[0]=GPL
WEB_SITE=http://www.virtualbox.org/
ENTERED=20070612
diff --git a/utils/virtualbox/HISTORY b/utils/virtualbox/HISTORY
index 8eb1385..1e4b19a 100644
--- a/utils/virtualbox/HISTORY
+++ b/utils/virtualbox/HISTORY
@@ -1,3 +1,6 @@
+2009-09-10 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 3.0.6
+
2009-08-05 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 3.0.4

diff --git a/utils/xen-tools/DETAILS b/utils/xen-tools/DETAILS
index 8a5236f..5900207 100755
--- a/utils/xen-tools/DETAILS
+++ b/utils/xen-tools/DETAILS
@@ -1,8 +1,8 @@
SPELL=xen-tools
PACKAGE=xen
- VERSION=3.4.0
+ VERSION=3.4.1
SOURCE=${PACKAGE}-${VERSION}.tar.gz
-
SOURCE_HASH=sha512:e954ef551b9618cbc8c7188961c7f57570c494122171093892bd0a8abbe29ef9f7c1b3822335968ae84c835ae470f87fdaaa4a9630206b7f4511b1e2f1535a3b
+
SOURCE_HASH=sha512:d4af7572494fe251ac1c42f151e4f5052d222a5a371b3aed0a8dac3c76b3a2c8b810279389148a51404a266ba7542aa82f12e5439a98d22ba437be89d939b789
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${PACKAGE}-${VERSION}

SOURCE_URL[0]=http://bits.xensource.com/oss-xen/release/${VERSION}/${SOURCE}
WEB_SITE=http://www.xen.org
diff --git a/utils/xen-tools/HISTORY b/utils/xen-tools/HISTORY
index 958c181..f99774a 100644
--- a/utils/xen-tools/HISTORY
+++ b/utils/xen-tools/HISTORY
@@ -1,3 +1,6 @@
+2009-09-12 Arjan Bouter <abouter AT sourcemage.org>
+ * DETAILS: version 3.4.1
+
2009-07-31 Arjan Bouter <abouter AT sourcemage.org>
* PRE_BUILD: added, install into lib instead of lib64

diff --git a/utils/xen/DETAILS b/utils/xen/DETAILS
index 3953a5b..f05cde9 100755
--- a/utils/xen/DETAILS
+++ b/utils/xen/DETAILS
@@ -1,10 +1,11 @@
SPELL=xen
- VERSION=3.4.0
+ VERSION=3.4.1
LICENSE[0]=UNKNOWN
KEYWORDS="xen"
WEB_SITE=http://www.xensource.com/
ENTERED=20060412
SHORT='Xen provides software virtualization for linux'
cat << EOF
-Missing
+This is a profile spell, which means it depends on various parts that make
up a
+xen install.
EOF
diff --git a/utils/xen/HISTORY b/utils/xen/HISTORY
index 9d0086c..3c7ec17 100644
--- a/utils/xen/HISTORY
+++ b/utils/xen/HISTORY
@@ -1,3 +1,6 @@
+2009-09-12 Arjan Bouter <abouter AT sourcemage.org>
+ * DETAILS: version 3.4.1 and added a long description.
+
2009-07-30 Arjan Bouter <abouter AT sourcemage.org>
* DETAILS: version 3.4.0
* DEPENDS: patches not strictly needed
diff --git a/video-libs/live/DETAILS b/video-libs/live/DETAILS
index 0a49dce..63dd5d0 100755
--- a/video-libs/live/DETAILS
+++ b/video-libs/live/DETAILS
@@ -1,12 +1,12 @@
SPELL=live
- VERSION=2009.07.28
+ VERSION=2009.09.04
SOURCE=$SPELL.$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL
SOURCE_URL[0]=http://www.live555.com/liveMedia/public/$SOURCE
SOURCE_URL[1]=http://mirror.ovh.net/gentoo-distfiles/distfiles/$SOURCE
WEB_SITE=http://www.live555.com/liveMedia/
LICENSE[0]=LGPL
-
SOURCE_HASH=sha512:85554df5d11fb35b14a509582063db727b00b7043315389be36227195a709dd1582e092675062e210775ea1a07579c78e43303d9076b0b960bec387a36486eb2
+
SOURCE_HASH=sha512:19108d0433b9e9c9c7848ee6aae7acfaf38c25f7dae6af6c149f4e8a7daeac5687f72170afa1f95da9f59e6cf23e52dc6b29faed35cd2635ec8ca460ce923ffc
# SOURCE_GPG="gurus.gpg:$SOURCE.sig"
ENTERED=20030301
KEYWORDS="streaming video libs"
diff --git a/video-libs/live/HISTORY b/video-libs/live/HISTORY
index f2693c3..14a6f12 100644
--- a/video-libs/live/HISTORY
+++ b/video-libs/live/HISTORY
@@ -1,3 +1,6 @@
+2009-09-13 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 2009.09.04
+
2009-08-01 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 2009.07.28

diff --git a/video/totem/DEPENDS b/video/totem/DEPENDS
index ccd6f46..081e877 100755
--- a/video/totem/DEPENDS
+++ b/video/totem/DEPENDS
@@ -30,8 +30,10 @@ optional_depends rarian \
'--disable-scrollkeeper' \
'build and install docs?' &&

-message "you NEED to enable either gnome-doc-utils or gtk-doc" &&
-message "there is no easy way to opt-out of installing docs." &&
+message "${MESSAGE_COLOR}You NEED to enable either
${DEFAULT_COLOR}${SPELL_COLOR}gnome-doc-utils${DEFAULT_COLOR}" \
+ "${MESSAGE_COLOR}or
${DEFAULT_COLOR}${SPELL_COLOR}gtk-doc${DEFAULT_COLOR}${MESSAGE_COLOR}, there
is no" \
+ "easy way to opt-out of installing docs."
&&
+
optional_depends gnome-doc-utils \
'' '' \
'build and install docs?' &&
diff --git a/video/totem/HISTORY b/video/totem/HISTORY
index d69b120..c7bcbd8 100644
--- a/video/totem/HISTORY
+++ b/video/totem/HISTORY
@@ -1,3 +1,6 @@
+2009-09-10 Eric Sandall <sandalle AT sourcemage.org>
+ * DEPENDS: Use colour in our message
+
2009-08-02 Arjan Bouter <abouter AT sourcemage.org>
* DEPENDS: made rarian optional, changed doc deps to gnome-doc-utils
and gtk-doc, added missing, removed unsupported and corrected
diff --git a/wm-addons/devilspie/DETAILS b/wm-addons/devilspie/DETAILS
index 33bebac..0fe408c 100755
--- a/wm-addons/devilspie/DETAILS
+++ b/wm-addons/devilspie/DETAILS
@@ -9,5 +9,8 @@ SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
LICENSE[0]=GPL
SHORT="A window matching utility"
cat << EOF
-Devil's Pie can be configured to detect windows as they are created, and
match the windows to a set of rules. If the window matches the rules, actions
are applied to it. For example XChat can be put on all desktops by default or
Aterm can be ripped of decorations by default (tested in OpenBox).
+Devil's Pie can be configured to detect windows as they are created, and
match
+the windows to a set of rules. If the window matches the rules, actions are
+applied to it. For example XChat can be put on all desktops by default or
Aterm
+can be ripped of decorations by default (tested in OpenBox).
EOF
diff --git a/wm-addons/devilspie/HISTORY b/wm-addons/devilspie/HISTORY
index 946adc0..277eb29 100644
--- a/wm-addons/devilspie/HISTORY
+++ b/wm-addons/devilspie/HISTORY
@@ -1,3 +1,6 @@
+2009-09-10 Donald Johnson <ltdonny AT gmail.com>
+ * DETAILS: line wrapped long desc
+
2008-03-18 Eric Sandall <sandalle AT sourcemage.org>
* DEPENDS: Switch X11-LIBS to the one and only xorg-libs

diff --git a/x11-toolkits/pygoocanvas/DETAILS
b/x11-toolkits/pygoocanvas/DETAILS
index 2d78a49..10a2aa1 100755
--- a/x11-toolkits/pygoocanvas/DETAILS
+++ b/x11-toolkits/pygoocanvas/DETAILS
@@ -1,8 +1,8 @@
SPELL=pygoocanvas
- VERSION=0.10.0
+ VERSION=0.14.1
SOURCE="${SPELL}-${VERSION}.tar.gz"
- SOURCE_URL[0]=http://download.berlios.de/${SPELL}/${SOURCE}
-
SOURCE_HASH=sha512:df661679cb726a05e9cb6ac648f1da51c97967774b06f66e0ac1e0482354bae7877b65907f2afb4b5742de39169c760bf141e73ba6303e96660c4f89cf2fd1ef
+
SOURCE_URL[0]=http://ftp.gnome.org/pub/GNOME/sources/${SPELL}/${VERSION%.*}/${SPELL}-${VERSION}.tar.gz
+ SOURCE_HASH=sha512:
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
WEB_SITE="http://pygoocanvas.berlios.de/";
LICENSE[0]=lgpl
diff --git a/x11-toolkits/pygoocanvas/HISTORY
b/x11-toolkits/pygoocanvas/HISTORY
index d057072..e980fb6 100644
--- a/x11-toolkits/pygoocanvas/HISTORY
+++ b/x11-toolkits/pygoocanvas/HISTORY
@@ -1,3 +1,6 @@
+2009-09-13 Donald Johnson <ltdonny AT gmail.com>
+ * DETAILS: Switched to new URL and version update.
+
2009-07-09 Bearcat M. Sandor <sourcemage AT feline-soul.com>
* DEPENDS: added goocanvas

diff --git a/x11/xdaliclock/DETAILS b/x11/xdaliclock/DETAILS
index a11d33b..534ef1b 100755
--- a/x11/xdaliclock/DETAILS
+++ b/x11/xdaliclock/DETAILS
@@ -1,9 +1,9 @@
SPELL=xdaliclock
- VERSION=2.27
+ VERSION=2.30
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://www.jwz.org/xdaliclock/$SOURCE
-
SOURCE_HASH=sha512:7f1ce53ee5c88d296c33694643d89deb7cda96f137e64a138e08b2f811defbe9071b5274273cb35809a70c16568a92f9f0ce9c7e82d389410b7288928dfb8ba0
+
SOURCE_HASH=sha512:340f75f4adb22eb743dc87551d2019c7c9dfdd91a1d3946e4b8b32702d1367ebe6f6322a62ab3620e0a8e241ac4419042041eccece80f0dcb28a9d32fc20c382
LICENSE[0]=MIT
WEB_SITE=http://www.jwz.org/xdaliclock/
ENTERED=20020728
diff --git a/x11/xdaliclock/HISTORY b/x11/xdaliclock/HISTORY
index d8aa077..f6751de 100644
--- a/x11/xdaliclock/HISTORY
+++ b/x11/xdaliclock/HISTORY
@@ -1,3 +1,6 @@
+2009-09-10 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 2.30
+
2009-06-29 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 2.27

diff --git a/x11/xscreensaver/DETAILS b/x11/xscreensaver/DETAILS
index 0d1960e..e439268 100755
--- a/x11/xscreensaver/DETAILS
+++ b/x11/xscreensaver/DETAILS
@@ -1,10 +1,10 @@
SPELL=xscreensaver
- VERSION=5.08
+ VERSION=5.10
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://www.jwz.org/$SPELL/$SOURCE
WEB_SITE=http://www.jwz.org/xscreensaver/
-
SOURCE_HASH=sha512:b9ce187cbe0135d24ab0ff916d8ca5cf052e96c0c8e89ed9a16f4dd69d2655b1cc04d8ce5591a213c541fc6615681aa7f4b5c908d0b0a7394ce21e5177245ef8
+
SOURCE_HASH=sha512:40f8fcb5ccb6cfe2deb8d1a673e4dd5bf54b3aee940a406afae07186756ad00521384c823affa2f3867ed7305903b2676678bb78d52b4b81aeeb10a6f5dc52d7
ENTERED=20010922
LICENSE[0]=BSD
KEYWORDS="x11"
diff --git a/x11/xscreensaver/HISTORY b/x11/xscreensaver/HISTORY
index 557e2e3..d1bdb25 100644
--- a/x11/xscreensaver/HISTORY
+++ b/x11/xscreensaver/HISTORY
@@ -1,3 +1,6 @@
+2009-09-10 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 5.10
+
2009-07-25 Arjan Bouter <abouter AT sourcemage.org>
* BUILD: added logic to optionally select a help browser
* CONFIGURE: moved libglade2, libxml2 and gtk+2 to DEPENDS,



  • [SM-Commit] GIT changes to devel-xorg-modular grimoire by Eric Sandall (bb6257ef43ae895e0ad004f2fcc5da573fa6ce59), Eric Sandall, 09/15/2009

Archive powered by MHonArc 2.6.24.

Top of Page